Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

extended auto-subscribe to circles with admin flag

Browse Source
This commit is contained in:
csoler 2016-05-28 20:25:15 -04:00
parent d114b830a7
commit 9a328f67ce
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libretroshare/src/services/p3gxscircles.cc
View File

@ -1246,9 +1246,7 @@ bool p3GxsCircles::locked_checkCircleCacheForAutoSubscribe(RsGxsCircleCache &cac
return false; return false;
} }
/* if we appear in the group - then autosubscribe, and mark as processed */ /* if we appear in the group - then autosubscribe, and mark as processed. This also applies if we're the group admin */
// const RsPgpId& ownPgpId = mPgpUtils->getPGPOwnId();
std::list<RsGxsId> myOwnIds; std::list<RsGxsId> myOwnIds;
@ -1275,11 +1273,12 @@ bool p3GxsCircles::locked_checkCircleCacheForAutoSubscribe(RsGxsCircleCache &cac
} }
} }
#ifdef DEBUG_CIRCLES bool am_I_admin( cache.mGroupSubscribeFlags & GXS_SERV::GROUP_SUBSCRIBE_ADMIN) ;
std::cerr << " own ID in circle: " << in_admin_list << ", own subscribe request: " << member_request << std::endl;
#endif
if(in_admin_list || member_request) #ifdef DEBUG_CIRCLES
std::cerr << " own ID in circle: " << in_admin_list << ", own subscribe request: " << member_request << ", am I admin?: " << am_I_admin << std::endl;
#endif
if(in_admin_list || member_request || am_I_admin)
{ {
uint32_t token, token2; uint32_t token, token2;