0
Fork 0
mirror of https://codeberg.org/SafeTwitch/safetwitch.git synced 2024-12-22 21:33:01 -05:00

FIx ban and timeout messages and add chat history

This commit is contained in:
dragongoose 2023-07-30 19:14:12 -04:00
parent d7e9b663d5
commit f513de6819
No known key found for this signature in database
GPG key ID: 01397EEC371CDAA5
4 changed files with 64 additions and 3 deletions

View file

@ -1,5 +1,6 @@
import type { Badge, ParsedMessage } from './types' import type { Badge, ParsedMessage } from './types'
import { getBadgesFromMessage } from './badges' import { getBadges, getBadgesFromMessage } from './badges'
import type { StreamMessage } from '@/types'
export function parseMessage(messageData: any, allBadges: Badge[]): ParsedMessage { export function parseMessage(messageData: any, allBadges: Badge[]): ParsedMessage {
const message = JSON.parse(messageData) const message = JSON.parse(messageData)
@ -50,6 +51,20 @@ export function parseMessage(messageData: any, allBadges: Badge[]): ParsedMessag
} }
} }
} }
case 'CLEARCHAT': {
let duration = message.tags['@ban-duration']
if (!message.tags['@ban-duration']) {
duration = 0
}
return {
type: 'CLEARCHAT',
data: {
username: message.message.replace(/(\r\n|\n|\r)/gm, ""),
duration
}
}
}
// Add more cases for other message types here // Add more cases for other message types here
default: { default: {
return { return {
@ -59,3 +74,25 @@ export function parseMessage(messageData: any, allBadges: Badge[]): ParsedMessag
} }
} }
} }
export function parseChatHistory(messages: StreamMessage[], badges: Badge[]) {
let parsedMessages = []
for (let i = 0; i < messages.length; i++) {
const message = messages[i]
const data: ParsedMessage = {
type: 'PRIVMSG',
data: {
message: message.message,
username: message.username,
color: message.color,
badges: getBadges(badges, message.badges)
}
}
parsedMessages.push(data)
}
return parsedMessages
}

View file

@ -3,7 +3,7 @@ import { ref, inject } from 'vue'
import BadgeVue from './ChatBadge.vue' import BadgeVue from './ChatBadge.vue'
import { getBadges } from '@/assets/badges' import { getBadges } from '@/assets/badges'
import { parseMessage } from '@/assets/messageParser' import { parseMessage, parseChatHistory } from '@/assets/messageParser'
import { getEndpoint } from '@/mixins' import { getEndpoint } from '@/mixins'
import type { Badge, ParsedMessage } from '@/assets/types' import type { Badge, ParsedMessage } from '@/assets/types'
@ -42,6 +42,7 @@ export default {
} }
}, },
async mounted() { async mounted() {
if (!this.$props.isVod) { if (!this.$props.isVod) {
const chatStatusMessage = this.$refs.initConnectingStatus as Element const chatStatusMessage = this.$refs.initConnectingStatus as Element
this.ws!.onmessage = (message) => { this.ws!.onmessage = (message) => {
@ -58,6 +59,12 @@ export default {
this.ws!.send('JOIN ' + this.$props.channelName?.toLowerCase()) this.ws!.send('JOIN ' + this.$props.channelName?.toLowerCase())
} }
} }
await getEndpoint(`api/chat/${this.$props.channelName}/history`)
.then((data) => {
this.messages = parseChatHistory(data, this.badges)
})
}, },
beforeUnmount() { beforeUnmount() {
this.ws?.close() this.ws?.close()
@ -182,6 +189,11 @@ export default {
<p> {{ $t("chat.resub", { username: message.data.username, duration : message.data.months }) }} </p> <p> {{ $t("chat.resub", { username: message.data.username, duration : message.data.months }) }} </p>
</div> </div>
<div v-else-if="message.type === 'CLEARCHAT'" class="text-white inline-flex p-1 rounded-md">
<p v-if="!message.data.duration" class="text-sm text-gray-500 italic"> {{ $t("chat.banned", { username: message.data.username }) }} </p>
<p v-else class="text-sm text-gray-500 italic"> {{ $t("chat.timeout", { username: message.data.username, duration: message.data.duration }) }} </p>
</div>
<div v-else class="text-white"> <div v-else class="text-white">
{{ message }} {{ message }}
</div> </div>

@ -1 +1 @@
Subproject commit 1d5cb5d2208ad9b9134ab970d68033ccf4e9ef27 Subproject commit 10d7cc027c65e925ff943c566155496c65789c54

View file

@ -16,3 +16,15 @@ export interface Metadata {
message: string message: string
tags: { [k: string]: any } tags: { [k: string]: any }
} }
export interface StreamMessageBadge {
version: string
setId: string
}
export interface StreamMessage {
message: string
username: string
color: string
badges: StreamMessageBadge[]
}