Create room table for easier room deletion

src/euph/room.rs

@@ -167,6 +167,7 @@ impl State {
             }
             Data::SnapshotEvent(d) => {
                 info!("e&{}: successfully joined", self.name);
+                self.vault.join();
                 self.last_msg_id = Some(d.log.last().map(|m| m.id));
                 self.vault.add_messages(d.log, None);
                 let _ = self.ui_event_tx.send(UiEvent::Redraw);

src/vault/euph.rs

@@ -9,7 +9,7 @@ use tokio::sync::{mpsc, oneshot};
 use crate::euph::api::{Message, Snowflake, Time};
 use crate::store::{Msg, MsgStore, Path, Tree};
 
-use super::Request;
+use super::{Request, Vault};
 
 impl ToSql for Snowflake {
     fn to_sql(&self) -> rusqlite::Result<ToSqlOutput<'_>> {
@@ -76,6 +76,16 @@ impl From<EuphRequest> for Request {
     }
 }
 
+impl Vault {
+    pub async fn euph_rooms(&self) -> Vec<String> {
+        // TODO vault::Error
+        let (tx, rx) = oneshot::channel();
+        let request = EuphRequest::Rooms { result: tx };
+        let _ = self.tx.send(request.into());
+        rx.await.unwrap()
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct EuphVault {
     pub(super) tx: mpsc::UnboundedSender<Request>,
@@ -83,6 +93,13 @@ pub struct EuphVault {
 }
 
 impl EuphVault {
+    pub fn join(&self) {
+        let request = EuphRequest::Join {
+            room: self.room.clone(),
+        };
+        let _ = self.tx.send(request.into());
+    }
+
     pub fn add_message(&self, msg: Message, prev_msg: Option<Snowflake>) {
         let request = EuphRequest::AddMsg {
             room: self.room.clone(),
@@ -187,6 +204,12 @@ impl MsgStore<EuphMsg> for EuphVault {
 }
 
 pub(super) enum EuphRequest {
+    Rooms {
+        result: oneshot::Sender<Vec<String>>,
+    },
+    Join {
+        room: String,
+    },
     AddMsg {
         room: String,
         msg: Message,
@@ -234,6 +257,8 @@ pub(super) enum EuphRequest {
 impl EuphRequest {
     pub(super) fn perform(self, conn: &mut Connection) {
         let result = match self {
+            EuphRequest::Rooms { result } => Self::rooms(conn, result),
+            EuphRequest::Join { room } => Self::join(conn, room),
             EuphRequest::AddMsg {
                 room,
                 msg,
@@ -265,6 +290,31 @@ impl EuphRequest {
         }
     }
 
+    fn rooms(conn: &mut Connection, result: oneshot::Sender<Vec<String>>) -> rusqlite::Result<()> {
+        let rooms = conn
+            .prepare(
+                "
+                SELECT room
+                FROM euph_rooms
+                ",
+            )?
+            .query_map([], |row| row.get(0))?
+            .collect::<rusqlite::Result<_>>()?;
+        let _ = result.send(rooms);
+        Ok(())
+    }
+
+    fn join(conn: &mut Connection, room: String) -> rusqlite::Result<()> {
+        conn.execute(
+            "
+            INSERT INTO euph_rooms (room)
+            VALUES (?)
+            ",
+            [room],
+        )?;
+        Ok(())
+    }
+
     fn insert_msgs(tx: &Transaction, room: &str, msgs: Vec<Message>) -> rusqlite::Result<()> {
         let mut insert_msg = tx.prepare(
             "

src/vault/migrate.rs

@@ -21,6 +21,10 @@ const MIGRATIONS: [fn(&mut Transaction) -> rusqlite::Result<()>; 1] = [m1];
 fn m1(tx: &mut Transaction) -> rusqlite::Result<()> {
     tx.execute_batch(
         "
+        CREATE TABLE euph_rooms (
+            room TEXT NOT NULL PRIMARY KEY
+        ) STRICT;
+
         CREATE TABLE euph_msgs (
             -- Message
             room              TEXT NOT NULL,
@@ -45,7 +49,9 @@ fn m1(tx: &mut Transaction) -> rusqlite::Result<()> {
             client_address      TEXT,
             real_client_address TEXT,
 
-            PRIMARY KEY (room, id)
+            PRIMARY KEY (room, id),
+            FOREIGN KEY (room) REFERENCES euph_rooms (room)
+                ON DELETE CASCADE
         ) STRICT;
 
         CREATE TABLE euph_spans (
@@ -54,9 +60,8 @@ fn m1(tx: &mut Transaction) -> rusqlite::Result<()> {
             end   INT,
 
             UNIQUE (room, start, end),
-            FOREIGN KEY (room, start) REFERENCES euph_msgs (room, id),
-            FOREIGN KEY (room, end) REFERENCES euph_msgs (room, id),
-
+            FOREIGN KEY (room) REFERENCES euph_rooms (room)
+                ON DELETE CASCADE,
             CHECK (start IS NULL OR end IS NOT NULL)
         ) STRICT;