Use type aliases for different ID types and add puppet type

This commit is contained in:
Tulir Asokan
2018-08-17 00:11:28 +03:00
parent 141eba644b
commit edd4f817e4
13 changed files with 325 additions and 189 deletions

View File

@ -17,96 +17,60 @@
package main
import (
log "maunium.net/go/maulogger"
"maunium.net/go/mautrix-appservice"
"maunium.net/go/gomatrix"
)
type MatrixListener struct {
bridge *Bridge
as *appservice.AppService
log log.Logger
stop chan struct{}
}
func NewMatrixListener(bridge *Bridge) *MatrixListener {
return &MatrixListener{
bridge: bridge,
as: bridge.AppService,
stop: make(chan struct{}, 1),
log: bridge.Log.Sub("Matrix Listener"),
}
}
func (ml *MatrixListener) Start() {
for {
select {
case evt := <-ml.bridge.AppService.Events:
ml.log.Debugln("Received Matrix event:", evt)
switch evt.Type {
case gomatrix.StateMember:
ml.HandleMembership(evt)
case gomatrix.EventMessage:
ml.HandleMessage(evt)
}
case <-ml.stop:
return
}
}
}
func (ml *MatrixListener) HandleBotInvite(evt *gomatrix.Event) {
intent := ml.as.BotIntent()
func (bridge *Bridge) HandleBotInvite(evt *gomatrix.Event) {
intent := bridge.AppService.BotIntent()
resp, err := intent.JoinRoom(evt.RoomID, "", nil)
if err != nil {
ml.log.Debugln("Failed to join room", evt.RoomID, "with invite from", evt.Sender)
bridge.Log.Debugln("Failed to join room", evt.RoomID, "with invite from", evt.Sender)
return
}
members, err := intent.JoinedMembers(resp.RoomID)
if err != nil {
ml.log.Debugln("Failed to get members in room", resp.RoomID, "after accepting invite from", evt.Sender)
bridge.Log.Debugln("Failed to get members in room", resp.RoomID, "after accepting invite from", evt.Sender)
intent.LeaveRoom(resp.RoomID)
return
}
if len(members.Joined) < 2 {
ml.log.Debugln("Leaving empty room", resp.RoomID, "after accepting invite from", evt.Sender)
bridge.Log.Debugln("Leaving empty room", resp.RoomID, "after accepting invite from", evt.Sender)
intent.LeaveRoom(resp.RoomID)
return
}
hasPuppets := false
for mxid, _ := range members.Joined {
if mxid == intent.UserID || mxid == evt.Sender {
continue
} else if true { // TODO check if mxid is WhatsApp puppet
} else if _, _, ok := bridge.ParsePuppetMXID(mxid); ok {
hasPuppets = true
continue
}
ml.log.Debugln("Leaving multi-user room", resp.RoomID, "after accepting invite from", evt.Sender)
bridge.Log.Debugln("Leaving multi-user room", resp.RoomID, "after accepting invite from", evt.Sender)
intent.SendNotice(resp.RoomID, "This bridge is user-specific, please don't invite me into rooms with other users.")
intent.LeaveRoom(resp.RoomID)
return
}
user := ml.bridge.GetUser(evt.Sender)
user.ManagementRoom = resp.RoomID
user.Update()
intent.SendNotice(user.ManagementRoom, "This room has been registered as your bridge management/status room.")
ml.log.Debugln(resp.RoomID, "registered as a management room with", evt.Sender)
}
func (ml *MatrixListener) HandleMembership(evt *gomatrix.Event) {
ml.log.Debugln(evt.Content, evt.Content.Membership, evt.GetStateKey())
if evt.Content.Membership == "invite" && evt.GetStateKey() == ml.as.BotMXID() {
ml.HandleBotInvite(evt)
if !hasPuppets {
user := bridge.GetUser(evt.Sender)
user.ManagementRoom = resp.RoomID
user.Update()
intent.SendNotice(user.ManagementRoom, "This room has been registered as your bridge management/status room.")
bridge.Log.Debugln(resp.RoomID, "registered as a management room with", evt.Sender)
}
}
func (ml *MatrixListener) HandleMessage(evt *gomatrix.Event) {
func (bridge *Bridge) HandleMembership(evt *gomatrix.Event) {
bridge.Log.Debugln(evt.Content, evt.Content.Membership, evt.GetStateKey())
if evt.Content.Membership == "invite" && evt.GetStateKey() == bridge.AppService.BotMXID() {
bridge.HandleBotInvite(evt)
}
}
func (ml *MatrixListener) Stop() {
ml.stop <- struct{}{}
func (bridge *Bridge) HandleMessage(evt *gomatrix.Event) {
}