From ca2da39167ea995744c24d8a64692f147bbf228a Mon Sep 17 00:00:00 2001
From: drbob <drbob@lunamutt.com>
Date: Fri, 7 Aug 2020 23:54:14 +1000
Subject: [PATCH 1/2] TheWire fix Show and Follow Buttons

 * Add Icons to Buttons
 * Wire up Follow Buttons (add in a couple of places too)
 * Show / Hide buttons depending on Following status
 * Handle cases where Msgs / Groups unavailable
---
 retroshare-gui/src/gui/TheWire/PulseReply.cpp |  21 +++-
 retroshare-gui/src/gui/TheWire/PulseReply.h   |   2 +-
 retroshare-gui/src/gui/TheWire/PulseReply.ui  |  43 ++++++-
 .../src/gui/TheWire/PulseTopLevel.cpp         |  20 +--
 .../src/gui/TheWire/PulseTopLevel.h           |   2 +-
 .../src/gui/TheWire/PulseTopLevel.ui          | 116 +++++++++++++++++-
 .../src/gui/TheWire/PulseViewGroup.cpp        |  14 +++
 .../src/gui/TheWire/PulseViewGroup.h          |   4 +
 .../src/gui/TheWire/PulseViewGroup.ui         |   9 +-
 .../src/gui/TheWire/PulseViewItem.cpp         |  51 ++++++--
 .../src/gui/TheWire/PulseViewItem.h           |   9 +-
 .../src/gui/TheWire/TheWire_images.qrc        |   3 +
 retroshare-gui/src/gui/TheWire/WireDialog.cpp |   6 +-
 .../src/gui/TheWire/images/external-link.svg  |   1 +
 .../src/gui/TheWire/images/invite.png         | Bin 0 -> 5218 bytes
 .../src/gui/TheWire/images/link.svg           |   1 +
 16 files changed, 276 insertions(+), 26 deletions(-)
 create mode 100644 retroshare-gui/src/gui/TheWire/images/external-link.svg
 create mode 100644 retroshare-gui/src/gui/TheWire/images/invite.png
 create mode 100644 retroshare-gui/src/gui/TheWire/images/link.svg

diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.cpp b/retroshare-gui/src/gui/TheWire/PulseReply.cpp
index 76ce49d90..92dccabf5 100644
--- a/retroshare-gui/src/gui/TheWire/PulseReply.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseReply.cpp
@@ -114,10 +114,25 @@ void PulseReply::setRepliesString(QString reply)
 	label_replies->setText(reply);	
 }
 
-void PulseReply::showResponseStats(bool enable)
+void PulseReply::setPulseStatus(PulseStatus status)
 {
-	widget_actions->setVisible(enable);
-	widget_follow->setVisible(!enable);
+	widget_actions->setVisible(status == PulseStatus::FULL);
+	widget_follow->setVisible(status != PulseStatus::FULL);
+	toolButton_follow->setEnabled(status == PulseStatus::UNSUBSCRIBED);
+
+	switch(status)
+	{
+		case PulseStatus::FULL:
+			break;
+		case PulseStatus::UNSUBSCRIBED:
+			break;
+		case PulseStatus::NO_GROUP:
+			label_follow_msg->setText("Group unavailable");
+			break;
+		case PulseStatus::REF_MSG:
+			label_follow_msg->setText("Full Pulse unavailable");
+			break;
+	}
 }
 
 void PulseReply::setReferenceString(QString ref)
diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.h b/retroshare-gui/src/gui/TheWire/PulseReply.h
index da3c0337b..c2c9545f5 100644
--- a/retroshare-gui/src/gui/TheWire/PulseReply.h
+++ b/retroshare-gui/src/gui/TheWire/PulseReply.h
@@ -56,7 +56,7 @@ protected:
 
 	// 
 	virtual void setReferenceString(QString ref) override;
-	virtual void showResponseStats(bool enable) override;
+	virtual void setPulseStatus(PulseStatus status) override;
 // PulseDataInterface ===========
 
 	void mousePressEvent(QMouseEvent *event);
diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.ui b/retroshare-gui/src/gui/TheWire/PulseReply.ui
index 78a6d7ab7..582ceb269 100644
--- a/retroshare-gui/src/gui/TheWire/PulseReply.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseReply.ui
@@ -154,6 +154,13 @@ border-radius: 10px}</string>
              <property name="text">
               <string>REPLY</string>
              </property>
+             <property name="icon">
+              <iconset resource="TheWire_images.qrc">
+               <normaloff>:/images/reply.png</normaloff>:/images/reply.png</iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -198,6 +205,13 @@ border-radius: 10px}</string>
              <property name="text">
               <string>REPUBLISH</string>
              </property>
+             <property name="icon">
+              <iconset resource="TheWire_images.qrc">
+               <normaloff>:/images/retweet.png</normaloff>:/images/retweet.png</iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -242,6 +256,13 @@ border-radius: 10px}</string>
              <property name="text">
               <string>LIKE</string>
              </property>
+             <property name="icon">
+              <iconset resource="TheWire_images.qrc">
+               <normaloff>:/images/like.png</normaloff>:/images/like.png</iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -286,6 +307,13 @@ border-radius: 10px}</string>
              <property name="text">
               <string>SHOW</string>
              </property>
+             <property name="icon">
+              <iconset resource="TheWire_images.qrc">
+               <normaloff>:/images/external-link.svg</normaloff>:/images/external-link.svg</iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -339,10 +367,23 @@ border-radius: 10px}</string>
            <property name="text">
             <string>FOLLOW</string>
            </property>
+           <property name="icon">
+            <iconset resource="TheWire_images.qrc">
+             <normaloff>:/images/invite.png</normaloff>:/images/invite.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>16</width>
+             <height>16</height>
+            </size>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label_4">
+          <widget class="QLabel" name="label_follow_msg">
            <property name="text">
             <string> for response statistics </string>
            </property>
diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp b/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp
index a02dfd8fc..d66b90eb3 100644
--- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp
@@ -45,10 +45,9 @@ PulseTopLevel::PulseTopLevel(PulseViewHolder *holder, RsWirePulseSPtr pulse)
 
 void PulseTopLevel::setup()
 {
-	connect(pushButton_tmpViewGroup, SIGNAL(clicked()), this, SLOT(actionViewGroup()));
-	connect(pushButton_tmpViewParent, SIGNAL(clicked()), this, SLOT(actionViewParent()));
-
-	// connect(toolButton_follow, SIGNAL(clicked()), this, SLOT(follow()));
+	connect(toolButton_viewGroup, SIGNAL(clicked()), this, SLOT(actionViewGroup()));
+	connect(toolButton_viewParent, SIGNAL(clicked()), this, SLOT(actionViewParent()));
+	connect(toolButton_follow, SIGNAL(clicked()), this, SLOT(actionFollow()));
 	// connect(toolButton_rate, SIGNAL(clicked()), this, SLOT(rate()));
 
 	connect(toolButton_reply, SIGNAL(clicked()), this, SLOT(actionReply()));
@@ -107,10 +106,11 @@ void PulseTopLevel::setRepliesString(QString reply)
 	label_replies->setText(reply);
 }
 	
-void PulseTopLevel::showResponseStats(bool enable)
+void PulseTopLevel::setPulseStatus(PulseStatus status)
 {
-	widget_replies->setVisible(enable);
-	widget_actions->setVisible(enable);
+	widget_replies->setVisible(true); // this is only reachable if we have ORIG so show always.
+	widget_actions->setVisible(status == PulseStatus::FULL);
+	widget_actionsFollow->setVisible(status == PulseStatus::UNSUBSCRIBED);
 }
 
 void PulseTopLevel::setReferenceString(QString ref)
@@ -123,6 +123,12 @@ void PulseTopLevel::setReferenceString(QString ref)
 	{
 		label_reference->setText(ref);
 	}
+
+	if (mPulse->mRefGroupPtr) {
+		toolButton_viewParent->setVisible(true);
+	} else {
+		toolButton_viewParent->setVisible(false);
+	}
 }
 	
 void PulseTopLevel::mousePressEvent(QMouseEvent *event)
diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.h b/retroshare-gui/src/gui/TheWire/PulseTopLevel.h
index e43fe012d..c04550023 100644
--- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.h
+++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.h
@@ -55,7 +55,7 @@ protected:
 
 	// 
 	virtual void setReferenceString(QString ref) override;
-	virtual void showResponseStats(bool enable) override;
+	virtual void setPulseStatus(PulseStatus status) override;
 // PulseDataInterface ===========
 
 protected:
diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
index feb31abee..884300c64 100644
--- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
@@ -104,10 +104,23 @@ border-radius: 10px}</string>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="pushButton_tmpViewParent">
+          <widget class="QToolButton" name="toolButton_viewParent">
+           <property name="toolTip">
+            <string>open Parent Pulse</string>
+           </property>
            <property name="text">
             <string>SHOW PARENT</string>
            </property>
+           <property name="icon">
+            <iconset resource="TheWire_images.qrc">
+             <normaloff>:/images/external-link.svg</normaloff>:/images/external-link.svg</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
           </widget>
          </item>
          <item>
@@ -228,16 +241,29 @@ border-radius: 10px}</string>
           </widget>
          </item>
          <item row="1" column="2">
-          <widget class="QPushButton" name="pushButton_tmpViewGroup">
+          <widget class="QToolButton" name="toolButton_viewGroup">
            <property name="minimumSize">
             <size>
              <width>0</width>
              <height>25</height>
             </size>
            </property>
+           <property name="toolTip">
+            <string>open Group</string>
+           </property>
            <property name="text">
             <string>SHOW GROUP</string>
            </property>
+           <property name="icon">
+            <iconset resource="TheWire_images.qrc">
+             <normaloff>:/images/external-link.svg</normaloff>:/images/external-link.svg</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
           </widget>
          </item>
         </layout>
@@ -472,6 +498,13 @@ border-radius: 10px}</string>
              <property name="text">
               <string>REPLY</string>
              </property>
+             <property name="icon">
+              <iconset resource="TheWire_images.qrc">
+               <normaloff>:/images/reply.png</normaloff>:/images/reply.png</iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -516,6 +549,13 @@ border-radius: 10px}</string>
              <property name="text">
               <string>REPUBLISH</string>
              </property>
+             <property name="icon">
+              <iconset resource="TheWire_images.qrc">
+               <normaloff>:/images/retweet.png</normaloff>:/images/retweet.png</iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -560,6 +600,13 @@ border-radius: 10px}</string>
              <property name="text">
               <string>LIKE</string>
              </property>
+             <property name="icon">
+              <iconset resource="TheWire_images.qrc">
+               <normaloff>:/images/like.png</normaloff>:/images/like.png</iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -604,6 +651,13 @@ border-radius: 10px}</string>
              <property name="text">
               <string>SHOW</string>
              </property>
+             <property name="icon">
+              <iconset resource="TheWire_images.qrc">
+               <normaloff>:/images/external-link.svg</normaloff>:/images/external-link.svg</iconset>
+             </property>
+             <property name="toolButtonStyle">
+              <enum>Qt::ToolButtonTextBesideIcon</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -624,6 +678,64 @@ border-radius: 10px}</string>
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QWidget" name="widget_actionsFollow" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>40</height>
+         </size>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_11">
+         <item>
+          <spacer name="horizontalSpacer_20">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>298</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QToolButton" name="toolButton_follow">
+           <property name="text">
+            <string>FOLLOW</string>
+           </property>
+           <property name="icon">
+            <iconset resource="TheWire_images.qrc">
+             <normaloff>:/images/invite.png</normaloff>:/images/invite.png</iconset>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_21">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>297</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
index 715bc8ff6..25d393295 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.cpp
@@ -41,6 +41,8 @@ PulseViewGroup::PulseViewGroup(PulseViewHolder *holder, RsWireGroupSPtr group)
 void PulseViewGroup::setup()
 {
 	if (mGroup) {
+		connect(toolButton_follow, SIGNAL(clicked()), this, SLOT(actionFollow()));
+
 		label_groupName->setText("@" + QString::fromStdString(mGroup->mMeta.mGroupName));
 		label_authorName->setText(BoldString(QString::fromStdString(mGroup->mMeta.mAuthorId.toStdString())));
 		label_date->setText(DateTime::formatDateTime(mGroup->mMeta.mPublishTs));
@@ -92,3 +94,15 @@ void PulseViewGroup::setup()
 	}
 }
 
+void PulseViewGroup::actionFollow()
+{
+	RsGxsGroupId groupId = mGroup->mMeta.mGroupId;
+	std::cerr << "PulseViewGroup::actionFollow() following ";
+	std::cerr << groupId;
+	std::cerr << std::endl;
+
+	if (mHolder) {
+		mHolder->PVHfollow(groupId);
+	}
+}
+
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.h b/retroshare-gui/src/gui/TheWire/PulseViewGroup.h
index 94b3f1031..4d00090ca 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.h
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.h
@@ -33,9 +33,13 @@ class PulseViewGroup : public PulseViewItem, private Ui::PulseViewGroup
 public:
 	PulseViewGroup(PulseViewHolder *holder, RsWireGroupSPtr group);
 
+private slots:
+	void actionFollow();
+
 protected:
 	void setup();
 
+
 protected:
 	RsWireGroupSPtr mGroup;
 };
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
index 6dc0a25cf..7f808dd44 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
@@ -508,10 +508,17 @@ border-radius: 10px}</string>
           </spacer>
          </item>
          <item>
-          <widget class="QToolButton" name="toolButton_like_2">
+          <widget class="QToolButton" name="toolButton_follow">
            <property name="text">
             <string>FOLLOW</string>
            </property>
+           <property name="icon">
+            <iconset resource="TheWire_images.qrc">
+             <normaloff>:/images/invite.png</normaloff>:/images/invite.png</iconset>
+           </property>
+           <property name="toolButtonStyle">
+            <enum>Qt::ToolButtonTextBesideIcon</enum>
+           </property>
           </widget>
          </item>
          <item>
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp b/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp
index 1395883bf..3a42f5ba9 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp
@@ -183,8 +183,18 @@ void PulseDataItem::actionFollow()
 	std::cerr << "PulseDataItem::actionFollow()";
 	std::cerr << std::endl;
 
-	// TODO
 	RsGxsGroupId groupId;
