Changeset 62

Timestamp:

02/16/04 19:46:59 (5 years ago)

Author:

jajcus

Message:

- /OP (moderator privileges granting in MUC)

Files:

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

trunk/jjigw.py

@@ -87 +87 @@
-def normalize(s):
-    return s.translate(irc_translate_table)
-
-
-class ConnectConfig:
@@ -263 +262 @@
-        channel,user,host,server,nick,flags,rest=params
-        fullname=rest.split(None,1)[1]
-        self.debug("Channel: %r" % (channel,))
-        if channel and channel!="*":
-            channel=self.session.channels.get(normalize(channel))
@@ -277 +275 @@
-            self.user=user
-            if channel:
-                self.debug("Channel: %r" % (channel,))
-                self.join_channel(channel)
-                if "@" in flags:
@@ -395 +392 @@
-        else:
-            p=MucPresence(type="unavailable",fr=self.nick_to_jid(user.nick),to=self.session.jid)
-        self.debug("%r modes: %r" % (self.name,self.modes))
-        if self.muc:
-            if user in self.modes.get("o",[]):
@@ -406 +402 @@
-                aff="none"
-                role="visitor"
+            elif user in self.users:
+                aff="none"
+                role="participant"
-            else:
-                aff="none"
-participant
+none
-            ui=p.make_muc_userinfo()
-            if nick:
@@ -465 +464 @@
-        
-    def irc_cmd_482(self,prefix,command,params): # ERR_CHANOPRIVSNEEDED
-
+,"MODE"
-
-    def irc_cmd_461(self,prefix,command,params): # ERR_NEEDMOREPARAMS
-
+,"MODE"
-
-    def irc_cmd_403(self,prefix,command,params): # ERR_NOSUCHCHANNEL
@@ -477 +476 @@
-    
-    def irc_cmd_441(self,prefix,command,params): # ERR_USERNOTINCHANNEL
-
+,"MODE"
-        
-    def irc_cmd_442(self,prefix,command,params): # ERR_NOTONCHANNEL
-        self.irc_error_response(prefix,command,params,["TOPIC","KICK"],"forbidden")
-
+    def irc_cmd_472(self,prefix,command,params): # ERR_UNKNOWNMODE
+        self.irc_error_response(prefix,command,params,["MODE"],"feature-not-implemented")
+
-    def irc_cmd_477(self,prefix,command,params): # ERR_NOCHANMODES
-
+,"MODE"
-
-    def irc_error_response(self,prefix,command,params,requests,condition):
@@ -529 +531 @@
-                        unicode(iuser,self.encoding,"replace")),
-                0)
+        if self.session.check_prefix(prefix) and len(params)>=3:
+            r=self.requests.get("MODE",(params[1],normalize(params[2])))
+            if r:
+                reply=r.stanza.make_result_response()
+                self.session.component.send(reply)
-        self.irc_mode_changed(prefix,command,params)
-
@@ -568 +575 @@
-
-    def user_mode_changed(self,user,actor,mode):
-        self.debug("user_mode_changed(%r,%r,%r)" % (user,actor,mode))
-        if actor:
-            actor_jid=self.nick_to_jid(actor.nick)
@@ -640 +646 @@
-
-    def irc_cmd_PRIVMSG(self,prefix,command,params):
-
+
+
+
+
+
+
-        if not self.state or len(params)<2:
-            self.debug("ignoring it")
@@ -671 +682 @@
-
-    def kick_user(self,nick,reason,stanza):
+        nick=nick.encode(self.encoding,"strict")
-        self.session.send("KICK %s %s :%s" % (self.name,nick,reason))
-        self.requests.add("KICK",stanza,nick)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def __repr__(self):
-        return "<IRCChannel %r>" % (self.name,)
@@ -930 +956 @@
-        if command and numeric_re.match(command):
-            params=params[1:]
-        self.debug("Prefix: %r Command: %r params: %r" % (prefix,command,params))
-        self.lock.release()
-        try:
@@ -945 +970 @@
-            else:
-                for u in self.used_for:
-                    self.debug("u: %r" % (u,))
-                    if u.bare()==self.network.jid:
-                        self.pass_input_to_user(prefix,command,params)
@@ -966 +990 @@
-
-    def irc_cmd_PRIVMSG(self,prefix,command,params):
-
+
+
+
+
+
+
-        if len(params)<2:
-            self.debug("ignoring it")
@@ -1076 +1105 @@
-            return
-        user=self.get_user(params[4])
-        self.debug("Got user %r" % (user.nick,))
-        user.whoreply(params)
-        self.debug("%r on channels %r" % (user.nick,user.channels.keys()))
-        for c in user.channels.keys():
-            self.debug("announcing %r presence on channel %r" % (user.nick,c))
-            channel=user.channels[c]
-            self.component.send(channel.get_user_presence(user))
-   
-    def send_error_message(self,source,cond,text):
-        self.debug("send_error_message(self,%r,%r,%r)" % (source,cond,text))
-        text=remove_evil_characters(text)
-        user=self.get_user(source)
@@ -1091 +1116 @@
-            self.unregister_user(user)
-        if user and user.current_thread:
-            self.debug("user.current_thread: %r" % (user.current_thread,))
-            typ,thread,fr=user.current_thread
-            if not fr:
@@ -1099 +1123 @@
-        else:
-            fr=self.prefix_to_jid(source)
-            self.debug("from: %r" % (fr,))
-            m=Message(type="error",error_cond=cond,error_text=text,
-                    to=self.jid,fr=fr)
@@ -1150 +1173 @@
-
-    def message_to_channel(self,stanza):
-        self.debug("message_to_channel(%r)" % (stanza,))
-        self.cond.acquire()
-        try:
@@ -1163 +1185 @@
-            self.component.send(e)
-            return
-        self.debug("channel: %r" % (channel,))
-        if channel:
-            encoding=channel.encoding
-        else:
-            encoding=self.default_encoding
-        self.debug("encoding: %r" % (encoding,))
-        subject=stanza.get_subject()
-        self.debug("subject: %r" % (subject,))
-        if subject and channel:
-            channel.change_topic(subject,stanza.copy())
-        body=stanza.get_body()
-        self.debug("body: %r" % (body,))
-        if body:
-            body=body.encode(encoding,"replace")
-            body=body.replace("\n"," ").replace("\r"," ")
-            self.debug("body: %r" % (body,))
-            if body.startswith("/me "):
-                body="\001ACTION "+body[4:]+"\001"
-            self.send("PRIVMSG %s :%s" % (channel.name,body))
-            channel.irc_cmd_PRIVMSG(self.nick,"PRIVMSG",[channel.name,body])
-        self.debug("message_to_channel: done")
-
-    def message_to_user(self,stanza):
@@ -1204 +1220 @@
-            debug("Bad nick: %r" % (nick,))
-            return
-        self.debug("Nick: %r" % (nick,))
-        user=self.get_user(nick)
-        user.current_thread=stanza.get_type(),stanza.get_thread(),thread_fr
@@ -1406 +1421 @@
-        if item.role=="none":
-            channel.kick_user(item.nick,item.reason,iq)
+        elif item.role=="moderator":
+            channel.op_user(item.nick,iq)
-        else:
-            self.debug("Unknown admin action")