jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 16:44:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pass ServerInfo_User down the chain (#5542)

Browse source
This commit is contained in:
RickyRister 2025-02-01 17:04:49 -08:00 • committed by GitHub
parent 26c0cdc072
commit 0fc05e15cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 17 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/server/chat_view/chat_view.cpp
View file

@ -149,11 +149,12 @@ void ChatView::appendUrlTag(QTextCursor &cursor, QString url)
void ChatView::appendMessage(QString message,
RoomMessageTypeFlags messageType,
const QString &userName,
UserLevelFlags userLevel,
QString UserPrivLevel,
const ServerInfo_User &userInfo,
bool playerBold)
{
const QString userName = QString::fromStdString(userInfo.name());
const UserLevelFlags userLevel = UserLevelFlags(userInfo.user_level());
bool atBottom = verticalScrollBar()->value() >= verticalScrollBar()->maximum();
// messageType should be Event_RoomSay::UserMessage though we don't actually check
bool isUserMessage = !(userName.toLower() == "servatrice" || userName.isEmpty());
@ -189,8 +190,9 @@ void ChatView::appendMessage(QString message,
} else {
const int pixelSize = QFontInfo(cursor.charFormat().font()).pixelSize();
bool isBuddy = userListProxy->isUserBuddy(userName);
const QString privLevel = userInfo.has_privlevel() ? QString::fromStdString(userInfo.privlevel()) : "NONE";
cursor.insertImage(
UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel, isBuddy, UserPrivLevel).toImage());
UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel, isBuddy, privLevel).toImage());
cursor.insertText(" ");
cursor.setCharFormat(senderFormat);
cursor.insertText(userName);

4
cockatrice/src/server/chat_view/chat_view.h
View file

@ -91,9 +91,7 @@ public:
QString optionalFontColor = QString());
void appendMessage(QString message,
RoomMessageTypeFlags messageType = {},
const QString &userName = QString(),
UserLevelFlags userLevel = UserLevelFlags(),
QString UserPrivLevel = "NONE",
const ServerInfo_User &userInfo = {},
bool playerBold = false);
void clearChat();
void redactMessages(const QString &userName, int amount);

10
cockatrice/src/server/message_log_widget.cpp
View file

@ -606,8 +606,7 @@ void MessageLogWidget::logRollDie(Player *player, int sides, const QList<uint> &
void MessageLogWidget::logSay(Player *player, QString message)
{
appendMessage(std::move(message), {}, player->getName(), UserLevelFlags(player->getUserInfo()->user_level()),
QString::fromStdString(player->getUserInfo()->privlevel()), true);
appendMessage(std::move(message), {}, *player->getUserInfo(), true);
}
void MessageLogWidget::logSetActivePhase(int phaseNumber)
@ -783,12 +782,9 @@ void MessageLogWidget::logShuffle(Player *player, CardZone *zone, int start, int
}
}
void MessageLogWidget::logSpectatorSay(QString spectatorName,
UserLevelFlags spectatorUserLevel,
QString userPrivLevel,
QString message)
void MessageLogWidget::logSpectatorSay(const ServerInfo_User &spectator, QString message)
{
appendMessage(std::move(message), {}, spectatorName, spectatorUserLevel, userPrivLevel, false);
appendMessage(std::move(message), {}, spectator, false);
}
void MessageLogWidget::logUnattachCard(Player *player, QString cardName)

3
cockatrice/src/server/message_log_widget.h
View file

@ -92,8 +92,7 @@ public slots:
void logSetSideboardLock(Player *player, bool locked);
void logSetTapped(Player *player, CardItem *card, bool tapped);
void logShuffle(Player *player, CardZone *zone, int start, int end);
void
logSpectatorSay(QString spectatorName, UserLevelFlags spectatorUserLevel, QString userPrivLevel, QString message);
void logSpectatorSay(const ServerInfo_User &spectator, QString message);
void logUnattachCard(Player *player, QString cardName);
void logUndoDraw(Player *player, QString cardName);
void setContextJudgeName(QString player);