ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

postHtml Refactor

Browse Source 
Use EventRelation and EventContent to form messages rather than writing custom Json.
This commit is contained in:
James Graham
2024-12-01 17:19:55 +00:00
parent 43f052a363
commit d65aacac6f
1 changed files with 9 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/neochatroom.cpp
View File

@@ -10,6 +10,8 @@
#include <QTemporaryFile> #include <QTemporaryFile>
#include <Quotient/events/eventcontent.h> #include <Quotient/events/eventcontent.h>
#include <Quotient/events/eventrelation.h>
#include <Quotient/events/roommessageevent.h>
#include <Quotient/jobs/basejob.h> #include <Quotient/jobs/basejob.h>
#include <Quotient/quotient_common.h> #include <Quotient/quotient_common.h>
#include <qcoro/qcorosignal.h> #include <qcoro/qcorosignal.h>
@@ -509,6 +511,9 @@ void NeoChatRoom::postHtmlMessage(const QString &text,
isReply = false; isReply = false;
} }
auto content = std::make_unique<EventContent::TextContent>(html, u"text/html"_s);
std::optional<EventRelation> relatesTo = std::nullopt;
if (isThread) { if (isThread) {
bool isFallingBack = !fallbackId.isEmpty(); bool isFallingBack = !fallbackId.isEmpty();
QString replyEventId = isFallingBack ? fallbackId : QString(); QString replyEventId = isFallingBack ? fallbackId : QString();
@@ -524,75 +529,18 @@ void NeoChatRoom::postHtmlMessage(const QString &text,
replyEventId = threadRootId; replyEventId = threadRootId;
} }
// clang-format off relatesTo = EventRelation::replyInThread(threadRootId, isFallingBack, replyEventId);
QJsonObject json{
{"msgtype"_ls, msgTypeToString(type)},
{"body"_ls, text},
{"format"_ls, "org.matrix.custom.html"_ls},
{"m.relates_to"_ls,
QJsonObject {
{"rel_type"_ls, "m.thread"_ls},
{"event_id"_ls, threadRootId},
{"is_falling_back"_ls, isFallingBack},
{"m.in_reply_to"_ls,
QJsonObject {
{"event_id"_ls, replyEventId}
}
}
}
},
{"formatted_body"_ls, html}
};
// clang-format on
postJson("m.room.message"_ls, json);
return;
} }
if (isEdit) { if (isEdit) {
QJsonObject json{ relatesTo = EventRelation::replace(relateToEventId);
{"type"_ls, "m.room.message"_ls},
{"msgtype"_ls, msgTypeToString(type)},
{"body"_ls, "* %1"_ls.arg(text)},
{"format"_ls, "org.matrix.custom.html"_ls},
{"formatted_body"_ls, html},
{"m.new_content"_ls,
QJsonObject{{"body"_ls, text}, {"msgtype"_ls, msgTypeToString(type)}, {"format"_ls, "org.matrix.custom.html"_ls}, {"formatted_body"_ls, html}}},
{"m.relates_to"_ls, QJsonObject{{"rel_type"_ls, "m.replace"_ls}, {"event_id"_ls, relateToEventId}}}};
postJson("m.room.message"_ls, json);
return;
} }
if (isReply) { if (isReply) {
const auto &replyEvt = **replyIt; relatesTo = EventRelation::replyTo(replyEventId);
// clang-format off
QJsonObject json{
{"msgtype"_ls, msgTypeToString(type)},
{"body"_ls, "> <%1> %2\n\n%3"_ls.arg(replyEvt.senderId(), EventHandler::plainBody(this, &replyEvt), text)},
{"format"_ls, "org.matrix.custom.html"_ls},
{"m.relates_to"_ls,
QJsonObject {
{"m.in_reply_to"_ls,
QJsonObject {
{"event_id"_ls, replyEventId}
}
}
}
},
{"formatted_body"_ls,
"<mx-reply><blockquote><a href=\"https://matrix.to/#/%1/%2\">In reply to</a> <a href=\"https://matrix.to/#/%3\">%4</a><br>%5</blockquote></mx-reply>%6"_ls.arg(id(), replyEventId, replyEvt.senderId(), replyEvt.senderId(), EventHandler::richBody(this, &replyEvt), html)
}
};
// clang-format on
postJson("m.room.message"_ls, json);
return;
} }
Room::postHtmlMessage(text, html, type); post<RoomMessageEvent>(text, type, std::move(content), relatesTo);
} }
void NeoChatRoom::toggleReaction(const QString &eventId, const QString &reaction) void NeoChatRoom::toggleReaction(const QString &eventId, const QString &reaction)