Skip to content

Include users' UpdateAt, DeleteAt, and Timezone #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hloeung merged 1 commit into from
Sep 15, 2026
Merged

Include users' UpdateAt, DeleteAt, and Timezone #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions matterclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,15 @@ type UsersCache struct {

type UserSummary struct {
Id string `json:"id"`
UpdateAt int64 `json:"update_at"`
DeleteAt int64 `json:"delete_at"`
Username string `json:"username"`
FirstName string `json:"first_name"`
LastName string `json:"last_name"`
Nickname string `json:"nickname"`
Roles string `json:"roles"`
Props map[string]string `json:"props"`
Timezone map[string]string `json:"timezone"`
}

type Team struct {
Expand Down
32 changes: 21 additions & 11 deletions users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,13 +787,15 @@ func (m *Client) UpdateUser(user *model.User, batchLock ...bool) *model.User {

return m.updateUserLocked(
user.Id,
user.UpdateAt,
user.DeleteAt,
user.Username,
user.FirstName,
user.LastName,
user.Nickname,
user.Roles,
user.Props,
user.DeleteAt,
user.Timezone,
)
}

Expand All @@ -812,17 +814,20 @@ func (m *Client) UpdateUserSummary(u *UserSummary, batchLock ...bool) *model.Use

return m.updateUserLocked(
u.Id,
u.UpdateAt,
u.DeleteAt,
u.Username,
u.FirstName,
u.LastName,
u.Nickname,
u.Roles,
u.Props,
-1,
u.Timezone,
)
}

func (m *Client) updateUserLocked(id, username, firstName, lastName, nickname, roles string, props map[string]string, deleteAt int64) *model.User {
//nolint:funlen
func (m *Client) updateUserLocked(id string, updateAt int64, deleteAt int64, username, firstName, lastName, nickname, roles string, props map[string]string, timezone map[string]string) *model.User {
switch roles {
case "system_user":
roles = "system_user"
Expand All @@ -832,26 +837,31 @@ func (m *Client) updateUserLocked(id, username, firstName, lastName, nickname, r

cachedUser, exists := m.Users.users[id]
if !exists {
newUserDeleteAt := int64(0)
if deleteAt > 0 {
newUserDeleteAt = deleteAt
}

cachedUser = &model.User{
Id: id,
UpdateAt: max(0, updateAt),
DeleteAt: max(0, deleteAt),
Username: username,
FirstName: firstName,
LastName: lastName,
Nickname: nickname,
Roles: roles,
Props: props,
DeleteAt: newUserDeleteAt,
Timezone: timezone,
}
m.Users.users[id] = cachedUser

return cachedUser
}

if updateAt > 0 && cachedUser.UpdateAt != updateAt {
cachedUser.UpdateAt = updateAt
}

if deleteAt >= 0 && cachedUser.DeleteAt != deleteAt {
cachedUser.DeleteAt = deleteAt
}

if cachedUser.Username != username {
cachedUser.Username = username
}
Expand All @@ -876,8 +886,8 @@ func (m *Client) updateUserLocked(id, username, firstName, lastName, nickname, r
cachedUser.Props = props
}

if deleteAt >= 0 && cachedUser.DeleteAt != deleteAt {
cachedUser.DeleteAt = deleteAt
if timezone != nil {
cachedUser.Timezone = timezone
}

return cachedUser
Expand Down