Compare commits

...
4 Commits
15 changed files with 38 additions and 31 deletions

No files matched your search

Generated
+8 -8
View File
@@ -3593,7 +3593,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-bonfire" name = "revolt-bonfire"
version = "0.7.13" version = "0.7.14"
dependencies = [ dependencies = [
"async-channel 2.3.1", "async-channel 2.3.1",
"async-std", "async-std",
@@ -3623,7 +3623,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-config" name = "revolt-config"
version = "0.7.13" version = "0.7.14"
dependencies = [ dependencies = [
"async-std", "async-std",
"cached", "cached",
@@ -3639,7 +3639,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-database" name = "revolt-database"
version = "0.7.13" version = "0.7.14"
dependencies = [ dependencies = [
"async-lock", "async-lock",
"async-recursion", "async-recursion",
@@ -3686,7 +3686,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-delta" name = "revolt-delta"
version = "0.7.13" version = "0.7.14"
dependencies = [ dependencies = [
"async-channel 1.6.1", "async-channel 1.6.1",
"async-std", "async-std",
@@ -3733,7 +3733,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-models" name = "revolt-models"
version = "0.7.13" version = "0.7.14"
dependencies = [ dependencies = [
"indexmap 1.9.3", "indexmap 1.9.3",
"iso8601-timestamp 0.2.11", "iso8601-timestamp 0.2.11",
@@ -3750,7 +3750,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-permissions" name = "revolt-permissions"
version = "0.7.13" version = "0.7.14"
dependencies = [ dependencies = [
"async-std", "async-std",
"async-trait", "async-trait",
@@ -3765,7 +3765,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-presence" name = "revolt-presence"
version = "0.7.13" version = "0.7.14"
dependencies = [ dependencies = [
"async-std", "async-std",
"log", "log",
@@ -3776,7 +3776,7 @@ dependencies = [
[[package]] [[package]]
name = "revolt-result" name = "revolt-result"
version = "0.7.13" version = "0.7.14"
dependencies = [ dependencies = [
"revolt_okapi", "revolt_okapi",
"revolt_rocket_okapi", "revolt_rocket_okapi",
+1 -1
View File
@@ -143,7 +143,7 @@ Now run tests for whichever database:
```sh ```sh
TEST_DB=REFERENCE cargo nextest run TEST_DB=REFERENCE cargo nextest run
TEST_DB=MONGOBD cargo nextest run TEST_DB=MONGODB cargo nextest run
``` ```
## License ## License
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-bonfire" name = "revolt-bonfire"
version = "0.7.13" version = "0.7.14"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
edition = "2021" edition = "2021"
@@ -41,7 +41,7 @@ revolt-result = { path = "../core/result" }
revolt-models = { path = "../core/models" } revolt-models = { path = "../core/models" }
revolt-config = { path = "../core/config" } revolt-config = { path = "../core/config" }
revolt-database = { path = "../core/database" } revolt-database = { path = "../core/database" }
revolt-permissions = { version = "0.7.13", path = "../core/permissions" } revolt-permissions = { version = "0.7.14", path = "../core/permissions" }
revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] } revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] }
# redis # redis
+1 -1
View File
@@ -443,7 +443,7 @@ impl State {
EventV1::ServerMemberJoin { .. } => { EventV1::ServerMemberJoin { .. } => {
// We will always receive ServerCreate when joining a new server. // We will always receive ServerCreate when joining a new server.
} }
EventV1::ServerMemberLeave { id, user } => { EventV1::ServerMemberLeave { id, user, .. } => {
if user == &self.cache.user_id { if user == &self.cache.user_id {
self.remove_subscription(id).await; self.remove_subscription(id).await;
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-config" name = "revolt-config"
version = "0.7.13" version = "0.7.14"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
authors = ["Paul Makles <me@insrt.uk>"] authors = ["Paul Makles <me@insrt.uk>"]
+6 -6
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-database" name = "revolt-database"
version = "0.7.13" version = "0.7.14"
edition = "2021" edition = "2021"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
authors = ["Paul Makles <me@insrt.uk>"] authors = ["Paul Makles <me@insrt.uk>"]
@@ -23,13 +23,13 @@ default = ["mongodb", "async-std-runtime", "tasks"]
[dependencies] [dependencies]
# Core # Core
revolt-config = { version = "0.7.13", path = "../config" } revolt-config = { version = "0.7.14", path = "../config" }
revolt-result = { version = "0.7.13", path = "../result" } revolt-result = { version = "0.7.14", path = "../result" }
revolt-models = { version = "0.7.13", path = "../models", features = [ revolt-models = { version = "0.7.14", path = "../models", features = [
"validator", "validator",
] } ] }
revolt-presence = { version = "0.7.13", path = "../presence" } revolt-presence = { version = "0.7.14", path = "../presence" }
revolt-permissions = { version = "0.7.13", path = "../permissions", features = [ revolt-permissions = { version = "0.7.14", path = "../permissions", features = [
"serde", "serde",
"bson", "bson",
] } ] }
+7 -3
View File
@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
use revolt_models::v0::{ use revolt_models::v0::{
AppendMessage, Channel, Emoji, FieldsChannel, FieldsMember, FieldsRole, FieldsServer, AppendMessage, Channel, Emoji, FieldsChannel, FieldsMember, FieldsRole, FieldsServer,
FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember, FieldsUser, FieldsWebhook, Member, MemberCompositeKey, Message, PartialChannel, PartialMember,
PartialMessage, PartialRole, PartialServer, PartialUser, PartialWebhook, Report, Server, User, PartialMessage, PartialRole, PartialServer, PartialUser, PartialWebhook, RemovalIntention,
UserSettings, Webhook, Report, Server, User, UserSettings, Webhook,
}; };
use revolt_result::Error; use revolt_result::Error;
@@ -136,7 +136,11 @@ pub enum EventV1 {
ServerMemberJoin { id: String, user: String }, ServerMemberJoin { id: String, user: String },
/// User left server /// User left server
ServerMemberLeave { id: String, user: String }, ServerMemberLeave {
id: String,
user: String,
reason: RemovalIntention,
},
/// Server role created or updated /// Server role created or updated
ServerRoleUpdate { ServerRoleUpdate {
@@ -172,7 +172,7 @@ mod tests {
.await .await
.unwrap(); .unwrap();
let bot = Bot::create( let (bot, _) = Bot::create(
&db, &db,
"Bot Name".to_string(), "Bot Name".to_string(),
&owner, &owner,
@@ -702,6 +702,8 @@ impl Channel {
} }
} }
db.remove_user_from_group(id, &user.id).await?;
EventV1::ChannelGroupLeave { EventV1::ChannelGroupLeave {
id: id.to_string(), id: id.to_string(),
user: user.id.to_string(), user: user.id.to_string(),
@@ -229,6 +229,7 @@ impl Member {
EventV1::ServerMemberLeave { EventV1::ServerMemberLeave {
id: self.id.server.to_string(), id: self.id.server.to_string(),
user: self.id.user.to_string(), user: self.id.user.to_string(),
reason: intention.clone().into(),
} }
.p(self.id.server.to_string()) .p(self.id.server.to_string())
.await; .await;
+3 -3
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-models" name = "revolt-models"
version = "0.7.13" version = "0.7.14"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
authors = ["Paul Makles <me@insrt.uk>"] authors = ["Paul Makles <me@insrt.uk>"]
@@ -19,8 +19,8 @@ default = ["serde", "partials", "rocket"]
[dependencies] [dependencies]
# Core # Core
revolt-config = { version = "0.7.13", path = "../config" } revolt-config = { version = "0.7.14", path = "../config" }
revolt-permissions = { version = "0.7.13", path = "../permissions" } revolt-permissions = { version = "0.7.14", path = "../permissions" }
# Utility # Utility
regex = "1" regex = "1"
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-permissions" name = "revolt-permissions"
version = "0.7.13" version = "0.7.14"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
authors = ["Paul Makles <me@insrt.uk>"] authors = ["Paul Makles <me@insrt.uk>"]
@@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] }
[dependencies] [dependencies]
# Core # Core
revolt-result = { version = "0.7.13", path = "../result" } revolt-result = { version = "0.7.14", path = "../result" }
# Utility # Utility
auto_ops = "0.3.0" auto_ops = "0.3.0"
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-presence" name = "revolt-presence"
version = "0.7.13" version = "0.7.14"
edition = "2021" edition = "2021"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
authors = ["Paul Makles <me@insrt.uk>"] authors = ["Paul Makles <me@insrt.uk>"]
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-result" name = "revolt-result"
version = "0.7.13" version = "0.7.14"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
authors = ["Paul Makles <me@insrt.uk>"] authors = ["Paul Makles <me@insrt.uk>"]
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "revolt-delta" name = "revolt-delta"
version = "0.7.13" version = "0.7.14"
license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
authors = ["Paul Makles <paulmakles@gmail.com>"] authors = ["Paul Makles <paulmakles@gmail.com>"]
edition = "2018" edition = "2018"