Skip to content

Commit

Permalink
Update go-sarah
Browse files Browse the repository at this point in the history
  • Loading branch information
@oklahomer
oklahomer committed Sep 7, 2019
1 parent b0c4817 commit 59fc4d4
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 9 deletions.
10 changes: 5 additions & 5 deletions adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"time"

"github.com/mattn/go-xmpp"
"github.com/oklahomer/go-sarah"
"github.com/oklahomer/go-sarah/log"
"github.com/oklahomer/go-sarah/v2"
"github.com/oklahomer/go-sarah/v2/log"

"context"
"fmt"
"github.com/oklahomer/go-sarah/retry"
"golang.org/x/net/context"
)

const (
Expand Down Expand Up @@ -54,11 +54,11 @@ func defaultStanzaHandler(_ context.Context, config *Config, stanza Stanza, enqu
trimmed := strings.TrimSpace(input.Message())
if config.HelpCommand != "" && trimmed == config.HelpCommand {
// Help command
help := sarah.NewHelpInput(input.SenderKey(), input.Message(), input.SentAt(), input.ReplyTo())
help := sarah.NewHelpInput(input)
enqueueInput(help)
} else if config.AbortCommand != "" && trimmed == config.AbortCommand {
// Abort command
abort := sarah.NewAbortInput(input.SenderKey(), input.Message(), input.SentAt(), input.ReplyTo())
abort := sarah.NewAbortInput(input)
enqueueInput(abort)
} else {
// Regular input
Expand Down
4 changes: 2 additions & 2 deletions adapter_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package xmpp

import (
"context"
"errors"
"github.com/mattn/go-xmpp"
"github.com/oklahomer/go-sarah"
"golang.org/x/net/context"
"github.com/oklahomer/go-sarah/v2"
"testing"
"time"
)
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ go 1.12
require (
github.com/mattn/go-xmpp v0.0.0-20190124093244-6093f50721ed
github.com/oklahomer/go-sarah v1.6.0
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6
github.com/oklahomer/go-sarah/v2 v2.0.2
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
)
21 changes: 21 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,50 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mattn/go-xmpp v0.0.0-20190124093244-6093f50721ed h1:A1hEQg5M0b3Wg06pm3q/B0wdZsPjVQ/a2IgauQ8wCZo=
github.com/mattn/go-xmpp v0.0.0-20190124093244-6093f50721ed/go.mod h1:Cs5mF0OsrRRmhkyOod//ldNPOwJsrBvJ+1WRspv0xoc=
github.com/oklahomer/cron v0.0.0-20170121044010-e6e3d632402c h1:ymz/Zj3ZVuLvtTz9IUdw1Euca5u8tWHGpwGCAuzL5og=
github.com/oklahomer/cron v0.0.0-20170121044010-e6e3d632402c/go.mod h1:VMHEgU02mAKCPgsqY6QJVTsLYeUIlU8ja0ChfAuh3jU=
github.com/oklahomer/go-sarah v1.6.0 h1:KhEjhp877C1+x4QdvkEtpK8aG9CO9dfcDx/v8EQbpDU=
github.com/oklahomer/go-sarah v1.6.0/go.mod h1:2RHkH2yJNbd249gQF3fJbFbt84HzuCRXzZCi7pxyyTA=
github.com/oklahomer/go-sarah/v2 v2.0.2 h1:C7q4pB8Kjhvw0vwklyta6LCloagDin0ei+TiWNtkHZA=
github.com/oklahomer/go-sarah/v2 v2.0.2/go.mod h1:6RfU1+omyYkY49bLQpqplKIqTgwKRjgNQ7z2YSlpjks=
github.com/oklahomer/golack v0.0.0-20180603071311-54f1368ad24f/go.mod h1:2Nxv6rB0Xiwta/MLpkSrvvMgvVkf9cmnYsZWQHYj6M4=
github.com/oklahomer/golack v0.0.0-20190629020339-9fd6087c8776/go.mod h1:9MnvcoxjPwEa2+KeeEzTShYH32h/dcj11kEl/wWX7Wg=
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/robfig/cron/v3 v3.0.0 h1:kQ6Cb7aHOHTSzNVNEhmp8EcWKLb4CbiMW9h9VyIhO4E=
github.com/robfig/cron/v3 v3.0.0/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/tidwall/gjson v1.2.1/go.mod h1:c/nTNbUr0E0OrXEhq1pwa8iEgc2DOt4ZZqAt1HtCkPA=
github.com/tidwall/gjson v1.2.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
github.com/tidwall/gjson v1.3.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6 h1:FP8hkuE6yUEaJnK7O2eTuejKWwW+Rhfj80dQ2JcKxCU=
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
2 changes: 1 addition & 1 deletion message.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package xmpp
import (
"fmt"
"github.com/mattn/go-xmpp"
"github.com/oklahomer/go-sarah"
"github.com/oklahomer/go-sarah/v2"
"strings"
"time"
)
Expand Down

0 comments on commit 59fc4d4

Please sign in to comment.