thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

strip reply fallbacks from forwarded message

Browse source
This commit is contained in:
targetakhil 2021-04-18 11:22:44 +05:30
parent 06e12a0a16
commit 2dfa40e017
4 changed files with 69 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/timeline/TimelineViewManager.cpp
View file

@ -4,7 +4,6 @@
#include "TimelineViewManager.h"
#include <QBuffer>
#include <QDesktopServices>
#include <QDropEvent>
#include <QMetaType>
@ -26,7 +25,6 @@
#include "RoomsModel.h"
#include "UserSettingsPage.h"
#include "UsersModel.h"
#include "blurhash.hpp"
#include "dialogs/ImageOverlay.h"
#include "emoji/EmojiModel.h"
#include "emoji/Provider.h"
@ -623,10 +621,9 @@ void
TimelineViewManager::forwardMessageToRoom(mtx::events::collections::TimelineEvents *e,
QString roomId)
{
auto elem = *e;
auto room = models.find(roomId);
auto content = mtx::accessors::url(elem);
std::optional<mtx::crypto::EncryptedFile> encryptionInfo = mtx::accessors::file(elem);
auto content = mtx::accessors::url(*e);
std::optional<mtx::crypto::EncryptedFile> encryptionInfo = mtx::accessors::file(*e);
if (encryptionInfo) {
http::client()->download(
@ -669,6 +666,8 @@ TimelineViewManager::forwardMessageToRoom(mtx::events::collections::TimelineEven
}
auto room = models.find(roomId);
removeReplyFallback(ev);
ev.content.relations.relations.clear();
room.value()->sendMessageEvent(
ev.content,
mtx::events::EventType::RoomMessage);
@ -688,9 +687,10 @@ TimelineViewManager::forwardMessageToRoom(mtx::events::collections::TimelineEven
if constexpr (mtx::events::message_content_to_type<decltype(e.content)> ==
mtx::events::EventType::RoomMessage) {
e.content.relations.relations.clear();
removeReplyFallback(e);
room.value()->sendMessageEvent(e.content,
mtx::events::EventType::RoomMessage);
}
},
elem);
*e);
}