Просмотр исходного кода

Improvements to telegram alerts

Daniel Gibbs 8 лет назад
Родитель
Сommit
80fc9da580
73 измененных файлов с 89 добавлено и 84 удалено
  1. 1 1
      lgsm/config-default/config-lgsm/arkserver/_default.cfg
  2. 1 1
      lgsm/config-default/config-lgsm/arma3server/_default.cfg
  3. 1 1
      lgsm/config-default/config-lgsm/bb2server/_default.cfg
  4. 1 1
      lgsm/config-default/config-lgsm/bf1942server/_default.cfg
  5. 1 1
      lgsm/config-default/config-lgsm/bmdmserver/_default.cfg
  6. 1 1
      lgsm/config-default/config-lgsm/boserver/_default.cfg
  7. 1 1
      lgsm/config-default/config-lgsm/bsserver/_default.cfg
  8. 1 1
      lgsm/config-default/config-lgsm/ccserver/_default.cfg
  9. 1 1
      lgsm/config-default/config-lgsm/cod2server/_default.cfg
  10. 1 1
      lgsm/config-default/config-lgsm/cod4server/_default.cfg
  11. 1 1
      lgsm/config-default/config-lgsm/codserver/_default.cfg
  12. 1 1
      lgsm/config-default/config-lgsm/coduoserver/_default.cfg
  13. 1 1
      lgsm/config-default/config-lgsm/codwawserver/_default.cfg
  14. 1 1
      lgsm/config-default/config-lgsm/coserver/_default.cfg
  15. 1 1
      lgsm/config-default/config-lgsm/csczserver/_default.cfg
  16. 1 1
      lgsm/config-default/config-lgsm/csgoserver/_default.cfg
  17. 1 1
      lgsm/config-default/config-lgsm/csserver/_default.cfg
  18. 1 1
      lgsm/config-default/config-lgsm/cssserver/_default.cfg
  19. 1 1
      lgsm/config-default/config-lgsm/dabserver/_default.cfg
  20. 1 1
      lgsm/config-default/config-lgsm/dmcserver/_default.cfg
  21. 1 1
      lgsm/config-default/config-lgsm/dodserver/_default.cfg
  22. 1 1
      lgsm/config-default/config-lgsm/dodsserver/_default.cfg
  23. 1 1
      lgsm/config-default/config-lgsm/doiserver/_default.cfg
  24. 1 1
      lgsm/config-default/config-lgsm/dstserver/_default.cfg
  25. 1 1
      lgsm/config-default/config-lgsm/emserver/_default.cfg
  26. 1 1
      lgsm/config-default/config-lgsm/fctrserver/_default.cfg
  27. 1 1
      lgsm/config-default/config-lgsm/fofserver/_default.cfg
  28. 1 1
      lgsm/config-default/config-lgsm/gesserver/_default.cfg
  29. 1 1
      lgsm/config-default/config-lgsm/gmodserver/_default.cfg
  30. 1 1
      lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg
  31. 1 1
      lgsm/config-default/config-lgsm/hldmserver/_default.cfg
  32. 1 1
      lgsm/config-default/config-lgsm/hldmsserver/_default.cfg
  33. 1 1
      lgsm/config-default/config-lgsm/hwserver/_default.cfg
  34. 1 1
      lgsm/config-default/config-lgsm/insserver/_default.cfg
  35. 1 1
      lgsm/config-default/config-lgsm/jc2server/_default.cfg
  36. 1 1
      lgsm/config-default/config-lgsm/kfserver/_default.cfg
  37. 1 1
      lgsm/config-default/config-lgsm/l4d2server/_default.cfg
  38. 1 1
      lgsm/config-default/config-lgsm/l4dserver/_default.cfg
  39. 1 1
      lgsm/config-default/config-lgsm/mcserver/_default.cfg
  40. 1 1
      lgsm/config-default/config-lgsm/mtaserver/_default.cfg
  41. 1 1
      lgsm/config-default/config-lgsm/mumbleserver/_default.cfg
  42. 1 1
      lgsm/config-default/config-lgsm/nmrihserver/_default.cfg
  43. 1 1
      lgsm/config-default/config-lgsm/ns2cserver/_default.cfg
  44. 1 1
      lgsm/config-default/config-lgsm/ns2server/_default.cfg
  45. 1 1
      lgsm/config-default/config-lgsm/opforserver/_default.cfg
  46. 1 1
      lgsm/config-default/config-lgsm/pcserver/_default.cfg
  47. 1 1
      lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg
  48. 1 1
      lgsm/config-default/config-lgsm/pzserver/_default.cfg
  49. 1 1
      lgsm/config-default/config-lgsm/q2server/_default.cfg
  50. 1 1
      lgsm/config-default/config-lgsm/q3server/_default.cfg
  51. 1 1
      lgsm/config-default/config-lgsm/qlserver/_default.cfg
  52. 1 1
      lgsm/config-default/config-lgsm/qwserver/_default.cfg
  53. 1 1
      lgsm/config-default/config-lgsm/ricochetserver/_default.cfg
  54. 1 1
      lgsm/config-default/config-lgsm/roserver/_default.cfg
  55. 1 1
      lgsm/config-default/config-lgsm/rustserver/_default.cfg
  56. 1 1
      lgsm/config-default/config-lgsm/sbserver/_default.cfg
  57. 1 1
      lgsm/config-default/config-lgsm/sdtdserver/_default.cfg
  58. 1 1
      lgsm/config-default/config-lgsm/squadserver/_default.cfg
  59. 1 1
      lgsm/config-default/config-lgsm/ss3server/_default.cfg
  60. 1 1
      lgsm/config-default/config-lgsm/svenserver/_default.cfg
  61. 1 1
      lgsm/config-default/config-lgsm/terrariaserver/_default.cfg
  62. 1 1
      lgsm/config-default/config-lgsm/tf2server/_default.cfg
  63. 1 1
      lgsm/config-default/config-lgsm/tfcserver/_default.cfg
  64. 1 1
      lgsm/config-default/config-lgsm/ts3server/_default.cfg
  65. 1 1
      lgsm/config-default/config-lgsm/tuserver/_default.cfg
  66. 1 1
      lgsm/config-default/config-lgsm/twserver/_default.cfg
  67. 1 1
      lgsm/config-default/config-lgsm/ut2k4server/_default.cfg
  68. 1 1
      lgsm/config-default/config-lgsm/ut3server/_default.cfg
  69. 1 1
      lgsm/config-default/config-lgsm/ut99server/_default.cfg
  70. 1 1
      lgsm/config-default/config-lgsm/utserver/_default.cfg
  71. 1 1
      lgsm/config-default/config-lgsm/wetserver/_default.cfg
  72. 16 10
      lgsm/functions/alert.sh
  73. 2 3
      lgsm/functions/alert_telegram.sh

+ 1 - 1
lgsm/config-default/config-lgsm/arkserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/arma3server/_default.cfg

@@ -55,7 +55,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/bb2server/_default.cfg

@@ -45,7 +45,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/bf1942server/_default.cfg

@@ -32,7 +32,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/bmdmserver/_default.cfg

@@ -45,7 +45,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/boserver/_default.cfg

@@ -38,7 +38,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/bsserver/_default.cfg

@@ -44,7 +44,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/ccserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/cod2server/_default.cfg

@@ -38,7 +38,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/cod4server/_default.cfg

@@ -38,7 +38,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/codserver/_default.cfg

@@ -38,7 +38,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/coduoserver/_default.cfg

@@ -38,7 +38,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/codwawserver/_default.cfg

@@ -38,7 +38,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/coserver/_default.cfg

@@ -63,7 +63,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/csczserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/csgoserver/_default.cfg

@@ -63,7 +63,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/csserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/cssserver/_default.cfg

@@ -45,7 +45,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/dabserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/dmcserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/dodserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/dodsserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/doiserver/_default.cfg

@@ -42,7 +42,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/dstserver/_default.cfg

@@ -43,7 +43,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/emserver/_default.cfg

@@ -45,7 +45,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/fctrserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/fofserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/gesserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/gmodserver/_default.cfg

@@ -55,7 +55,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/hl2dmserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/hldmserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/hldmsserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/hwserver/_default.cfg

@@ -53,7 +53,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/insserver/_default.cfg

@@ -47,7 +47,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/jc2server/_default.cfg

@@ -32,7 +32,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/kfserver/_default.cfg

@@ -44,7 +44,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/l4d2server/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/l4dserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/mcserver/_default.cfg

@@ -34,7 +34,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/mtaserver/_default.cfg

@@ -33,7 +33,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/mumbleserver/_default.cfg

@@ -33,7 +33,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/nmrihserver/_default.cfg

@@ -45,7 +45,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/ns2cserver/_default.cfg

@@ -51,7 +51,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/ns2server/_default.cfg

@@ -51,7 +51,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/opforserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/pcserver/_default.cfg

@@ -33,7 +33,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/pvkiiserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/pzserver/_default.cfg

@@ -35,7 +35,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/q2server/_default.cfg

@@ -37,7 +37,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/q3server/_default.cfg

@@ -37,7 +37,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/qlserver/_default.cfg

@@ -37,7 +37,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/qwserver/_default.cfg

@@ -36,7 +36,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/ricochetserver/_default.cfg

@@ -58,7 +58,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/roserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/rustserver/_default.cfg

@@ -57,7 +57,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/sbserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/sdtdserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/squadserver/_default.cfg

@@ -38,7 +38,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/ss3server/_default.cfg

@@ -36,7 +36,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/svenserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/terrariaserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/tf2server/_default.cfg

@@ -45,7 +45,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/tfcserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/ts3server/_default.cfg

@@ -28,7 +28,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/tuserver/_default.cfg

@@ -37,7 +37,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/twserver/_default.cfg

@@ -39,7 +39,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Updating | https://github.com/GameServerManagers/LinuxGSM/wiki/Update

+ 1 - 1
lgsm/config-default/config-lgsm/ut2k4server/_default.cfg

@@ -36,7 +36,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/ut3server/_default.cfg

@@ -48,7 +48,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/ut99server/_default.cfg

@@ -36,7 +36,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/utserver/_default.cfg

