Merge pull request #275 from Manganeez/server_password_earlier

Per RFC 2812, PASS is required *before* NICK/USER.
sopel-irc · May 31, 2013 · 2d4d934 · 2d4d934
2 parents c9faadc + 35dcc2f
commit 2d4d934
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/willie/irc.py b/willie/irc.py
@@ -287,11 +287,12 @@ def handle_connect(self):
                                           % e)
                     os._exit(1)
             self.set_socket(self.ssl)
-        self.write(('NICK', self.nick))
-        self.write(('USER', self.user, '+iw', self.nick), self.name)
 
         if self.config.core.server_password is not None:
             self.write(('PASS', self.config.core.server_password))
+        self.write(('NICK', self.nick))
+        self.write(('USER', self.user, '+iw', self.nick), self.name)
+
         stderr('Connected.')
         self.last_ping_time = datetime.now();
         timeout_check_thread = threading.Thread(target=self._timeout_check)