Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
@ -37,7 +37,6 @@ class Channel {
|
||||
|
||||
updateMessages(messages)
|
||||
{
|
||||
console.log(messages);
|
||||
messages = JSON.parse(messages);
|
||||
let new_messages = [];
|
||||
|
||||
@ -75,6 +74,10 @@ class Channel {
|
||||
return data;
|
||||
}
|
||||
|
||||
async sendInvite() {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export {Channel}
|
||||
|
@ -1,9 +1,9 @@
|
||||
import {Channel} from "./channel.js"
|
||||
import {Message} from "./message.js"
|
||||
|
||||
class Channels {
|
||||
constructor(client) {
|
||||
this.client = client;
|
||||
this.channel = undefined;
|
||||
}
|
||||
|
||||
async createChannel(members_id, reload) {
|
||||
@ -28,7 +28,10 @@ class Channels {
|
||||
if (exit_code == 200)
|
||||
messages = data.messages;
|
||||
|
||||
return new Channel(this.client, data.channel_id, members_id, messages, reload);
|
||||
console.log(response);
|
||||
console.log(data);
|
||||
this.channel = new Channel(this.client, data.channel_id, members_id, messages, reload);
|
||||
return this.channel;
|
||||
}
|
||||
|
||||
async deleteChannel(members_id) {
|
||||
|
0
frontend/static/js/api/chat/notice.js
Normal file
0
frontend/static/js/api/chat/notice.js
Normal file
@ -34,8 +34,8 @@ class Profile
|
||||
|
||||
let block_response = await this.client._get("/api/profiles/block");
|
||||
|
||||
if (block_response.status == 404)
|
||||
return;
|
||||
if (block_response.status != 200)
|
||||
return
|
||||
|
||||
let block_data = await block_response.json();
|
||||
let block_list = JSON.parse(block_data);
|
||||
|
@ -41,8 +41,6 @@ class Profiles
|
||||
});
|
||||
|
||||
let data = await response.json();
|
||||
console.log(response.status);
|
||||
console.log(data);
|
||||
return data;
|
||||
|
||||
}
|
||||
@ -55,8 +53,6 @@ class Profiles
|
||||
});
|
||||
|
||||
let data = await response.json();
|
||||
console.log(response.status);
|
||||
console.log(data);
|
||||
return data;
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user