Apply patreon sharing across web/bot

src/web/routes/dashboard/api/guild/mod.rs

@@ -7,38 +7,43 @@ pub mod todos;
 
 use std::env;
 
+use crate::utils::check_subscription;
+use crate::web::guards::transaction::Transaction;
+use crate::web::{check_authorization, routes::JsonResult};
 pub use channels::get_guild_channels;
 pub use emojis::get_guild_emojis;
 pub use reminders::*;
 use rocket::{get, http::CookieJar, serde::json::json, State};
 pub use roles::get_guild_roles;
+use serenity::all::UserId;
 use serenity::{
     client::Context,
     model::id::{GuildId, RoleId},
 };
 pub use templates::*;
 
-use crate::web::{check_authorization, routes::JsonResult};
-
 #[get("/api/guild/<id>")]
-pub async fn get_guild_info(id: u64, cookies: &CookieJar<'_>, ctx: &State<Context>) -> JsonResult {
+pub async fn get_guild_info(
+    id: u64,
+    cookies: &CookieJar<'_>,
+    ctx: &State<Context>,
+    mut transaction: Transaction<'_>,
+) -> JsonResult {
     offline!(Ok(json!({ "patreon": true, "name": "Guild" })));
     check_authorization(cookies, ctx.inner(), id).await?;
 
-    match GuildId::new(id)
-        .to_guild_cached(ctx.inner())
-        .map(|guild| (guild.owner_id, guild.name.clone()))
-    {
-        Some((owner_id, name)) => {
-            let member_res = GuildId::new(env::var("PATREON_GUILD_ID").unwrap().parse().unwrap())
-                .member(&ctx.inner(), owner_id)
-                .await;
+    let user_id =
+        cookies.get_private("userid").map(|c| c.value().parse::<u64>().ok()).flatten().unwrap();
 
-            let patreon = member_res.map_or(false, |member| {
-                member
-                    .roles
-                    .contains(&RoleId::new(env::var("PATREON_ROLE_ID").unwrap().parse().unwrap()))
-            });
+    match GuildId::new(id).to_guild_cached(ctx.inner()).map(|guild| guild.name.clone()) {
+        Some(name) => {
+            let patreon = check_subscription(
+                ctx.inner(),
+                transaction.executor(),
+                UserId::from(user_id),
+                Some(GuildId::from(id)),
+            )
+            .await;
 
             Ok(json!({ "patreon": patreon, "name": name }))
         }

src/web/routes/dashboard/api/guild/reminders.rs

@@ -12,8 +12,9 @@ use serenity::{
 };
 use sqlx::{MySql, Pool};
 
+use crate::utils::check_subscription;
 use crate::web::{
-    check_authorization, check_guild_subscription, check_subscription,
+    check_authorization,
     consts::MIN_INTERVAL,
     guards::transaction::Transaction,
     routes::{
@@ -186,8 +187,13 @@ pub async fn edit_reminder(
         || reminder.interval_months.flatten().is_some()
         || reminder.interval_seconds.flatten().is_some()
     {
-        if check_guild_subscription(&ctx.inner(), id).await
-            || check_subscription(&ctx.inner(), user_id).await
+        if check_subscription(
+            ctx.inner(),
+            transaction.executor(),
+            UserId::from(user_id),
+            Some(GuildId::from(id)),
+        )
+        .await
         {
             let new_interval_length = match reminder.interval_days {
                 Some(interval) => interval.unwrap_or(0),