Changeset 135

Timestamp:

09/18/04 20:18:56 (4 years ago)

Author:

jajcus

Message:

- updated for recent PyXMPP changes (stanza constructors keyword arguments name changes)

Files:

• trunk/jjigw/channel.py (modified) (7 diffs)
• trunk/jjigw/component.py (modified) (3 diffs)
• trunk/jjigw/ircsession.py (modified) (8 diffs)

trunk/jjigw/channel.py

@@ -71 +71 @@
-        if not self.state or (self.muc and not_in_muc):
-            return
-=self.room_jid.bare(),to=self.session.jid,
+om_jid=self.room_jid.bare(),to_jid=self.session.jid,stanza_
-        self.session.component.send(m)
-
@@ -99 +99 @@
-                        status.encode(self.encoding,"replace")))
-            self.state=None
-type="unavailable",fr=stanza.get_to(),to
+stanza_type="unavailable",from_jid=stanza.get_to(),to_jid
-        self.session.component.send(p)
-        for u in self.users:
@@ -116 +116 @@
-    def get_user_presence(self,user,nick=None,actor=None,reason=None,status=None):
-        if self.state and user in self.users:
-=self.nick_to_jid(user.nick),to
-
-type="unavailable",fr=self.nick_to_jid(user.nick),to
+om_jid=self.nick_to_jid(user.nick),to_jid
+
+stanza_type="unavailable",from_jid=self.nick_to_jid(user.nick),to_jid
-        if self.muc:
-            if user in self.modes.get("o",[]):
@@ -222 +222 @@
-            m=r.stanza.make_error_response(condition)
-        else:
-=self.room_jid.bare(),to
-
+om_jid=self.room_jid.bare(),to_jid
+stanza_
-        self.session.component.send(m)
-
-    def irc_cmd_331(self,prefix,command,params): # RPL_NOTOPIC
-=self.room_jid.bare(),to=self.session.jid, 
+om_jid=self.room_jid.bare(),to_jid=self.session.jid, stanza_
-        self.session.component.send(m)
-
-    def irc_cmd_332(self,prefix,command,params): # RPL_TOPIC
-        topic=remove_evil_characters(params[1])
-=self.room_jid.bare(),to
-
+om_jid=self.room_jid.bare(),to_jid
+stanza_
-        self.session.component.send(m)
-
@@ -239 +239 @@
-        self.requests.get("TOPIC")
-        topic=remove_evil_characters(params[1])
-=self.prefix_to_jid(prefix),to
-
+om_jid=self.prefix_to_jid(prefix),to_jid
+stanza_
-        self.session.component.send(m)
-
@@ -395 +395 @@
-            self.CTCP(prefix,body[1:-1])
-        else:
-type="groupchat",fr=self.prefix_to_jid(prefix),to
+stanza_type="groupchat",from_jid=self.prefix_to_jid(prefix),to_jid
-                    body=remove_evil_characters(strip_colors(body)))
-            self.session.component.send(m)
@@ -405 +405 @@
-            arg=None
-        if command=="ACTION":
-type="groupchat",fr=self.prefix_to_jid(prefix),to
+stanza_type="groupchat",from_jid=self.prefix_to_jid(prefix),to_jid
-                    body="/me "+remove_evil_characters(strip_colors(arg)))
-            self.session.component.send(m)

trunk/jjigw/component.py

@@ -208 +208 @@
-        remove=iq.xpath_eval("r:query/r:remove",{"r":"jabber:iq:register"})
-        if remove:
-=iq.get_to(),to=iq.get_from(),
+om_jid=iq.get_to(),to_jid=iq.get_from(),stanza_
-                    body=u"Unregistered")
-            self.stream.send(m)
-=iq.get_to(),to=iq.get_from(),
+om_jid=iq.get_to(),to_jid=iq.get_from(),stanza_
-            self.stream.send(p)
-=iq.get_to(),to=iq.get_from(),
+om_jid=iq.get_to(),to_jid=iq.get_from(),stanza_
-            self.stream.send(p)
-            return 1
@@ -226 +226 @@
-        else:
-            password=u""
-=iq.get_to(),to=iq.get_from(),
+om_jid=iq.get_to(),to_jid=iq.get_from(),stanza_
-                body=u"Registered with username '%s' and password '%s'"
-                " (both ignored)" % (username,password))
-        self.stream.send(m)
-=iq.get_to(),to=iq.get_from(),
+om_jid=iq.get_to(),to_jid=iq.get_from(),stanza_
-        self.stream.send(p)
-        iq=iq.make_result_response()
@@ -245 +245 @@
-        if not to.node:
-            if sess:
-=fr,fr=to,body="Connected to: %s" % (sess.server,),
+_jid=fr,from_jid=to,body="Connected to: %s" % (sess.server,),stanza_
-            else:
-=fr,fr=to,body="Not connected",
+_jid=fr,from_jid=to,body="Not connected",stanza_
-            return 1
-        if not to.resource and (to.node[0] in "#+!" or to.node.startswith(",amp,")):

trunk/jjigw/ircsession.py

@@ -187 +187 @@
-            self.lock.release()
-        for j in self.used_for:
-=j,to=self.jid,
+om_jid=j,to_jid=self.jid,stanza_
-            self.component.send(p)
-        self.used_for=[]
@@ -381 +381 @@
-            fr=user.jid()
-        body=unicode(params[1],self.default_encoding,"replace")
-type=typ,fr=fr,to
+stanza_type=typ,from_jid=fr,to_jid
-        self.component.send(m)
-
@@ -493 +493 @@
-            if not fr:
-                fr=self.prefix_to_jid(source)
-
-=self.jid,fr
+stanza_
+_jid=self.jid,from_jid
-        else:
-            fr=self.prefix_to_jid(source)
-
-=self.jid,fr
+stanza_
+_jid=self.jid,from_jid
-        self.component.send(m)
-
@@ -516 +516 @@
-            prefix=None
-        fr=JID('#',self.network.jid.domain,prefix)
-=self.jid,fr=fr,body=body,
+_jid=self.jid,from_jid=fr,body=body,stanza_
-        self.component.send(m)
-
@@ -526 +526 @@
-        nick=unicode(self.nick,self.default_encoding,"replace")
-        fr=JID('#',self.network.jid.domain,nick)
-=self.jid,fr=fr,body=body,
+_jid=self.jid,from_jid=fr,body=body,stanza_
-        self.component.send(m)
-
-    def pass_message_to_raw_channel(self,msg):
-        fr=JID('#',self.network.jid.domain,None)
-=self.jid,fr=fr,body=msg,
+_jid=self.jid,from_jid=fr,body=msg,stanza_
-        self.component.send(m)
-
@@ -564 +564 @@
-        if to not in self.used_for:
-            self.used_for.append(to)
-=to,to
+om_jid=to,to_jid
-        self.component.send(p)
-
@@ -594 +594 @@
-            self.used_for.append(to)
-        fr=stanza.get_from()
-=fr,fr
+_jid=fr,from_jid
-        self.component.send(p)
-
@@ -608 +608 @@
-        if send_response:
-            p=Presence(
-
-
-
+stanza_
+_jid
+om_jid
-                );
-            self.component.send(p)