@@ -40,7 +40,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 1 - 1
lgsm/config-default/config-lgsm/wetserver/_default.cfg

@@ -32,7 +32,7 @@ channeltag=""
 # The chat id is the User or channel name or an integer like so:
 #   https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/38388851#38388851
 telegramalert="off"
-telegramapikey=""
+telegramtoken=""
 telegramchatid=""
 
 ## Backup | https://github.com/GameServerManagers/LinuxGSM/wiki/Backup

+ 16 - 10
lgsm/functions/alert.sh

@@ -9,31 +9,31 @@ local commandaction="Alert"
 
 fn_alert_test(){
 	fn_script_log_info "Sending test alert"
-	alertsubject="LinuxGSM - Test Alert - ${servername}"
-	alertbody="LinuxGSM test alert, how you read?"
+	alertsubject="LinuxGSM Alert- Test - ${servername}"
+	alertbody="Testing LinuxGSM Alert. No action to be taken."
 }
 
 fn_alert_restart(){
 	fn_script_log_info "Sending restart alert: ${executable} process not running"
-	alertsubject="LinuxGSM - Restarted - ${servername}"
+	alertsubject="LinuxGSM Alert - Restarted - ${servername}"
 	alertbody="${servicename} ${executable} process not running"
 }
 
 fn_alert_restart_query(){
 	fn_script_log_info "Sending restart alert: ${gsquerycmd}"
-	alertsubject="LinuxGSM - Restarted - ${servername}"
+	alertsubject="LinuxGSM Alert- Restarted - ${servername}"
 	alertbody="gsquery.py failed to query: ${gsquerycmd}"
 }
 
 fn_alert_update(){
 	fn_script_log_info "Sending update alert"
-	alertsubject="LinuxGSM - Updated - ${servername}"
+	alertsubject="LinuxGSM Alert- Updated - ${servername}"
 	alertbody="${servicename} received update"
 }
 
 fn_alert_permissions(){
 	fn_script_log_info "Sending permissions error alert"
-	alertsubject="LinuxGSM - Error - ${servername}"
+	alertsubject="LinuxGSM Alert - Error - ${servername}"
 	alertbody="${servicename} has permissions issues."
 }
 
@@ -66,17 +66,23 @@ elif [ "${pushbulletalert}" != "on" ]&&[ "${function_selfname}" == "command_test
 	fn_script_log_warn "Pushbullet alerts not enabled"
 elif [ -z "${pushbullettoken}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
 	fn_print_error_nl "Pushbullet token not set"
+	echo "	* https://github.com/GameServerManagers/LinuxGSM/wiki/Pushbullet"
 	fn_script_error_warn "Pushbullet token not set"
 fi
 
-if [ "${telegramalert}" == "on" ]&&[ -n "${telegramapikey}" ]; then
+if [ "${telegramalert}" == "on" ]&&[ -n "${telegramtoken}" ]; then
 	alert_telegram.sh
 elif [ "${telegramalert}" != "on" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
 	fn_print_warn_nl "Telegram Messages not enabled"
 	fn_script_log_warn "Telegram Messages not enabled"
-elif [ -z "${telegramapikey}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
-	fn_print_error_nl "Telegram API-key not set. Get one from @botfather"
-	fn_script_error_warn "Telegram API-key not set. Get one from @botfather"
+elif [ -z "${telegramtoken}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
+	fn_print_error_nl "Telegram token not set."
+	echo "	* https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram"
+	fn_script_error_warn "Telegram token not set."
+elif [ -z "${telegramchatid}" ]&&[ "${function_selfname}" == "command_test_alert.sh" ]; then
+	fn_print_error_nl "Telegram chat id not set."
+	echo "	* https://github.com/GameServerManagers/LinuxGSM/wiki/Telegram"
+	fn_script_error_warn "Telegram chat id not set. Get one from @botfather"
 fi
 
 if [ "${discordalert}" == "on" ]&&[ -n "${discordalert}" ]; then

+ 2 - 3
lgsm/functions/alert_telegram.sh

@@ -12,16 +12,15 @@ local function_selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 json=$(cat <<EOF
 {
 	"chat_id": "${telegramchatid}",
-	"text": "<b>🚨🚨🚨${alertsubject}🚨🚨🚨</b>\n\n${alertbody}",
+	"text": "🚨<b>${alertsubject}</b>\n\n${alertbody}",
 	"parse_mode": "HTML",
-	"disable_notification": true
 }
 EOF
 )
 
 fn_print_dots "Sending Telegram Message"
 sleep 1
-telegramsend=$(curl -sSL -H "Content-Type: application/json" -X POST -d """$json""" "https://api.telegram.org/bot${telegramapikey}/sendMessage" | grep -Po '(?<="description":").*?(?=")'|uniq)
+telegramsend=$(curl -sSL -H "Content-Type: application/json" -X POST -d """$json""" "https://api.telegram.org/bot${telegramtoken}/sendMessage" | grep -Po '(?<="description":").*?(?=")'|uniq)
 
 if [ -n "${telegramsend}" ]; then
 	fn_print_fail_nl "Sending Telegram Message: ${telegramsend}"