Compare commits

..

No commits in common. "6586890b6c65d33d5d371b1c328848d02f7a01d5" and "307969ffe59dbb752c2644ade400d65f6e678d51" have entirely different histories.

3 changed files with 11 additions and 37 deletions

View file

@ -40,10 +40,9 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import type { MessageResponse, ScrollPosition, UserResponse, WSMessage } from '~/types/interfaces'; import type { MessageResponse, ScrollPosition, UserResponse } from '~/types/interfaces';
import scrollToBottom from '~/utils/scrollToBottom'; import scrollToBottom from '~/utils/scrollToBottom';
import { generateIrcColor } from '#imports'; import { generateIrcColor } from '#imports';
import { WSEvent } from '~/types/enums';
const { getDisplayName } = useProfile() const { getDisplayName } = useProfile()
const { fetchMe } = useApi() const { fetchMe } = useApi()
@ -196,19 +195,16 @@ if (accessToken && apiBase) {
ws.addEventListener("message", async (event) => { ws.addEventListener("message", async (event) => {
console.log("event data:", event.data); console.log("event data:", event.data);
console.log("message uuid:", event.data.uuid); console.log("message uuid:", event.data.uuid);
const message: WSMessage = JSON.parse(event.data); const parsedData = JSON.parse(event.data);
console.log("[MSG] parsed message:", message); console.log("[MSG] parsed message:", parsedData);
if (message.event == WSEvent.MessageSend) { console.log("parsed message type:", messagesType.value[parsedData.uuid]);
const messageObject = message.entity as MessageResponse; console.log("parsed message timestamp:", messageTimestamps.value[parsedData.uuid]);
console.log("parsed message type:", messagesType.value[messageObject.uuid]); pushMessage(parsedData);
console.log("parsed message timestamp:", messageTimestamps.value[messageObject.uuid]); await nextTick();
pushMessage(messageObject); if (messagesElement.value) {
await nextTick(); console.log("scrolling to bottom");
if (messagesElement.value) { scrollToBottom(messagesElement.value);
console.log("scrolling to bottom");
scrollToBottom(messagesElement.value);
}
} }
}); });

View file

@ -8,11 +8,4 @@ export const enum Permission {
ManageMember = 64, ManageMember = 64,
BanMember = 128, BanMember = 128,
KickMember = 256 KickMember = 256
} }
export const enum WSEvent {
MessageSend,
MessageDelete,
MessageEdit,
Error
}

View file

@ -1,5 +1,3 @@
import type { WSEvent } from "./enums"
export interface ChannelPermissionResponse { export interface ChannelPermissionResponse {
channel_uuid: string, channel_uuid: string,
role_uuid: string, role_uuid: string,
@ -58,19 +56,6 @@ export interface MessageResponse {
member: GuildMemberResponse, member: GuildMemberResponse,
} }
export interface IMessageDelete {
uuid: string
}
export interface WSError {
message: string
}
export interface WSMessage {
event: WSEvent,
entity: MessageResponse | IMessageDelete | WSError
}
export interface InviteResponse { export interface InviteResponse {
id: string, id: string,
user_uuid: string, user_uuid: string,