StarMirror/hack-chat-main
1
0
Fork 0
mirror of https://github.com/hack-chat/main.git synced 2024-03-22 13:20:33 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94 from MinusGix/joinPassword

Browse Source 
Make password field available for use in join
This commit is contained in:
marzavec 2020-03-12 10:58:06 -05:00 committed by GitHub
commit 44ce7aa5da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/commands/core/join.js
View File

@ -32,7 +32,13 @@ export function parseNickname(core, data) {
return 'Nickname must consist of up to 24 letters, numbers, and underscores';
}
const password = nickArray[1];
let password = undefined;
// prioritize hash in nick for password over password field
if (typeof nickArray[1] === 'string') {
password = nickArray[1];
} else if (typeof data.password === 'string') {
password = data.password;
}
if (hash(password + core.config.tripSalt) === core.config.adminTrip) {
userInfo.uType = 'admin';
@ -152,5 +158,5 @@ export const info = {
name: 'join',
description: 'Place calling socket into target channel with target nick & broadcast event to channel',
usage: `
API: { cmd: 'join', nick: '<your nickname>', channel: '<target channel>' }`,
API: { cmd: 'join', nick: '<your nickname>', password: '<optional password>', channel: '<target channel>' }`,
};