jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-10 03:53:26 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

[Server] Let users fetch their own private chat history (#7506)

Browse source 
* [Server] Let users fetch their own private chat history

Players lose their private conversations on reconnect or on another
device. Servatrice can already log private messages, but only
moderators can read the logs.

Add Command_GetPrivateChatHistory / Response_PrivateChatHistory so a
registered user can page through their own logged conversation with one
other user. Operators opt in with logging/allow_user_chat_history
(default off, and log_user_msg_chat must be on). The caller is matched
by account id so reused guest or deleted-account names can't read older
messages; only time, sender name and text are returned. Pages hold
1..200 messages and never split a second, since log_time has 1-second
resolution.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* [Server] Harden private chat history identity matching

Match both participants by account id and name so a federated user's remote id cannot collide with a local account, and stop storing foreign ids in the local chat log. Extract the paging assembly into a pure helper and cover the whole-second boundary rules with gtests.

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Lukas Brübach <44814898+BruebachL@users.noreply.github.com>
This commit is contained in:
SwitchOCE 2026-11-09 23:21:43 +11:00 • committed by GitHub
parent 3d8c729517
commit 7709184ecc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 395 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

47
servatrice/src/serversocketinterface.cpp
View file

@ -98,6 +98,7 @@
#include <libcockatrice/protocol/pb/command_deck_share_list_mine.pb.h>
#include <libcockatrice/protocol/pb/command_deck_share_remove.pb.h>
#include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
#include <libcockatrice/protocol/pb/command_get_private_chat_history.pb.h>
#include <libcockatrice/protocol/pb/command_get_server_stats.pb.h>
#include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
#include <libcockatrice/protocol/pb/command_replay_download.pb.h>
@ -139,6 +140,7 @@
#include <libcockatrice/protocol/pb/response_get_server_stats.pb.h>
#include <libcockatrice/protocol/pb/response_moderator_last_logins.pb.h>
#include <libcockatrice/protocol/pb/response_password_salt.pb.h>
#include <libcockatrice/protocol/pb/response_private_chat_history.pb.h>
#include <libcockatrice/protocol/pb/response_register.pb.h>
#include <libcockatrice/protocol/pb/response_remove_user_avatar.pb.h>
#include <libcockatrice/protocol/pb/response_remove_user_banner.pb.h>
@ -414,6 +416,8 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedSessionComm
return cmdDeckShareRemove(cmd.GetExtension(Command_DeckShareRemove::ext), rc);
case SessionCommand::DECK_SHARE_DOWNLOAD:
return cmdDeckShareDownload(cmd.GetExtension(Command_DeckShareDownload::ext), rc);
case SessionCommand::GET_PRIVATE_CHAT_HISTORY:
return cmdGetPrivateChatHistory(cmd.GetExtension(Command_GetPrivateChatHistory::ext), rc);
case SessionCommand::ACCOUNT_PASSWORD:
return cmdAccountPassword(cmd.GetExtension(Command_AccountPassword::ext), rc);
case SessionCommand::REQUEST_PASSWORD_SALT:
@ -1702,6 +1706,49 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplaySubmitCode(const
return Response::RespOk;
}
Response::ResponseCode AbstractServerSocketInterface::cmdGetPrivateChatHistory(const Command_GetPrivateChatHistory &cmd,
ResponseContainer &rc)
{
if (authState != PasswordRight) {
return Response::RespFunctionNotAllowed;
}
if (!userInfo || !(userInfo->user_level() & ServerInfo_User::IsRegistered)) {
return Response::RespFunctionNotAllowed;
}
if (!settingsCache->value("logging/log_user_msg_chat", false).toBool() ||
!settingsCache->value("logging/allow_user_chat_history", false).toBool()) {
return Response::RespFunctionNotAllowed;
}
const QString peer = nameFromStdString(cmd.user_name());
if (peer.isEmpty()) {
return Response::RespInvalidData;
}
// Resolve the peer to an account id. Matching by name alone would merge the
// conversations of everyone who has ever used that name.
const int peerId = sqlInterface->getUserIdInDB(peer);
if (peerId < 1) {
return Response::RespNameNotFound;
}
const int limit = qBound<quint32>(1, cmd.limit(), 200);
QList<ServerInfo_PrivateChatMessage> messages;
bool hasMore = false;
if (!sqlInterface->getPrivateChatHistory(userInfo->id(), QString::fromStdString(userInfo->name()), peerId, peer,
cmd.before(), limit, messages, hasMore)) {
return Response::RespInternalError;
}
Response_PrivateChatHistory *re = new Response_PrivateChatHistory;
for (const auto &message : messages) {
re->add_messages()->CopyFrom(message);
}
re->set_has_more(hasMore);
rc.setResponseExtension(re);
return Response::RespOk;
}
// MODERATOR FUNCTIONS.
// May be called by admins and moderators. Permission is checked by the calling function.
Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Command_ViewLogHistory &cmd,