diff --git a/set_version.sh b/set_version.sh index 0df975c7333087afe364bb69d23586cc62259a6e..fbb6134f9d41def4bb365551ee94b8a5ecbd66b5 100755 --- a/set_version.sh +++ b/set_version.sh @@ -1,3 +1,3 @@ #!/bin/bash -export version=0.5.0-alpha.0 +export version=0.5.0-alpha.0-patch.0 echo "pub const VERSION: &str = \"${version}\";" > src/version.rs diff --git a/src/database/entities/channel.rs b/src/database/entities/channel.rs index 881afd25799e951f722a104b6daa9b27b2e3b3b4..043799fe4eb6224c063c239f49979334ba585616 100644 --- a/src/database/entities/channel.rs +++ b/src/database/entities/channel.rs @@ -116,7 +116,7 @@ impl Channel { let messages = get_collection("messages"); // Delete any invites. - get_collection("invites") + get_collection("channel_invites") .delete_many( doc! { "channel": id @@ -126,7 +126,7 @@ impl Channel { .await .map_err(|_| Error::DatabaseError { operation: "delete_many", - with: "invites", + with: "channel_invites", })?; // Check if there are any attachments we need to delete. diff --git a/src/database/entities/invites.rs b/src/database/entities/invites.rs index 7574a178bd3e3f6382d500f031fc1ce432be2197..9d3cfecbd5db47729ded08cd8537f2ca7e79e668 100644 --- a/src/database/entities/invites.rs +++ b/src/database/entities/invites.rs @@ -44,7 +44,7 @@ impl Invite { } pub async fn get(code: &str) -> Result<Invite> { - let doc = get_collection("invites") + let doc = get_collection("channel_invites") .find_one(doc! { "_id": code }, None) .await .map_err(|_| Error::DatabaseError { @@ -60,7 +60,7 @@ impl Invite { } pub async fn save(self) -> Result<()> { - get_collection("invites") + get_collection("channel_invites") .insert_one( to_document(&self).map_err(|_| Error::DatabaseError { operation: "to_bson", @@ -78,7 +78,7 @@ impl Invite { } pub async fn delete(&self) -> Result<()> { - get_collection("invites") + get_collection("channel_invites") .delete_one( doc! { "_id": self.code() diff --git a/src/database/entities/server.rs b/src/database/entities/server.rs index 4984677e50b0f9b17b495a62678a6907625727ad..b30c5c4a7b0b64cf52ab49e878e857477c4fcb2a 100644 --- a/src/database/entities/server.rs +++ b/src/database/entities/server.rs @@ -165,7 +165,7 @@ impl Server { })?; // Delete all channels, members, bans and invites. - for with in &["channels", "invites"] { + for with in &["channels", "channel_invites"] { get_collection(with) .delete_many( doc! { diff --git a/src/database/guards/reference.rs b/src/database/guards/reference.rs index 3570a29e227729d02aa13165cd6bed97ee279fa2..adfa7d26b00418d70a6636c912ddd07604ad5d9f 100644 --- a/src/database/guards/reference.rs +++ b/src/database/guards/reference.rs @@ -59,7 +59,7 @@ impl Ref { } pub async fn fetch_invite(&self) -> Result<Invite> { - self.fetch("invites").await + self.fetch("channel_invites").await } pub async fn fetch_member(&self, server: &str) -> Result<Member> { diff --git a/src/database/migrations/init.rs b/src/database/migrations/init.rs index d08971f811eb664a84185326b029ce3577a21559..dcb06308fdd23988967c766bb8b759b23ce34a62 100644 --- a/src/database/migrations/init.rs +++ b/src/database/migrations/init.rs @@ -37,9 +37,9 @@ pub async fn create_database() { .await .expect("Failed to create server_bans collection."); - db.create_collection("invites", None) + db.create_collection("channel_invites", None) .await - .expect("Failed to create invites collection."); + .expect("Failed to create channel_invites collection."); db.create_collection("migrations", None) .await diff --git a/src/database/migrations/scripts.rs b/src/database/migrations/scripts.rs index 0186353b8caaa8fca9179d911fd86662433a3844..a5d5eceec8274fc79d704aacac96a4b5767ed99a 100644 --- a/src/database/migrations/scripts.rs +++ b/src/database/migrations/scripts.rs @@ -152,9 +152,9 @@ pub async fn run_migrations(revision: i32) -> i32 { .expect("Failed to create server_bans collection."); get_db() - .create_collection("invites", None) + .create_collection("channel_invites", None) .await - .expect("Failed to create invites collection."); + .expect("Failed to create channel_invites collection."); } // Reminder to update LATEST_REVISION when adding new migrations. diff --git a/src/routes/servers/invites_fetch.rs b/src/routes/servers/invites_fetch.rs index 9ef36073449d0f15ec4268a1a16c14ffe7f8ec87..d307051b0eb2e2819ac54c4ca310deb23545d2e6 100644 --- a/src/routes/servers/invites_fetch.rs +++ b/src/routes/servers/invites_fetch.rs @@ -27,7 +27,7 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> { Err(Error::MissingPermission)? } - let mut cursor = get_collection("invites") + let mut cursor = get_collection("channel_invites") .find( doc! { "server": target.id @@ -37,7 +37,7 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> { .await .map_err(|_| Error::DatabaseError { operation: "find", - with: "invites", + with: "channel_invites", })?; let mut invites = vec![]; diff --git a/src/version.rs b/src/version.rs index ab774c50785020efef67df4358086324b233a995..ce7db47e6843655fd015e1ef394999f5e34d0a7d 100644 --- a/src/version.rs +++ b/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "0.5.0-alpha.0"; +pub const VERSION: &str = "0.5.0-alpha.0-patch.0";