From e7c840a4d4f57644259eadedd0699f186dc61b63 Mon Sep 17 00:00:00 2001
From: jude <jude@jellywx.com>
Date: Mon, 19 Aug 2024 21:45:24 +0100
Subject: [PATCH] Fix patreon not sharing between guild members

---
 .../src/components/Reminder/Settings.tsx            | 13 ++++++++++---
 src/web/routes/dashboard/api/user/mod.rs            |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/reminder-dashboard/src/components/Reminder/Settings.tsx b/reminder-dashboard/src/components/Reminder/Settings.tsx
index d85a6ee..30f83f9 100644
--- a/reminder-dashboard/src/components/Reminder/Settings.tsx
+++ b/reminder-dashboard/src/components/Reminder/Settings.tsx
@@ -2,7 +2,7 @@ import { ChannelSelector } from "./ChannelSelector";
 import { DateTime } from "luxon";
 import { IntervalSelector } from "./IntervalSelector";
 import { useQuery } from "react-query";
-import { fetchUserInfo } from "../../api";
+import { fetchGuildInfo, fetchUserInfo } from "../../api";
 import { useReminder } from "./ReminderContext";
 import { Attachment } from "./Attachment";
 import { TTS } from "./TTS";
@@ -12,10 +12,11 @@ import { useGuild } from "../App/useGuild";
 export const Settings = () => {
     const guild = useGuild();
     const { isSuccess: userFetched, data: userInfo } = useQuery({ ...fetchUserInfo() });
+    const { isSuccess: guildFetched, data: guildInfo } = useQuery({ ...fetchGuildInfo(guild) });
 
     const [reminder, setReminder] = useReminder();
 
-    if (!userFetched) {
+    if (!userFetched || !guildFetched) {
         return <></>;
     }
 
@@ -59,7 +60,13 @@ export const Settings = () => {
 
             <div class="collapses split-controls">
                 <div>
-                    <div class={userInfo.patreon ? "patreon-only" : "patreon-only is-locked"}>
+                    <div
+                        class={
+                            userInfo.patreon || guildInfo.patreon
+                                ? "patreon-only"
+                                : "patreon-only is-locked"
+                        }
+                    >
                         <div class="patreon-invert foreground">
                             Intervals available on <a href="https://patreon.com/jellywx">Patreon</a>{" "}
                             or{" "}
diff --git a/src/web/routes/dashboard/api/user/mod.rs b/src/web/routes/dashboard/api/user/mod.rs
index 5de3ada..8e6c360 100644
--- a/src/web/routes/dashboard/api/user/mod.rs
+++ b/src/web/routes/dashboard/api/user/mod.rs
@@ -74,7 +74,7 @@ pub async fn get_user_info(
         let preferences = sqlx::query!(
             "
             SELECT
-                timezone,
+                IFNULL(timezone, 'UTC') AS timezone,
                 use_browser_timezone,
                 dashboard_color_scheme,
                 reset_inputs_on_create