pro/im_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: support group invite privacy verification

Browse Source
This commit is contained in:
richjohnrambo
2026-09-12 11:20:48 +08:00
parent 80c802af20
commit ca3957e3b3
12 changed files with 197 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/db/mysql/adapter.go
+1
View File
@@ -1851,6 +1851,7 @@ func createIMUserProductTables(tx *sql.Tx) error {
profile_visibility VARCHAR(32) NOT NULL DEFAULT 'friends',
last_seen_visibility VARCHAR(32) NOT NULL DEFAULT 'friends',
read_receipts TINYINT NOT NULL DEFAULT 1,
group_invite_verification TINYINT NOT NULL DEFAULT 0,
version INT NOT NULL DEFAULT 1,
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
server/db/mysql/tenant_adapter.go
+23 -17
View File
@@ -6201,6 +6201,10 @@ func (a *adapter) TenantUserPrivacyUpdate(id t.TenantID, uid t.Uid, patch t.User
sets = append(sets, "read_receipts=?")
args = append(args, *patch.ReadReceipts)
}
if patch.GroupInviteVerification != nil {
sets = append(sets, "group_invite_verification=?")
args = append(args, *patch.GroupInviteVerification)
}
args = append(args, decodeUID(uid), patch.Version)
res, err := a.db.ExecContext(ctx, `UPDATE im_user_privacy_settings SET `+strings.Join(sets, ",")+` WHERE user_id=? AND version=?`, args...)
if err != nil {
@@ -6825,28 +6829,30 @@ func (a *adapter) userProfileByUID(ctx context.Context, uid t.Uid) (*t.UserProfi
func (a *adapter) userPrivacyByUID(ctx context.Context, uid t.Uid) (*t.UserPrivacySettings, error) {
row := struct {
UserID int64 `db:"user_id"`
AddMeMethods []byte `db:"add_me_methods"`
ProfileVisibility string `db:"profile_visibility"`
LastSeenVisibility string `db:"last_seen_visibility"`
ReadReceipts bool `db:"read_receipts"`
Version int
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
UserID int64 `db:"user_id"`
AddMeMethods []byte `db:"add_me_methods"`
ProfileVisibility string `db:"profile_visibility"`
LastSeenVisibility string `db:"last_seen_visibility"`
ReadReceipts bool `db:"read_receipts"`
GroupInviteVerification bool `db:"group_invite_verification"`
Version int
CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"`
}{}
if err := sqlx.GetContext(ctx, a.db, &row, `SELECT user_id,add_me_methods,profile_visibility,last_seen_visibility,
read_receipts,version,created_at,updated_at FROM im_user_privacy_settings WHERE user_id=?`, decodeUID(uid)); err != nil {
read_receipts,group_invite_verification,version,created_at,updated_at FROM im_user_privacy_settings WHERE user_id=?`, decodeUID(uid)); err != nil {
return nil, err
}
settings := &t.UserPrivacySettings{
UserID: store.EncodeUid(row.UserID),
AddMeMethods: map[string]bool{"account": true, "phone": true, "qr": true, "group": true},
ProfileVisibility: row.ProfileVisibility,
LastSeenVisibility: row.LastSeenVisibility,
ReadReceipts: row.ReadReceipts,
Version: row.Version,
CreatedAt: row.CreatedAt,
UpdatedAt: row.UpdatedAt,
UserID: store.EncodeUid(row.UserID),
AddMeMethods: map[string]bool{"account": true, "phone": true, "qr": true, "group": true},
ProfileVisibility: row.ProfileVisibility,
LastSeenVisibility: row.LastSeenVisibility,
ReadReceipts: row.ReadReceipts,
GroupInviteVerification: row.GroupInviteVerification,
Version: row.Version,
CreatedAt: row.CreatedAt,
UpdatedAt: row.UpdatedAt,
}
_ = json.Unmarshal(row.AddMeMethods, &settings.AddMeMethods)
return settings, nil
server/db/mysql/tenant_groups.go
+6
View File
@@ -499,6 +499,12 @@ func (a *adapter) TenantGroupInvitationAccept(id t.TenantID, invitationID string
if inv.Status == t.GroupInvitationStatusJoined || inv.Result == "joined" {
return &inv, nil
}
if strings.TrimSpace(inv.JoinRequestID) != "" {
if err = tx.Commit(); err != nil {
return nil, err
}
return &inv, nil
}
var deletedAt sql.NullTime
err = tx.QueryRowxContext(ctx, "SELECT deletedat FROM im_subscriptions WHERE topic=? AND userid=?",
inv.Topic, decodeUID(uid)).Scan(&deletedAt)
server/im_http.go
+53 -23
View File
@@ -3177,21 +3177,23 @@ func serveIMMePrivacy(wrt http.ResponseWriter, req *http.Request) {
writeIMSuccess(wrt, req, userPrivacyPayload(settings))
case http.MethodPatch:
var body struct {
AddMeMethods map[string]bool `json:"add_me_methods"`
ProfileVisibility *string `json:"profile_visibility"`
LastSeenVisibility *string `json:"last_seen_visibility"`
ReadReceipts *bool `json:"read_receipts"`
Version int `json:"version"`
AddMeMethods map[string]bool `json:"add_me_methods"`
ProfileVisibility *string `json:"profile_visibility"`
LastSeenVisibility *string `json:"last_seen_visibility"`
ReadReceipts *bool `json:"read_receipts"`
GroupInviteVerification *bool `json:"group_invite_verification"`
Version int `json:"version"`
}
if !decodeIMJSONBody(wrt, req, &body) {
return
}
settings, err := store.Profiles.UpdatePrivacy(principal.TenantID, principal.Uid, types.UserPrivacyPatch{
AddMeMethods: body.AddMeMethods,
ProfileVisibility: body.ProfileVisibility,
LastSeenVisibility: body.LastSeenVisibility,
ReadReceipts: body.ReadReceipts,
Version: body.Version,
AddMeMethods: body.AddMeMethods,
ProfileVisibility: body.ProfileVisibility,
LastSeenVisibility: body.LastSeenVisibility,
ReadReceipts: body.ReadReceipts,
GroupInviteVerification: body.GroupInviteVerification,
Version: body.Version,
})
if err != nil {
writeIMRelationError(wrt, req, err)
@@ -5351,8 +5353,24 @@ func serveIMGroupInvitations(wrt http.ResponseWriter, req *http.Request, topic s
} else {
idempotencyKey = invitationID
}
targetRequiresApproval := settings != nil && settings.JoinApproval
if !targetRequiresApproval && store.Profiles != nil {
privacy, privacyErr := store.Profiles.GetPrivacy(principal.TenantID, uid)
if privacyErr != nil {
if errors.Is(privacyErr, types.ErrNotFound) || errors.Is(privacyErr, types.ErrUnsupported) {
privacyErr = nil
}
}
if privacyErr != nil {
item["status"] = "failed"
item["reason"] = relationErrorReason(privacyErr)
results = append(results, item)
continue
}
targetRequiresApproval = privacy != nil && privacy.GroupInviteVerification
}
joinRequestID := ""
if settings != nil && settings.JoinApproval {
if targetRequiresApproval {
joinRequestID = "gjr_" + store.Store.GetUidString()
}
inv, err := store.GroupBusiness.CreateInvitation(principal.TenantID, &types.GroupInvitation{
@@ -5376,7 +5394,7 @@ func serveIMGroupInvitations(wrt http.ResponseWriter, req *http.Request, topic s
continue
}
item["invitation_id"] = inv.InvitationID
item["status"] = inv.Status
item["status"] = groupInvitationDisplayStatus(inv)
item["expires_at"] = inv.ExpiresAt.Format(time.RFC3339Nano)
if inv.JoinRequestID != "" {
item["join_request_id"] = inv.JoinRequestID
@@ -7112,7 +7130,7 @@ func groupInvitationPayload(inv *types.GroupInvitation) map[string]any {
"topic": inv.Topic,
"inviter_id": inv.InviterUserID.UserId(),
"target_user_id": inv.TargetUserID.UserId(),
"status": inv.Status,
"status": groupInvitationDisplayStatus(inv),
"result": inv.Result,
"expires_at": inv.ExpiresAt.Format(time.RFC3339Nano),
}
@@ -7125,6 +7143,16 @@ func groupInvitationPayload(inv *types.GroupInvitation) map[string]any {
return data
}
func groupInvitationDisplayStatus(inv *types.GroupInvitation) string {
if inv == nil {
return ""
}
if inv.Status == types.GroupInvitationStatusPending && strings.TrimSpace(inv.JoinRequestID) != "" {
return types.GroupInvitationStatusPendingApproval
}
return inv.Status
}
func groupFilePayloads(files []types.GroupFile) []map[string]any {
items := make([]map[string]any, 0, len(files))
for i := range files {
@@ -9210,17 +9238,19 @@ func validIMSecurityChallengeScene(scene string) bool {
func userPrivacyPayload(settings *types.UserPrivacySettings) map[string]any {
return map[string]any{
"add_me_methods": settings.AddMeMethods,
"profile_visibility": settings.ProfileVisibility,
"last_seen_visibility": settings.LastSeenVisibility,
"read_receipts": settings.ReadReceipts,
"version": settings.Version,
"updated_at": settings.UpdatedAt.UTC().Format(time.RFC3339Nano),
"add_me_methods": settings.AddMeMethods,
"profile_visibility": settings.ProfileVisibility,
"last_seen_visibility": settings.LastSeenVisibility,
"read_receipts": settings.ReadReceipts,
"group_invite_verification": settings.GroupInviteVerification,
"version": settings.Version,
"updated_at": settings.UpdatedAt.UTC().Format(time.RFC3339Nano),
"editable": map[string]any{
"add_me_methods": true,
"profile_visibility": true,
"last_seen_visibility": true,
"read_receipts": true,
"add_me_methods": true,
"profile_visibility": true,
"last_seen_visibility": true,
"read_receipts": true,
"group_invite_verification": true,
},
}
}
server/im_http_test.go
+72 -4
View File
@@ -451,6 +451,9 @@ func (s *testGroupBusinessStore) AcceptInvitation(_ types.TenantID, invitationID
for i := range s.invitations {
if s.invitations[i].InvitationID == invitationID {
s.invitations[i].TargetUserID = uid
if s.invitations[i].JoinRequestID != "" {
return &s.invitations[i], nil
}
s.invitations[i].Status = types.GroupInvitationStatusJoined
s.invitations[i].Result = "joined"
s.invitations[i].HandledAt = &now
@@ -1063,7 +1066,7 @@ func (s *testProfilesStore) GetPrivacy(_ types.TenantID, uid types.Uid) (*types.
now := time.Now().UTC().Round(time.Millisecond)
s.privacy = &types.UserPrivacySettings{
UserID: uid, AddMeMethods: map[string]bool{"account": true, "phone": true, "qr": true, "group": true},
ProfileVisibility: "friends", LastSeenVisibility: "friends", ReadReceipts: true, Version: 1, CreatedAt: now, UpdatedAt: now,
ProfileVisibility: "friends", LastSeenVisibility: "friends", ReadReceipts: true, GroupInviteVerification: false, Version: 1, CreatedAt: now, UpdatedAt: now,
}
}
return s.privacy, nil
@@ -1083,6 +1086,9 @@ func (s *testProfilesStore) UpdatePrivacy(_ types.TenantID, uid types.Uid, patch
if patch.ReadReceipts != nil {
privacy.ReadReceipts = *patch.ReadReceipts
}
if patch.GroupInviteVerification != nil {
privacy.GroupInviteVerification = *patch.GroupInviteVerification
}
privacy.Version = patch.Version + 1
privacy.UpdatedAt = time.Now().UTC().Round(time.Millisecond)
return privacy, nil
@@ -3716,7 +3722,7 @@ func TestServeIMMePrivacy(t *testing.T) {
store.Profiles = profiles
defer func() { store.Profiles = oldProfiles }()
req := httptest.NewRequest(http.MethodPatch, "/v1/im/me/privacy", strings.NewReader(`{"add_me_methods":{"account":true,"phone":false,"qr":true,"group":true},"read_receipts":false,"version":1}`))
req := httptest.NewRequest(http.MethodPatch, "/v1/im/me/privacy", strings.NewReader(`{"add_me_methods":{"account":true,"phone":false,"qr":true,"group":true},"read_receipts":false,"group_invite_verification":true,"version":1}`))
req.Header.Set("Authorization", "Bearer token-1")
rec := httptest.NewRecorder()
serveIMMePrivacy(rec, req)
@@ -3726,7 +3732,9 @@ func TestServeIMMePrivacy(t *testing.T) {
}
data := decodeIMHTTPResponse(t, rec).Data.(map[string]any)
methods := data["add_me_methods"].(map[string]any)
if methods["phone"] != false || data["read_receipts"] != false || data["version"].(float64) != 2 {
editable := data["editable"].(map[string]any)
if methods["phone"] != false || data["read_receipts"] != false || data["group_invite_verification"] != true ||
editable["group_invite_verification"] != true || data["version"].(float64) != 2 {
t.Fatalf("unexpected privacy: %#v", data)
}
}
@@ -4802,7 +4810,7 @@ func TestServeIMGroupInvitationCreatesApprovalRequest(t *testing.T) {
data := decodeIMHTTPResponse(t, rec).Data.(map[string]any)
items := data["items"].([]any)
item := items[0].(map[string]any)
if item["invitation_id"] != "ginv_invite" || item["join_request_id"] != "gjr_request" || item["status"] != types.GroupInvitationStatusPending {
if item["invitation_id"] != "ginv_invite" || item["join_request_id"] != "gjr_request" || item["status"] != types.GroupInvitationStatusPendingApproval {
t.Fatalf("unexpected invitation response: %#v", data)
}
if len(groupStore.joinRequests) != 1 || groupStore.joinRequests[0].RequestID != "gjr_request" ||
@@ -4850,6 +4858,66 @@ func TestServeIMGroupInvitationCreatesApprovalRequest(t *testing.T) {
}
}
func TestServeIMGroupInvitationRespectsTargetPrivacyApproval(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
mockStore := expectIMBearer(t, ctrl, "token-1", 7, 42)
mockStore.EXPECT().GetUidString().Return("invite")
mockStore.EXPECT().GetUidString().Return("request")
oldSubs := store.Subs
oldGroupBusiness := store.GroupBusiness
oldProfiles := store.Profiles
subs := mock_store.NewMockSubsPersistenceInterface(ctrl)
groupStore := &testGroupBusinessStore{settings: &types.GroupSettings{
Topic: "grpAlpha", OwnerUserID: types.Uid(42), Name: "Alpha", GroupStatus: types.GroupStatusActive,
JoinApproval: false, MemberInvite: true, MaxAdminCount: groupMaxAdminCount, Version: 1,
}}
store.Subs = subs
store.GroupBusiness = groupStore
store.Profiles = &testProfilesStore{privacy: &types.UserPrivacySettings{
UserID: types.Uid(43),
AddMeMethods: map[string]bool{"account": true, "phone": true, "qr": true, "group": true},
ProfileVisibility: "friends",
LastSeenVisibility: "friends",
ReadReceipts: true,
GroupInviteVerification: true,
Version: 1,
CreatedAt: time.Now().UTC(),
UpdatedAt: time.Now().UTC(),
}}
defer func() {
store.Subs = oldSubs
store.GroupBusiness = oldGroupBusiness
store.Profiles = oldProfiles
}()
owner := types.Uid(42)
target := types.Uid(43)
subs.EXPECT().Get(types.TenantID(7), "grpAlpha", owner, false).Return(&types.Subscription{
TenantID: 7, User: owner.String(), Topic: "grpAlpha", ModeWant: types.ModeCFull, ModeGiven: types.ModeCFull,
}, nil)
subs.EXPECT().Get(types.TenantID(7), "grpAlpha", target, false).Return(nil, types.ErrNotFound)
req := httptest.NewRequest(http.MethodPost, "/v1/im/groups/grpAlpha/invitations",
bytes.NewBufferString(`{"user_ids":["`+target.UserId()+`"],"message":"welcome"}`))
req.Header.Set("Authorization", "Bearer token-1")
req.Header.Set("Idempotency-Key", "invite-privacy")
rec := httptest.NewRecorder()
serveIMGroupResource(rec, req)
if rec.Code != http.StatusOK {
t.Fatalf("status: got %d body=%s", rec.Code, rec.Body.String())
}
data := decodeIMHTTPResponse(t, rec).Data.(map[string]any)
items := data["items"].([]any)
item := items[0].(map[string]any)
if item["invitation_id"] != "ginv_invite" || item["join_request_id"] != "gjr_request" || item["status"] != types.GroupInvitationStatusPendingApproval {
t.Fatalf("unexpected invitation response: %#v", data)
}
if len(groupStore.joinRequests) != 1 || groupStore.joinRequests[0].ApplicantUserID != target || groupStore.joinRequests[0].Source != "invitation" {
t.Fatalf("join request was not created from privacy setting: %#v", groupStore.joinRequests)
}
}
func TestServeIMGroupInvitationAccept(t *testing.T) {
ctrl := gomock.NewController(t)
defer ctrl.Finish()
server/store/store.go
+1 -1
View File
@@ -3020,7 +3020,7 @@ func (profileMapper) UpdatePrivacy(tenantID types.TenantID, uid types.Uid, patch
}
func validUserPrivacyPatch(patch types.UserPrivacyPatch) bool {
if patch.AddMeMethods == nil && patch.ProfileVisibility == nil && patch.LastSeenVisibility == nil && patch.ReadReceipts == nil {
if patch.AddMeMethods == nil && patch.ProfileVisibility == nil && patch.LastSeenVisibility == nil && patch.ReadReceipts == nil && patch.GroupInviteVerification == nil {
return false
}
for method := range patch.AddMeMethods {
server/store/types/groups.go
+3 -2
View File
@@ -12,8 +12,9 @@ const (
GroupMemberStatusActive = "active"
GroupMemberStatusLeft = "left"
GroupInvitationStatusPending = "pending"
GroupInvitationStatusJoined = "joined"
GroupInvitationStatusPending = "pending"
GroupInvitationStatusPendingApproval = "pending_approval"
GroupInvitationStatusJoined = "joined"
GroupJoinRequestStatusPending = "pending"
GroupJoinRequestStatusAccepted = "accepted"
server/store/types/profile.go
+15 -13
View File
@@ -29,22 +29,24 @@ type UserProfilePatch struct {
}
type UserPrivacySettings struct {
UserID Uid
AddMeMethods map[string]bool
ProfileVisibility string
LastSeenVisibility string
ReadReceipts bool
Version int
CreatedAt time.Time
UpdatedAt time.Time
UserID Uid
AddMeMethods map[string]bool
ProfileVisibility string
LastSeenVisibility string
ReadReceipts bool
GroupInviteVerification bool
Version int
CreatedAt time.Time
UpdatedAt time.Time
}
type UserPrivacyPatch struct {
AddMeMethods map[string]bool
ProfileVisibility *string
LastSeenVisibility *string
ReadReceipts *bool
Version int
AddMeMethods map[string]bool
ProfileVisibility *string
LastSeenVisibility *string
ReadReceipts *bool
GroupInviteVerification *bool
Version int
}
type AppRelease struct {