stop blank messages from being sent #5

Closed
carsand101 wants to merge 3 commits from main into main
2 changed files with 846 additions and 841 deletions

1504
main

File diff suppressed because it is too large Load Diff

View File

@ -1,90 +1,95 @@
let channelDiv = document.getElementById("channelDiv")
let messageDiv = document.getElementById("messageDiv")
let messageBox = document.getElementById("messageBox")
let statusMessage = document.getElementById("statusMessage")
let channelID = 0
async function updateMessages(id) {
try {
let response = await fetch("/api/chat/getmessages/" + id);
let messages = await response.json()
statusMessage.innerText = ""
document.querySelectorAll(".messageParagraph").forEach(el => el.remove());
for (let i in messages) {
let messageParagraph = document.createElement("p")
messageParagraph.appendChild(document.createTextNode(messages[i]["creator"]["username"] + ": " + messages[i]["content"]))
messageParagraph.classList.add("messageParagraph")
messageParagraph.id = "messageParagraph" + messages[i]["id"]
messageDiv.append(messageParagraph)
}
}
catch {
statusMessage.innerText = "Not connected"
}
}
function selectChannel(id) {
channelID = id
let selectedButton = channelDiv.querySelector(".selected");
if (selectedButton) {
selectedButton.classList.remove("selected");
}
let channelButton = document.getElementById("channelButton" + id)
if (channelButton) {
channelButton.classList.add("selected")
}
else {
console.log("channelButton not found")
}
updateMessages(id)
}
async function updateRooms() {
let response = await fetch("/api/chat/listrooms");
let rooms = await response.json()
for (let i in rooms) {
let channelButton = document.createElement("button")
channelButton.appendChild(document.createTextNode(rooms[i]["name"]))
channelButton.id = "channelButton" + rooms[i]["id"]
channelButton.onclick = function () { selectChannel(rooms[i]["id"]) }
channelDiv.append(channelButton)
}
selectChannel(1)
}
async function sendMessage(content, id) {
fetch("/api/chat/send/" + String(id), {
method: "POST",
body: JSON.stringify({
content: content
}),
headers: {
"Content-Type": "application/json"
}
})
}
messageBox.addEventListener("keyup", function onEvent(event) {
if (event.key === "Enter") {
sendMessage(messageBox.value, channelID)
updateMessages(channelID)
messageBox.value = ""
}
})
function update() {
updateMessages(channelID)
setTimeout(update, 1500);
}
window.addEventListener("load", function () {
updateRooms()
update()
let channelDiv = document.getElementById("channelDiv")
let messageDiv = document.getElementById("messageDiv")
let messageBox = document.getElementById("messageBox")
let statusMessage = document.getElementById("statusMessage")
let channelID = 0
async function updateMessages(id) {
try {
let response = await fetch("/api/chat/getmessages/" + id);
let messages = await response.json()
statusMessage.innerText = ""
document.querySelectorAll(".messageParagraph").forEach(el => el.remove());
for (let i in messages) {
let messageParagraph = document.createElement("p")
messageParagraph.appendChild(document.createTextNode(messages[i]["creator"]["username"] + ": " + messages[i]["content"]))
messageParagraph.classList.add("messageParagraph")
messageParagraph.id = "messageParagraph" + messages[i]["id"]
messageDiv.append(messageParagraph)
}
}
catch {
statusMessage.innerText = "Not connected"
}
}
function selectChannel(id) {
channelID = id
let selectedButton = channelDiv.querySelector(".selected");
if (selectedButton) {
selectedButton.classList.remove("selected");
}
let channelButton = document.getElementById("channelButton" + id)
if (channelButton) {
channelButton.classList.add("selected")
}
else {
console.log("channelButton not found")
}
updateMessages(id)
}
async function updateRooms() {
let response = await fetch("/api/chat/listrooms");
let rooms = await response.json()
for (let i in rooms) {
let channelButton = document.createElement("button")
channelButton.appendChild(document.createTextNode(rooms[i]["name"]))
channelButton.id = "channelButton" + rooms[i]["id"]
channelButton.onclick = function () { selectChannel(rooms[i]["id"]) }
channelDiv.append(channelButton)
}
selectChannel(1)
}
async function sendMessage(content, id) {
fetch("/api/chat/send/" + String(id), {
method: "POST",
body: JSON.stringify({
content: content
}),
headers: {
"Content-Type": "application/json"
}
})
}
messageBox.addEventListener("keyup", function onEvent(event) {
if (event.key === "Enter") {
if (!messageBox.value.trim().length == 0) {
sendMessage(messageBox.value, channelID)
updateMessages(channelID)
messageBox.value = ""
}
else {
return;
}
}
})
function update() {
updateMessages(channelID)
setTimeout(update, 1500);
}
window.addEventListener("load", function () {
updateRooms()
update()
})