Add vote webhooks

scripty-bot · Dec 21, 2023 · f1c8908 · f1c8908
1 parent 508a134
commit f1c8908
Show file tree

Hide file tree

Showing 39 changed files with 519 additions and 459 deletions.
diff --git a/.sqlx/query-343e3787a742ae6ed8bcb167d2a5ebe8ccd6b29a5d52eca4cb4382391eca39f8.json b/.sqlx/query-343e3787a742ae6ed8bcb167d2a5ebe8ccd6b29a5d52eca4cb4382391eca39f8.json
diff --git a/.sqlx/query-44e187a92daa9453a5465cd057fdeaa7237eb96c13395d7d099b714d85793eff.json b/.sqlx/query-44e187a92daa9453a5465cd057fdeaa7237eb96c13395d7d099b714d85793eff.json
diff --git a/.sqlx/query-8d09c510bf7c60f5ad05c3be9054f2519432711eeef25dbd69a8528f8378c594.json b/.sqlx/query-8d09c510bf7c60f5ad05c3be9054f2519432711eeef25dbd69a8528f8378c594.json
diff --git a/.sqlx/query-8f88862824d6f1d9a305cb1c96bf78bb19609c0f1067673af10308282706c59a.json b/.sqlx/query-8f88862824d6f1d9a305cb1c96bf78bb19609c0f1067673af10308282706c59a.json
diff --git a/.sqlx/query-a55baeff8a9d29d3f4bf93bdce5a8516107f98b21ef7eaf913e1d73cafbad1a1.json b/.sqlx/query-a55baeff8a9d29d3f4bf93bdce5a8516107f98b21ef7eaf913e1d73cafbad1a1.json
diff --git a/.sqlx/query-a90b58705c2aa90bd947676b09f5c1bd7cf8de9ac78a57ae007ba1e233e23ff5.json b/.sqlx/query-a90b58705c2aa90bd947676b09f5c1bd7cf8de9ac78a57ae007ba1e233e23ff5.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/migrations/20231216214434_vote_reminder_table.sql b/migrations/20231216214434_vote_reminder_table.sql
@@ -0,0 +1,8 @@
+-- Add migration script here
+CREATE TABLE vote_reminders (
+    user_id BIGINT NOT NULL,
+    site_id SMALLINT NOT NULL,
+    next_reminder TIMESTAMP NOT NULL,
+
+    PRIMARY KEY (user_id, site_id)
+);
diff --git a/migrations/20231217034034_vote_reminder_opt_out.sql b/migrations/20231217034034_vote_reminder_opt_out.sql
@@ -0,0 +1,2 @@
+-- Add migration script here
+ALTER TABLE users ADD COLUMN vote_reminder_disabled BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/scripty_audio_handler/src/events/voice_tick.rs b/scripty_audio_handler/src/events/voice_tick.rs
@@ -394,7 +394,10 @@ async fn finalize_stream(
 			webhook_executor
 		}
 		Ok(_) => return (None, None),
-		Err(error) => handle_error(error, ssrc),
+		Err(e) => {
+			error!(%ssrc, "failed to get stream result: {}", e);
+			return (None, None);
+		}
 	};
 
 	debug!(%ssrc, "got stream results");

diff --git a/scripty_bot_utils/src/background_tasks/tasks/bot_list_poster.rs b/scripty_bot_utils/src/background_tasks/tasks/bot_list_poster.rs
@@ -1,7 +1,20 @@
 use std::{sync::Arc, time::Duration};
 
 use reqwest::Client;
-use scripty_botlists::*;
+use scripty_botlists::{
+	botlist_me::BotListMe,
+	discord_bots_gg::DiscordBotsGG,
+	discordbotlist_com::DiscordBotListCom,
+	discordextremelist_xyz::DiscordExtremeListXyz,
+	discords_com::DiscordsCom,
+	discordservices_net::DiscordServicesNet,
+	disforge_com::DisforgeCom,
+	infinitybots_gg::InfinityBotsGG,
+	top_gg::TopGG,
+	voidbots_net::VoidBotsNet,
+	PostStats,
+	StatPoster,
+};
 use scripty_config::BotListsConfig;
 use serenity::client::Context;
 
@@ -51,17 +64,12 @@ enum BotLists {
 	BotListMe(BotListMe),
 	DiscordBotsGG(DiscordBotsGG),
 	DiscordBotListCom(DiscordBotListCom),
-	DiscordBotListEu(DiscordBotListEu),
 	DiscordExtremeListXyz(DiscordExtremeListXyz),
-	DiscordListGG(DiscordListGG),
 	DiscordsCom(DiscordsCom),
 	DiscordServicesNet(DiscordServicesNet),
 	DisforgeCom(DisforgeCom),
 	InfinityBotsGG(InfinityBotsGG),
-	MotionDevelopmentTop(MotionDevelopmentTop),
-	RadarCordNet(RadarCordNet),
 	TopGG(TopGG),
-	TopCordXyz(TopCordXyz),
 	VoidBotsNet(VoidBotsNet),
 }
 
