starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch chat

Browse Source
This commit is contained in:
Xamora
2024-01-08 17:20:15 +01:00
parent 58d20920ea
commit 478456a199
8 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/static/js/views/Search.js
View File

@ -54,22 +54,22 @@ export default class extends AbstractView {
let add_chat = document.createElement("a");
add_chat.id = "add_chat_off";
add_chat.onclick = async () => {
if (client.channel != undefined) {
client.channel.members_id.forEach((member_id) => {
if (client.channels.channel != undefined) {
client.channels.channel.members_id.forEach((member_id) => {
if (member_id == user.user_id)
client.channel = undefined;
client.channels.channel = undefined;
});
if (client.channel == undefined) {
if (client.channels.channel == undefined) {
add_chat.id = "add_chat_off";
this.last_add_chat = undefined;
return this.hideChat();
return await this.hideChat();
}
client.channel.disconnect();
await client.channels.channel.disconnect();
}
client.channel = await client.channels.createChannel([client.me.user_id , user.user_id], this.chat);
client.channels.channel = await client.channels.createChannel([client.me.user_id , user.user_id], this.chat);
this.chat();
if (this.last_add_chat != undefined)
this.last_add_chat.id = "add_chat_off";
@ -109,7 +109,7 @@ export default class extends AbstractView {
document.getElementById(reload).remove();
});
if (client.channel == undefined || !logged)
if (client.channels.channel == undefined || !logged)
return ;
let chats = document.getElementById("chats");
@ -134,7 +134,7 @@ export default class extends AbstractView {
// les messages, réecriture seulement du dernier
let i = 0;
client.channel.messages.forEach((message) => {
client.channels.channel.messages.forEach((message) => {
if (messages.children[i] == null || message.content != messages.children[i].innerText) {
let text = document.createElement("p");
let date = new Date(message.time);
@ -160,16 +160,16 @@ export default class extends AbstractView {
chat.appendChild(chat_input);
chat_input.onkeydown = async () => {
if (event.keyCode == 13 && client.channel != undefined) {
if (event.keyCode == 13 && client.channels.channel != undefined) {
//let chat_input = document.getElementById("input_chat");
let chat_text = chat_input.value;
let receivers_id = [];
client.channel.members_id.forEach((member_id) => {
client.channels.channel.members_id.forEach((member_id) => {
if (member_id != client.me.user_id)
receivers_id.push(users.filter(user => user.user_id == member_id)[0].user_id);
});
await client.channel.sendMessageChannel(chat_text, receivers_id)
await client.channels.channel.sendMessageChannel(chat_text, receivers_id)
// Reset
chat_input.value = "";
@ -180,7 +180,7 @@ export default class extends AbstractView {
let members = document.createElement("h2");
members.id = "members";
let usernames = "";
client.channel.members_id.forEach((member_id) => {
client.channels.channel.members_id.forEach((member_id) => {
if (member_id != client.me.user_id) {
if (usernames.length > 0)
usernames += ", ";
@ -216,9 +216,9 @@ export default class extends AbstractView {
}
async leavePage() {
if (client.channel != undefined)
client.channel.disconnect();
client.channel = undefined
if (client.channels.channel != undefined)
client.channels.channel.disconnect();
client.channels.channel = undefined;
}
async getHtml() {