Changeset 137

Show
Ignore:
Timestamp:
09/18/04 20:35:44 (4 years ago)
Author:
jajcus
Message:

- simple channel browsing (only for channels listed in config file, patch by Petr Mensik)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/jjigw/component.py

    r135 r137  
    2525 
    2626import pyxmpp.jabberd 
    27 from pyxmpp import Presence,Message,StreamError,FatalStreamError 
     27from pyxmpp import Presence,Message,StreamError,FatalStreamError,JID 
    2828from pyxmpp.jabber.muc import MUC_ADMIN_NS,MUC_NS 
    2929from pyxmpp.jabber.muc import MucPresence,MucIq,MucAdminQuery 
     
    182182        q=iq.new_query("jabber:iq:version") 
    183183        q.newTextChild(q.ns(),"name","Jajcus' Jabber-IRC Gateway") 
    184         q.newTextChild(q.ns(),"version","0.1") 
     184        q.newTextChild(q.ns(),"version","0.2.2") 
    185185        self.stream.send(iq) 
    186186        return 1 
     
    383383            if fr in self.config.admins or fr.bare() in self.config.admins: 
    384384                DiscoItem(di,to,"admin","Administrator tree") 
     385            if network.channels:  
     386                for c in network.channels.values(): 
     387                    if not c.browseable: 
     388                        continue 
     389                    desc = c.description 
     390                    if not c.description: 
     391                        desc = "%s IRC channel on %s IRC network" % (c.name,network.name) 
     392                    jid = JID(c.name,to,None); 
     393                    DiscoItem(di,jid,None,desc); 
    385394            return di 
    386395        if node=="admin" or node.startswith("admin."):