@@ -76,17 +84,12 @@ impl StatPoster for BotLists {
 			BotLists::BotListMe(item) => item.post_stats(client, stats).await,
 			BotLists::DiscordBotsGG(item) => item.post_stats(client, stats).await,
 			BotLists::DiscordBotListCom(item) => item.post_stats(client, stats).await,
-			BotLists::DiscordBotListEu(item) => item.post_stats(client, stats).await,
 			BotLists::DiscordExtremeListXyz(item) => item.post_stats(client, stats).await,
-			BotLists::DiscordListGG(item) => item.post_stats(client, stats).await,
 			BotLists::DiscordsCom(item) => item.post_stats(client, stats).await,
 			BotLists::DiscordServicesNet(item) => item.post_stats(client, stats).await,
 			BotLists::DisforgeCom(item) => item.post_stats(client, stats).await,
 			BotLists::InfinityBotsGG(item) => item.post_stats(client, stats).await,
-			BotLists::MotionDevelopmentTop(item) => item.post_stats(client, stats).await,
-			BotLists::RadarCordNet(item) => item.post_stats(client, stats).await,
 			BotLists::TopGG(item) => item.post_stats(client, stats).await,
-			BotLists::TopCordXyz(item) => item.post_stats(client, stats).await,
 			BotLists::VoidBotsNet(item) => item.post_stats(client, stats).await,
 		}
 	}
@@ -114,27 +117,13 @@ fn add_bot_lists(bot_lists: &mut Vec<BotLists>, bot_id: u64) {
 		)));
 	}
 
-	if let Some(BotListsConfig::TokenOnly(token)) = bot_list_cfg.get("discordbotlist_eu") {
-		bot_lists.push(BotLists::DiscordBotListEu(DiscordBotListEu::new(
-			token.clone(),
-			bot_id,
-		)));
-	}
-
 	if let Some(BotListsConfig::TokenOnly(token)) = bot_list_cfg.get("discordextremelist_xyz") {
 		bot_lists.push(BotLists::DiscordExtremeListXyz(DiscordExtremeListXyz::new(
 			token.clone(),
 			bot_id,
 		)));
 	}
 
-	if let Some(BotListsConfig::TokenOnly(token)) = bot_list_cfg.get("discordlist_gg") {
-		bot_lists.push(BotLists::DiscordListGG(DiscordListGG::new(
-			token.clone(),
-			bot_id,
-		)));
-	}
-
 	if let Some(BotListsConfig::TokenOnly(token)) = bot_list_cfg.get("discords_com") {
 		bot_lists.push(BotLists::DiscordsCom(DiscordsCom::new(
 			token.clone(),
@@ -164,28 +153,10 @@ fn add_bot_lists(bot_lists: &mut Vec<BotLists>, bot_id: u64) {
 		)));
 	}
 
-	if let Some(BotListsConfig::TokenOnly(token)) = bot_list_cfg.get("motiondevelopment_top") {
-		bot_lists.push(BotLists::MotionDevelopmentTop(MotionDevelopmentTop::new(
-			token.clone(),
-			bot_id,
-		)));
-	}
-
-	if let Some(BotListsConfig::TokenOnly(token)) = bot_list_cfg.get("radarcord_net") {
-		bot_lists.push(BotLists::RadarCordNet(RadarCordNet::new(
-			token.clone(),
-			bot_id,
-		)));
-	}
-
 	if let Some(BotListsConfig::FullConfig { token, .. }) = bot_list_cfg.get("top_gg") {
 		bot_lists.push(BotLists::TopGG(TopGG::new(token.clone(), bot_id)));
 	}
 
-	if let Some(BotListsConfig::TokenOnly(token)) = bot_list_cfg.get("topcord_xyz") {
-		bot_lists.push(BotLists::TopCordXyz(TopCordXyz::new(token.clone(), bot_id)));
-	}
-
 	if let Some(BotListsConfig::TokenOnly(token)) = bot_list_cfg.get("voidbots_net") {
 		bot_lists.push(BotLists::VoidBotsNet(VoidBotsNet::new(
 			token.clone(),

diff --git a/scripty_botlists/src/lists/discordbotlist_eu/mod.rs b/scripty_botlists/src/lists/discordbotlist_eu/mod.rs
diff --git a/scripty_botlists/src/lists/discordbotlist_eu/models.rs b/scripty_botlists/src/lists/discordbotlist_eu/models.rs
diff --git a/scripty_botlists/src/lists/discordbotlist_eu/trait_impl.rs b/scripty_botlists/src/lists/discordbotlist_eu/trait_impl.rs
diff --git a/scripty_botlists/src/lists/discordlist_gg/mod.rs b/scripty_botlists/src/lists/discordlist_gg/mod.rs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- Add migration script here
		ALTER TABLE users ADD COLUMN vote_reminder_disabled BOOLEAN NOT NULL DEFAULT FALSE;