startchat,msgconv: return group create errors and allow sending invites in DMs

Author: tulir

go.mod

@@ -15,7 +15,7 @@ require (
 	golang.org/x/sync v0.17.0
 	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
-	maunium.net/go/mautrix v0.25.2
+	maunium.net/go/mautrix v0.25.3-0.20251021144018-1aacf6e987b1
 )
 
 require (

go.sum

@@ -113,5 +113,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
-maunium.net/go/mautrix v0.25.2 h1:CUG23zp754yGOTMh9Q4mVSENS9FyweE/G+6ZsPDMCUU=
-maunium.net/go/mautrix v0.25.2/go.mod h1:EWgYyp2iFZP7pnSm+rufHlO8YVnA2KnoNBDpwekiAwI=
+maunium.net/go/mautrix v0.25.3-0.20251021144018-1aacf6e987b1 h1:jE/W7DZnnD3wWVinyiUkuN8lMBM8AcUiJX5V2fClj3Y=
+maunium.net/go/mautrix v0.25.3-0.20251021144018-1aacf6e987b1/go.mod h1:EWgYyp2iFZP7pnSm+rufHlO8YVnA2KnoNBDpwekiAwI=

pkg/connector/startchat.go

@@ -35,6 +35,7 @@ import (
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 
+	"go.mau.fi/mautrix-whatsapp/pkg/msgconv"
 	"go.mau.fi/mautrix-whatsapp/pkg/waid"
 )
 
@@ -249,6 +250,38 @@ func (wa *WhatsAppClient) CreateGroup(ctx context.Context, params *bridgev2.Grou
 	if err != nil {
 		return nil, fmt.Errorf("failed to create group: %w", err)
 	}
+	failedParticipants := make(map[networkid.UserID]bridgev2.CreateChatFailedParticipant)
+	filteredParticipants := resp.Participants[:0]
+	for _, pcp := range resp.Participants {
+		if pcp.Error != 0 {
+			var inviteContent *event.Content
+			if pcp.AddRequest != nil {
+				inviteContent = &event.Content{
+					Raw: map[string]any{
+						msgconv.GroupInviteMetaField: &waid.GroupInviteMeta{
+							JID:           resp.JID,
+							Code:          pcp.AddRequest.Code,
+							Expiration:    pcp.AddRequest.Expiration.Unix(),
+							Inviter:       wa.JID.ToNonAD(),
+							GroupName:     resp.Name,
+							IsParentGroup: resp.IsParent,
+						},
+					},
+					Parsed: &event.MessageEventContent{
+						Body:    "Invitation to join my WhatsApp group",
+						MsgType: event.MsgText,
+					},
+				}
+			}
+			failedParticipants[waid.MakeUserID(pcp.JID)] = bridgev2.CreateChatFailedParticipant{
+				Reason:        fmt.Sprintf("error %d", pcp.Error),
+				InviteContent: inviteContent,
+			}
+		} else {
+			filteredParticipants = append(filteredParticipants, pcp)
+		}
+	}
+	resp.Participants = filteredParticipants
 	portal, err := wa.Main.Bridge.GetPortalByKey(ctx, wa.makeWAPortalKey(resp.JID))
 	if err != nil {
 		return nil, fmt.Errorf("failed to get portal: %w", err)
@@ -322,5 +355,7 @@ func (wa *WhatsAppClient) CreateGroup(ctx context.Context, params *bridgev2.Grou
 		PortalKey:  wa.makeWAPortalKey(resp.JID),
 		Portal:     portal,
 		PortalInfo: groupInfo,
+
+		FailedParticipants: failedParticipants,
 	}, nil
 }

pkg/msgconv/from-matrix.go

@@ -19,6 +19,7 @@ package msgconv
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"image"
@@ -99,7 +100,11 @@ func (mc *MessageConverter) ToWhatsApp(
 
 	switch content.MsgType {
 	case event.MsgText, event.MsgNotice, event.MsgEmote:
-		message = mc.constructTextMessage(ctx, content, contextInfo)
+		var err error
+		message, err = mc.constructTextMessage(ctx, content, evt.Content.Raw, contextInfo)
+		if err != nil {
+			return nil, nil, err
+		}
 	case event.MessageType(event.EventSticker.Type), event.MsgImage, event.MsgVideo, event.MsgAudio, event.MsgFile:
 		uploaded, thumbnail, mime, err := mc.reuploadFileToWhatsApp(ctx, content)
 		if err != nil {
@@ -304,7 +309,16 @@ func (mc *MessageConverter) parseText(ctx context.Context, content *event.Messag
 	return
 }
 
-func (mc *MessageConverter) constructTextMessage(ctx context.Context, content *event.MessageEventContent, contextInfo *waE2E.ContextInfo) *waE2E.Message {
+func (mc *MessageConverter) constructTextMessage(
+	ctx context.Context,
+	content *event.MessageEventContent,
+	raw map[string]any,
+	contextInfo *waE2E.ContextInfo,
+) (*waE2E.Message, error) {
+	groupInvite, ok := raw[GroupInviteMetaField].(map[string]any)
+	if ok {
+		return mc.constructGroupInviteMessage(ctx, content, groupInvite, contextInfo)
+	}
 	text, mentions := mc.parseText(ctx, content)
 	if len(mentions) > 0 {
 		contextInfo.MentionedJID = mentions
@@ -315,7 +329,44 @@ func (mc *MessageConverter) constructTextMessage(ctx context.Context, content *e
 	}
 	mc.convertURLPreviewToWhatsApp(ctx, content, etm)
 
-	return &waE2E.Message{ExtendedTextMessage: etm}
+	return &waE2E.Message{ExtendedTextMessage: etm}, nil
+}
+
+func (mc *MessageConverter) constructGroupInviteMessage(
+	ctx context.Context,
+	content *event.MessageEventContent,
+	inviteMeta map[string]any,
+	contextInfo *waE2E.ContextInfo,
+) (*waE2E.Message, error) {
+	payload, err := json.Marshal(inviteMeta)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal invite meta: %w", err)
+	}
+	var parsedInviteMeta waid.GroupInviteMeta
+	err = json.Unmarshal(payload, &parsedInviteMeta)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse invite meta: %w", err)
+	}
+	text, mentions := mc.parseText(ctx, content)
+	if len(mentions) > 0 {
+		contextInfo.MentionedJID = mentions
+	}
+	groupType := waE2E.GroupInviteMessage_DEFAULT
+	if parsedInviteMeta.IsParentGroup {
+		groupType = waE2E.GroupInviteMessage_PARENT
+	}
+	return &waE2E.Message{
+		GroupInviteMessage: &waE2E.GroupInviteMessage{
+			GroupJID:         proto.String(parsedInviteMeta.JID.String()),
+			InviteCode:       proto.String(parsedInviteMeta.Code),
+			InviteExpiration: proto.Int64(parsedInviteMeta.Expiration),
+			GroupName:        proto.String(parsedInviteMeta.GroupName),
+			JPEGThumbnail:    nil,
+			Caption:          proto.String(text),
+			ContextInfo:      contextInfo,
+			GroupType:        groupType.Enum(),
+		},
+	}, nil
 }
 
 func (mc *MessageConverter) convertPill(displayname, mxid, eventID string, ctx format.Context) string {

pkg/msgconv/wa-misc.go

@@ -88,10 +88,12 @@ func (mc *MessageConverter) convertGroupInviteMessage(ctx context.Context, info
 		template = inviteMsgBroken
 	} else {
 		inviteMeta = &waid.GroupInviteMeta{
-			JID:        groupJID,
-			Code:       msg.GetInviteCode(),
-			Expiration: msg.GetInviteExpiration(),
-			Inviter:    info.Sender.ToNonAD(),
+			JID:           groupJID,
+			Code:          msg.GetInviteCode(),
+			Expiration:    msg.GetInviteExpiration(),
+			Inviter:       info.Sender.ToNonAD(),
+			GroupName:     msg.GetGroupName(),
+			IsParentGroup: msg.GetGroupType() == waE2E.GroupInviteMessage_PARENT,
 		}
 		extraAttrs = map[string]any{
 			GroupInviteMetaField: inviteMeta,

pkg/waid/dbmeta.go

@@ -68,6 +68,9 @@ type GroupInviteMeta struct {
 	Code       string    `json:"code"`
 	Expiration int64     `json:"expiration,string"`
 	Inviter    types.JID `json:"inviter"`
+
+	GroupName     string `json:"group_name,omitempty"`
+	IsParentGroup bool   `json:"is_parent_group,omitempty"`
 }
 
 type MessageMetadata struct {