+	if (mPulse->mPulseType & WIRE_PULSE_TYPE_REFERENCE) {
+		std::cerr << "PulseDataItem::actionFollow() REF following Replier: ";
+		std::cerr << mPulse->mRefGroupId;
+		std::cerr << std::endl;
+		groupId = mPulse->mRefGroupId;
+	} else {
+		std::cerr << "PulseDataItem::actionFollow() RESPONSE following Group: ";
+		std::cerr << mPulse->mMeta.mGroupId;
+		std::cerr << std::endl;
+		groupId = mPulse->mMeta.mGroupId;
+	}
 
 	if (mHolder) {
 		mHolder->PVHfollow(groupId);
@@ -260,15 +270,28 @@ void PulseDataItem::showPulse()
 		setRefMessage(QString::fromStdString(mPulse->mRefPulseText), mPulse->mRefImageCount);
 		setDate(mPulse->mRefPublishTs);
 
-		// References (unknown for a REFERENCE)
-		// show FOLLOW button instead.
-		showResponseStats(false);
+		// Workout Pulse status for Stats/Follow/Msgs.
+		// Its a REF so cannot be FULL.
+		PulseStatus status = PulseStatus::REF_MSG;
+		if (mPulse->mRefGroupPtr) {
+			// bitwise comparisons.
+			if (mPulse->mRefGroupPtr->mMeta.mSubscribeFlags &
+					(GXS_SERV::GROUP_SUBSCRIBE_ADMIN |
+					 GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)) {
+				status = PulseStatus::REF_MSG;
+			} else {
+				status = PulseStatus::UNSUBSCRIBED;
+			}
+		} else {
+			status = PulseStatus::NO_GROUP;
+		}
+
+		setPulseStatus(status);
 
-		// 
 		if (mPulse->mGroupPtr) {
 			setReference(mPulse->mPulseType & WIRE_PULSE_RESPONSE_MASK, mPulse->mMeta.mGroupId, mPulse->mGroupPtr->mMeta.mGroupName);
 		} else {
-			setReference(mPulse->mPulseType & WIRE_PULSE_RESPONSE_MASK, mPulse->mMeta.mGroupId, "REF GROUP MISSING");
+			setReference(mPulse->mPulseType & WIRE_PULSE_RESPONSE_MASK, mPulse->mMeta.mGroupId, "UNKNOWN");
 		}
 
 	}
@@ -310,8 +333,19 @@ void PulseDataItem::showPulse()
 		setMessage(mPulse);
 		setDate(mPulse->mMeta.mPublishTs);
 
-		// References
-		showResponseStats(true);
+		// Possible to have ORIG and be UNSUBSCRIBED.
+		PulseStatus status = PulseStatus::FULL;
+		if (mPulse->mGroupPtr) {
+			// bitwise comparisons.
+			if (mPulse->mGroupPtr->mMeta.mSubscribeFlags &
+					(GXS_SERV::GROUP_SUBSCRIBE_ADMIN |
+					 GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)) {
+				status = PulseStatus::FULL;
+			} else {
+				status = PulseStatus::UNSUBSCRIBED;
+			}
+		}
+		setPulseStatus(status);
 		setLikes(mPulse->mLikes.size());
 		setReplies(mPulse->mReplies.size());
 		setRepublishes(mPulse->mRepublishes.size());
@@ -322,6 +356,7 @@ void PulseDataItem::showPulse()
 		}
 		else
 		{
+			// NO Parent, so only 0 is important.
 			setReference(0, mPulse->mRefGroupId, mPulse->mRefGroupName);
 		}
 	}
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewItem.h b/retroshare-gui/src/gui/TheWire/PulseViewItem.h
index 05f23cdb2..549c2d34a 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewItem.h
+++ b/retroshare-gui/src/gui/TheWire/PulseViewItem.h
@@ -50,6 +50,13 @@ class PulseDataInterface
 public:
 	virtual ~PulseDataInterface() {}
 
+    enum class PulseStatus {
+		FULL,         // have Msg + Group:            Show Stats
+		UNSUBSCRIBED, // Ref + unsubscribed to Group: Show Follow
+		NO_GROUP,     // Ref Msg, unknown group:      Show Missing Group.
+		REF_MSG       // Subscribed, only Ref Msg:    Show Missing Msg.
+	};
+
 protected:
 	// Group
 	virtual void setHeadshot(const QPixmap &pixmap) = 0;
@@ -68,7 +75,7 @@ protected:
 
 	// 
 	virtual void setReferenceString(QString ref) = 0;
-	virtual void showResponseStats(bool enable) = 0;
+	virtual void setPulseStatus(PulseStatus status) = 0;
 };
 
 
diff --git a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc
index b26e6b7da..2c344c6bd 100644
--- a/retroshare-gui/src/gui/TheWire/TheWire_images.qrc
+++ b/retroshare-gui/src/gui/TheWire/TheWire_images.qrc
@@ -4,5 +4,8 @@
         <file>images/like.png</file>
         <file>images/reply.png</file>
         <file>images/retweet.png</file>
+        <file>images/link.svg</file>
+        <file>images/external-link.svg</file>
+        <file>images/invite.png</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index 8a0b2a235..cc0e3d840 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -578,8 +578,12 @@ void WireDialog::PVHfollow(const RsGxsGroupId &groupId)
 {
 	std::cerr << "WireDialog::PVHfollow(";
 	std::cerr << groupId.toStdString();
-	std::cerr << ") TODO";
+	std::cerr << ")";
 	std::cerr << std::endl;
+
+	uint32_t token;
+	rsWire->subscribeToGroup(token, groupId, true);
+	mWireQueue->queueRequest(token, TOKENREQ_GROUPINFO, RS_TOKREQ_ANSTYPE_ACK, WIRE_TOKEN_TYPE_SUBSCRIBE_CHANGE);
 }
 
 void WireDialog::PVHrate(const RsGxsId &authorId)
diff --git a/retroshare-gui/src/gui/TheWire/images/external-link.svg b/retroshare-gui/src/gui/TheWire/images/external-link.svg
new file mode 100644
index 000000000..d3a249f34
--- /dev/null
+++ b/retroshare-gui/src/gui/TheWire/images/external-link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 24 24" fill="none" stroke="#3070FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/TheWire/images/invite.png b/retroshare-gui/src/gui/TheWire/images/invite.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fda4753e62a963203073ce59fb8097f0360f1e0
GIT binary patch
literal 5218
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

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/TheWire/images/link.svg b/retroshare-gui/src/gui/TheWire/images/link.svg
new file mode 100644
index 000000000..fdee24b3c
--- /dev/null
+++ b/retroshare-gui/src/gui/TheWire/images/link.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 24 24" fill="none" stroke="#3070FF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
\ No newline at end of file

From d0104e03645fcd13c05685e9c47c87694890db09 Mon Sep 17 00:00:00 2001
From: drbob <drbob@lunamutt.com>
Date: Sat, 8 Aug 2020 15:52:31 +1000
Subject: [PATCH 2/2] Get Republishing Pulses working

 * Copy Original Pulse data for Republished Pulses
 * Add LHS | to indicate republish
 * Update Ref Icon in PulseTopLevel
 * Add FollowParent button in PulseTopLevel
 * display republished pulses as part of PulseFocus view
---
 .../src/gui/TheWire/PulseAddDialog.cpp        | 12 +++++++
 .../src/gui/TheWire/PulseMessage.cpp          |  4 +++
 .../src/gui/TheWire/PulseMessage.ui           | 34 +++++++++++++++++--
 .../src/gui/TheWire/PulseTopLevel.cpp         | 19 ++++++++++-
 .../src/gui/TheWire/PulseTopLevel.ui          | 34 ++++++++++++++++++-
 .../src/gui/TheWire/PulseViewItem.cpp         | 23 +++++++++++++
 .../src/gui/TheWire/PulseViewItem.h           |  1 +
 retroshare-gui/src/gui/TheWire/WireDialog.cpp | 20 +++++++++++
 8 files changed, 142 insertions(+), 5 deletions(-)

diff --git a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
index 41ad2be75..dc09a11f1 100644
--- a/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
@@ -302,6 +302,18 @@ void PulseAddDialog::postReplyPulse()
 	pPulse->mImage3 = mImage3;
 	pPulse->mImage4 = mImage4;
 
