Slack webhooks (#959)

* Slack webhooks * Fix automod rejecting audio and locale packs * Run prepare
modrinth · Sep 7, 2024 · cb0f03c · cb0f03c
1 parent 2e35f36
commit cb0f03c
Show file tree

Hide file tree

Showing 6 changed files with 361 additions and 283 deletions.
diff --git a/.env b/.env
@@ -20,7 +20,7 @@ REDIS_MAX_CONNECTIONS=10000
 BIND_ADDR=127.0.0.1:8000
 SELF_ADDR=http://127.0.0.1:8000
 
-MODERATION_DISCORD_WEBHOOK=
+MODERATION_SLACK_WEBHOOK=
 PUBLIC_DISCORD_WEBHOOK=
 CLOUDFLARE_INTEGRATION=false
 

diff --git a/.sqlx/query-47611992348919d1f4ba21c35784492b95030d6c10d6a066b245b35be0386e81.json b/.sqlx/query-47611992348919d1f4ba21c35784492b95030d6c10d6a066b245b35be0386e81.json
diff --git a/src/queue/moderation.rs b/src/queue/moderation.rs
@@ -246,7 +246,11 @@ impl AutomatedModerationQueue {
                                 mod_messages.messages.push(ModerationMessage::MissingCustomLicenseUrl { license: project.inner.license.clone() });
                             }
 
-                            if (project.project_types.contains(&"resourcepack".to_string()) || project.project_types.contains(&"shader".to_string())) && project.gallery_items.is_empty() {
+                            if (project.project_types.contains(&"resourcepack".to_string()) || project.project_types.contains(&"shader".to_string())) &&
+                                project.gallery_items.is_empty() &&
+                                !project.categories.contains(&"audio".to_string()) &&
+                                !project.categories.contains(&"locale".to_string())
+                            {
                                 mod_messages.messages.push(ModerationMessage::MissingGalleryImage);
                             }
 
@@ -660,15 +664,15 @@ impl AutomatedModerationQueue {
                                         .insert_many(members.into_iter().map(|x| x.user_id).collect(), &mut transaction, &redis)
                                         .await?;
 
-                                    if let Ok(webhook_url) = dotenvy::var("MODERATION_DISCORD_WEBHOOK") {
-                                        crate::util::webhook::send_discord_webhook(
+                                    if let Ok(webhook_url) = dotenvy::var("MODERATION_SLACK_WEBHOOK") {
+                                        crate::util::webhook::send_slack_webhook(
                                             project.inner.id.into(),
                                             &pool,
                                             &redis,
                                             webhook_url,
                                             Some(
                                                 format!(
-                                                    "**[AutoMod]({}/user/AutoMod)** changed project status from **{}** to **Rejected**",
+                                                    "*<{}/user/AutoMod|AutoMod>* changed project status from *{}* to *Rejected*",
                                                     dotenvy::var("SITE_URL")?,
                                                     &project.inner.status.as_friendly_str(),
                                                 )

diff --git a/src/routes/v3/oauth_clients.rs b/src/routes/v3/oauth_clients.rs
@@ -249,6 +249,7 @@ pub struct OAuthClientEdit {
     )]
     pub name: Option<String>,
 
+    #[validate(custom(function = "crate::util::validate::validate_no_restricted_scopes"))]
     pub max_scopes: Option<Scopes>,
 
     #[validate(length(min = 1))]

diff --git a/src/routes/v3/projects.rs b/src/routes/v3/projects.rs
@@ -398,18 +398,18 @@ pub async fn project_edit(
                 }
 
                 if user.role.is_mod() {
-                    if let Ok(webhook_url) = dotenvy::var("MODERATION_DISCORD_WEBHOOK") {
-                        crate::util::webhook::send_discord_webhook(
+                    if let Ok(webhook_url) = dotenvy::var("MODERATION_SLACK_WEBHOOK") {
+                        crate::util::webhook::send_slack_webhook(
                             project_item.inner.id.into(),
                             &pool,
                             &redis,
                             webhook_url,
                             Some(
                                 format!(
-                                    "**[{}]({}/user/{})** changed project status from **{}** to **{}**",
-                                    user.username,
+                                    "*<{}/user/{}|{}>* changed project status from *{}* to *{}*",
                                     dotenvy::var("SITE_URL")?,
                                     user.username,
+                                    user.username,
                                     &project_item.inner.status.as_friendly_str(),
                                     status.as_friendly_str(),
                                 )