mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +00:00 
			
		
		
		
	citra_qt/multiplayer/chat_room: Add moderation to context menu
This commit is contained in:
		
							parent
							
								
									6359b6094c
								
							
						
					
					
						commit
						15540df140
					
				
					 3 changed files with 62 additions and 1 deletions
				
			
		|  | @ -160,6 +160,10 @@ ChatRoom::ChatRoom(QWidget* parent) : QWidget(parent), ui(std::make_unique<Ui::C | ||||||
| 
 | 
 | ||||||
| ChatRoom::~ChatRoom() = default; | ChatRoom::~ChatRoom() = default; | ||||||
| 
 | 
 | ||||||
|  | void ChatRoom::SetModPerms(bool is_mod) { | ||||||
|  |     has_mod_perms = is_mod; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| void ChatRoom::RetranslateUi() { | void ChatRoom::RetranslateUi() { | ||||||
|     ui->retranslateUi(this); |     ui->retranslateUi(this); | ||||||
| } | } | ||||||
|  | @ -177,6 +181,21 @@ void ChatRoom::AppendChatMessage(const QString& msg) { | ||||||
|     ui->chat_history->append(msg); |     ui->chat_history->append(msg); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | void ChatRoom::SendModerationRequest(Network::RoomMessageTypes type, const std::string& nickname) { | ||||||
|  |     if (auto room = Network::GetRoomMember().lock()) { | ||||||
|  |         auto members = room->GetMemberInformation(); | ||||||
|  |         auto it = std::find_if(members.begin(), members.end(), | ||||||
|  |                                [&nickname](const Network::RoomMember::MemberInformation& member) { | ||||||
|  |                                    return member.nickname == nickname; | ||||||
|  |                                }); | ||||||
|  |         if (it == members.end()) { | ||||||
|  |             NetworkMessage::ShowError(NetworkMessage::NO_SUCH_USER); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |         room->SendModerationRequest(type, nickname); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | 
 | ||||||
| bool ChatRoom::ValidateMessage(const std::string& msg) { | bool ChatRoom::ValidateMessage(const std::string& msg) { | ||||||
|     return !msg.empty(); |     return !msg.empty(); | ||||||
| } | } | ||||||
|  | @ -241,6 +260,15 @@ void ChatRoom::OnStatusMessageReceive(const Network::StatusMessageEntry& status_ | ||||||
|     case Network::IdMemberLeave: |     case Network::IdMemberLeave: | ||||||
|         message = tr("%1 has left").arg(name); |         message = tr("%1 has left").arg(name); | ||||||
|         break; |         break; | ||||||
|  |     case Network::IdMemberKicked: | ||||||
|  |         message = tr("%1 has been kicked").arg(name); | ||||||
|  |         break; | ||||||
|  |     case Network::IdMemberBanned: | ||||||
|  |         message = tr("%1 has been banned").arg(name); | ||||||
|  |         break; | ||||||
|  |     case Network::IdAddressUnbanned: | ||||||
|  |         message = tr("%1 has been unbanned").arg(name); | ||||||
|  |         break; | ||||||
|     } |     } | ||||||
|     if (!message.isEmpty()) |     if (!message.isEmpty()) | ||||||
|         AppendStatusMessage(message); |         AppendStatusMessage(message); | ||||||
|  | @ -351,7 +379,7 @@ void ChatRoom::PopupContextMenu(const QPoint& menu_location) { | ||||||
|     std::string nickname = |     std::string nickname = | ||||||
|         player_list->item(item.row())->data(PlayerListItem::NicknameRole).toString().toStdString(); |         player_list->item(item.row())->data(PlayerListItem::NicknameRole).toString().toStdString(); | ||||||
|     if (auto room = Network::GetRoomMember().lock()) { |     if (auto room = Network::GetRoomMember().lock()) { | ||||||
|         // You can't block yourself
 |         // You can't block, kick or ban yourself
 | ||||||
|         if (nickname == room->GetNickname()) |         if (nickname == room->GetNickname()) | ||||||
|             return; |             return; | ||||||
|     } |     } | ||||||
|  | @ -377,5 +405,32 @@ void ChatRoom::PopupContextMenu(const QPoint& menu_location) { | ||||||
|         } |         } | ||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
|  |     if (has_mod_perms) { | ||||||
|  |         context_menu.addSeparator(); | ||||||
|  | 
 | ||||||
|  |         QAction* kick_action = context_menu.addAction(tr("Kick")); | ||||||
|  |         QAction* ban_action = context_menu.addAction(tr("Ban")); | ||||||
|  | 
 | ||||||
|  |         connect(kick_action, &QAction::triggered, [this, nickname] { | ||||||
|  |             QMessageBox::StandardButton result = | ||||||
|  |                 QMessageBox::question(this, tr("Kick Player"), | ||||||
|  |                                       tr("Are you sure you would like to <b>kick</b> %1?") | ||||||
|  |                                           .arg(QString::fromStdString(nickname)), | ||||||
|  |                                       QMessageBox::Yes | QMessageBox::No); | ||||||
|  |             if (result == QMessageBox::Yes) | ||||||
|  |                 SendModerationRequest(Network::IdModKick, nickname); | ||||||
|  |         }); | ||||||
|  |         connect(ban_action, &QAction::triggered, [this, nickname] { | ||||||
|  |             QMessageBox::StandardButton result = QMessageBox::question( | ||||||
|  |                 this, tr("Ban Player"), | ||||||
|  |                 tr("Are you sure you would like to <b>kick and ban</b> %1?\n\nThis would " | ||||||
|  |                    "ban both their forum username and their IP address.") | ||||||
|  |                     .arg(QString::fromStdString(nickname)), | ||||||
|  |                 QMessageBox::Yes | QMessageBox::No); | ||||||
|  |             if (result == QMessageBox::Yes) | ||||||
|  |                 SendModerationRequest(Network::IdModBan, nickname); | ||||||
|  |         }); | ||||||
|  |     } | ||||||
|  | 
 | ||||||
|     context_menu.exec(ui->player_view->viewport()->mapToGlobal(menu_location)); |     context_menu.exec(ui->player_view->viewport()->mapToGlobal(menu_location)); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -36,6 +36,8 @@ public: | ||||||
|     void AppendStatusMessage(const QString& msg); |     void AppendStatusMessage(const QString& msg); | ||||||
|     ~ChatRoom(); |     ~ChatRoom(); | ||||||
| 
 | 
 | ||||||
|  |     void SetModPerms(bool is_mod); | ||||||
|  | 
 | ||||||
| public slots: | public slots: | ||||||
|     void OnRoomUpdate(const Network::RoomInformation& info); |     void OnRoomUpdate(const Network::RoomInformation& info); | ||||||
|     void OnChatReceive(const Network::ChatEntry&); |     void OnChatReceive(const Network::ChatEntry&); | ||||||
|  | @ -54,8 +56,10 @@ private: | ||||||
|     static constexpr u32 max_chat_lines = 1000; |     static constexpr u32 max_chat_lines = 1000; | ||||||
|     void AppendChatMessage(const QString&); |     void AppendChatMessage(const QString&); | ||||||
|     bool ValidateMessage(const std::string&); |     bool ValidateMessage(const std::string&); | ||||||
|  |     void SendModerationRequest(Network::RoomMessageTypes type, const std::string& nickname); | ||||||
|     void UpdateIconDisplay(); |     void UpdateIconDisplay(); | ||||||
| 
 | 
 | ||||||
|  |     bool has_mod_perms = false; | ||||||
|     QStandardItemModel* player_list; |     QStandardItemModel* player_list; | ||||||
|     std::unique_ptr<Ui::ChatRoom> ui; |     std::unique_ptr<Ui::ChatRoom> ui; | ||||||
|     std::unordered_set<std::string> block_list; |     std::unordered_set<std::string> block_list; | ||||||
|  | @ -66,3 +70,4 @@ Q_DECLARE_METATYPE(Network::ChatEntry); | ||||||
| Q_DECLARE_METATYPE(Network::StatusMessageEntry); | Q_DECLARE_METATYPE(Network::StatusMessageEntry); | ||||||
| Q_DECLARE_METATYPE(Network::RoomInformation); | Q_DECLARE_METATYPE(Network::RoomInformation); | ||||||
| Q_DECLARE_METATYPE(Network::RoomMember::State); | Q_DECLARE_METATYPE(Network::RoomMember::State); | ||||||
|  | Q_DECLARE_METATYPE(Network::RoomMember::Error); | ||||||
|  |  | ||||||
|  | @ -55,6 +55,7 @@ ClientRoomWindow::ClientRoomWindow(QWidget* parent) | ||||||
| ClientRoomWindow::~ClientRoomWindow() = default; | ClientRoomWindow::~ClientRoomWindow() = default; | ||||||
| 
 | 
 | ||||||
| void ClientRoomWindow::SetModPerms(bool is_mod) { | void ClientRoomWindow::SetModPerms(bool is_mod) { | ||||||
|  |     ui->chat->SetModPerms(is_mod); | ||||||
|     ui->moderation->setVisible(is_mod); |     ui->moderation->setVisible(is_mod); | ||||||
|     ui->moderation->setDefault(false); |     ui->moderation->setDefault(false); | ||||||
|     ui->moderation->setAutoDefault(false); |     ui->moderation->setAutoDefault(false); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue