mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-22 09:35:08 -07:00
* [Client] Prevent contacting users on the ignore list (#1249) The ignore list silences incoming messages, but a user on it was still reachable: the context menu's chat item stayed enabled, private messages could be sent, and a chat tab could be opened for an ignored user. Make ignored users uncontactable: disable the chat item for them, refuse to deliver messages typed in an open PM tab with one, and refuse to open a new private chat tab with an ignored user (with a hint on how to undo the ignore). * Update cockatrice/src/interface/widgets/tabs/tab_message.cpp Co-authored-by: RickyRister <42636155+RickyRister@users.noreply.github.com> --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de> Co-authored-by: RickyRister <42636155+RickyRister@users.noreply.github.com>
220 lines
7 KiB
C++
220 lines
7 KiB
C++
#include "tab_message.h"
|
|
|
|
#include "../../../client/settings/cache_settings.h"
|
|
#include "../client/sound_engine.h"
|
|
#include "../interface/widgets/server/chat_view/chat_view.h"
|
|
#include "../interface/widgets/server/user/user_list_manager.h"
|
|
#include "../interface/widgets/utility/custom_line_edit.h"
|
|
#include "../main.h"
|
|
|
|
#include <QApplication>
|
|
#include <QDebug>
|
|
#include <QMenu>
|
|
#include <QSystemTrayIcon>
|
|
#include <QVBoxLayout>
|
|
#include <libcockatrice/network/client/abstract/abstract_client.h>
|
|
#include <libcockatrice/protocol/pb/event_user_message.pb.h>
|
|
#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
|
|
#include <libcockatrice/protocol/pb/session_commands.pb.h>
|
|
#include <libcockatrice/protocol/pending_command.h>
|
|
#include <libcockatrice/settings/chat_settings.h>
|
|
#include <libcockatrice/utility/string_limits.h>
|
|
|
|
TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
|
|
AbstractClient *_client,
|
|
const ServerInfo_User &_ownUserInfo,
|
|
const ServerInfo_User &_otherUserInfo,
|
|
bool _userOnline)
|
|
: Tab(_tabSupervisor), client(_client), ownUserInfo(new ServerInfo_User(_ownUserInfo)),
|
|
otherUserInfo(new ServerInfo_User(_otherUserInfo)), userOnline(_userOnline)
|
|
{
|
|
chatView = new ChatView(tabSupervisor, 0, true);
|
|
connect(chatView, &ChatView::showCardInfoPopup, this, &TabMessage::showCardInfoPopup);
|
|
connect(chatView, &ChatView::deleteCardInfoPopup, this, &TabMessage::deleteCardInfoPopup);
|
|
connect(chatView, &ChatView::addMentionTag, this, &TabMessage::addMentionTag);
|
|
connect(chatView, &ChatView::cockatriceLinkActivated, this, &TabMessage::cockatriceLinkActivated);
|
|
sayEdit = new LineEditUnfocusable;
|
|
sayEdit->setMaxLength(MAX_TEXT_LENGTH);
|
|
connect(sayEdit, &LineEditUnfocusable::returnPressed, this, &TabMessage::sendMessage);
|
|
|
|
auto *vbox = new QVBoxLayout;
|
|
vbox->addWidget(chatView);
|
|
vbox->addWidget(sayEdit);
|
|
|
|
aLeave = new QAction(this);
|
|
connect(aLeave, &QAction::triggered, this, &TabMessage::closeRequest);
|
|
|
|
messageMenu = new QMenu(this);
|
|
messageMenu->addAction(aLeave);
|
|
addTabMenu(messageMenu);
|
|
|
|
retranslateUi();
|
|
|
|
auto *mainWidget = new QWidget(this);
|
|
mainWidget->setLayout(vbox);
|
|
setCentralWidget(mainWidget);
|
|
}
|
|
|
|
TabMessage::~TabMessage()
|
|
{
|
|
delete ownUserInfo;
|
|
delete otherUserInfo;
|
|
}
|
|
|
|
void TabMessage::addMentionTag(QString mentionTag)
|
|
{
|
|
sayEdit->insert(mentionTag + " ");
|
|
sayEdit->setFocus();
|
|
}
|
|
|
|
void TabMessage::retranslateUi()
|
|
{
|
|
messageMenu->setTitle(tr("Private &chat"));
|
|
aLeave->setText(tr("&Leave"));
|
|
}
|
|
|
|
void TabMessage::tabActivated()
|
|
{
|
|
if (!sayEdit->hasFocus()) {
|
|
sayEdit->setFocus();
|
|
}
|
|
}
|
|
|
|
QString TabMessage::getUserName() const
|
|
{
|
|
return QString::fromStdString(otherUserInfo->name());
|
|
}
|
|
|
|
QString TabMessage::getTabText() const
|
|
{
|
|
return tr("%1 - Private chat").arg(QString::fromStdString(otherUserInfo->name()));
|
|
}
|
|
|
|
void TabMessage::closeEvent(QCloseEvent *event)
|
|
{
|
|
emit talkClosing(this);
|
|
event->accept();
|
|
}
|
|
|
|
void TabMessage::sendPrivateMessage(const QString &text)
|
|
{
|
|
if (tabSupervisor->getUserListManager()->isUserIgnored(getUserName())) {
|
|
chatView->appendMessage(tr("You have ignored %1; your messages are not delivered.")
|
|
.arg(QString::fromStdString(otherUserInfo->name())));
|
|
return;
|
|
}
|
|
|
|
Command_Message cmd;
|
|
cmd.set_user_name(otherUserInfo->name());
|
|
cmd.set_message(text.toStdString());
|
|
|
|
PendingCommand *pend = client->prepareSessionCommand(cmd);
|
|
pend->setExtraData(text);
|
|
connect(pend, &PendingCommand::finished, this, &TabMessage::messageSent);
|
|
client->sendCommand(pend);
|
|
}
|
|
|
|
void TabMessage::sendMessage()
|
|
{
|
|
if (sayEdit->text().isEmpty()) {
|
|
return;
|
|
}
|
|
|
|
if (!userOnline) {
|
|
notifyUserOffline();
|
|
return;
|
|
}
|
|
|
|
sendPrivateMessage(sayEdit->text());
|
|
sayEdit->clear();
|
|
}
|
|
|
|
bool TabMessage::isUserOnline() const
|
|
{
|
|
return userOnline;
|
|
}
|
|
|
|
void TabMessage::sendInviteMessage(const QString &text)
|
|
{
|
|
sayEdit->setText(text);
|
|
sendMessage();
|
|
}
|
|
|
|
void TabMessage::messageSent(const Response &response,
|
|
const CommandContainer & /*commandContainer*/,
|
|
const QVariant &extraData)
|
|
{
|
|
if (response.response_code() == Response::RespInIgnoreList) {
|
|
chatView->appendMessage(tr(
|
|
"This user is ignoring you, they cannot see your messages in main chat and you cannot join their games."));
|
|
} else if (response.response_code() == Response::RespNameNotFound) {
|
|
// The recipient went offline before the command reached the server: restore the draft.
|
|
userOnline = false;
|
|
if (sayEdit->text().isEmpty()) {
|
|
sayEdit->setText(extraData.toString());
|
|
}
|
|
notifyUserOffline();
|
|
}
|
|
}
|
|
|
|
void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
|
|
{
|
|
auto userInfo = event.sender_name() == otherUserInfo->name() ? otherUserInfo : ownUserInfo;
|
|
|
|
chatView->appendMessage(QString::fromStdString(event.message()), {}, *userInfo, true);
|
|
if (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)) {
|
|
soundEngine->playSound("private_message");
|
|
}
|
|
if (SettingsCache::instance().chat().getShowMessagePopup() && shouldShowSystemPopup(event)) {
|
|
showSystemPopup(event);
|
|
}
|
|
if (QString::fromStdString(event.sender_name()).toLower().simplified() == "servatrice") {
|
|
sayEdit->setDisabled(true);
|
|
}
|
|
|
|
emit userEvent();
|
|
}
|
|
|
|
bool TabMessage::shouldShowSystemPopup(const Event_UserMessage &event)
|
|
{
|
|
return (QApplication::activeWindow() == 0 || QApplication::focusWidget() == 0 ||
|
|
(event.sender_name() == otherUserInfo->name() &&
|
|
tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)));
|
|
}
|
|
|
|
void TabMessage::showSystemPopup(const Event_UserMessage &event)
|
|
{
|
|
if (trayIcon) {
|
|
disconnect(trayIcon, &QSystemTrayIcon::messageClicked, 0, 0);
|
|
trayIcon->showMessage(tr("Private message from") + " " + otherUserInfo->name().c_str(),
|
|
event.message().c_str());
|
|
connect(trayIcon, &QSystemTrayIcon::messageClicked, this, &TabMessage::messageClicked);
|
|
} else {
|
|
qCWarning(TabMessageLog) << "Error: trayIcon is NULL. TabMessage::showSystemPopup failed";
|
|
}
|
|
}
|
|
|
|
void TabMessage::messageClicked()
|
|
{
|
|
tabSupervisor->setCurrentIndex(tabSupervisor->indexOf(this));
|
|
activateWindow();
|
|
emit maximizeClient();
|
|
}
|
|
|
|
void TabMessage::processUserLeft()
|
|
{
|
|
chatView->appendMessage(tr("%1 has left the server.").arg(QString::fromStdString(otherUserInfo->name())));
|
|
userOnline = false;
|
|
}
|
|
|
|
void TabMessage::processUserJoined(const ServerInfo_User &_userInfo)
|
|
{
|
|
chatView->appendMessage(tr("%1 has joined the server.").arg(QString::fromStdString(otherUserInfo->name())));
|
|
userOnline = true;
|
|
*otherUserInfo = _userInfo;
|
|
}
|
|
|
|
void TabMessage::notifyUserOffline()
|
|
{
|
|
chatView->appendMessage(tr("Message not sent — %1 is offline.").arg(QString::fromStdString(otherUserInfo->name())));
|
|
}
|