new trout from Senji

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 8c22d293a09429aa2fab542f132376c17b1cb4e0..140d7c5faf27ee866728a123dfb3a34f5166f1c5 100755 (executable)
--- a/commands.py
+++ b/commands.py
@@ -61,6 +61,9 @@ def fish_quota(pond):
             pond.cur_fish=pond.max_fish
         pond.quotatime=time.time()
 
+# List of things the bot might be called to work round the self-trouting code
+synonyms=["itself","the bot","themself"]
+
 # trout someone, or flirt with them
 def troutq(bot, cmd, nick, conn, public, cfg):
     fishlist=cfg[0]
@@ -86,7 +89,7 @@ def troutq(bot, cmd, nick, conn, public, cfg):
     trout_msg = random.choice(fishlist)
     fishpond.last=trout_msg
     # The bot won't trout or flirt with itself;
-    if irc_lower(me) == irc_lower(target):
+    if irc_lower(me) == irc_lower(target) or irc_lower(target) in synonyms:
         target = nick
     # There's a chance the game may be given away if the request was not
     # public...
@@ -132,7 +135,7 @@ def slashq(bot, cmd, nick, conn, public, cfg):
        return
     # The bot won't slash with itself, instead slashing the requester
     for n in [0,1]:
-       if irc_lower(me) == irc_lower(who[n]):
+       if irc_lower(me) == irc_lower(who[n]) or irc_lower(who[n]) in synonyms:
            who[n] = nick
     # Perhaps someone asked to slash themselves with the bot then we get
     if irc_lower(who[0]) == irc_lower(who[1]):
@@ -503,8 +506,16 @@ def getTweet(urlstring,twitapi):
   tweetID = parts[-1]
   try:
     status = twitapi.GetStatus(tweetID)
-    tweeter_screen = status.user.screen_name.encode('UTF-8', 'replace')
-    tweeter_name = status.user.name.encode('UTF-8', 'replace')
+    print status, type(status), status=={}
+    if status == {}:
+        return "twitapi.GetStatus returned nothing :-("
+    if status.user == None and status.text == None:
+        return "Empty status object returned :("
+    if status.user is not None:
+        tweeter_screen = status.user.screen_name.encode('UTF-8', 'replace')
+        tweeter_name = status.user.name.encode('UTF-8', 'replace')
+    else:
+        tweeter_screen = "[not returned]" ; tweeter_name = "[not returned]"
     tweetText = status.text.encode('UTF-8', 'replace')
     tweetText = tweetText.replace('\n',' ')
     stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)