all: update to dstate v2

Moleculor · Sep 2, 2020 · 31ae9af · 31ae9af
1 parent 0857a2d
commit 31ae9af
Show file tree

Hide file tree

Showing 54 changed files with 81 additions and 101 deletions.
diff --git a/automod/automod_bot.go b/automod/automod_bot.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/analytics"
 	"github.com/jonas747/yagpdb/automod/models"
 	"github.com/jonas747/yagpdb/bot"

diff --git a/automod/effects.go b/automod/effects.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/automod/models"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/common"

diff --git a/automod/rulepart.go b/automod/rulepart.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/automod/models"
 )
 

diff --git a/automod/triggers.go b/automod/triggers.go
@@ -8,7 +8,7 @@ import (
 	"unicode"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/automod/models"
 	"github.com/jonas747/yagpdb/automod_legacy"
 	"github.com/jonas747/yagpdb/common"

diff --git a/automod_legacy/bot.go b/automod_legacy/bot.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/analytics"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/bot/eventsystem"

diff --git a/automod_legacy/rules.go b/automod_legacy/rules.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/common"
 	"github.com/jonas747/yagpdb/safebrowsing"
 	"github.com/mediocregopher/radix/v3"

diff --git a/autorole/bot.go b/autorole/bot.go
@@ -9,7 +9,7 @@ import (
 	"emperror.dev/errors"
 	"github.com/jonas747/dcmd"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/analytics"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/bot/eventsystem"

diff --git a/aylien/aylien.go b/aylien/aylien.go
@@ -8,7 +8,7 @@ import (
 
 	textapi "github.com/AYLIEN/aylien_textapi_go"
 	"github.com/jonas747/dcmd"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/commands"
 	"github.com/jonas747/yagpdb/common"

diff --git a/bot/bot.go b/bot/bot.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/jonas747/discordgo"
 	"github.com/jonas747/dshardorchestrator/v2/node"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	dshardmanager "github.com/jonas747/jdshardmanager"
 	"github.com/jonas747/yagpdb/bot/eventsystem"
 	"github.com/jonas747/yagpdb/common"

diff --git a/bot/botrest/server.go b/bot/botrest/server.go
@@ -9,7 +9,7 @@ import (
 
 	"emperror.dev/errors"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/dutil"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/common"

diff --git a/bot/eventsystem/eventsystem.go b/bot/eventsystem/eventsystem.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/common"
 	"github.com/jonas747/yagpdb/common/featureflags"
 	"github.com/sirupsen/logrus"

diff --git a/bot/history.go b/bot/history.go
@@ -2,9 +2,8 @@ package bot
 
 import (
 	"sort"
-	"time"
 
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/common"
 )
 
@@ -97,11 +96,6 @@ func GetMessages(channelID int64, limit int, deleted bool) ([]*dstate.MessageSta
 		msgBuf = msgBuf[n+1:]
 	}
 
-	maxChannelMessages, maxMessageAge := State.MaxChannelMessages, State.MaxMessageAge
-	if State.CustomLimitProvider != nil {
-		maxChannelMessages, maxMessageAge = State.CustomLimitProvider.MessageLimits(cs)
-	}
-
 	// merge the current state with this new one and sort
 	cs.Owner.Lock()
 	defer cs.Owner.Unlock()
@@ -117,8 +111,6 @@ func GetMessages(channelID int64, limit int, deleted bool) ([]*dstate.MessageSta
 
 	sort.Sort(DiscordMessages(cs.Messages))
 
-	cs.UpdateMessages(false, maxChannelMessages, time.Now().Add(-maxMessageAge))
-
 	// Return at most limit results
 	if limit < len(msgBuf) {
 		return msgBuf[len(msgBuf)-limit:], nil

diff --git a/bot/memberfetcher.go b/bot/memberfetcher.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/bot/eventsystem"
 	"github.com/jonas747/yagpdb/common"
 	"github.com/karlseguin/ccache"

diff --git a/bot/metrics.go b/bot/metrics.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 )

diff --git a/bot/nodeimpl.go b/bot/nodeimpl.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/jonas747/dshardorchestrator/v2"
 	"github.com/jonas747/dshardorchestrator/v2/node"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/common"
 )
 

diff --git a/bot/plugin.go b/bot/plugin.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/jonas747/discordgo"
 	"github.com/jonas747/dshardorchestrator/v2"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/common"
 )
 

diff --git a/bot/util.go b/bot/util.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/bwmarrin/snowflake"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/dutil"
 	"github.com/jonas747/yagpdb/common"
 	"github.com/jonas747/yagpdb/common/pubsub"

diff --git a/bot/util_test.go b/bot/util_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 )
 
 func TestMemberHighestRole(t *testing.T) {

diff --git a/commands/plugin_bot.go b/commands/plugin_bot.go
@@ -12,7 +12,7 @@ import (
 	"emperror.dev/errors"
 	"github.com/jonas747/dcmd"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/bot/eventsystem"
 	"github.com/jonas747/yagpdb/common"

diff --git a/commands/yagcommmand.go b/commands/yagcommmand.go
@@ -11,7 +11,7 @@ import (
 	"emperror.dev/errors"
 	"github.com/jonas747/dcmd"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/analytics"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/commands/models"

diff --git a/common/templates/context.go b/common/templates/context.go
@@ -13,7 +13,7 @@ import (
 
 	"emperror.dev/errors"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/template"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/common"
@@ -66,7 +66,7 @@ var (
 		"cslice":             CreateSlice,
 		"complexMessage":     CreateMessageSend,
 		"complexMessageEdit": CreateMessageEdit,
-		"kindOf":	      KindOf,
+		"kindOf":             KindOf,
 
 		"formatTime":  tmplFormatTime,
 		"json":        tmplJson,
@@ -487,7 +487,7 @@ func baseContextFuncs(c *Context) {
 
 	c.ContextFuncs["addRoleID"] = c.tmplAddRoleID
 	c.ContextFuncs["removeRoleID"] = c.tmplRemoveRoleID
-	
+
 	c.ContextFuncs["addRoleName"] = c.tmplAddRoleName
 	c.ContextFuncs["removeRoleName"] = c.tmplRemoveRoleName
 
@@ -576,17 +576,17 @@ func MaybeScheduledDeleteMessage(guildID, channelID, messageID int64, delaySecon
 type Dict map[interface{}]interface{}
 
 func (d Dict) Set(key interface{}, value interface{}) string {
-    d[key] = value
-    return ""
+	d[key] = value
+	return ""
 }
 
 func (d Dict) Get(key interface{}) interface{} {
-    return d[key]
+	return d[key]
 }
 
 func (d Dict) Del(key interface{}) string {
-    delete(d, key)
-    return ""
+	delete(d, key)
+	return ""
 }
 
 type SDict map[string]interface{}

diff --git a/common/templates/context_funcs.go b/common/templates/context_funcs.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/common"
 	"github.com/jonas747/yagpdb/common/scheduledevents2"

diff --git a/common/templates/structs.go b/common/templates/structs.go
@@ -2,7 +2,7 @@ package templates
 
 import (
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 )
 
 // CtxChannel is almost a 1:1 copy of dstate.ChannelState, its needed because we cant axpose all those state methods

diff --git a/common/util.go b/common/util.go
@@ -13,7 +13,7 @@ import (
 
 	"emperror.dev/errors"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/lib/pq"
 	"github.com/mediocregopher/radix/v3"
 	"github.com/sirupsen/logrus"

diff --git a/customcommands/bot.go b/customcommands/bot.go
@@ -20,7 +20,7 @@ import (
 	"emperror.dev/errors"
 	"github.com/jonas747/dcmd"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/bot/eventsystem"
 	"github.com/jonas747/yagpdb/commands"

diff --git a/customcommands/customcommands.go b/customcommands/customcommands.go
@@ -12,7 +12,7 @@ import (
 
 	"emperror.dev/errors"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/common"
 	"github.com/jonas747/yagpdb/common/featureflags"
 	"github.com/jonas747/yagpdb/customcommands/models"

diff --git a/customcommands/tmplextensions.go b/customcommands/tmplextensions.go
@@ -9,7 +9,7 @@ import (
 	"emperror.dev/errors"
 	"github.com/jonas747/dcmd"
 	"github.com/jonas747/discordgo"
-	"github.com/jonas747/dstate"
+	"github.com/jonas747/dstate/v2"
 	"github.com/jonas747/yagpdb/bot"
 	"github.com/jonas747/yagpdb/commands"
 	"github.com/jonas747/yagpdb/common"

diff --git a/go.mod b/go.mod
@@ -32,18 +32,18 @@ require (
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/jonas747/cardsagainstdiscord v1.1.1-0.20200617121715-2c969a853358
 	github.com/jonas747/dca v0.0.0-20190317094138-10e959e9d3e8
-	github.com/jonas747/dcmd v1.2.3
+	github.com/jonas747/dcmd v1.2.4
 	github.com/jonas747/dice v0.0.0-20170619144252-7735f6ee7b69
 	github.com/jonas747/discordgo v1.5.2-0.20200901025258-0fb044c908a4
 	github.com/jonas747/dshardorchestrator/v2 v2.0.1
-	github.com/jonas747/dstate v1.0.9
+	github.com/jonas747/dstate/v2 v2.0.1
 	github.com/jonas747/dutil v0.0.3
 	github.com/jonas747/go-reddit v0.1.2
 	github.com/jonas747/go-twitter v0.0.0-20200706234916-1d17060b92bc
 	github.com/jonas747/jdshardmanager v1.0.1
 	github.com/jonas747/ogg v0.0.0-20161220051205-b4f6f4cf3757 // indirect
 	github.com/jonas747/template v1.1.2
-	github.com/jonas747/when v0.0.2 // indirect
+	github.com/jonas747/when v0.0.2
 	github.com/justinian/dice v0.0.0-20170728002755-6a18b51d929c // indirect
 	github.com/karlseguin/ccache v2.0.3+incompatible
 	github.com/karlseguin/expect v1.0.1 // indirect
@@ -54,7 +54,6 @@ require (
 	github.com/microcosm-cc/bluemonday v1.0.1
 	github.com/miolini/datacounter v0.0.0-20190724021726-aa48df3a02c1
 	github.com/natefinch/lumberjack v2.0.0+incompatible
-	github.com/olebedev/when v0.0.0-20190311101825-c3b538a97254 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.5.1

diff --git a/go.sum b/go.sum
@@ -206,8 +206,8 @@ github.com/jonas747/dca v0.0.0-20190317094138-10e959e9d3e8 h1:k/3mvr7ImDZ8Ig/qcL
 github.com/jonas747/dca v0.0.0-20190317094138-10e959e9d3e8/go.mod h1:rxjYX9OJU81unMxQDHChU/lAiOhlY9MV+faPX/NmwLk=
 github.com/jonas747/dcmd v1.1.0 h1:zn5qVNxyz08cgAdjvAGoG2WwY3GbxnzImRynV0Atja0=
 github.com/jonas747/dcmd v1.1.0/go.mod h1:pfeU2I/OynOj5NXiyavaMb4MqKq7rbjHj1hPe44YJ1A=
-github.com/jonas747/dcmd v1.2.3 h1:1c8BTgUHQaqIY4SskHaGgE7VIFEB2Zo7f0AdxivcI+0=
-github.com/jonas747/dcmd v1.2.3/go.mod h1:qa2rnZNmoZL2Eh3eonPY8AhNVEyGGRRFttdtBuX0+G8=
+github.com/jonas747/dcmd v1.2.4 h1:+3Uxk7yGxuVrVqK4CAXK9ASK7yHzUE7accU5lESHb+A=
+github.com/jonas747/dcmd v1.2.4/go.mod h1:dOpx8IdbmRPYsv9f4wFQXRxGYrA2lTBmSA4xM9fARiI=
 github.com/jonas747/dice v0.0.0-20170619144252-7735f6ee7b69 h1:npnwg0oLHdEZs4KXXk2092gEuHx2jePVyrNIJXMsCBw=
 github.com/jonas747/dice v0.0.0-20170619144252-7735f6ee7b69/go.mod h1:m242ZgUE5Rw5Pmc35yiSSyGAxXCiO/QWJZ244MDpanI=
 github.com/jonas747/discordgo v1.1.1 h1:xanhLCWhl5hLN90JZC8EfjBthRF3JRkikePWtLrce3Q=
@@ -216,15 +216,8 @@ github.com/jonas747/discordgo v1.1.7 h1:If1IF6nvL2swzxGznVzsiUwORyu3mlf/UT0HW1Gb
 github.com/jonas747/discordgo v1.1.7/go.mod h1:Mq9l7/Kn7L8Np5p//vuxKfnZohrX70XYx9cGoa+19J8=
 github.com/jonas747/discordgo v1.1.9 h1:zgI5nmgIhoMsHFL4XbEY7j45B0NO697V9TwHPEdVjFU=
 github.com/jonas747/discordgo v1.1.9/go.mod h1:Mq9l7/Kn7L8Np5p//vuxKfnZohrX70XYx9cGoa+19J8=
-github.com/jonas747/discordgo v1.3.4-0.20200309143309-14b9c57c750a/go.mod h1:bAhKzQI2Jco59WVa5fhGOKdtMyGL7CFFBAxBeSGVCj0=
-github.com/jonas747/discordgo v1.5.1-0.20200804173715-b80e497b473c h1:DLQyZR2IeaiK7m71dLLIQTKC8T8f+KwPWU4bAWoKMxg=
-github.com/jonas747/discordgo v1.5.1-0.20200804173715-b80e497b473c/go.mod h1:AtjBAWqqaBsSj2dgxKaeQ3Gy8GFlDRg+PZiFcsqav00=
-github.com/jonas747/discordgo v1.5.1-0.20200806201143-eb0997b8bc59 h1:rArkqyBK7QsDYzRu+Tt5fv9rTEOYsOcwB6IpLwfYjJs=
-github.com/jonas747/discordgo v1.5.1-0.20200806201143-eb0997b8bc59/go.mod h1:AtjBAWqqaBsSj2dgxKaeQ3Gy8GFlDRg+PZiFcsqav00=
 github.com/jonas747/discordgo v1.5.1 h1:/mX4Cf9J7kk+IJ2qp5pGpbi1TE8HdzWhUcWl78W0Lo8=
 github.com/jonas747/discordgo v1.5.1/go.mod h1:AtjBAWqqaBsSj2dgxKaeQ3Gy8GFlDRg+PZiFcsqav00=
-github.com/jonas747/discordgo v1.5.2-0.20200807204914-c1886a5a15ac h1:NJEdfZiZKVBj4tLzADuBWVXVgYAAhTk6P88Oh2hkBS0=
-github.com/jonas747/discordgo v1.5.2-0.20200807204914-c1886a5a15ac/go.mod h1:AtjBAWqqaBsSj2dgxKaeQ3Gy8GFlDRg+PZiFcsqav00=
 github.com/jonas747/discordgo v1.5.2-0.20200901025258-0fb044c908a4 h1:7cWS/J+1zlob781wYee7L+nmUTedvTdFQZvceWLSOfQ=
 github.com/jonas747/discordgo v1.5.2-0.20200901025258-0fb044c908a4/go.mod h1:AtjBAWqqaBsSj2dgxKaeQ3Gy8GFlDRg+PZiFcsqav00=
 github.com/jonas747/dshardorchestrator v0.1.0 h1:3/v+lx0gLupm7/VZr7wbfvUGhpxvuNC5JHaS+OnWjCc=
@@ -236,12 +229,10 @@ github.com/jonas747/dstate v1.0.4 h1:TS1YcPJelsVOqgU8u+SKkQevEMi0klG9Agugj+TE8+0
 github.com/jonas747/dstate v1.0.4/go.mod h1:6EQjQnyxbdNzQJS9wANzHVzKCyTO+lsmH6t3aqZRNI8=
 github.com/jonas747/dstate v1.0.5 h1:HgHXWurXFtQRAp+3fTIDW/ukHlKsEYe0lJjbC1mQoKc=
 github.com/jonas747/dstate v1.0.5/go.mod h1:6EQjQnyxbdNzQJS9wANzHVzKCyTO+lsmH6t3aqZRNI8=
-github.com/jonas747/dstate v1.0.7 h1:wgEkNGIi+sXRqIQu0niM1So3KcvX/l6slX8CbytWAa4=
-github.com/jonas747/dstate v1.0.7/go.mod h1:6EQjQnyxbdNzQJS9wANzHVzKCyTO+lsmH6t3aqZRNI8=
-github.com/jonas747/dstate v1.0.8 h1:HpFL5XFTDbYE73DlHicoJXue23l+jwDfdlLcOs2rpZQ=
-github.com/jonas747/dstate v1.0.8/go.mod h1:By783tU/RPJO/dv19uixstzAwvoo2Xw541C0tQIunO8=
-github.com/jonas747/dstate v1.0.9 h1:oXnSG71uoX3/e4iph2YCxKqJeSzxGTBDgYjVBP2scT8=
-github.com/jonas747/dstate v1.0.9/go.mod h1:By783tU/RPJO/dv19uixstzAwvoo2Xw541C0tQIunO8=
+github.com/jonas747/dstate/v2 v2.0.0 h1:iKRA/ENnyO+922kQCrTYpTivxn9tyFeNzh5slHvqF3c=
+github.com/jonas747/dstate/v2 v2.0.0/go.mod h1:xuGgbuvq9CgnxYrHfNzT9Zvc8bVRCZHMnBekL0c79fY=
+github.com/jonas747/dstate/v2 v2.0.1 h1:pbfaqz5L15P4o8zbkdY0p1fx1e4yTUQQQXF5dj2tHEM=
+github.com/jonas747/dstate/v2 v2.0.1/go.mod h1:xuGgbuvq9CgnxYrHfNzT9Zvc8bVRCZHMnBekL0c79fY=
 github.com/jonas747/dutil v0.0.2 h1:GV4b5tb0l/Qq11GS7g4m5hlxDkKGhZ8hXRefS4dKMMQ=
 github.com/jonas747/dutil v0.0.2/go.mod h1:FwfIRC0ShAEHhwUJ6JppfciiFrfOA/cAoyCECsfib8c=
 github.com/jonas747/dutil v0.0.3 h1:Qe4Qls2sBjAvBOqregFLyDuWG/gonK8BiqT9DHRhIg0=
@@ -258,8 +249,6 @@ github.com/jonas747/ogg v0.0.0-20161220051205-b4f6f4cf3757 h1:Kyv+zTfWIGRNaz/4+l
 github.com/jonas747/ogg v0.0.0-20161220051205-b4f6f4cf3757/go.mod h1:cZnNmdLiLpihzgIVqiaQppi9Ts3D4qF/M45//yW35nI=
 github.com/jonas747/template v1.1.2 h1:eCAU81MpcC0gij9NitXt+ECCf436OxklvJA+CHWjqxA=
 github.com/jonas747/template v1.1.2/go.mod h1:gAPqCURcbB4rsYIzAsvcZyyflNZHNG6FQcUZBtLUzXg=
-github.com/jonas747/when v0.0.0-20190311101825-c3b538a97254 h1:JYoQR67E1vv1WGoeW8DkdFs7vrIEe/5wP+qJItd5tUE=
-github.com/jonas747/when v0.0.0-20190311101825-c3b538a97254/go.mod h1:DPucAeQGDPUzYUt+NaWw6qsF5SFapWWToxEiVDh2aV0=
 github.com/jonas747/when v0.0.2 h1:71sgEPQ/3SlwcNHOblVj/RUCWqHkurK3umlRxNpbOFs=
 github.com/jonas747/when v0.0.2/go.mod h1:FcMTsyR9FGTdWt9RboWas5IJ+i5NlozhLtNkCRYC3+A=
 github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
@@ -324,8 +313,6 @@ github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4
 github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
-github.com/olebedev/when v0.0.0-20190311101825-c3b538a97254 h1:JYoQR67E1vv1WGoeW8DkdFs7vrIEe/5wP+qJItd5tUE=
-github.com/olebedev/when v0.0.0-20190311101825-c3b538a97254/go.mod h1:DPucAeQGDPUzYUt+NaWw6qsF5SFapWWToxEiVDh2aV0=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=