From 170af99fec4e1a595a1d1ade1b7b16e588c879d7 Mon Sep 17 00:00:00 2001
From: VistaPOWA <hegyi.mokka@gmail.com>
Date: Sat, 10 May 2014 00:36:24 +0200
Subject: [PATCH] Minor fix for the PR announcer.

Also includes a config file made specifically for /tg/ Sibyl.
---
 tools/PR_announcer_bot/config_for_tg.txt      |   8 ++++++++
 tools/PR_announcer_bot/sendkeys_ss13.exe      | Bin 12800 -> 12800 bytes
 .../PR_announcer_bot/sendkeys_ss13/Program.cs |   4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 tools/PR_announcer_bot/config_for_tg.txt

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 82af6be9543879ab56086eb44c3aea9a4d62579f..5985be093a8429e4d90732fb900717d4509ccc9d 100644
GIT binary patch
delta 400
zcmZojX-JvS!R!&1JF#1qao)t0;fx-W85z}C1zZ^zWF{*z=}eAfRA*c=xskD6u)&Q1
z3_O4&69X&5g3W?VuUQyNC;w#=mknV83QEo@Qek5#&@f<N;L@pQ5}#FM0OD#*R$`B0
zw3}SZE+^^(m(N3zU&!tWk(Y{s$?I~}aWgQmSQ;<_4F;LCS((F<QJ8_jQ3hl^0|QW&
zAs)!c+MLVzmDO^FI>>Po8Ky8=F|acvXh3+I8J!q78FDlsynT%B3|tITwLrW!iPMaJ
zKtuj)p3VPCfIX2RkD-LYYI2=|&gLBoDa-;QS#3K`^a%KG4_#9+=~VZ`%{nS4m~??5
z6%5i1a)1obWjerc(gE5W6zmdwZFO$s&)^z|J(KhHPYV2N%D!1qot;sr02*u{ZG9lN
g!bC+e#)i#-8gm&p^J)EJWm;giS<v7;<3s~?09_qi+yDRo

delta 368
zcmZojX-JvS!OY2*I<Z@pv2NnZa7K;EjEw56A6yt1WF{*z=}eAfRA+3N+{jojnBc|$
z1|C3?iGh`&VY499YZk`v$$#0z`OKJrf|9d}RM;2_Gz=yivPUr*OzvTqW3z(@>}U4`
z3#bd~a@BD&FtAt}FamXm&nk-A?8srsDCj5yGL?Y=D97LkWcY0E<^0NOS)mTHb0WhO
zMk@w(1_uoYZ!@D411E!zCWN<-(Vc;dp;QaRYm+$5=m#|9&gR|xuLLG<R#4^P&1Fbs
zNMy)kC}FVLd`%&ZS->|eVW9xqP5-&tYaJg>OiJ7AqjG{t7Z?h`AR|DokO4Z5#}$Zy
z)&~W<1YcX78~HQ1#$nIoy#12`|C+LGc2s9)6bgU_2}oNWh^;VDQH(KRbD_pu#>oau
W3Y+<~ez7t&m~9p`c+WV|fE@rb3so8b

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)