stuff

Author: Stan-l-e-y

components/home/AddChannelModal.tsx

@@ -15,7 +15,6 @@ import {
   useUserPerms,
   useUserServerPerms,
 } from '@/lib/store';
-import { ChannelPermissions } from '@/types/permissions';
 
 export default function AddChannelModal({
   showModal,
@@ -38,8 +37,6 @@ export default function AddChannelModal({
 
   const getUserServerPerms = useGetUserPermsForServer();
 
-  const userServerPerms = useUserServerPerms();
-
   const {
     register,
     handleSubmit,
@@ -65,9 +62,6 @@ export default function AddChannelModal({
   }, [user, getUserServerPerms, supabase, serverId]);
 
   const onSubmit = async (formData: CreateChannelInput) => {
-    //
-    // console.log(serverId);
-    // console.log(userPerms & ChannelPermissions.MANAGE_MESSAGES);
     const { data, error } = await createChannel(
       supabase,
       serverId,

components/home/ServerList.tsx

@@ -18,7 +18,6 @@ import { ChannelPermissions, ServerPermissions } from '@/types/permissions';
 
 export default function ServerList() {
   //TODO: Display default page (when user belongs to and has no servers)
-  //TODO: Only show add channel if user has perms for it
 
   const [showAddServer, setShowAddServer] = useState(false);
   const [showAddChannelModal, setShowAddChannelModal] = useState(false);
@@ -32,7 +31,6 @@ export default function ServerList() {
 
   const getUserServerPerms = useGetUserPermsForServer();
   const userServerPerms = useUserServerPerms();
-  console.log(userServerPerms & ServerPermissions.OWNER);
 
   useEffect(() => {
     if (getServers) {

hooks/useRealtimeStore.ts

@@ -41,7 +41,12 @@ export function useRealtimeStore(supabase: SupabaseClient<Database>) {
         .channel('server_users')
         .on<ServerUser>(
           'postgres_changes',
-          { event: 'INSERT', schema: 'public', table: 'server_users', filter: `profile_id=eq.${user?.id}` },
+          {
+            event: 'INSERT',
+            schema: 'public',
+            table: 'server_users',
+            filter: `profile_id=eq.${user?.id}`,
+          },
           async (payload) => {
             console.log('insert');
 
@@ -50,7 +55,12 @@ export function useRealtimeStore(supabase: SupabaseClient<Database>) {
         )
         .on<ServerUser>(
           'postgres_changes',
-          { event: 'DELETE', schema: 'public', table: 'server_users', filter: `profile_id=eq.${user?.id}` },
+          {
+            event: 'DELETE',
+            schema: 'public',
+            table: 'server_users',
+            filter: `profile_id=eq.${user?.id}`,
+          },
           async (payload) => {
             console.log('remove user from server');
 
@@ -77,6 +87,21 @@ export function useRealtimeStore(supabase: SupabaseClient<Database>) {
           }
         )
         .subscribe();
+
+      supabase
+        .channel('channels')
+        .on<Server>(
+          'postgres_changes',
+          { event: 'INSERT', schema: 'public', table: 'channels' },
+          async (payload) => {
+            console.log('update');
+
+            if (user) {
+              getServers(supabase, user.id);
+            }
+          }
+        )
+        .subscribe();
     }
 
     // add return right here!
@@ -93,7 +118,7 @@ export function useRealtimeStore(supabase: SupabaseClient<Database>) {
             event: 'INSERT',
             schema: 'public',
             table: 'messages',
-            filter: `channel_id=eq.${channel?.channel_id}`,
+            filter: `channel_id=eq.${channel.channel_id}`,
           },
           async (payload) => {
             console.log('New message event');

lib/store.ts

@@ -10,6 +10,7 @@ import { Database } from '@/types/database.supabase';
 import { SupabaseClient } from '@supabase/supabase-js';
 import {
   getCurrentUserServerPermissions,
+  getServer,
   getServerForUser,
   getServersForUser,
 } from '@/services/server.service';
@@ -26,6 +27,7 @@ export interface ServerState {
   addServer: (supabase: SupabaseClient<Database>, serverUserId: number) => void;
   removeServer: (serverId: number) => void;
   getServers: (supabase: SupabaseClient<Database>, userId: string) => void;
+  updateServer: (supabase: SupabaseClient<Database>, serverId: number) => void;
 }
 
 const useServerStore = create<ServerState>()((set) => ({
@@ -65,6 +67,28 @@ const useServerStore = create<ServerState>()((set) => ({
       set({ servers: data as ServersForUser[] }, true);
     }
   },
+  updateServer: async (supabase, serverId) => {
+    const { data, error } = await getServer(supabase, serverId);
+
+    if (error) {
+      console.error(error);
+      return;
+    }
+
+    if (data) {
+      set((state) => ({
+        servers: state.servers.map((server) => {
+          // Once we hit a message that matches the id, we can return the updated message instead of the old one
+          if (server.server_id === data[0].id) {
+            return data as MessageWithServerProfile;
+          }
+
+          // Otherwise fallback to the old one
+          return message;
+        }),
+      }));
+    }
+  },
 }));
 export interface MessagesState {
   messages: MessageWithServerProfile[];
@@ -187,7 +211,7 @@ const useUserPermsStore = create<UserPermsState>()((set) => ({
     if (error) {
       console.log(error);
     }
-    // console.log('data', data);
+
     if (data) {
       set({ userServerPerms: data });
     }