servus understands https URLs as well

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 0f958e277ac8c47b7976446fdfe4234e1deb3093..db8ace677d2c1a16ebb519d4fd508cdd8fc12dd3 100644 (file)
--- a/commands.py
+++ b/commands.py
@@ -331,7 +331,7 @@ urlcomplaints = ["a contemporary","an interesting","a fascinating","an overused"
 ### Deal with /msg bot url or ~url in channel
 def urlq(bot, cmd, nick, conn, public,urldb):
   if (not urlre.search(cmd)):
-    bot.automsg(False,nick,"Please use 'url' only with http URLs")
+    bot.automsg(False,nick,"Please use 'url' only with http or https URLs")
     return
 
   urlstring=urlre.search(cmd).group(1)
@@ -406,9 +406,13 @@ def twitterq(bot,cmd,nick,conn,public,twitapi):
 def getTweet(urlstring,twitapi):
   parts = string.split(urlstring,'/')
   tweetID = parts[-1]
-  status = twitapi.GetStatus(tweetID)
-  tweeter_screen = status.user.screen_name
-  tweeter_name = status.user.name
-  tweetText = status.text
-  stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
+  try:
+    status = twitapi.GetStatus(tweetID)
+    tweeter_screen = status.user.screen_name
+    tweeter_name = status.user.name
+    tweetText = status.text
+    stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
+  except twitter.TwitterError:
+    terror = sys.exc_info()
+    stringout = "Twitter error: %s" % terror[1].__str__()
   return stringout