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

Merge branch 'master' into jsonapi

Browse source
This commit is contained in:
G10h4ck 2018-10-10 22:23:28 +02:00 • committed by GitHub
commit 047ae7f723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
260 changed files with 1737 additions and 1178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/rsitems/rsbanlistitems.cc
View file

@ -46,7 +46,7 @@ void RsBanListConfigItem::serial_process(RsGenericSerializer::SerializeJob j,RsG
{
RsTypeSerializer::serial_process<uint32_t>(j,ctx,banListType,"type") ;
RsTypeSerializer::serial_process (j,ctx,banListPeerId,"peerId") ;
RsTypeSerializer::serial_process<time_t> (j,ctx,update_time,"update_time") ;
RsTypeSerializer::serial_process<rstime_t> (j,ctx,update_time,"update_time") ;
RsTypeSerializer::serial_process (j,ctx,banned_peers,"banned_peers") ;
}
RsItem *RsBanListSerialiser::create_item(uint16_t service_id,uint8_t item_sub_id) const

2
libretroshare/src/rsitems/rsbanlistitems.h
View file

@ -68,7 +68,7 @@ public:
uint32_t banListType ;
RsPeerId banListPeerId ;
time_t update_time ;
rstime_t update_time ;
RsTlvBanList banned_peers;
};

2
libretroshare/src/rsitems/rsgxsiditems.h
View file

@ -79,7 +79,7 @@ public:
virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx);
std::map<RsGxsId,time_t> mTimeStamps ;
std::map<RsGxsId,rstime_t> mTimeStamps ;
std::set<RsGxsId> mContacts ;
};

4
libretroshare/src/rsitems/rsgxsitems.h
View file

@ -25,7 +25,7 @@
#include "rsitems/rsitem.h"
#include "rsitems/rsserviceids.h"
#include "util/rstime.h"
#include "retroshare/rsgxsifacetypes.h"
std::ostream &operator<<(std::ostream &out, const RsGroupMetaData &meta);
@ -99,7 +99,7 @@ struct TurtleGxsInfo
RsGxsId author;
std::string name ;
std::string description ;
time_t last_post ;
rstime_t last_post ;
uint32_t number_of_posts ;
};

2
libretroshare/src/rsitems/rsgxsreputationitems.cc
View file

@ -20,7 +20,7 @@
* *
*******************************************************************************/
#include <stdio.h>
#include <time.h>
#include "util/rstime.h"
#include "serialiser/rsbaseserial.h"
#include "rsitems/rsgxsreputationitems.h"

4
libretroshare/src/rsitems/rsgxsupdateitems.h
View file

@ -67,8 +67,8 @@ public:
RsTlvPeerIdSet suppliers; // list of friends who feed this group
uint32_t max_visible_count ; // max visible count reported by contributing friends
time_t statistics_update_TS ; // last time the max visible count was updated.
time_t last_group_modification_TS ; // last time the group was modified, either in meta data or in the list of messages posted in it.
rstime_t statistics_update_TS ; // last time the max visible count was updated.
rstime_t last_group_modification_TS ; // last time the group was modified, either in meta data or in the list of messages posted in it.
};
class RsGxsGrpConfigItem : public RsGxsNetServiceItem, public RsGxsGrpConfig

2
libretroshare/src/rsitems/rsmsgitems.cc
View file

@ -20,7 +20,7 @@
* *
*******************************************************************************/
#include <stdexcept>
#include <time.h>
#include "util/rstime.h"
#include "serialiser/rsbaseserial.h"
#include "serialiser/rstlvbase.h"