Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-21 11:26:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed GxsForumMsgItem

Browse source
This commit is contained in:
csoler 2025-11-02 18:25:01 +01:00
parent f8061d452c
commit 5e4249663e
2 changed files with 98 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

231
retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
View file

@ -48,56 +48,88 @@ GxsForumMsgItem::GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const
mMessage.mMeta.mMsgId = messageId; // useful for uniqueIdentifier() before the post is actually loaded mMessage.mMeta.mMsgId = messageId; // useful for uniqueIdentifier() before the post is actually loaded
mMessage.mMeta.mGroupId = groupId; mMessage.mMeta.mGroupId = groupId;
mLoadingStatus = NO_DATA;
mLoadingGroup = false; mLoadingGroup = false;
mLoadingMessage = false; mLoadingMessage = false;
mLoadingSetAsRead = false; mLoadingSetAsRead = false;
mLoadingParentMessage = false;
setup(); setup();
requestGroup();
requestMessage();
} }
GxsForumMsgItem::GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumGroup &group, const RsGxsForumMsg &post, bool isHome, bool autoUpdate) : // GxsForumMsgItem::GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumGroup &group, const RsGxsForumMsg &post, bool isHome, bool autoUpdate) :
GxsFeedItem(feedHolder, feedId, post.mMeta.mGroupId, post.mMeta.mMsgId, isHome, rsGxsForums, autoUpdate) // GxsFeedItem(feedHolder, feedId, post.mMeta.mGroupId, post.mMeta.mMsgId, isHome, rsGxsForums, autoUpdate)
// {
// #ifdef DEBUG_ITEM
// std::cerr << "GxsForumMsgItem::GxsForumMsgItem() Direct Load";
// std::cerr << std::endl;
// #endif
//
// setup();
//
// setGroup(group, false);
// setMessage(post);
// }
// GxsForumMsgItem::GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumMsg &post, bool isHome, bool autoUpdate) :
// GxsFeedItem(feedHolder, feedId, post.mMeta.mGroupId, post.mMeta.mMsgId, isHome, rsGxsForums, autoUpdate)
// {
// #ifdef DEBUG_ITEM
// std::cerr << "GxsForumMsgItem::GxsForumMsgItem() Direct Load";
// std::cerr << std::endl;
// #endif
//
// setup();
//
// requestGroup();
// setMessage(post);
// }
void GxsForumMsgItem::paintEvent(QPaintEvent *e)
{ {
#ifdef DEBUG_ITEM /* This method employs a trick to trigger a deferred loading. The post and group is requested only
std::cerr << "GxsForumMsgItem::GxsForumMsgItem() Direct Load"; * when actually displayed on the screen. */
std::cerr << std::endl;
#endif
setup(); if(mLoadingStatus != FILLED && !mGroup.mMeta.mGroupId.isNull() && !mMessage.mMeta.mMsgId.isNull())
mLoadingStatus = HAS_DATA;
setGroup(group, false); if(mGroup.mMeta.mGroupId.isNull() && !mLoadingGroup)
setMessage(post); requestGroup();
}
GxsForumMsgItem::GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumMsg &post, bool isHome, bool autoUpdate) : if(mMessage.mMeta.mMsgId.isNull() && !mLoadingMessage)
GxsFeedItem(feedHolder, feedId, post.mMeta.mGroupId, post.mMeta.mMsgId, isHome, rsGxsForums, autoUpdate) requestMessage();
{
#ifdef DEBUG_ITEM
std::cerr << "GxsForumMsgItem::GxsForumMsgItem() Direct Load";
std::cerr << std::endl;
#endif
setup(); switch(mLoadingStatus)
{
case FILLED:
case NO_DATA:
default:
break;
requestGroup(); case HAS_DATA:
setMessage(post); fillGroup();
fillMessage();
if(!mParentMessage.mMeta.mMsgId.isNull())
fillParentMessage();
mLoadingStatus = FILLED;
break;
}
GxsFeedItem::paintEvent(e) ;
} }
GxsForumMsgItem::~GxsForumMsgItem() GxsForumMsgItem::~GxsForumMsgItem()
{ {
auto timeout = std::chrono::steady_clock::now() + std::chrono::milliseconds(GROUP_ITEM_LOADING_TIMEOUT_ms); auto timeout = std::chrono::steady_clock::now() + std::chrono::milliseconds(GROUP_ITEM_LOADING_TIMEOUT_ms);
while( (mLoadingGroup || mLoadingMessage || mLoadingSetAsRead || mLoadingParentMessage) while( (mLoadingGroup || mLoadingMessage || mLoadingSetAsRead)
&& std::chrono::steady_clock::now() < timeout) && std::chrono::steady_clock::now() < timeout)
{ {
RsDbg() << __PRETTY_FUNCTION__ << " is Waiting for " RsDbg() << __PRETTY_FUNCTION__ << " is Waiting for "
<< (mLoadingGroup ? "Group " : "") << (mLoadingGroup ? "Group " : "")
<< (mLoadingMessage ? "Message " : "") << (mLoadingMessage ? "Message " : "")
<< (mLoadingParentMessage ? "Parent message " : "")
<< (mLoadingSetAsRead ? "Set as read" : "") << (mLoadingSetAsRead ? "Set as read" : "")
<< "loading." << std::endl; << "loading." << std::endl;
std::this_thread::sleep_for(std::chrono::milliseconds(100)); std::this_thread::sleep_for(std::chrono::milliseconds(100));
@ -113,7 +145,6 @@ void GxsForumMsgItem::setup()
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);
mInFill = false;
mCloseOnRead = false; mCloseOnRead = false;
/* clear ui */ /* clear ui */
@ -144,41 +175,6 @@ void GxsForumMsgItem::setup()
ui->parentFrame->hide(); ui->parentFrame->hide();
} }
bool GxsForumMsgItem::setGroup(const RsGxsForumGroup &group, bool doFill)
{
if (groupId() != group.mMeta.mGroupId) {
std::cerr << "GxsForumMsgItem::setGroup() - Wrong id, cannot set post";
std::cerr << std::endl;
return false;
}
mGroup = group;
if (doFill)
fillGroup();
return true;
}
bool GxsForumMsgItem::setMessage(const RsGxsForumMsg &msg, bool doFill)
{
if (groupId() != msg.mMeta.mGroupId || messageId() != msg.mMeta.mMsgId) {
std::cerr << "GxsForumMsgItem::setPost() - Wrong id, cannot set post";
std::cerr << std::endl;
return false;
}
mMessage = msg;
if(! mMessage.mMeta.mParentId.isNull())
loadParentMessage(mMessage.mMeta.mParentId);
if(doFill)
fillMessage();
return true;
}
QString GxsForumMsgItem::groupName() QString GxsForumMsgItem::groupName()
{ {
return QString::fromUtf8(mGroup.mMeta.mGroupName.c_str()); return QString::fromUtf8(mGroup.mMeta.mGroupName.c_str());
@ -221,7 +217,7 @@ void GxsForumMsgItem::loadGroup()
* thread, for example to update the data model with new information * thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */ * after a blocking call to RetroShare API complete */
setGroup(group); mGroup = group;
mLoadingGroup = false; mLoadingGroup = false;
}, this ); }, this );
@ -244,93 +240,50 @@ void GxsForumMsgItem::loadMessage()
std::cerr << "Retrieving post data for post " << mThreadId << std::endl; std::cerr << "Retrieving post data for post " << mThreadId << std::endl;
#endif #endif
std::vector<RsGxsForumMsg> msgs; auto getMessageData = [](const RsGxsGroupId& gid,const RsGxsMessageId& msg_id,RsGxsForumMsg& msg) -> bool
const std::list<RsGxsGroupId> forumIds = { groupId() }; {
std::vector<RsGxsForumMsg> msgs;
if(!rsGxsForums->getForumContent(groupId(),std::set<RsGxsMessageId>( { messageId() } ),msgs)) if(!rsGxsForums->getForumContent(gid,std::set<RsGxsMessageId>( { msg_id } ),msgs))
{ return false;
std::cerr << "GxsForumMsgItem::loadMessage() ERROR getting data";
std::cerr << std::endl; if (msgs.size() != 1)
return false;
msg = msgs[0];
return true;
};
RsGxsForumMsg msg,parent_msg;
if(!getMessageData(groupId(),messageId(),msg))
{
std::cerr << "GxsForumMsgItem::loadMessage() ERROR getting message data";
mLoadingMessage = false; mLoadingMessage = false;
return; return;
} }
// now load the parent message. If not found, it's not a problem.
if (msgs.size() != 1) if(!msg.mMeta.mParentId.isNull() && !getMessageData(groupId(),msg.mMeta.mParentId,parent_msg))
{ std::cerr << "GxsForumMsgItem::loadMessage() ERROR getting parent message data. Maybe the parent msg is not available.";
std::cerr << "GxsForumMsgItem::loadMessage() Wrong number of Items";
std::cerr << std::endl;
mLoadingMessage = false;
return;
}
RsGxsForumMsg msg(msgs[0]);
RsQThreadUtils::postToObject( [msg,this]() RsQThreadUtils::postToObject( [msg,parent_msg,this]()
{ {
/* Here it goes any code you want to be executed on the Qt Gui /* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information * thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */ * after a blocking call to RetroShare API complete */
setMessage(msg); mMessage = msg;
mParentMessage = parent_msg;
mLoadingMessage = false; mLoadingMessage = false;
}, this ); }, this );
}); });
} }
void GxsForumMsgItem::loadParentMessage(const RsGxsMessageId& parent_msg)
{
#ifdef DEBUG_ITEM
std::cerr << "GxsForumMsgItem::loadParentMessage()";
std::cerr << std::endl;
#endif
mLoadingParentMessage = true;
RsThread::async([parent_msg,this]()
{
// 1 - get group data
#ifdef DEBUG_FORUMS
std::cerr << "Retrieving post data for post " << mThreadId << std::endl;
#endif
std::vector<RsGxsForumMsg> msgs;
const std::list<RsGxsGroupId> forumIds = { groupId() };
if(!rsGxsForums->getForumContent(groupId(),std::set<RsGxsMessageId>( { parent_msg } ),msgs))
{
std::cerr << "GxsForumMsgItem::loadMessage() ERROR getting data";
std::cerr << std::endl;
mLoadingParentMessage = false;
return;
}
if (msgs.size() != 1)
{
std::cerr << "GxsForumMsgItem::loadMessage() Wrong number of Items";
std::cerr << std::endl;
mLoadingParentMessage = false;
return;
}
RsGxsForumMsg msg(msgs[0]);
RsQThreadUtils::postToObject( [msg,this]()
{
/* Here it goes any code you want to be executed on the Qt Gui
* thread, for example to update the data model with new information
* after a blocking call to RetroShare API complete */
mParentMessage = msg;
fillParentMessage();
mLoadingParentMessage = false;
}, this );
});
}
void GxsForumMsgItem::fillParentMessage() void GxsForumMsgItem::fillParentMessage()
{ {
mInFill = true;
ui->parentFrame->hide(); ui->parentFrame->hide();
RetroShareLink linkParent = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_FORUM, mParentMessage.mMeta.mGroupId, mParentMessage.mMeta.mMsgId, QString::fromUtf8(mParentMessage.mMeta.mMsgName.c_str())); RetroShareLink linkParent = RetroShareLink::createGxsMessageLink(RetroShareLink::TYPE_FORUM, mParentMessage.mMeta.mGroupId, mParentMessage.mMeta.mMsgId, QString::fromUtf8(mParentMessage.mMeta.mMsgName.c_str()));
@ -347,8 +300,6 @@ void GxsForumMsgItem::fillParentMessage()
pixmap = GxsIdDetails::makeDefaultIcon(mParentMessage.mMeta.mAuthorId,GxsIdDetails::SMALL); pixmap = GxsIdDetails::makeDefaultIcon(mParentMessage.mMeta.mAuthorId,GxsIdDetails::SMALL);
ui->parentAvatar->setPixmap(pixmap); ui->parentAvatar->setPixmap(pixmap);
mInFill = false;
} }
void GxsForumMsgItem::fillMessage() void GxsForumMsgItem::fillMessage()
{ {
@ -357,8 +308,6 @@ void GxsForumMsgItem::fillMessage()
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
mInFill = true;
if(!mIsHome && mCloseOnRead && !IS_MSG_NEW(mMessage.mMeta.mMsgStatus)) if(!mIsHome && mCloseOnRead && !IS_MSG_NEW(mMessage.mMeta.mMsgStatus))
removeItem(); removeItem();
@ -400,21 +349,15 @@ void GxsForumMsgItem::fillMessage()
ui->clearButton->setEnabled(false); ui->clearButton->setEnabled(false);
ui->clearButton->hide(); ui->clearButton->hide();
} }
mInFill = false;
} }
void GxsForumMsgItem::fillGroup() void GxsForumMsgItem::fillGroup()
{ {
mInFill = true;
ui->unsubscribeButton->setEnabled(IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags) || IS_GROUP_ADMIN(mGroup.mMeta.mSubscribeFlags)) ; ui->unsubscribeButton->setEnabled(IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags) || IS_GROUP_ADMIN(mGroup.mMeta.mSubscribeFlags)) ;
if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags)) if (IS_GROUP_PUBLISHER(mGroup.mMeta.mSubscribeFlags))
ui->iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png")); ui->iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums.png"));
else else
ui->iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums-default.png")); ui->iconLabel->setPixmap(FilesDefs::getPixmapFromQtResourcePath(":/icons/png/forums-default.png"));
mInFill = false;
} }
void GxsForumMsgItem::fillExpandFrame() void GxsForumMsgItem::fillExpandFrame()
@ -508,10 +451,6 @@ void GxsForumMsgItem::unsubscribeForum()
void GxsForumMsgItem::setAsRead(bool doUpdate) void GxsForumMsgItem::setAsRead(bool doUpdate)
{ {
if (mInFill) {
return;
}
mCloseOnRead = false; mCloseOnRead = false;
mLoadingSetAsRead = true; mLoadingSetAsRead = true;

26
retroshare-gui/src/gui/feeds/GxsForumMsgItem.h
View file

@ -36,22 +36,18 @@ class GxsForumMsgItem : public GxsFeedItem
public: public:
GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate); GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsGroupId &groupId, const RsGxsMessageId &messageId, bool isHome, bool autoUpdate);
GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumGroup &group, const RsGxsForumMsg &post, bool isHome, bool autoUpdate);
GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumMsg &post, bool isHome, bool autoUpdate);
virtual ~GxsForumMsgItem();
bool setGroup(const RsGxsForumGroup &group, bool doFill = true); //GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumGroup &group, const RsGxsForumMsg &post, bool isHome, bool autoUpdate);
bool setMessage(const RsGxsForumMsg &msg, bool doFill = true); //GxsForumMsgItem(FeedHolder *feedHolder, uint32_t feedId, const RsGxsForumMsg &post, bool isHome, bool autoUpdate);
virtual ~GxsForumMsgItem();
uint64_t uniqueIdentifier() const override { return hash_64bits("GxsForumMsgItem " + messageId().toStdString()) ; } uint64_t uniqueIdentifier() const override { return hash_64bits("GxsForumMsgItem " + messageId().toStdString()) ; }
protected: protected:
/* FeedItem */ virtual void paintEvent(QPaintEvent *e) override;
/* FeedItem */
virtual void doExpand(bool open) override; virtual void doExpand(bool open) override;
virtual void expandFill(bool first) override; virtual void expandFill(bool first) override;
/* load message data */
virtual void loadParentMessage(const RsGxsMessageId &parent_msg);
/* GxsGroupFeedItem */ /* GxsGroupFeedItem */
virtual QString groupName() override; virtual QString groupName() override;
virtual void loadGroup() override; virtual void loadGroup() override;
@ -77,6 +73,7 @@ signals:
private: private:
void setup(); void setup();
void fillGroup(); void fillGroup();
void fillMessage(); void fillMessage();
void fillParentMessage(); void fillParentMessage();
@ -85,16 +82,19 @@ private:
void setAsRead(bool doUpdate); void setAsRead(bool doUpdate);
private: private:
bool mInFill;
bool mCloseOnRead; bool mCloseOnRead;
LoadingStatus mLoadingStatus;
bool mLoadingMessage; bool mLoadingMessage;
bool mLoadingParentMessage;
bool mLoadingGroup; bool mLoadingGroup;
bool mLoadingSetAsRead; bool mLoadingSetAsRead;
bool mHasParentMessage; // set to false when we see that the msg does not have a parent.
RsGxsForumGroup mGroup; RsGxsForumGroup mGroup;
RsGxsForumMsg mMessage; RsGxsForumMsg mMessage;
RsGxsForumMsg mParentMessage; RsGxsForumMsg mParentMessage;
/** Qt Designer generated object */ /** Qt Designer generated object */
Ui::GxsForumMsgItem *ui; Ui::GxsForumMsgItem *ui;