From f41d26d63b97534477b34aa8fc02955c6f9c103e Mon Sep 17 00:00:00 2001
From: Sam Dodrill <shadow.h511@gmail.com>
Date: Tue, 18 Feb 2014 00:02:11 -0500
Subject: [PATCH] Don't JOIN until 376 verb

---
 .gitignore      |  1 +
 tox-irc-sync.py | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1269488
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+data
diff --git a/tox-irc-sync.py b/tox-irc-sync.py
index 521f166..85d83a0 100644
--- a/tox-irc-sync.py
+++ b/tox-irc-sync.py
@@ -39,7 +39,6 @@ class SyncBot(Tox):
         self.irc.connect((IRC_HOST, IRC_PORT))
         self.irc.send("NICK %s\r\n" % NICK)
         self.irc.send("USER %s %s bla :%s\r\n" % (IDENT, IRC_HOST, REALNAME))
-        self.irc.send("JOIN %s\r\n" % CHANNEL)
 
     def connect(self):
         print('connecting...')
@@ -93,7 +92,7 @@ class SyncBot(Tox):
                                 CHANNEL, line, re.S)
                         if rx:
                             print('IRC> %s: %s' % rx.groups())
-                            msg = '%s> %s' % rx.groups()
+                            msg = '%s\ %s' % rx.groups()
                             content = rx.group(2)
 
                             if content == '^syncbot' or \
@@ -101,7 +100,7 @@ class SyncBot(Tox):
                                 self.irc_send('PRIVMSG %s :%s\r\n' %
                                         (CHANNEL, self.get_address()))
                             elif content[1:].startswith('ACTION '):
-                                action = '%s> %s' % (rx.group(1),
+                                action = '\%s %s' % (rx.group(1),
                                         rx.group(2)[8:-1])
                                 self.sent = action
                                 self.ensure_exe(self.group_action_send,
@@ -114,6 +113,8 @@ class SyncBot(Tox):
                         l = line.rstrip().split()
                         if l[0] == "PING":
                            self.irc_send("PONG %s\r\n" % l[1])
+                        if l[1] == "376":
+                           self.irc.send("JOIN %s\r\n" % CHANNEL)
 
                 self.do()
         except KeyboardInterrupt:
@@ -147,13 +148,13 @@ class SyncBot(Tox):
         if message != self.sent:
             name = self.group_peername(groupnumber, friendgroupnumber)
             print('TOX> %s: %s' % (name, message))
-            self.irc_send('PRIVMSG %s :%s> %s\r\n' % (CHANNEL, name, message))
+            self.irc_send('PRIVMSG %s :%s\ %s\r\n' % (CHANNEL, name, message))
 
     def on_group_action(self, groupnumber, friendgroupnumber, action):
         if action != self.sent:
             name = self.group_peername(groupnumber, friendgroupnumber)
             print('TOX> %s: %s' % (name, action))
-            self.irc_send('PRIVMSG %s :\x01ACTION %s> %s\x01\r\n' %
+            self.irc_send('PRIVMSG %s :\x01ACTION \%s %s\x01\r\n' %
                     (CHANNEL, name, action))
 
     def on_friend_request(self, pk, message):