X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/1015276a43c848652cb7cb7ec71ac6c0e95caa83..16458c45ef1a3d02f4266b875c35b48aa72a2a36:/twitter/ircbot.py diff --git a/twitter/ircbot.py b/twitter/ircbot.py index 9310d0c..9113377 100644 --- a/twitter/ircbot.py +++ b/twitter/ircbot.py @@ -36,7 +36,7 @@ oauth_token_file: from __future__ import print_function -BOT_VERSION = "TwitterBot 1.6.1 (http://mike.verdone.ca/twitter)" +BOT_VERSION = "TwitterBot 1.9.1 (http://mike.verdone.ca/twitter)" CONSUMER_KEY = "XryIxN3J2ACaJs50EizfLQ" CONSUMER_SECRET = "j7IuDCNjftVY8DBauRdqXs4jDl5Fgk1IJRag8iE" @@ -87,7 +87,7 @@ except ImportError: "This module requires python irclib available from " + "https://github.com/sixohsix/python-irclib/zipball/python-irclib3-0.4.8") -OAUTH_FILE = os.environ.get('HOME', '') + os.sep + '.twitterbot_oauth' +OAUTH_FILE = os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.twitterbot_oauth' def debug(msg): # uncomment this for debug text stuff @@ -154,6 +154,7 @@ class TwitterBot(object): self.irc = irclib.IRC() self.irc.add_global_handler('privmsg', self.handle_privmsg) self.irc.add_global_handler('ctcp', self.handle_ctcp) + self.irc.add_global_handler('umode', self.handle_umode) self.ircServer = self.irc.server() self.sched = Scheduler( @@ -226,6 +227,19 @@ class TwitterBot(object): elif args[0] == 'CLIENTINFO': conn.ctcp_reply(source, "CLIENTINFO PING VERSION CLIENTINFO") + def handle_umode(self, conn, evt): + """ + QuakeNet ignores all your commands until after the MOTD. This + handler defers joining until after it sees a magic line. It + also tries to join right after connect, but this will just + make it join again which should be safe. + """ + args = evt.arguments() + if (args and args[0] == '+i'): + channels = self.config.get('irc', 'channel').split(',') + for channel in channels: + self.ircServer.join(channel) + def privmsg_channels(self, msg): return_response=True channels=self.config.get('irc','channel').split(',')