mirrors/Parsee
1
0
Fork 0
mirror of https://forge.fsky.io/lda/Parsee.git synced 2026-03-13 15:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Properly handle new contents with Matrix

Browse source 
No more ugly asterisks. It annoyed me enough.
This commit is contained in:
LDA 2024-12-28 20:17:03 +01:00
commit 86deab29af
2 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/MatrixEventHandler.c
View file

@ -370,6 +370,7 @@ ParseeMessageHandler(ParseeData *data, HashMap *event)
DbRef *ref = NULL; DbRef *ref = NULL;
HashMap *json; HashMap *json;
char *unedited_id = MatrixGetEdit(event);
char *body = GrabString(event, 2, "content", "body"); char *body = GrabString(event, 2, "content", "body");
char *id = GrabString(event, 1, "room_id"); char *id = GrabString(event, 1, "room_id");
char *ev_id = GrabString(event, 1, "event_id"); char *ev_id = GrabString(event, 1, "event_id");
@ -381,12 +382,17 @@ ParseeMessageHandler(ParseeData *data, HashMap *event)
char *unauth = NULL; char *unauth = NULL;
char *origin_id = NULL, *stanza = NULL; char *origin_id = NULL, *stanza = NULL;
char *sender = NULL; char *sender = NULL;
char *unedited_id = MatrixGetEdit(event);
char *url = GrabString(event, 2, "content", "url"); char *url = GrabString(event, 2, "content", "url");
char *encoded_from = NULL; char *encoded_from = NULL;
bool direct = false; bool direct = false;
if (unedited_id)
{
char *new_content = GrabString(event, 3, "content", "m.new_content", "body");
if (new_content) body = new_content;
}
if (ParseeIsPuppet(data->config, m_sender) || if (ParseeIsPuppet(data->config, m_sender) ||
ParseeManageBan(data, m_sender, id)) ParseeManageBan(data, m_sender, id))
{ {

31
src/Parsee/Utils/Formatting.c
View file

@ -207,6 +207,32 @@ XMPPifyElement(HashMap *event, XMLElement *elem, XMPPFlags flags)
} }
return xepd; return xepd;
} }
static char *
GetRawBody(HashMap *event)
{
if (MatrixGetEdit(event))
{
char *new = GrabString(event, 3, "content", "m.new_content", "body");
if (new)
{
return new;
}
}
return GrabString(event, 2, "content", "body");
}
static char *
GetHTMLBody(HashMap *event)
{
if (MatrixGetEdit(event))
{
char *new = GrabString(event, 3, "content", "m.new_content", "formatted_body");
if (new)
{
return new;
}
}
return GrabString(event, 2, "content", "formatted_body");
}
char * char *
ParseeXMPPify(HashMap *event) ParseeXMPPify(HashMap *event)
{ {
@ -231,11 +257,12 @@ ParseeXMPPify(HashMap *event)
if (!StrEquals(format, "org.matrix.custom.html")) if (!StrEquals(format, "org.matrix.custom.html"))
{ {
/* Settle for the raw body instead. */ /* Settle for the raw body instead. */
char *body = JsonValueAsString(JsonGet(event, 2, "content", "body")); char *body = GetRawBody(event);
return StrDuplicate(body); return StrDuplicate(body);
} }
html = JsonValueAsString(JsonGet(event, 2, "content", "formatted_body")); html = GetHTMLBody(event);
html = StrConcat(3, "<html>", html, "</html>"); html = StrConcat(3, "<html>", html, "</html>");
elem = XMLCDecode(StrStreamReader(html), true, true); elem = XMLCDecode(StrStreamReader(html), true, true);