diff --git a/tools/PR_announcer_bot/config_for_tg.txt b/tools/PR_announcer_bot/config_for_tg.txt new file mode 100644 index 00000000000..4bf44fb2adc --- /dev/null +++ b/tools/PR_announcer_bot/config_for_tg.txt @@ -0,0 +1,8 @@ +serverip = 127.0.0.1 //SS13 server IP +serverport = 1337 //SS13 server port +commskey = fill_your_own_in //API key of the server +GitHub_bot_name = TheGhostOfWhibyl1 //It'll get the data from this bot +IRC_bot_name = PR_Listener_Bot //This'll be our name +IRC_server = irc.rizon.net:6670 //format - server:port +IRC_channel = #coderbus +Nickserv_auth = _NONE_ //leave _NONE_ if your bot does not require nickserv authentication \ No newline at end of file diff --git a/tools/PR_announcer_bot/sendkeys_ss13.exe b/tools/PR_announcer_bot/sendkeys_ss13.exe index 82af6be9543..5985be093a8 100644 Binary files a/tools/PR_announcer_bot/sendkeys_ss13.exe and b/tools/PR_announcer_bot/sendkeys_ss13.exe differ diff --git a/tools/PR_announcer_bot/sendkeys_ss13/Program.cs b/tools/PR_announcer_bot/sendkeys_ss13/Program.cs index dbfd53c90f6..ebb05c7f153 100644 --- a/tools/PR_announcer_bot/sendkeys_ss13/Program.cs +++ b/tools/PR_announcer_bot/sendkeys_ss13/Program.cs @@ -232,7 +232,7 @@ namespace sendkeys_ss13 { if (msg.Length >= 4) { - if (msg[3] == "Merge") //Someone is merging something + if (msg[3] == "Merge" && msg[1] != "meant:") //Someone is merging something { mergedPR = msg[6]; if (merge_archive != null) @@ -249,7 +249,7 @@ namespace sendkeys_ss13 } } } - if (msg[2] == "closed") + if (msg[2] == "closed" && msg[1] != "meant:") { merge_archive = msg; if (mergedPR != null)