fixed the issue caused by the commit last time
This commit is contained in:
parent
4d176a532f
commit
ac88478189
11
matrix.go
11
matrix.go
|
@ -257,7 +257,7 @@ func (mx *MatrixHandler) HandleMembership(evt *event.Event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
user := mx.bridge.GetUserByMXID(evt.Sender)
|
user := mx.bridge.GetUserByMXID(evt.Sender)
|
||||||
if user == nil || !user.Whitelisted || !user.IsConnected() {
|
if user == nil || user.Conn == nil || !user.Whitelisted || !user.IsConnected() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -307,7 +307,7 @@ func (mx *MatrixHandler) HandleRoomMetadata(evt *event.Event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
portal := mx.bridge.GetPortalByMXID(evt.RoomID)
|
portal := mx.bridge.GetPortalByMXID(evt.RoomID)
|
||||||
if portal == nil || portal.IsPrivateChat() {
|
if user.Conn == nil || portal == nil || portal.IsPrivateChat() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -374,9 +374,6 @@ func (mx *MatrixHandler) shouldIgnoreEvent(evt *event.Event) bool {
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
fmt.Printf("shouldIgnoreEvent: user%+v", *user)
|
fmt.Printf("shouldIgnoreEvent: user%+v", *user)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
if user.Conn == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if !user.RelaybotWhitelisted {
|
if !user.RelaybotWhitelisted {
|
||||||
fmt.Println("user.RelaybotWhitelisted true", user.RelaybotWhitelisted)
|
fmt.Println("user.RelaybotWhitelisted true", user.RelaybotWhitelisted)
|
||||||
return true
|
return true
|
||||||
|
@ -424,7 +421,7 @@ func (mx *MatrixHandler) HandleMessage(evt *event.Event) {
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
fmt.Printf("HandleMessage portal: %+v", portal)
|
fmt.Printf("HandleMessage portal: %+v", portal)
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
if portal != nil && (user.Whitelisted || portal.HasRelaybot()) {
|
if user.Conn != nil && portal != nil && (user.Whitelisted || portal.HasRelaybot()) {
|
||||||
portal.HandleMatrixMessage(user, evt)
|
portal.HandleMatrixMessage(user, evt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -452,7 +449,7 @@ func (mx *MatrixHandler) HandleRedaction(evt *event.Event) {
|
||||||
}
|
}
|
||||||
|
|
||||||
portal := mx.bridge.GetPortalByMXID(evt.RoomID)
|
portal := mx.bridge.GetPortalByMXID(evt.RoomID)
|
||||||
if portal != nil {
|
if user.Conn != nil && portal != nil {
|
||||||
portal.HandleMatrixRedaction(user, evt)
|
portal.HandleMatrixRedaction(user, evt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue