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 0d9757d68d90a421f37ec76cde3b3057a988aefc..6cb3bfdccd46b113185aa336dadbf095112fd4a5 100755 (executable)
--- a/acrobat-chiark-0.2.py
+++ b/acrobat-chiark-0.2.py
@@ -86,15 +86,15 @@ class Acrobat(SingleServerIRCBot):
            and (irc_lower(a[0]) == irc_lower(self.connection.get_nickname())
                 or irc_lower(a[0])[:-1] == irc_lower(self.connection.get_nickname())):
 
-            self.do_command(self.channel, string.strip(a[1]), public = 1)
+            self.do_command(nm_to_n(evt.source()), string.strip(a[1]), public = 1)
         if a[0].endswith("++"):
             self.karmaup(a[0])
         if a[0].endswith("--"):
             self.karmadown(a[0])
         if payload[0] == "!" and len(payload)>1:
-            self.do_command(self.channel, string.strip(payload[1:]), public=1)
+            self.do_command(nm_to_n(evt.source()), string.strip(payload[1:]), public=1)
         if payload[0] == "~" and len(payload)>1:
-            self.do_command(self.channel, string.strip(payload[1:]), public=1)
+            self.do_command(nm_to_n(evt.source()), string.strip(payload[1:]), public=1)
 
     # And now bot commands;
 
@@ -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?")