new trout from rjk

[irc.git] / commands.py

diff --git a/commands.py b/commands.py
index 114f7b0e65a705832f08c068705c8e65a6ad1368..d22655e7fab72147322a6a03afba55e1fd1a1d4a 100644 (file)
--- a/commands.py
+++ b/commands.py
@@ -214,6 +214,9 @@ def googleq(bot, cmd, nick, conn, public):
 
 # Look up the definition of something using google
 def defineq(bot, cmd, nick, conn, public):
+    #this doesn't work any more
+    bot.automsg(public,nick,"'define' is broken because google are bastards :(")
+    return
     cmdrest = string.join(cmd.split()[1:])
     targ = ("http://www.google.co.uk/search?q=define%%3A%s&ie=utf-8&oe=utf-8"
             % urllib.quote_plus(cmdrest))
@@ -413,6 +416,7 @@ def getTweet(urlstring,twitapi):
     tweeter_screen = status.user.screen_name.encode('UTF-8', 'replace')
     tweeter_name = status.user.name.encode('UTF-8', 'replace')
     tweetText = status.text.encode('UTF-8', 'replace')
+    tweetText = tweetText.replace('\n',' ')
     stringout = "tweet by %s (%s): %s" %(tweeter_screen,tweeter_name,tweetText)
   except twitter.TwitterError:
     terror = sys.exc_info()