v1/portal: log more errors for addmember (#475)

[skip ci]
mautrix · Jun 28, 2024 · 97d87b5 · 97d87b5
1 parent 21282c3
commit 97d87b5
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/portal.go b/portal.go
@@ -1018,12 +1018,15 @@ func (portal *Portal) applySignalGroupChange(ctx context.Context, source *User,
 				}
 			}
 		} else {
-			puppet, _ = portal.sendMembershipForPuppetAndUser(ctx, sender, addMember.ACI, event.MembershipInvite, "added")
+			puppet, err = portal.sendMembershipForPuppetAndUser(ctx, sender, addMember.ACI, event.MembershipInvite, "added")
 		}
-		if puppet != nil {
-			puppet.IntentFor(portal).SendCustomMembershipEvent(ctx, portal.MXID, puppet.IntentFor(portal).UserID, event.MembershipJoin, "")
-		} else {
-			log.Warn().Stringer("signal_user_id", addMember.ACI).Msg("Couldn't get puppet for invite")
+		if err != nil {
+			log.Err(err).Stringer("signal_user_id", addMember.ACI).Msg("Couldn't get puppet for invite")
+			return
+		}
+		_, err = puppet.IntentFor(portal).SendCustomMembershipEvent(ctx, portal.MXID, puppet.IntentFor(portal).UserID, event.MembershipJoin, "")
+		if err != nil {
+			log.Err(err).Stringer("mxid", puppet.MXID).Msg("Failed to join user")
 		}
 	}
 	bannedMembers := make(map[uuid.UUID]bool)