+	if (mReplyType & WIRE_PULSE_TYPE_REPUBLISH) {
+		// Copy details from parent, and override
+		pPulse->mSentiment = mReplyToPulse.mSentiment;
+		pPulse->mPulseText = mReplyToPulse.mPulseText;
+
+		// Copy images.
+		pPulse->mImage1 = mReplyToPulse.mImage1;
+		pPulse->mImage2 = mReplyToPulse.mImage2;
+		pPulse->mImage3 = mReplyToPulse.mImage3;
+		pPulse->mImage4 = mReplyToPulse.mImage4;
+	}
+
 	// this should be in async thread, so doesn't block UI thread.
 	if (!rsWire->createReplyPulse(mReplyToPulse.mMeta.mGroupId,
 			mReplyToPulse.mMeta.mOrigMsgId,
diff --git a/retroshare-gui/src/gui/TheWire/PulseMessage.cpp b/retroshare-gui/src/gui/TheWire/PulseMessage.cpp
index 0cf986b86..91af09b3a 100644
--- a/retroshare-gui/src/gui/TheWire/PulseMessage.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseMessage.cpp
@@ -36,6 +36,10 @@ void PulseMessage::setup(RsWirePulseSPtr pulse)
 
 	setMessage(QString::fromStdString(pulse->mPulseText));
 
+	// show indent if republish (both RESPONSE or REF)
+	bool showIndent = (pulse->mPulseType & WIRE_PULSE_TYPE_REPUBLISH);
+	widget_indent->setVisible(showIndent);
+
 	// setup images.
 	int width  = 256;
 	int height = 128;
diff --git a/retroshare-gui/src/gui/TheWire/PulseMessage.ui b/retroshare-gui/src/gui/TheWire/PulseMessage.ui
index a85f602c6..a1ce9831d 100644
--- a/retroshare-gui/src/gui/TheWire/PulseMessage.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseMessage.ui
@@ -13,11 +13,39 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" rowspan="2">
+    <widget class="QWidget" name="widget_indent" native="true">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="Line" name="line">
+        <property name="minimumSize">
+         <size>
+          <width>20</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Plain</enum>
+        </property>
+        <property name="lineWidth">
+         <number>5</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="1">
     <widget class="QTextBrowser" name="textBrowser"/>
    </item>
-   <item>
+   <item row="1" column="1">
     <widget class="QFrame" name="frame_expand">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp b/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp
index d66b90eb3..859a4d735 100644
--- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.cpp
@@ -48,6 +48,7 @@ void PulseTopLevel::setup()
 	connect(toolButton_viewGroup, SIGNAL(clicked()), this, SLOT(actionViewGroup()));
 	connect(toolButton_viewParent, SIGNAL(clicked()), this, SLOT(actionViewParent()));
 	connect(toolButton_follow, SIGNAL(clicked()), this, SLOT(actionFollow()));
+	connect(toolButton_followParent, SIGNAL(clicked()), this, SLOT(actionFollowParent()));
 	// connect(toolButton_rate, SIGNAL(clicked()), this, SLOT(rate()));
 
 	connect(toolButton_reply, SIGNAL(clicked()), this, SLOT(actionReply()));
@@ -122,12 +123,28 @@ void PulseTopLevel::setReferenceString(QString ref)
 	else
 	{
 		label_reference->setText(ref);
+
+		// set ref icon
+		if (mPulse->mPulseType & WIRE_PULSE_TYPE_REPUBLISH) {
+			label_reficon->setPixmap(QPixmap(":/images/retweet.png"));
+		} else {
+			label_reficon->setPixmap(QPixmap(":/images/reply.png"));
+		}
 	}
 
 	if (mPulse->mRefGroupPtr) {
-		toolButton_viewParent->setVisible(true);
+		if (mPulse->mRefGroupPtr->mMeta.mSubscribeFlags &
+				(GXS_SERV::GROUP_SUBSCRIBE_ADMIN |
+				 GXS_SERV::GROUP_SUBSCRIBE_SUBSCRIBED)) {
+			toolButton_viewParent->setVisible(true);
+			toolButton_followParent->setVisible(false);
+		} else {
+			toolButton_viewParent->setVisible(false);
+			toolButton_followParent->setVisible(true);
+		}
 	} else {
 		toolButton_viewParent->setVisible(false);
+		toolButton_followParent->setVisible(false);
 	}
 }
 	
diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
index 884300c64..77d32218a 100644
--- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
+++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
@@ -91,8 +91,20 @@ border-radius: 10px}</string>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="maximumSize">
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
            <property name="text">
