send_message fixes

Author: Ninjasoturi

core/bot/user.php

@@ -176,7 +176,7 @@ public function denyAccess() {
     $response_msg = '<b>' . getTranslation('bot_access_denied') . '</b>';
     // Edit message or send new message based on type of received call
     if ($update['type'] != 'callback_query') {
-      send_message($update['message']['from']['id'], $response_msg);
+      send_message(create_chat_object([$update['message']['chat']['id']]), $response_msg);
       exit;
     }
     $keys = [];

logic/alarm.php

@@ -252,7 +252,7 @@ function alarm($raid_id_array, $user_id, $action, $info = '', $tg_json = [])
       $msg_text .= EMOJI_CLOCK . SP . '<b>' . check_time($attendtime, $recipient_language) . '</b>';
       $msg_text .= create_traincode_msg($trainercode);
     }
-    $tg_json[] = send_message($answer['user_id'], $msg_text, false, false, true);
+    $tg_json[] = send_message(create_chat_object([$answer['user_id']]), $msg_text, false, false, true);
   }
   return $tg_json;
 }

logic/sendalarmnotice.php

@@ -43,5 +43,5 @@ function sendAlertOnOffNotice($raid_id, $user_id, $alarm = null, $raid = null){
     $msg_text = EMOJI_NO_ALARM . SP . '<b>' . getTranslation('alert_no_updates') . '</b>' . CR;
 	}
   $msg_text .= EMOJI_HERE . SP . $gymname . SP . '(' . $raidtimes . ')';
-  send_message($user_id, $msg_text);
+  send_message(create_chat_object([$user_id]), $msg_text);
 }

mods/change_trainercode.php

@@ -9,7 +9,7 @@
 // Check that Code is 12 digits long
 if(strlen($trainercode) != 12){
   // Trainer Code got unallowed Chars -> Error-Message
-  send_message($target_user_id, getTranslation('trainercode_fail'));
+  send_message(create_chat_object([$target_user_id]), getTranslation('trainercode_fail'));
   exit();
 }
 // Store new Trainercode to DB
@@ -28,4 +28,4 @@
 $keys[0][1] = button(getTranslation('done'), ['exit', 'd' => '1']);
 
 // confirm Trainercode-Change
-send_message($target_user_id, getTranslation('trainercode_success').' <b>'.$trainercode.'</b>', $keys);
+send_message(create_chat_object([$target_user_id]), getTranslation('trainercode_success').' <b>'.$trainercode.'</b>', $keys);

mods/change_trainername.php

@@ -7,7 +7,7 @@
 // Only numbers and alphabetic character allowed
 if(!$returnValue){
   // Trainer Name got unallowed Chars -> Error-Message
-  send_message($userid, getTranslation('trainername_fail'));
+  send_message(create_chat_object([$userid]), getTranslation('trainername_fail'));
   exit();
 }
 $trainername = $update['message']['text'];
@@ -28,4 +28,4 @@
 $keys[0][] = button(getTranslation('done'), ['exit', 'd' => '1']);
 
 // confirm Name-Change
-send_message($userid, getTranslation('trainername_success').' <b>'.$trainername.'</b>', $keys);
+send_message(create_chat_object([$userid]), getTranslation('trainername_success').' <b>'.$trainername.'</b>', $keys);

mods/gym_create.php

