X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=blobdiff_plain;f=commands.py;h=474a4420e4edfca1921431bf733b1a1fe05f8445;hp=19f8c4b6327f9c577c6792fd91370603cd0d1c5a;hb=aeb973cc930f3b9649658d6f0047601a9a9ab017;hpb=30d4a98347868e23712ffa5f85fd473cc394ef65

diff --git a/commands.py b/commands.py
index 19f8c4b..474a442 100755
--- 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...
@@ -125,13 +128,14 @@ def slashq(bot, cmd, nick, conn, public, cfg):
 	return
     me = bot.connection.get_nickname()
     slash_msg = random.choice(fishlist)
+    fishpond.last=slash_msg
     # The bot won't slash people with themselves
     if irc_lower(who[0]) == irc_lower(who[1]):
 	conn.notice(nick, "oooooh no missus!")
 	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]):
@@ -436,7 +440,6 @@ def urlq(bot, cmd, nick, conn, public,urldb):
         conn.privmsg(bot.channel,"%s remarks: %s" % (nick," ".join(cmd.split()[1:])))
       else:
         conn.privmsg(bot.channel,"(via %s) %s"%(nick," ".join(cmd.split()[1:])))
-      bot.automsg(False,nick,"That URL was unique; I have posted it into IRC")
     urldb[url]=UrlLog(url,nick)
 
 ### Deal with URLs spotted in channel
@@ -502,8 +505,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)