Simplify channel IDs in events. Remove redundant ones.

6 files changed, 168 insertions, 186 deletions

diff --git a/.sqlx/query-14ca0364c6f0ab084b22af0061d4bf5755cda35dba473eae37f467cfabb0102e.json b/.sqlx/query-14ca0364c6f0ab084b22af0061d4bf5755cda35dba473eae37f467cfabb0102e.json
new file mode 100644
index 0000000..15ceb24
--- /dev/null
+++ b/.sqlx/query-14ca0364c6f0ab084b22af0061d4bf5755cda35dba473eae37f467cfabb0102e.json
@@ -0,0 +1,56 @@
+{
+  "db_name": "SQLite",
+  "query": "\n                select\n                    message.channel as \"channel: channel::Id\",\n                    sender.id as \"sender_id: login::Id\",\n                    sender.name as \"sender_name\",\n                    message.id as \"id: Id\",\n                    message.body,\n                    sent_at as \"sent_at: DateTime\",\n                    sent_sequence as \"sent_sequence: Sequence\"\n                from message\n                    join login as sender on message.sender = sender.id\n                where coalesce(message.sent_sequence > $1, true)\n            ",
+  "describe": {
+    "columns": [
+      {
+        "name": "channel: channel::Id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "sender_id: login::Id",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "sender_name",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "id: Id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "body",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "sent_at: DateTime",
+        "ordinal": 5,
+        "type_info": "Text"
+      },
+      {
+        "name": "sent_sequence: Sequence",
+        "ordinal": 6,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "14ca0364c6f0ab084b22af0061d4bf5755cda35dba473eae37f467cfabb0102e"
+}
diff --git a/.sqlx/query-315a4a16ebc0a99ab745a40bd021892002b7ba7d9f4cac5deea298b6223918aa.json b/.sqlx/query-315a4a16ebc0a99ab745a40bd021892002b7ba7d9f4cac5deea298b6223918aa.json
new file mode 100644
index 0000000..7aeac69
--- /dev/null
+++ b/.sqlx/query-315a4a16ebc0a99ab745a40bd021892002b7ba7d9f4cac5deea298b6223918aa.json
@@ -0,0 +1,56 @@
+{
+  "db_name": "SQLite",
+  "query": "\n                select\n                    message.channel as \"channel: channel::Id\",\n                    sender.id as \"sender_id: login::Id\",\n                    sender.name as \"sender_name\",\n                    message.id as \"id: Id\",\n                    message.body,\n                    sent_at as \"sent_at: DateTime\",\n                    sent_sequence as \"sent_sequence: Sequence\"\n                from message\n                    join login as sender on message.sender = sender.id\n                where message.id = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "name": "channel: channel::Id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "sender_id: login::Id",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "sender_name",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "id: Id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "body",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "sent_at: DateTime",
+        "ordinal": 5,
+        "type_info": "Text"
+      },
+      {
+        "name": "sent_sequence: Sequence",
+        "ordinal": 6,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "315a4a16ebc0a99ab745a40bd021892002b7ba7d9f4cac5deea298b6223918aa"
+}
diff --git a/.sqlx/query-5c53579fa431b6e184faf94eedb8229360ba78f2607d25e7e2ee5db5c759a5a3.json b/.sqlx/query-5c53579fa431b6e184faf94eedb8229360ba78f2607d25e7e2ee5db5c759a5a3.json
deleted file mode 100644
index 4ca6786..0000000
--- a/.sqlx/query-5c53579fa431b6e184faf94eedb8229360ba78f2607d25e7e2ee5db5c759a5a3.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n                select\n                    channel.id as \"channel_id: channel::Id\",\n                    channel.name as \"channel_name\",\n                    sender.id as \"sender_id: login::Id\",\n                    sender.name as \"sender_name\",\n                    message.id as \"id: Id\",\n                    message.body,\n                    sent_at as \"sent_at: DateTime\",\n                    sent_sequence as \"sent_sequence: Sequence\"\n                from message\n                    join channel on message.channel = channel.id\n                    join login as sender on message.sender = sender.id\n                where coalesce(message.sent_sequence > $1, true)\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "channel_id: channel::Id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "channel_name",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "sender_id: login::Id",
-        "ordinal": 2,
-        "type_info": "Text"
-      },
-      {
-        "name": "sender_name",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "id: Id",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "body",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "sent_at: DateTime",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "sent_sequence: Sequence",
-        "ordinal": 7,
-        "type_info": "Integer"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "5c53579fa431b6e184faf94eedb8229360ba78f2607d25e7e2ee5db5c759a5a3"
-}
diff --git a/.sqlx/query-6fc4be85527af518da17c49cedc6bee1750d28a6176980ed7040b8a3301fc7e5.json b/.sqlx/query-6fc4be85527af518da17c49cedc6bee1750d28a6176980ed7040b8a3301fc7e5.json
deleted file mode 100644
index 257e1f6..0000000
--- a/.sqlx/query-6fc4be85527af518da17c49cedc6bee1750d28a6176980ed7040b8a3301fc7e5.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n                select\n                    channel.id as \"channel_id: channel::Id\",\n                    channel.name as \"channel_name\",\n                    sender.id as \"sender_id: login::Id\",\n                    sender.name as \"sender_name\",\n                    message.id as \"id: Id\",\n                    message.body,\n                    sent_at as \"sent_at: DateTime\",\n                    sent_sequence as \"sent_sequence: Sequence\"\n                from message\n                    join channel on message.channel = channel.id\n                    join login as sender on message.sender = sender.id\n                where message.id = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "channel_id: channel::Id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "channel_name",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "sender_id: login::Id",
-        "ordinal": 2,
-        "type_info": "Text"
-      },
-      {
-        "name": "sender_name",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "id: Id",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "body",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "sent_at: DateTime",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "sent_sequence: Sequence",
-        "ordinal": 7,
-        "type_info": "Integer"
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "6fc4be85527af518da17c49cedc6bee1750d28a6176980ed7040b8a3301fc7e5"
-}
diff --git a/.sqlx/query-9606853f2ea9f776f7e4384a2137be57b3a45fe38a675262ceaaebb3d346a9ca.json b/.sqlx/query-9606853f2ea9f776f7e4384a2137be57b3a45fe38a675262ceaaebb3d346a9ca.json
deleted file mode 100644
index 82246ac..0000000
--- a/.sqlx/query-9606853f2ea9f776f7e4384a2137be57b3a45fe38a675262ceaaebb3d346a9ca.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n                select\n                    channel.id as \"channel_id: channel::Id\",\n                    channel.name as \"channel_name\",\n                    sender.id as \"sender_id: login::Id\",\n                    sender.name as \"sender_name\",\n                    message.id as \"id: Id\",\n                    message.body,\n                    sent_at as \"sent_at: DateTime\",\n                    sent_sequence as \"sent_sequence: Sequence\"\n                from message\n                    join channel on message.channel = channel.id\n                    join login as sender on message.sender = sender.id\n                where channel.id = $1\n                    and coalesce(message.sent_sequence <= $2, true)\n                order by message.sent_sequence\n            ",
-  "describe": {
-    "columns": [
-      {
-        "name": "channel_id: channel::Id",
-        "ordinal": 0,
-        "type_info": "Text"
-      },
-      {
-        "name": "channel_name",
-        "ordinal": 1,
-        "type_info": "Text"
-      },
-      {
-        "name": "sender_id: login::Id",
-        "ordinal": 2,
-        "type_info": "Text"
-      },
-      {
-        "name": "sender_name",
-        "ordinal": 3,
-        "type_info": "Text"
-      },
-      {
-        "name": "id: Id",
-        "ordinal": 4,
-        "type_info": "Text"
-      },
-      {
-        "name": "body",
-        "ordinal": 5,
-        "type_info": "Text"
-      },
-      {
-        "name": "sent_at: DateTime",
-        "ordinal": 6,
-        "type_info": "Text"
-      },
-      {
-        "name": "sent_sequence: Sequence",
-        "ordinal": 7,
-        "type_info": "Integer"
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "9606853f2ea9f776f7e4384a2137be57b3a45fe38a675262ceaaebb3d346a9ca"
-}
diff --git a/.sqlx/query-eb9d7146e615044568f9bb47a7317dda3e429faac15e02c900f62f83c25070a7.json b/.sqlx/query-eb9d7146e615044568f9bb47a7317dda3e429faac15e02c900f62f83c25070a7.json
new file mode 100644
index 0000000..1fe8a3e
--- /dev/null
+++ b/.sqlx/query-eb9d7146e615044568f9bb47a7317dda3e429faac15e02c900f62f83c25070a7.json
@@ -0,0 +1,56 @@
+{
+  "db_name": "SQLite",
+  "query": "\n                select\n                    message.channel as \"channel: channel::Id\",\n                    sender.id as \"sender_id: login::Id\",\n                    sender.name as \"sender_name\",\n                    message.id as \"id: Id\",\n                    message.body,\n                    sent_at as \"sent_at: DateTime\",\n                    sent_sequence as \"sent_sequence: Sequence\"\n                from message\n                    join login as sender on message.sender = sender.id\n                where message.channel = $1\n                    and coalesce(message.sent_sequence <= $2, true)\n                order by message.sent_sequence\n            ",
+  "describe": {
+    "columns": [
+      {
+        "name": "channel: channel::Id",
+        "ordinal": 0,
+        "type_info": "Text"
+      },
+      {
+        "name": "sender_id: login::Id",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "sender_name",
+        "ordinal": 2,
+        "type_info": "Text"
+      },
+      {
+        "name": "id: Id",
+        "ordinal": 3,
+        "type_info": "Text"
+      },
+      {
+        "name": "body",
+        "ordinal": 4,
+        "type_info": "Text"
+      },
+      {
+        "name": "sent_at: DateTime",
+        "ordinal": 5,
+        "type_info": "Text"
+      },
+      {
+        "name": "sent_sequence: Sequence",
+        "ordinal": 6,
+        "type_info": "Integer"
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "eb9d7146e615044568f9bb47a7317dda3e429faac15e02c900f62f83c25070a7"
+}