zoeissleeping/discord-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a bunch of bug fixes and improvements

Browse Source
This commit is contained in:
Zoe
2023-04-28 00:28:37 -05:00
parent a7c91b382a
commit b88b3207b3
27 changed files with 494 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
layouts/default.vue
View File

@@ -13,7 +13,7 @@ import { useUserStore } from '~/stores/userStore';
import { useServerStore } from '~/stores/serverStore';
import { useDmStore } from '~/stores/dmStore';
import { useActiveStore } from '~/stores/activeStore';
import { IChannel } from '~/types';
import { IChannel, IServer, SafeUser } from '~/types';
export default {
async setup() {
@@ -25,8 +25,8 @@ export default {
if (!userStore.isLoggedIn) {
const [userData, serverData] = await Promise.all([
$fetch('/api/getCurrentUser', { headers }),
$fetch('/api/user/getServers', { headers })
$fetch('/api/getCurrentUser', { headers }) as Promise<SafeUser | null>,
$fetch('/api/user/getServers', { headers }) as Promise<{ dms: IChannel[], servers: IServer[] } | null>
]);
if (!userData || !serverData) throw new Error('No user data or server data');
@@ -40,7 +40,7 @@ export default {
const isDm = route.path.includes('@me');
if (isDm && route.params.dmId) {
if (isDm && route.params.dmId && useActiveStore().dm.id !== route.params.dmId) {
const dmData: IChannel = await $fetch(`/api/channels/${route.params.dmId}`, { headers });
if (!dmData) throw new Error('Could not find dm.');
@@ -49,12 +49,14 @@ export default {
useActiveStore().setActiveDM(dmData);
}
if (!isDm && route.params.channelId) {
if (!isDm && route.params.channelId && useActiveStore().server.channel.id !== route.params.channelId) {
const [channel, server] = await Promise.all([
$fetch(`/api/channels/${route.params.channelId}`, { headers }) as unknown as IChannel,
$fetch(`/api/channels/${route.params.channelId}/guild`, { headers })
$fetch(`/api/channels/${route.params.channelId}`, { headers }) as Promise<IChannel | null>,
$fetch(`/api/channels/${route.params.channelId}/guild`, { headers }) as Promise<IServer | null>
]);
if (!server || !channel) throw new Error('No channel or server');
if (!server) throw new Error('Could not find server.');
useServerStore().addServer(server);
useActiveStore().setActiveServer(channel, useServerStore().servers);
@@ -62,14 +64,8 @@ export default {
if (isDm && !route.params.dmId) {
// on '/@me'
useActiveStore().type = 'dm';
useActiveStore().setActiveHome();
}
// const socket = ref(null);
// socket.value = io('127.0.0.1:3000', {
// auth: (cb) => cb({ token: useCookie('sessionToken').value })
// });
}
};
</script>