src/bin/dicebot-cmd.rs

@@ -2,20 +2,10 @@ use chronicle_dicebot::commands;
 use chronicle_dicebot::context::Context;
 use chronicle_dicebot::db::Database;
 use chronicle_dicebot::error::BotError;
-use matrix_sdk::{
-    identifiers::{room_id, user_id},
-    Room,
-};
-
-fn dummy_room() -> Room {
-    Room::new(
-        &room_id!("!fakeroomid:example.com"),
-        &user_id!("@fakeuserid:example.com"),
-    )
-}
 
 #[tokio::main]
 async fn main() -> Result<(), BotError> {
+    let db = Database::new_temp()?;
     let input = std::env::args().skip(1).collect::<Vec<String>>().join(" ");
     let command = match commands::parser::parse_command(&input) {
         Ok(command) => command,
@@ -23,10 +13,10 @@ async fn main() -> Result<(), BotError> {
     };
 
     let context = Context {
-        db: Database::new_temp()?,
+        db: db,
         matrix_client: &matrix_sdk::Client::new("http://example.com")
             .expect("Could not create matrix client"),
-        room: &dummy_room(),
+        room_id: "roomid",
         username: "@localuser:example.com",
         message_body: &input,
     };

src/bot.rs

@@ -130,7 +130,7 @@ impl DiceBot {
             let ctx = Context {
                 db: self.db.clone(),
                 matrix_client: &self.client,
-                room: room,
+                room_id: room_id.as_str(),
                 username: &sender_username,
                 message_body: &command,
             };

src/bot/event_handlers.rs

@@ -100,16 +100,6 @@ async fn record_room_information(
 ) -> Result<(), crate::db::errors::DataError> {
     let room_id_str = room.room_id.as_str();
     let usernames = matrix::get_users_in_room(&client, &room.room_id).await;
-
-    let info = crate::models::RoomInfo {
-        room_id: room_id_str.to_owned(),
-        room_name: room.display_name(),
-    };
-
-    // TODO this and the username adding should be one whole
-    // transaction in the db.
-    db.rooms.insert_room_info(&info)?;
-
     usernames
         .into_iter()
         .filter(|username| username != our_username)

src/cofd/dice.rs

@@ -323,14 +323,6 @@ mod tests {
     use super::*;
     use crate::db::Database;
 
-    /// Create dummy room instance.
-    fn dummy_room() -> matrix_sdk::Room {
-        matrix_sdk::Room::new(
-            &matrix_sdk::identifiers::room_id!("!fakeroomid:example.com"),
-            &matrix_sdk::identifiers::user_id!("@fakeuserid:example.com"),
-        )
-    }
-
     ///Instead of being random, generate a series of numbers we have complete
     ///control over.
     struct SequentialDieRoller {
@@ -472,7 +464,7 @@ mod tests {
         let ctx = Context {
             db: db,
             matrix_client: &matrix_sdk::Client::new("http://example.com").unwrap(),
-            room: &dummy_room(),
+            room_id: "roomid",
             username: "username",
             message_body: "message",
         };
@@ -503,7 +495,7 @@ mod tests {
         let ctx = Context {
             db: db,
             matrix_client: &matrix_sdk::Client::new("http://example.com").unwrap(),
-            room: &dummy_room(),
+            room_id: "roomid",
             username: "username",
             message_body: "message",
         };
@@ -527,18 +519,15 @@ mod tests {
 
     #[tokio::test]
     async fn can_resolve_variables_test() {
-        use crate::db::variables::UserAndRoom;
-
         let db = Database::new_temp().unwrap();
         let ctx = Context {
             db: db.clone(),
             matrix_client: &matrix_sdk::Client::new("http://example.com").unwrap(),
-            room: &dummy_room(),
+            room_id: "roomid",
             username: "username",
             message_body: "message",
         };
-
-        let user_and_room = UserAndRoom(&ctx.username, &ctx.room.room_id.as_str());
+        let user_and_room = crate::db::variables::UserAndRoom(&ctx.username, &ctx.room_id);
 
         db.variables
             .set_user_variable(&user_and_room, "myvariable", 10)

src/commands.rs

@@ -78,21 +78,13 @@ pub async fn execute_command(ctx: &Context<'_>) -> CommandResult {
 mod tests {
     use super::*;
 
-    /// Create a dummy room instance.
-    fn dummy_room() -> matrix_sdk::Room {
-        matrix_sdk::Room::new(
-            &matrix_sdk::identifiers::room_id!("!fakeroomid:example.com"),
-            &matrix_sdk::identifiers::user_id!("@fakeuserid:example.com"),
-        )
-    }
-
     #[tokio::test]
     async fn unrecognized_command() {
         let db = crate::db::Database::new_temp().unwrap();
         let ctx = Context {
             db: db,
             matrix_client: &matrix_sdk::Client::new("http://example.com").unwrap(),
-            room: &dummy_room(),
+            room_id: "myroomid",
             username: "myusername",
             message_body: "!notacommand",
         };

src/commands/management.rs

@@ -3,7 +3,8 @@ use crate::context::Context;
 use crate::db::errors::DataError;
 use crate::matrix;
 use async_trait::async_trait;
-use matrix_sdk::identifiers::UserId;
+use matrix_sdk::identifiers::{RoomId, UserId};
+use std::convert::TryFrom;
 
 pub struct ResyncCommand;
 
@@ -16,7 +17,7 @@ impl Command for ResyncCommand {
     }
 
     async fn execute(&self, ctx: &Context<'_>) -> Execution {
-        let room_id = &ctx.room.room_id;
+        let room_id = RoomId::try_from(ctx.room_id).expect("failed to decode room ID");
         let our_username: Option<UserId> = ctx.matrix_client.user_id().await;
         let our_username: &str = our_username.as_ref().map_or("", UserId::as_str);
 

src/commands/variables.rs

@@ -13,7 +13,7 @@ impl Command for GetAllVariablesCommand {
     }
 
     async fn execute(&self, ctx: &Context<'_>) -> Execution {
-        let key = UserAndRoom(&ctx.username, &ctx.room.room_id.as_str());
+        let key = UserAndRoom(&ctx.username, &ctx.room_id);
         let result = ctx.db.variables.get_user_variables(&key);
 
         let value = match result {
@@ -48,7 +48,7 @@ impl Command for GetVariableCommand {
 
     async fn execute(&self, ctx: &Context<'_>) -> Execution {
         let name = &self.0;
-        let key = UserAndRoom(&ctx.username, &ctx.room.room_id.as_str());
+        let key = UserAndRoom(&ctx.username, &ctx.room_id);
         let result = ctx.db.variables.get_user_variable(&key, name);
 
         let value = match result {
@@ -74,7 +74,7 @@ impl Command for SetVariableCommand {
     async fn execute(&self, ctx: &Context<'_>) -> Execution {
         let name = &self.0;
         let value = self.1;
-        let key = UserAndRoom(&ctx.username, ctx.room.room_id.as_str());
+        let key = UserAndRoom(&ctx.username, ctx.room_id);
         let result = ctx.db.variables.set_user_variable(&key, name, value);
 
         let content = match result {
@@ -98,7 +98,7 @@ impl Command for DeleteVariableCommand {
 
     async fn execute(&self, ctx: &Context<'_>) -> Execution {
         let name = &self.0;
-        let key = UserAndRoom(&ctx.username, ctx.room.room_id.as_str());
+        let key = UserAndRoom(&ctx.username, ctx.room_id);
         let result = ctx.db.variables.delete_user_variable(&key, name);
 
         let value = match result {

src/context.rs

@@ -1,6 +1,5 @@
 use crate::db::Database;
 use matrix_sdk::Client;
-use matrix_sdk::Room;
 
 /// A context carried through the system providing access to things
 /// like the database.
@@ -8,7 +7,7 @@ use matrix_sdk::Room;
 pub struct Context<'a> {
     pub db: Database,
     pub matrix_client: &'a Client,
-    pub room: &'a Room,
+    pub room_id: &'a str,
     pub username: &'a str,
     pub message_body: &'a str,
 }

src/cthulhu/dice.rs

@@ -343,14 +343,6 @@ mod tests {
     use crate::db::Database;
     use crate::parser::{Amount, Element, Operator};
 
-    /// Create a dummy room instance.
-    fn dummy_room() -> matrix_sdk::Room {
-        matrix_sdk::Room::new(
-            &matrix_sdk::identifiers::room_id!("!fakeroomid:example.com"),
-            &matrix_sdk::identifiers::user_id!("@fakeuserid:example.com"),
-        )
-    }
-
     /// Generate a series of numbers manually for testing. For this
     /// die system, the first roll in the Vec should be the unit roll,
     /// and any subsequent rolls should be the tens place roll. The
@@ -391,7 +383,7 @@ mod tests {
         let ctx = Context {
             db: db,
             matrix_client: &matrix_sdk::Client::new("https://example.com").unwrap(),
-            room: &dummy_room(),
+            room_id: "roomid",
             username: "username",
             message_body: "message",
         };

src/dice.rs

@@ -9,7 +9,7 @@ use futures::stream::{self, StreamExt, TryStreamExt};
 //New hotness
 pub async fn calculate_dice_amount(amounts: &[Amount], ctx: &Context<'_>) -> Result<i32, BotError> {
     let stream = stream::iter(amounts);
-    let key = UserAndRoom(&ctx.username, ctx.room.room_id.as_str());
+    let key = UserAndRoom(&ctx.username, &ctx.room_id);
     let variables = &ctx.db.variables.get_user_variables(&key)?;
 
     use DiceRollingError::VariableNotFound;