Simplify further

Author: tulir

pkg/connector/events.go

@@ -340,13 +340,10 @@ func (evt *WAUndecryptableMessage) ConvertMessage(ctx context.Context, portal *b
 	}
 	content := &undecryptableMessageContent
 	if evt.Type == events.UnavailableTypeViewOnce {
-		verb := "sent"
-		suffix := ""
-		if !evt.Info.IsFromMe {
-			verb = "received"
-			suffix = " For added privacy, you can only open it on the WhatsApp app."
+		body := "You received a view once message. For added privacy, you can only open it on the WhatsApp app."
+		if evt.Info.IsFromMe {
+			body = "You sent a view once message from another device."
 		}
-		body := fmt.Sprintf("You %s a view once message.%s", verb, suffix)
 		content = &event.MessageEventContent{
 			MsgType: event.MsgNotice,
 			Body:    body,

pkg/msgconv/wa-media.go

@@ -54,13 +54,10 @@ func (mc *MessageConverter) convertMediaMessage(
 	cachedPart *bridgev2.ConvertedMessagePart,
 ) (part *bridgev2.ConvertedMessagePart, contextInfo *waE2E.ContextInfo) {
 	if mc.DisableViewOnce && isViewOnce {
-		verb := "sent"
-		suffix := ""
-		if !messageInfo.IsFromMe {
-			verb = "received"
-			suffix = " For added privacy, you can only open it on the WhatsApp app."
+		body := "You received a view once message. For added privacy, you can only open it on the WhatsApp app."
+		if messageInfo.IsFromMe {
+			body = "You sent a view once message from another device."
 		}
-		body := fmt.Sprintf("You %s a view once %s.%s", verb, typeName, suffix)
 		return &bridgev2.ConvertedMessagePart{
 			Type: event.EventMessage,
 			Content: &event.MessageEventContent{