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

don't favourite starting words when first_word is provided

Browse source
This commit is contained in:
jesopo 2019-09-24 10:55:18 +01:00
parent 5ea714182d
commit 8618f43b34
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/markov.py
View file

@ -121,13 +121,18 @@ class Module(ModuleManager.BaseModule):
if not first_words: if not first_words:
return None return None
first_word = self._choose(first_words) first_word = self._choose(first_words)
second_words = self.bot.database.execute_fetchall("""SELECT
third_word, frequency FROM markov WHERE channel_id=? AND
first_word IS NULL AND second_word=? AND third_word NOT NULL""",
[channel_id, first_word])
if not second_words:
return None
second_word = self._choose(second_words)
words = [first_word, second_word]
else: else:
first_word = first_word.lower() first_word = first_word.lower()
second_words = self.bot.database.execute_fetchall("""SELECT third_word,
frequency FROM markov WHERE channel_id=? AND first_word IS NULL AND
second_word=? AND third_word NOT NULL""", [channel_id, first_word])
if not second_words:
second_two_words = self.bot.database.execute_fetchall("""SELECT second_two_words = self.bot.database.execute_fetchall("""SELECT
second_word, third_word, frequency FROM markov WHERE second_word, third_word, frequency FROM markov WHERE
channel_id=? AND first_word=? AND second_word NOT NULL AND channel_id=? AND first_word=? AND second_word NOT NULL AND
@ -138,9 +143,6 @@ class Module(ModuleManager.BaseModule):
second_word, third_word = self._choose( second_word, third_word = self._choose(
[[[s, t], f] for s, t, f in second_two_words]) [[[s, t], f] for s, t, f in second_two_words])
words = [first_word, second_word, third_word] words = [first_word, second_word, third_word]
else:
second_word = self._choose(second_words)
words = [first_word, second_word]
for i in range(30): for i in range(30):
two_words = words[-2:] two_words = words[-2:]