Skip to content

Commit ecb158f

Browse files
committed
fix types and remove unused imports
1 parent 565baa7 commit ecb158f

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

components/home/Chat.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import { useChannel, useMessages, useUserPerms } from '@/lib/store';
1111
import { Channel } from '@/types/dbtypes';
1212
import { ChannelMediaIcon } from '@/components/icons/ChannelMediaIcon';
1313
import { ChannelPermissions } from '@/types/permissions';
14-
import { ChannelPermissions as ChannelPermissionsTableType } from '@/types/dbtypes';
15-
import { getMessageWithServerProfile } from '@/services/profile.service';
1614

1715
export default function Chat() {
1816
const supabase = useSupabaseClient();

lib/store.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { create, createStore, StateCreator } from 'zustand';
1+
import { create } from 'zustand';
22
import {
33
Channel,
4-
ChatMessageWithUser,
4+
MessageWithServerProfile,
55
Server,
66
ServersForUser,
77
ServerUser,
@@ -15,6 +15,7 @@ import {
1515
getMessageWithUser,
1616
} from '@/services/message.service';
1717
import { getCurrentUserChannelPermissions } from '@/services/channels.service';
18+
import { getMessageWithServerProfile } from '@/services/profile.service';
1819

1920
export interface ServerState {
2021
servers: ServersForUser[];
@@ -62,7 +63,7 @@ const useServerStore = create<ServerState>()((set) => ({
6263
},
6364
}));
6465
export interface MessagesState {
65-
messages: ChatMessageWithUser[];
66+
messages: MessageWithServerProfile[];
6667
channelId: number;
6768
setChannelId: (channelId: number) => void;
6869
addMessage: (supabase: SupabaseClient<Database>, messageId: number) => void;
@@ -79,7 +80,7 @@ const useMessagesStore = create<MessagesState>()((set) => ({
7980
channelId: 0,
8081
setChannelId: (chId) => set((state) => ({ channelId: chId })),
8182
addMessage: async (supabase, messageId) => {
82-
const { data, error } = await getMessageWithUser(supabase, messageId);
83+
const { data, error } = await getMessageWithServerProfile(supabase, messageId);
8384

8485
if (error) {
8586
console.error(error);
@@ -88,12 +89,12 @@ const useMessagesStore = create<MessagesState>()((set) => ({
8889

8990
if (data) {
9091
set((state) => ({
91-
messages: [...state.messages, data as ChatMessageWithUser],
92+
messages: [...state.messages, data as MessageWithServerProfile],
9293
}));
9394
}
9495
},
9596
updateMessage: async (supabase, messageId) => {
96-
const { data, error } = await getMessageWithUser(supabase, messageId);
97+
const { data, error } = await getMessageWithServerProfile(supabase, messageId);
9798

9899
if (error) {
99100
console.error(error);
@@ -105,7 +106,7 @@ const useMessagesStore = create<MessagesState>()((set) => ({
105106
messages: state.messages.map((message) => {
106107
// Once we hit a message that matches the id, we can return the updated message instead of the old one
107108
if (message.id === data.id) {
108-
return data as ChatMessageWithUser;
109+
return data as MessageWithServerProfile;
109110
}
110111

111112
// Otherwise fallback to the old one
@@ -133,7 +134,7 @@ const useMessagesStore = create<MessagesState>()((set) => ({
133134

134135
if (data) {
135136
data.reverse();
136-
set({ messages: data as ChatMessageWithUser[] });
137+
set({ messages: data as MessageWithServerProfile[] });
137138
}
138139
},
139140
}));

0 commit comments

Comments
 (0)