Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Update ban feature"

Browse source 
This reverts commit d2ee52ce43.
This commit is contained in:
Gregoire Parant 2021-01-15 03:15:14 +01:00
parent d2ee52ce43
commit 8c9e9522db
10 changed files with 26 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

14
back/src/Model/Admin.ts
View file

@ -21,15 +21,17 @@ export class Admin {
) {
}
public sendUserJoin(uuid: string, name: string, ip: string): void {
let serverToAdminClientMessage = new ServerToAdminClientMessage();
serverToAdminClientMessage = serverToAdminClientMessage.setUseruuidnamejoinedroom(uuid+';'+name+';'+ip)
public sendUserJoin(uuid: string): void {
const serverToAdminClientMessage = new ServerToAdminClientMessage();
serverToAdminClientMessage.setUseruuidjoinedroom(uuid);
this.socket.write(serverToAdminClientMessage);
}
public sendUserLeft(uuid: string, name: string, ip: string): void {
let serverToAdminClientMessage = new ServerToAdminClientMessage();
serverToAdminClientMessage = serverToAdminClientMessage.setUseruuidnameleftroom(uuid+';'+name+';'+ip);
public sendUserLeft(uuid: string): void {
const serverToAdminClientMessage = new ServerToAdminClientMessage();
serverToAdminClientMessage.setUseruuidleftroom(uuid);
this.socket.write(serverToAdminClientMessage);
}
}

18
back/src/Model/GameRoom.ts
View file

@ -102,17 +102,7 @@ export class GameRoom {
}
const position = ProtobufUtils.toPointInterface(positionMessage);
const user = new User(this.nextUserId,
joinRoomMessage.getUseruuid(),
joinRoomMessage.getIpaddress(),
position,
false,
this.positionNotifier,
socket,
joinRoomMessage.getTagList(),
joinRoomMessage.getName(),
ProtobufUtils.toCharacterLayerObjects(joinRoomMessage.getCharacterlayerList())
);
const user = new User(this.nextUserId, joinRoomMessage.getUseruuid(), position, false, this.positionNotifier, socket, joinRoomMessage.getTagList(), joinRoomMessage.getName(), ProtobufUtils.toCharacterLayerObjects(joinRoomMessage.getCharacterlayerList()));
this.nextUserId++;
this.users.set(user.id, user);
this.usersByUuid.set(user.uuid, user);
@ -122,7 +112,7 @@ export class GameRoom {
// Notify admins
for (const admin of this.admins) {
admin.sendUserJoin(user.uuid, user.name, user.IPAddress);
admin.sendUserJoin(user.uuid);
}
return user;
@ -145,7 +135,7 @@ export class GameRoom {
// Notify admins
for (const admin of this.admins) {
admin.sendUserLeft(user.uuid, user.name, user.IPAddress);
admin.sendUserLeft(user.uuid);
}
}
@ -328,7 +318,7 @@ export class GameRoom {
// Let's send all connected users
for (const user of this.users.values()) {
admin.sendUserJoin(user.uuid, user.name, user.IPAddress);
admin.sendUserJoin(user.uuid);
}
}

1
back/src/Model/User.ts
View file

@ -16,7 +16,6 @@ export class User implements Movable {
public constructor(
public id: number,
public readonly uuid: string,
public readonly IPAddress: string,
private position: PointInterface,
public silent: boolean,
private positionNotifier: PositionNotifier,

1
back/tests/GameRoomTest.ts
View file

@ -26,7 +26,6 @@ function createJoinRoomMessage(uuid: string, x: number, y: number): JoinRoomMess
positionMessage.setMoving(false);
const joinRoomMessage = new JoinRoomMessage();
joinRoomMessage.setUseruuid('1');
joinRoomMessage.setIpaddress('10.0.0.2');
joinRoomMessage.setName('foo');
joinRoomMessage.setRoomid('_/global/test.json');
joinRoomMessage.setPositionmessage(positionMessage);