v2: add support for starting DMs and ACI found events

mautrix · Jun 19, 2024 · e37ad78 · e37ad78
1 parent 4d601ab
commit e37ad78
Show file tree

Hide file tree

Showing 3 changed files with 161 additions and 27 deletions.
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
 	golang.org/x/net v0.26.0
 	google.golang.org/protobuf v1.34.2
-	maunium.net/go/mautrix v0.19.0-beta.1.0.20240619124218-2e23f6372f66
+	maunium.net/go/mautrix v0.19.0-beta.1.0.20240619195836-2a7a5070fb32
 	nhooyr.io/websocket v1.8.11
 )
 

diff --git a/go.sum b/go.sum
@@ -93,7 +93,7 @@ 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.19.0-beta.1.0.20240619124218-2e23f6372f66 h1:O7IzqKzbgIPwosfI4nJg97JM1JKP4+KuMCploezxQpI=
-maunium.net/go/mautrix v0.19.0-beta.1.0.20240619124218-2e23f6372f66/go.mod h1:cxv1w6+syudmEpOewHYIQT9yO7TM5UOWmf6xEBVI4H4=
+maunium.net/go/mautrix v0.19.0-beta.1.0.20240619195836-2a7a5070fb32 h1:BiUVpB1hejeuCivlLOv5jKzU/Y8TTwDlQ0i1qO+JGdI=
+maunium.net/go/mautrix v0.19.0-beta.1.0.20240619195836-2a7a5070fb32/go.mod h1:cxv1w6+syudmEpOewHYIQT9yO7TM5UOWmf6xEBVI4H4=
 nhooyr.io/websocket v1.8.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0=
 nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go
