vbatts/maubot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix active command matching

Browse source
This commit is contained in:
Tulir Asokan 2018-09-21 23:33:37 +03:00
parent b805641ea4
commit f06c6dd767
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -16,3 +16,4 @@ github/
gitlab/ gitlab/
rss/ rss/
factorial/ factorial/
dictionary/

5
matrix/commands.go
View file

@ -43,6 +43,7 @@ func (pc *ParsedCommand) parseCommandSyntax(command maubot.Command) error {
argumentEncountered := false argumentEncountered := false
regexBuilder.WriteString("^!") regexBuilder.WriteString("^!")
swBuilder.WriteRune('!')
words := strings.Split(command.Syntax, " ") words := strings.Split(command.Syntax, " ")
for i, word := range words { for i, word := range words {
argument, ok := command.Arguments[word] argument, ok := command.Arguments[word]
@ -50,8 +51,10 @@ func (pc *ParsedCommand) parseCommandSyntax(command maubot.Command) error {
if ok && len(word) > 0 /*&& word[0] == '$'*/ { if ok && len(word) > 0 /*&& word[0] == '$'*/ {
argumentEncountered = true argumentEncountered = true
regex := argument.Matches regex := argument.Matches
if argument.Required { if !argument.Required {
regex = fmt.Sprintf("(?:%s)?", regex) regex = fmt.Sprintf("(?:%s)?", regex)
} else {
regex = fmt.Sprintf("(%s)", regex)
} }
pc.Arguments = append(pc.Arguments, word) pc.Arguments = append(pc.Arguments, word)
regexBuilder.WriteString(regex) regexBuilder.WriteString(regex)

4
matrix/matrix.go
View file

@ -104,11 +104,11 @@ func (client *Client) GetEvent(roomID, eventID string) *maubot.Event {
func (client *Client) TriggerCommand(command *ParsedCommand, evt *maubot.Event) maubot.CommandHandlerResult { func (client *Client) TriggerCommand(command *ParsedCommand, evt *maubot.Event) maubot.CommandHandlerResult {
handlers, ok := client.handlers[command.Name] handlers, ok := client.handlers[command.Name]
if !ok { if !ok {
log.Warnf("Command %s triggered by %s doesn't have any handlers.\n", command.Name, evt.Sender) log.Warnf("Command `%s` triggered by %s doesn't have any handlers.\n", command.Name, evt.Sender)
return maubot.Continue return maubot.Continue
} }
log.Debugf("Command %s on client %s triggered by %s\n", command.Name, client.UserID, evt.Sender) log.Debugf("Command `%s` on client %s triggered by %s\n", command.Name, client.UserID, evt.Sender)
for _, handler := range handlers { for _, handler := range handlers {
result := handler(evt) result := handler(evt)
if result == maubot.StopCommandPropagation { if result == maubot.StopCommandPropagation {