mirror of
https://github.com/jlu5/PyLink.git
synced 2024-11-01 01:09:22 +01:00
core: rename IrcUser.identified attribute to IrcUser.account
This commit is contained in:
parent
afb035ae6b
commit
1ef89560e2
@ -911,7 +911,7 @@ class Irc():
|
|||||||
if uid in self.users:
|
if uid in self.users:
|
||||||
if allowOper and ("o", None) in self.users[uid].modes:
|
if allowOper and ("o", None) in self.users[uid].modes:
|
||||||
return True
|
return True
|
||||||
elif allowAuthed and self.users[uid].identified:
|
elif allowAuthed and self.users[uid].account:
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -1001,12 +1001,12 @@ class IrcUser():
|
|||||||
self.modes = set() # Tracks user modes
|
self.modes = set() # Tracks user modes
|
||||||
|
|
||||||
# Tracks PyLink identification status
|
# Tracks PyLink identification status
|
||||||
self.identified = ''
|
self.account = ''
|
||||||
|
|
||||||
# Tracks oper type (for display only)
|
# Tracks oper type (for display only)
|
||||||
self.opertype = opertype
|
self.opertype = opertype
|
||||||
|
|
||||||
# Tracks services identification status
|
# Tracks external services identification status
|
||||||
self.services_account = ''
|
self.services_account = ''
|
||||||
|
|
||||||
# Tracks channels the user is in
|
# Tracks channels the user is in
|
||||||
|
@ -33,7 +33,7 @@ def identify(irc, source, args):
|
|||||||
# Usernames are case-insensitive, passwords are NOT.
|
# Usernames are case-insensitive, passwords are NOT.
|
||||||
if username.lower() == conf.conf['login']['user'].lower() and password == conf.conf['login']['password']:
|
if username.lower() == conf.conf['login']['user'].lower() and password == conf.conf['login']['password']:
|
||||||
realuser = conf.conf['login']['user']
|
realuser = conf.conf['login']['user']
|
||||||
irc.users[source].identified = realuser
|
irc.users[source].account = realuser
|
||||||
irc.reply('Successfully logged in as %s.' % realuser)
|
irc.reply('Successfully logged in as %s.' % realuser)
|
||||||
log.info("(%s) Successful login to %r by %s",
|
log.info("(%s) Successful login to %r by %s",
|
||||||
irc.name, username, irc.getHostmask(source))
|
irc.name, username, irc.getHostmask(source))
|
||||||
|
@ -134,7 +134,7 @@ def pylinkacc(irc, host, uid):
|
|||||||
$pylinkacc -> Returns True if the target is logged in to PyLink.
|
$pylinkacc -> Returns True if the target is logged in to PyLink.
|
||||||
$pylinkacc:accountname -> Returns True if the target's PyLink login matches the one given.
|
$pylinkacc:accountname -> Returns True if the target's PyLink login matches the one given.
|
||||||
"""
|
"""
|
||||||
login = irc.toLower(irc.users[uid].identified)
|
login = irc.toLower(irc.users[uid].account)
|
||||||
groups = list(map(irc.toLower, host.split(':')))
|
groups = list(map(irc.toLower, host.split(':')))
|
||||||
log.debug('(%s) exttargets.pylinkacc: groups to match: %s', irc.name, groups)
|
log.debug('(%s) exttargets.pylinkacc: groups to match: %s', irc.name, groups)
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ def status(irc, source, args):
|
|||||||
"""takes no arguments.
|
"""takes no arguments.
|
||||||
|
|
||||||
Returns your current PyLink login status."""
|
Returns your current PyLink login status."""
|
||||||
identified = irc.users[source].identified
|
identified = irc.users[source].account
|
||||||
if identified:
|
if identified:
|
||||||
irc.reply('You are identified as \x02%s\x02.' % identified)
|
irc.reply('You are identified as \x02%s\x02.' % identified)
|
||||||
else:
|
else:
|
||||||
@ -57,7 +57,7 @@ def showuser(irc, source, args):
|
|||||||
channels = sorted(userobj.channels)
|
channels = sorted(userobj.channels)
|
||||||
f('\x02Channels\x02: %s' % (' '.join(channels) or _none))
|
f('\x02Channels\x02: %s' % (' '.join(channels) or _none))
|
||||||
f('\x02PyLink identification\x02: %s; \x02Services account\x02: %s; \x02Away status\x02: %s' % \
|
f('\x02PyLink identification\x02: %s; \x02Services account\x02: %s; \x02Away status\x02: %s' % \
|
||||||
((userobj.identified or _none), (userobj.services_account or _none), userobj.away or _none))
|
((userobj.account or _none), (userobj.services_account or _none), userobj.away or _none))
|
||||||
|
|
||||||
|
|
||||||
@utils.add_cmd
|
@utils.add_cmd
|
||||||
|
@ -75,12 +75,12 @@ def remote(irc, source, args):
|
|||||||
remoteirc.called_in = remoteirc.called_by = remoteirc.pseudoclient.uid
|
remoteirc.called_in = remoteirc.called_by = remoteirc.pseudoclient.uid
|
||||||
|
|
||||||
# Set PyLink's identification to admin.
|
# Set PyLink's identification to admin.
|
||||||
remoteirc.pseudoclient.identified = "<PyLink networks.remote override>"
|
remoteirc.pseudoclient.account = "<PyLink networks.remote override>"
|
||||||
|
|
||||||
try: # Remotely call the command (use the PyLink client as a dummy user).
|
try: # Remotely call the command (use the PyLink client as a dummy user).
|
||||||
remoteirc.callCommand(remoteirc.pseudoclient.uid, cmd_args)
|
remoteirc.callCommand(remoteirc.pseudoclient.uid, cmd_args)
|
||||||
finally: # Remove the identification override after we finish.
|
finally: # Remove the identification override after we finish.
|
||||||
remoteirc.pseudoclient.identified = ''
|
remoteirc.pseudoclient.account = ''
|
||||||
|
|
||||||
irc.reply("Done.")
|
irc.reply("Done.")
|
||||||
|
|
||||||
|
4
world.py
4
world.py
@ -5,7 +5,7 @@ world.py: Stores global variables for PyLink, including lists of active IRC obje
|
|||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
# This indicates whether we're running in tests modes. What it actually does
|
# This indicates whether we're running in tests mode. What it actually does
|
||||||
# though is control whether IRC connections should be threaded or not.
|
# though is control whether IRC connections should be threaded or not.
|
||||||
testing = False
|
testing = False
|
||||||
|
|
||||||
@ -19,8 +19,10 @@ services = {}
|
|||||||
# Registered extarget handlers. This maps exttarget names (strings) to handling functions.
|
# Registered extarget handlers. This maps exttarget names (strings) to handling functions.
|
||||||
exttarget_handlers = {}
|
exttarget_handlers = {}
|
||||||
|
|
||||||
|
# Trigger to be set when all IRC objects are initially created.
|
||||||
started = threading.Event()
|
started = threading.Event()
|
||||||
|
|
||||||
|
# Source address.
|
||||||
source = "https://github.com/GLolol/PyLink" # CHANGE THIS IF YOU'RE FORKING!!
|
source = "https://github.com/GLolol/PyLink" # CHANGE THIS IF YOU'RE FORKING!!
|
||||||
|
|
||||||
# Fallback hostname used in various places internally when hostname isn't configured.
|
# Fallback hostname used in various places internally when hostname isn't configured.
|
||||||
|
Loading…
Reference in New Issue
Block a user