@@ -19,6 +19,7 @@ package connector
 import (
 	"context"
 	_ "embed"
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -103,6 +104,7 @@ var _ bridgev2.NetworkConnector = (*SignalConnector)(nil)
 var _ bridgev2.MaxFileSizeingNetwork = (*SignalConnector)(nil)
 var _ bridgev2.NetworkAPI = (*SignalClient)(nil)
 var _ bridgev2.PushableNetworkAPI = (*SignalClient)(nil)
+var _ bridgev2.GroupCreatingNetworkAPI = (*SignalClient)(nil)
 var _ msgconv.PortalMethods = (*msgconvPortalMethods)(nil)
 
 func NewConnector() *SignalConnector {
@@ -323,13 +325,13 @@ func (s *SignalClient) GetChatInfo(ctx context.Context, portal *bridgev2.Portal)
 	if err != nil {
 		return nil, err
 	}
-	isSpace := false
 	if groupID != "" {
 		groupInfo, err := s.Client.RetrieveGroupByID(ctx, groupID, 0)
 		if err != nil {
 			return nil, err
 		}
 		isDM := false
+		isSpace := false
 		members := make([]networkid.UserID, len(groupInfo.Members))
 		for i, member := range groupInfo.Members {
 			members[i] = makeUserID(member.ACI)
@@ -348,41 +350,127 @@ func (s *SignalClient) GetChatInfo(ctx context.Context, portal *bridgev2.Portal)
 			IsDirectChat: &isDM,
 			IsSpace:      &isSpace,
 		}, nil
-	} else if userID.Type == libsignalgo.ServiceIDTypePNI {
-		contact, err := s.Client.Store.RecipientStore.LoadAndUpdateRecipient(ctx, uuid.Nil, userID.UUID, nil)
+	} else {
+		aci, pni := serviceIDToACIAndPNI(userID)
+		contact, err := s.Client.Store.RecipientStore.LoadAndUpdateRecipient(ctx, aci, pni, nil)
 		if err != nil {
 			return nil, err
 		}
-		var topic, name string
-		name = s.Main.Config.FormatDisplayname(contact)
-		if s.Main.Config.NumberInTopic && contact.E164 != "" {
-			topic = fmt.Sprintf("")
-			// TODO set topic
+		return s.makeCreateDMResponse(contact).PortalInfo, nil
+	}
+}
+
+func (s *SignalClient) ResolveIdentifier(ctx context.Context, number string, createChat bool) (*bridgev2.ResolveIdentifierResponse, error) {
+	number, err := bridgev2.CleanPhoneNumber(number)
+	if err != nil {
+		return nil, err
+	}
+	e164Number, err := strconv.ParseUint(strings.TrimPrefix(number, "+"), 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing phone number: %w", err)
+	}
+	e164String := fmt.Sprintf("+%d", e164Number)
+	var aci, pni uuid.UUID
+	var recipient *types.Recipient
+	if recipient, err = s.Client.ContactByE164(ctx, e164String); err != nil {
+		return nil, fmt.Errorf("error looking up number in local contact list: %w", err)
+	} else if recipient != nil {
+		aci = recipient.ACI
+		pni = recipient.PNI
+	} else if resp, err := s.Client.LookupPhone(ctx, e164Number); err != nil {
+		return nil, fmt.Errorf("error looking up number on server: %w", err)
+	} else {
+		aci = resp[e164Number].ACI
+		pni = resp[e164Number].PNI
+		if aci == uuid.Nil && pni == uuid.Nil {
+			return nil, errors.New("user not found on Signal")
 		}
-		isDM := true
-		return &bridgev2.PortalInfo{
-			Members:      []networkid.UserID{makeUserID(s.Client.Store.ACI)},
-			Name:         &name,
-			Topic:        &topic,
-			IsDirectChat: &isDM,
-			IsSpace:      &isSpace,
+		recipient, err = s.Client.Store.RecipientStore.UpdateRecipientE164(ctx, aci, pni, e164String)
+		if err != nil {
+			zerolog.Ctx(ctx).Err(err).Msg("Failed to save recipient entry after looking up phone")
+		}
+		aci, pni = recipient.ACI, recipient.PNI
+	}
+	zerolog.Ctx(ctx).Debug().
+		Uint64("e164", e164Number).
+		Stringer("aci", aci).
+		Stringer("pni", pni).
+		Msg("Found resolve identifier target user")
+
+	// createChat is a no-op: chats don't need to be created, and we always return chat info
+	if aci != uuid.Nil {
+		ghost, err := s.Main.Bridge.GetGhostByID(ctx, makeUserID(aci))
+		if err != nil {
+			return nil, fmt.Errorf("failed to get ghost: %w", err)
+		}
+		return &bridgev2.ResolveIdentifierResponse{
+			UserID:   makeUserID(aci),
+			UserInfo: s.contactToUserInfo(recipient),
+			Ghost:    ghost,
+			Chat:     s.makeCreateDMResponse(recipient),
+		}, nil
+	} else {
+		return &bridgev2.ResolveIdentifierResponse{
+			UserID:   makeUserIDFromServiceID(libsignalgo.NewPNIServiceID(pni)),
+			UserInfo: s.contactToUserInfo(recipient),
+			Chat:     s.makeCreateDMResponse(recipient),
 		}, nil
+	}
+}
+
+const PrivateChatTopic = "Signal private chat"
+const NoteToSelfName = "Signal Note to Self"
+
+func serviceIDToACIAndPNI(serviceID libsignalgo.ServiceID) (aci, pni uuid.UUID) {
+	if serviceID.Type == libsignalgo.ServiceIDTypeACI {
+		return serviceID.UUID, uuid.Nil
+	} else {
+		return uuid.Nil, serviceID.UUID
+	}
+}
+
+func (s *SignalClient) makeCreateDMResponse(recipient *types.Recipient) *bridgev2.CreateChatResponse {
+	isDirectChat := true
+	isSpace := false
+	name := ""
+	topic := PrivateChatTopic
+	members := []networkid.UserID{makeUserID(s.Client.Store.ACI)}
+	if s.Main.Config.NumberInTopic && recipient.E164 != "" {
+		topic = fmt.Sprintf("%s with %s", PrivateChatTopic, recipient.E164)
+	}
+	var serviceID libsignalgo.ServiceID
+	if recipient.ACI == uuid.Nil {
+		name = s.Main.Config.FormatDisplayname(recipient)
+		serviceID = libsignalgo.NewPNIServiceID(recipient.PNI)
 	} else {
-		var topic, name string
-		if s.Main.Config.NumberInTopic {
-			// TODO set topic
+		if recipient.ACI == s.Client.Store.ACI {
+			name = NoteToSelfName
+		} else {
+			// The other user is only present if their ACI is known
+			members = append(members, makeUserID(recipient.ACI))
 		}
-		isDM := true
-		return &bridgev2.PortalInfo{
-			Members:      []networkid.UserID{makeUserID(userID.UUID), makeUserID(s.Client.Store.ACI)},
+		serviceID = libsignalgo.NewACIServiceID(recipient.ACI)
+	}
+	return &bridgev2.CreateChatResponse{
+		PortalID: networkid.PortalKey{
+			ID:       networkid.PortalID(serviceID.String()),
+			Receiver: s.UserLogin.ID,
+		},
+		PortalInfo: &bridgev2.PortalInfo{
 			Name:         &name,
 			Topic:        &topic,
-			IsDirectChat: &isDM,
+			Members:      members,
+			IsDirectChat: &isDirectChat,
 			IsSpace:      &isSpace,
-		}, nil
+		},
 	}
 }
 
+func (s *SignalClient) CreateGroup(ctx context.Context, name string, users ...networkid.UserID) (*bridgev2.CreateChatResponse, error) {
+	//TODO implement me
+	return nil, fmt.Errorf("not implemented")
+}
+
 func (s *SignalClient) IsThisUser(_ context.Context, userID networkid.UserID) bool {
 	return userID == makeUserID(s.Client.Store.ACI)
 }
@@ -525,7 +613,18 @@ func (s *SignalClient) IsLoggedIn() bool {
 }
 
 func parseUserID(userID networkid.UserID) (uuid.UUID, error) {
-	return uuid.Parse(string(userID))
+	serviceID, err := parseUserIDAsServiceID(userID)
+	if err != nil {
+		return uuid.Nil, err
+	} else if serviceID.Type != libsignalgo.ServiceIDTypeACI {
+		return uuid.Nil, fmt.Errorf("invalid user ID: expected ACI type")
+	} else {
+		return serviceID.UUID, nil
+	}
+}
+
+func parseUserIDAsServiceID(userID networkid.UserID) (libsignalgo.ServiceID, error) {
+	return libsignalgo.ServiceIDFromString(string(userID))
 }
 
 func (s *SignalClient) parsePortalID(portalID networkid.PortalID) (userID libsignalgo.ServiceID, groupID types.GroupIdentifier, err error) {
@@ -559,6 +658,10 @@ func makeUserID(user uuid.UUID) networkid.UserID {
 	return networkid.UserID(user.String())
 }
 
+func makeUserIDFromServiceID(user libsignalgo.ServiceID) networkid.UserID {
+	return networkid.UserID(user.String())
+}
+
 func makeUserLoginID(user uuid.UUID) networkid.UserLoginID {
 	return networkid.UserLoginID(user.String())
 }
@@ -944,6 +1047,37 @@ func (s *SignalClient) handleSignalEvent(rawEvt events.SignalEvent) {
 	case *events.ContactList:
 		s.handleSignalContactList(evt)
 	case *events.ACIFound:
+		s.handleSignalACIFound(evt)
+	}
+}
+
+func (s *SignalClient) handleSignalACIFound(evt *events.ACIFound) {
+	log := s.UserLogin.Log.With().
+		Str("action", "handle aci found").
+		Stringer("aci", evt.ACI).
+		Stringer("pni", evt.PNI).
+		Logger()
+	ctx := log.WithContext(context.TODO())
+	pniPortalKey := networkid.PortalKey{
+		ID:       networkid.PortalID(evt.PNI.String()),
+		Receiver: s.UserLogin.ID,
+	}
+	aciPortalKey := networkid.PortalKey{
+		ID:       networkid.PortalID(evt.ACI.String()),
+		Receiver: s.UserLogin.ID,
+	}
+	result, portal, err := s.Main.Bridge.ReIDPortal(ctx, pniPortalKey, aciPortalKey)
+	if err != nil {
+		log.Err(err).Msg("Failed to re-ID portal")
+	} else if result == bridgev2.ReIDResultSourceReIDd || result == bridgev2.ReIDResultTargetDeletedAndSourceReIDd {
+		// If the source portal is re-ID'd, we need to sync metadata and participants.
+		// If the source is deleted, then it doesn't matter, any existing target will already be correct
+		info, err := s.GetChatInfo(ctx, portal)
+		if err != nil {
+			log.Err(err).Msg("Failed to get chat info to update portal after re-ID")
+		} else {
+			portal.UpdateInfo(ctx, info, s.UserLogin, nil, time.Time{})
+		}
 	}
 }