Merge remote-tracking branch 'origin/main' into livekit

crates/delta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.8.4"
+version = "0.8.7"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"
@@ -52,10 +52,11 @@ async-std = { version = "1.8.0", features = [
 lettre = "0.10.0-alpha.4"
 
 # web
+
 rocket = { version = "0.5.1", default-features = false, features = ["json"] }
 rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", rev = "072d90359b23e9b291df6b672c07c93de9c46011" }
 rocket_empty = { version = "0.1.1", features = ["schema"] }
-rocket_authifier = { version = "1.0.10" }
+rocket_authifier = { version = "1.0.15" }
 rocket_prometheus = "0.10.0-rc.3"
 
 # spec generation
@@ -66,7 +67,7 @@ revolt_rocket_okapi = { version = "0.10.0", features = ["swagger"] }
 amqprs = { version = "1.7.0" }
 
 # core
-authifier = "1.0.10"
+authifier = "1.0.15"
 revolt-config = { path = "../core/config" }
 revolt-database = { path = "../core/database", features = [
     "rocket-impl",

crates/delta/src/routes/channels/members_fetch.rs

@@ -1,4 +1,3 @@
-use futures::future::join_all;
 use revolt_database::{
     util::{permissions::DatabasePermissionQuery, reference::Reference},
     Channel, Database, User,

crates/delta/src/routes/channels/message_bulk_delete.rs

@@ -8,7 +8,6 @@ use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 use rocket::{serde::json::Json, State};
 use rocket_empty::EmptyResponse;
-use serde::Deserialize;
 use validator::Validate;
 
 /// # Bulk Delete Messages

crates/delta/src/routes/channels/message_edit.rs

@@ -1,5 +1,4 @@
 use iso8601_timestamp::Timestamp;
-use revolt_config::config;
 use revolt_database::{
     tasks,
     util::{permissions::DatabasePermissionQuery, reference::Reference},

crates/delta/src/routes/channels/permissions_set.rs

@@ -5,7 +5,6 @@ use revolt_models::v0;
 use revolt_permissions::{calculate_channel_permissions, ChannelPermission, Override};
 use revolt_result::{create_error, Result};
 use rocket::{serde::json::Json, State};
-use serde::Deserialize;
 
 /// # Set Role Permission
 ///

crates/delta/src/routes/customisation/emoji_delete.rs

@@ -3,7 +3,7 @@ use revolt_database::{
     Database, EmojiParent, User,
 };
 use revolt_permissions::{calculate_server_permissions, ChannelPermission};
-use revolt_result::{create_error, Result};
+use revolt_result::Result;
 
 use rocket::State;
 use rocket_empty::EmptyResponse;
@@ -18,7 +18,6 @@ pub async fn delete_emoji(
     user: User,
     emoji_id: Reference,
 ) -> Result<EmptyResponse> {
-
     // Fetch the emoji
     let emoji = emoji_id.as_emoji(db).await?;
 

crates/delta/src/routes/mod.rs

@@ -1,4 +1,4 @@
-use revolt_config::{config, Settings};
+use revolt_config::Settings;
 use revolt_rocket_okapi::{revolt_okapi::openapi3::OpenApi, settings::OpenApiSettings};
 pub use rocket::http::Status;
 pub use rocket::response::Redirect;
@@ -9,6 +9,7 @@ mod channels;
 mod customisation;
 mod invites;
 mod onboard;
+mod policy;
 mod push;
 mod root;
 mod safety;
@@ -36,6 +37,7 @@ pub fn mount(config: Settings, mut rocket: Rocket<Build>) -> Rocket<Build> {
             "/auth/session" => rocket_authifier::routes::session::routes(),
             "/auth/mfa" => rocket_authifier::routes::mfa::routes(),
             "/onboard" => onboard::routes(),
+            "/policy" => policy::routes(),
             "/push" => push::routes(),
             "/sync" => sync::routes(),
             "/webhooks" => webhooks::routes()
@@ -56,6 +58,7 @@ pub fn mount(config: Settings, mut rocket: Rocket<Build>) -> Rocket<Build> {
             "/auth/session" => rocket_authifier::routes::session::routes(),
             "/auth/mfa" => rocket_authifier::routes::mfa::routes(),
             "/onboard" => onboard::routes(),
+            "/policy" => policy::routes(),
             "/push" => push::routes(),
             "/sync" => sync::routes()
         };

crates/delta/src/routes/policy/acknowledge_policy_changes.rs

@@ -0,0 +1,17 @@
+use revolt_database::{events::client::EventV1, Database, Report, Snapshot, SnapshotContent, User};
+use revolt_models::v0::{ReportStatus, ReportedContent};
+use revolt_result::{create_error, Result};
+use serde::Deserialize;
+use ulid::Ulid;
+use validator::Validate;
+
+use rocket::{serde::json::Json, State};
+
+/// # Acknowledge Policy Changes
+///
+/// Accept/acknowledge changes to platform policy.
+#[openapi(tag = "Policy")]
+#[post("/acknowledge")]
+pub async fn acknowledge_policy_changes(db: &State<Database>, user: User) -> Result<()> {
+    db.acknowledge_policy_changes(&user.id).await
+}

crates/delta/src/routes/policy/mod.rs

@@ -0,0 +1,11 @@
+use revolt_rocket_okapi::revolt_okapi::openapi3::OpenApi;
+use rocket::Route;
+
+mod acknowledge_policy_changes;
+
+pub fn routes() -> (Vec<Route>, OpenApi) {
+    openapi_get_routes_spec![
+        // Policy
+        acknowledge_policy_changes::acknowledge_policy_changes,
+    ]
+}

crates/delta/src/routes/servers/ban_create.rs

@@ -5,9 +5,7 @@ use revolt_database::{
 };
 use revolt_models::v0;
 
-use revolt_permissions::{
-    calculate_server_permissions, ChannelPermission,
-};
+use revolt_permissions::{calculate_server_permissions, ChannelPermission};
 use revolt_result::{create_error, Result};
 use rocket::{serde::json::Json, State};
 use validator::Validate;

crates/delta/src/routes/users/fetch_user_flags.rs

@@ -2,7 +2,6 @@ use revolt_database::{util::reference::Reference, Database};
 use revolt_models::v0;
 use revolt_result::Result;
 use rocket::{serde::json::Json, State};
-use serde::Serialize;
 
 /// # Fetch User Flags
 ///

crates/delta/src/routes/webhooks/webhook_execute_github.rs

@@ -588,6 +588,7 @@ pub enum PullRequestEvent {
 #[derive(Debug)]
 #[allow(clippy::large_enum_variant)]
 pub enum BaseEvent {
+    #[allow(dead_code)]
     Star(StarEvent),
     Ping,
     Push(PushEvent),
@@ -829,7 +830,7 @@ pub async fn webhook_execute_github(
                         })
                         .collect::<Vec<String>>()
                         .join("\n"),
-                        1000
+                    1000,
                 );
 
                 SendableEmbed {