fix rls error

Author: Stan-l-e-y

components/home/AddChannelModal.tsx

@@ -5,9 +5,9 @@ import {
   createChannelSchema,
 } from '@/types/client/channel';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Dispatch, SetStateAction, useRef, useState } from 'react';
+import { Dispatch, SetStateAction, useEffect, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';
-import { useSupabaseClient } from '@supabase/auth-helpers-react';
+import { useSupabaseClient, useUser } from '@supabase/auth-helpers-react';
 import { createChannel } from '@/services/channels.service';
 import { PostgrestError } from '@supabase/supabase-js';
 import {
@@ -34,8 +34,10 @@ export default function AddChannelModal({
 
   const supabase = useSupabaseClient();
 
+  const user = useUser();
+
   const getUserServerPerms = useGetUserPermsForServer();
-  getUserServerPerms(supabase, serverId);
+
   const userServerPerms = useUserServerPerms();
 
   const {
@@ -54,10 +56,18 @@ export default function AddChannelModal({
     },
   });
 
+  useEffect(() => {
+    if (getUserServerPerms) {
+      if (user) {
+        getUserServerPerms(supabase, serverId, user.id);
+      }
+    }
+  }, [user, getUserServerPerms, supabase, serverId]);
+
   const onSubmit = async (formData: CreateChannelInput) => {
     //
-    console.log(serverId);
-    console.log(userPerms & ChannelPermissions.MANAGE_MESSAGES);
+    // console.log(serverId);
+    // console.log(userPerms & ChannelPermissions.MANAGE_MESSAGES);
     const { data, error } = await createChannel(
       supabase,
       serverId,

components/home/ServerList.tsx

@@ -31,17 +31,17 @@ export default function ServerList() {
   const getServers = useGetServers();
 
   const getUserServerPerms = useGetUserPermsForServer();
-  getUserServerPerms(supabase, expanded);
   const userServerPerms = useUserServerPerms();
   console.log(userServerPerms & ServerPermissions.OWNER);
 
   useEffect(() => {
     if (getServers) {
       if (user) {
+        getUserServerPerms(supabase, expanded, user.id);
         getServers(supabase, user.id);
       }
     }
-  }, [getServers, supabase, user]);
+  }, [getServers, supabase, user, getUserServerPerms, expanded]);
 
   //TODO: add isServer check
 
@@ -116,7 +116,9 @@ export default function ServerList() {
             }
           })}
       </div>
-      {userServerPerms & ServerPermissions.MANAGE_MESSAGES ? (
+      {userServerPerms & ServerPermissions.MANAGE_MESSAGES ||
+      userServerPerms & ServerPermissions.OWNER ||
+      userServerPerms & ServerPermissions.ADMINISTRATOR ? (
         <Tooltip
           className="z-20 !opacity-100 font-semibold "
           style={{

lib/store.ts

@@ -155,7 +155,8 @@ export interface UserPermsState {
   getUserPerms: (supabase: SupabaseClient<Database>, channelId: number) => void;
   getUserPermsForServer: (
     supabase: SupabaseClient<Database>,
-    server_id: number
+    server_id: number,
+    userId?: string
   ) => void;
 }
 
@@ -176,10 +177,11 @@ const useUserPermsStore = create<UserPermsState>()((set) => ({
       set({ userPerms: data });
     }
   },
-  getUserPermsForServer: async (supabase, serverId) => {
+  getUserPermsForServer: async (supabase, serverId, userId) => {
     const { data, error } = await getCurrentUserServerPermissions(
       supabase,
-      serverId
+      serverId,
+      userId
     );
 
     if (error) {

services/server.service.ts

@@ -230,11 +230,12 @@ export type KickUserResponseError = KickUserResponse['error'];
 
 export async function getCurrentUserServerPermissions(
   supabase: SupabaseClient<Database>,
-  server_id: number
+  server_id: number,
+  userId?: string
 ) {
   return await supabase.rpc('get_permission_flags_for_server_user', {
     s_id: server_id,
-    p_id: (await supabase.auth.getUser()).data.user?.id!,
+    p_id: userId ? userId : (await supabase.auth.getUser()).data.user?.id!,
   });
 }
 
@@ -285,12 +286,17 @@ export async function getServerIdFromMessageId(
   message_id: number
 ) {
   return await supabase
-    .rpc('get_server_id_of_message', { m_id: message_id }).single();
+    .rpc('get_server_id_of_message', { m_id: message_id })
+    .single();
 }
 
-type GetServerIdFromMessageIdResponse = Awaited<ReturnType<typeof getServerIdFromMessageId>>;
-export type GetServerIdFromMessageIdResponseSuccess = GetServerIdFromMessageIdResponse['data'];
-export type GetServerIdFromMessageIdResponseError = GetServerIdFromMessageIdResponse['error'];
+type GetServerIdFromMessageIdResponse = Awaited<
+  ReturnType<typeof getServerIdFromMessageId>
+>;
+export type GetServerIdFromMessageIdResponseSuccess =
+  GetServerIdFromMessageIdResponse['data'];
+export type GetServerIdFromMessageIdResponseError =
+  GetServerIdFromMessageIdResponse['error'];
 
 export async function addServerIcon(
   supabase: SupabaseClient<Database>,