From 23ba0fb8fc5070ba30a43035970775247da370f3 Mon Sep 17 00:00:00 2001
From: Arjun Satarkar <me@arjunsatarkar.net>
Date: Tue, 26 Mar 2024 15:26:06 -0400
Subject: teleport: don't teleport within same channel, better text

---
 markov/data/init.sql            | 45 -----------------------------------------
 markov/data/migrations/init.sql | 45 +++++++++++++++++++++++++++++++++++++++++
 markov/markov.py                |  5 +++--
 3 files changed, 48 insertions(+), 47 deletions(-)
 delete mode 100644 markov/data/init.sql
 create mode 100644 markov/data/migrations/init.sql

(limited to 'markov')

diff --git a/markov/data/init.sql b/markov/data/init.sql
deleted file mode 100644
index 71ec073..0000000
--- a/markov/data/init.sql
+++ /dev/null
@@ -1,45 +0,0 @@
-CREATE TABLE IF NOT EXISTS guild_total_completion_count (
-    guild_id BLOB,
-    first_token TEXT,
-    total_completion_count INTEGER,
-    UNIQUE (guild_id, first_token)
-) STRICT;
-
-CREATE TABLE IF NOT EXISTS guild_pairs (
-    guild_id BLOB,
-    first_token TEXT,
-    second_token TEXT,
-    frequency INTEGER,
-    UNIQUE (guild_id, first_token, second_token)
-) STRICT;
-
-CREATE INDEX IF NOT EXISTS idx_guild_pairs__guild_id__first_token__frequency__second_token ON guild_pairs (guild_id, first_token, frequency, second_token);
-
-CREATE TABLE IF NOT EXISTS member_total_completion_count (
-    guild_id BLOB,
-    member_id BLOB,
-    first_token TEXT,
-    total_completion_count INTEGER,
-    UNIQUE (guild_id, member_id, first_token)
-) STRICT;
-
-CREATE TABLE IF NOT EXISTS member_pairs (
-    guild_id BLOB,
-    member_id BLOB,
-    first_token TEXT,
-    second_token TEXT,
-    frequency INTEGER,
-    UNIQUE (guild_id, member_id, first_token, second_token)
-) STRICT;
-
-CREATE INDEX IF NOT EXISTS idx_member_pairs__guild_id__member_id__first_token__frequency__second_token ON member_pairs (
-    guild_id,
-    member_id,
-    first_token,
-    frequency,
-    second_token
-);
-
-PRAGMA analysis_limit = 1000;
-
-PRAGMA optimize;
diff --git a/markov/data/migrations/init.sql b/markov/data/migrations/init.sql
new file mode 100644
index 0000000..71ec073
--- /dev/null
+++ b/markov/data/migrations/init.sql
@@ -0,0 +1,45 @@
+CREATE TABLE IF NOT EXISTS guild_total_completion_count (
+    guild_id BLOB,
+    first_token TEXT,
+    total_completion_count INTEGER,
+    UNIQUE (guild_id, first_token)
+) STRICT;
+
+CREATE TABLE IF NOT EXISTS guild_pairs (
+    guild_id BLOB,
+    first_token TEXT,
+    second_token TEXT,
+    frequency INTEGER,
+    UNIQUE (guild_id, first_token, second_token)
+) STRICT;
+
+CREATE INDEX IF NOT EXISTS idx_guild_pairs__guild_id__first_token__frequency__second_token ON guild_pairs (guild_id, first_token, frequency, second_token);
+
+CREATE TABLE IF NOT EXISTS member_total_completion_count (
+    guild_id BLOB,
+    member_id BLOB,
+    first_token TEXT,
+    total_completion_count INTEGER,
+    UNIQUE (guild_id, member_id, first_token)
+) STRICT;
+
+CREATE TABLE IF NOT EXISTS member_pairs (
+    guild_id BLOB,
+    member_id BLOB,
+    first_token TEXT,
+    second_token TEXT,
+    frequency INTEGER,
+    UNIQUE (guild_id, member_id, first_token, second_token)
+) STRICT;
+
+CREATE INDEX IF NOT EXISTS idx_member_pairs__guild_id__member_id__first_token__frequency__second_token ON member_pairs (
+    guild_id,
+    member_id,
+    first_token,
+    frequency,
+    second_token
+);
+
+PRAGMA analysis_limit = 1000;
+
+PRAGMA optimize;
diff --git a/markov/markov.py b/markov/markov.py
index d7cf14b..9965d65 100644
--- a/markov/markov.py
+++ b/markov/markov.py
@@ -36,7 +36,8 @@ class Markov(commands.Cog):
 
     async def cog_load(self):
         with open(
-            redbot.core.data_manager.bundled_data_path(self) / "init.sql", "r"
+            redbot.core.data_manager.bundled_data_path(self) / "migrations/init.sql",
+            "r",
         ) as setup_script_file:
             async with aiosqlite.connect(self.db_path) as db:
                 await db.executescript(setup_script_file.read())
@@ -92,7 +93,7 @@ class Markov(commands.Cog):
             + [
                 token
                 for token in re.findall(
-                    r"[\w']+|[\.,!?\/;\(\)]|<a?:\w+:\d+>|<#\d+>|<@!?\d+>", content
+                    r"[\w']+|[\.,!?/;()]|<a?:\w+:\d+>|<#\d+>|<@!?\d+>", content
                 )
                 if len(token) <= MAX_TOKEN_LENGTH
             ]
-- 
cgit v1.2.3-57-g22cb