forked from ppfun/pixelplanet
parent
73ae694ef1
commit
81133c90aa
|
@ -61,14 +61,9 @@ class User {
|
||||||
userlvl; // number
|
userlvl; // number
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
// if id = 0 -> unregistered
|
this.resetRegUser();
|
||||||
this.id = 0;
|
|
||||||
this.regUser = null;
|
|
||||||
this.ip = '127.0.0.1';
|
this.ip = '127.0.0.1';
|
||||||
this.ipSub = this.ip;
|
this.ipSub = this.ip;
|
||||||
this.channels = {};
|
|
||||||
this.blocked = [];
|
|
||||||
this.userlvl = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async initialize(id, ip = null, regUser = null) {
|
async initialize(id, ip = null, regUser = null) {
|
||||||
|
@ -91,6 +86,15 @@ class User {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resetRegUser() {
|
||||||
|
// if id = 0 -> unregistered
|
||||||
|
this.id = 0;
|
||||||
|
this.regUser = null;
|
||||||
|
this.channels = {};
|
||||||
|
this.blocked = [];
|
||||||
|
this.userlvl = 0;
|
||||||
|
}
|
||||||
|
|
||||||
setRegUser(reguser) {
|
setRegUser(reguser) {
|
||||||
this.regUser = reguser;
|
this.regUser = reguser;
|
||||||
this.id = reguser.id;
|
this.id = reguser.id;
|
||||||
|
@ -154,7 +158,13 @@ class User {
|
||||||
|
|
||||||
async reload() {
|
async reload() {
|
||||||
if (!this.regUser) return;
|
if (!this.regUser) return;
|
||||||
await this.regUser.reload();
|
try {
|
||||||
|
await this.regUser.reload();
|
||||||
|
} catch (e) {
|
||||||
|
// user got deleted
|
||||||
|
this.resetRegUser();
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.setRegUser(this.regUser);
|
this.setRegUser(this.regUser);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -372,9 +372,9 @@ class SocketServer {
|
||||||
reloadUser(name) {
|
reloadUser(name) {
|
||||||
this.wss.clients.forEach(async (ws) => {
|
this.wss.clients.forEach(async (ws) => {
|
||||||
if (ws.user.name === name) {
|
if (ws.user.name === name) {
|
||||||
|
await ws.user.reload();
|
||||||
const buffer = dehydrateChangeMe();
|
const buffer = dehydrateChangeMe();
|
||||||
ws.send(buffer);
|
ws.send(buffer);
|
||||||
await ws.user.reload();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user