Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1389 from G10h4ck/jsonapi

Browse Source 
JSON API to check if PGP id is friend
This commit is contained in:
G10h4ck 2018-11-09 11:10:30 +01:00 committed by GitHub
commit 60b424eb66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretroshare/src/retroshare/rspeers.h
View File

@ -428,7 +428,14 @@ public:
*/
virtual bool isFriend(const RsPeerId& sslId) = 0;
virtual bool isGPGAccepted(const RsPgpId &gpg_id_is_friend) = 0;
/**
* @brief Check if given PGP id is trusted
* @jsonapi{development}
* @param[in] pgpId PGP id to check
* @return true if the PGP id is trusted, false otherwise
*/
virtual bool isPgpFriend(const RsPgpId& pgpId) = 0;
virtual std::string getPeerName(const RsPeerId &ssl_id) = 0;
virtual std::string getGPGName(const RsPgpId& gpg_id) = 0;
@ -731,6 +738,9 @@ public:
virtual bool setPeerMaximumRates(const RsPgpId& pid,uint32_t maxUploadRate,uint32_t maxDownloadRate) =0;
virtual bool getPeerMaximumRates(const RsPeerId& pid,uint32_t& maxUploadRate,uint32_t& maxDownloadRate) =0;
virtual bool getPeerMaximumRates(const RsPgpId& pid,uint32_t& maxUploadRate,uint32_t& maxDownloadRate) =0;
RS_DEPRECATED_FOR(isPgpFriend)
virtual bool isGPGAccepted(const RsPgpId &gpg_id_is_friend) = 0;
};

8
libretroshare/src/rsserver/p3peers.cc
View File

@ -567,11 +567,11 @@ std::string p3Peers::getGPGName(const RsPgpId &gpg_id)
return AuthGPG::getAuthGPG()->getGPGName(gpg_id);
}
bool p3Peers::isPgpFriend(const RsPgpId& pgpId)
{ return AuthGPG::getAuthGPG()->isGPGAccepted(pgpId); }
bool p3Peers::isGPGAccepted(const RsPgpId &gpg_id_is_friend)
{
/* get from mAuthMgr as it should have more peers? */
return AuthGPG::getAuthGPG()->isGPGAccepted(gpg_id_is_friend);
}
{ return isPgpFriend(gpg_id_is_friend); }
std::string p3Peers::getPeerName(const RsPeerId& ssl)
{

4
libretroshare/src/rsserver/p3peers.h
View File

@ -66,7 +66,11 @@ public:
virtual bool isOnline(const RsPeerId &id);
virtual bool isFriend(const RsPeerId &id);
virtual bool isPgpFriend(const RsPgpId& pgpId);
RS_DEPRECATED_FOR(isPgpFriend)
virtual bool isGPGAccepted(const RsPgpId &gpg_id_is_friend);
virtual std::string getGPGName(const RsPgpId &gpg_id);
virtual std::string getPeerName(const RsPeerId& ssl_or_gpg_id);
virtual bool getPeerDetails(const RsPeerId& ssl_or_gpg_id, RsPeerDetails &d);