Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

fix regression of message filters not matching without formatting

Browse source
This commit is contained in:
jesopo 2020-04-08 18:19:06 +01:00
parent 5df8df83ad
commit 7fdb9a1e55
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/message_filter.py
View file

@ -31,14 +31,16 @@ class Module(ModuleManager.BaseModule):
filters = self._get_filters(event["server"], target) filters = self._get_filters(event["server"], target)
for filter in filters: for filter in filters:
sed = utils.parse.sed.parse(filter) sed = utils.parse.sed.parse(filter)
type, out = utils.parse.sed.sed(sed, message)
if type == "m" and out: if sed.type == "m":
self.log.info("Message matched filter, dropping: %s" out = utils.parse.sed.sed(sed, message_plain)
% event["line"].format()) if out:
event["line"].invalidate() self.log.info("Message matched filter, dropping: %s"
return % event["line"].format())
elif type == "s": event["line"].invalidate()
return
elif sed.type == "s":
out = utils.parse.sed.sed(sed, message)
message = out message = out
if not message == original_message: if not message == original_message:

4
src/utils/parse/sed.py
View file

@ -76,6 +76,6 @@ def parse(sed_s: str) -> typing.Optional[Sed]:
return SedMatch(type, re.compile(pattern, flags)) return SedMatch(type, re.compile(pattern, flags))
return None return None
def sed(sed_obj: Sed, s: str) -> typing.Tuple[str, typing.Optional[str]]: def sed(sed_obj: Sed, s: str) -> typing.Optional[str]:
out = sed_obj.match(s) out = sed_obj.match(s)
return sed_obj.type, out return out