From 537384db476e7d3f4a401cb306cdd38301364122 Mon Sep 17 00:00:00 2001 From: Naoki Kosaka Date: Fri, 28 Dec 2018 12:50:30 +0900 Subject: [PATCH] Apply golint. --- ActivityPub/models.go | 6 +++--- cli/cli.go | 4 ++-- cli/config.go | 2 +- cli/follow.go | 4 ++-- handle.go | 4 ++-- handle_test.go | 4 ++-- main.go | 8 ++++---- worker/sender.go | 2 +- worker/worker.go | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ActivityPub/models.go b/ActivityPub/models.go index 4f53ecf..05eeb36 100644 --- a/ActivityPub/models.go +++ b/ActivityPub/models.go @@ -9,9 +9,9 @@ import ( "net/url" "time" - "github.com/patrickmn/go-cache" - "github.com/satori/go.uuid" - "github.com/yukimochi/Activity-Relay/KeyLoader" + cache "github.com/patrickmn/go-cache" + uuid "github.com/satori/go.uuid" + keyloader "github.com/yukimochi/Activity-Relay/KeyLoader" ) // PublicKey : Activity Certificate. diff --git a/cli/cli.go b/cli/cli.go index 45348a4..ec0a614 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -9,8 +9,8 @@ import ( "github.com/go-redis/redis" "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/yukimochi/Activity-Relay/KeyLoader" - "github.com/yukimochi/Activity-Relay/State" + keyloader "github.com/yukimochi/Activity-Relay/KeyLoader" + state "github.com/yukimochi/Activity-Relay/State" ) var hostname *url.URL diff --git a/cli/config.go b/cli/config.go index 61cffdc..856162b 100644 --- a/cli/config.go +++ b/cli/config.go @@ -7,7 +7,7 @@ import ( "os" "github.com/spf13/cobra" - "github.com/yukimochi/Activity-Relay/State" + state "github.com/yukimochi/Activity-Relay/State" ) const ( diff --git a/cli/follow.go b/cli/follow.go index c1483e0..8041e54 100644 --- a/cli/follow.go +++ b/cli/follow.go @@ -8,8 +8,8 @@ import ( "github.com/RichardKnop/machinery/v1/tasks" "github.com/spf13/cobra" - "github.com/yukimochi/Activity-Relay/ActivityPub" - "github.com/yukimochi/Activity-Relay/State" + activitypub "github.com/yukimochi/Activity-Relay/ActivityPub" + state "github.com/yukimochi/Activity-Relay/State" ) func followCmdInit() *cobra.Command { diff --git a/handle.go b/handle.go index 9dc54d3..4f9925a 100644 --- a/handle.go +++ b/handle.go @@ -9,8 +9,8 @@ import ( "os" "github.com/RichardKnop/machinery/v1/tasks" - "github.com/yukimochi/Activity-Relay/ActivityPub" - "github.com/yukimochi/Activity-Relay/State" + activitypub "github.com/yukimochi/Activity-Relay/ActivityPub" + state "github.com/yukimochi/Activity-Relay/State" ) func handleWebfinger(writer http.ResponseWriter, request *http.Request) { diff --git a/handle_test.go b/handle_test.go index 1a7efd0..e7aac9b 100644 --- a/handle_test.go +++ b/handle_test.go @@ -11,8 +11,8 @@ import ( "strconv" "testing" - "github.com/yukimochi/Activity-Relay/ActivityPub" - "github.com/yukimochi/Activity-Relay/State" + activitypub "github.com/yukimochi/Activity-Relay/ActivityPub" + state "github.com/yukimochi/Activity-Relay/State" ) const ( diff --git a/main.go b/main.go index 8888dd2..b1853f9 100644 --- a/main.go +++ b/main.go @@ -10,11 +10,11 @@ import ( "github.com/RichardKnop/machinery/v1" "github.com/RichardKnop/machinery/v1/config" "github.com/go-redis/redis" - "github.com/patrickmn/go-cache" + cache "github.com/patrickmn/go-cache" "github.com/spf13/viper" - "github.com/yukimochi/Activity-Relay/ActivityPub" - "github.com/yukimochi/Activity-Relay/KeyLoader" - "github.com/yukimochi/Activity-Relay/State" + activitypub "github.com/yukimochi/Activity-Relay/ActivityPub" + keyloader "github.com/yukimochi/Activity-Relay/KeyLoader" + state "github.com/yukimochi/Activity-Relay/State" ) // Actor : Relay's Actor diff --git a/worker/sender.go b/worker/sender.go index 4cb128a..14248e7 100644 --- a/worker/sender.go +++ b/worker/sender.go @@ -10,7 +10,7 @@ import ( "net/http" "time" - "github.com/Songmu/go-httpdate" + httpdate "github.com/Songmu/go-httpdate" "github.com/yukimochi/httpsig" ) diff --git a/worker/worker.go b/worker/worker.go index ff1d75d..d29ec8d 100644 --- a/worker/worker.go +++ b/worker/worker.go @@ -10,10 +10,10 @@ import ( "github.com/RichardKnop/machinery/v1" "github.com/RichardKnop/machinery/v1/config" "github.com/go-redis/redis" - "github.com/satori/go.uuid" + uuid "github.com/satori/go.uuid" "github.com/spf13/viper" - "github.com/yukimochi/Activity-Relay/ActivityPub" - "github.com/yukimochi/Activity-Relay/KeyLoader" + activitypub "github.com/yukimochi/Activity-Relay/ActivityPub" + keyloader "github.com/yukimochi/Activity-Relay/KeyLoader" ) // Actor : Relay's Actor