mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-03 20:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
Neil Alexander 2022-04-13 11:12:16 +01:00
parent 4463e42129
commit 03df3210f7
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
syncapi/notifier/notifier.go
View file

@ -262,10 +262,7 @@ func (n *Notifier) SharedUsers(userID string) []string {
func (n *Notifier) _sharedUsers(userID string) []string { func (n *Notifier) _sharedUsers(userID string) []string {
n._sharedUserMap[userID] = struct{}{} n._sharedUserMap[userID] = struct{}{}
for roomID, users := range n.roomIDToJoinedUsers { for roomID, users := range n.roomIDToJoinedUsers {
users.Lock() if ok := users.isIn(userID); !ok {
_, ok := users.set[userID]
users.Unlock()
if !ok {
continue continue
} }
for _, userID := range n._joinedUsers(roomID) { for _, userID := range n._joinedUsers(roomID) {
@ -285,10 +282,8 @@ func (n *Notifier) IsSharedUser(userA, userB string) bool {
defer n.lock.RUnlock() defer n.lock.RUnlock()
var okA, okB bool var okA, okB bool
for _, users := range n.roomIDToJoinedUsers { for _, users := range n.roomIDToJoinedUsers {
users.Lock() okA = users.isIn(userA)
_, okA = users.set[userA] okB = users.isIn(userB)
_, okB = users.set[userB]
users.Unlock()
if okA && okB { if okA && okB {
return true return true
} }
@ -562,9 +557,16 @@ func (s *userIDSet) precompute() {
s.precomputed = s.values() s.precomputed = s.values()
} }
func (s *userIDSet) isIn(str string) bool {
s.Lock()
defer s.Unlock()
_, ok := s.set[str]
return ok
}
func (s *userIDSet) values() (vals []string) { func (s *userIDSet) values() (vals []string) {
if len(s.precomputed) > 0 { if len(s.precomputed) > 0 {
return s.precomputed return s.precomputed // only return if not invalidated
} }
vals = make([]string, 0, len(s.set)) vals = make([]string, 0, len(s.set))
for str := range s.set { for str := range s.set {