yellows111
/
messenger.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting 2: fix merge conflicts 

nothing new, yet
This commit is contained in:
yellows111 2024-03-25 17:00:16 +00:00
parent e0e5396bd8
commit 6e7f0d9094
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.js
View File

@ -184,7 +184,7 @@ channelSocket.onmessage = function(event) {
break;
}
default: {
__messengerjs__.fade.textContent = "server error: " + args[1] + " code ( " + args[2] + " )";
__messengerjs__.fade.textContent = "server error: " + args[1] + " code (" + args[2] + ")";
__messengerjs__.fade.style.display = "block";
channelSocket.close(1000, "server sent non-zero error");
__messengerjs__.callIfExists("Channel_OnTypeChanged");

8
server.js
View File

@ -93,7 +93,7 @@ const MessageParser = function(webSocket, message, isBinary) {
}
let getChannelId = args[1];
if(server.numSubscribers(`channels/${getChannelId}`) >= 2) {
// this room is full
// this channel is full
webSocket.send(EncodeCommandString(["error", "channel has too many members", 513]), true);
break;
}
@ -104,12 +104,12 @@ const MessageParser = function(webSocket, message, isBinary) {
}
if(ChannelStorage.has(getChannelId) === false) {
// make the channel right then and there
console.log(`creating #${getChannelId} for (${webSocket.getUserData().uid})`);
console.log(`creating #${getChannelId} (fourCC: ${args2}) for (${webSocket.getUserData().uid})`);
ChannelStorage.set(getChannelId, {"owner": webSocket.getUserData().uid, "fourCC": args[2]});
};
if(ChannelStorage.get(getChannelId).fourCC !== args[2]) {
// if the fourCC is not the same as the channel, error as such
webSocket.send(EncodeCommandString(["error", `activity is incompatible! (You: ${args[2]}, Remote: ${ChannelStorage.get(getChannelId).fourCC}).`, 256]), true);
webSocket.send(EncodeCommandString(["error", `Activity is incompatible! (You: ${args[2]}, Remote: ${ChannelStorage.get(getChannelId).fourCC}).`, 256]), true);
break;
}
@ -145,7 +145,7 @@ const MessageParser = function(webSocket, message, isBinary) {
EncodeCommandString(["remuser", UserAttachedNameStorage.get(webSocket.getUserData().uid)]),
true
);
// if room is empty, delete it
// if channel is empty, delete it
if(server.numSubscribers(`channels/${UserAttachedChannelStorage.get(webSocket.getUserData().uid)}`) === 0) {
console.log(`deleting #${UserAttachedChannelStorage.get(webSocket.getUserData().uid)} since (${webSocket.getUserData().uid}) left, leaving it with no members`);
ChannelStorage.delete(UserAttachedChannelStorage.get(webSocket.getUserData().uid));