mirror of
https://github.com/yawaflua/LuckyDiamond.git
synced 2025-12-10 04:09:29 +02:00
added chat-notification
This commit is contained in:
@@ -184,3 +184,11 @@
|
|||||||
.write__content button:disabled {
|
.write__content button:disabled {
|
||||||
cursor: not-allowed;
|
cursor: not-allowed;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.system-message {
|
||||||
|
background-color: rgb(1, 56, 74);
|
||||||
|
}
|
||||||
|
|
||||||
|
.mention-message {
|
||||||
|
background-color: rgb(169, 113, 0);
|
||||||
|
}
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<ul>
|
<ul>
|
||||||
<transition-group name="fade">
|
<transition-group name="fade">
|
||||||
<li v-for="msg in array" :key="msg">
|
<li v-for="msg in array" :key="msg">
|
||||||
<div class="card__user">
|
<div class="card__user" :class="{ 'mention-message': isCurrentUser(msg), 'system-message' : msg.username === '🛠️ System' }">
|
||||||
<div class="user__icon">
|
<div class="user__icon">
|
||||||
<img :src="msg.icon" />
|
<img :src="msg.icon" />
|
||||||
</div>
|
</div>
|
||||||
@@ -31,6 +31,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import "@/assets/css/ComponentsStyles/chat.css";
|
import "@/assets/css/ComponentsStyles/chat.css";
|
||||||
import { GetChatHistory } from "@/assets/js/rest/RestMethods.js";
|
import { GetChatHistory } from "@/assets/js/rest/RestMethods.js";
|
||||||
|
import { GetCookie } from "@/assets/js/storage/CookieStorage";
|
||||||
|
|
||||||
import WritechatComponent from "@/components/WritechatComponent.vue";
|
import WritechatComponent from "@/components/WritechatComponent.vue";
|
||||||
import { SendMessageToChat } from "@/assets/js/chat/ChatLogic.js";
|
import { SendMessageToChat } from "@/assets/js/chat/ChatLogic.js";
|
||||||
@@ -53,6 +54,9 @@ export default {
|
|||||||
chatContent.scrollTop = chatContent.scrollHeight;
|
chatContent.scrollTop = chatContent.scrollHeight;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
isCurrentUser(msg) {
|
||||||
|
return msg.msg.includes(GetCookie('SpUserName'))
|
||||||
|
},
|
||||||
ClaimDatamsg(msg) {
|
ClaimDatamsg(msg) {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
if (!this.lastMsgTime || now - this.lastMsgTime >= 2000) {
|
if (!this.lastMsgTime || now - this.lastMsgTime >= 2000) {
|
||||||
@@ -61,15 +65,11 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
alert("Вы не можете отправлять сообщения чаще, чем раз в 2 секунды.");
|
alert("Вы не можете отправлять сообщения чаще, чем раз в 2 секунды.");
|
||||||
}
|
}
|
||||||
// if(this.array.length > 7) {
|
|
||||||
// this.array.shift()
|
|
||||||
// }
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
eventBus.on("dataChat", (dataFromServer) => {
|
eventBus.on("dataChat", (dataFromServer) => {
|
||||||
try {
|
try {
|
||||||
// Attempt to parse the JSON string
|
|
||||||
const dataObject = JSON.parse(dataFromServer);
|
const dataObject = JSON.parse(dataFromServer);
|
||||||
let imageUrl =
|
let imageUrl =
|
||||||
"https://avatar.spworlds.ru/face/55/" + dataObject.SpUserName;
|
"https://avatar.spworlds.ru/face/55/" + dataObject.SpUserName;
|
||||||
@@ -81,12 +81,10 @@ export default {
|
|||||||
icon: imageUrl,
|
icon: imageUrl,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (MsgUser.username === 'System') {
|
if (MsgUser.username === '🛠️ System') {
|
||||||
MsgUser.icon = 'https://avatar.spworlds.ru/face/55/CONSOLE'
|
MsgUser.icon = 'https://avatar.spworlds.ru/face/55/CONSOLE'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 🛠️ - icon
|
|
||||||
this.array.push(MsgUser);
|
this.array.push(MsgUser);
|
||||||
|
|
||||||
this.ScrollToBottom();
|
this.ScrollToBottom();
|
||||||
@@ -108,7 +106,7 @@ export default {
|
|||||||
icon: imageUrl,
|
icon: imageUrl,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (MsgUser.username === 'System') {
|
if (MsgUser.username === '🛠️ System') {
|
||||||
MsgUser.icon = 'https://avatar.spworlds.ru/face/55/CONSOLE'
|
MsgUser.icon = 'https://avatar.spworlds.ru/face/55/CONSOLE'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user