diff --git a/protocols/inspircd.py b/protocols/inspircd.py index 9312463..52a9171 100644 --- a/protocols/inspircd.py +++ b/protocols/inspircd.py @@ -23,7 +23,7 @@ def _send(irc, sid, msg): irc.send(':%s %s' % (sid, msg)) def spawnClient(irc, nick, ident='null', host='null', realhost=None, modes=set(), - server=None, ip='0.0.0.0', realname=None, ts=None): + server=None, ip='0.0.0.0', realname=None, ts=None, opertype=None): server = server or irc.sid if not utils.isInternalServer(irc, server): raise ValueError('Server %r is not a PyLink internal PseudoServer!' % server) @@ -45,6 +45,8 @@ def spawnClient(irc, nick, ident='null', host='null', realhost=None, modes=set() nick=nick, ident=ident, uid=uid, modes=raw_modes, ip=ip, realname=realname, realhost=realhost)) + if ('o', None) in modes or ('+o', None) in modes: + _operUp(irc, uid, opertype=opertype or 'IRC_Operator') return u def joinClient(irc, client, channel): @@ -182,11 +184,30 @@ def nickClient(irc, numeric, newnick): _send(irc, numeric, 'NICK %s %s' % (newnick, int(time.time()))) irc.users[numeric].nick = newnick +def _operUp(irc, target, opertype=None): + userobj = irc.users[target] + try: + otype = opertype or userobj.opertype + except AttributeError: + log.debug('(%s) opertype field for %s (%s) isn\'t filled yet!', + irc.name, target, userobj.nick) + # whatever, this is non-standard anyways. + otype = 'IRC_Operator' + log.debug('(%s) Sending OPERTYPE from %s to oper them up.', + irc.name, target) + _send(irc, target, 'OPERTYPE %s' % otype) + def _sendModes(irc, numeric, target, modes, ts=None): # -> :9PYAAAAAA FMODE #pylink 1433653951 +os 9PYAAAAAA # -> :9PYAAAAAA MODE 9PYAAAAAA -i+w - joinedmodes = utils.joinModes(modes) + log.debug('(%s) inspircd._sendModes: received %r for mode list', irc.name, modes) + if ('+o', None) in modes and not utils.isChannel(target): + # https://github.com/inspircd/inspircd/blob/master/src/modules/m_spanningtree/opertype.cpp#L26-L28 + # Servers need a special command to set umode +o on people. + # Why isn't this documented anywhere, InspIRCd? + _operUp(irc, target) utils.applyModes(irc, target, modes) + joinedmodes = utils.joinModes(modes) if utils.isChannel(target): ts = ts or irc.channels[target.lower()].ts _send(irc, numeric, 'FMODE %s %s %s' % (target, ts, joinedmodes)) @@ -680,8 +701,9 @@ def handle_opertype(irc, numeric, command, args): # command sent for it. # <- :70MAAAAAB OPERTYPE Network_Owner omode = [('+o', None)] + irc.users[numeric].opertype = opertype = args[0] utils.applyModes(irc, numeric, omode) - return {'target': numeric, 'modes': omode} + return {'target': numeric, 'modes': omode, 'text': opertype} def handle_fident(irc, numeric, command, args): # :70MAAAAAB FHOST test diff --git a/protocols/ts6.py b/protocols/ts6.py index f0a06f3..e41d27d 100644 --- a/protocols/ts6.py +++ b/protocols/ts6.py @@ -23,7 +23,7 @@ def _send(irc, sid, msg): irc.send(':%s %s' % (sid, msg)) def spawnClient(irc, nick, ident='null', host='null', realhost=None, modes=set(), - server=None, ip='0.0.0.0', realname=None, ts=None): + server=None, ip='0.0.0.0', realname=None, ts=None, opertype=None): server = server or irc.sid if not utils.isInternalServer(irc, server): raise ValueError('Server %r is not a PyLink internal PseudoServer!' % server)