X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=blobdiff_plain;f=commands.py;h=e8293ef868e23f08b9b4b5cba21bcf0a491dd041;hb=14c9710d21ac83abd718791a73bc0341082d22e9;hp=7232bd1292fd022061481bb3defe3f01b3d7e1f3;hpb=6f1d44855cb937c9c6a6e59cb57524a28a7461df;p=irc.git

diff --git a/commands.py b/commands.py
old mode 100644
new mode 100755
index 7232bd1..e8293ef
--- a/commands.py
+++ b/commands.py
@@ -125,6 +125,7 @@ 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!")
@@ -321,7 +322,7 @@ def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
 	if len(ans[0])==1:
 	    bot.automsg(public,nick,ans[0])
 	else:
-	    bot.automsg(public,nick,"Added %s: %s" % (ans[0][2].isoformat(),ans[0][1]))
+	    bot.automsg(public,nick,"Modified %s: %s" % (ans[0][2].isoformat(),ans[0][1]))
     elif len(ans)>4:
 	bot.automsg(public,nick,"I found %d matches, which is too many. Please be more specific!" % (len(ans)) )
     else:
@@ -329,7 +330,7 @@ def blameq(bot,cmd,nick,conn,public,fish,tdb,tdbk,fdb,fdbk,sdb,sdbk):
 	    if len(a)==1:
 	        bot.automsg(public,nick,a)
 	    else:
-	        bot.automsg(public,nick,"'%s' added on %s: %s" % (a[0],a[2].isoformat(),a[1]))
+	        bot.automsg(public,nick,"'%s' modified on %s: %s" % (a[0],a[2].isoformat(),a[1]))
 
 ### say to msg/channel            
 def sayq(bot, cmd, nick, conn, public):
@@ -502,8 +503,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)