From 63fc2cdcbcf267d1c4f72313c5c6d0f68f201d82 Mon Sep 17 00:00:00 2001
From: jude <jude@jellywx.com>
Date: Sun, 10 Mar 2024 19:43:57 +0000
Subject: [PATCH] Block editing username and avatar on DMs

---
 .../src/components/Reminder/Avatar.tsx        | 28 ++++++++++
 .../src/components/Reminder/Message.tsx       | 51 +++++++------------
 .../src/components/Reminder/Username.tsx      |  8 ++-
 .../src/components/Sidebar/index.tsx          | 20 +++++++-
 web/src/lib.rs                                |  1 +
 web/src/routes/dashboard/api/mod.rs           |  1 -
 web/src/routes/dashboard/api/user/mod.rs      |  2 +-
 7 files changed, 73 insertions(+), 38 deletions(-)
 create mode 100644 reminder-dashboard/src/components/Reminder/Avatar.tsx

diff --git a/reminder-dashboard/src/components/Reminder/Avatar.tsx b/reminder-dashboard/src/components/Reminder/Avatar.tsx
new file mode 100644
index 0000000..61127ed
--- /dev/null
+++ b/reminder-dashboard/src/components/Reminder/Avatar.tsx
@@ -0,0 +1,28 @@
+import { ImagePicker } from "./ImagePicker";
+import { useReminder } from "./ReminderContext";
+import { useGuild } from "../App/useGuild";
+
+export const Avatar = () => {
+    const guild = useGuild();
+    const [reminder, setReminder] = useReminder();
+
+    return guild ? (
+        <ImagePicker
+            class="is-rounded avatar"
+            url={reminder.avatar || "/static/img/icon.png"}
+            alt="Image for discord avatar"
+            setImage={(url: string) => {
+                setReminder((reminder) => ({
+                    ...reminder,
+                    avatar: url,
+                }));
+            }}
+        ></ImagePicker>
+    ) : (
+        <img
+            class="is-rounded avatar"
+            alt="Image for discord avatar"
+            src={"/static/img/icon.png"}
+        ></img>
+    );
+};
diff --git a/reminder-dashboard/src/components/Reminder/Message.tsx b/reminder-dashboard/src/components/Reminder/Message.tsx
index 1b9ba10..07e7e7a 100644
--- a/reminder-dashboard/src/components/Reminder/Message.tsx
+++ b/reminder-dashboard/src/components/Reminder/Message.tsx
@@ -1,38 +1,23 @@
-import { ImagePicker } from "./ImagePicker";
 import { Username } from "./Username";
 import { Content } from "./Content";
 import { Embed } from "./Embed";
-import { useReminder } from "./ReminderContext";
+import { Avatar } from "./Avatar";
 
-export const Message = () => {
-    const [reminder, setReminder] = useReminder();
-
-    return (
-        <div class="column discord-frame">
-            <article class="media">
-                <figure class="media-left">
-                    <p class="image is-32x32 customizable">
-                        <ImagePicker
-                            class="is-rounded avatar"
-                            url={reminder.avatar || "/static/img/icon.png"}
-                            alt="Image for discord avatar"
-                            setImage={(url: string) => {
-                                setReminder((reminder) => ({
-                                    ...reminder,
-                                    avatar: url,
-                                }));
-                            }}
-                        ></ImagePicker>
-                    </p>
-                </figure>
-                <div class="media-content">
-                    <div class="content">
-                        <Username />
-                        <Content />
-                        <Embed />
-                    </div>
+export const Message = () => (
+    <div class="column discord-frame">
+        <article class="media">
+            <figure class="media-left">
+                <p class="image is-32x32 customizable">
+                    <Avatar />
+                </p>
+            </figure>
+            <div class="media-content">
+                <div class="content">
+                    <Username />
+                    <Content />
+                    <Embed />
                 </div>
-            </article>
-        </div>
-    );
-};
+            </div>
+        </article>
+    </div>
+);
diff --git a/reminder-dashboard/src/components/Reminder/Username.tsx b/reminder-dashboard/src/components/Reminder/Username.tsx
index 8e2d87a..4edcea2 100644
--- a/reminder-dashboard/src/components/Reminder/Username.tsx
+++ b/reminder-dashboard/src/components/Reminder/Username.tsx
@@ -1,9 +1,11 @@
 import { useReminder } from "./ReminderContext";
