From dd0be21d08eabe720ccc24d59edf6eae1d4ea11f Mon Sep 17 00:00:00 2001
From: mtrp12 <6695345+mtrp12@users.noreply.github.com>
Date: Wed, 11 Aug 2021 12:53:37 +0800
Subject: [PATCH 1/3] added addition info on how to get your chat id

---
 README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b0bfe5b..d513c15 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,14 @@ To add your bot's channel to Telegram, you'll need to click the link from Botfat
 
 # Getting your Chat ID
 
-The next step will be to get your chat ID. The easiest way I've found to do this is using the test message in your new Bot channel. Go to the following page: `https://api.telegram.org/bot<token>/getUpdates` (where `<token>` is the token you got in the last step). Upon heading to the site, you'll see a JSON-formatted list of information. Look specifically for the table `chat`, which has an `id` field. Copy that ID (including any negative symbols).
+The next step will be to get your chat ID. The easiest way I've found to do this is using the test message in your new Bot channel. Go to the following page: `https://api.telegram.org/bot<token>/getUpdates` (where `<token>` is the token you got in the last step). Upon heading to the site, you'll see a JSON-formatted list of information. Look specifically for the table `chat`, which has an `id` field. Copy that ID (including any negative symbols). If you only see mostly empty JSON without any chat id like this -
+```json
+{"ok":true,"result":[]}
+```
+Send a message to the bot using the following format, to get updated JSON.
+```
+/start your_msg_whatever
+```
 
 # Putting it all together
 
@@ -77,4 +84,4 @@ end
 ```
 Please be aware that if you utilize this feature so you can bot and pass bot checks, you are a bad person and you will be caught eventually. This feature is only to be used so you do not miss any tells for legitimate reasons. Besides, the Imms have other ways to botcheck you, too.
 
-If you have any questions or difficulties, please feel free to drop me (Crowley) a tell or a note on personal board.
\ No newline at end of file
+If you have any questions or difficulties, please feel free to drop me (Crowley) a tell or a note on personal board.

From 422c8375f51046db965876cde208f75b1a9cf80a Mon Sep 17 00:00:00 2001
From: mtrp12 <6695345+mtrp12@users.noreply.github.com>
Date: Wed, 11 Aug 2021 16:25:05 +0800
Subject: [PATCH 2/3] added global quest alert

---
 Telegram.xml | 43 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/Telegram.xml b/Telegram.xml
index 5cfaf1d..3d7c98b 100644
--- a/Telegram.xml
+++ b/Telegram.xml
@@ -22,8 +22,22 @@
         </alias>
     </aliases>
 
-    <!--  Script  -->
+    <!--  Triggers  -->
 
+    <triggers>
+        <trigger 
+            name="gqAlert" 
+            enabled="y" 
+            keep_evaluating="y" 
+            group="Notifier" 
+            match="^Global Quest\: Global quest \# (.*?) has been declared for levels ([0-9]*?) to ([0-9]*?)\.$" 
+            regexp="y" 
+            script="sendAlert" 
+            sequence="100" >
+        </trigger>
+    </triggers>
+
+    <!--  Script  -->
 
     <script>
         <![CDATA[
@@ -77,9 +91,32 @@ function pageRequest(req, protocol)
     end
 end
 
+function getGQAlertMessage(wildcards)
+    -- get gq information
+    local gqid = wildcards[1]
+    local lower = tonumber(wildcards[2])
+    local upper = tonumber(wildcards[3])
+
+    -- get character information
+    local ret, datastring = CallPlugin("3e7dedbe37e44942dd46d264", "gmcpdata_as_string", "char.status")
+    pcall(loadstring("status_table = "..datastring))
+    local char_level = tonumber(status_table["level"])
+
+    -- verification and message creation
+    if char_level >= lower and char_level <= upper then
+        return "GQ ALERT#" .. gqid
+    end
+end
+
 function sendAlert(name, line, wildcards)
-    local wc = wildcards[1] or ""
-    if name ~= "TestAlert" then
+    if name == "gqAlert" then
+        msg = getGQAlertMessage(wildcards)
+        if msg == nil then
+            return
+        end
+        msg = string.format(alertFormat, url.escape(msg))
+    elseif name ~= "TestAlert" then
+        local wc = wildcards[1] or ""
         for _,v in ipairs(triggerLines) do
             if name == v.name then
                 msg = string.format(alertFormat, url.escape(v.message .. wc))

From 06ea1aaf90a9fe8231a590e0475f008c2f4195bf Mon Sep 17 00:00:00 2001
From: mtrp12 <6695345+mtrp12@users.noreply.github.com>
Date: Wed, 18 Aug 2021 15:32:47 +0800
Subject: [PATCH 3/3] streamlined global quest alert

You only get notification for global quests you can take part in. With this newfound knowledge, removed all the level checking and incorporated the trigger in the triggerLines table.
---
 Telegram.xml | 41 ++---------------------------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/Telegram.xml b/Telegram.xml
index 3d7c98b..4fca8cd 100644
--- a/Telegram.xml
+++ b/Telegram.xml
@@ -22,21 +22,6 @@
         </alias>
     </aliases>
 
-    <!--  Triggers  -->
-
-    <triggers>
-        <trigger 
-            name="gqAlert" 
-            enabled="y" 
-            keep_evaluating="y" 
-            group="Notifier" 
-            match="^Global Quest\: Global quest \# (.*?) has been declared for levels ([0-9]*?) to ([0-9]*?)\.$" 
-            regexp="y" 
-            script="sendAlert" 
-            sequence="100" >
-        </trigger>
-    </triggers>
-
     <!--  Script  -->
 
     <script>
@@ -51,6 +36,7 @@ local triggerLines = {
 {name = "donationDouble", match ="\\[    10 minutes of double exp started courtesy of donations being open   \\]", message = "Double for 10 minutes!"},
 {name = "hourDouble", match = "^For the next 60 minutes all experience is doubled!!$", message = "Hour of double!"},
 {name = "questAlert", match = "^QUEST: You may now quest again.", message = "Quest time!"},
+{name = "gqAlert", match = "^Global Quest\: Global quest \# (.*?) has been declared(.*?)$", message = "GQ ALERT#"},
 }
 
 
@@ -91,31 +77,8 @@ function pageRequest(req, protocol)
     end
 end
 
-function getGQAlertMessage(wildcards)
-    -- get gq information
-    local gqid = wildcards[1]
-    local lower = tonumber(wildcards[2])
-    local upper = tonumber(wildcards[3])
-
-    -- get character information
-    local ret, datastring = CallPlugin("3e7dedbe37e44942dd46d264", "gmcpdata_as_string", "char.status")
-    pcall(loadstring("status_table = "..datastring))
-    local char_level = tonumber(status_table["level"])
-
-    -- verification and message creation
-    if char_level >= lower and char_level <= upper then
-        return "GQ ALERT#" .. gqid
-    end
-end
-
 function sendAlert(name, line, wildcards)
-    if name == "gqAlert" then
-        msg = getGQAlertMessage(wildcards)
-        if msg == nil then
-            return
-        end
-        msg = string.format(alertFormat, url.escape(msg))
-    elseif name ~= "TestAlert" then
+    if name ~= "TestAlert" then
         local wc = wildcards[1] or ""
         for _,v in ipairs(triggerLines) do
             if name == v.name then