From b0d07a75e51dd7377807275355a55964b240d2b9 Mon Sep 17 00:00:00 2001 From: Ninetime Date: Sun, 11 Aug 2024 10:20:19 -0400 Subject: [PATCH] Enable users to reject friend requests --- rpcs3/rpcs3qt/rpcn_settings_dialog.cpp | 37 +++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp index ea6763ccba..e24cfeed88 100644 --- a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp @@ -1135,17 +1135,36 @@ rpcn_friends_dialog::rpcn_friends_dialog(QWidget* parent) } QListWidgetItem* selected_item = m_lst_requests->selectedItems().first(); + std::string str_sel_friend = selected_item->text().toStdString(); - // Only create context menu for incoming requests + QMenu* context_menu = new QMenu(); + + // Presents different context based on role if (selected_item->data(Qt::UserRole) == false) { + QAction* cancel_friend_request = context_menu->addAction(tr("&Cancel Request")); + + connect(cancel_friend_request, &QAction::triggered, this, [this, str_sel_friend]() + { + if (!m_rpcn->remove_friend(str_sel_friend)) + { + QMessageBox::critical(this, tr("Error cancelling friend request!"), tr("An error occurred while trying to cancel friend request!"), QMessageBox::Ok); + } + else + { + QMessageBox::information(this, tr("Friend request cancelled!"), tr("You've successfully cancelled the friend request!"), QMessageBox::Ok); + } + }); + + context_menu->exec(m_lst_requests->viewport()->mapToGlobal(pos)); + context_menu->deleteLater(); + return; } - std::string str_sel_friend = selected_item->text().toStdString(); - QMenu* context_menu = new QMenu(); QAction* accept_request_action = context_menu->addAction(tr("&Accept Request")); + QAction* reject_friend_request = context_menu->addAction(tr("&Reject Request")); connect(accept_request_action, &QAction::triggered, this, [this, str_sel_friend]() { @@ -1159,6 +1178,18 @@ rpcn_friends_dialog::rpcn_friends_dialog(QWidget* parent) } }); + connect(reject_friend_request, &QAction::triggered, this, [this, str_sel_friend]() + { + if (!m_rpcn->remove_friend(str_sel_friend)) + { + QMessageBox::critical(this, tr("Error rejecting friend request!"), tr("An error occurred while trying to reject the friend request!"), QMessageBox::Ok); + } + else + { + QMessageBox::information(this, tr("Friend request cancelled!"), tr("You've successfully rejected the friend request!"), QMessageBox::Ok); + } + }); + context_menu->exec(m_lst_requests->viewport()->mapToGlobal(pos)); context_menu->deleteLater(); });