Changeset 58

Timestamp:

02/15/04 12:08:26 (5 years ago)

Author:

jajcus

Message:

- Request and RequestQueue? classes
- confirm kick with <iq type="result"/> response

Files:

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

trunk/jjigw.py

@@ -14 +14 @@
-import Queue
-import time
+from types import StringType,UnicodeType
-
-from pyxmpp import ClientStream,JID,Iq,Presence,Message,StreamError
@@ -170 +171 @@
-            self.doc.freeDoc()
-
+
+class Request:
+    def __init__(self,command,stanza,args=None):
+        self.command=command
+        self.stanza=stanza
+        self.args=args
+    def match(self,commands,args=None):
+        if type(commands) in (StringType,UnicodeType):
+            commands=[commands]
+        for c in commands:
+            if not self.command==c:
+                continue
+            if args and not self.args==args:
+                continue
+            return 1
+        return 0
+
+class RequestQueue:
+    def __init__(self,maxsize):
+        self.maxsize=maxsize
+        self.requests=[]
+    def get(self,commands,args=None):
+        for r in self.requests:
+            if r.match(commands):
+                try:
+                    self.requests.remove(r)
+                except ValueError:
+                    pass
+                return r
+        return None
+    def add(self,command,stanza,args=None):
+        r=Request(command,stanza,args)
+        self.requests.append(r)
+        if len(self.requests)>10:
+            self.requests=self.requests[-10:]
+
-class IRCUser:
-    def __init__(self,session,nick,user="",host=""):
@@ -289 +326 @@
-        self.users=[]
-        self.muc=0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    def sync_user(self,user,status=None):
@@ -338 +360 @@
-        self.debug("Joining channel %r" % (self.name,))
-        self.session.send("JOIN %s" % (self.name,))
-add_request
+requests.add
-        self.state="join"
-        if stanza.get_join_info():
@@ -465 +487 @@
-
-    def irc_error_response(self,prefix,command,params,requests,condition):
-get_reques
+requests.ge
-        if command:
-            m=stanza.make_error_response(condition)
@@ -484 +506 @@
-
-    def irc_cmd_TOPIC(self,prefix,command,params):
-get_request(("TOPIC",)
+requests.get("TOPIC"
-        topic=remove_evil_characters(params[1])
-        m=Message(fr=self.prefix_to_jid(prefix),to=self.session.jid,
@@ -580 +602 @@
-                    self.session.user.sync_delay-=1
-                self.state="joined"
-get_request(("JOIN",)
+requests.get("JOIN"
-                self.session.send("MODE %s" % (self.name,))
-                self.session.send("WHO %s" % (self.name,))
@@ -612 +634 @@
-                0)
-        user.leave_channel(self,status=307)
+        if user and self.session.check_prefix(prefix):
+            r=self.requests.get("KICK",user.nick)
+            if r:
+                iq=r.stanza.make_result_response()
+                self.session.component.send(iq)
-
-    def irc_cmd_PRIVMSG(self,prefix,command,params):
@@ -642 +669 @@
-        topic=topic.replace("\n"," ").replace("\r"," ")
-        self.session.send("TOPIC %s :%s" % (self.name,topic))
-add_request
+requests.add
-
-    def kick_user(self,nick,reason,stanza):
-        self.session.send("KICK %s %s :%s" % (self.name,nick,reason))
-add_request("KICK",stanza
+requests.add("KICK",stanza,nick
-   
-    def __repr__(self):