moparisthebest
/
xmpp-ircd
mirror of https://github.com/moparisthebest/xmpp-ircd
1
0
Fork 0
Code Issues Releases Wiki Activity

2to3-2.7

This commit is contained in:
Joshua Judson Rosen 2021-06-02 23:09:20 -04:00
parent 7e8e466cfe
commit f1f4c0b0cd
1 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
xmpp-ircd.py
View File

@ -32,7 +32,7 @@ import getopt, sys
import daemon import daemon
import logging import logging
import logging.handlers import logging.handlers
import urllib import urllib.request, urllib.parse, urllib.error
import string import string
import random import random
@ -137,7 +137,7 @@ class ClientThread(Thread):
@return: fixed nick @return: fixed nick
""" """
fixednick = unicode(nick) fixednick = str(nick)
fixednick = fixednick.replace(' ', '_') fixednick = fixednick.replace(' ', '_')
fixednick = fixednick.replace('!', '_') fixednick = fixednick.replace('!', '_')
fixednick = fixednick.replace(':', '_') fixednick = fixednick.replace(':', '_')
@ -148,7 +148,7 @@ class ClientThread(Thread):
# fix roomname # fix roomname
if self.fullRoomJid: if self.fullRoomJid:
return channel return channel
channel = unicode(channel) channel = str(channel)
return channel[0:channel.find('@')] return channel[0:channel.find('@')]
def fixChannelCommand(self, arguments): def fixChannelCommand(self, arguments):
@ -169,7 +169,7 @@ class ClientThread(Thread):
@return valid Host part @return valid Host part
""" """
return "%s@%s/%s" % (urllib.quote(jid.getNode()), urllib.quote(jid.getDomain()), urllib.quote(jid.getResource())) return "%s@%s/%s" % (urllib.parse.quote(jid.getNode()), urllib.parse.quote(jid.getDomain()), urllib.parse.quote(jid.getResource()))
def makeNickFromJID(self, jid, is_muc_jid): def makeNickFromJID(self, jid, is_muc_jid):
@ -186,11 +186,11 @@ class ClientThread(Thread):
if is_muc_jid and not jid.getResource(): if is_muc_jid and not jid.getResource():
return self.fixNick(jid.getNode()) return self.fixNick(jid.getNode())
jid_string = u'' jid_string = ''
if not is_muc_jid: if not is_muc_jid:
jid_string = jid.getStripped() jid_string = jid.getStripped()
else: else:
jid_string = unicode(jid) jid_string = str(jid)
if not is_muc_jid: if not is_muc_jid:
nick = self.fixNick(jid.getNode()) nick = self.fixNick(jid.getNode())
@ -210,7 +210,7 @@ class ClientThread(Thread):
@return: JID corresponding to nick @return: JID corresponding to nick
""" """
if self.UIDtoJID.has_key(nick): if nick in self.UIDtoJID:
return self.UIDtoJID[nick] return self.UIDtoJID[nick]
if nick.find('@') != -1: if nick.find('@') != -1:
return JID(nick) return JID(nick)
@ -265,7 +265,7 @@ class ClientThread(Thread):
sta = 'H' sta = 'H'
show = '' show = ''
role = '' role = ''
if self.mucs.has_key(room_jid): if room_jid in self.mucs:
show = self.mucs[room_jid][jid]['show'] show = self.mucs[room_jid][jid]['show']
role = self.mucs[room_jid][jid]['role'] role = self.mucs[room_jid][jid]['role']
if show in ['away', 'xa', 'dnd']: if show in ['away', 'xa', 'dnd']:
@ -311,7 +311,7 @@ class ClientThread(Thread):
lines.append(':%s JOIN :#%s'% (snick, channel)) lines.append(':%s JOIN :#%s'% (snick, channel))
lines.append(':%s MODE #%s +n' % (self.server, channel)) lines.append(':%s MODE #%s +n' % (self.server, channel))
for jid in self.mucs[room_jid].iterkeys(): for jid in list(self.mucs[room_jid].keys()):
nick = snick nick = snick
if (jid.getResource() != nick): if (jid.getResource() != nick):
nick = self.makeNickFromJID(jid, True) nick = self.makeNickFromJID(jid, True)
@ -548,7 +548,7 @@ class ClientThread(Thread):
@type jid: JID @type jid: JID
@param jid: Jabber id of the user whose vcard is quered @param jid: Jabber id of the user whose vcard is quered
""" """
nick = self.makeNickFromJID(jid, self.mucs.has_key(jid.getStripped())) nick = self.makeNickFromJID(jid, jid.getStripped() in self.mucs)
lines = [ lines = [
':%s 311 %s %s %s %s * : %s' % ( ':%s 311 %s %s %s %s * : %s' % (
self.server, self.server,
@ -651,7 +651,7 @@ class ClientThread(Thread):
@param show: status @param show: status
@param status: status @param status: status
""" """
for muc in self.mucs.keys(): for muc in list(self.mucs.keys()):
p=Presence(to='%s/%s' % ( p=Presence(to='%s/%s' % (
muc, muc,
self.nickname)) self.nickname))
@ -722,7 +722,7 @@ class ClientThread(Thread):
# todo: looks at roster which doesn't exist, fix this # todo: looks at roster which doesn't exist, fix this
if not jid.getResource(): if not jid.getResource():
# try to find match in roster # try to find match in roster
rosternicks = self.mucs['roster'].keys() rosternicks = list(self.mucs['roster'].keys())
for x in rosternicks: for x in rosternicks:
if x.getStripped() == jid.getStripped(): if x.getStripped() == jid.getStripped():
jid = x jid = x
@ -795,8 +795,8 @@ class ClientThread(Thread):
# check that our rooms are still alive # check that our rooms are still alive
if self.pingCounter == 5: if self.pingCounter == 5:
self.pingCounter = 0 self.pingCounter = 0
for muc in self.mucs.keys(): for muc in list(self.mucs.keys()):
if self.disconnectedMucs.has_key(muc): if muc in self.disconnectedMucs:
if self.disconnectedMucs[muc] < 5: if self.disconnectedMucs[muc] < 5:
self.disconnectedMucs[muc] = self.disconnectedMucs[muc] + 1 self.disconnectedMucs[muc] = self.disconnectedMucs[muc] + 1
else: else:
@ -816,7 +816,7 @@ class ClientThread(Thread):
self.connected = False self.connected = False
if jt.connected: if jt.connected:
# leave all rooms # leave all rooms
for room in self.mucs.keys(): for room in list(self.mucs.keys()):
self.sendToXMPP(Presence(to='%s/%s' % (room, self.nickname), self.sendToXMPP(Presence(to='%s/%s' % (room, self.nickname),
typ='unavailable', typ='unavailable',
status='')) status=''))
@ -882,7 +882,7 @@ class ClientThread(Thread):
if mess.getType() == 'groupchat': if mess.getType() == 'groupchat':
private = False private = False
MUC = self.mucs.has_key(jid.getStripped()) MUC = jid.getStripped() in self.mucs
if private: if private:
self.ircCommandPRIVMSG(jid, MUC, True, text, ts) self.ircCommandPRIVMSG(jid, MUC, True, text, ts)
@ -1011,7 +1011,7 @@ class ClientThread(Thread):
card[c.getName()] = c.getData() card[c.getName()] = c.getData()
self.ircCommandNOTICE('** Vcard information for %s **' % iq.getFrom()) self.ircCommandNOTICE('** Vcard information for %s **' % iq.getFrom())
for key in card.keys(): for key in list(card.keys()):
for line in card[key].splitlines(): for line in card[key].splitlines():
self.ircCommandNOTICE('%s: %s' % (key, line)) self.ircCommandNOTICE('%s: %s' % (key, line))
@ -1025,12 +1025,12 @@ class ClientThread(Thread):
""" """
jid = iq.getFrom() jid = iq.getFrom()
# this can mess things up, fix later # this can mess things up, fix later
if self.roomPingQueue.has_key(jid): if jid in self.roomPingQueue:
del (self.roomPingQueue[jid]) del (self.roomPingQueue[jid])
# room errors # room errors
errornum = iq.getErrorCode() errornum = iq.getErrorCode()
if jid in self.mucs.keys(): if jid in list(self.mucs.keys()):
if errornum == '404' and jid not in self.disconnectedMucs.keys(): if errornum == '404' and jid not in list(self.disconnectedMucs.keys()):
self.ircCommandERRORMUC(404, 'MUC DISCONNECTED', jid) self.ircCommandERRORMUC(404, 'MUC DISCONNECTED', jid)
self.ircCommandPRIVMSG(JID("%s/%s" % (jid, 'telepaatti')), self.ircCommandPRIVMSG(JID("%s/%s" % (jid, 'telepaatti')),
True, True,
@ -1065,7 +1065,7 @@ class ClientThread(Thread):
name = c.getName() name = c.getName()
if name == 'item': if name == 'item':
mucusers.append(JID(c.getAttrs()['jid'])) mucusers.append(JID(c.getAttrs()['jid']))
if self.mucs.has_key(jid): if jid in self.mucs:
pass # we keep track of users else where pass # we keep track of users else where
self.ircCommandWHO(mucusers, jid) self.ircCommandWHO(mucusers, jid)
return return
@ -1091,7 +1091,7 @@ class ClientThread(Thread):
""" """
roomname = iq.getFrom() roomname = iq.getFrom()
# this can mess things up, fix # this can mess things up, fix
if self.roomPingQueue.has_key(roomname): if roomname in self.roomPingQueue:
del (self.roomPingQueue[roomname]) del (self.roomPingQueue[roomname])
return return
@ -1106,7 +1106,7 @@ class ClientThread(Thread):
name = c.getName() name = c.getName()
if name == 'identity': if name == 'identity':
atrs = c.getAttrs() atrs = c.getAttrs()
if atrs.has_key('type') and atrs.has_key('category'): if 'type' in atrs and 'category' in atrs:
if atrs['type'] == 'text' and \ if atrs['type'] == 'text' and \
atrs['category'] == 'conference': atrs['category'] == 'conference':
MUC = True MUC = True
@ -1178,8 +1178,8 @@ class ClientThread(Thread):
room = JID(pres.getFrom().getStripped()) room = JID(pres.getFrom().getStripped())
# for affiliation and role changes # for affiliation and role changes
if self.mucs.has_key(room) and \ if room in self.mucs and \
nick in self.mucs[room].keys(): nick in list(self.mucs[room].keys()):
xrole = self.mucs[room][nick]['role'] xrole = self.mucs[room][nick]['role']
xaffiliation = self.mucs[room][nick]['affiliation'] xaffiliation = self.mucs[room][nick]['affiliation']
if role != xrole: # role has changed if role != xrole: # role has changed
@ -1204,14 +1204,14 @@ class ClientThread(Thread):
self.nickChangeInMucs[room] = {'checked': True, self.nickChangeInMucs[room] = {'checked': True,
'changed': True} 'changed': True}
# check if we have checked all MUCs # check if we have checked all MUCs
for muc in self.nickChangeInMucs.keys(): for muc in list(self.nickChangeInMucs.keys()):
if not self.nickChangeInMucs[muc]['checked']: if not self.nickChangeInMucs[muc]['checked']:
return # no need to go any further return # no need to go any further
# check if it changed in all MUCs # check if it changed in all MUCs
for muc in self.nickChangeInMucs.keys(): for muc in list(self.nickChangeInMucs.keys()):
if not self.nickChangeInMucs[muc]['changed']: if not self.nickChangeInMucs[muc]['changed']:
changedMucs = list() changedMucs = list()
for gei in self.nickChangeInMucs.keys(): for gei in list(self.nickChangeInMucs.keys()):
if self.nickChangeInMucs[gei]['changed']: if self.nickChangeInMucs[gei]['changed']:
changedMucs.append(gei) changedMucs.append(gei)
self.nickChangeInMucs = {} self.nickChangeInMucs = {}
@ -1260,21 +1260,21 @@ class ClientThread(Thread):
else: else:
self.ircCommandERROR('MUC error not yet implemented (%d %s)' % (erc, er)) self.ircCommandERROR('MUC error not yet implemented (%d %s)' % (erc, er))
else: else:
joining = self.joinQueue.has_key(room) joining = room in self.joinQueue
inroom = self.mucs.has_key(room) inroom = room in self.mucs
if ptype == 'unavailable': if ptype == 'unavailable':
self.printDebug('unavailable') self.printDebug('unavailable')
if nick.getResource() == self.nickname: if nick.getResource() == self.nickname:
self.printDebug('our self') self.printDebug('our self')
if joining: if joining:
del (self.joinQueue[room]) del (self.joinQueue[room])
elif self.nickChangeInMucs.has_key(room): elif room in self.nickChangeInMucs:
# between nick change # between nick change
self.printDebug('we are between nick change') self.printDebug('we are between nick change')
return return
elif inroom: elif inroom:
self.ircCommandPART(nick, ' left') self.ircCommandPART(nick, ' left')
if nick in self.mucs[room].keys(): if nick in list(self.mucs[room].keys()):
del (self.mucs[room]) del (self.mucs[room])
else: else:
line = "%s is doing something" % nick line = "%s is doing something" % nick
@ -1317,18 +1317,18 @@ class ClientThread(Thread):
pass pass
else: # someone else else: # someone else
if joining: if joining:
if nick not in self.joinQueue[room]['users'].keys(): if nick not in list(self.joinQueue[room]['users'].keys()):
self.joinQueue[room]['users'][nick] = { 'role': role, self.joinQueue[room]['users'][nick] = { 'role': role,
'affiliation': affiliation, 'affiliation': affiliation,
'show' : show, 'show' : show,
'status': status} 'status': status}
elif inroom: elif inroom:
new_user = nick not in self.mucs[room].keys() new_user = nick not in list(self.mucs[room].keys())
self.mucs[room][nick] = { 'role': role, self.mucs[room][nick] = { 'role': role,
'affiliation': affiliation, 'affiliation': affiliation,
'show' : show, 'show' : show,
'status': status } 'status': status }
if nick in self.changingNick.keys(): if nick in list(self.changingNick.keys()):
self.ircCommandNICK(self.changingNick[nick], nick) self.ircCommandNICK(self.changingNick[nick], nick)
elif new_user: elif new_user:
self.ircCommandJOIN(nick) self.ircCommandJOIN(nick)
@ -1344,14 +1344,14 @@ class ClientThread(Thread):
self.printDebug('got ircline: %s' % data) self.printDebug('got ircline: %s' % data)
# utf-8 test # utf-8 test
try: try:
unicode(data, 'utf-8') str(data, 'utf-8')
except exceptions.UnicodeDecodeError: except exceptions.UnicodeDecodeError:
self.printError('Unicode decode error. Your IRC client is (probably) not writing utf-8') self.printError('Unicode decode error. Your IRC client is (probably) not writing utf-8')
self.ircCommandERROR('Input form IRC client was not in utf-8. Turn utf-8 support on from your IRC client or input only pure ascii', -1) self.ircCommandERROR('Input form IRC client was not in utf-8. Turn utf-8 support on from your IRC client or input only pure ascii', -1)
return return
args = data.split(' ', 1) args = data.split(' ', 1)
arguments = u'' arguments = ''
command = args[0].upper() command = args[0].upper()
if len(args) == 2: if len(args) == 2:
arguments = args[1] arguments = args[1]
@ -1382,7 +1382,7 @@ class ClientThread(Thread):
#We won't be able to join rooms with a space in their name, but it's not as bad as being unable to join rooms with a password #We won't be able to join rooms with a space in their name, but it's not as bad as being unable to join rooms with a password
arguments = arguments.split(' ', 1) arguments = arguments.split(' ', 1)
room = arguments[0] room = arguments[0]
password = u'' password = ''
if len(arguments) == 2: if len(arguments) == 2:
password = arguments[1] password = arguments[1]
@ -1390,7 +1390,7 @@ class ClientThread(Thread):
room = "%s@%s" % (room, self.muc_server) room = "%s@%s" % (room, self.muc_server)
room = room.lower() # todo: is this valid? room = room.lower() # todo: is this valid?
if room in self.mucs.keys(): # already in MUC if room in list(self.mucs.keys()): # already in MUC
return return
self.printDebug("Joining room: %s" % JID(room)) self.printDebug("Joining room: %s" % JID(room))
self.joinQueue[JID(room)] = {'messages': list(), self.joinQueue[JID(room)] = {'messages': list(),
@ -1413,7 +1413,7 @@ class ClientThread(Thread):
room = JID(room.strip()) room = JID(room.strip())
else: else:
room = JID(arguments.strip()) room = JID(arguments.strip())
if room not in self.mucs.keys(): # not in room if room not in list(self.mucs.keys()): # not in room
return return
self.sendToXMPP(Presence(to='%s/%s' % (room, self.nickname), self.sendToXMPP(Presence(to='%s/%s' % (room, self.nickname),
typ='unavailable', typ='unavailable',
@ -1464,7 +1464,7 @@ class ClientThread(Thread):
for muc in self.getMucs(): for muc in self.getMucs():
self.nickChangeInMucs[muc] = {'checked': False, self.nickChangeInMucs[muc] = {'checked': False,
'changed': False} 'changed': False}
for muc in self.nickChangeInMucs.keys(): for muc in list(self.nickChangeInMucs.keys()):
self.xmppCommandMUCPRESENCE(muc, self.newnick) self.xmppCommandMUCPRESENCE(muc, self.newnick)
elif command == 'TOPIC': elif command == 'TOPIC':
@ -1475,7 +1475,7 @@ class ClientThread(Thread):
text = arguments[x+2:] text = arguments[x+2:]
text = text.strip() text = text.strip()
jid = JID(arguments[:x].strip()) jid = JID(arguments[:x].strip())
if jid not in self.mucs.keys(): if jid not in list(self.mucs.keys()):
self.ircCommandERROR('', 403) self.ircCommandERROR('', 403)
return return
@ -1559,18 +1559,18 @@ class ClientThread(Thread):
def usage(): def usage():
"""Usage function for showing commandline options """ """Usage function for showing commandline options """
print "Usage: xmpp-ircd [OPTION]..." print("Usage: xmpp-ircd [OPTION]...")
print "OPTIONS" print("OPTIONS")
print "-h, --help\t help" print("-h, --help\t help")
print "-p, --port\t port to listen for IRC connections on" print("-p, --port\t port to listen for IRC connections on")
print "-m, --muc-server\t Address of the MUC service. Used for autocompletion of JOIN commands" print("-m, --muc-server\t Address of the MUC service. Used for autocompletion of JOIN commands")
print "-s, --server\t Jabber/XMPP server to which the component connection should be made" print("-s, --server\t Jabber/XMPP server to which the component connection should be made")
print "-P, --server-port\t Port to which the component connection should be made" print("-P, --server-port\t Port to which the component connection should be made")
print "-c, --component-name\t Name of component" print("-c, --component-name\t Name of component")
print "-C, --component-pass\t Component password" print("-C, --component-pass\t Component password")
print " --ssl\t SSL certificate. Enables ssl when provided" print(" --ssl\t SSL certificate. Enables ssl when provided")
print " --dh\t Diffie Hellman parameter file for SSL." print(" --dh\t Diffie Hellman parameter file for SSL.")
print " --log\t log file" print(" --log\t log file")
def main(): def main():
port = 6667 port = 6667
@ -1601,13 +1601,13 @@ def main():
try: try:
port = int(a) port = int(a)
except: except:
print "port should be an integer" print("port should be an integer")
sys.exit() sys.exit()
if o in ("-P", "--server-port"): if o in ("-P", "--server-port"):
try: try:
server_port = int(a) server_port = int(a)
except: except:
print "server-port should be an integer" print("server-port should be an integer")
sys.exit() sys.exit()
if o in ("-s", "--server"): if o in ("-s", "--server"):
server = a server = a