From ac5819dfc93a228d57f1d03b95267076ab30f47e Mon Sep 17 00:00:00 2001 From: Cubicroot Date: Fri, 11 Jun 2021 10:47:11 +0200 Subject: [PATCH] move respond/replace logic to separate functions --- internal/api/errors.go | 2 +- internal/dispatcher/notification.go | 157 ++++++++++++++++------------ 2 files changed, 94 insertions(+), 65 deletions(-) diff --git a/internal/api/errors.go b/internal/api/errors.go index db296e3..64c744a 100644 --- a/internal/api/errors.go +++ b/internal/api/errors.go @@ -2,4 +2,4 @@ package api import "errors" -var ErrorMessageNotFound = errors.New("Message not found") +var ErrorMessageNotFound = errors.New("message not found") diff --git a/internal/dispatcher/notification.go b/internal/dispatcher/notification.go index 6571d8d..16248de 100644 --- a/internal/dispatcher/notification.go +++ b/internal/dispatcher/notification.go @@ -80,82 +80,23 @@ func (d *Dispatcher) DeleteNotification(a *model.Application, n *model.DeleteNot return api.ErrorMessageNotFound } - if val, ok := deleteMessage.Content["body"]; ok { - body, ok := val.(string) + oldBody, oldFormattedBody, err = bodiesFromMessage(deleteMessage) - if !ok { - log.Println("Event does not have a body") - return api.ErrorMessageNotFound - } - - oldBody = body - oldFormattedBody = body - - } else { - log.Println("Message to delete has wrong format") - return api.ErrorMessageNotFound - } - - if val, ok := deleteMessage.Content["formatted_body"]; ok { - body, ok := val.(string) - if ok { - oldFormattedBody = body - } + if err != nil { + return err } // update the message with strikethrough newBody := fmt.Sprintf("%s\n- deleted", oldBody) newFormattedBody := fmt.Sprintf("%s
- deleted", oldFormattedBody) - newMessage := NewContent{ - Body: newBody, - FormattedBody: newFormattedBody, - MsgType: MsgTypeText, - Format: MessageFormatHTML, - } - - replaceRelation := RelatesTo{ - RelType: "m.replace", - EventID: deleteMessage.ID, - } - - replaceEvent := MessageEvent{ - Body: oldBody, - FormattedBody: oldFormattedBody, - MsgType: MsgTypeText, - NewContent: newMessage, - RelatesTo: replaceRelation, - Format: MessageFormatHTML, - } - - _, err = d.client.SendMessageEvent(a.MatrixID, "m.room.message", replaceEvent) + _, err = d.replaceMessage(a, newBody, newFormattedBody, deleteMessage.ID, oldBody, oldFormattedBody) if err != nil { - log.Println(err) return err } - // send a notification about the deletion - // formatting according to https://matrix.org/docs/spec/client_server/latest#fallbacks-and-event-representation - notificationFormattedBody := fmt.Sprintf("
In reply to %s
%s
\nThis message got deleted.", deleteMessage.RoomID, deleteMessage.ID, deleteMessage.Sender, deleteMessage.Sender, oldFormattedBody) - notificationBody := fmt.Sprintf("> <%s>%s\n\nThis message got deleted", deleteMessage.Sender, oldBody) - - notificationEvent := MessageEvent{ - FormattedBody: notificationFormattedBody, - Body: notificationBody, - MsgType: MsgTypeText, - Format: MessageFormatHTML, - } - - notificationReply := make(map[string]string) - notificationReply["event_id"] = deleteMessage.ID - - notificationRelation := RelatesTo{ - InReplyTo: notificationReply, - } - notificationEvent.RelatesTo = notificationRelation - - _, err = d.client.SendMessageEvent(a.MatrixID, "m.room.message", notificationEvent) + _, err = d.respondToMessage(a, "This message got deleted", "This message got deleted.", deleteMessage) return err } @@ -243,3 +184,91 @@ func (d *Dispatcher) getMessage(a *model.Application, id string) (gomatrix.Event } return gomatrix.Event{}, api.ErrorMessageNotFound } + +// Replaces the content of a matrix message +func (d *Dispatcher) replaceMessage(a *model.Application, newBody, newFormattedBody string, messageID string, oldBody, oldFormattedBody string) (*gomatrix.RespSendEvent, error) { + newMessage := NewContent{ + Body: newBody, + FormattedBody: newFormattedBody, + MsgType: MsgTypeText, + Format: MessageFormatHTML, + } + + replaceRelation := RelatesTo{ + RelType: "m.replace", + EventID: messageID, + } + + replaceEvent := MessageEvent{ + Body: oldBody, + FormattedBody: oldFormattedBody, + MsgType: MsgTypeText, + NewContent: newMessage, + RelatesTo: replaceRelation, + Format: MessageFormatHTML, + } + + sendEvent, err := d.client.SendMessageEvent(a.MatrixID, "m.room.message", replaceEvent) + + if err != nil { + log.Println(err) + return nil, err + } + + return sendEvent, nil +} + +// Sends a notification in response to another matrix message event +func (d *Dispatcher) respondToMessage(a *model.Application, body, formattedBody string, respondMessage gomatrix.Event) (*gomatrix.RespSendEvent, error) { + oldBody, oldFormattedBody, err := bodiesFromMessage(respondMessage) + + if err != nil { + return nil, err + } + + // formatting according to https://matrix.org/docs/spec/client_server/latest#fallbacks-and-event-representation + newFormattedBody := fmt.Sprintf("
In reply to %s
%s
\n%s", respondMessage.RoomID, respondMessage.ID, respondMessage.Sender, respondMessage.Sender, oldFormattedBody, formattedBody) + newBody := fmt.Sprintf("> <%s>%s\n\n%s", respondMessage.Sender, oldBody, body) + + notificationEvent := MessageEvent{ + FormattedBody: newFormattedBody, + Body: newBody, + MsgType: MsgTypeText, + Format: MessageFormatHTML, + } + + notificationReply := make(map[string]string) + notificationReply["event_id"] = respondMessage.ID + + notificationRelation := RelatesTo{ + InReplyTo: notificationReply, + } + notificationEvent.RelatesTo = notificationRelation + + return d.client.SendMessageEvent(a.MatrixID, "m.room.message", notificationEvent) +} + +// Extracts body and formatted body from a matrix message event +func bodiesFromMessage(message gomatrix.Event) (body, formattedBody string, err error) { + if val, ok := message.Content["body"]; ok { + body, ok := val.(string) + + if !ok { + return "", "", api.ErrorMessageNotFound + } + + formattedBody = body + + } else { + return "", "", api.ErrorMessageNotFound + } + + if val, ok := message.Content["formatted_body"]; ok { + body, ok := val.(string) + if ok { + formattedBody = body + } + } + + return body, formattedBody, nil +}