From 08e298715405ceae652575fee36d56ea4e67580d Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 7 Nov 2020 20:52:50 +0100
Subject: [PATCH] added icon over posts with comments in channels

---
 libretroshare/src/retroshare/rsgxschannels.h  |  4 +--
 .../gui/Posted/PostedListWidgetWithModel.cpp  |  4 ++-
 .../gui/gxschannels/GxsChannelPostsModel.cpp  | 28 +++++++++++++++++++
 .../GxsChannelPostsWidgetWithModel.cpp        | 19 +++++++++++--
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/libretroshare/src/retroshare/rsgxschannels.h b/libretroshare/src/retroshare/rsgxschannels.h
index 975498728..d9bf6c7a7 100644
--- a/libretroshare/src/retroshare/rsgxschannels.h
+++ b/libretroshare/src/retroshare/rsgxschannels.h
@@ -71,14 +71,14 @@ struct RsGxsChannelGroup : RsSerializable, RsGxsGenericGroupData
 
 struct RsGxsChannelPost : RsSerializable, RsGxsGenericMsgData
 {
-    RsGxsChannelPost() : mAttachmentCount(0), mSize(0) {}
+    RsGxsChannelPost() : mAttachmentCount(0), mCommentCount(0), mSize(0) {}
 
 	std::set<RsGxsMessageId> mOlderVersions;
 	std::string mMsg;  // UTF8 encoded.
 
 	std::list<RsGxsFile> mFiles;
     uint32_t mAttachmentCount;   // auto calced.
-    uint32_t mCommentCount;      // auto calced.
+    uint32_t mCommentCount;      // auto calced. WARNING: not computed yet. In the future we need a background process to update this and store in the service string.
     uint64_t mSize;              // auto calced.
 
 	RsGxsImage mThumbnail;
diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
index 845e48783..eb1fe9bae 100644
--- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.cpp
@@ -474,7 +474,8 @@ void PostedListWidgetWithModel::handleEvent_main_thread(std::shared_ptr<const Rs
 
 	switch(e->mPostedEventCode)
 	{
-        case RsPostedEventCode::NEW_MESSAGE:     // [[fallthrough]];
+        case RsPostedEventCode::NEW_COMMENT:     // [[fallthrough]];
+        case RsPostedEventCode::NEW_VOTE:        // [[fallthrough]];
         {
             // special treatment here because the message might be a comment, so we need to refresh the comment tab if openned
 
@@ -486,6 +487,7 @@ void PostedListWidgetWithModel::handleEvent_main_thread(std::shared_ptr<const Rs
                     t->refresh();
             }
         }
+        case RsPostedEventCode::NEW_MESSAGE:          // [[fallthrough]];
         case RsPostedEventCode::NEW_POSTED_GROUP:     // [[fallthrough]];
 		case RsPostedEventCode::UPDATED_POSTED_GROUP: // [[fallthrough]];
 		case RsPostedEventCode::UPDATED_MESSAGE:
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
index a5a56597b..d65689766 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp
@@ -522,6 +522,29 @@ void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vecto
 	emit channelPostsLoaded();
 }
 
+static void updateCommentCounts( std::vector<RsGxsChannelPost>& posts, std::vector<RsGxsComment>& comments)
+{
+    // Store posts IDs in a std::map to avoid a quadratic cost
+
+    std::map<RsGxsMessageId,uint32_t> post_indices;
+
+    for(uint32_t i=0;i<posts.size();++i)
+    {
+        post_indices[posts[i].mMeta.mMsgId] = i;
+        posts[i].mCommentCount = 0;	// should be 0 already, but we secure that value.
+
+        std::cerr << "Zeroing comments for post " << posts[i].mMeta.mMsgId << std::endl;
+    }
+
+    // now look into comments and increase the count
+
+    for(uint32_t i=0;i<comments.size();++i)
+    {
+        std::cerr << "Found new comment " << comments[i].mMeta.mMsgId << " for post" << comments[i].mMeta.mThreadId << std::endl;
+        ++posts[post_indices[comments[i].mMeta.mThreadId]].mCommentCount;
+    }
+}
+
 void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
 {
     if(group_id.isNull())
@@ -557,6 +580,11 @@ void RsGxsChannelPostsModel::update_posts(const RsGxsGroupId& group_id)
 			return;
 		}
 
+        // This shouldn't be needed normally. We need it until a background process computes the number of comments per
+        // post and stores it in the service string. Since we request all data, this process isn't costing much anyway.
+
+        updateCommentCounts(*posts,*comments);
+
         // 2 - update the model in the UI thread.
 
         RsQThreadUtils::postToObject( [group,posts,comments,votes,this]()
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
index 15f84f22a..dbcb2a39d 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@@ -76,6 +76,7 @@ QColor SelectedColor = QRgb(0xff308dc7);
 #define COLUMN_SIZE_FONT_FACTOR_H  10
 
 #define STAR_OVERLAY_IMAGE ":icons/star_overlay_128.png"
+#define COMMENT_OVERLAY_IMAGE ":images/white-bubble-64.png"
 #define IMAGE_COPYLINK     ":icons/png/copy.png"
 #define IMAGE_GRID_VIEW    ":icons/png/menu.png"
 #define IMAGE_DOWNLOAD     ":icons/png/download.png"
@@ -179,8 +180,20 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
                 QPainter p(&pixmap);
                 QFontMetricsF fm(option.font);
 
-                p.drawPixmap(mZoom*QPoint(0.1*fm.height(),-3.6*fm.height()),FilesDefs::getPixmapFromQtResourcePath(STAR_OVERLAY_IMAGE).scaled(mZoom*7*fm.height(),mZoom*7*fm.height(),Qt::KeepAspectRatio,Qt::SmoothTransformation));
+                p.drawPixmap(mZoom*QPoint(0.1*fm.height(),-3.4*fm.height()),FilesDefs::getPixmapFromQtResourcePath(STAR_OVERLAY_IMAGE).scaled(mZoom*6*fm.height(),mZoom*6*fm.height(),Qt::KeepAspectRatio,Qt::SmoothTransformation));
             }
+
+            std::cerr << "mCommentCount=" << post.mCommentCount << std::endl;
+            if(post.mCommentCount)
+            {
+                QPainter p(&pixmap);
+                QFontMetricsF fm(option.font);
+
+                p.drawPixmap(QPoint(pixmap.width(),0.0)+mZoom*QPoint(-2.9*fm.height(),0.4*fm.height()),
+                             FilesDefs::getPixmapFromQtResourcePath(COMMENT_OVERLAY_IMAGE).scaled(mZoom*3*fm.height(),mZoom*3*fm.height(),
+                                                                                                  Qt::KeepAspectRatio,Qt::SmoothTransformation));
+            }
+
         }
 
         painter->drawPixmap(option.rect.topLeft(),
@@ -703,7 +716,9 @@ void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<con
 	switch(e->mChannelEventCode)
 	{
 		case RsChannelEventCode::NEW_CHANNEL:     // [[fallthrough]];
-		case RsChannelEventCode::UPDATED_CHANNEL: // [[fallthrough]];
+        case RsChannelEventCode::NEW_COMMENT:     // [[fallthrough]];
+        case RsChannelEventCode::NEW_VOTE:        // [[fallthrough]];
+        case RsChannelEventCode::UPDATED_CHANNEL: // [[fallthrough]];
 		case RsChannelEventCode::NEW_MESSAGE:     // [[fallthrough]];
 		case RsChannelEventCode::UPDATED_MESSAGE:
         case RsChannelEventCode::SYNC_PARAMETERS_UPDATED: