From 22681875f32fa97f65c9a52e2ee666932706ce95 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 5 May 2020 18:39:28 +0300
Subject: Update mautrix-go and give crypto module access to state store

---
 matrix/rooms/roomcache.go | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'matrix/rooms/roomcache.go')

diff --git a/matrix/rooms/roomcache.go b/matrix/rooms/roomcache.go
index ffdcad1..d66078c 100644
--- a/matrix/rooms/roomcache.go
+++ b/matrix/rooms/roomcache.go
@@ -27,6 +27,7 @@ import (
 	sync "github.com/sasha-s/go-deadlock"
 
 	"maunium.net/go/gomuks/debug"
+	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
 )
 
@@ -67,6 +68,26 @@ func (cache *RoomCache) EnableUnloading() {
 	cache.noUnload = false
 }
 
+func (cache *RoomCache) IsEncrypted(roomID id.RoomID) bool {
+	room := cache.Get(roomID)
+	return room != nil && room.Encrypted
+}
+
+func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) {
+	cache.Lock()
+	for _, room := range cache.Map {
+		if !room.Encrypted {
+			continue
+		}
+		member, ok := room.GetMembers()[userID]
+		if ok && member.Membership == event.MembershipJoin {
+			shared = append(shared, room.ID)
+		}
+	}
+	cache.Unlock()
+	return
+}
+
 func (cache *RoomCache) LoadList() error {
 	cache.Lock()
 	defer cache.Unlock()
-- 
cgit v1.2.3


From 4052ec532b7f963ef738f8c5fb0b32759571e8f5 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 6 May 2020 18:43:35 +0300
Subject: Fix potential double locking when finding shared rooms

---
 matrix/rooms/roomcache.go | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'matrix/rooms/roomcache.go')

diff --git a/matrix/rooms/roomcache.go b/matrix/rooms/roomcache.go
index d66078c..067cbb6 100644
--- a/matrix/rooms/roomcache.go
+++ b/matrix/rooms/roomcache.go
@@ -74,6 +74,8 @@ func (cache *RoomCache) IsEncrypted(roomID id.RoomID) bool {
 }
 
 func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) {
+	// FIXME this disables unloading so TouchNode wouldn't try to double-lock
+	cache.DisableUnloading()
 	cache.Lock()
 	for _, room := range cache.Map {
 		if !room.Encrypted {
@@ -85,6 +87,7 @@ func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) {
 		}
 	}
 	cache.Unlock()
+	cache.EnableUnloading()
 	return
 }
 
-- 
cgit v1.2.3