Changeset 40

Timestamp:

02/08/04 18:24:43 (5 years ago)

Author:

jajcus

Message:

- topic change support
- muc status codes handling updated for the latest PyXMPP
- SIGPIPE handling

Files:

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

trunk/jjigw.py

@@ -15 +15 @@
-from pyxmpp import ClientStream,JID,Iq,Presence,Message,StreamError
-import pyxmpp.jabberd
-
+,MucStatus
-
-class JJIGWFatalError(RuntimeError):
@@ -260 +260 @@
-        self.session=session
-        self.state=None
-        self.stanza=None
-        self.room_jid=None
-        self.config=session.network.get_channel_config(name)
@@ -270 +269 @@
-        self.users=[]
-        self.muc=0
+        self.requests={}
-
-    def sync_user(self,user):
@@ -303 +303 @@
-        self.debug("Joining channel %r" % (self.name,))
-        self.session.send("JOIN %s" % (self.name,))
-stanza
+requests["JOIN"]
-        self.state="join"
-        if stanza.get_join_info():
@@ -319 +319 @@
-                        status.encode(self.encoding,"replace")))
-            self.state=None
-            self.stanza=None
-        p=MucPresence(type="unavailable",fr=stanza.get_to(),to=stanza.get_from(),status=status)
-        self.session.component.send(p)
@@ -354 +353 @@
-                aff="none"
-                role="participant"
-status=status
+
-            if nick:
-                nick=unicode(user.nick,self.encoding,"replace")
-            it=MucItem(aff,role,user.jid(),nick=nick,actor=actor,reason=reason)
-            ui.add_item(it)
+            if status:
+                ui.add_item(MucStatus(status))
-        return p
-
@@ -406 +407 @@
-                pass
-        self.irc_cmd_MODE(prefix,command,params)
+        
+    def irc_cmd_482(self,prefix,command,params): # ERR_CHANOPRIVSNEEDED
+        stanza=self.requests.get("TOPIC")
+        if stanza:
+            m=stanza.make_error_response("forbidden")
+            try:
+                del self.requests["TOPIC"]
+            except KeyError:
+                pass
+        else:
+            m=Message(fr=self.room_jid.bare(),to=self.session.jid,
+                    type="error", error_cond="forbidden")
+        self.session.component.send(m)
+
+    def irc_cmd_332(self,prefix,command,params): # RPL_TOPIC
+        topic=params[1]
+        m=Message(fr=self.room_jid.bare(),to=self.session.jid,
+                type="groupchat", subject=unicode(topic,self.encoding,"replace"))
+        self.session.component.send(m)
+        
+    def irc_cmd_TOPIC(self,prefix,command,params):
+        if self.session.check_prefix(prefix):
+            try:
+                del self.requests["TOPIC"]
+            except KeyError:
+                pass
+        topic=params[1]
+        m=Message(fr=self.prefix_to_jid(prefix),to=self.session.jid,
+                type="groupchat", subject=unicode(topic,self.encoding,"replace"))
+        self.session.component.send(m)
-        
-    def irc_cmd_MODE(self,prefix,command,params):
@@ -482 +513 @@
-                    self.session.user.sync_delay-=1
-                self.state="joined"
-
+
+
+
+
-                self.session.send("MODE %s" % (self.name,))
-                self.session.send("WHO %s" % (self.name,))
@@ -526 +560 @@
-        else:
-            self.debug("Unknown CTCP command: %r %r" % (command,arg))
-
+
+
+
+
+
+
+
-    def __repr__(self):
-        return "<IRCChannel %r>" % (self.name,)
@@ -615 +655 @@
-        else:
-            return 0
+
+    def check_prefix(self,prefix):
+        if "!" in prefix:
+            nick=prefix.split("!",1)[0]
+        else:
+            nick=prefix
+        return normalize(nick)==normalize(self.nick)
-
-    def thread_run(self):
@@ -886 +933 @@
-            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:
@@ -925 +972 @@
-
-    def message_to_channel(self,stanza):
+        self.debug("message_to_channel(%r)" % (stanza,))
-        self.cond.acquire()
-        try:
@@ -932 +980 @@
-        finally:
-            self.cond.release()
+        self.debug("message_to_channel: no need to wait")
-        channel_name=stanza.get_to().node
+        self.debug("channel_name: %r" % (channel_name,))
-        channel_name=node_to_channel(channel_name,self.default_encoding)
+        self.debug("channel_name: %r" % (channel_name,))
-        if not channel_re.match(channel_name):
-            self.debug("Bad channel name: %r" % (channel_name,))
-            return
-        channel=self.channels.get(normalize(channel_name))
+        self.debug("channel: %r" % (channel,))
-        if channel:
-            encoding=channel.encoding
-        else:
-            encoding=self.default_encoding
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def message_to_user(self,stanza):
@@ -998 +1060 @@
-        self.shutdown=0
-        signal.signal(signal.SIGINT,self.signal_handler)
+        signal.signal(signal.SIGPIPE,self.signal_handler)
-        signal.signal(signal.SIGTERM,self.signal_handler)
-        self.irc_sessions={}