merge hugo fixed pbm in room name check

This commit is contained in:
simplonco
2023-01-10 10:43:08 +01:00
2 changed files with 98 additions and 135 deletions

View File

@@ -3853,56 +3853,44 @@ 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) { messages.forEach(function (item) {
if (item.name === user.username) { if (item.name === user.username) {
item.name = "me"; 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"); console.log("in create_room");
let form_data = { let form_data = {
room_name: room_name, room_name: room_name,
room_type: room_type, room_type: room_type,
}; };
// send the new room // send the new room
const response = await fetch('/api/v2/chat/create', { const response = await fetch('/api/v2/chat/create', {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(form_data), body: JSON.stringify(form_data),
}); });
// get response status and message // get response status and message
let response_status = response.status; let response_status = response.status;
let data = await response.json(); let data = await response.json();
let response_message = ""; let response_message = "";
if (data.message) if (data.message)
response_message = data.message; response_message = data.message;
return { return {
status: response_status, status: response_status,
message: response_message message: response_message
}; };
} }
async function join_room(room_name) {
async function join_room(room_name)
{
console.log("in join_room"); console.log("in join_room");
console.log(room_name); console.log(room_name);
let name = { let name = {
room_name: room_name, room_name: room_name,
}; };
@@ -3913,14 +3901,10 @@ var app = (function () {
}); });
let data = await response.json(); let data = await response.json();
console.log(data.message); console.log(data.message);
socket$1.emit('join', room_name); socket$1.emit('join', room_name);
} }
async function change_room(room_name) {
async function change_room(room_name)
{
console.log("in change_room"); console.log("in change_room");
let room_name_request = { let room_name_request = {
room_name: room_name, room_name: room_name,
}; };
@@ -3931,68 +3915,47 @@ var app = (function () {
}); });
let data = await response.json(); let data = await response.json();
console.log(data.message); console.log(data.message);
await get_room_messages(); await get_room_messages();
socket$1.emit('change', room_name); socket$1.emit('change', room_name);
current_room_name.set(room_name); current_room_name.set(room_name);
layout.set("room"); layout.set("room");
} }
async function get_my_rooms() {
async function get_my_rooms()
{
console.log("in get_my_rooms"); console.log("in get_my_rooms");
const response = await fetch('/api/v2/chat/myrooms'); const response = await fetch('/api/v2/chat/myrooms');
const data = await response.json(); const data = await response.json();
console.log("data.rooms:", data.rooms); console.log("data.rooms:", data.rooms);
for (let room of data.rooms) for (let room of data.rooms)
console.log(room.name); console.log(room.name);
let rooms = data.rooms; let rooms = data.rooms;
return rooms; return rooms;
} }
async function get_all_rooms() {
async function get_all_rooms()
{
console.log("in get_all_rooms"); console.log("in get_all_rooms");
const response = await fetch('/api/v2/chat/allrooms'); const response = await fetch('/api/v2/chat/allrooms');
const data = await response.json(); const data = await response.json();
console.log("data.rooms:", data.rooms); console.log("data.rooms:", data.rooms);
for (let room of data.rooms) for (let room of data.rooms)
console.log(room.name); console.log(room.name);
let rooms = data.rooms; let rooms = data.rooms;
return rooms; return rooms;
} }
async function get_room_users() {
async function get_room_users()
{
console.log("in get_room_users"); console.log("in get_room_users");
const response = await fetch('/api/v2/chat/roomusers'); const response = await fetch('/api/v2/chat/roomusers');
const data = await response.json(); const data = await response.json();
console.log("data.users:", data.users); console.log("data.users:", data.users);
for (let user of data.users) for (let user of data.users)
console.log(user.username); console.log(user.username);
let users = data.users; let users = data.users;
return users; return users;
} }
async function user_leave_room() {
async function user_leave_room()
{
console.log("in leave_room"); console.log("in leave_room");
const response = await fetch('/api/v2/chat/removeuser', { const response = await fetch('/api/v2/chat/removeuser', {
method: 'DELETE', method: 'DELETE',
}); });
const data = await response.json(); const data = await response.json();
console.log("data", data); console.log("data", data);
} }

File diff suppressed because one or more lines are too long