Merge commit '2aae2a312880ffa56ca6f0fe0f08bf90fabeb015' into develop

airdcpp-web · Jun 19, 2024 · c4c07e8 · c4c07e8
2 parents aa0c4e3 + 2aae2a3
commit c4c07e8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/airdcpp-webapi/api/MenuApi.cpp b/airdcpp-webapi/api/MenuApi.cpp
@@ -382,4 +382,12 @@ namespace webserver {
 	void MenuApi::on(ContextMenuManagerListener::ExtensionMenuSelected, const vector<string>& aSelectedIds, const ContextMenuItemClickData& aClickData) noexcept {
 		onMenuItemSelected("extension", aSelectedIds, aClickData);
 	}
+
+	void MenuApi::on(HubMessageHighlightMenuSelected, const vector<uint32_t>& aSelectedIds, const ClientPtr& aClient, const ContextMenuItemClickData& aClickData) noexcept {
+		onMenuItemSelected("hub_message_highlight", aSelectedIds, aClickData, aClient->getToken());
+	}
+
+	void MenuApi::on(PrivateChatMessageHighlightMenuSelected, const vector<uint32_t>& aSelectedIds, const PrivateChatPtr& aChat, const ContextMenuItemClickData& aClickData) noexcept {
+		onMenuItemSelected("private_chat_message_highlight", aSelectedIds, aClickData, aChat->getToken());
+	}
 }
diff --git a/airdcpp-webapi/api/MenuApi.h b/airdcpp-webapi/api/MenuApi.h
@@ -149,14 +149,18 @@ namespace webserver {
 		void on(ContextMenuManagerListener::TransferMenuSelected, const vector<uint32_t>&, const ContextMenuItemClickData& aClickData) noexcept override;
 		void on(ContextMenuManagerListener::ShareRootMenuSelected, const vector<TTHValue>&, const ContextMenuItemClickData& aClickData) noexcept override;
 		void on(ContextMenuManagerListener::FavoriteHubMenuSelected, const vector<uint32_t>&, const ContextMenuItemClickData& aClickData) noexcept override;
+		void on(ContextMenuManagerListener::ExtensionMenuSelected, const vector<string>&, const ContextMenuItemClickData& aClickData) noexcept override;
+
 		void on(ContextMenuManagerListener::UserMenuSelected, const vector<CID>&, const ContextMenuItemClickData& aClickData) noexcept override;
 		void on(ContextMenuManagerListener::HintedUserMenuSelected, const vector<HintedUser>&, const ContextMenuItemClickData& aClickData) noexcept override;
-		void on(ContextMenuManagerListener::ExtensionMenuSelected, const vector<string>&, const ContextMenuItemClickData& aClickData) noexcept override;
 
 		void on(ContextMenuManagerListener::GroupedSearchResultMenuSelected, const vector<TTHValue>& aSelectedIds, const SearchInstancePtr& aInstance, const ContextMenuItemClickData& aClickData) noexcept override;
 		void on(ContextMenuManagerListener::FilelistItemMenuSelected, const vector<uint32_t>& aSelectedIds, const DirectoryListingPtr& aList, const ContextMenuItemClickData& aClickData) noexcept override;
 		void on(ContextMenuManagerListener::HubUserMenuSelected, const vector<uint32_t>&, const ClientPtr& aClient, const ContextMenuItemClickData& aClickData) noexcept override;
 
+		void on(HubMessageHighlightMenuSelected, const vector<uint32_t>&, const ClientPtr& aClient, const ContextMenuItemClickData& aClickData) noexcept override;
+		void on(PrivateChatMessageHighlightMenuSelected, const vector<uint32_t>&, const PrivateChatPtr& aChat, const ContextMenuItemClickData& aClickData) noexcept override;
+
 		void onMenuItemSelected(const string& aMenuId, const json& aSelectedIds, const ContextMenuItemClickData& aClickData, const json& aEntityId = nullptr) noexcept;
 	};
 }