aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2019-04-01 10:05:03 -0700
committerChristine Dodrill <me@christine.website>2019-04-01 10:05:28 -0700
commitf06f021f402270951f849dde7bee3f3340b8a1d5 (patch)
treebaee337aab524f162b349d254d21c2d8f2716d44
parentba91a17859267201b1d1f0e71da465b1464d940f (diff)
downloadx-f06f021f402270951f849dde7bee3f3340b8a1d5.tar.xz
x-f06f021f402270951f849dde7bee3f3340b8a1d5.zip
reorg
-rw-r--r--Dockerfile11
-rw-r--r--cmd/appsluggr/main.go (renamed from tools/appsluggr/main.go)0
-rw-r--r--cmd/dnsd/dnsd.conf (renamed from tools/dnsd/dnsd.conf)0
-rw-r--r--cmd/dnsd/main.go (renamed from tools/dnsd/main.go)0
-rw-r--r--cmd/ff-primitive/main.go (renamed from farbfeld/ff-primitive/main.go)0
-rw-r--r--cmd/johaus/build.go (renamed from jbo/johaus/build.go)0
-rw-r--r--cmd/johaus/main.go (renamed from jbo/johaus/main.go)0
-rw-r--r--cmd/la-baujmi/.gitignore (renamed from la-baujmi/.gitignore)0
-rw-r--r--cmd/la-baujmi/README.md (renamed from la-baujmi/README.md)0
-rw-r--r--cmd/la-baujmi/const.go (renamed from la-baujmi/const.go)0
-rw-r--r--cmd/la-baujmi/corpus.txt (renamed from la-baujmi/corpus.txt)0
-rw-r--r--cmd/la-baujmi/fact.go (renamed from la-baujmi/fact.go)0
-rw-r--r--cmd/la-baujmi/fact_test.go (renamed from la-baujmi/fact_test.go)0
-rw-r--r--cmd/la-baujmi/main.go (renamed from la-baujmi/main.go)0
-rw-r--r--cmd/license/.gitignore (renamed from tools/license/.gitignore)0
-rw-r--r--cmd/license/licenses/licenses.go (renamed from tools/license/licenses/licenses.go)0
-rw-r--r--cmd/license/main.go (renamed from tools/license/main.go)2
-rw-r--r--cmd/mainsanow/main.go (renamed from internal/mainsa/cmd/mainsanow/main.go)0
-rw-r--r--cmd/minipaas/main.go (renamed from tools/minipaas/main.go)0
-rw-r--r--cmd/mkapp/main.go (renamed from mastodon/mkapp/main.go)0
-rw-r--r--cmd/priorworkgen/.gitignore (renamed from tools/priorworkgen/.gitignore)0
-rw-r--r--cmd/priorworkgen/main.go (renamed from tools/priorworkgen/main.go)0
-rw-r--r--cmd/quickserv/.gitignore (renamed from tools/quickserv/.gitignore)0
-rw-r--r--cmd/quickserv/main.go (renamed from tools/quickserv/main.go)0
-rw-r--r--cmd/relayd/main.go (renamed from tools/relayd/main.go)0
-rw-r--r--cmd/thumber/in/XjScp8a.png (renamed from tools/thumber/in/XjScp8a.png)bin292689 -> 292689 bytes
-rw-r--r--cmd/thumber/in/lB4ICS3.png (renamed from tools/thumber/in/lB4ICS3.png)bin369886 -> 369886 bytes
-rw-r--r--cmd/thumber/in/oaw79y9.jpg (renamed from tools/thumber/in/oaw79y9.jpg)bin67119 -> 67119 bytes
-rw-r--r--cmd/thumber/main.go (renamed from tools/thumber/main.go)0
-rw-r--r--cmd/within.website/.gitignore (renamed from within.website/.gitignore)0
-rw-r--r--cmd/within.website/build.go (renamed from within.website/build.go)0
-rw-r--r--cmd/within.website/main.go (renamed from within.website/main.go)0
-rw-r--r--discord/ilo-kesi/main.go2
-rwxr-xr-xdocs/man/prepare.sh6
-rw-r--r--docs/man1/README.md (renamed from docs/man/README.md)0
-rw-r--r--docs/man1/appsluggr.1 (renamed from docs/man/appsluggr.1)0
-rw-r--r--docs/man1/cadeybot.1 (renamed from docs/man/cadeybot.1)0
-rw-r--r--docs/man1/ghstat.1 (renamed from docs/man/ghstat.1)0
-rw-r--r--docs/man1/ilo-kesi.1 (renamed from docs/man/ilo-kesi.1)0
-rw-r--r--docs/man1/license.1 (renamed from docs/man/license.1)0
-rw-r--r--docs/man1/quickserv.1 (renamed from docs/man/quickserv.1)0
-rw-r--r--docs/man5/flagconfyg.5 (renamed from docs/man/flagconfyg.5)0
-rw-r--r--farbfeld/README.md3
-rw-r--r--go.mod17
-rw-r--r--go.sum154
-rw-r--r--internal/license.go2
-rw-r--r--internal/yeet/yeet.go4
-rw-r--r--web/ponyapi/doc.go5
-rw-r--r--web/ponyapi/episode.go18
-rw-r--r--web/ponyapi/get.go114
50 files changed, 37 insertions, 301 deletions
diff --git a/Dockerfile b/Dockerfile
index 7dca26a..4970892 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,14 @@
-FROM xena/go:1.11.5 AS build
+FROM xena/go:1.12.1 AS build
WORKDIR /x
COPY . .
ENV GOPROXY=https://cache.greedo.xeserv.us
ENV CGO_ENABLED=0
-RUN go run tools_install.go \
- && GOBIN=/x/bin go install -v ./...
-RUN apk --no-cache add mdocml \
- && cd ./docs/man \
- && ./prepare.sh
+RUN go mod download
+RUN go test ./...
+RUN GOBIN=/x/bin go install -v ./...
RUN apk --no-cache add upx \
&& upx /x/bin/*
FROM xena/alpine
COPY --from=build /x/bin/ /usr/local/bin/
-COPY --from=build /x/docs/man /usr/share/man/man1
RUN apk --no-cache add man
diff --git a/tools/appsluggr/main.go b/cmd/appsluggr/main.go
index b4701a1..b4701a1 100644
--- a/tools/appsluggr/main.go
+++ b/cmd/appsluggr/main.go
diff --git a/tools/dnsd/dnsd.conf b/cmd/dnsd/dnsd.conf
index e490d13..e490d13 100644
--- a/tools/dnsd/dnsd.conf
+++ b/cmd/dnsd/dnsd.conf
diff --git a/tools/dnsd/main.go b/cmd/dnsd/main.go
index 314c86d..314c86d 100644
--- a/tools/dnsd/main.go
+++ b/cmd/dnsd/main.go
diff --git a/farbfeld/ff-primitive/main.go b/cmd/ff-primitive/main.go
index 3ee0882..3ee0882 100644
--- a/farbfeld/ff-primitive/main.go
+++ b/cmd/ff-primitive/main.go
diff --git a/jbo/johaus/build.go b/cmd/johaus/build.go
index 07e8489..07e8489 100644
--- a/jbo/johaus/build.go
+++ b/cmd/johaus/build.go
diff --git a/jbo/johaus/main.go b/cmd/johaus/main.go
index 5c9c59e..5c9c59e 100644
--- a/jbo/johaus/main.go
+++ b/cmd/johaus/main.go
diff --git a/la-baujmi/.gitignore b/cmd/la-baujmi/.gitignore
index 07b6fbf..07b6fbf 100644
--- a/la-baujmi/.gitignore
+++ b/cmd/la-baujmi/.gitignore
diff --git a/la-baujmi/README.md b/cmd/la-baujmi/README.md
index 10aa48d..10aa48d 100644
--- a/la-baujmi/README.md
+++ b/cmd/la-baujmi/README.md
diff --git a/la-baujmi/const.go b/cmd/la-baujmi/const.go
index 2b70d19..2b70d19 100644
--- a/la-baujmi/const.go
+++ b/cmd/la-baujmi/const.go
diff --git a/la-baujmi/corpus.txt b/cmd/la-baujmi/corpus.txt
index 5313317..5313317 100644
--- a/la-baujmi/corpus.txt
+++ b/cmd/la-baujmi/corpus.txt
diff --git a/la-baujmi/fact.go b/cmd/la-baujmi/fact.go
index a421d1e..a421d1e 100644
--- a/la-baujmi/fact.go
+++ b/cmd/la-baujmi/fact.go
diff --git a/la-baujmi/fact_test.go b/cmd/la-baujmi/fact_test.go
index 43f7a4b..43f7a4b 100644
--- a/la-baujmi/fact_test.go
+++ b/cmd/la-baujmi/fact_test.go
diff --git a/la-baujmi/main.go b/cmd/la-baujmi/main.go
index 5183909..5183909 100644
--- a/la-baujmi/main.go
+++ b/cmd/la-baujmi/main.go
diff --git a/tools/license/.gitignore b/cmd/license/.gitignore
index 03a3b4e..03a3b4e 100644
--- a/tools/license/.gitignore
+++ b/cmd/license/.gitignore
diff --git a/tools/license/licenses/licenses.go b/cmd/license/licenses/licenses.go
index 297a8d6..297a8d6 100644
--- a/tools/license/licenses/licenses.go
+++ b/cmd/license/licenses/licenses.go
diff --git a/tools/license/main.go b/cmd/license/main.go
index 990972d..0f93df9 100644
--- a/tools/license/main.go
+++ b/cmd/license/main.go
@@ -11,7 +11,7 @@ import (
"time"
"github.com/Xe/x/internal"
- "github.com/Xe/x/tools/license/licenses"
+ "github.com/Xe/x/cmd/license/licenses"
)
var (
diff --git a/internal/mainsa/cmd/mainsanow/main.go b/cmd/mainsanow/main.go
index bb3df15..bb3df15 100644
--- a/internal/mainsa/cmd/mainsanow/main.go
+++ b/cmd/mainsanow/main.go
diff --git a/tools/minipaas/main.go b/cmd/minipaas/main.go
index 24b2fda..24b2fda 100644
--- a/tools/minipaas/main.go
+++ b/cmd/minipaas/main.go
diff --git a/mastodon/mkapp/main.go b/cmd/mkapp/main.go
index 376ce52..376ce52 100644
--- a/mastodon/mkapp/main.go
+++ b/cmd/mkapp/main.go
diff --git a/tools/priorworkgen/.gitignore b/cmd/priorworkgen/.gitignore
index 4c49bd7..4c49bd7 100644
--- a/tools/priorworkgen/.gitignore
+++ b/cmd/priorworkgen/.gitignore
diff --git a/tools/priorworkgen/main.go b/cmd/priorworkgen/main.go
index f484c27..f484c27 100644
--- a/tools/priorworkgen/main.go
+++ b/cmd/priorworkgen/main.go
diff --git a/tools/quickserv/.gitignore b/cmd/quickserv/.gitignore
index 14f6297..14f6297 100644
--- a/tools/quickserv/.gitignore
+++ b/cmd/quickserv/.gitignore
diff --git a/tools/quickserv/main.go b/cmd/quickserv/main.go
index 7506320..7506320 100644
--- a/tools/quickserv/main.go
+++ b/cmd/quickserv/main.go
diff --git a/tools/relayd/main.go b/cmd/relayd/main.go
index 97ff5b5..97ff5b5 100644
--- a/tools/relayd/main.go
+++ b/cmd/relayd/main.go
diff --git a/tools/thumber/in/XjScp8a.png b/cmd/thumber/in/XjScp8a.png
index a9ec6df..a9ec6df 100644
--- a/tools/thumber/in/XjScp8a.png
+++ b/cmd/thumber/in/XjScp8a.png
Binary files differ
diff --git a/tools/thumber/in/lB4ICS3.png b/cmd/thumber/in/lB4ICS3.png
index 850bf28..850bf28 100644
--- a/tools/thumber/in/lB4ICS3.png
+++ b/cmd/thumber/in/lB4ICS3.png
Binary files differ
diff --git a/tools/thumber/in/oaw79y9.jpg b/cmd/thumber/in/oaw79y9.jpg
index 2ab4cb9..2ab4cb9 100644
--- a/tools/thumber/in/oaw79y9.jpg
+++ b/cmd/thumber/in/oaw79y9.jpg
Binary files differ
diff --git a/tools/thumber/main.go b/cmd/thumber/main.go
index c968853..c968853 100644
--- a/tools/thumber/main.go
+++ b/cmd/thumber/main.go
diff --git a/within.website/.gitignore b/cmd/within.website/.gitignore
index 4697cff..4697cff 100644
--- a/within.website/.gitignore
+++ b/cmd/within.website/.gitignore
diff --git a/within.website/build.go b/cmd/within.website/build.go
index d72d9f5..d72d9f5 100644
--- a/within.website/build.go
+++ b/cmd/within.website/build.go
diff --git a/within.website/main.go b/cmd/within.website/main.go
index ba4f090..ba4f090 100644
--- a/within.website/main.go
+++ b/cmd/within.website/main.go
diff --git a/discord/ilo-kesi/main.go b/discord/ilo-kesi/main.go
index ce15aa3..2ba7284 100644
--- a/discord/ilo-kesi/main.go
+++ b/discord/ilo-kesi/main.go
@@ -41,7 +41,7 @@ func init() {
var mentionRex = regexp.MustCompile(`<((@!?\d+)|(:.+?:\d+))>`)
func main() {
- internal.HandleLicense()
+ internal.HandleStartup()
var cfg lipuSona
err := envdecode.StrictDecode(&cfg)
diff --git a/docs/man/prepare.sh b/docs/man/prepare.sh
deleted file mode 100755
index c8f23bc..0000000
--- a/docs/man/prepare.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-for file in *.1 *.5
-do
- mandoc -T markdown $file > ../$file.md
-done
diff --git a/docs/man/README.md b/docs/man1/README.md
index b0a74fc..b0a74fc 100644
--- a/docs/man/README.md
+++ b/docs/man1/README.md
diff --git a/docs/man/appsluggr.1 b/docs/man1/appsluggr.1
index a0f3881..a0f3881 100644
--- a/docs/man/appsluggr.1
+++ b/docs/man1/appsluggr.1
diff --git a/docs/man/cadeybot.1 b/docs/man1/cadeybot.1
index e1d1967..e1d1967 100644
--- a/docs/man/cadeybot.1
+++ b/docs/man1/cadeybot.1
diff --git a/docs/man/ghstat.1 b/docs/man1/ghstat.1
index 694c72e..694c72e 100644
--- a/docs/man/ghstat.1
+++ b/docs/man1/ghstat.1
diff --git a/docs/man/ilo-kesi.1 b/docs/man1/ilo-kesi.1
index 93f26f7..93f26f7 100644
--- a/docs/man/ilo-kesi.1
+++ b/docs/man1/ilo-kesi.1
diff --git a/docs/man/license.1 b/docs/man1/license.1
index 67cef43..67cef43 100644
--- a/docs/man/license.1
+++ b/docs/man1/license.1
diff --git a/docs/man/quickserv.1 b/docs/man1/quickserv.1
index 5403140..5403140 100644
--- a/docs/man/quickserv.1
+++ b/docs/man1/quickserv.1
diff --git a/docs/man/flagconfyg.5 b/docs/man5/flagconfyg.5
index 7f701b0..7f701b0 100644
--- a/docs/man/flagconfyg.5
+++ b/docs/man5/flagconfyg.5
diff --git a/farbfeld/README.md b/farbfeld/README.md
deleted file mode 100644
index 68dbb00..0000000
--- a/farbfeld/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# farbfeld filters
-
-Filters and tools for http://tools.suckless.org/farbfeld/
diff --git a/go.mod b/go.mod
index cd2e681..2ca3c36 100644
--- a/go.mod
+++ b/go.mod
@@ -1,17 +1,23 @@
module github.com/Xe/x
require (
- git.xeserv.us/xena/xekrazy v0.0.0-20190323225600-a1897cd1ff90 // indirect
github.com/McKael/madon/v2 v2.0.0-20180929094633-c679abc985d6
+ github.com/Yawning/bulb v0.0.0-20170405033506-85d80d893c3d
+ github.com/aclements/go-moremath v0.0.0-20180329182055-b1aff36309c7 // indirect
github.com/bwmarrin/discordgo v0.19.0
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd
github.com/dgryski/go-failure v0.0.0-20151001134759-4963dbd58fd0
+ github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768 // indirect
github.com/disintegration/imaging v1.5.0
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51
+ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
+ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect
+ github.com/fogleman/gg v1.3.0 // indirect
github.com/fogleman/primitive v0.0.0-20170926175833-69506c928bef
github.com/garyburd/redigo v1.6.0
- github.com/go-bindata/go-bindata v1.0.0
+ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/google/go-github v17.0.0+incompatible
+ github.com/google/go-querystring v1.0.0 // indirect
github.com/google/gops v0.3.5
github.com/google/uuid v1.1.0 // indirect
github.com/hullerob/go.farbfeld v0.0.0-20181222022525-3661193c725f
@@ -19,6 +25,7 @@ require (
github.com/joeshaw/envdecode v0.0.0-20180312135643-c9e015854467
github.com/joho/godotenv v1.3.0
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
+ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/klauspost/cpuid v1.2.0 // indirect
github.com/klauspost/reedsolomon v1.8.0 // indirect
github.com/kr/pretty v0.1.0
@@ -29,12 +36,15 @@ require (
github.com/mndrix/ps v0.0.0-20170330174427-18e65badd6ab // indirect
github.com/olekukonko/tablewriter v0.0.1 // indirect
github.com/otiai10/copy v1.0.1
+ github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95 // indirect
github.com/pborman/uuid v1.2.0
github.com/peterh/liner v1.1.0
+ github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
github.com/pkg/errors v0.8.1
- github.com/robertkrimen/godocdown v0.0.0-20130622164427-0bfa04905481
+ github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6
github.com/stretchr/testify v1.3.0 // indirect
+ github.com/sycamoreone/orc v0.0.0-20150204213357-1627eaec2699
github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b // indirect
github.com/tjfoc/gmsm v1.0.1 // indirect
@@ -42,6 +52,7 @@ require (
github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119
github.com/xtaci/kcp-go v5.0.7+incompatible
github.com/xtaci/smux v1.1.0
+ github.com/yawning/bulb v0.0.0-20170405033506-85d80d893c3d // indirect
go.jonnrb.io/vanity v0.1.0
go4.org v0.0.0-20181109185143-00e24f1b2599
golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc
diff --git a/go.sum b/go.sum
index f808a2b..7db78ff 100644
--- a/go.sum
+++ b/go.sum
@@ -1,35 +1,16 @@
+bou.ke/monkey v1.0.1 h1:zEMLInw9xvNakzUUPjfS4Ds6jYPqCFx3m7bRmG5NH2U=
bou.ke/monkey v1.0.1/go.mod h1:FgHuK96Rv2Nlf+0u1OOVDpCMdsWyOFmeeketDHE7LIg=
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-contrib.go.opencensus.io/exporter/stackdriver v0.5.0/go.mod h1:QeFzMJDAw8TXt5+aRaSuE8l5BwaMIOIlaVkBOPRuMuw=
-dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
-dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
-git.xeserv.us/xena/xekrazy v0.0.0-20190323225600-a1897cd1ff90 h1:HYlBF/HwuxVlHd+U/e3TjBk4pqEVvfJ1oA9xrH3Q0R8=
-git.xeserv.us/xena/xekrazy v0.0.0-20190323225600-a1897cd1ff90/go.mod h1:a/2dRcwKz0OU5LelwG7qJZI84iKDWZjEA0U+PjZjrOY=
-github.com/McKael/madon v2.3.0+incompatible/go.mod h1:+issnvJjN1rpjAHZwXRB/x30uHh/NoQR7QaojJK/lSI=
github.com/McKael/madon/v2 v2.0.0-20180929094633-c679abc985d6 h1:9cJcTOeILzInNo+DCYmXKME1QfAP07FYdo3M9/9jyc4=
github.com/McKael/madon/v2 v2.0.0-20180929094633-c679abc985d6/go.mod h1:mvlJhxZCchfiasx3XvN3hBu5RekGwTDm09dKlSM/dQQ=
-github.com/ThomasRooney/gexpect v0.0.0-20161231170123-5482f0350944/go.mod h1:sPML5WwI6oxLRLPuuqbtoOKhtmpVDCYtwsps+I+vjIY=
-github.com/Xe/johaus v0.3.0/go.mod h1:AxheHD7a8X/KIoOUFa2krQkHFIKqhoP+VTWqNJ+3Joo=
-github.com/Xe/ln v0.1.2/go.mod h1:GWZDvjL0ZC/9SSjY8DJ2IOrID6Lejs7D8pgQyjqMYSk=
-github.com/Xe/x v0.0.0-20181215174608-ddbe51f7fcb3/go.mod h1:HRT48voeWT3hUxA3++o8yKAwTJ8woU03BUC6G0xrSig=
+github.com/Yawning/bulb v0.0.0-20170405033506-85d80d893c3d h1:ASfbc4vPGK69qbMO5qqRtGxfPvUmfbaK1ryEBv9WnQQ=
+github.com/Yawning/bulb v0.0.0-20170405033506-85d80d893c3d/go.mod h1:v1YQIDSfaeRRehor57unRn66SBtmgAzxfsCpKIV998I=
github.com/aclements/go-moremath v0.0.0-20180329182055-b1aff36309c7 h1:/NWziSfuX4cu00adiPldD8sdCpKxu6BZtLoALSyElZQ=
github.com/aclements/go-moremath v0.0.0-20180329182055-b1aff36309c7/go.mod h1:idZL3yvz4kzx1dsBOAC+oYv6L92P1oFEhUXUB1A/lwQ=
-github.com/ailncode/gluaxmlpath v0.0.0-20161126153117-6ce478ecb4a6/go.mod h1:Ti1AvV2KUYtHEBX7eYbdAGEfFyKz9+lHrJPcr79Vkng=
-github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
-github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
-github.com/brandur/simplebox v0.0.0-20150921201729-84e9865bb03a/go.mod h1:8hDWkKEpFQwZcugC69PxsoNQMh+0/A3FzLCppp/yJZM=
-github.com/bwmarrin/discordgo v0.18.0/go.mod h1:5NIvFv5Z7HddYuXbuQegZ684DleQaCFqChP2iuBivJ8=
github.com/bwmarrin/discordgo v0.19.0 h1:kMED/DB0NR1QhRcalb85w0Cu3Ep2OrGAqZH1R5awQiY=
github.com/bwmarrin/discordgo v0.19.0/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q=
-github.com/caarlos0/env v3.4.0+incompatible/go.mod h1:tdCsowwCzMLdkqRYDlHpZCp2UooDD3MspDBjZ2AD02Y=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/cjoudrey/gluahttp v0.0.0-20180401075744-7065ce73b887/go.mod h1:X97UjDTXp+7bayQSFZk2hPvCTmTZIicUjZQRtkwgAKY=
-github.com/cjoudrey/gluaurl v0.0.0-20161028222611-31cbb9bef199/go.mod h1:jC+zrjHA5CaxJzn+tojIoIOzSp/6BlkRWXnMlxNkB+g=
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w=
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/coreos/go-systemd v0.0.0-20180705093442-88bfeed483d3/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -39,166 +20,92 @@ github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768 h1:Xzl7CSuS
github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768/go.mod h1:alfmlCqcg4uw9jaoIU1nOp9RFdJLMuu8P07BCEgpgoo=
github.com/disintegration/imaging v1.5.0 h1:uYqUhwNmLU4K1FN44vhqS4TZJRAA4RhBINgbQlKyGi0=
github.com/disintegration/imaging v1.5.0/go.mod h1:9B/deIUIrliYkyMTuXJd6OUFLcrZ2tf+3Qlwnaf/CjU=
-github.com/dustin/go-humanize v0.0.0-20180713052910-9f541cc9db5d/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eaburns/johaus v0.0.0-20180211190535-0482c3c1f4ff/go.mod h1:haq7Ati+IITjB94ZcX9Pur49JW6bQRs/yTcYaqDPxsc=
github.com/eaburns/peggy v0.0.0-20180405011029-d685ddd3cbcb h1:VNtdhXiCNFtQkeRwcS8XW2+gyxollG4Kc4wnHbzGpP8=
github.com/eaburns/peggy v0.0.0-20180405011029-d685ddd3cbcb/go.mod h1:5tfPwI6ukiK3W5vJzkj5MBQKHHY9Gcy2y6k1FC/23Xk=
github.com/eaburns/pretty v0.0.0-20170305202417-362524b72369 h1:C/RhDONMNTxvyaQNWbxj2RAyHOGVYoq+kP5j9hdnYOk=
github.com/eaburns/pretty v0.0.0-20170305202417-362524b72369/go.mod h1:iW/TU1T4mA4w2KzqNbBCjacPFdJ9PfGvNSxr8ajT/iM=
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ=
github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
-github.com/facebookgo/flagenv v0.0.0-20160425205200-fcd59fca7456/go.mod h1:zFhibDvPDWmtk4dAQ05sRobtyoffEHygEt3wSNuAzz8=
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y=
github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/fogleman/gg v1.1.0 h1:wVTfU9tB/LDr2eI5HILatkzBQLD3yl0KtPFt8KlcSIY=
-github.com/fogleman/gg v1.1.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
+github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
+github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
github.com/fogleman/primitive v0.0.0-20170926175833-69506c928bef h1:b2hzCO7V6vnDYAvucXo5smx9wut3A3Huw4VRNg1SMK8=
github.com/fogleman/primitive v0.0.0-20170926175833-69506c928bef/go.mod h1:Tm6t8LbdhSCXNfpjTwoL1mdjCnyKHkMyf6PqQXo7Or8=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/go-bindata/go-bindata v1.0.0 h1:DZ34txDXWn1DyWa+vQf7V9ANc2ILTtrEjtlsdJRF26M=
-github.com/go-bindata/go-bindata v1.0.0/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
-github.com/gokrazy/firmware v0.0.0-20181218024517-9658191a477a/go.mod h1:/Wg/Oyk098vOfXjoZGM9Iy5KjPfw5fKBMR3YepMUN6A=
-github.com/gokrazy/gokrazy v0.0.0-20181121074951-2216841c80ef/go.mod h1:YbpshsItGhDXnytFAvMTRvZvGkVSpZV/4mwxQsvqzHg=
-github.com/gokrazy/hello v0.0.0-20170304101055-fa4e42473124/go.mod h1:yeYHuA/zwQyoXM6XIEvVMwMXeKRwmkT7FKQLBgTa0gk=
-github.com/gokrazy/internal v0.0.0-20180714213357-23a986872b2e/go.mod h1:c7C8E8dlEJG/vdLtGN5NJPdbKNzZi/puMD0sKC346TI=
-github.com/gokrazy/kernel v0.0.0-20190105233129-fbad964034d9/go.mod h1:Z+iJTEay/nI9BalH1DO/zdi+H/vCnRegrULPFTwlMM0=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
-github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/gopacket v1.1.15/go.mod h1:UCLx9mCmAwsVbn6qQl1WIEt2SO7Nd2fD0th1TBAsqBw=
github.com/google/gops v0.3.5 h1:SIWvPLiYvy5vMwjxB3rVFTE4QBhUFj2KKWr3Xm7CKhw=
github.com/google/gops v0.3.5/go.mod h1:pMQgrscwEK/aUSW1IFSaBPbJX82FPHWaSoJw1axQfD0=
-github.com/google/martian v2.0.0-beta.2.0.20180813215018-c223d6f7955e+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA=
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
-github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
-github.com/hullerob/go.farbfeld v0.0.0-20160317142651-b572f0728b69/go.mod h1:mQEoc766DxPTAwQ54neWTK/lFqIeSO7OU6bqZsceglw=
github.com/hullerob/go.farbfeld v0.0.0-20181222022525-3661193c725f h1:1LkiAnH6RhOEbQAcfcEcixM5IsegqFi6IH0Nz0ZGqYs=
github.com/hullerob/go.farbfeld v0.0.0-20181222022525-3661193c725f/go.mod h1:mQEoc766DxPTAwQ54neWTK/lFqIeSO7OU6bqZsceglw=
github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0 h1:xqgexXAGQgY3HAjNPSaCqn5Aahbo5TKsmhp8VRfr1iQ=
github.com/jaytaylor/html2text v0.0.0-20180606194806-57d518f124b0/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
-github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
github.com/joeshaw/envdecode v0.0.0-20180312135643-c9e015854467 h1:REcMVvHDwEBFDEUrphtsx+/LqVKkKfcWxnAuVKFzSWk=
github.com/joeshaw/envdecode v0.0.0-20180312135643-c9e015854467/go.mod h1:Q+alOFAXgW5SrcfMPt/G4B2oN+qEcQRJjkn/f4mKL04=
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
-github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
github.com/klauspost/cpuid v1.2.0 h1:NMpwD2G9JSFOE1/TJjGSo5zG7Yb2bTe7eq1jH+irmeE=
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/crc32 v0.0.0-20170628072449-bab58d77464a/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
-github.com/klauspost/reedsolomon v0.0.0-20180704173009-925cb01d6510/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
github.com/klauspost/reedsolomon v1.8.0 h1:lvvOkvk64cE1EGbBIgFk7WSOOsI1GexpuLiT7zjab6g=
github.com/klauspost/reedsolomon v1.8.0/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
-github.com/kohkimakimoto/gluaenv v0.0.0-20160815032729-2888db6bbe38/go.mod h1:lkO/BmfZkRNgMaKcN5CvXaYM/UCM0W5HQdTJ4SXMLXc=