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, relay_clientbot: more type safety for protocols/discord

Browse Source
This commit is contained in:
James Lu 2019-02-07 13:49:38 -08:00
parent 23cb7c173a
commit 61c8677802
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes.py
View File

@ -725,7 +725,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
@functools.lru_cache(maxsize=8192) @functools.lru_cache(maxsize=8192)
def to_lower(self, text): def to_lower(self, text):
if not text: if (not text) or (not isinstance(text, str)):
return text return text
if self.casemapping == 'rfc1459': if self.casemapping == 'rfc1459':
text = text.replace('{', '[') text = text.replace('{', '[')
@ -754,7 +754,7 @@ class PyLinkNetworkCoreWithUtils(PyLinkNetworkCore):
def _isASCII(s): def _isASCII(s):
"""Returns whether the given string only contains non-whitespace ASCII characters.""" """Returns whether the given string only contains non-whitespace ASCII characters."""
chars = string.ascii_letters + string.digits + string.punctuation chars = string.ascii_letters + string.digits + string.punctuation
return all(char in chars for char in s) return all(char in chars for char in str(s))
@classmethod @classmethod
def is_server_name(cls, s): def is_server_name(cls, s):

7
plugins/relay.py
View File

@ -1410,9 +1410,10 @@ def handle_messages(irc, numeric, command, args):
avail_prefixes = {v: k for k, v in irc.prefixmodes.items()} avail_prefixes = {v: k for k, v in irc.prefixmodes.items()}
prefixes = [] prefixes = []
# Split up @#channel prefixes and the like into their prefixes and target components # Split up @#channel prefixes and the like into their prefixes and target components
while target and target[0] in avail_prefixes: if isinstance(target, str):
prefixes.append(avail_prefixes[target[0]]) while target and target[0] in avail_prefixes:
target = target[1:] prefixes.append(avail_prefixes[target[0]])
target = target[1:]
log.debug('(%s) relay.handle_messages: splitting target %r into prefixes=%r, target=%r', log.debug('(%s) relay.handle_messages: splitting target %r into prefixes=%r, target=%r',
irc.name, args['target'], prefixes, target) irc.name, args['target'], prefixes, target)

2
plugins/relay_clientbot.py
View File

@ -26,6 +26,8 @@ def color_text(s):
""" """
Returns a colorized version of the given text based on a simple hash algorithm. Returns a colorized version of the given text based on a simple hash algorithm.
""" """
if not s:
return s
colors = ('03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '15') colors = ('03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '15')
hash_output = hash(s.encode()) hash_output = hash(s.encode())
num = hash_output % len(colors) num = hash_output % len(colors)