Make the telling-on-you message be on the same line

[irc.git] / acrobat-chiark-0.2.py

diff --git a/acrobat-chiark-0.2.py b/acrobat-chiark-0.2.py
index 03971b051dfc0b0431527ef6b27856bf5884b8b7..6cb3bfdccd46b113185aa336dadbf095112fd4a5 100755 (executable)
--- a/acrobat-chiark-0.2.py
+++ b/acrobat-chiark-0.2.py
@@ -180,10 +180,12 @@ class Acrobat(SingleServerIRCBot):
                 # ...and touchy.
                 if me.lower() == target.lower():
                     target = nick
-                conn.action(self.channel, trout_msg % target)
                 if public == 0:
-                    if random.random() <= 0.1:
-                        conn.action(self.channel, "notes %s is conducting a whispering campaign" % nick)
+                    if random.random() <= 0.25:
+                        trout_msg+= ' (at the instigation of '
+                        trout_msg+=nick
+                        trout_msg+= ')'
+                conn.action(self.channel, trout_msg % target)
             except IndexError:
                 conn.notice(nick, "Who do you wish me to trout?")