Refactoring following code to make a distinction beween followed and following users.

Also, moving sending messages to the User class.
This commit is contained in:
David Négrier 2021-12-17 18:26:17 +01:00 committed by PizZaKatZe
parent fd9cb09de6
commit cd805fab31
4 changed files with 63 additions and 33 deletions

View file

@ -844,34 +844,28 @@ export class SocketManager {
}
handleFollowConfirmationMessage(room: GameRoom, user: User, message: FollowConfirmationMessage) {
const clientMessage = new ServerToClientMessage();
clientMessage.setFollowconfirmationmessage(message);
const leader = room.getUserById(message.getLeader());
leader?.socket.write(clientMessage);
if (!leader) {
console.info('Could not find user "', message.getLeader(), '" while handling a follow confirmation in room "', room.roomUrl,'". Maybe the user just left.');
return;
}
leader?.addFollower(user.id);
user.addFollower(message.getLeader());
// By security, we look at the group leader. If the group leader is NOT the leader in the message, everybody should
// stop following the group leader (to avoid having 2 group leaders)
if (user?.group?.leader && user?.group?.leader !== leader) {
user?.group?.leader?.stopLeading();
}
leader.addFollower(user);
}
handleFollowAbortMessage(room: GameRoom, user: User, message: FollowAbortMessage) {
const clientMessage = new ServerToClientMessage();
clientMessage.setFollowabortmessage(message);
if (user.id === message.getLeader()) {
// Forward message
room.sendToOthersInGroupIncludingUser(user, clientMessage);
// Update followers
user.group?.getUsers().forEach((user) => {
user.following = [];
});
user?.group?.leader?.stopLeading();
} else {
// Forward message
const leader = room.getUserById(message.getLeader());
leader?.socket.write(clientMessage);
// Update followers
leader?.delFollower(user.id);
user.following = [];
leader?.delFollower(user);
}
}
}