Skip to content

Commit

Permalink
Merge branches 'main' and 'main' of https://github.com/3r1s-s/meo
Browse files Browse the repository at this point in the history
  • Loading branch information
3r1s-s committed Aug 5, 2024
2 parents 9b2e079 + 4c1d904 commit 1550444
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions script.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ if (urlParams.has('openprofile')) {
// make it so when reconnect happens it goes back to the prev screen and not the start page
function main() {
meowerConnection = new WebSocket(server);
let loggedin = false;

meowerConnection.addEventListener('error', function(event) {
//launch screen
Expand Down Expand Up @@ -182,7 +181,6 @@ function main() {
console.log("INC: " + event.data);

const sentdata = JSON.parse(event.data);
let data
if (sentdata.listener === "auth") {
if (sentdata.cmd === "auth") {
sentdata.val.relationships.forEach((relationship) => {
Expand All @@ -197,7 +195,6 @@ function main() {
localStorage.setItem("token", sentdata.val.token);
localStorage.setItem("permissions", sentdata.val.account.permissions);
favoritedChats = sentdata.val.account.favorited_chats;
loggedin = true;
loadPfp(sentdata.val.username, sentdata.val.account);
sidebars();
renderChats();
Expand Down Expand Up @@ -1632,7 +1629,7 @@ function loadchat(chatId) {

const mainContainer = document.getElementById("main");
if (chatId === "home") {
pageContainer.innerHTML = `
mainContainer.innerHTML = `
<div class='info'><h1 class='header-top'>${lang().page_home}</h1><p id='info'></p>
</div>` + loadinputs();
document.getElementById("info").innerText = lul + " users online (" + sul + ")";
Expand Down Expand Up @@ -1722,7 +1719,7 @@ async function loadposts(pageNo) {
loadpost(post);
}
if (cachedPosts.length >= 25 || chatId === "livechat") {
document.getElementById("skeleton-msgs").style.display = "none";
if (chatId === "livechat") document.getElementById("skeleton-msgs").style.display = "none";
return;
}

Expand Down

0 comments on commit 1550444

Please sign in to comment.