X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=blobdiff_plain;f=commands.py;h=e8293ef868e23f08b9b4b5cba21bcf0a491dd041;hb=bf3a96b6d4f1b0d392a7bcf2487a7b5280525988;hp=8c22d293a09429aa2fab542f132376c17b1cb4e0;hpb=87650c67dbdf05e88db791be3df68dc8d3ae58e8;p=irc.git

diff --git a/commands.py b/commands.py
index 8c22d29..e8293ef 100755
--- a/commands.py
+++ b/commands.py
@@ -503,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)