jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-28 21:52:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimize UpdateUsers usage. (from @recht matterircd fork)

Browse Source
This commit is contained in:
Wim 2017-07-01 23:02:56 +02:00
parent 8064744d3a
commit f3e0358de7
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
matterclient/matterclient.go
View File

@ -527,17 +527,15 @@ func (m *MMClient) UpdateLastViewed(channelId string) {
} }
func (m *MMClient) UsernamesInChannel(channelId string) []string { func (m *MMClient) UsernamesInChannel(channelId string) []string {
res, err := m.Client.GetMyChannelMembers() res, err := m.Client.GetProfilesInChannel(channelId, 0, 50000, "")
if err != nil { if err != nil {
m.log.Errorf("UsernamesInChannel(%s) failed: %s", channelId, err) m.log.Errorf("UsernamesInChannel(%s) failed: %s", channelId, err)
return []string{} return []string{}
} }
members := res.Data.(*model.ChannelMembers) members := res.Data.(map[string]*model.User)
result := []string{} result := []string{}
for _, channel := range *members { for _, member := range members {
if channel.ChannelId == channelId { result = append(result, member.Nickname)
result = append(result, m.GetUser(channel.UserId).Username)
}
} }
return result return result
} }
@ -665,6 +663,15 @@ func (m *MMClient) GetUsers() map[string]*model.User {
func (m *MMClient) GetUser(userId string) *model.User { func (m *MMClient) GetUser(userId string) *model.User {
m.Lock() m.Lock()
defer m.Unlock() defer m.Unlock()
u, ok := m.Users[userId]
if !ok {
res, err := m.Client.GetProfilesByIds([]string{userId})
if err != nil {
return nil
}
u = res.Data.(map[string]*model.User)[userId]
m.Users[userId] = u
}
return m.Users[userId] return m.Users[userId]
} }