-            <string>icn</string>
+            <string/>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="TheWire_images.qrc">:/images/reply.png</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
            </property>
           </widget>
          </item>
@@ -123,6 +135,26 @@ border-radius: 10px}</string>
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QToolButton" name="toolButton_followParent">
+           <property name="toolTip">
+            <string>follow Parent Group</string>
+           </property>
+           <property name="text">
+            <string>...</string>
+           </property>
+           <property name="icon">
+            <iconset resource="TheWire_images.qrc">
+             <normaloff>:/images/invite.png</normaloff>:/images/invite.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+          </widget>
+         </item>
          <item>
           <spacer name="horizontalSpacer_15">
            <property name="orientation">
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp b/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp
index 3a42f5ba9..12568dc49 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp
+++ b/retroshare-gui/src/gui/TheWire/PulseViewItem.cpp
@@ -201,6 +201,29 @@ void PulseDataItem::actionFollow()
 	}
 }
 
+void PulseDataItem::actionFollowParent()
+{
+	std::cerr << "PulseDataItem::actionFollowParent()";
+	std::cerr << std::endl;
+
+	RsGxsGroupId groupId;
+	if (mPulse->mPulseType & WIRE_PULSE_TYPE_REFERENCE) {
+		std::cerr << "PulseDataItem::actionFollowParent() REF following Group: ";
+		std::cerr << mPulse->mMeta.mGroupId;
+		std::cerr << std::endl;
+		groupId = mPulse->mMeta.mGroupId;
+	} else {
+		std::cerr << "PulseDataItem::actionFollowParent() RESPONSE following RefGroup: ";
+		std::cerr << mPulse->mRefGroupId;
+		std::cerr << std::endl;
+		groupId = mPulse->mRefGroupId;
+	}
+
+	if (mHolder) {
+		mHolder->PVHfollow(groupId);
+	}
+}
+
 void PulseDataItem::actionRate()
 {
 	std::cerr << "PulseDataItem::actionRate()";
diff --git a/retroshare-gui/src/gui/TheWire/PulseViewItem.h b/retroshare-gui/src/gui/TheWire/PulseViewItem.h
index 549c2d34a..bee96f14b 100644
--- a/retroshare-gui/src/gui/TheWire/PulseViewItem.h
+++ b/retroshare-gui/src/gui/TheWire/PulseViewItem.h
@@ -112,6 +112,7 @@ private slots:
 	void actionViewPulse();
 
 	void actionFollow();
+	void actionFollowParent();
 	void actionRate();
 	// Action interfaces --------------------------
 
diff --git a/retroshare-gui/src/gui/TheWire/WireDialog.cpp b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
index cc0e3d840..06fa6ba6c 100644
--- a/retroshare-gui/src/gui/TheWire/WireDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireDialog.cpp
@@ -819,6 +819,26 @@ void WireDialog::postPulseFocus(RsWirePulseSPtr pPulse)
 
 		addTwitterView(new PulseReplySeperator());
 	}
+
+	// Add big separator, and republishes.
+	if (pPulse->mReplies.size() > 0 && pPulse->mRepublishes.size() > 0)
+	{
+		addTwitterView(new PulseReplySeperator());
+		addTwitterView(new PulseReplySeperator());
+	}
+
+	for(it = pPulse->mRepublishes.begin(); it != pPulse->mRepublishes.end(); it++)
+	{
+		RsWirePulseSPtr repub = *it;
+
+		PulseReply *firstRepub = new PulseReply(this, repub);
+		firstRepub->showReplyLine(false);
+
+		addTwitterView(firstRepub);
+		addTwitterView(new PulseReplySeperator());
+	}
+
+
 }
 
 void WireDialog::requestGroupFocus(const RsGxsGroupId groupId)