9pfs/FireBot
1
0
Fork 0
forked from Firepup650/FireBot
Code Pull requests Activity

Actually work if a command is multi-worded

Browse source
This commit is contained in:
Firepup Sixfifty 2024-05-25 14:49:48 -05:00
parent b720b5edf8
commit 47e377a68d
Signed by: Firepup650
GPG key ID: 7C92E2ABBBFAB9BA
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
config.py
View file

@ -32,7 +32,7 @@ ipbl = DNSBLIpChecker(providers=providers)
hsbl = DNSBLDomainChecker(providers=providers) hsbl = DNSBLDomainChecker(providers=providers)
load_dotenv() load_dotenv()
__version__ = "v3.0.16" __version__ = "v3.0.17"
npbase: str = ( npbase: str = (
"\[\x0303last\.fm\x03\] [A-Za-z0-9_[\]{}\\|\-^]{1,$MAX} (is listening|last listened) to: \x02.+ - .*\x02( \([0-9]+ plays\)( \[.*\])?)?" # pyright: ignore [reportInvalidStringEscapeSequence] "\[\x0303last\.fm\x03\] [A-Za-z0-9_[\]{}\\|\-^]{1,$MAX} (is listening|last listened) to: \x02.+ - .*\x02( \([0-9]+ plays\)( \[.*\])?)?" # pyright: ignore [reportInvalidStringEscapeSequence]
) )
@ -126,17 +126,26 @@ def decode_escapes(s: str) -> str:
def cmdFind(message: str, find: list, usePrefix: bool = True) -> bool: def cmdFind(message: str, find: list, usePrefix: bool = True) -> bool:
cmd = None cmd = message.split(" ")
try:
cmd = message.split(" ", 1)[0]
except IndexError:
...
if not cmd: if not cmd:
return False return False
if usePrefix: if usePrefix:
return any(cmd == prefix + match for match in find) for match in find:
sMatch = (prefix + match).split(" ")
try:
if all(cmd[i] == sMatch[i] for i in range(len(sMatch))):
return True
except IndexError:
...
else: else:
return any(cmd == match for match in find) for match in find:
sMatch = match.split(" ")
try:
if all(cmd[i] == sMatch[i] for i in range(len(sMatch))):
return True
except IndexError:
...
return False
def mfind(message: str, find: list, usePrefix: bool = True) -> bool: def mfind(message: str, find: list, usePrefix: bool = True) -> bool: