updated MatchChat

This commit is contained in:
2022-03-27 14:56:09 +02:00
parent 106ef97ede
commit 9ac3228f5d
4 changed files with 67 additions and 72 deletions

View File

@@ -3,6 +3,7 @@
"version": "1.0.7", "version": "1.0.7",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"host": "vite --host",
"build": "vue-tsc --noEmit && vite build", "build": "vue-tsc --noEmit && vite build",
"preview": "vite preview --port 5050", "preview": "vite preview --port 5050",
"typecheck": "vue-tsc --noEmit", "typecheck": "vue-tsc --noEmit",

View File

@@ -2,7 +2,6 @@
<div class="container w-50"> <div class="container w-50">
<TranslateChatButton <TranslateChatButton
v-if="data.chat.length > 0" v-if="data.chat.length > 0"
:translated="data.translatedText.length > 0"
class="translate-btn" class="translate-btn"
@translated="handleTranslatedText" @translated="handleTranslatedText"
/> />
@@ -70,7 +69,7 @@
</span> </span>
</td> </td>
<td class="td-icon"> <td class="td-icon">
<i class="fa fa-caret-right" /> <i class="fa fa-caret-right"/>
<span v-if="!m.all_chat" class="ms-1"> (team) </span> <span v-if="!m.all_chat" class="ms-1"> (team) </span>
</td> </td>
<td class="td-message"> <td class="td-message">
@@ -85,7 +84,7 @@
:title="`Translated from ${ISO6391.getName(m.translated_from)}`" :title="`Translated from ${ISO6391.getName(m.translated_from)}`"
class="ms-2 helpicon" class="ms-2 helpicon"
> >
<br /> <br/>
{{ m.message }} {{ m.message }}
</span> </span>
</td> </td>
@@ -100,7 +99,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, reactive } from "vue"; import {onMounted, reactive} from "vue";
import { import {
constructAvatarUrl, constructAvatarUrl,
ConvertTickToTime, ConvertTickToTime,
@@ -118,34 +117,32 @@ import type {MatchChat, MatchChatItem, MatchStats} from "@/types";
const matchDetailsStore = useMatchDetailsStore(); const matchDetailsStore = useMatchDetailsStore();
const infoStoreState = useInfoStateStore(); const infoStoreState = useInfoStateStore();
interface ChatStats extends MatchStats, MatchChatItem {} interface ChatStats extends MatchStats, MatchChatItem {
}
const data = reactive({ const data = reactive({
chat: [] as ChatStats[], chat: [] as ChatStats[],
translatedText: [] as ChatStats[], translatedText: [] as ChatStats[],
originalChat: [], originalChat: [] as ChatStats[],
clientWidth: 0, clientWidth: 0,
}); });
const handleTranslatedText = async (e: PromiseLike<[any, any]> | [any, any]) => { const handleTranslatedText = (e: string) => {
const [res, toggle] = await e; if (e === "translated") {
data.translatedText = setPlayer(sortChatHistory(matchDetailsStore.matchChat, true));
if (res !== null) {
if (toggle === "translated") {
data.translatedText = await setPlayer(sortChatHistory(res, true));
data.chat = data.translatedText; data.chat = data.translatedText;
} else if (toggle === "original") { } else if (e === "original") {
data.chat = data.originalChat; data.chat = data.originalChat;
} }
} console.log(matchDetailsStore.matchChat)
}; }
const getChatHistory = async () => { const getChatHistory = async () => {
const [resData, info] = await GetChatHistory(matchDetailsStore.matchDetails.match_id); const [resData, info] = await GetChatHistory(matchDetailsStore.matchDetails.match_id);
if (info.message !== "") infoStoreState.addInfo(info); if (info.message !== "") infoStoreState.addInfo(info);
if (resData !== null) { if (resData !== null) {
data.chat = await setPlayer(sortChatHistory(resData)); data.chat = setPlayer(sortChatHistory(resData));
data.originalChat = data.chat; data.originalChat = data.chat;
} }
}; };
@@ -171,7 +168,7 @@ const sortChatHistory = (res: MatchChat = {}, translated = false): MatchChatItem
return arr; return arr;
}; };
const setPlayer = async (chat: MatchChatItem[]): ChatStats[] => { const setPlayer = (chat: MatchChatItem[]): ChatStats[] => {
let arr: ChatStats[] = []; let arr: ChatStats[] = [];
for (const o of chat) { for (const o of chat) {
for (const p of matchDetailsStore.matchDetails.stats || []) { for (const p of matchDetailsStore.matchDetails.stats || []) {

View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="toggle-btn text-muted"> <div class="toggle-btn text-muted">
<div class="d-flex" @click.prevent="$emit('translated', handleBtnClick())"> <div class="d-flex" @click.prevent="handleBtnClick">
<span class="text-center mx-2"> <span class="text-center mx-2">
<i id="toggle-off" class="fa fa-toggle-off show" /> <i id="toggle-off" class="fa fa-toggle-off show" />
<i id="toggle-on" class="fa fa-toggle-on" /> <i id="toggle-on" class="fa fa-toggle-on" />
@@ -22,7 +22,7 @@
</div> </div>
</template> </template>
<script setup lang="ts"> <script lang="ts" setup>
import { onMounted, reactive, ref } from "vue"; import { onMounted, reactive, ref } from "vue";
import ISO6391 from "iso-639-1"; import ISO6391 from "iso-639-1";
import { GetChatHistoryTranslated } from "@/utils"; import { GetChatHistoryTranslated } from "@/utils";
@@ -32,14 +32,8 @@ import { useInfoStateStore } from "@/stores/infoState";
const matchDetailsStore = useMatchDetailsStore(); const matchDetailsStore = useMatchDetailsStore();
const infoStateStore = useInfoStateStore(); const infoStateStore = useInfoStateStore();
// TODO: Maybe remove props
const props = defineProps<{
translated: boolean;
}>();
// TODO: needs more work
const emit = defineEmits<{ const emit = defineEmits<{
(e: "translate", ): [MatchChat || null, string] (e: "translated", toggle: string): void;
}>(); }>();
const data = reactive({ const data = reactive({
@@ -71,20 +65,21 @@ const handleBtnClick = async () => {
) as HTMLElement; ) as HTMLElement;
refreshButton.classList.add("show"); refreshButton.classList.add("show");
toggleShow();
// TODO: Needs more work
// TODO: Add langCode // TODO: Add langCode
const [response, info] = await GetChatHistoryTranslated( const [response, info] = await GetChatHistoryTranslated(
matchDetailsStore.matchDetails.match_id matchDetailsStore.matchDetails.match_id
); );
if (info.message !== "") infoStateStore.addInfo(info); if (info.message !== "") infoStateStore.addInfo(info);
if (response !== null) {
matchDetailsStore.matchChat = response;
toggleShow();
if (refreshButton.classList.contains("show")) if (refreshButton.classList.contains("show"))
refreshButton.classList.remove("show"); refreshButton.classList.remove("show");
}
return [response, toggle.value]; emit("translated", toggle.value);
}; };
const toggleShow = () => { const toggleShow = () => {

View File

@@ -1,8 +1,9 @@
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import type { Match } from "@/types"; import type { Match, MatchChat } from "@/types";
export type RootState = { export type RootState = {
matchDetails: Match; matchDetails: Match;
matchChat: MatchChat;
}; };
export const useMatchDetailsStore = defineStore({ export const useMatchDetailsStore = defineStore({
@@ -10,6 +11,7 @@ export const useMatchDetailsStore = defineStore({
state: () => state: () =>
({ ({
matchDetails: {}, matchDetails: {},
matchChat: {},
} as RootState), } as RootState),
actions: {}, actions: {},
getters: {}, getters: {},