Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network/room: add message/join/leave/kick/ban/unban/game name logging

Browse source
This commit is contained in:
vvanelslande 2019-11-02 21:16:37 -05:00
parent 35690e3ac7
commit db1b0a1964
2 changed files with 64 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/network/room.cpp
View file

@ -778,6 +778,27 @@ void Room::RoomImpl::SendStatusMessage(StatusMessageTypes type, const std::strin
}
}
enet_host_flush(server);
const std::string display_name =
username.empty() ? nickname : fmt::format("{} ({})", nickname, username);
switch (type) {
case IdMemberJoin:
LOG_INFO(Network, "{} has joined.", display_name);
break;
case IdMemberLeave:
LOG_INFO(Network, "{} has left.", display_name);
break;
case IdMemberKicked:
LOG_INFO(Network, "{} has been kicked.", display_name);
break;
case IdMemberBanned:
LOG_INFO(Network, "{} has been banned.", display_name);
break;
case IdAddressUnbanned:
LOG_INFO(Network, "{} has been unbanned.", display_name);
break;
}
}
void Room::RoomImpl::BroadcastRoomInformation() {
@ -911,6 +932,13 @@ void Room::RoomImpl::HandleChatPacket(const ENetEvent* event) {
}
enet_host_flush(server);
if (sending_member->user_data.username.empty()) {
LOG_INFO(Network, "{}: {}", sending_member->nickname, message);
} else {
LOG_INFO(Network, "{} ({}): {}", sending_member->nickname,
sending_member->user_data.username, message);
}
}
void Room::RoomImpl::HandleGameNamePacket(const ENetEvent* event) {
@ -930,6 +958,17 @@ void Room::RoomImpl::HandleGameNamePacket(const ENetEvent* event) {
});
if (member != members.end()) {
member->game_info = game_info;
const std::string display_name =
member->user_data.username.empty()
? member->nickname
: fmt::format("{} ({})", member->nickname, member->user_data.username);
if (game_info.name.empty()) {
LOG_INFO(Network, "{} is not playing", display_name);
} else {
LOG_INFO(Network, "{} is playing {}", display_name, game_info.name);
}
}
}
BroadcastRoomInformation();