Full sync on portal creation, invite handling

ROADMAP.md

@@ -20,8 +20,8 @@
     * [x] Name
     * [x] Avatar
     * [x] Topic
-  * [ ] Membership actions
-    * [ ] Join (accepting invites)
+  * [x] Membership actions
+    * [x] Join (accepting invites)
     * [x] Invite
     * [x] Leave
     * [x] Kick/Ban/Unban

commands.go

@@ -279,7 +279,7 @@ func fnPM(ce *WrappedCommandEvent) {
 		portal.MXID = ""
 	}
 
-	if err = portal.CreateMatrixRoom(ce.Ctx, user, 0); err != nil {
+	if err = portal.CreateMatrixRoom(ce.Ctx, user, 0, nil, nil); err != nil {
 		ce.ZLog.Err(err).Msg("Failed to create portal room")
 		ce.Reply("Error creating Matrix room for portal to +%d", number)
 	} else {

pkg/signalmeow/groups.go

@@ -154,7 +154,7 @@ type RequestingMember struct {
 	Timestamp  uint64
 }
 
-type PromotePendingMembers struct {
+type PromotePendingMember struct {
 	ACI        uuid.UUID
 	ProfileKey libsignalgo.ProfileKey
 }
@@ -178,15 +178,15 @@ type BannedMember struct {
 type GroupChange struct {
 	groupMasterKey types.SerializedGroupMasterKey
 
-	SourceACI                          uuid.UUID
+	SourceServiceID                    libsignalgo.ServiceID
 	Revision                           uint32
 	AddMembers                         []*AddMember
 	DeleteMembers                      []*uuid.UUID
 	ModifyMemberRoles                  []*RoleMember
 	ModifyMemberProfileKeys            []*ProfileKeyMember
 	AddPendingMembers                  []*PendingMember
 	DeletePendingMembers               []*libsignalgo.ServiceID
-	PromotePendingMembers              []*GroupMember
+	PromotePendingMembers              []*PromotePendingMember
 	ModifyTitle                        *string
 	ModifyAvatar                       *string
 	ModifyDisappearingMessagesDuration *uint32
@@ -858,13 +858,10 @@ func (cli *Client) decryptGroupChange(ctx context.Context, encryptedGroupChange
 		log.Err(err).Msg("Couldn't decrypt source serviceID")
 		return nil, err
 	}
-	if sourceServiceID.Type != libsignalgo.ServiceIDTypeACI {
-		return nil, fmt.Errorf("wrong serviceid kind: expected aci, got pni")
-	}
 	decryptedGroupChange := &GroupChange{
-		groupMasterKey: groupMasterKey,
-		Revision:       encryptedActions.Revision,
-		SourceACI:      sourceServiceID.UUID,
+		groupMasterKey:  groupMasterKey,
+		Revision:        encryptedActions.Revision,
+		SourceServiceID: sourceServiceID,
 	}
 
 	if encryptedActions.ModifyTitle != nil {
@@ -972,7 +969,9 @@ func (cli *Client) decryptGroupChange(ctx context.Context, encryptedGroupChange
 	}
 
 	for _, deletePendingMember := range encryptedActions.DeletePendingMembers {
+		log.Debug().Msg("Decrypting pending Member")
 		if deletePendingMember == nil {
+			log.Debug().Msg("Pending Member is nil")
 			continue
 		}
 		encryptedUserID := libsignalgo.UUIDCiphertext(deletePendingMember.DeletedUserId)
@@ -992,7 +991,7 @@ func (cli *Client) decryptGroupChange(ctx context.Context, encryptedGroupChange
 		if err != nil {
 			return nil, err
 		}
-		decryptedGroupChange.PromotePendingMembers = append(decryptedGroupChange.PromotePendingMembers, &GroupMember{
+		decryptedGroupChange.PromotePendingMembers = append(decryptedGroupChange.PromotePendingMembers, &PromotePendingMember{
 			ACI:        *aci,
 			ProfileKey: *profileKey,
 		})
@@ -1886,3 +1885,28 @@ func (cli *Client) decryptGroupChanges(ctx context.Context, encryptedGroupChange
 	}
 	return groupChanges, nil
 }
+
+func (group *Group) UndoAddOrInviteChange(ctx context.Context, groupChange *GroupChange) {
+	if len(groupChange.AddMembers) > 0 || len(groupChange.AddPendingMembers) > 0 || len(groupChange.PromoteRequestingMembers) > 0 {
+		group.Revision--
+	}
+	for i, members := range group.Members {
+		for _, addMember := range groupChange.AddMembers {
+			if addMember.ACI == members.ACI {
+				group.Members = append(group.Members[:i], group.Members[i+1:]...)
+			}
+		}
+		for _, addMember := range groupChange.PromoteRequestingMembers {
+			if addMember.ACI == members.ACI {
+				group.Members = append(group.Members[:i], group.Members[i+1:]...)
+			}
+		}
+	}
+	for i, pendingMember := range group.PendingMembers {
+		for _, addPendingMember := range groupChange.AddPendingMembers {
+			if addPendingMember.ServiceID == pendingMember.ServiceID {
+				group.PendingMembers = append(group.PendingMembers[:i], group.PendingMembers[i+1:]...)
+			}
+		}
+	}
+}

pkg/signalmeow/store/container.go

@@ -39,6 +39,7 @@ FROM signalmeow_device
 `
 
 const getDeviceQuery = getAllDevicesQuery + " WHERE aci_uuid=$1"
+const deviceByPNIQuery = getAllDevicesQuery + "Where pni_uuid=$1"
 
 func (c *Container) Upgrade(ctx context.Context) error {
 	return c.db.Upgrade(ctx)
@@ -119,6 +120,14 @@ func (c *Container) DeviceByACI(ctx context.Context, aci uuid.UUID) (*Device, er
 	return sess, err
 }
 
+func (c *Container) DeviceByPNI(ctx context.Context, pni uuid.UUID) (*Device, error) {
+	sess, err := c.scanDevice(c.db.QueryRow(ctx, deviceByPNIQuery, pni))
+	if errors.Is(err, sql.ErrNoRows) {
+		return nil, nil
+	}
+	return sess, err
+}
+
 const (
 	insertDeviceQuery = `
 		INSERT INTO signalmeow_device (