Replaced twisted with new IRC backend.

Author: kgc

botmily/bot.py

@@ -2,26 +2,27 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import asyncore
 import pkgutil
 import re
+import socket
 import sys
 
-from twisted.words.protocols import irc
-
 from botmily import config
+from botmily import irc
 import plugins
 
-def splituser(user):
-    nick, remainder = user.split('!', 1)
-    ident, host = remainder.split('@', 1)
-    return nick, ident, host
-
-class Bot(irc.IRCClient):
+class bot():
     def __init__(self):
+        self.server = config.server
         self.nickname = config.name
         self.realname = b"Botmily https://github.com/kgc/botmily"
         self.channels = config.channels
 
+        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.socket.connect((self.server, 6667))
+        self.irc = irc.irc_handler(self.socket, self)
+
         print("Initializing plugins...")
         self.commands = {}
         self.triggers = []
@@ -31,21 +32,17 @@ def __init__(self):
             self.commands.update(plugin.commands)
             self.triggers.extend(plugin.triggers)
 
-    def signedOn(self):
-        print("Signed on to the IRC server")
-        for channel in self.channels:
-            self.join(str(channel))
+        asyncore.loop()
 
-    def joined(self, channel):
+    def join(self, channel):
         print("Joined channel " + channel)
 
-    def privmsg(self, user, channel, message):
-        nick, ident, host = splituser(user)
+    def privmsg(self, nick, user, host, channel, message):
         message_data = {"nick":    nick,
                         "user":    user,
                         "host":    host,
                         "channel": channel,
-                        "message": unicode(message, encoding='utf-8')}
+                        "message": message}
         command_match = re.match("\.([^ ]+) ?(.*)", message_data["message"])
         if command_match is not None:
             sent_command = command_match.group(1)
@@ -77,7 +74,7 @@ def say(self, nick, channel, output):
         if output is None:
             return
         if self.nickname == channel:
-            self.msg(str(nick), output.encode("utf-8"))
+            self.irc.privmsg(nick, output)
         else:
-            self.msg(channel, str(nick) + str(": ") + output.encode("utf-8"))
+            self.irc.privmsg(channel, nick + ": " + output)
 

botmily/irc.py

@@ -2,6 +2,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+import asynchat
+import time
 import unicodedata
 
 controls = {'bold':  '\u0002',
@@ -37,3 +39,77 @@ def bold(message):
 
 def color(message, color):
     return controls['color'] + colors[color] + message + controls['clear']
+
+def split_prefix(prefix):
+    nick, remainder = prefix[1:].split(b"!", 1)
+    user, host = remainder.split(b"@", 1)
+    return nick, user, host
+
+class irc_handler(asynchat.async_chat):
+    def __init__(self, sock, bot):
+        asynchat.async_chat.__init__(self, sock=sock)
+        self.ibuffer = b""
+        self.set_terminator(b"\r\n")
+        self.bot = bot
+        self.push(b"NICK botmily\r\n")
+        self.push(b"USER botmily 0 0 :Botmily\r\n")
+
+    def collect_incoming_data(self, data):
+        self.ibuffer += data
+
+    def found_terminator(self):
+        current_line = self.ibuffer
+        self.ibuffer = b""
+        prefix = None
+        if current_line[0] == b":":
+            prefix, null, current_line = current_line.partition(b" ")
+        command, null, params = current_line.partition(b" ")
+        if b":" in params:
+            other_params, null, trailing = params.partition(b":")
+            if len(other_params) == 0:
+                params = [trailing]
+            else:
+                params = other_params.split(" ") + [trailing]
+        else:
+            params = params.split(" ")
+        if command[0] >= b"0" and command[0] <= b"9":
+            if command == b"001":
+                for channel in self.bot.channels:
+                    self.join(str(channel))
+        else:
+            try:
+                handler = getattr(self, "raw_" + command)
+            except AttributeError:
+                return
+            handler(prefix, params)
+
+    def join(self, channel):
+        self.push(b"JOIN " + channel + b"\r\n")
+
+    def part(self, channel):
+        self.push(b"PART " + channel + b"\r\n")
+
+    def kick(self, channel, user):
+        self.push(b"KICK " + str(channel) + b" " + str(user) + b"\r\n")
+
+    def privmsg(self, receiver, message):
+        self.push(b"PRIVMSG " + str(receiver) + b" :" + message.encode("utf-8") + b"\r\n")
+
+    def notice(self, receiver, message):
+        self.push(b"NOTICE " + str(receiver) + b" :" + message.encode("utf-8") + b"\r\n")
+
+    def pong(self, message):
+        self.push(b"PONG " + message + b"\r\n")
+
+    def raw_PRIVMSG(self, prefix, params):
+        nick, user, host = split_prefix(prefix)
+        channel = params[0]
+        message = params[-1].decode("utf-8")
+        self.bot.privmsg(nick, user, host, channel, message)
+
+    def raw_PING(self, prefix, params):
+        self.pong(params[0])
+
+    def raw_JOIN(self, prefix, params):
+        self.bot.join(params[0])
+

main.py

@@ -2,27 +2,13 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from twisted.internet import protocol, reactor
-
 from botmily import bot
 from botmily import config
 from botmily import db
 
-class BotFactory(protocol.ClientFactory):
-    def __init__(self):
-        print("Creating the BotFactory")
-
-    def buildProtocol(self, addr):
-        print("Connected")
-        p = bot.Bot()
-        p.factory = self
-        return p
-
 if __name__ == '__main__':
     print("Starting the bot")
     config.getConfig()
     db.connect()
-    f = BotFactory()
-    print("Connecting...")
-    reactor.connectTCP(config.server, 6667, f)
-    reactor.run()
+    bot.bot()
+

plugins/privilege.py

@@ -7,7 +7,7 @@
 from botmily import irc
 
 def privilege(message_data, bot):
-    bot.kick(str(message_data["channel"]), str(message_data["nick"]));
+    bot.irc.kick(message_data["channel"], message_data["nick"]);
     return 'out'
 
 commands = {}

plugins/tell.py

@@ -20,7 +20,7 @@ def set_tell(message_data, bot):
 def get_tell(message_data, bot):
     row = db.execute("select nick_to, nick_from, message, time, channel from tells where nick_to=:nick_to", {"nick_to": message_data["nick"].lower()}).fetchone()
     if row:
-        bot.notice(str(message_data["nick"]), str(row[1]) + str(" said ") + str(datetime.timedelta(seconds=(time.time() - row[3]))) + str(" ago in ") + str(row[4]) + str(" the following: ") + row[2].encode('utf-8'))
+        bot.irc.notice(message_data["nick"], row[1] + " said " + str(datetime.timedelta(seconds=(time.time() - row[3]))) + " ago in " + row[4] + " the following: " + row[2])
         db.execute("delete from tells where nick_to=:nick_to and nick_from=:nick_from and message=:message and time=:time and channel=:channel", {"nick_to": row[0], "nick_from": row[1], "message": row[2], "time": row[3], "channel": row[4]})
         db.commit()