From 2676fd658e8a90cfe4d466927d37ea91bb12d46e Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 30 Jun 2023 23:22:32 +0800
Subject: [PATCH] Fix #7731 - telegram improvemnts

---
 DataObjects/Mtrack_change.php | 30 +++++++++++++++++++++---------
 DataObjects/Mtrack_ticket.php |  4 +++-
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/DataObjects/Mtrack_change.php b/DataObjects/Mtrack_change.php
index 3c9d76f..c1e5cf1 100644
--- a/DataObjects/Mtrack_change.php
+++ b/DataObjects/Mtrack_change.php
@@ -763,15 +763,27 @@ class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
             $str[] = $a->toAuditString($this);
         }
         
-        $res = $tg->factory('SendMessage',array(
-            'chat_id' => 35721679, 
-            'parse_mode' => 'MarkdownV2',
-            'text' => "/ticket@{$this->onid}  *". $tg->escape($t->summary) . "*\n\n".
-                    "{$this->cgtype} by ". $tg->escape($this->person()->name) . "\n\n" . $tg->escape(implode("\n", $str))
-                
-          
-        ))->send();
-         
+        // who to send to..
+        $d = DB_DataObject::factory('core_person');
+        $d->whereAddIn('id', array($t->created_person_id, $t->developer_id));
+        $d->whereAdd('telegram_id > 0');
+        $sendto = $d->fetchAll('id','telegram_id');
+        
+        // creator  //created_person_id
+        // assigned to developer_id
+        // exclude whoever modfiied it? (disable for testing.)
+        foreach($sendto as $pid => $tid) { 
+            if ($this->person_id == $pid) {
+                // continue;
+            }
+            $res = $tg->factory('SendMessage',array(
+                'chat_id' => $tid, 
+                'parse_mode' => 'MarkdownV2',
+                'text' => "/ticket@{$this->onid}  *". $tg->escape("[{$t->project_id_name}]] {$t->summary}") . "*\n\n".
+                        "{$this->cgtype} by ". $tg->escape($this->person()->name) . "\n\n" . $tg->escape(implode("\n", $str))
+            ))->send();
+        }
+        
         //print_R($res); 
     }
 
diff --git a/DataObjects/Mtrack_ticket.php b/DataObjects/Mtrack_ticket.php
index fb3612b..cab8912 100644
--- a/DataObjects/Mtrack_ticket.php
+++ b/DataObjects/Mtrack_ticket.php
@@ -894,7 +894,9 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
             $this->updateUploads(json_decode($req['uploads']), $roo);
         }
         // in theory this should trigger a timesheet log that we have started working on something.
-        
+        if ($ch) {
+            $ch->sendTelegram();
+        }
         
         
     }
-- 
2.39.2