@@ -23,7 +23,7 @@ function insertUserInput($userId, $stage, $oldMessageId, $gymId = 0) {
 function respondToUser($userId, $oldMessageId = 0, $editMsg = '', $editKeys = [], $sendMsg = '', $sendKeys = [], $callbackMsg = '', $callbackId = 0) {
   if($callbackId != 0) answerCallbackQuery($callbackId, $callbackMsg);
   if($editMsg != '') editMessageText($oldMessageId, $editMsg, $editKeys, $userId, ['disable_web_page_preview' => 'true']);
-  if($sendMsg != '') send_message($userId, $sendMsg, $sendKeys, ['disable_web_page_preview' => 'true']);
+  if($sendMsg != '') send_message(create_chat_object([$userId]), $sendMsg, $sendKeys, ['disable_web_page_preview' => 'true']);
 }
 // Set keys.
 $keys = [];
@@ -50,6 +50,7 @@ function respondToUser($userId, $oldMessageId = 0, $editMsg = '', $editKeys = []
   $sendMsg = EMOJI_HERE . getTranslation('gym_gps_instructions') . CR;
   $sendMsg .= getTranslation('gym_gps_example');
   respondToUser($userId, $oldMessageId, $editMsg, $editKeys, $sendMsg, [], $callbackResponse, $callbackId);
+  exit;
 }
 $userId = $update['message']['from']['id'];
 $oldMessageId = $modifiers['oldMessageId'];
@@ -69,6 +70,7 @@ function respondToUser($userId, $oldMessageId = 0, $editMsg = '', $editKeys = []
     $msg = getTranslation('gym_gps_coordinates_format_error');
     respondToUser($userId, 0, '', [], $msg);
   }
+  exit;
 }
 if($stage == 3) {
   $input = trim($update['message']['text']);
@@ -83,4 +85,5 @@ function respondToUser($userId, $oldMessageId = 0, $editMsg = '', $editKeys = []
     $msg = getTranslation('gym_edit_text_too_long');
     respondToUser($userId, 0, '', [], $msg);
   }
+  exit;
 }

mods/save_event_note.php

@@ -29,4 +29,4 @@
 debug_log($keys);
 
 // Send response message to user
-send_message($user_id, $msg, $keys, []);
+send_message(create_chat_object([$user_id]), $msg, $keys, []);

mods/save_gym_info.php

@@ -18,7 +18,7 @@
 if($action == 'gps') {
   $reg_exp_coordinates = '^[-+]?([1-8]?\d(\.\d+)?|90(\.0+)?),\s*[-+]?(180(\.0+)?|((1[0-7]\d)|([1-9]?\d))(\.\d+)?)$^';
   if(!preg_match($reg_exp_coordinates, $input)) {
-    send_message($user_id, getTranslation("gym_gps_coordinates_format_error") . CR . getTranslation("gym_gps_example"));
+    send_message(create_chat_object([$user_id]), getTranslation("gym_gps_coordinates_format_error") . CR . getTranslation("gym_gps_example"));
     exit();
   }
   [$lat, $lon] = explode(',', $input, 2);
@@ -32,7 +32,7 @@
   $gym['lon'] = $lon;
 }else if(in_array($action, ['addr','name','note'])) {
   if(strlen($input) > 255) {
-    send_message($user_id, getTranslation('gym_edit_text_too_long'));
+    send_message(create_chat_object([$user_id]), getTranslation('gym_edit_text_too_long'));
     exit();
   }
   $column_map = ['addr' => 'address', 'name' => 'gym_name', 'note' => 'gym_note'];

mods/tutorial.php

@@ -23,7 +23,7 @@
   delete_message($update['callback_query']['message']['chat']['id'],$update['callback_query']['message']['message_id']);
   if($new_user) {
     my_query('UPDATE users SET tutorial = ? WHERE user_id = ?', [$data['l'], $user_id]);
-    send_message($user_id, $tutorial_done, []);
+    send_message(create_chat_object([$user_id]), $tutorial_done, []);
 
     // Post the user id to external address if specified
     if(isset($config->TUTORIAL_COMPLETED_CURL_ADDRESS) && $config->TUTORIAL_COMPLETED_CURL_ADDRESS != '') {
@@ -61,7 +61,7 @@
     $msg = getTranslation('tutorial_no_user_info_set');
     $keys[0][0] = button(getTranslation('yes'), 'trainer');
     $keys[0][1] = button(getTranslation('no'), ['exit', 'd' => '1']);
-    send_message($user_id,$msg,$keys);
+    send_message(create_chat_object([$user_id]),$msg,$keys);
   }
   exit();
 }

mods/vote_status.php

@@ -86,7 +86,7 @@
       $keys[0][1] = button(getTranslation('no'), 'exit');
       if($status == 'raid_done') $msg = getTranslation("delete_remote_raid_done");
       else if($status == 'cancel') $msg = getTranslation("delete_remote_raid_cancel");
-      $tg_json[] = send_message($update['callback_query']['from']['id'], $msg, $keys, false, true);
+      $tg_json[] = send_message(create_chat_object([$update['callback_query']['from']['id']]), $msg, $keys, false, true);
     }
   }elseif($status != 'arrived') {
     $tg_json = alarm($raidId,$update['callback_query']['from']['id'],'status',$status, $tg_json);