+import { useGuild } from "../App/useGuild";
 
 export const Username = () => {
+    const guild = useGuild();
     const [reminder, setReminder] = useReminder();
 
-    return (
+    return guild ? (
         <div class="discord-message-header">
             <label class="is-sr-only">Username Override</label>
             <input
@@ -20,5 +22,9 @@ export const Username = () => {
                 }}
             ></input>
         </div>
+    ) : (
+        <div class="discord-message-header">
+            <span class="discord-username">Reminder Bot</span>
+        </div>
     );
 };
diff --git a/reminder-dashboard/src/components/Sidebar/index.tsx b/reminder-dashboard/src/components/Sidebar/index.tsx
index 26c1570..4003e00 100644
--- a/reminder-dashboard/src/components/Sidebar/index.tsx
+++ b/reminder-dashboard/src/components/Sidebar/index.tsx
@@ -4,16 +4,19 @@ import { MobileSidebar } from "./MobileSidebar";
 import { Brand } from "./Brand";
 import { Wave } from "./Wave";
 import { GuildEntry } from "./GuildEntry";
-import { fetchUserGuilds, GuildInfo } from "../../api";
+import { fetchUserGuilds, fetchUserInfo, GuildInfo } from "../../api";
 import { TimezonePicker } from "../TimezonePicker";
 import "./styles.scss";
+import { Link, useLocation } from "wouter";
 
 type ContentProps = {
     guilds: GuildInfo[];
 };
 
 const SidebarContent = ({ guilds }: ContentProps) => {
-    const guildEntries = guilds.map((guild) => <GuildEntry guild={guild}></GuildEntry>);
+    const guildEntries = guilds.map((guild) => <GuildEntry guild={guild} />);
+    const [loc] = useLocation();
+    const { data: userInfo } = useQuery({ ...fetchUserInfo() });
 
     return (
         <>
@@ -22,6 +25,19 @@ const SidebarContent = ({ guilds }: ContentProps) => {
             </a>
             <Wave />
             <aside class="menu">
+                <ul class="menu-list">
+                    <li>
+                        <Link
+                            class={loc.startsWith("/@me") ? "is-active switch-pane" : "switch-pane"}
+                            data-pane="guild"
+                            href={"/@me/reminders"}
+                        >
+                            <>
+                                <span class="guild-name">@{userInfo?.name || "unknown"}</span>
+                            </>
+                        </Link>
+                    </li>
+                </ul>
                 <p class="menu-label">Servers</p>
                 <ul class="menu-list guildList">{guildEntries}</ul>
                 <div
diff --git a/web/src/lib.rs b/web/src/lib.rs
index a45ab13..aa89132 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -136,6 +136,7 @@ pub async fn initialize(
                 routes::dashboard::api::user::update_user_info,
                 routes::dashboard::api::user::get_user_guilds,
                 routes::dashboard::api::user::get_reminders,
+                routes::dashboard::api::user::edit_reminder,
                 routes::dashboard::api::user::create_user_reminder,
                 routes::dashboard::api::guild::get_guild_info,
                 routes::dashboard::api::guild::get_guild_channels,
diff --git a/web/src/routes/dashboard/api/mod.rs b/web/src/routes/dashboard/api/mod.rs
index 955d563..bbb59a5 100644
--- a/web/src/routes/dashboard/api/mod.rs
+++ b/web/src/routes/dashboard/api/mod.rs
@@ -6,7 +6,6 @@ use rocket::{
     serde::json::{json, Json},
     State,
 };
-use serenity::client::Context;
 use sqlx::{MySql, Pool};
 
 use crate::routes::{dashboard::DeleteReminder, JsonResult};
diff --git a/web/src/routes/dashboard/api/user/mod.rs b/web/src/routes/dashboard/api/user/mod.rs
index 91b02ba..5c31ba5 100644
--- a/web/src/routes/dashboard/api/user/mod.rs
+++ b/web/src/routes/dashboard/api/user/mod.rs
@@ -57,7 +57,7 @@ pub async fn get_user_info(
         let user_info = UserInfo {
             name: cookies
                 .get_private("username")
-                .map_or("DiscordUser#0000".to_string(), |c| c.value().to_string()),
+                .map_or("Discord User".to_string(), |c| c.value().to_string()),
             patreon: member_res.map_or(false, |member| {
                 member
                     .roles