From 4cddaf78cbc48fecc5b8d30efc6ff2498e493a10 Mon Sep 17 00:00:00 2001 From: Passw Date: Wed, 3 Dec 2025 17:44:08 +0800 Subject: [PATCH 1/3] Fix missing space in SecurityIpItem.cpp --- retroshare-gui/src/gui/feeds/SecurityIpItem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp index 9f306685d..6d03cbf56 100644 --- a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp +++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp @@ -23,7 +23,7 @@ #include "SecurityIpItem.h" #include "FeedHolder.h" -#include"ui_SecurityIpItem.h" +#include "ui_SecurityIpItem.h" #include "retroshare-gui/RsAutoUpdatePage.h" #include "gui/connect/ConfCertDialog.h" #include "util/DateTime.h" From 64efeae56af65fefc567fbd48be02a60935546ae Mon Sep 17 00:00:00 2001 From: defnax <9952056+defnax@users.noreply.github.com> Date: Thu, 4 Dec 2025 18:39:59 +0100 Subject: [PATCH 2/3] Fix Boards update notify --- retroshare-gui/src/gui/NewsFeed.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp index 9ade10fea..1b67c92a9 100644 --- a/retroshare-gui/src/gui/NewsFeed.cpp +++ b/retroshare-gui/src/gui/NewsFeed.cpp @@ -240,6 +240,7 @@ void NewsFeed::handlePostedEvent(std::shared_ptr event) switch(pe->mPostedEventCode) { + case RsPostedEventCode::UPDATED_POSTED_GROUP: case RsPostedEventCode::NEW_POSTED_GROUP: addFeedItem( new PostedGroupItem(this, NEWSFEED_POSTEDNEWLIST, pe->mPostedGroupId, false, true)); break; From 499860ee09d09300af6925d148cb01f5c0a90da5 Mon Sep 17 00:00:00 2001 From: Christoph Johannes Kleine Date: Fri, 5 Dec 2025 15:43:41 +0100 Subject: [PATCH 3/3] remove duplicate code introduced by merging --- retroshare-gui/src/gui/FriendsDialog.cpp | 26 ++++++++---------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 3bc7965e4..9b1efb9a0 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -242,29 +242,19 @@ void FriendsDialog::chatMessageReceived(const ChatMessage &msg) if(!msg.chat_id.isBroadcast()) return; - QDateTime sendTime = QDateTime::fromTime_t(msg.sendTime); - QDateTime recvTime = QDateTime::fromTime_t(msg.recvTime); - QString message = QString::fromUtf8(msg.msg.c_str()); - QString name = QString::fromUtf8(rsPeers->getPeerName(msg.broadcast_peer_id).c_str()); + QDateTime sendTime = DateTime::DateTimeFromTime_t(msg.sendTime); + QDateTime recvTime = DateTime::DateTimeFromTime_t(msg.recvTime); + QString message = QString::fromUtf8(msg.msg.c_str()); + QString name = QString::fromUtf8(rsPeers->getPeerName(msg.broadcast_peer_id).c_str()); - ui.chatWidget->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL); + ui.chatWidget->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL); - if(ui.chatWidget->isActive()) - { - QDateTime sendTime = DateTime::DateTimeFromTime_t(msg.sendTime); - QDateTime recvTime = DateTime::DateTimeFromTime_t(msg.recvTime); - QString message = QString::fromUtf8(msg.msg.c_str()); - QString name = QString::fromUtf8(rsPeers->getPeerName(msg.broadcast_peer_id).c_str()); - - ui.chatWidget->addChatMsg(msg.incoming, name, sendTime, recvTime, message, ChatWidget::MSGTYPE_NORMAL); - - if(ui.chatWidget->isActive()) - { + if(ui.chatWidget->isActive()) + { // clear the chat notify when control returns to the Qt event loop // we have to do this later, because we don't know if we or the notify receives the chat message first QMetaObject::invokeMethod(this, "clearChatNotify", Qt::QueuedConnection); - } - } + } } void FriendsDialog::chatStatusReceived(const ChatId &chat_id, const QString &status_string)