chore: massively improve performance

JayDwee · JayDwee · commit cadb766d2072 · 2025-08-19T00:03:58.000-04:00
diff --git a/api/src/guilds/mod.rs b/api/src/guilds/mod.rs
@@ -6,12 +6,12 @@ use http::StatusCode;
 use lambda_http::tracing::warn;
 use serde_json::{Value, json};
 use std::sync::Arc;
-use twilight_model::guild::Permissions;
 use twilight_model::id::Id;
 use twilight_model::id::marker::GuildMarker;
 
 mod models;
 pub mod verify;
+mod utils;
 
 pub fn router() -> Router<AppState> {
     Router::new()
@@ -24,19 +24,11 @@ async fn get_guilds(
     Extension(discord_user): Extension<Arc<twilight_http::Client>>,
     State(app_state): State<AppState>,
 ) -> Result<Json<Value>, StatusCode> {
-    let user_guilds = discord_user
-        .current_user_guilds()
-        .await
-        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?
-        .models()
-        .await
-        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
-    let user_guilds_filtered = user_guilds
-        .iter()
-        .filter(|g| g.permissions.contains(Permissions::ADMINISTRATOR))
-        .collect::<Vec<_>>();
     let guilds = Guild::vec_from_db(
-        user_guilds_filtered
+        utils::intersect_admin_guilds(
+            &discord_user,
+            &app_state.discord_bot,
+        ).await
             .iter()
             .map(|g| g.id.to_string())
             .collect(),
@@ -46,60 +38,15 @@ async fn get_guilds(
     Ok(Json(json!(guilds)))
 }
 
-async fn verify_user_admin(
-    guild_id: &Id<GuildMarker>,
-    discord_user: &Arc<twilight_http::Client>,
-    app_state: &AppState,
-) -> Result<(), StatusCode> {
-    let logged_in_user = discord_user
-        .current_user()
-        .await
-        .unwrap()
-        .model()
-        .await
-        .unwrap();
-
-    let guild = match app_state.discord_bot.guild(*guild_id).await {
-        Ok(g) => g.model().await.unwrap(),
-        Err(e) => {
-            warn!("Error fetching guild: {:?}", e);
-            return Err(StatusCode::NOT_FOUND);
-        }
-    };
-
-    let user_is_owner = guild.owner_id == logged_in_user.id;
-
-    if !user_is_owner {
-        let member = match app_state
-            .discord_bot
-            .guild_member(*guild_id, logged_in_user.id)
-            .await
-        {
-            Ok(gm) => gm.model().await.unwrap(),
-            Err(e) => {
-                warn!("Error fetching guild member: {:?}", e);
-                return Err(StatusCode::NOT_FOUND);
-            }
-        };
-
-        let user_has_admin = guild.roles.iter().any(|r| {
-            (r.permissions & Permissions::ADMINISTRATOR) == Permissions::ADMINISTRATOR
-                && member.roles.contains(&r.id)
-        });
-        if !user_has_admin {
-            warn!("User does not have admin permissions in guild {}", guild_id);
-            return Err(StatusCode::NOT_FOUND);
-        }
-    }
-    Ok(())
-}
-
 async fn get_guilds_id(
     Path(guild_id): Path<Id<GuildMarker>>,
     Extension(discord_user): Extension<Arc<twilight_http::Client>>,
     State(app_state): State<AppState>,
 ) -> Result<Json<Value>, StatusCode> {
-    verify_user_admin(&guild_id, &discord_user, &app_state).await?;
+    if !utils::is_intersect_admin_guild(guild_id, &discord_user, &app_state.discord_bot).await.map_err(utils::ise)? {
+        warn!("User is not an admin in guild {}", guild_id);
+        return Err(StatusCode::NOT_FOUND);
+    }
 
     let guild = Guild::from_db(&guild_id.to_string(), &app_state.dynamo).await;
 
diff --git a/api/src/guilds/models.rs b/api/src/guilds/models.rs
@@ -108,10 +108,10 @@ impl Guild {
             .send()
             .await
             .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)
-            .and_then(|resp| {
+            .map(|resp| {
                 let item = resp.item.unwrap_or_default();
                 let guild: Guild = (&item).into();
-                Ok(guild)
+                guild
             }) {
             Ok(guild) => Some(guild),
             Err(e) => {
diff --git a/api/src/guilds/utils.rs b/api/src/guilds/utils.rs
@@ -0,0 +1,50 @@
+use http::StatusCode;
+use lambda_http::tracing::{error, info};
+use twilight_http::Error;
+use twilight_model::guild::Permissions;
+use twilight_model::id::Id;
+use twilight_model::id::marker::GuildMarker;
+use twilight_model::user::CurrentUserGuild;
+
+pub fn ise(e: Error) -> StatusCode {
+    error!("Internal Server Error: {:?}", e);
+    StatusCode::INTERNAL_SERVER_ERROR
+}
+
+async fn client_admin_guilds(client: &twilight_http::Client) -> Vec<CurrentUserGuild> {
+    client.current_user_guilds().await.unwrap().models().await.unwrap()
+        .into_iter()
+        .filter(|g| g.permissions & Permissions::ADMINISTRATOR == Permissions::ADMINISTRATOR)
+        .collect()
+}
+
+pub async fn intersect_admin_guilds(
+    client_1: &twilight_http::Client,
+    client_2: &twilight_http::Client
+) -> Vec<CurrentUserGuild> {
+    let client_1_guilds = client_admin_guilds(client_1).await;
+    let client_2_guilds = client_admin_guilds(client_2).await;
+
+    client_1_guilds
+        .into_iter()
+        .filter(|g| client_2_guilds.iter().any(|g2| g.id == g2.id))
+        .collect()
+}
+
+async fn is_client_admin_guild(guild_id: Id<GuildMarker>, client: &twilight_http::Client) -> Result<bool, Error> {
+    let guilds = client.current_user_guilds().after(Id::new(guild_id.get()-1)).limit(1).await?.models().await.unwrap();
+    let admin_guilds: Vec<CurrentUserGuild> = guilds
+        .into_iter()
+        .filter(|g| g.permissions & Permissions::ADMINISTRATOR == Permissions::ADMINISTRATOR)
+        .collect();
+    Ok(admin_guilds.len() == 1)
+}
+
+pub async fn is_intersect_admin_guild(
+    guild_id: Id<GuildMarker>,
+    client_1: &twilight_http::Client,
+    client_2: &twilight_http::Client
+) -> Result<bool, Error> {
+    Ok(
+        is_client_admin_guild(guild_id, client_1).await? && is_client_admin_guild(guild_id, client_2).await?)
+}
diff --git a/ui/src/components/dashboard/VerifyComponent.vue b/ui/src/components/dashboard/VerifyComponent.vue
@@ -3,6 +3,15 @@
 import {ref} from "vue";
 import {getUser} from "../../stores/auth.js";
 
+defineProps(
+  {
+    guild: {
+      type: Object,
+      required: true
+    }
+  }
+)
+
 const userRef = ref(getUser())
 
 function getVerifyRolesFromKB() {
@@ -38,7 +47,7 @@ function getVerifyRolesFromKB() {
         </tr>
         </thead>
         <tbody>
-        <tr v-for="role in getVerifyRolesFromKB()">
+        <tr v-for="role in $props.guild.verify.roles">
           <td>
             {{ role.role_name }}
           </td>
diff --git a/ui/src/helpers/discordapi.js b/ui/src/helpers/discordapi.js
@@ -4,15 +4,17 @@ import {getUser} from "../stores/auth.js";
 let user = getUser();
 
 export async function getUserAdminGuilds() {
-  let guilds = (await axios.get('https://discord.com/api/v10/users/@me/guilds', {
+  return (await axios.get('https://discord.com/api/v10/users/@me/guilds', {
     headers: {
       'Authorization': 'Bearer ' + user.token.accessToken
     }
-  })).data
-  //convert to map of id to obj
-  return guilds.filter(g => (Number(g.permissions) & (1 << 3)) === (1 << 3))
-    .reduce((acc, g) => {
-      acc[g.id] = g;
-      return acc;
-    }, {});
+  })).data.filter(guild => guild.permissions && (BigInt(guild.permissions) & BigInt(0x0000000000000008)) === BigInt(0x0000000000000008));
+}
+
+export async function getUserAdminGuildsAsMap() {
+  let guilds = await getUserAdminGuilds();
+  return Object.values(guilds).reduce((acc, guild) => {
+    acc.set(guild.id, guild);
+    return acc;
+  }, new Map());
 }
diff --git a/ui/src/helpers/kbguild.js b/ui/src/helpers/kbguild.js
@@ -14,6 +14,14 @@ export async function getGuilds() {
   return resp.data;
 }
 
+export async function getGuildsAsMap() {
+  let guilds = await getGuilds();
+  return Object.values(guilds).reduce((acc, guild) => {
+    acc.set(guild.guild_id, guild);
+    return acc;
+  }, new Map());
+}
+
 export async function getGuild(guild_id) {
   return (await axios.get(`${VITE_KB_API_URL}/guilds/${guild_id}`, {
     headers: {
diff --git a/ui/src/pages/dashboard/DashBaseView.vue b/ui/src/pages/dashboard/DashBaseView.vue
@@ -3,41 +3,36 @@
 import KoalaMonoIcon from "../../components/icons/KoalaMonoIcon.vue";
 import {onMounted, ref} from "vue";
 import DashBody from "./body/DashBody.vue";
-import ThemeToggle from "../../components/ThemeToggle.vue";
 import DiscordAuthButton from "../../components/auth/DiscordAuthButton.vue";
 import MainWithFooter from "../../components/MainWithFooter.vue";
-import {getUserAdminGuilds} from "../../helpers/discordapi.js";
-import {getGuild, getGuilds} from "../../helpers/kbguild.js";
+import {getUserAdminGuildsAsMap} from "../../helpers/discordapi.js";
+import {getGuild, getGuildsAsMap} from "../../helpers/kbguild.js";
 import {INVITE_URL} from "../../helpers/redirect.js";
 
-const HOME_PATH = "/dashboard"
-const VERIFY_PATH = "/dashboard/verify"
-const ANNOUNCE_PATH = "/dashboard/announce"
-
 const currentPath = ref(window.location.pathname)
 
 window.addEventListener('hashchange', () => {
   currentPath.value = window.location.pathname
 })
 
-let guildsDsc = ref({})
-let guildsKb = ref({})
+let guildsDsc = ref(new Map())
+let guildsKb = ref(new Map())
 let currentGuildId = ref()
 
 
 onMounted(async () => {
-  guildsDsc.value = await getUserAdminGuilds();
+  guildsDsc.value = await getUserAdminGuildsAsMap();
 
   // Load remaining guilds
   await sync_guilds_kb();
   console.log("Loaded guilds", guildsKb.value);
-  await setCurrentGuild(Object.keys(guildsKb.value)[0]);
+  console.log("Loaded guilds", guildsKb.value.values().next().value.guild_id);
 })
 
 async function setCurrentGuild(gid) {
   currentGuildId.value = gid
   try {
-    guildsKb.value[gid] = await getGuild(gid) // Refresh from db
+    guildsKb.value.set(gid, await getGuild(gid)) // Refresh from db
   } catch (e) {
     if (e.response && e.response.status === 404) {
       // Allowed, means Koala not in server
@@ -48,7 +43,7 @@ async function setCurrentGuild(gid) {
 }
 
 async function sync_guilds_kb() {
-  guildsKb.value = await getGuilds()
+  guildsKb.value = await getGuildsAsMap()
 }
 
 </script>
@@ -60,17 +55,20 @@ async function sync_guilds_kb() {
       <div class="navbar shadow m-5 w-auto bg-base-200">
         <div class="navbar-start">
           <div class="dropdown">
+            <div tabindex="0" role="button" class="btn btn-sm btn-primary" v-if="!currentGuildId">
+              Select Guild
+            </div>
             <div tabindex="0" role="button" class="card-title btn btn-sm btn-ghost" v-if="currentGuildId">
               <div class="avatar">
                 <div class="w-6 rounded-xl">
-                  <img :src="`https://cdn.discordapp.com/icons/${currentGuildId}/${guildsDsc[currentGuildId].icon}.webp`" v-if="guildsDsc[currentGuildId].icon"/>
+                  <img :src="`https://cdn.discordapp.com/icons/${currentGuildId}/${guildsDsc.get(currentGuildId).icon}.webp`" v-if="guildsDsc.get(currentGuildId).icon"/>
                 </div>
               </div>
-              {{ guildsDsc[currentGuildId].name }}
+              {{ guildsDsc.get(currentGuildId).name }}
             </div>
             <ul tabindex="0" class="dropdown-content menu bg-base-100 rounded-box z-1 p-2 shadow-sm">
-              <li v-for="(gid, guild) in guildsKb" :class="(!guildsKb[guild.id] && 'menu-disabled')"><a :class="(gid === currentGuildId && 'menu-active')" @click="setCurrentGuild(gid)">
-                <div class="w-6 rounded-xl"><img :src="`https://cdn.discordapp.com/icons/${gid}/${guildsDsc[gid].icon}.webp`" v-if="guildsDsc[gid] && guildsDsc[gid].icon"/>
+              <li v-for="[gid, guild] in guildsDsc" :class="(!guildsKb.has(guild.id) && 'menu-disabled')"><a :class="(gid === currentGuildId && 'menu-active')" @click="setCurrentGuild(gid)">
+                <div class="w-6 rounded-xl"><img :src="`https://cdn.discordapp.com/icons/${gid}/${guildsDsc.get(gid).icon}.webp`" v-if="guildsDsc.has(gid) && guildsDsc.get(gid).icon"/>
                 </div> {{ guild.name }}</a></li>
             </ul>
           </div>
@@ -85,9 +83,9 @@ async function sync_guilds_kb() {
         </div>
       </div>
     </header>
-    <DashBody v-if="currentPath === HOME_PATH && guildsKb[currentGuildId]"/>
+    <DashBody v-if="guildsKb.has(currentGuildId)" :guild="guildsKb.get(currentGuildId)"/>
     <div class="flex flex-row justify-center">
-    <div class="card card-sm m-5 p-10 shadow bg-base-200 flex w-fit" v-if="!guildsKb[currentGuildId]">
+    <div class="card card-sm m-5 p-10 shadow bg-base-200 flex w-fit" v-if="!guildsKb.has(currentGuildId)">
       <div class="flex flex-row justify-center p-2">
         <h1 class="card-title">
           You need to invite KoalaBot to your server to use the dashboard silly!
diff --git a/ui/src/pages/dashboard/body/DashBody.vue b/ui/src/pages/dashboard/body/DashBody.vue
@@ -6,13 +6,22 @@ import StreamAlertComponent from "../../../components/dashboard/StreamAlertCompo
 import AnnounceComponent from "../../../components/dashboard/AnnounceComponent.vue";
 import ColourRoleComponent from "../../../components/dashboard/ColourRoleComponent.vue";
 import VoteComponent from "../../../components/dashboard/VoteComponent.vue";
+
+defineProps(
+  {
+    guild: {
+      type: Object,
+      required: true
+    }
+  }
+)
 </script>
 
 <template>
 
   <div class="lg:columns-2 sm:columns-1">
     <InsightsStatsComponent class="m-5 break-inside-avoid-column"/>
-    <VerifyComponent class="m-5 break-inside-avoid-column"/>
+    <VerifyComponent class="m-5 break-inside-avoid-column" :guild="$props.guild"/>
     <StreamAlertComponent class="m-5 break-inside-avoid-column"/>
     <AnnounceComponent class="m-5 break-inside-avoid-column"/>
     <ColourRoleComponent class="m-5 break-inside-avoid-column"/>
diff --git a/ui/src/router/RouterView.vue b/ui/src/router/RouterView.vue
@@ -18,7 +18,7 @@ const routes = {
   '^/verify/google/callback$': VerifyGoogleCallback,
   '^/verify/email/callback$': VerifyEmailCallback,
   '^/verify/email/wait$': VerifyEmailWait,
-  '^/dashboard(.*)$': DashBaseView,
+  '^/dashboard$': DashBaseView,
   '^/404$': NotFoundView
 }
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ const routes = {`
`18`	`18`	`'^/verify/google/callback$': VerifyGoogleCallback,`
`19`	`19`	`'^/verify/email/callback$': VerifyEmailCallback,`
`20`	`20`	`'^/verify/email/wait$': VerifyEmailWait,`
`21`		`- '^/dashboard(.*)$': DashBaseView,`
	`21`	`+ '^/dashboard$': DashBaseView,`
`22`	`22`	`'^/404$': NotFoundView`
`23`	`23`	`}`
`24`	`24`