merge hugo fixed pbm in room name check
This commit is contained in:
@@ -3853,147 +3853,110 @@ var app = (function () {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function get_room_messages()
|
async function get_room_messages() {
|
||||||
{
|
console.log("in get_room_messages");
|
||||||
console.log("in get_room_messages");
|
const response = await fetch('/api/v2/chat/messages');
|
||||||
const response = await fetch('/api/v2/chat/messages');
|
const data = await response.json();
|
||||||
const data = await response.json();
|
const messages = data.messages;
|
||||||
const messages = data.messages;
|
messages.forEach(function (item) {
|
||||||
|
if (item.name === user.username) {
|
||||||
messages.forEach(function(item) {
|
item.name = "me";
|
||||||
if (item.name === user.username) {
|
}
|
||||||
item.name = "me";
|
});
|
||||||
}
|
msgs.set(messages);
|
||||||
});
|
|
||||||
|
|
||||||
msgs.set(messages);
|
|
||||||
}
|
}
|
||||||
|
async function create_room(room_name, room_type) {
|
||||||
async function create_room(room_name, room_type)
|
console.log("in create_room");
|
||||||
{
|
let form_data = {
|
||||||
console.log("in create_room");
|
room_name: room_name,
|
||||||
|
room_type: room_type,
|
||||||
let form_data = {
|
};
|
||||||
room_name: room_name,
|
// send the new room
|
||||||
room_type: room_type,
|
const response = await fetch('/api/v2/chat/create', {
|
||||||
};
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
// send the new room
|
body: JSON.stringify(form_data),
|
||||||
const response = await fetch('/api/v2/chat/create', {
|
});
|
||||||
method: 'POST',
|
// get response status and message
|
||||||
headers: { 'Content-Type': 'application/json' },
|
let response_status = response.status;
|
||||||
body: JSON.stringify(form_data),
|
let data = await response.json();
|
||||||
});
|
let response_message = "";
|
||||||
|
if (data.message)
|
||||||
// get response status and message
|
response_message = data.message;
|
||||||
let response_status = response.status;
|
return {
|
||||||
let data = await response.json();
|
status: response_status,
|
||||||
let response_message = "";
|
message: response_message
|
||||||
if (data.message)
|
};
|
||||||
response_message = data.message;
|
|
||||||
|
|
||||||
return {
|
|
||||||
status: response_status,
|
|
||||||
message: response_message
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
async function join_room(room_name) {
|
||||||
async function join_room(room_name)
|
console.log("in join_room");
|
||||||
{
|
console.log(room_name);
|
||||||
console.log("in join_room");
|
let name = {
|
||||||
console.log(room_name);
|
room_name: room_name,
|
||||||
|
};
|
||||||
let name = {
|
const response = await fetch('/api/v2/chat/join', {
|
||||||
room_name: room_name,
|
method: 'POST',
|
||||||
};
|
headers: { 'Content-Type': 'application/json' },
|
||||||
const response = await fetch('/api/v2/chat/join', {
|
body: JSON.stringify(name),
|
||||||
method: 'POST',
|
});
|
||||||
headers: { 'Content-Type': 'application/json' },
|
let data = await response.json();
|
||||||
body: JSON.stringify(name),
|
console.log(data.message);
|
||||||
});
|
socket$1.emit('join', room_name);
|
||||||
let data = await response.json();
|
|
||||||
console.log(data.message);
|
|
||||||
|
|
||||||
socket$1.emit('join', room_name);
|
|
||||||
}
|
}
|
||||||
|
async function change_room(room_name) {
|
||||||
async function change_room(room_name)
|
console.log("in change_room");
|
||||||
{
|
let room_name_request = {
|
||||||
console.log("in change_room");
|
room_name: room_name,
|
||||||
|
};
|
||||||
let room_name_request = {
|
const response = await fetch('/api/v2/chat/change', {
|
||||||
room_name: room_name,
|
method: 'POST',
|
||||||
};
|
headers: { 'Content-Type': 'application/json' },
|
||||||
const response = await fetch('/api/v2/chat/change', {
|
body: JSON.stringify(room_name_request),
|
||||||
method: 'POST',
|
});
|
||||||
headers: { 'Content-Type': 'application/json' },
|
let data = await response.json();
|
||||||
body: JSON.stringify(room_name_request),
|
console.log(data.message);
|
||||||
});
|
await get_room_messages();
|
||||||
let data = await response.json();
|
socket$1.emit('change', room_name);
|
||||||
console.log(data.message);
|
current_room_name.set(room_name);
|
||||||
|
layout.set("room");
|
||||||
await get_room_messages();
|
|
||||||
socket$1.emit('change', room_name);
|
|
||||||
|
|
||||||
current_room_name.set(room_name);
|
|
||||||
layout.set("room");
|
|
||||||
}
|
}
|
||||||
|
async function get_my_rooms() {
|
||||||
async function get_my_rooms()
|
console.log("in get_my_rooms");
|
||||||
{
|
const response = await fetch('/api/v2/chat/myrooms');
|
||||||
console.log("in get_my_rooms");
|
const data = await response.json();
|
||||||
|
console.log("data.rooms:", data.rooms);
|
||||||
const response = await fetch('/api/v2/chat/myrooms');
|
for (let room of data.rooms)
|
||||||
const data = await response.json();
|
console.log(room.name);
|
||||||
|
let rooms = data.rooms;
|
||||||
console.log("data.rooms:", data.rooms);
|
return rooms;
|
||||||
for (let room of data.rooms)
|
|
||||||
console.log(room.name);
|
|
||||||
let rooms = data.rooms;
|
|
||||||
|
|
||||||
return rooms;
|
|
||||||
}
|
}
|
||||||
|
async function get_all_rooms() {
|
||||||
async function get_all_rooms()
|
console.log("in get_all_rooms");
|
||||||
{
|
const response = await fetch('/api/v2/chat/allrooms');
|
||||||
console.log("in get_all_rooms");
|
const data = await response.json();
|
||||||
|
console.log("data.rooms:", data.rooms);
|
||||||
const response = await fetch('/api/v2/chat/allrooms');
|
for (let room of data.rooms)
|
||||||
const data = await response.json();
|
console.log(room.name);
|
||||||
|
let rooms = data.rooms;
|
||||||
console.log("data.rooms:", data.rooms);
|
return rooms;
|
||||||
for (let room of data.rooms)
|
|
||||||
console.log(room.name);
|
|
||||||
let rooms = data.rooms;
|
|
||||||
|
|
||||||
return rooms;
|
|
||||||
}
|
}
|
||||||
|
async function get_room_users() {
|
||||||
async function get_room_users()
|
console.log("in get_room_users");
|
||||||
{
|
const response = await fetch('/api/v2/chat/roomusers');
|
||||||
console.log("in get_room_users");
|
const data = await response.json();
|
||||||
|
console.log("data.users:", data.users);
|
||||||
const response = await fetch('/api/v2/chat/roomusers');
|
for (let user of data.users)
|
||||||
const data = await response.json();
|
console.log(user.username);
|
||||||
|
let users = data.users;
|
||||||
console.log("data.users:", data.users);
|
return users;
|
||||||
for (let user of data.users)
|
|
||||||
console.log(user.username);
|
|
||||||
let users = data.users;
|
|
||||||
|
|
||||||
return users;
|
|
||||||
}
|
}
|
||||||
|
async function user_leave_room() {
|
||||||
async function user_leave_room()
|
console.log("in leave_room");
|
||||||
{
|
const response = await fetch('/api/v2/chat/removeuser', {
|
||||||
console.log("in leave_room");
|
method: 'DELETE',
|
||||||
|
});
|
||||||
const response = await fetch('/api/v2/chat/removeuser', {
|
const data = await response.json();
|
||||||
method: 'DELETE',
|
console.log("data", data);
|
||||||
});
|
|
||||||
const data = await response.json();
|
|
||||||
|
|
||||||
console.log("data", data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* src/pieces/chat/Layout_home.svelte generated by Svelte v3.53.1 */
|
/* src/pieces/chat/Layout_home.svelte generated by Svelte v3.53.1 */
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user