Merge pull request #2261 from csoler/v0.6-BugFixing_6

Better display of last seen info in groups

libretroshare/src/gxs/rsgenexchange.cc

@@ -1379,7 +1379,16 @@ bool RsGenExchange::getGroupMeta(const uint32_t &token, std::list<RsGroupMetaDat
 		{
 			m.mPop= 0 ;
 			m.mVisibleMsgCount = 0 ;
-		}
+        }
+
+        // We could save this in the net service, but it's a bit more than that since some services have
+        // specific usage footprints for their groups.
+
+        m.mLastSeen = (IS_GROUP_SUBSCRIBED(gMeta.mSubscribeFlags)) ? time(nullptr) : service_getLastGroupSeenTs(gMeta.mGroupId);
+
+#ifdef GEN_EXCH_DEBUG
+        std::cerr << "Group: " << gMeta.mGroupId << " name \"" << gMeta.mGroupName << "\" last seen=" << m.mLastSeen << " now=" << time(nullptr) << std::endl;
+#endif
 
 		groupInfo.push_back(m);
 	}
@@ -1556,6 +1565,7 @@ bool RsGenExchange::getGroupData(const uint32_t &token, std::vector<RsGxsGrpItem
 
 						if((!(IS_GROUP_SUBSCRIBED(gItem->meta.mSubscribeFlags))) || gItem->meta.mLastPost == 0)
 							gItem->meta.mLastPost = sts.mLastGroupModificationTS ;
+
 					}
 					else
 					{
@@ -1563,6 +1573,14 @@ bool RsGenExchange::getGroupData(const uint32_t &token, std::vector<RsGxsGrpItem
 						gItem->meta.mVisibleMsgCount = 0;
 					}
 
+                    // We could save this in the net service, but it's a bit more than that since some services have
+                    // specific usage footprints for their groups.
+
+                    gItem->meta.mLastSeen = (IS_GROUP_SUBSCRIBED(gItem->meta.mSubscribeFlags)) ? time(nullptr) : service_getLastGroupSeenTs(gItem->meta.mGroupId);
+
+#ifdef GEN_EXCH_DEBUG
+                    std::cerr << "Group: " << gItem->meta.mGroupId << " name \"" << gItem->meta.mGroupName << "\" last seen=" << gItem->meta.mLastSeen << " now=" << time(nullptr) << std::endl;
+#endif
 
                     // Also check the group privacy flags. A while ago, it as possible to publish a group without privacy flags. Now it is not possible anymore.
                     // As a consequence, it's important to supply a correct value in this flag before the data can be edited/updated.

libretroshare/src/gxs/rsgenexchange.h

@@ -667,6 +667,14 @@ protected:
      */
     virtual bool service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& /* meta */) { return true; }	// see RsGenExchange
 
+    /*!
+     * \brief service_getLastGroupSeenTs
+     * \return
+     * 			returns the last time a friend sent information (statistics) about this group. That practically means when the
+     * 			group was still being subscribed by at least one friend. This is used by service_checkIfGroupIsStillUsed() to
+     * 			help getting rid of dead groups.
+     */
+    virtual rstime_t service_getLastGroupSeenTs(const RsGxsGroupId&) { return 0; }
 public:
 
     /*!

libretroshare/src/retroshare/rsgxsifacetypes.h

@@ -88,9 +88,10 @@ struct RsGroupMetaData : RsSerializable
 
     uint32_t    mSubscribeFlags;
 
-    uint32_t    mPop; 			// Popularity = number of friend subscribers
-    uint32_t    mVisibleMsgCount; 	// Max messages reported by friends
-    rstime_t      mLastPost; 		// Timestamp for last message. Not used yet.
+    uint32_t    mPop; 			   // Popularity = number of friend subscribers
+    uint32_t    mVisibleMsgCount;  // Max messages reported by friends
+    rstime_t    mLastPost; 		   // Timestamp for last message. Not used yet.
+    rstime_t    mLastSeen; 		   // Last time the group was advertised by friends.
 
     uint32_t    mGroupStatus;
 

libretroshare/src/services/p3gxscircles.cc

@@ -1700,6 +1700,24 @@ bool p3GxsCircles::locked_checkCircleCacheForAutoSubscribe(RsGxsCircleCache& cac
     return true;
 }
 
+rstime_t p3GxsCircles::service_getLastGroupSeenTs(const RsGxsGroupId& gid)
+{
+    rstime_t now = time(nullptr);
+
+    RS_STACK_MUTEX(mKnownCirclesMtx);
+
+    auto it = mKnownCircles.find(gid);
+    bool unknown_posted = (it == mKnownCircles.end());
+
+    if(unknown_posted)
+    {
+        mKnownCircles[gid] = now;
+        IndicateConfigChanged();
+        return now;
+    }
+    else
+        return it->second;
+}
 bool p3GxsCircles::service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& meta)
 {
 #ifdef GXSFORUMS_CHANNELS

libretroshare/src/services/p3gxscircles.h

@@ -290,6 +290,7 @@ public:
 	virtual void updateGroup(uint32_t &token, RsGxsCircleGroup &group) override;
 
 	virtual bool service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& meta) override;
+    virtual rstime_t service_getLastGroupSeenTs(const RsGxsGroupId&) override;
 
 	/* membership management for external circles */
 

libretroshare/src/services/p3gxsforums.cc

@@ -417,6 +417,24 @@ void	p3GxsForums::service_tick()
 	return;
 }
 
+rstime_t p3GxsForums::service_getLastGroupSeenTs(const RsGxsGroupId& gid)
+{
+     rstime_t now = time(nullptr);
+
+    RS_STACK_MUTEX(mKnownForumsMutex);
+
+    auto it = mKnownForums.find(gid);
+    bool unknown_forum = it == mKnownForums.end();
+
+    if(unknown_forum)
+    {
+        mKnownForums[gid] = now;
+        IndicateConfigChanged();
+        return now;
+    }
+    else
+        return it->second;
+}
 bool p3GxsForums::service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& meta)
 {
 #ifdef GXSFORUMS_DEBUG

libretroshare/src/services/p3gxsforums.h

@@ -53,6 +53,7 @@ protected:
     virtual bool loadList(std::list<RsItem *>& loadList) override;               // @see p3Config::loadList(std::list<RsItem *>&)
 
     virtual bool service_checkIfGroupIsStillUsed(const RsGxsGrpMetaData& meta) override;
+    virtual rstime_t service_getLastGroupSeenTs(const RsGxsGroupId&) override;
 public:
 	/// @see RsGxsForums::createForumV2
 	bool createForumV2(