rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement MSC3664, pushrules for related events

This commit is contained in:
Nicolas Werner 2022-12-03 02:10:45 +01:00
parent ea5984a575
commit 59703d3c25
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
4 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -595,7 +595,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG c7a13e79289ae35c4e2a9bccb3fdeb2bc03a925d
GIT_TAG 7155cbb8ed3289f2cc7269da7607b0dd012f471b
)
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")

2
io.github.NhekoReborn.Nheko.yaml
View File

@ -182,7 +182,7 @@ modules:
buildsystem: cmake-ninja
name: mtxclient
sources:
- commit: c7a13e79289ae35c4e2a9bccb3fdeb2bc03a925d
- commit: 7155cbb8ed3289f2cc7269da7607b0dd012f471b
#tag: v0.8.2
type: git
url: https://github.com/Nheko-Reborn/mtxclient.git

24
src/ChatPage.cpp
View File

@ -261,6 +261,10 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QObject *parent)
cache::getEventIndex(room_id, cache::client()->getFullyReadEventId(room_id));
auto ctx = roomModel->pushrulesRoomContext();
std::vector<
std::pair<mtx::common::Relation, mtx::events::collections::TimelineEvent>>
relatedEvents;
for (const auto &event : room.timeline.events) {
mtx::events::collections::TimelineEvent te{event};
std::visit([room_id = room_id](auto &event_) { event_.room_id = room_id; },
@ -277,7 +281,25 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QObject *parent)
te.data = result.event.value();
}
auto actions = pushrules->evaluate(te, ctx);
relatedEvents.clear();
for (const auto &r : mtx::accessors::relations(te.data).relations) {
auto related = cache::client()->getEvent(room_id, r.event_id);
if (related) {
relatedEvents.emplace_back(r, *related);
if (auto encryptedEvent = std::get_if<
mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>(
&related->data);
encryptedEvent && userSettings_->decryptNotifications()) {
MegolmSessionIndex index(room_id, encryptedEvent->content);
auto result = olm::decryptEvent(index, *encryptedEvent);
if (result.event)
relatedEvents.back().second.data = result.event.value();
}
}
}
auto actions = pushrules->evaluate(te, ctx, relatedEvents);
if (std::find(actions.begin(),
actions.end(),
mtx::pushrules::actions::Action{

13
src/timeline/TimelineModel.cpp
View File

@ -742,7 +742,18 @@ TimelineModel::data(const mtx::events::collections::TimelineEvents &event, int r
case Notificationlevel: {
const auto &push = ChatPage::instance()->pushruleEvaluator();
if (push) {
auto actions = push->evaluate({event}, pushrulesRoomContext());
const auto &id = event_id(event);
std::vector<std::pair<mtx::common::Relation, mtx::events::collections::TimelineEvent>>
relatedEvents;
for (const auto &r : mtx::accessors::relations(event).relations) {
auto related = events.get(r.event_id, id);
if (related) {
relatedEvents.emplace_back(r,
mtx::events::collections::TimelineEvent{*related});
}
}
auto actions = push->evaluate({event}, pushrulesRoomContext(), relatedEvents);
if (std::find(actions.begin(),
actions.end(),
mtx::pushrules::actions::Action{