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

push markov lines down command.regex so ignored users are missed

Browse source
This commit is contained in:
jesopo 2019-09-25 18:12:49 +01:00
parent c6efea3971
commit fb4018dd4f
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/markov.py
View file

@ -1,4 +1,4 @@
import random, threading import random, re, threading
from src import ModuleManager, utils from src import ModuleManager, utils
NO_MARKOV = "Markov chains not enabled in this channel" NO_MARKOV = "Markov chains not enabled in this channel"
@ -14,10 +14,14 @@ class Module(ModuleManager.BaseModule):
FOREIGN KEY (channel_id) REFERENCES channels(channel_id), FOREIGN KEY (channel_id) REFERENCES channels(channel_id),
PRIMARY KEY (channel_id, first_word, second_word))""") PRIMARY KEY (channel_id, first_word, second_word))""")
@utils.hook("received.message.channel") @utils.hook("command.regex")
@utils.kwarg("expect_output", False)
@utils.kwarg("ignore_action", False)
@utils.kwarg("command", "markov-trigger")
@utils.kwarg("pattern", re.compile(".+"))
def channel_message(self, event): def channel_message(self, event):
if event["channel"].get_setting("markov", False): if event["target"].get_setting("markov", False):
self._create(event["channel"].id, event["message_split"]) self._create(event["target"].id, event["match"].group(0))
@utils.hook("received.command.markovlog") @utils.hook("received.command.markovlog")
@utils.kwarg("min_args", 1) @utils.kwarg("min_args", 1)
@ -43,14 +47,13 @@ class Module(ModuleManager.BaseModule):
def _load_loop(self, channel_id, data): def _load_loop(self, channel_id, data):
for line in data.decode("utf8").split("\n"): for line in data.decode("utf8").split("\n"):
line = line.strip("\r").split(" ") self.bot.trigger(self._create_factory(channel_id, line.strip()))
self.bot.trigger(self._create_factory(channel_id, line))
self._load_thread = None self._load_thread = None
def _create_factory(self, channel_id, line): def _create_factory(self, channel_id, line):
return lambda: self._create(channel_id, line) return lambda: self._create(channel_id, line)
def _create(self, channel_id, words): def _create(self, channel_id, line):
words = list(filter(None, words)) words = list(filter(None, line.split(" ")))
words = [word.lower() for word in words] words = [word.lower() for word in words]
words_n = len(words) words_n = len(words)