MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-12-23 22:14:06 +01:00
Code Issues Projects Releases Wiki Activity

Pass event ID into CommandEvents

Browse source
This commit is contained in:
Tulir Asokan 2022-01-07 14:39:00 +02:00
parent 2ce9947130
commit 3d457d005e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
commands.go
View file

@ -61,6 +61,7 @@ type CommandEvent struct {
Portal *Portal
Handler *CommandHandler
RoomID id.RoomID
EventID id.EventID
User *User
Command string
Args []string
@ -82,7 +83,7 @@ func (ce *CommandEvent) Reply(msg string, args ...interface{}) {
}
// Handle handles messages to the bridge
func (handler *CommandHandler) Handle(roomID id.RoomID, user *User, message string, replyTo id.EventID) {
func (handler *CommandHandler) Handle(roomID id.RoomID, eventID id.EventID, user *User, message string, replyTo id.EventID) {
args := strings.Fields(message)
if len(args) == 0 {
args = []string{"unknown-command"}
@ -93,6 +94,7 @@ func (handler *CommandHandler) Handle(roomID id.RoomID, user *User, message stri
Portal: handler.bridge.GetPortalByMXID(roomID),
Handler: handler,
RoomID: roomID,
EventID: eventID,
User: user,
Command: strings.ToLower(args[0]),
Args: args[1:],
@ -454,7 +456,7 @@ func (handler *CommandHandler) CommandSetPowerLevel(ce *CommandEvent) {
ce.Reply("Only bridge admins can use `set-pl`")
return
} else if ce.Portal == nil {
ce.Reply("Not a portal room")
ce.Reply("This is not a portal room")
return
}
var level int

2
matrix.go
View file

@ -437,7 +437,7 @@ func (mx *MatrixHandler) HandleMessage(evt *event.Event) {
content.Body = strings.TrimLeft(content.Body[len(commandPrefix):], " ")
}
if hasCommandPrefix || evt.RoomID == user.ManagementRoom {
mx.cmd.Handle(evt.RoomID, user, content.Body, content.GetReplyTo())
mx.cmd.Handle(evt.RoomID, evt.ID, user, content.Body, content.GetReplyTo())
return
}
}