aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorGravatar jesopo2019-09-20 17:12:17 +0100
committerGravatar jesopo2019-09-20 17:12:17 +0100
commit532d1687c3fbabfcda10efaa159f518b78e8d7ff (patch)
tree570b9e949d1f106bdebdb0ab027fef5daee9d51a /modules
parentgenerate() takes a channel id, not a channel (diff)
signature
database.execute() doesn't fetch data
Diffstat (limited to 'modules')
-rw-r--r--modules/markov.py20
1 files changed, 9 insertions, 11 deletions
diff --git a/modules/markov.py b/modules/markov.py
index 69091ef5..43e3fdb9 100644
--- a/modules/markov.py
+++ b/modules/markov.py
@@ -44,18 +44,16 @@ class Module(ModuleManager.BaseModule):
return random.choices(words, weights=frequencies, k=1)[0]
def generate(self, channel_id):
- first_words = self.bot.database.execute("""SELECT third_word, frequency
- FROM markov WHERE channel_id=? AND first_word IS NULL AND
- second_word IS NULL AND third_word NOT NULL""",
- [channel_id])
+ first_words = self.bot.database.execute_fetchall("""SELECT third_word,
+ frequency FROM markov WHERE channel_id=? AND first_word IS NULL AND
+ second_word IS NULL AND third_word NOT NULL""", [channel_id])
if not first_words:
return None
first_word = self._choose(first_words)
- second_words = self.bot.database.execute("""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])
+ 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)
@@ -63,9 +61,9 @@ class Module(ModuleManager.BaseModule):
words = [first_word, second_word]
for i in range(30):
two_words = words[-2:]
- third_words = self.bot.database.execute("""SELECT third_word,
- frequency FROM markov WHERE channel_id=? AND first_word=? AND
- second_word=?""", [channel_id]+two_words)
+ third_words = self.bot.database.execute_fetchall("""SELECT
+ third_word, frequency FROM markov WHERE channel_id=? AND
+ first_word=? AND second_word=?""", [channel_id]+two_words)
third_word = self._choose(third_words)
if third_word == None: