Changeset 56

Timestamp:

02/14/04 20:19:13 (5 years ago)

Author:

jajcus

Message:

- IRCUser.descr() - "nick(user@host)"
- improved request handling
- more IRC error responses handled
- basic kicking (no <iq type="response"/> yet)

Files:

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

trunk/jjigw.py

@@ -18 +18 @@
-import pyxmpp.jabberd
-from pyxmpp.jabber.muc import MucPresence,MucX,MucUserX,MucItem,MUC_NS,MucStatus
+from pyxmpp.jabber.muc import MucIq,MucAdminQuery,MUC_ADMIN_NS
-
-class JJIGWFatalError(RuntimeError):
@@ -187 +188 @@
-        self.current_thread=None
-
-
+
+
+
+
+
+
+
-        if self.sync_delay>0:
-            return
-        elif self.sync_delay<0:
-            self.debug("Warning: %r.sync_delay<0" % (self,))
-
+,status=status
-
-    def join_channel(self,channel):
@@ -198 +205 @@
-        self.sync_in_channel(channel)
-
-
+,status=None
-        try:
-            del self.channels[normalize(channel.name)]
-
+,status=status
-        except KeyError:
-            pass
@@ -282 +289 @@
-        self.users=[]
-        self.muc=0
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if user.channels.has_key(normalize(self.name)):
-            if user not in self.users:
@@ -298 +320 @@
-                        % (unicode(user.nick,self.encoding,"replace"),))
-        if self.state:
-
+,status=status
-            self.session.component.send(p)
-
@@ -316 +338 @@
-        self.debug("Joining channel %r" % (self.name,))
-        self.session.send("JOIN %s" % (self.name,))
-requests["JOIN"]=stanza.copy(
+add_request("JOIN",stanza
-        self.state="join"
-        if stanza.get_join_info():
@@ -422 +444 @@
-        
-    def irc_cmd_482(self,prefix,command,params): # ERR_CHANOPRIVSNEEDED
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else:
-            m=Message(fr=self.room_jid.bare(),to=self.session.jid,
-"forbidden"
+condition
-        self.session.component.send(m)
-
+    def irc_cmd_331(self,prefix,command,params): # RPL_NOTOPIC
+        m=Message(fr=self.room_jid.bare(),to=self.session.jid, type="groupchat", subject=u"")
+        self.session.component.send(m)
+        
-    def irc_cmd_332(self,prefix,command,params): # RPL_TOPIC
-        topic=remove_evil_characters(params[1])
@@ -439 +482 @@
-                type="groupchat", subject=unicode(topic,self.encoding,"replace"))
-        self.session.component.send(m)
-
+
-    def irc_cmd_TOPIC(self,prefix,command,params):
-
-
-
-
-
+
-        topic=remove_evil_characters(params[1])
-        m=Message(fr=self.prefix_to_jid(prefix),to=self.session.jid,
@@ -458 +497 @@
-        if params_str:
-            params_str=" "+params_str
-
+
+
+
+
+
+
-                % (unicode(params[1],self.encoding,"replace"),
-                        unicode(params_str,self.encoding,"replace"),
-
+
+
-                0)
-        self.irc_mode_changed(prefix,command,params)
@@ -535 +580 @@
-                    self.session.user.sync_delay-=1
-                self.state="joined"
-
-
-
-
+
-                self.session.send("MODE %s" % (self.name,))
-                self.session.send("WHO %s" % (self.name,))
@@ -557 +599 @@
-        self.send_notice_message(u"%s has left" 
-                % (unicode(user.nick,self.encoding,"replace"),))
+
+    def irc_cmd_KICK(self,prefix,command,params):
+        actor=self.session.get_user(prefix)
+        user=self.session.get_user(params[1])
+        try:
+            self.users.remove(user)
+        except ValueError:
+            pass
+        self.send_notice_message(u"%s was kicked by %s" 
+                % (unicode(user.descr(),self.encoding,"replace"),
+                    unicode(actor.descr(),self.encoding,"replace")),
+                0)
+        user.leave_channel(self,status=307)
-
-    def irc_cmd_PRIVMSG(self,prefix,command,params):
@@ -587 +642 @@
-        topic=topic.replace("\n"," ").replace("\r"," ")
-        self.session.send("TOPIC %s :%s" % (self.name,topic))
-
+
+
+
+
+
-   
-    def __repr__(self):
@@ -1056 +1115 @@
-        self.channels[normalize(channel.name)]=channel
-
+    def get_channel(self,jid):
+        channel_name=jid.node
+        channel_name=node_to_channel(channel_name,self.default_encoding)
+        if not channel_re.match(channel_name):
+            self.debug("Bad channel name: %r" % (channel_name,))
+            return None
+        return self.channels.get(normalize(channel_name))
+
-    def message_to_channel(self,stanza):
-        self.debug("message_to_channel(%r)" % (stanza,))
@@ -1065 +1132 @@
-        finally:
-            self.cond.release()
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        self.debug("channel: %r" % (channel,))
-        if channel:
@@ -1092 +1155 @@
-            if body.startswith("/me "):
-                body="\001ACTION "+body[4:]+"\001"
-
-
-
+
+
-        self.debug("message_to_channel: done")
-
@@ -1263 +1325 @@
-        self.stream.set_iq_get_handler("query","jabber:iq:register",self.get_register)
-        self.stream.set_iq_set_handler("query","jabber:iq:register",self.set_register)
+        self.stream.set_iq_set_handler("query",MUC_ADMIN_NS,self.set_muc_admin)
-        self.disco_info.add_feature("jabber:iq:version")
-        self.disco_info.add_feature("jabber:iq:register")
@@ -1272 +1335 @@
-        self.stream.set_message_handler("normal",self.message)
-
+    def set_muc_admin(self,iq):
+        to=iq.get_to()
+        fr=iq.get_from()
+        if not to.node:
+            self.debug("admin request sent to JID without a node")
+            iq=iq.make_error_response("feature-not-implemented")
+            self.stream.send(iq)
+            return 1
+        if to.resource or not (to.node[0] in "#+!" or to.node.startswith(",amp,")):
+            self.debug("admin request sent not to a channel")
+            iq=iq.make_error_response("not-acceptable")
+            self.stream.send(iq)
+            return 1
+            
+        iq=MucIq(iq)
+        sess=self.irc_sessions.get(fr.as_unicode())
+        if not sess:
+            self.debug("User session not found")
+            iq=iq.make_error_response("recipient-unavailable")
+            self.stream.send(iq)
+            return 1
+
+        channel=sess.get_channel(to)
+        if not channel:
+            self.debug("Channel not found")
+            iq=iq.make_error_response("recipient-unavailable")
+            self.stream.send(iq)
+            return 1
+
+        query=iq.get_muc_child()
+        if not isinstance(query,MucAdminQuery):
+            self.debug("Bad query content")
+            iq=iq.make_error_response("bad-request")
+            self.stream.send(iq)
+            return 1
+
+        items=query.get_items()
+        if not items:
+            self.debug("No items in query")
+            iq=iq.make_error_response("bad-request")
+            self.stream.send(iq)
+            return 1
+        item=items[0] 
+        if item.role=="none":
+            channel.kick_user(item.nick,item.reason,iq)
+        else:
+            self.debug("Unknown admin action")
+            iq=iq.make_error_response("feature-not-implemented")
+            self.stream.send(iq)
+            return 1
+ 
-    def get_version(self,iq):
-        iq=iq.make_result_response()