mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-23 14:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Nothing to see here, move along

Browse source
This commit is contained in:
Kegan Dougal 2020-09-04 10:40:30 +01:00
parent b982372377
commit 87cd243036
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roomserver/acls/acls.go
View file

@ -24,7 +24,6 @@ import (
"sync" "sync"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -88,7 +87,6 @@ func compileACLRegex(orig string) (*regexp.Regexp, error) {
} }
func (s *ServerACLs) OnServerACLUpdate(state *gomatrixserverlib.Event) { func (s *ServerACLs) OnServerACLUpdate(state *gomatrixserverlib.Event) {
util.GetLogger(context.TODO()).Infof("banana OnServerACLUpdate :D %s", string(state.Content()))
acls := &serverACL{} acls := &serverACL{}
if err := json.Unmarshal(state.Content(), &acls.ServerACL); err != nil { if err := json.Unmarshal(state.Content(), &acls.ServerACL); err != nil {
logrus.WithError(err).Errorf("Failed to unmarshal state content for server ACLs") logrus.WithError(err).Errorf("Failed to unmarshal state content for server ACLs")
@ -123,7 +121,6 @@ func (s *ServerACLs) OnServerACLUpdate(state *gomatrixserverlib.Event) {
} }
func (s *ServerACLs) IsServerBannedFromRoom(serverName gomatrixserverlib.ServerName, roomID string) bool { func (s *ServerACLs) IsServerBannedFromRoom(serverName gomatrixserverlib.ServerName, roomID string) bool {
util.GetLogger(context.TODO()).Infof("banana IsServerBannedFromRoom %s %s", serverName, roomID)
s.aclsMutex.RLock() s.aclsMutex.RLock()
// First of all check if we have an ACL for this room. If we don't then // First of all check if we have an ACL for this room. If we don't then
// no servers are banned from the room. // no servers are banned from the room.