Squashed 'airdcpp-webapi/' changes from 304979f..4804276

4804276 API: refactor view tasks, most likely fixes #65 365f37f API: serialize encryption information for relevant entities, don't display CCPM connections in transfers, serialize connect state flags for OnlineUsers 225424c API: add transfer permission, show better initial status for transfers 2036ecc API: add transfer view c2e46af Merge branch 'master' of https://github.com/airdcpp/airgit 6f8a29a Hopefully fix crash stopping the web server fad4816 Compiling fixes for Boost 1.60 git-subtree-dir: airdcpp-webapi git-subtree-split: 4804276e4a36813cf46e5f82e4b70b81aff0e146
airdcpp-web · Jan 30, 2016 · fed67d2 · fed67d2
1 parent 98c5487
commit fed67d2
Show file tree

Hide file tree

Showing 26 changed files with 834 additions and 156 deletions.
diff --git a/api/FilelistApi.cpp b/api/FilelistApi.cpp
@@ -54,7 +54,7 @@ namespace webserver {
 	}
 
 	void FilelistApi::addList(const DirectoryListingPtr& aList) noexcept {
-		addSubModule(aList->getUser()->getCID(), make_shared<FilelistInfo>(this, aList));
+		addSubModule(aList->getUser()->getCID(), std::make_shared<FilelistInfo>(this, aList));
 	}
 
 	api_return FilelistApi::handleQueueList(ApiRequest& aRequest, QueueItem::Flags aFlags) {

diff --git a/api/FilelistInfo.cpp b/api/FilelistInfo.cpp
@@ -126,7 +126,7 @@ namespace webserver {
 			return nullptr;
 		}
 
-		auto ret = Serializer::serializeItem(make_shared<FilelistItemInfo>(location.directory), itemHandler);
+		auto ret = Serializer::serializeItem(std::make_shared<FilelistItemInfo>(location.directory), itemHandler);
 
 		ret["size"] = location.totalSize;
 		ret["complete"] = location.directory->isComplete();
@@ -145,11 +145,11 @@ namespace webserver {
 				currentViewItems.clear();
 
 				for (auto& d : curDir->directories) {
-					currentViewItems.emplace_back(make_shared<FilelistItemInfo>(d));
+					currentViewItems.emplace_back(std::make_shared<FilelistItemInfo>(d));
 				}
 
 				for (auto& f : curDir->files) {
-					currentViewItems.emplace_back(make_shared<FilelistItemInfo>(f));
+					currentViewItems.emplace_back(std::make_shared<FilelistItemInfo>(f));
 				}
 			}
 

diff --git a/api/HubApi.cpp b/api/HubApi.cpp
@@ -102,7 +102,7 @@ namespace webserver {
 	}
 
 	void HubApi::addHub(const ClientPtr& aClient) noexcept {
-		addSubModule(aClient->getClientId(), make_shared<HubInfo>(this, aClient));
+		addSubModule(aClient->getClientId(), std::make_shared<HubInfo>(this, aClient));
 	}
 
 	api_return HubApi::handleGetHubs(ApiRequest& aRequest) {

diff --git a/api/HubInfo.cpp b/api/HubInfo.cpp
@@ -158,7 +158,8 @@ namespace webserver {
 		}
 
 		return {
-			{ "id", id }
+			{ "id", id },
+			{ "encryption", aClient->getEncryptionInfo() },
 		};
 	}
 

diff --git a/api/PrivateChatApi.cpp b/api/PrivateChatApi.cpp
@@ -97,7 +97,7 @@ namespace webserver {
 	}
 
 	void PrivateChatApi::addChat(const PrivateChatPtr& aChat) noexcept {
-		addSubModule(aChat->getUser()->getCID(), make_shared<PrivateChatInfo>(this, aChat));
+		addSubModule(aChat->getUser()->getCID(), std::make_shared<PrivateChatInfo>(this, aChat));
 	}
 
 	void PrivateChatApi::on(MessageManagerListener::ChatCreated, const PrivateChatPtr& aChat, bool aReceivedMessage) noexcept {

diff --git a/api/PrivateChatInfo.cpp b/api/PrivateChatInfo.cpp
@@ -85,7 +85,8 @@ namespace webserver {
 		return{
 			{ "id", formatCCPMState(aChat->getCCPMState()) },
 			{ "str", PrivateChat::ccpmStateToString(aChat->getCCPMState()) },
-			{ "supported", aChat->getSupportsCCPM() }
+			{ "supported", aChat->getSupportsCCPM() },
+			{ "encryption", aChat->getUc() ? aChat->getUc()->getEncryptionInfo() : Util::emptyString },
 		};
 	}
 

diff --git a/api/QueueUtils.cpp b/api/QueueUtils.cpp
@@ -74,41 +74,6 @@ namespace webserver {
 		}
 	}
 
-	/*json QueueUtils::serializeQueueItem(const QueueItemPtr& aQI) noexcept {
-		json j;
-		return{
-		{ "user", aQI-> },
-		{ "file_count", aSource.files },
-		{ "bytes_left", aSource.size }
-		};
-
-		return j;
-	}
-
-	json QueueUtils::serializeQueueItemBase(const QueueItemBase& aItem) noexcept {
-		return{
-			{ "target", aItem.getTarget() },
-			{ "size", aItem.getSize() },
-			{ "time_added", aItem.getTimeAdded() },
-			{ "priority", aItem.getPriority() },
-			{ "using_autopriority", aItem.getAutoPriority() }
-		};
-	}*/
-
-	/*json QueueUtils::serializeBundleSource(const Bundle::BundleSource& aSource) noexcept {
-	return{
-	{ "user", serializeUser(aSource.getUser()) },
-	{ "file_count", aSource.files },
-	{ "bytes_left", aSource.size }
-	};
-	}
-
-	json QueueUtils::serializeQueueItemSource(const QueueItem::Source& aSource) noexcept {
-	return{
-	{ "user", serializeUser(aSource.getUser()) }
-	};
-	}*/
-
 	json QueueUtils::serializePriority(const QueueItemBase& aItem) noexcept {
 		return{
 			{ "id", aItem.getPriority() },

diff --git a/api/SearchApi.cpp b/api/SearchApi.cpp
@@ -192,7 +192,7 @@ namespace webserver {
 		}
 
 		SearchResultInfoPtr parent = nullptr;
-		auto result = make_shared<SearchResultInfo>(aResult, move(*relevancyInfo));
+		auto result = std::make_shared<SearchResultInfo>(aResult, move(*relevancyInfo));
 
 		{
 			WLock l(cs);

diff --git a/api/ShareProfileApi.cpp b/api/ShareProfileApi.cpp
@@ -106,7 +106,7 @@ namespace webserver {
 	api_return ShareProfileApi::handleAddProfile(ApiRequest& aRequest) {
 		const auto& reqJson = aRequest.getRequestBody();
 
-		auto profile = make_shared<ShareProfile>();
+		auto profile = std::make_shared<ShareProfile>();
 		parseProfile(profile, reqJson);
 
 		ShareManager::getInstance()->addProfile(profile);

diff --git a/api/ShareRootApi.cpp b/api/ShareRootApi.cpp
@@ -79,7 +79,7 @@ namespace webserver {
 			JsonUtil::throwError("path", JsonUtil::ERROR_INVALID, e.what());
 		}
 
-		auto info = make_shared<ShareDirectoryInfo>(path);
+		auto info = std::make_shared<ShareDirectoryInfo>(path);
 
 		parseRoot(info, reqJson, true);