Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bridgev2/matrix/intent.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func (as *ASIntent) SendMessage(ctx context.Context, roomID id.RoomID, eventType
if (eventType != event.EventReaction || as.Connector.Config.Encryption.MSC4392) && eventType != event.EventRedaction {
msgContent, ok := content.Parsed.(*event.MessageEventContent)
if ok && eventType == event.EventMessage {
msgContent.AddForwardedFallback()
msgContent.AddPerMessageProfileFallback()
}
if encrypted, err := as.Connector.isEncrypted(ctx, roomID); err != nil {
Expand Down
57 changes: 57 additions & 0 deletions event/beeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,63 @@ func (content *MessageEventContent) RemovePerMessageProfileFallback() {
}
}

// BeeperForwarded marks a message as forwarded on the remote network.
type BeeperForwarded struct {
HasFallback bool `json:"has_fallback,omitzero"`
}

const (
ForwardedFallbackText = "↷ Forwarded"
ForwardedFallbackHTML = "<p data-mx-forwarded-notice><em>↷ Forwarded</em></p>"
)

var HTMLForwardedFallbackRegex = regexp.MustCompile(`^<p\s+data-mx-forwarded-notice(?:="")?\s*><em>↷ Forwarded</em></p\s*>`)

func (content *MessageEventContent) AddForwardedFallback() {
if content.BeeperForwarded == nil || content.BeeperForwarded.HasFallback {
return
}
isMedia := content.MsgType.IsMedia()
if !isMedia && !content.MsgType.IsText() {
return
}
content.BeeperForwarded.HasFallback = true
if isMedia && (content.FileName == "" || content.FileName == content.Body) {
content.FileName = content.Body
content.Body = ForwardedFallbackText
content.Format = FormatHTML
content.FormattedBody = ForwardedFallbackHTML
return
}
content.EnsureHasHTML()
content.Body = ForwardedFallbackText + "\n\n" + content.Body
content.FormattedBody = ForwardedFallbackHTML + content.FormattedBody
}

func (content *MessageEventContent) RemoveForwardedFallback() {
if content == nil {
return
}
if content.NewContent != nil && content.NewContent != content {
content.NewContent.RemoveForwardedFallback()
}
if content.BeeperForwarded == nil || !content.BeeperForwarded.HasFallback {
return
}
content.BeeperForwarded.HasFallback = false
if content.MsgType.IsMedia() && content.Body == ForwardedFallbackText {
content.Body = content.FileName
} else {
content.Body = strings.TrimPrefix(content.Body, ForwardedFallbackText+"\n\n")
}
if content.Format == FormatHTML {
content.FormattedBody = HTMLForwardedFallbackRegex.ReplaceAllLiteralString(content.FormattedBody, "")
if content.FormattedBody == "" {
content.Format = ""
}
}
}

type BeeperStreamInfo struct {
UserID id.UserID `json:"user_id"`
DeviceID id.DeviceID `json:"device_id,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions event/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ type MessageEventContent struct {

MessageSendRetry *BeeperRetryMetadata `json:"com.beeper.message_send_retry,omitempty"`
BeeperPerMessageProfile *BeeperPerMessageProfile `json:"com.beeper.per_message_profile,omitempty"`
BeeperForwarded *BeeperForwarded `json:"com.beeper.forwarded,omitempty"`
BeeperActionMessage *BeeperActionMessage `json:"com.beeper.action_message,omitempty"`
BeeperLinkPreviews []*BeeperLinkPreview `json:"com.beeper.linkpreviews,omitzero"`
BeeperStream *BeeperStreamInfo `json:"com.beeper.stream,omitempty"`
Expand Down
Loading