GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00
Code Issues Projects Releases Wiki Activity

classes, coremods: migrate to irc.is_*

Browse Source
This commit is contained in:
James Lu 2017-08-28 20:13:25 -07:00
parent c4a3baca7d
commit d79f1766b6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes.py
View File

@ -552,7 +552,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
args = args.split() args = args.split()
assert args, 'No valid modes were supplied!' assert args, 'No valid modes were supplied!'
usermodes = not utils.isChannel(target) usermodes = not self.is_channel(target)
prefix = '' prefix = ''
modestring = args[0] modestring = args[0]
args = args[1:] args = args[1:]
@ -632,7 +632,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
"""Takes a list of parsed IRC modes, and applies them on the given target. """Takes a list of parsed IRC modes, and applies them on the given target.
The target can be either a channel or a user; this is handled automatically.""" The target can be either a channel or a user; this is handled automatically."""
usermodes = not utils.isChannel(target) usermodes = not self.is_channel(target)
try: try:
if usermodes: if usermodes:
@ -743,7 +743,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
if origstring: if origstring:
modes = self.parse_modes(target, modes.split(" ")) modes = self.parse_modes(target, modes.split(" "))
# Get the current mode list first. # Get the current mode list first.
if utils.isChannel(target): if self.is_channel(target):
c = oldobj or self._channels[target] c = oldobj or self._channels[target]
oldmodes = c.modes.copy() oldmodes = c.modes.copy()
possible_modes = self.cmodes.copy() possible_modes = self.cmodes.copy()
@ -1025,7 +1025,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
# Prepare a list of hosts to check against. # Prepare a list of hosts to check against.
if target in self.users: if target in self.users:
if not utils.isHostmask(glob): if not self.is_hostmask(glob):
for specialchar in '$:()': for specialchar in '$:()':
# XXX: we should probably add proper rules on what's a valid account name # XXX: we should probably add proper rules on what's a valid account name
if specialchar in glob: if specialchar in glob:
@ -1128,7 +1128,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
template = string.Template(ban_style) template = string.Template(ban_style)
banhost = template.safe_substitute(ban_style, **self.users[uid].__dict__) banhost = template.safe_substitute(ban_style, **self.users[uid].__dict__)
assert utils.isHostmask(banhost), "Ban mask %r is not a valid hostmask!" % banhost assert self.is_hostmask(banhost), "Ban mask %r is not a valid hostmask!" % banhost
if ban_type in self.cmodes: if ban_type in self.cmodes:
return ('+%s' % self.cmodes[ban_type], banhost) return ('+%s' % self.cmodes[ban_type], banhost)

2
coremods/corecommands.py
View File

@ -54,7 +54,7 @@ def identify(irc, source, args):
"""<username> <password> """<username> <password>
Logs in to PyLink using the configured administrator account.""" Logs in to PyLink using the configured administrator account."""
if utils.isChannel(irc.called_in): if irc.is_channel(irc.called_in):
irc.reply('Error: This command must be sent in private. ' irc.reply('Error: This command must be sent in private. '
'(Would you really type a password inside a channel?)') '(Would you really type a password inside a channel?)')
return return