From 85c7109a8538b9a25c3ce97d8bd46f538bc6da1b Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Tue, 12 Feb 2019 03:08:22 +0400 Subject: [PATCH] Update dependencies --- context/context.go | 2 +- context/exported.go | 2 +- domains/battles/v1/announce.go | 2 +- domains/battles/v1/exported.go | 2 +- domains/battles/v1/forward.go | 2 +- domains/commands/v1/exported.go | 2 +- domains/commands/v1/help.go | 2 +- domains/commands/v1/start.go | 2 +- go.mod | 7 +++++-- go.sum | 9 +++++++++ {local => internal}/config/announces.go | 0 {local => internal}/config/proxy.go | 0 {local => internal}/config/struct.go | 0 {local => internal}/config/telegram.go | 0 {local => internal}/config/webhook.go | 0 {local => internal}/router/exported.go | 0 {local => internal}/router/router.go | 0 {local => internal}/telegram/exported.go | 0 {local => internal}/telegram/respond.go | 0 {local => internal}/telegram/telegram.go | 2 +- main.go | 4 ++-- 21 files changed, 25 insertions(+), 13 deletions(-) rename {local => internal}/config/announces.go (100%) rename {local => internal}/config/proxy.go (100%) rename {local => internal}/config/struct.go (100%) rename {local => internal}/config/telegram.go (100%) rename {local => internal}/config/webhook.go (100%) rename {local => internal}/router/exported.go (100%) rename {local => internal}/router/router.go (100%) rename {local => internal}/telegram/exported.go (100%) rename {local => internal}/telegram/respond.go (100%) rename {local => internal}/telegram/telegram.go (97%) diff --git a/context/context.go b/context/context.go index cd3eb36..6f0c80f 100644 --- a/context/context.go +++ b/context/context.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" "gopkg.in/yaml.v2" "io/ioutil" - "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/config" + "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/config" "os" "path/filepath" "runtime" diff --git a/context/exported.go b/context/exported.go index dd54d05..d3f45b9 100644 --- a/context/exported.go +++ b/context/exported.go @@ -5,7 +5,7 @@ package context import ( "github.com/rs/zerolog" - "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/config" + "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/config" ) // VERSION is the current bot's version diff --git a/domains/battles/v1/announce.go b/domains/battles/v1/announce.go index 96650a7..48d9a6d 100644 --- a/domains/battles/v1/announce.go +++ b/domains/battles/v1/announce.go @@ -5,7 +5,7 @@ package battlesv1 import ( "gitlab.com/toby3d/telegram" - itelegram "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/telegram" + itelegram "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/telegram" "strings" ) diff --git a/domains/battles/v1/exported.go b/domains/battles/v1/exported.go index d2bcf9b..260cd5c 100644 --- a/domains/battles/v1/exported.go +++ b/domains/battles/v1/exported.go @@ -6,7 +6,7 @@ package battlesv1 import ( "github.com/rs/zerolog" "lab.wtfteam.pro/fat0troll/fw_zookeeper/context" - "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/router" + "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/router" "regexp" ) diff --git a/domains/battles/v1/forward.go b/domains/battles/v1/forward.go index dc17088..4676c13 100644 --- a/domains/battles/v1/forward.go +++ b/domains/battles/v1/forward.go @@ -5,7 +5,7 @@ package battlesv1 import ( "gitlab.com/toby3d/telegram" - itelegram "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/telegram" + itelegram "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/telegram" "strings" ) diff --git a/domains/commands/v1/exported.go b/domains/commands/v1/exported.go index d8b64ad..4dd71b5 100644 --- a/domains/commands/v1/exported.go +++ b/domains/commands/v1/exported.go @@ -6,7 +6,7 @@ package commandsv1 import ( "github.com/rs/zerolog" "lab.wtfteam.pro/fat0troll/fw_zookeeper/context" - "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/router" + "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/router" ) var ( diff --git a/domains/commands/v1/help.go b/domains/commands/v1/help.go index d9c4ce5..b20de9c 100644 --- a/domains/commands/v1/help.go +++ b/domains/commands/v1/help.go @@ -5,7 +5,7 @@ package commandsv1 import ( "gitlab.com/toby3d/telegram" - itelegram "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/telegram" + itelegram "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/telegram" ) // HelpCommand responds to /help message diff --git a/domains/commands/v1/start.go b/domains/commands/v1/start.go index 7c839e9..565ab7c 100644 --- a/domains/commands/v1/start.go +++ b/domains/commands/v1/start.go @@ -5,7 +5,7 @@ package commandsv1 import ( "gitlab.com/toby3d/telegram" - itelegram "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/telegram" + itelegram "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/telegram" ) // StartCommand responds to /start message diff --git a/go.mod b/go.mod index a741e14..d75f87d 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,14 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/kirillDanshin/dlog v0.0.0-20170728000807-97d876b12bf9 // indirect github.com/kirillDanshin/myutils v0.0.0-20160713214838-182269b1fbcc // indirect + github.com/klauspost/compress v1.4.1 // indirect + github.com/klauspost/cpuid v1.2.0 // indirect github.com/pquerna/ffjson v0.0.0-20181028064349-e517b90714f7 // indirect github.com/rs/zerolog v1.11.0 - github.com/valyala/fasthttp v1.0.0 + github.com/valyala/fasthttp v1.1.0 gitlab.com/toby3d/telegram v0.0.0-20181012114749-b3f324e1b3aa - golang.org/x/net v0.0.0-20181220203305-927f97764cc3 + golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 golang.org/x/text v0.3.0 // indirect + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect gopkg.in/yaml.v2 v2.2.2 ) diff --git a/go.sum b/go.sum index 4905f5c..f81d049 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,12 @@ github.com/kirillDanshin/myutils v0.0.0-20160713214838-182269b1fbcc h1:OkOhOn3WB github.com/kirillDanshin/myutils v0.0.0-20160713214838-182269b1fbcc/go.mod h1:Bt95qRxLvpdmASW9s2tTxGdQ5ma4o4n8QFhCvzCew/M= github.com/klauspost/compress v1.4.0 h1:8nsMz3tWa9SWWPL60G1V6CUsf4lLjWLTNEtibhe8gh8= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.4.1 h1:8VMb5+0wMgdBykOV96DwNwKFQ+WTI4pzYURP99CcB9E= +github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e h1:+lIPJOWl+jSiJOc70QXJ07+2eg2Jy2EC7Mi11BWujeM= 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/pquerna/ffjson v0.0.0-20181028064349-e517b90714f7 h1:gGBSHPOU7g8YjTbhwn+lvFm2VDEhhA+PwDIlstkgSxE= github.com/pquerna/ffjson v0.0.0-20181028064349-e517b90714f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= github.com/rs/zerolog v1.11.0 h1:DRuq/S+4k52uJzBQciUcofXx45GrMC6yrEbb/CoK6+M= @@ -16,15 +20,20 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.0.0 h1:BwIoZQbBsTo3v2F5lz5Oy3TlTq4wLKTLV260EVTEWco= github.com/valyala/fasthttp v1.0.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= +github.com/valyala/fasthttp v1.1.0 h1:3BohG7mqwj4lq7PTX//7gLbUlzNvZSPmuHFnloXT0lw= +github.com/valyala/fasthttp v1.1.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= gitlab.com/toby3d/telegram v0.0.0-20181012114749-b3f324e1b3aa h1:cY97lp8vP4ejxaKhxDx//4gBle1NgbGYsuTnCFwhmR0= gitlab.com/toby3d/telegram v0.0.0-20181012114749-b3f324e1b3aa/go.mod h1:qV8SaSi5ClH+I+JPQ56jJxqEuiRmZ5MOj2VqFasMMnM= golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80= +golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/local/config/announces.go b/internal/config/announces.go similarity index 100% rename from local/config/announces.go rename to internal/config/announces.go diff --git a/local/config/proxy.go b/internal/config/proxy.go similarity index 100% rename from local/config/proxy.go rename to internal/config/proxy.go diff --git a/local/config/struct.go b/internal/config/struct.go similarity index 100% rename from local/config/struct.go rename to internal/config/struct.go diff --git a/local/config/telegram.go b/internal/config/telegram.go similarity index 100% rename from local/config/telegram.go rename to internal/config/telegram.go diff --git a/local/config/webhook.go b/internal/config/webhook.go similarity index 100% rename from local/config/webhook.go rename to internal/config/webhook.go diff --git a/local/router/exported.go b/internal/router/exported.go similarity index 100% rename from local/router/exported.go rename to internal/router/exported.go diff --git a/local/router/router.go b/internal/router/router.go similarity index 100% rename from local/router/router.go rename to internal/router/router.go diff --git a/local/telegram/exported.go b/internal/telegram/exported.go similarity index 100% rename from local/telegram/exported.go rename to internal/telegram/exported.go diff --git a/local/telegram/respond.go b/internal/telegram/respond.go similarity index 100% rename from local/telegram/respond.go rename to internal/telegram/respond.go diff --git a/local/telegram/telegram.go b/internal/telegram/telegram.go similarity index 97% rename from local/telegram/telegram.go rename to internal/telegram/telegram.go index 9c3de29..630098b 100644 --- a/local/telegram/telegram.go +++ b/internal/telegram/telegram.go @@ -8,7 +8,7 @@ import ( http "github.com/valyala/fasthttp" "gitlab.com/toby3d/telegram" "golang.org/x/net/proxy" - "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/router" + "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/router" "net" ) diff --git a/main.go b/main.go index 78f1a35..f2f6641 100644 --- a/main.go +++ b/main.go @@ -7,8 +7,8 @@ import ( "lab.wtfteam.pro/fat0troll/fw_zookeeper/context" "lab.wtfteam.pro/fat0troll/fw_zookeeper/domains/battles/v1" "lab.wtfteam.pro/fat0troll/fw_zookeeper/domains/commands/v1" - "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/router" - "lab.wtfteam.pro/fat0troll/fw_zookeeper/local/telegram" + "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/router" + "lab.wtfteam.pro/fat0troll/fw_zookeeper/internal/telegram" "os" "os/signal" "runtime"