watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix data storage and other things

Browse Source
This commit is contained in:
Tulir Asokan
2018-08-16 19:20:07 +03:00
parent 9c48eeb534
commit 141eba644b
13 changed files with 158 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
matrix.go
View File

@ -25,7 +25,7 @@ import (
type MatrixListener struct {
bridge *Bridge
as *appservice.AppService
log *log.Sublogger
log log.Logger
stop chan struct{}
}
@ -34,7 +34,7 @@ func NewMatrixListener(bridge *Bridge) *MatrixListener {
bridge: bridge,
as: bridge.AppService,
stop: make(chan struct{}, 1),
log: bridge.Log.CreateSublogger("Matrix", log.LevelDebug),
log: bridge.Log.Sub("Matrix Listener"),
}
}
@ -42,7 +42,7 @@ func (ml *MatrixListener) Start() {
for {
select {
case evt := <-ml.bridge.AppService.Events:
log.Debugln("Received Matrix event:", evt)
ml.log.Debugln("Received Matrix event:", evt)
switch evt.Type {
case gomatrix.StateMember:
ml.HandleMembership(evt)
@ -56,47 +56,48 @@ func (ml *MatrixListener) Start() {
}
func (ml *MatrixListener) HandleBotInvite(evt *gomatrix.Event) {
cli := ml.as.BotClient()
intent := ml.as.BotIntent()
resp, err := cli.JoinRoom(evt.RoomID, "", nil)
resp, err := intent.JoinRoom(evt.RoomID, "", nil)
if err != nil {
ml.log.Debugln("Failed to join room", evt.RoomID, "with invite from", evt.Sender)
return
}
members, err := cli.JoinedMembers(resp.RoomID)
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)
cli.LeaveRoom(resp.RoomID)
intent.LeaveRoom(resp.RoomID)
return
}
if len(members.Joined) < 2 {
ml.log.Debugln("Leaving empty room", resp.RoomID, "after accepting invite from", evt.Sender)
cli.LeaveRoom(resp.RoomID)
intent.LeaveRoom(resp.RoomID)
return
}
for mxid, _ := range members.Joined {
if mxid == cli.UserID || mxid == evt.Sender {
if mxid == intent.UserID || mxid == evt.Sender {
continue
} else if true { // TODO check if mxid is WhatsApp puppet
continue
}
ml.log.Debugln("Leaving multi-user room", resp.RoomID, "after accepting invite from", evt.Sender)
cli.SendNotice(resp.RoomID, "This bridge is user-specific, please don't invite me into rooms with other users.")
cli.LeaveRoom(resp.RoomID)
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()
cli.SendNotice(user.ManagementRoom, "This room has been registered as your bridge management/status room.")
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)
}