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

Workaround JSON API opacity of RsTlv*Set in RsGxsForumGroup

Browse Source 
JSON API user would bet an unusable base64 blob due to RsTlv opaque JSON
  serialization, this way the content of the set is serialized plainly
  so it is usable through JSON API, without breaking binary
  serialization compatibility.

We must stop using those RsTlv derived items.
This commit is contained in:
Gioacchino Mazzurco 2019-07-25 14:14:42 +02:00
parent 933a6f1133
commit cc8300a098
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libretroshare/src/retroshare/rsgxsforums.h
View File

@ -59,25 +59,17 @@ struct RsGxsForumGroup : RsSerializable
RsGroupMetaData mMeta;
std::string mDescription;
/* What's below is optional, and handled by the serialiser
* TODO: run away from TLV old serializables as those types are opaque to
* JSON API! */
/* TODO: run away from TLV old serializables as those types are opaque to
* JSON API! */
RsTlvGxsIdSet mAdminList;
RsTlvGxsMsgIdSet mPinnedPosts;
/// @see RsSerializable
virtual void serial_process( RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx )
{
RS_SERIAL_PROCESS(mMeta);
RS_SERIAL_PROCESS(mDescription);
RS_SERIAL_PROCESS(mAdminList);
RS_SERIAL_PROCESS(mPinnedPosts);
}
RsGenericSerializer::SerializeContext& ctx );
// utility functions
bool canEditPosts(const RsGxsId& id) const { return mAdminList.ids.find(id) != mAdminList.ids.end() || id == mMeta.mAuthorId; }
/// utility functions
bool canEditPosts(const RsGxsId& id) const;
};
struct RsGxsForumMsg : RsSerializable
@ -203,4 +195,3 @@ public:
RS_DEPRECATED_FOR(editForum)
virtual bool updateGroup(uint32_t &token, RsGxsForumGroup &group) = 0;
};

31
libretroshare/src/services/p3gxsforums.cc
View File

@ -813,3 +813,34 @@ void p3GxsForums::handle_event(uint32_t event_type, const std::string &/*elabel*
break;
}
}
void RsGxsForumGroup::serial_process(
RsGenericSerializer::SerializeJob j,
RsGenericSerializer::SerializeContext& ctx )
{
RS_SERIAL_PROCESS(mMeta);
RS_SERIAL_PROCESS(mDescription);
/* Work around to have usable JSON API, without breaking binary
* serialization retrocompatibility */
switch (j)
{
case RsGenericSerializer::TO_JSON: // fallthrough
case RsGenericSerializer::FROM_JSON:
RsTypeSerializer::serial_process( j, ctx,
mAdminList.ids, "mAdminList" );
RsTypeSerializer::serial_process( j, ctx,
mPinnedPosts.ids, "mPinnedPosts" );
break;
default:
RS_SERIAL_PROCESS(mAdminList);
RS_SERIAL_PROCESS(mPinnedPosts);
}
}
bool RsGxsForumGroup::canEditPosts(const RsGxsId& id) const
{
return mAdminList.ids.find(id) != mAdminList.ids.end() ||
id == mMeta.mAuthorId;
}