fix: resolve im backend issue list regressions
This commit is contained in:
@@ -6609,6 +6609,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.FriendRequestVerification != nil {
|
||||
sets = append(sets, "friend_request_verification=?")
|
||||
args = append(args, *patch.FriendRequestVerification)
|
||||
}
|
||||
if patch.GroupInviteVerification != nil {
|
||||
sets = append(sets, "group_invite_verification=?")
|
||||
args = append(args, *patch.GroupInviteVerification)
|
||||
@@ -7180,30 +7184,32 @@ 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"`
|
||||
GroupInviteVerification bool `db:"group_invite_verification"`
|
||||
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"`
|
||||
FriendRequestVerification bool `db:"friend_request_verification"`
|
||||
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,group_invite_verification,version,created_at,updated_at FROM im_user_privacy_settings WHERE user_id=?`, decodeUID(uid)); err != nil {
|
||||
read_receipts,friend_request_verification,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,
|
||||
GroupInviteVerification: row.GroupInviteVerification,
|
||||
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,
|
||||
FriendRequestVerification: row.FriendRequestVerification,
|
||||
GroupInviteVerification: row.GroupInviteVerification,
|
||||
Version: row.Version,
|
||||
CreatedAt: row.CreatedAt,
|
||||
UpdatedAt: row.UpdatedAt,
|
||||
}
|
||||
_ = json.Unmarshal(row.AddMeMethods, &settings.AddMeMethods)
|
||||
return settings, nil
|
||||
@@ -9314,7 +9320,7 @@ func (a *adapter) TenantSystemNotificationMarkRead(id t.TenantID, uid t.Uid, eve
|
||||
}
|
||||
res, err := a.db.ExecContext(ctx,
|
||||
`UPDATE im_system_notifications
|
||||
SET read_at=COALESCE(read_at,?),updated_at=?
|
||||
SET read_at=?,updated_at=?
|
||||
WHERE user_id=? AND event_id=?`,
|
||||
readAt, readAt, decodeUID(uid), eventID)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user