Browse Source

* Fixed conflicting names in front chat socket

master
vvandenb 2 years ago
parent
commit
66345fd2b4
  1. 4
      front/volume/src/components/Channels.svelte
  2. 14
      front/volume/src/components/Chat.svelte
  3. 6
      front/volume/src/socket.ts

4
front/volume/src/components/Channels.svelte

@ -8,7 +8,7 @@
} }
import { onMount } from "svelte"; import { onMount } from "svelte";
import { API_URL, store } from "../Auth"; import { API_URL, store } from "../Auth";
import { io } from "../socket"; import { socket } from "../socket";
</script> </script>
<script lang="ts"> <script lang="ts">
@ -17,7 +17,7 @@
const channelOptions = ['public','private','direct']; const channelOptions = ['public','private','direct'];
const joinChannel = async (id: number) => { const joinChannel = async (id: number) => {
io.emit("joinChannel", id, $store.ftId); socket.emit("joinChannel", id, $store.ftId);
}; };
let channels: Array<ChannelsType> = []; let channels: Array<ChannelsType> = [];

14
front/volume/src/components/Chat.svelte

@ -6,7 +6,7 @@
} }
import { createEventDispatcher, onDestroy, onMount } from "svelte"; import { createEventDispatcher, onDestroy, onMount } from "svelte";
import { store, API_URL } from "../Auth"; import { store, API_URL } from "../Auth";
import { io } from "../socket" import { socket } from "../socket"
import type { ChannelsType } from "./Channels.svelte"; import type { ChannelsType } from "./Channels.svelte";
import type User from "./Profile.svelte"; import type User from "./Profile.svelte";
</script> </script>
@ -25,16 +25,16 @@ import type User from "./Profile.svelte";
}); });
if (res.ok) blockedUsers = await res.json(); if (res.ok) blockedUsers = await res.json();
io.on("messages", (msgs: Array<chatMessagesType>) => { socket.on("messages", (msgs: Array<chatMessagesType>) => {
chatMessages = msgs; chatMessages = msgs;
}); });
io.on("newMessage", (msg: chatMessagesType) => { socket.on("newMessage", (msg: chatMessagesType) => {
chatMessages = [...chatMessages.slice(-5 + 1), msg]; chatMessages = [...chatMessages.slice(-5 + 1), msg];
}); });
onDestroy(() => { onDestroy(() => {
io.emit("leaveChannel", channel.id, $store.ftId); socket.emit("leaveChannel", channel.id, $store.ftId);
}); });
}); });
@ -48,7 +48,7 @@ import type User from "./Profile.svelte";
text: newText, text: newText,
}; };
chatMessages = [...chatMessages.slice(-5 + 1)]; chatMessages = [...chatMessages.slice(-5 + 1)];
io.emit("addMessage", channel.id, $store.ftId, newText); socket.emit("addMessage", channel.id, $store.ftId, newText);
newText = ""; newText = "";
const messagesDiv = document.querySelector(".messages"); const messagesDiv = document.querySelector(".messages");
if (messagesDiv) { if (messagesDiv) {
@ -135,7 +135,7 @@ import type User from "./Profile.svelte";
mode: "cors", mode: "cors",
}); });
if (res2.ok) { if (res2.ok) {
io.emit("kickUser", channel.id, $store.ftId, data1.ftId); socket.emit("kickUser", channel.id, $store.ftId, data1.ftId);
alert("User banned"); alert("User banned");
} else { } else {
alert("Failed to ban user"); alert("Failed to ban user");
@ -150,7 +150,7 @@ import type User from "./Profile.svelte";
mode: "cors", mode: "cors",
}); });
const kickedUser = await res.json(); const kickedUser = await res.json();
io.emit("kickUser", channel.id, $store.ftId, kickedUser.ftId); socket.emit("kickUser", channel.id, $store.ftId, kickedUser.ftId);
}; };
//--------------------------------------------------------------------------------/ //--------------------------------------------------------------------------------/

6
front/volume/src/socket.ts

@ -1,5 +1,3 @@
import ioClient from "socket.io-client"; import { io } from "socket.io-client";
export const io = ioClient("http://localhost:3001", { export const socket: Socket = io("http://localhost:3001");
withCredentials: true,
});

Loading…
Cancel
Save