Changeset 50

Timestamp:

02/14/04 12:00:06 (5 years ago)

Author:

jajcus

Message:

- ERR_CANNOTSENDTOCHAN and ERR_NOSUCHNICK handling

Files:

• trunk/jjigw.py (modified) (8 diffs)

trunk/jjigw.py

@@ -70 +70 @@
-    s=n.encode(encoding,"strict")
-    s=escape_node_string(s)
-k
+
-        raise ValueError,"Bad nick name: %r" % (s,)
-    return s
@@ -78 +78 @@
-    n=unicode(s,encoding,"strict")
-    return n
+
-
-irc_translate_table=string.maketrans(
@@ -648 +649 @@
-            self.lock.release()
-
-
+,create=1
-        if "!" in prefix:
-            nick=prefix.split("!",1)[0]
@@ -658 +659 @@
-        if self.users.has_key(nnick):
-            return self.users[nnick]
+        if not create:
+            return None
-        user=IRCUser(self,prefix)
-        self.register_user(user)
@@ -675 +678 @@
-            nick=prefix
-        return normalize(nick)==normalize(self.nick)
+
+    def prefix_to_jid(self,prefix):
+        if channel_re.match(prefix):
+            node=channel_to_node(prefix,self.default_encoding)
+            return JID(node,self.network.jid.domain,None)
+        else:
+            if "!" in prefix:
+                nick,user=prefix.split("!",1)
+            else:
+                nick=prefix 
+                user=""
+            node=nick_to_node(nick,self.default_encoding)
+            resource=unicode(user,self.default_encoding,"replace")
+            return JID(node,self.network.jid.domain,resource)
-
-    def thread_run(self):
@@ -938 +955 @@
-            return
-        pass
+
+    def irc_cmd_401(self,prefix,command,params): # ERR_NOSUCHNICK
+        if len(params)>1:
+            nick,msg=params[:2]
+            error_text="%s: %s" % (nick,msg)
+        else:
+            error_text=None
+        self.send_error_message(params[0],"recipient-unavailable",error_text)
- 
+    def irc_cmd_404(self,prefix,command,params): # ERR_CANNOTSENDTOCHAN
+        if len(params)>1:
+            error_text=params[1]
+        else:
+            error_text=None
+        self.send_error_message(params[0],"forbidden",error_text)
+
-    def irc_cmd_QUIT(self,prefix,command,params):
-        user=self.get_user(prefix)
@@ -957 +989 @@
-            channel=user.channels[c]
-            self.component.send(channel.get_user_presence(user))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def pass_input_to_user(self,prefix,command,params):
-        if command in self.commands_dont_show:
@@ -1051 +1102 @@
-            nick=to.node
-            thread_fr=None
-
+,self.network
-        if not self.network.valid_nick(nick):
-            debug("Bad nick: %r" % (nick,))