From a92b64f249c1347e006278279d3a4463163f8b65 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 21 Mar 2025 22:13:17 +0100 Subject: [PATCH] clean code & temporary fix subscribe button --- .../src/gui/feeds/WireNotifyGroupItem.cpp | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/retroshare-gui/src/gui/feeds/WireNotifyGroupItem.cpp b/retroshare-gui/src/gui/feeds/WireNotifyGroupItem.cpp index 1ee884167..f8885d2f4 100644 --- a/retroshare-gui/src/gui/feeds/WireNotifyGroupItem.cpp +++ b/retroshare-gui/src/gui/feeds/WireNotifyGroupItem.cpp @@ -23,9 +23,9 @@ #include "FeedHolder.h" #include "util/qtthreadsutils.h" +#include "gui/common/FilesDefs.h" #include "gui/RetroShareLink.h" #include "gui/gxs/GxsIdDetails.h" -#include "gui/common/FilesDefs.h" #include "util/DateTime.h" /**** @@ -123,7 +123,7 @@ void WireNotifyGroupItem::loadGroup() { // 1 - get group data -#ifdef DEBUG_FORUMS +#ifdef DEBUG_ITEM std::cerr << "Retrieving post data for post " << mThreadId << std::endl; #endif @@ -173,7 +173,6 @@ void WireNotifyGroupItem::fill() // No link type at this moment RetroShareLink link = RetroShareLink::createGxsGroupLink(RetroShareLink::TYPE_WIRE, mGroup.mMeta.mGroupId, groupName()); ui->nameLabel->setText(link.toHtml()); -// ui->nameLabel->setText(groupName()); ui->descLabel->setText(QString::fromUtf8(mGroup.mTagline.c_str())); @@ -185,11 +184,6 @@ void WireNotifyGroupItem::fill() ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png")); } - if(mGroup.mMeta.mLastPost==0) - ui->infoLastPost->setText(tr("Never")); - else - ui->infoLastPost->setText(DateTime::formatLongDateTime(mGroup.mMeta.mLastPost)); - //TODO - nice icon for subscribed group // if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) { // ui->logoLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/wire.png")); @@ -203,6 +197,11 @@ void WireNotifyGroupItem::fill() ui->subscribeButton->setEnabled(true); } + if(mGroup.mMeta.mLastPost==0) + ui->infoLastPost->setText(tr("Never")); + else + ui->infoLastPost->setText(DateTime::formatLongDateTime(mGroup.mMeta.mLastPost)); + // if (mIsNew) // { ui->titleLabel->setText(tr("New Wire")); @@ -259,5 +258,8 @@ void WireNotifyGroupItem::subscribeWire() std::cerr << std::endl; #endif - subscribe(); + //subscribe(); does not work for wire, bug? -> GxsGroupFeedItem::subscribe() + + uint32_t token; + rsWire->subscribeToGroup(token, mGroup.mMeta.mGroupId, true); }