From 1608ce9df1c91f4bc284587fc52b6f13fb313b93 Mon Sep 17 00:00:00 2001 From: Tyr Mactire Date: Sat, 26 Nov 2022 23:53:11 +0000 Subject: [PATCH] refactor for git.ptzo.gdn (#162) Reviewed-on: https://git.ptzo.gdn/feditools/relay/pulls/162 Co-authored-by: Tyr Mactire Co-committed-by: Tyr Mactire --- .goreleaser.yaml | 24 +++++++---- Jenkinsfile | 41 ++++++------------- Makefile | 13 +++--- cmd/relay/account.go | 6 +-- cmd/relay/action/account/logger.go | 2 +- cmd/relay/action/account/modify.go | 6 +-- cmd/relay/action/database/logger.go | 2 +- cmd/relay/action/database/migrate.go | 4 +- cmd/relay/action/server/http_server.go | 22 +++++----- cmd/relay/action/server/logger.go | 2 +- cmd/relay/action/server/notifier.go | 6 +-- cmd/relay/action/server/start.go | 28 ++++++------- cmd/relay/database.go | 6 +-- cmd/relay/flag/account.go | 2 +- cmd/relay/flag/database.go | 2 +- cmd/relay/flag/global.go | 2 +- cmd/relay/flag/redis.go | 2 +- cmd/relay/flag/server.go | 2 +- cmd/relay/flag/usage.go | 2 +- cmd/relay/logger.go | 2 +- cmd/relay/main.go | 8 ++-- cmd/relay/server.go | 6 +-- go.mod | 4 +- internal/config/values.go | 2 +- internal/db/account.go | 2 +- internal/db/block.go | 2 +- internal/db/bun/account.go | 4 +- internal/db/bun/block.go | 4 +- internal/db/bun/client.go | 4 +- internal/db/bun/client_postgres_test.go | 4 +- internal/db/bun/client_test.go | 4 +- internal/db/bun/common.go | 4 +- internal/db/bun/config.go | 4 +- internal/db/bun/db_tx.go | 2 +- internal/db/bun/error.go | 2 +- internal/db/bun/instance.go | 4 +- internal/db/bun/log_entry.go | 4 +- internal/db/bun/logger.go | 2 +- .../bun/migrations/20220426162151_v0.1.0.go | 2 +- .../bun/migrations/20220730130134_v0.2.0.go | 2 +- .../bun/migrations/20220806130729_v0.3.0.go | 2 +- .../bun/migrations/20220822160012_v0.6.0.go | 2 +- .../db/bun/migrations/20220823192715_new.go | 2 +- internal/db/bun/migrations/logger.go | 2 +- internal/db/cachemem/account.go | 4 +- internal/db/cachemem/block.go | 4 +- internal/db/cachemem/cache_mem.go | 4 +- internal/db/cachemem/config.go | 4 +- internal/db/cachemem/instance.go | 4 +- internal/db/cachemem/log_entry.go | 4 +- internal/db/cachemem/logger.go | 2 +- internal/db/config.go | 2 +- internal/db/instance.go | 2 +- internal/db/log_entry.go | 2 +- internal/fedi/fedi.go | 10 ++--- internal/fedi/handler.go | 4 +- internal/http/activitypub/activitypub.go | 8 ++-- internal/http/activitypub/actor.go | 2 +- internal/http/activitypub/inbox.go | 4 +- internal/http/activitypub/logger.go | 2 +- internal/http/activitypub/nodeinfo.go | 2 +- internal/http/activitypub/route.go | 4 +- internal/http/activitypub/webfinger.go | 2 +- internal/http/client.go | 2 +- internal/http/logger.go | 2 +- internal/http/robots/logger.go | 2 +- internal/http/robots/robots.go | 10 ++--- internal/http/server.go | 2 +- internal/http/template/admin_account.go | 2 +- internal/http/template/admin_block.go | 2 +- internal/http/template/admin_instance.go | 2 +- internal/http/template/admin_instance_view.go | 2 +- internal/http/template/admin_jobs.go | 2 +- internal/http/template/blocks.go | 2 +- internal/http/template/common.go | 4 +- internal/http/template/gen.go | 2 +- internal/http/template/home.go | 2 +- internal/http/template/instance.go | 2 +- internal/http/template/login.go | 4 +- internal/http/template/logs.go | 2 +- internal/http/template/nav.go | 2 +- internal/http/template/template.go | 12 +++--- internal/http/webapp/admin_account.go | 6 +-- internal/http/webapp/admin_block.go | 6 +-- internal/http/webapp/admin_block_add.go | 6 +-- internal/http/webapp/admin_block_delete.go | 8 ++-- internal/http/webapp/admin_block_edit.go | 10 ++--- internal/http/webapp/admin_block_import.go | 6 +-- internal/http/webapp/admin_home.go | 6 +-- internal/http/webapp/admin_home_form.go | 2 +- internal/http/webapp/admin_instance.go | 6 +-- internal/http/webapp/admin_instance_view.go | 10 ++--- .../http/webapp/admin_instance_view_kick.go | 2 +- internal/http/webapp/admin_job.go | 6 +-- internal/http/webapp/admin_job_run_job.go | 2 +- internal/http/webapp/admin_statistics.go | 10 ++--- internal/http/webapp/blocks.go | 4 +- internal/http/webapp/callback.go | 8 ++-- internal/http/webapp/error.go | 4 +- internal/http/webapp/form.go | 2 +- internal/http/webapp/home.go | 10 ++--- internal/http/webapp/instance.go | 10 ++--- internal/http/webapp/instance_kick.go | 2 +- internal/http/webapp/logger.go | 2 +- internal/http/webapp/login.go | 6 +-- internal/http/webapp/logout.go | 2 +- internal/http/webapp/logs.go | 6 +-- internal/http/webapp/middleware.go | 2 +- internal/http/webapp/permission.go | 2 +- internal/http/webapp/route.go | 4 +- internal/http/webapp/settings.go | 6 +-- internal/http/webapp/settings_form.go | 2 +- internal/http/webapp/template.go | 8 ++-- internal/http/webapp/util.go | 10 ++--- internal/http/webapp/webapp.go | 20 ++++----- internal/kv/redis/access_token.go | 4 +- internal/kv/redis/actor.go | 2 +- internal/kv/redis/client.go | 4 +- internal/kv/redis/error.go | 2 +- internal/kv/redis/fedi.go | 2 +- internal/kv/redis/host_meta.go | 2 +- internal/kv/redis/instance_oauth.go | 4 +- internal/kv/redis/logger.go | 2 +- internal/kv/redis/metrics.go | 2 +- internal/language/language.go | 2 +- internal/language/logger.go | 2 +- internal/log/log.go | 8 +--- internal/logic/block.go | 2 +- internal/logic/instance.go | 2 +- internal/logic/logic.go | 2 +- internal/logic/logic1/activity.go | 4 +- internal/logic/logic1/actor.go | 2 +- internal/logic/logic1/block.go | 4 +- internal/logic/logic1/block_add.go | 4 +- internal/logic/logic1/block_delete.go | 4 +- internal/logic/logic1/block_update.go | 4 +- internal/logic/logic1/config.go | 4 +- internal/logic/logic1/fedi.go | 4 +- internal/logic/logic1/instance.go | 8 ++-- internal/logic/logic1/instance_self.go | 8 ++-- internal/logic/logic1/log_entry.go | 2 +- internal/logic/logic1/logger.go | 2 +- internal/logic/logic1/logic.go | 22 +++++----- internal/logic/logic1/maintenance.go | 2 +- internal/logic/logic1/metrics_get.go | 6 +-- internal/logic/logic1/notification.go | 2 +- internal/logic/logic1/scheduler.go | 4 +- internal/logic/metrics.go | 2 +- internal/models/config.go | 2 +- internal/models/instance.go | 2 +- internal/models/logger.go | 2 +- internal/models/testdata/instance.go | 2 +- internal/notification/manager/logger.go | 2 +- internal/notification/manager/manager.go | 4 +- internal/notification/notifier.go | 2 +- internal/notification/telegram/client.go | 2 +- internal/notification/telegram/config.go | 2 +- internal/notification/telegram/enabled.go | 2 +- internal/notification/telegram/logger.go | 2 +- .../notification/telegram/notification.go | 2 +- internal/notification/telegram/telegram.go | 4 +- internal/runner/faktory/logger.go | 2 +- internal/runner/faktory/middleware.go | 2 +- internal/runner/faktory/notification.go | 2 +- internal/runner/faktory/runner.go | 4 +- internal/runner/runner.go | 2 +- internal/scheduler/logger.go | 2 +- internal/scheduler/module.go | 4 +- internal/token/logger.go | 2 +- internal/token/tokenizer.go | 4 +- internal/util/encrypted.go | 2 +- internal/util/encrypted_test.go | 2 +- sonar-project.properties | 11 +++++ 173 files changed, 391 insertions(+), 388 deletions(-) create mode 100644 sonar-project.properties diff --git a/.goreleaser.yaml b/.goreleaser.yaml index d5f059e..0d3fdc8 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -18,14 +18,21 @@ builds: goarch: - amd64 - arm64 + - riscv64 goos: - linux - darwin + goamd64: + - v1 + - v2 + - v3 mod_timestamp: "{{ .CommitTimestamp }}" -universal_binaries: - - replace: true archives: - - replacements: + - format: tar.gz + format_overrides: + - goos: windows + format: zip + replacements: darwin: Darwin linux: Linux windows: Windows @@ -80,10 +87,10 @@ docker_manifests: image_templates: - feditools/{{ .ProjectName }}:latest-amd64 - feditools/{{ .ProjectName }}:latest-arm64v8 -docker_signs: - - artifacts: all - args: ["sign", "--key=env://COSIGN_PRIVATE_KEY", "${artifact}"] - stdin: '{{ .Env.COSIGN_PASSWORD }}' +#docker_signs: +# - artifacts: all +# args: ["sign", "--key=env://COSIGN_PRIVATE_KEY", "${artifact}"] +# stdin: '{{ .Env.COSIGN_PASSWORD }}' snapshot: name_template: "{{ incpatch .Version }}-dev" changelog: @@ -92,3 +99,6 @@ changelog: exclude: - '^docs:' - '^deployments:' +gitea_urls: + api: https://git.ptzo.gdn/api/v1/ + download: https://git.ptzo.gdn diff --git a/Jenkinsfile b/Jenkinsfile index 9c51d6b..35ef59c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,35 +1,18 @@ pipeline { environment { - BUILD_IMAGE = 'gobuild:1.18' - BUILD_ARGS = '-e GOCACHE=/gocache -e HOME=${WORKSPACE} -v /var/lib/jenkins/gocache:/gocache -v /var/lib/jenkins/go/pkg:/go/pkg' + BUILD_IMAGE = 'gobuild:1.19' + BUILD_ARGS = '-e HOME=${WORKSPACE} -v /var/lib/jenkins/go/pkg:/go/pkg' PATH = '/go/bin:~/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/usr/local/go/bin' composeFile = "deployments/docker-compose-integration.yaml" networkName = "network-${env.BUILD_TAG}" registryCredential = 'docker-io-feditools' + scannerHome = tool 'SonarScanner 4.0' } agent any stages { - stage('Build Static Assets') { - agent { - docker { - image "${BUILD_IMAGE}" - args "${BUILD_ARGS}" - reuseNode true - } - } - steps { - script { - sh """#!/bin/bash - make clean - make stage-static - """ - } - } - } - stage('Start External Test Requirements'){ steps{ script{ @@ -60,21 +43,23 @@ pipeline { steps { script { withCredentials([ - string(credentialsId: 'codecov-feditools-relay', variable: 'CODECOV_TOKEN'), file(credentialsId: 'tls-localhost-crt', variable: 'MB_TLS_CERT'), file(credentialsId: 'tls-localhost-key', variable: 'MB_TLS_KEY') ]) { - sh """#!/bin/bash - go test --tags=postgres -race -coverprofile=coverage.txt -covermode=atomic ./... - RESULT=\$? - bash <(curl -s https://codecov.io/bash) - exit \$RESULT - """ + sh "go test --tags=postgres -race -json -coverprofile=coverage.out -covermode=atomic ./... > test-report.out" } } } } + stage('SonarQube analysis') { + steps { + withSonarQubeEnv('PupHaus') { + sh "${scannerHome}/bin/sonar-scanner" + } + } + } + stage('Build Snapshot') { agent { docker { @@ -85,7 +70,7 @@ pipeline { } steps { script { - sh '/go/bin/goreleaser build --snapshot' + sh '/go/bin/goreleaser build --rm-dist --snapshot' } } } diff --git a/Makefile b/Makefile index 84f2a1e..7db3259 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ PROJECT_NAME=relay +GITHUB_TOKEN= .DEFAULT_GOAL := test @@ -6,11 +7,6 @@ build-snapshot: export GPG_FINGERPRINT=922248E5D4629F2284964DB103B64DFCECF2BE40 build-snapshot: clean goreleaser release --snapshot -bun-new-migration: export BUN_TIMESTAMP=$(shell date +%Y%m%d%H%M%S | head -c 14) -bun-new-migration: - touch internal/db/bun/migrations/${BUN_TIMESTAMP}_new.go - cat internal/db/bun/migrations/migration.go.tmpl > internal/db/bun/migrations/${BUN_TIMESTAMP}_new.go - clean: @echo cleaning up workspace @rm -Rvf .cache coverage.txt dist relay @@ -34,6 +30,11 @@ fmt: i18n-extract: goi18n extract -format yaml -outdir web/locales -crowdin +new-migration: export BUN_TIMESTAMP=$(shell date +%Y%m%d%H%M%S | head -c 14) +new-migration: + touch internal/db/bun/migrations/${BUN_TIMESTAMP}_new.go + cat internal/db/bun/migrations/migration.go.tmpl > internal/db/bun/migrations/${BUN_TIMESTAMP}_new.go + release: clean goreleaser release @@ -52,4 +53,4 @@ tidy: vendor: tidy go mod vendor -.PHONY: build-snapshot bun-new-migration clean docker-pull docker-restart docker-start docker-stop fmt i18n-extract release stage-static test test-ext test-bench-ext tidy vendor +.PHONY: build-snapshot clean docker-pull docker-restart docker-start docker-stop fmt i18n-extract new-migration release stage-static test test-ext test-bench-ext tidy vendor diff --git a/cmd/relay/account.go b/cmd/relay/account.go index abf9cdf..6c643d9 100644 --- a/cmd/relay/account.go +++ b/cmd/relay/account.go @@ -1,9 +1,9 @@ package main import ( - "github.com/feditools/relay/cmd/relay/action/account" - "github.com/feditools/relay/cmd/relay/flag" - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/cmd/relay/action/account" + "git.ptzo.gdn/feditools/relay/cmd/relay/flag" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/cobra" ) diff --git a/cmd/relay/action/account/logger.go b/cmd/relay/action/account/logger.go index 197149c..3695631 100644 --- a/cmd/relay/action/account/logger.go +++ b/cmd/relay/action/account/logger.go @@ -1,6 +1,6 @@ package account -import "github.com/feditools/relay/internal/log" +import "git.ptzo.gdn/feditools/relay/internal/log" type empty struct{} diff --git a/cmd/relay/action/account/modify.go b/cmd/relay/action/account/modify.go index 6a81a49..d33ce7c 100644 --- a/cmd/relay/action/account/modify.go +++ b/cmd/relay/action/account/modify.go @@ -3,9 +3,9 @@ package account import ( "context" "github.com/feditools/go-lib" - "github.com/feditools/relay/cmd/relay/action" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db/bun" + "git.ptzo.gdn/feditools/relay/cmd/relay/action" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db/bun" "github.com/spf13/viper" ) diff --git a/cmd/relay/action/database/logger.go b/cmd/relay/action/database/logger.go index 4773a85..a352add 100644 --- a/cmd/relay/action/database/logger.go +++ b/cmd/relay/action/database/logger.go @@ -1,7 +1,7 @@ package database import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/cmd/relay/action/database/migrate.go b/cmd/relay/action/database/migrate.go index e678caa..4ef80f5 100644 --- a/cmd/relay/action/database/migrate.go +++ b/cmd/relay/action/database/migrate.go @@ -2,8 +2,8 @@ package database import ( "context" - "github.com/feditools/relay/cmd/relay/action" - "github.com/feditools/relay/internal/db/bun" + "git.ptzo.gdn/feditools/relay/cmd/relay/action" + "git.ptzo.gdn/feditools/relay/internal/db/bun" ) // Migrate runs database migrations diff --git a/cmd/relay/action/server/http_server.go b/cmd/relay/action/server/http_server.go index f19003d..8fe9c1d 100644 --- a/cmd/relay/action/server/http_server.go +++ b/cmd/relay/action/server/http_server.go @@ -3,17 +3,17 @@ package server import ( "context" "github.com/feditools/go-lib" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/fedi" - "github.com/feditools/relay/internal/http" - "github.com/feditools/relay/internal/http/activitypub" - "github.com/feditools/relay/internal/http/robots" - "github.com/feditools/relay/internal/http/webapp" - liblanguage "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/runner" - "github.com/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/fedi" + "git.ptzo.gdn/feditools/relay/internal/http" + "git.ptzo.gdn/feditools/relay/internal/http/activitypub" + "git.ptzo.gdn/feditools/relay/internal/http/robots" + "git.ptzo.gdn/feditools/relay/internal/http/webapp" + liblanguage "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/runner" + "git.ptzo.gdn/feditools/relay/internal/token" "github.com/go-redis/redis/v8" "github.com/spf13/viper" ) diff --git a/cmd/relay/action/server/logger.go b/cmd/relay/action/server/logger.go index 8264008..af7caca 100644 --- a/cmd/relay/action/server/logger.go +++ b/cmd/relay/action/server/logger.go @@ -1,7 +1,7 @@ package server import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/cmd/relay/action/server/notifier.go b/cmd/relay/action/server/notifier.go index d8e6c2e..7cab4b4 100644 --- a/cmd/relay/action/server/notifier.go +++ b/cmd/relay/action/server/notifier.go @@ -1,9 +1,9 @@ package server import ( - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/notification/manager" - "github.com/feditools/relay/internal/notification/telegram" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/notification/manager" + "git.ptzo.gdn/feditools/relay/internal/notification/telegram" ) func newNotifier( diff --git a/cmd/relay/action/server/start.go b/cmd/relay/action/server/start.go index 6e4ab78..e705340 100644 --- a/cmd/relay/action/server/start.go +++ b/cmd/relay/action/server/start.go @@ -4,20 +4,20 @@ import ( "context" "errors" "fmt" - "github.com/feditools/relay/cmd/relay/action" - "github.com/feditools/relay/internal/clock" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db/bun" - "github.com/feditools/relay/internal/db/cachemem" - "github.com/feditools/relay/internal/fedi" - "github.com/feditools/relay/internal/http" - "github.com/feditools/relay/internal/kv/redis" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/logic/logic1" - "github.com/feditools/relay/internal/metrics" - "github.com/feditools/relay/internal/runner/faktory" - "github.com/feditools/relay/internal/scheduler" - "github.com/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/cmd/relay/action" + "git.ptzo.gdn/feditools/relay/internal/clock" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db/bun" + "git.ptzo.gdn/feditools/relay/internal/db/cachemem" + "git.ptzo.gdn/feditools/relay/internal/fedi" + "git.ptzo.gdn/feditools/relay/internal/http" + "git.ptzo.gdn/feditools/relay/internal/kv/redis" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/logic/logic1" + "git.ptzo.gdn/feditools/relay/internal/metrics" + "git.ptzo.gdn/feditools/relay/internal/runner/faktory" + "git.ptzo.gdn/feditools/relay/internal/scheduler" + "git.ptzo.gdn/feditools/relay/internal/token" "github.com/spf13/viper" "github.com/uptrace/uptrace-go/uptrace" "os" diff --git a/cmd/relay/database.go b/cmd/relay/database.go index 3ef7daf..7dfa9d0 100644 --- a/cmd/relay/database.go +++ b/cmd/relay/database.go @@ -1,9 +1,9 @@ package main import ( - "github.com/feditools/relay/cmd/relay/action/database" - "github.com/feditools/relay/cmd/relay/flag" - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/cmd/relay/action/database" + "git.ptzo.gdn/feditools/relay/cmd/relay/flag" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/cobra" ) diff --git a/cmd/relay/flag/account.go b/cmd/relay/flag/account.go index 7b1beea..b05f728 100644 --- a/cmd/relay/flag/account.go +++ b/cmd/relay/flag/account.go @@ -1,7 +1,7 @@ package flag import ( - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/cobra" ) diff --git a/cmd/relay/flag/database.go b/cmd/relay/flag/database.go index 6b5c1aa..c00abeb 100644 --- a/cmd/relay/flag/database.go +++ b/cmd/relay/flag/database.go @@ -1,7 +1,7 @@ package flag import ( - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/cobra" ) diff --git a/cmd/relay/flag/global.go b/cmd/relay/flag/global.go index e4112bc..0f8e536 100644 --- a/cmd/relay/flag/global.go +++ b/cmd/relay/flag/global.go @@ -1,7 +1,7 @@ package flag import ( - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/cobra" ) diff --git a/cmd/relay/flag/redis.go b/cmd/relay/flag/redis.go index f3a529f..11be7de 100644 --- a/cmd/relay/flag/redis.go +++ b/cmd/relay/flag/redis.go @@ -1,7 +1,7 @@ package flag import ( - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/cobra" ) diff --git a/cmd/relay/flag/server.go b/cmd/relay/flag/server.go index 4bb0652..153c185 100644 --- a/cmd/relay/flag/server.go +++ b/cmd/relay/flag/server.go @@ -1,7 +1,7 @@ package flag import ( - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/cobra" ) diff --git a/cmd/relay/flag/usage.go b/cmd/relay/flag/usage.go index 095b0a0..5111253 100644 --- a/cmd/relay/flag/usage.go +++ b/cmd/relay/flag/usage.go @@ -1,6 +1,6 @@ package flag -import "github.com/feditools/relay/internal/config" +import "git.ptzo.gdn/feditools/relay/internal/config" var usage = config.KeyNames{ ConfigPath: "Path to a file containing feditools configuration. Values set in this file will be overwritten by values set as env vars or arguments", diff --git a/cmd/relay/logger.go b/cmd/relay/logger.go index 2931f31..07b09f8 100644 --- a/cmd/relay/logger.go +++ b/cmd/relay/logger.go @@ -1,7 +1,7 @@ package main import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/cmd/relay/main.go b/cmd/relay/main.go index e11c8f1..21a93ba 100644 --- a/cmd/relay/main.go +++ b/cmd/relay/main.go @@ -3,10 +3,10 @@ package main import ( "context" "fmt" - "github.com/feditools/relay/cmd/relay/action" - "github.com/feditools/relay/cmd/relay/flag" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/cmd/relay/action" + "git.ptzo.gdn/feditools/relay/cmd/relay/flag" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/log" "github.com/spf13/cobra" "github.com/spf13/viper" ) diff --git a/cmd/relay/server.go b/cmd/relay/server.go index a4edf58..5432e2a 100644 --- a/cmd/relay/server.go +++ b/cmd/relay/server.go @@ -1,9 +1,9 @@ package main import ( - "github.com/feditools/relay/cmd/relay/action/server" - "github.com/feditools/relay/cmd/relay/flag" - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/cmd/relay/action/server" + "git.ptzo.gdn/feditools/relay/cmd/relay/flag" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 4fd0f0a..5cda988 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/feditools/relay +module git.ptzo.gdn/feditools/relay -go 1.18 +go 1.19 require ( github.com/allegro/bigcache/v3 v3.0.2 diff --git a/internal/config/values.go b/internal/config/values.go index 6131e97..fc1b9ed 100644 --- a/internal/config/values.go +++ b/internal/config/values.go @@ -68,7 +68,7 @@ var Defaults = Values{ // application ActorKeySize: 2048, ApplicationName: "feditools-relay", - ApplicationWebsite: "https://github.com/feditools/relay", + ApplicationWebsite: "https://git.ptzo.gdn/feditools/relay", CachedActivityLimit: 1024, CachedActorLimit: 1024, CachedDigestLimit: 1024, diff --git a/internal/db/account.go b/internal/db/account.go index 7d0acd0..93782dd 100644 --- a/internal/db/account.go +++ b/internal/db/account.go @@ -2,7 +2,7 @@ package db import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "time" ) diff --git a/internal/db/block.go b/internal/db/block.go index 3cbf8a8..50ec89e 100644 --- a/internal/db/block.go +++ b/internal/db/block.go @@ -2,7 +2,7 @@ package db import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) type Block interface { diff --git a/internal/db/bun/account.go b/internal/db/bun/account.go index 2e208ab..c2e384a 100644 --- a/internal/db/bun/account.go +++ b/internal/db/bun/account.go @@ -4,8 +4,8 @@ import ( "context" "database/sql" libdatabase "github.com/feditools/go-lib/database" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/uptrace/bun" "time" ) diff --git a/internal/db/bun/block.go b/internal/db/bun/block.go index a2093cd..1d8be32 100644 --- a/internal/db/bun/block.go +++ b/internal/db/bun/block.go @@ -3,8 +3,8 @@ package bun import ( "context" libdatabase "github.com/feditools/go-lib/database" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/uptrace/bun" "time" ) diff --git a/internal/db/bun/client.go b/internal/db/bun/client.go index a76d112..498eab6 100644 --- a/internal/db/bun/client.go +++ b/internal/db/bun/client.go @@ -8,8 +8,8 @@ import ( "encoding/pem" "errors" "fmt" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" "github.com/jackc/pgx/v4" "github.com/jackc/pgx/v4/stdlib" "github.com/spf13/viper" diff --git a/internal/db/bun/client_postgres_test.go b/internal/db/bun/client_postgres_test.go index e6d8322..823db41 100644 --- a/internal/db/bun/client_postgres_test.go +++ b/internal/db/bun/client_postgres_test.go @@ -4,8 +4,8 @@ package bun import ( "context" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" "github.com/spf13/viper" "testing" ) diff --git a/internal/db/bun/client_test.go b/internal/db/bun/client_test.go index 9ec11f9..01ca248 100644 --- a/internal/db/bun/client_test.go +++ b/internal/db/bun/client_test.go @@ -5,8 +5,8 @@ import ( "crypto/tls" "database/sql" "fmt" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" "github.com/jackc/pgconn" "github.com/spf13/viper" "testing" diff --git a/internal/db/bun/common.go b/internal/db/bun/common.go index e4ae0e0..015fcc0 100644 --- a/internal/db/bun/common.go +++ b/internal/db/bun/common.go @@ -2,8 +2,8 @@ package bun import ( "context" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/db/bun/migrations" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/db/bun/migrations" "github.com/uptrace/bun" "github.com/uptrace/bun/migrate" ) diff --git a/internal/db/bun/config.go b/internal/db/bun/config.go index 1669950..298977a 100644 --- a/internal/db/bun/config.go +++ b/internal/db/bun/config.go @@ -2,8 +2,8 @@ package bun import ( "context" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/uptrace/bun" "time" ) diff --git a/internal/db/bun/db_tx.go b/internal/db/bun/db_tx.go index c9b231c..e0192dc 100644 --- a/internal/db/bun/db_tx.go +++ b/internal/db/bun/db_tx.go @@ -3,7 +3,7 @@ package bun import ( "context" "database/sql" - "github.com/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/db" "github.com/google/uuid" "github.com/uptrace/bun" ) diff --git a/internal/db/bun/error.go b/internal/db/bun/error.go index 8b20375..f72500d 100644 --- a/internal/db/bun/error.go +++ b/internal/db/bun/error.go @@ -1,7 +1,7 @@ package bun import ( - "github.com/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/db" "github.com/jackc/pgconn" "modernc.org/sqlite" sqlite3 "modernc.org/sqlite/lib" diff --git a/internal/db/bun/instance.go b/internal/db/bun/instance.go index 3d4025b..01bb4a5 100644 --- a/internal/db/bun/instance.go +++ b/internal/db/bun/instance.go @@ -4,8 +4,8 @@ import ( "context" "fmt" libdatabase "github.com/feditools/go-lib/database" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/uptrace/bun" "time" ) diff --git a/internal/db/bun/log_entry.go b/internal/db/bun/log_entry.go index 5619c41..36338b2 100644 --- a/internal/db/bun/log_entry.go +++ b/internal/db/bun/log_entry.go @@ -3,8 +3,8 @@ package bun import ( "context" libdatabase "github.com/feditools/go-lib/database" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/uptrace/bun" "time" ) diff --git a/internal/db/bun/logger.go b/internal/db/bun/logger.go index 4ea18bf..cae1459 100644 --- a/internal/db/bun/logger.go +++ b/internal/db/bun/logger.go @@ -1,7 +1,7 @@ package bun import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/db/bun/migrations/20220426162151_v0.1.0.go b/internal/db/bun/migrations/20220426162151_v0.1.0.go index 3f8228d..2d96c42 100644 --- a/internal/db/bun/migrations/20220426162151_v0.1.0.go +++ b/internal/db/bun/migrations/20220426162151_v0.1.0.go @@ -2,7 +2,7 @@ package migrations import ( "context" - models "github.com/feditools/relay/internal/db/bun/migrations/20220426162151_v0.1.0" + models "git.ptzo.gdn/feditools/relay/internal/db/bun/migrations/20220426162151_v0.1.0" "github.com/uptrace/bun" ) diff --git a/internal/db/bun/migrations/20220730130134_v0.2.0.go b/internal/db/bun/migrations/20220730130134_v0.2.0.go index bcd1403..c8dff14 100644 --- a/internal/db/bun/migrations/20220730130134_v0.2.0.go +++ b/internal/db/bun/migrations/20220730130134_v0.2.0.go @@ -3,7 +3,7 @@ package migrations import ( "context" "fmt" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/sqltype" ) diff --git a/internal/db/bun/migrations/20220806130729_v0.3.0.go b/internal/db/bun/migrations/20220806130729_v0.3.0.go index 6c90b29..32f2be1 100644 --- a/internal/db/bun/migrations/20220806130729_v0.3.0.go +++ b/internal/db/bun/migrations/20220806130729_v0.3.0.go @@ -2,7 +2,7 @@ package migrations import ( "context" - models "github.com/feditools/relay/internal/db/bun/migrations/20220806130729_v0.3.0" + models "git.ptzo.gdn/feditools/relay/internal/db/bun/migrations/20220806130729_v0.3.0" "github.com/uptrace/bun" ) diff --git a/internal/db/bun/migrations/20220822160012_v0.6.0.go b/internal/db/bun/migrations/20220822160012_v0.6.0.go index 9f63bf6..e9815b1 100644 --- a/internal/db/bun/migrations/20220822160012_v0.6.0.go +++ b/internal/db/bun/migrations/20220822160012_v0.6.0.go @@ -3,7 +3,7 @@ package migrations import ( "context" "fmt" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/sqltype" "strings" diff --git a/internal/db/bun/migrations/20220823192715_new.go b/internal/db/bun/migrations/20220823192715_new.go index 8649a83..7144f62 100644 --- a/internal/db/bun/migrations/20220823192715_new.go +++ b/internal/db/bun/migrations/20220823192715_new.go @@ -3,7 +3,7 @@ package migrations import ( "context" "fmt" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/sqltype" "strings" diff --git a/internal/db/bun/migrations/logger.go b/internal/db/bun/migrations/logger.go index 74e6f48..ccdd3de 100644 --- a/internal/db/bun/migrations/logger.go +++ b/internal/db/bun/migrations/logger.go @@ -1,7 +1,7 @@ package migrations import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/db/cachemem/account.go b/internal/db/cachemem/account.go index d71095e..df6d039 100644 --- a/internal/db/cachemem/account.go +++ b/internal/db/cachemem/account.go @@ -7,8 +7,8 @@ import ( "encoding/gob" "errors" "github.com/allegro/bigcache/v3" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "strconv" "strings" "time" diff --git a/internal/db/cachemem/block.go b/internal/db/cachemem/block.go index 4b89bb7..b8377f9 100644 --- a/internal/db/cachemem/block.go +++ b/internal/db/cachemem/block.go @@ -2,8 +2,8 @@ package cachemem import ( "context" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" ) func (c CacheMem) CountBlocks(ctx context.Context) (count int64, err db.Error) { diff --git a/internal/db/cachemem/cache_mem.go b/internal/db/cachemem/cache_mem.go index 7f2e2e7..d75d824 100644 --- a/internal/db/cachemem/cache_mem.go +++ b/internal/db/cachemem/cache_mem.go @@ -4,8 +4,8 @@ import ( "context" "encoding/gob" "github.com/allegro/bigcache/v3" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "go.opentelemetry.io/otel" semconv "go.opentelemetry.io/otel/semconv/v1.7.0" "go.opentelemetry.io/otel/trace" diff --git a/internal/db/cachemem/config.go b/internal/db/cachemem/config.go index 9bad76f..0c5a413 100644 --- a/internal/db/cachemem/config.go +++ b/internal/db/cachemem/config.go @@ -2,8 +2,8 @@ package cachemem import ( "context" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" ) func (c CacheMem) CreateConfigTX(ctx context.Context, txID db.TxID, configs ...*models.Config) (err db.Error) { diff --git a/internal/db/cachemem/instance.go b/internal/db/cachemem/instance.go index b661530..899518a 100644 --- a/internal/db/cachemem/instance.go +++ b/internal/db/cachemem/instance.go @@ -2,8 +2,8 @@ package cachemem import ( "context" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "time" ) diff --git a/internal/db/cachemem/log_entry.go b/internal/db/cachemem/log_entry.go index 5778308..a512db3 100644 --- a/internal/db/cachemem/log_entry.go +++ b/internal/db/cachemem/log_entry.go @@ -2,8 +2,8 @@ package cachemem import ( "context" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" ) func (c CacheMem) CountLogEntries(ctx context.Context) (count int64, err db.Error) { diff --git a/internal/db/cachemem/logger.go b/internal/db/cachemem/logger.go index a95d6b5..5c9ba2d 100644 --- a/internal/db/cachemem/logger.go +++ b/internal/db/cachemem/logger.go @@ -1,6 +1,6 @@ package cachemem -import "github.com/feditools/relay/internal/log" +import "git.ptzo.gdn/feditools/relay/internal/log" type empty struct{} diff --git a/internal/db/config.go b/internal/db/config.go index d5c376a..d844b81 100644 --- a/internal/db/config.go +++ b/internal/db/config.go @@ -2,7 +2,7 @@ package db import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) type Config interface { diff --git a/internal/db/instance.go b/internal/db/instance.go index fb3677c..72fed89 100644 --- a/internal/db/instance.go +++ b/internal/db/instance.go @@ -2,7 +2,7 @@ package db import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "time" ) diff --git a/internal/db/log_entry.go b/internal/db/log_entry.go index f840a69..26d8796 100644 --- a/internal/db/log_entry.go +++ b/internal/db/log_entry.go @@ -2,7 +2,7 @@ package db import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) type LogEntry interface { diff --git a/internal/fedi/fedi.go b/internal/fedi/fedi.go index 5d09f2f..cc70c6c 100644 --- a/internal/fedi/fedi.go +++ b/internal/fedi/fedi.go @@ -4,11 +4,11 @@ import ( "context" "github.com/feditools/go-lib/fedihelper" "github.com/feditools/go-lib/fedihelper/mastodon" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/kv" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/token" "github.com/spf13/viper" "net/url" ) diff --git a/internal/fedi/handler.go b/internal/fedi/handler.go index 68f3203..7fc2f7b 100644 --- a/internal/fedi/handler.go +++ b/internal/fedi/handler.go @@ -4,8 +4,8 @@ import ( "context" "errors" "github.com/feditools/go-lib/fedihelper" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" ) func (m *Module) CreateAccountHandler(ctx context.Context, accountI fedihelper.Account) (err error) { diff --git a/internal/http/activitypub/activitypub.go b/internal/http/activitypub/activitypub.go index d99cccd..7492741 100644 --- a/internal/http/activitypub/activitypub.go +++ b/internal/http/activitypub/activitypub.go @@ -2,10 +2,10 @@ package activitypub import ( "context" - "github.com/feditools/relay/internal/config" - ihttp "github.com/feditools/relay/internal/http" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/runner" + "git.ptzo.gdn/feditools/relay/internal/config" + ihttp "git.ptzo.gdn/feditools/relay/internal/http" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/runner" "github.com/spf13/viper" ) diff --git a/internal/http/activitypub/actor.go b/internal/http/activitypub/actor.go index 854cce9..056e52c 100644 --- a/internal/http/activitypub/actor.go +++ b/internal/http/activitypub/actor.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/feditools/go-lib/fedihelper" libhttp "github.com/feditools/go-lib/http" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" ) diff --git a/internal/http/activitypub/inbox.go b/internal/http/activitypub/inbox.go index 1404e44..aa40fdc 100644 --- a/internal/http/activitypub/inbox.go +++ b/internal/http/activitypub/inbox.go @@ -4,8 +4,8 @@ import ( "encoding/json" "errors" "github.com/feditools/go-lib/fedihelper" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" nethttp "net/http" "net/url" ) diff --git a/internal/http/activitypub/logger.go b/internal/http/activitypub/logger.go index 78c2ab6..a03d05a 100644 --- a/internal/http/activitypub/logger.go +++ b/internal/http/activitypub/logger.go @@ -1,7 +1,7 @@ package activitypub import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/http/activitypub/nodeinfo.go b/internal/http/activitypub/nodeinfo.go index dbbc414..effd99e 100644 --- a/internal/http/activitypub/nodeinfo.go +++ b/internal/http/activitypub/nodeinfo.go @@ -4,7 +4,7 @@ import ( "encoding/json" "github.com/feditools/go-lib" libhttp "github.com/feditools/go-lib/http" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" ) diff --git a/internal/http/activitypub/route.go b/internal/http/activitypub/route.go index 2a84575..dd255cf 100644 --- a/internal/http/activitypub/route.go +++ b/internal/http/activitypub/route.go @@ -1,8 +1,8 @@ package activitypub import ( - "github.com/feditools/relay/internal/http" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http" + "git.ptzo.gdn/feditools/relay/internal/path" ) // Route attaches routes to the web server diff --git a/internal/http/activitypub/webfinger.go b/internal/http/activitypub/webfinger.go index c872bdf..4482ac3 100644 --- a/internal/http/activitypub/webfinger.go +++ b/internal/http/activitypub/webfinger.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/feditools/go-lib/fedihelper" libhttp "github.com/feditools/go-lib/http" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" ) diff --git a/internal/http/client.go b/internal/http/client.go index 079c608..39dd839 100644 --- a/internal/http/client.go +++ b/internal/http/client.go @@ -3,7 +3,7 @@ package http import ( "context" "fmt" - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/viper" "io" "net/http" diff --git a/internal/http/logger.go b/internal/http/logger.go index b70c7ea..e70b1f2 100644 --- a/internal/http/logger.go +++ b/internal/http/logger.go @@ -1,7 +1,7 @@ package http import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/http/robots/logger.go b/internal/http/robots/logger.go index ecd8a96..58fa0b9 100644 --- a/internal/http/robots/logger.go +++ b/internal/http/robots/logger.go @@ -1,7 +1,7 @@ package robots import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/http/robots/robots.go b/internal/http/robots/robots.go index eb70ed1..4c0a47b 100644 --- a/internal/http/robots/robots.go +++ b/internal/http/robots/robots.go @@ -3,11 +3,11 @@ package robots import ( "errors" libhttp "github.com/feditools/go-lib/http" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" - ihttp "github.com/feditools/relay/internal/http" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" + ihttp "git.ptzo.gdn/feditools/relay/internal/http" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "github.com/sirupsen/logrus" "net/http" ) diff --git a/internal/http/server.go b/internal/http/server.go index 4d9b232..2115735 100644 --- a/internal/http/server.go +++ b/internal/http/server.go @@ -4,7 +4,7 @@ import ( "context" "fmt" libhttp "github.com/feditools/go-lib/http" - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/gorilla/mux" metrics "github.com/slok/go-http-metrics/metrics/prometheus" "github.com/slok/go-http-metrics/middleware" diff --git a/internal/http/template/admin_account.go b/internal/http/template/admin_account.go index 81fd821..e02764b 100644 --- a/internal/http/template/admin_account.go +++ b/internal/http/template/admin_account.go @@ -2,7 +2,7 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) // AdminAccountName is the name of the admin block list template. diff --git a/internal/http/template/admin_block.go b/internal/http/template/admin_block.go index 36a5de9..ecec366 100644 --- a/internal/http/template/admin_block.go +++ b/internal/http/template/admin_block.go @@ -2,7 +2,7 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) // AdminBlockName is the name of the admin block list template. diff --git a/internal/http/template/admin_instance.go b/internal/http/template/admin_instance.go index 1d68cf3..e5b1cde 100644 --- a/internal/http/template/admin_instance.go +++ b/internal/http/template/admin_instance.go @@ -2,7 +2,7 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) // AdminInstanceName is the name of the admin block list template. diff --git a/internal/http/template/admin_instance_view.go b/internal/http/template/admin_instance_view.go index f45834b..2ef9035 100644 --- a/internal/http/template/admin_instance_view.go +++ b/internal/http/template/admin_instance_view.go @@ -2,7 +2,7 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) // AdminInstanceViewName is the name of the admin block list template. diff --git a/internal/http/template/admin_jobs.go b/internal/http/template/admin_jobs.go index 4bf2b0d..44b9959 100644 --- a/internal/http/template/admin_jobs.go +++ b/internal/http/template/admin_jobs.go @@ -2,7 +2,7 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/logic" ) // AdminJobsName is the name of the admin jobs template. diff --git a/internal/http/template/blocks.go b/internal/http/template/blocks.go index 7d5643b..b305f46 100644 --- a/internal/http/template/blocks.go +++ b/internal/http/template/blocks.go @@ -1,6 +1,6 @@ package template -import "github.com/feditools/relay/internal/models" +import "git.ptzo.gdn/feditools/relay/internal/models" // BlocksName is the name of the blocks template. const BlocksName = "blocks" diff --git a/internal/http/template/common.go b/internal/http/template/common.go index f3c5d54..80ef97e 100644 --- a/internal/http/template/common.go +++ b/internal/http/template/common.go @@ -2,8 +2,8 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" ) // Common contains the variables used in nearly every template. diff --git a/internal/http/template/gen.go b/internal/http/template/gen.go index fbf7115..80faea7 100644 --- a/internal/http/template/gen.go +++ b/internal/http/template/gen.go @@ -1,7 +1,7 @@ package template import ( - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/path" "time" ) diff --git a/internal/http/template/home.go b/internal/http/template/home.go index 66d3c90..6d7f9a2 100644 --- a/internal/http/template/home.go +++ b/internal/http/template/home.go @@ -1,6 +1,6 @@ package template -import "github.com/feditools/relay/internal/models" +import "git.ptzo.gdn/feditools/relay/internal/models" // HomeName is the name of the home template. const HomeName = "home" diff --git a/internal/http/template/instance.go b/internal/http/template/instance.go index 6d6cb4a..5303f34 100644 --- a/internal/http/template/instance.go +++ b/internal/http/template/instance.go @@ -2,7 +2,7 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) // InstanceName is the name of the my instance template. diff --git a/internal/http/template/login.go b/internal/http/template/login.go index a92758f..6172741 100644 --- a/internal/http/template/login.go +++ b/internal/http/template/login.go @@ -2,8 +2,8 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" ) type Login struct { diff --git a/internal/http/template/logs.go b/internal/http/template/logs.go index a1945ed..ae479aa 100644 --- a/internal/http/template/logs.go +++ b/internal/http/template/logs.go @@ -2,7 +2,7 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) // LogsName is the name of the logs template. diff --git a/internal/http/template/nav.go b/internal/http/template/nav.go index c871d9a..dd0daef 100644 --- a/internal/http/template/nav.go +++ b/internal/http/template/nav.go @@ -1,6 +1,6 @@ package template -import "github.com/feditools/relay/internal/language" +import "git.ptzo.gdn/feditools/relay/internal/language" type Nav struct { Classes []string diff --git a/internal/http/template/template.go b/internal/http/template/template.go index 6162df2..6eb3379 100644 --- a/internal/http/template/template.go +++ b/internal/http/template/template.go @@ -2,12 +2,12 @@ package template import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" - "github.com/feditools/relay/internal/token" - "github.com/feditools/relay/web" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/web" "github.com/spf13/viper" "html/template" "io/ioutil" diff --git a/internal/http/webapp/admin_account.go b/internal/http/webapp/admin_account.go index cfe40c3..c8bf481 100644 --- a/internal/http/webapp/admin_account.go +++ b/internal/http/webapp/admin_account.go @@ -3,9 +3,9 @@ package webapp import ( libhttp "github.com/feditools/go-lib/http" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" ) diff --git a/internal/http/webapp/admin_block.go b/internal/http/webapp/admin_block.go index b86bd50..5ddf81b 100644 --- a/internal/http/webapp/admin_block.go +++ b/internal/http/webapp/admin_block.go @@ -4,9 +4,9 @@ import ( "fmt" libhttp "github.com/feditools/go-lib/http" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" ) diff --git a/internal/http/webapp/admin_block_add.go b/internal/http/webapp/admin_block_add.go index df74ba6..fe9500a 100644 --- a/internal/http/webapp/admin_block_add.go +++ b/internal/http/webapp/admin_block_add.go @@ -2,9 +2,9 @@ package webapp import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/util" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/util" "net/http" ) diff --git a/internal/http/webapp/admin_block_delete.go b/internal/http/webapp/admin_block_delete.go index 389feff..5e67cca 100644 --- a/internal/http/webapp/admin_block_delete.go +++ b/internal/http/webapp/admin_block_delete.go @@ -3,10 +3,10 @@ package webapp import ( "errors" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/token" "net/http" ) diff --git a/internal/http/webapp/admin_block_edit.go b/internal/http/webapp/admin_block_edit.go index 50f761b..95aae41 100644 --- a/internal/http/webapp/admin_block_edit.go +++ b/internal/http/webapp/admin_block_edit.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/token" - "github.com/feditools/relay/internal/util" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/internal/util" "net/http" ) diff --git a/internal/http/webapp/admin_block_import.go b/internal/http/webapp/admin_block_import.go index bd554b2..0d55433 100644 --- a/internal/http/webapp/admin_block_import.go +++ b/internal/http/webapp/admin_block_import.go @@ -6,9 +6,9 @@ import ( "fmt" libhttp "github.com/feditools/go-lib/http" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/util" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/util" "io" "io/ioutil" "net/http" diff --git a/internal/http/webapp/admin_home.go b/internal/http/webapp/admin_home.go index 7859e50..94a5475 100644 --- a/internal/http/webapp/admin_home.go +++ b/internal/http/webapp/admin_home.go @@ -3,9 +3,9 @@ package webapp import ( "context" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" "net/http" ) diff --git a/internal/http/webapp/admin_home_form.go b/internal/http/webapp/admin_home_form.go index fdca21e..e6e1ca6 100644 --- a/internal/http/webapp/admin_home_form.go +++ b/internal/http/webapp/admin_home_form.go @@ -1,7 +1,7 @@ package webapp import ( - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "net/http" ) diff --git a/internal/http/webapp/admin_instance.go b/internal/http/webapp/admin_instance.go index af81435..2c06b9e 100644 --- a/internal/http/webapp/admin_instance.go +++ b/internal/http/webapp/admin_instance.go @@ -3,9 +3,9 @@ package webapp import ( libhttp "github.com/feditools/go-lib/http" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" ) diff --git a/internal/http/webapp/admin_instance_view.go b/internal/http/webapp/admin_instance_view.go index b3dddb8..a33f8a8 100644 --- a/internal/http/webapp/admin_instance_view.go +++ b/internal/http/webapp/admin_instance_view.go @@ -3,11 +3,11 @@ package webapp import ( "fmt" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" "strconv" "strings" diff --git a/internal/http/webapp/admin_instance_view_kick.go b/internal/http/webapp/admin_instance_view_kick.go index cfc95a1..b8c9156 100644 --- a/internal/http/webapp/admin_instance_view_kick.go +++ b/internal/http/webapp/admin_instance_view_kick.go @@ -2,7 +2,7 @@ package webapp import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "net/http" ) diff --git a/internal/http/webapp/admin_job.go b/internal/http/webapp/admin_job.go index 5fe4dab..0fb3bac 100644 --- a/internal/http/webapp/admin_job.go +++ b/internal/http/webapp/admin_job.go @@ -2,9 +2,9 @@ package webapp import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/scheduler" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/scheduler" "net/http" ) diff --git a/internal/http/webapp/admin_job_run_job.go b/internal/http/webapp/admin_job_run_job.go index 68b3c19..b235c7e 100644 --- a/internal/http/webapp/admin_job_run_job.go +++ b/internal/http/webapp/admin_job_run_job.go @@ -2,7 +2,7 @@ package webapp import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/language" "net/http" ) diff --git a/internal/http/webapp/admin_statistics.go b/internal/http/webapp/admin_statistics.go index 84bda7c..9f7da0d 100644 --- a/internal/http/webapp/admin_statistics.go +++ b/internal/http/webapp/admin_statistics.go @@ -3,11 +3,11 @@ package webapp import ( "context" "fmt" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" "sort" "strconv" diff --git a/internal/http/webapp/blocks.go b/internal/http/webapp/blocks.go index aa647eb..1ff87d6 100644 --- a/internal/http/webapp/blocks.go +++ b/internal/http/webapp/blocks.go @@ -1,8 +1,8 @@ package webapp import ( - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" "net/http" ) diff --git a/internal/http/webapp/callback.go b/internal/http/webapp/callback.go index 32ff08f..5002bd4 100644 --- a/internal/http/webapp/callback.go +++ b/internal/http/webapp/callback.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" "github.com/feditools/go-lib/fedihelper" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" - "github.com/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/token" "github.com/gorilla/mux" "github.com/gorilla/sessions" "net/http" diff --git a/internal/http/webapp/error.go b/internal/http/webapp/error.go index 4823aa7..d52d96d 100644 --- a/internal/http/webapp/error.go +++ b/internal/http/webapp/error.go @@ -2,8 +2,8 @@ package webapp import ( "fmt" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" ) diff --git a/internal/http/webapp/form.go b/internal/http/webapp/form.go index b2a78d5..a6627c9 100644 --- a/internal/http/webapp/form.go +++ b/internal/http/webapp/form.go @@ -1,7 +1,7 @@ package webapp import ( - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/sirupsen/logrus" "net/http" ) diff --git a/internal/http/webapp/home.go b/internal/http/webapp/home.go index 7464331..9e7b393 100644 --- a/internal/http/webapp/home.go +++ b/internal/http/webapp/home.go @@ -2,11 +2,11 @@ package webapp import ( "fmt" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" "strconv" "strings" diff --git a/internal/http/webapp/instance.go b/internal/http/webapp/instance.go index c9ad1aa..3494c05 100644 --- a/internal/http/webapp/instance.go +++ b/internal/http/webapp/instance.go @@ -4,11 +4,11 @@ import ( "errors" "fmt" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/models" "net/http" "strconv" "strings" diff --git a/internal/http/webapp/instance_kick.go b/internal/http/webapp/instance_kick.go index dea17c4..6c42d54 100644 --- a/internal/http/webapp/instance_kick.go +++ b/internal/http/webapp/instance_kick.go @@ -2,7 +2,7 @@ package webapp import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "net/http" ) diff --git a/internal/http/webapp/logger.go b/internal/http/webapp/logger.go index 1b2f91a..e9f5705 100644 --- a/internal/http/webapp/logger.go +++ b/internal/http/webapp/logger.go @@ -1,7 +1,7 @@ package webapp import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/http/webapp/login.go b/internal/http/webapp/login.go index d774204..dee3b80 100644 --- a/internal/http/webapp/login.go +++ b/internal/http/webapp/login.go @@ -3,9 +3,9 @@ package webapp import ( "errors" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" "net/http" ) diff --git a/internal/http/webapp/logout.go b/internal/http/webapp/logout.go index 43f3106..af8a505 100644 --- a/internal/http/webapp/logout.go +++ b/internal/http/webapp/logout.go @@ -1,7 +1,7 @@ package webapp import ( - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/path" "github.com/gorilla/sessions" "net/http" ) diff --git a/internal/http/webapp/logs.go b/internal/http/webapp/logs.go index f43eb82..8d1677a 100644 --- a/internal/http/webapp/logs.go +++ b/internal/http/webapp/logs.go @@ -3,9 +3,9 @@ package webapp import ( libhttp "github.com/feditools/go-lib/http" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/path" "net/http" ) diff --git a/internal/http/webapp/middleware.go b/internal/http/webapp/middleware.go index 97dbbb0..a3a9818 100644 --- a/internal/http/webapp/middleware.go +++ b/internal/http/webapp/middleware.go @@ -3,7 +3,7 @@ package webapp import ( "context" libhttp "github.com/feditools/go-lib/http" - "github.com/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/language" "net/http" ) diff --git a/internal/http/webapp/permission.go b/internal/http/webapp/permission.go index b0a9134..ba9242f 100644 --- a/internal/http/webapp/permission.go +++ b/internal/http/webapp/permission.go @@ -1,6 +1,6 @@ package webapp -import "github.com/feditools/relay/internal/models" +import "git.ptzo.gdn/feditools/relay/internal/models" func permissionSettingsNotifications(account *models.Account) bool { switch { diff --git a/internal/http/webapp/route.go b/internal/http/webapp/route.go index 5cd28cb..a0849d2 100644 --- a/internal/http/webapp/route.go +++ b/internal/http/webapp/route.go @@ -1,8 +1,8 @@ package webapp import ( - "github.com/feditools/relay/internal/http" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http" + "git.ptzo.gdn/feditools/relay/internal/path" nethttp "net/http" ) diff --git a/internal/http/webapp/settings.go b/internal/http/webapp/settings.go index 517d576..1e7886f 100644 --- a/internal/http/webapp/settings.go +++ b/internal/http/webapp/settings.go @@ -4,9 +4,9 @@ import ( "context" "fmt" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" "net/http" ) diff --git a/internal/http/webapp/settings_form.go b/internal/http/webapp/settings_form.go index ba4f06c..fe10b25 100644 --- a/internal/http/webapp/settings_form.go +++ b/internal/http/webapp/settings_form.go @@ -2,7 +2,7 @@ package webapp import ( libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) func settingsFormValidate(cm *models.ConfigMap, displayConfig *displaySettingsHomeConfig) (bool, error) { diff --git a/internal/http/webapp/template.go b/internal/http/webapp/template.go index a1de3c7..88fe146 100644 --- a/internal/http/webapp/template.go +++ b/internal/http/webapp/template.go @@ -3,10 +3,10 @@ package webapp import ( "bytes" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "github.com/sirupsen/logrus" "net/http" ) diff --git a/internal/http/webapp/util.go b/internal/http/webapp/util.go index 99d8681..057f0f4 100644 --- a/internal/http/webapp/util.go +++ b/internal/http/webapp/util.go @@ -3,11 +3,11 @@ package webapp import ( "context" "errors" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "github.com/gorilla/mux" "github.com/gorilla/sessions" "net/http" diff --git a/internal/http/webapp/webapp.go b/internal/http/webapp/webapp.go index f18edb2..d09dea0 100644 --- a/internal/http/webapp/webapp.go +++ b/internal/http/webapp/webapp.go @@ -4,16 +4,16 @@ import ( "context" "encoding/gob" libtemplate "github.com/feditools/go-lib/template" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/fedi" - ihttp "github.com/feditools/relay/internal/http" - itemplate "github.com/feditools/relay/internal/http/template" - "github.com/feditools/relay/internal/kv" - "github.com/feditools/relay/internal/language" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/runner" - "github.com/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/fedi" + ihttp "git.ptzo.gdn/feditools/relay/internal/http" + itemplate "git.ptzo.gdn/feditools/relay/internal/http/template" + "git.ptzo.gdn/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/language" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/runner" + "git.ptzo.gdn/feditools/relay/internal/token" "github.com/go-redis/redis/v8" "github.com/gorilla/sessions" "github.com/rbcervilla/redisstore/v8" diff --git a/internal/kv/redis/access_token.go b/internal/kv/redis/access_token.go index 7c6227f..553a32d 100644 --- a/internal/kv/redis/access_token.go +++ b/internal/kv/redis/access_token.go @@ -2,8 +2,8 @@ package redis import ( "context" - "github.com/feditools/relay/internal/kv" - "github.com/feditools/relay/internal/util" + "git.ptzo.gdn/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/util" ) func (c *Client) DeleteAccessToken(ctx context.Context, accountID int64) error { diff --git a/internal/kv/redis/actor.go b/internal/kv/redis/actor.go index 564c75d..c7cef84 100644 --- a/internal/kv/redis/actor.go +++ b/internal/kv/redis/actor.go @@ -2,7 +2,7 @@ package redis import ( "context" - "github.com/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/kv" "time" ) diff --git a/internal/kv/redis/client.go b/internal/kv/redis/client.go index 9e6de24..6e83bf8 100644 --- a/internal/kv/redis/client.go +++ b/internal/kv/redis/client.go @@ -2,8 +2,8 @@ package redis import ( "context" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/kv" "github.com/go-redis/redis/extra/redisotel/v8" "github.com/go-redis/redis/v8" "github.com/spf13/viper" diff --git a/internal/kv/redis/error.go b/internal/kv/redis/error.go index 1eff8eb..c947342 100644 --- a/internal/kv/redis/error.go +++ b/internal/kv/redis/error.go @@ -2,7 +2,7 @@ package redis import ( "errors" - "github.com/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/kv" "github.com/go-redis/redis/v8" ) diff --git a/internal/kv/redis/fedi.go b/internal/kv/redis/fedi.go index 77bc7e0..771fe70 100644 --- a/internal/kv/redis/fedi.go +++ b/internal/kv/redis/fedi.go @@ -2,7 +2,7 @@ package redis import ( "context" - "github.com/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/kv" "time" ) diff --git a/internal/kv/redis/host_meta.go b/internal/kv/redis/host_meta.go index 2b97ef7..028f754 100644 --- a/internal/kv/redis/host_meta.go +++ b/internal/kv/redis/host_meta.go @@ -2,7 +2,7 @@ package redis import ( "context" - "github.com/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/kv" "time" ) diff --git a/internal/kv/redis/instance_oauth.go b/internal/kv/redis/instance_oauth.go index 85c5de8..28b9336 100644 --- a/internal/kv/redis/instance_oauth.go +++ b/internal/kv/redis/instance_oauth.go @@ -3,8 +3,8 @@ package redis import ( "context" "encoding/json" - "github.com/feditools/relay/internal/kv" - "github.com/feditools/relay/internal/util" + "git.ptzo.gdn/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/util" ) type instanceOAuth struct { diff --git a/internal/kv/redis/logger.go b/internal/kv/redis/logger.go index 67a6e66..04ebe5b 100644 --- a/internal/kv/redis/logger.go +++ b/internal/kv/redis/logger.go @@ -1,6 +1,6 @@ package redis -import "github.com/feditools/relay/internal/log" +import "git.ptzo.gdn/feditools/relay/internal/log" type empty struct{} diff --git a/internal/kv/redis/metrics.go b/internal/kv/redis/metrics.go index 9c2c1c4..bfde691 100644 --- a/internal/kv/redis/metrics.go +++ b/internal/kv/redis/metrics.go @@ -3,7 +3,7 @@ package redis import ( "context" "errors" - "github.com/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/kv" "github.com/go-redis/redis/v8" "github.com/sirupsen/logrus" "strconv" diff --git a/internal/language/language.go b/internal/language/language.go index c05b3f8..e9bac69 100644 --- a/internal/language/language.go +++ b/internal/language/language.go @@ -1,7 +1,7 @@ package language import ( - "github.com/feditools/relay/web" + "git.ptzo.gdn/feditools/relay/web" "github.com/nicksnyder/go-i18n/v2/i18n" "golang.org/x/text/language" "gopkg.in/yaml.v2" diff --git a/internal/language/logger.go b/internal/language/logger.go index 141999e..d6e0f55 100644 --- a/internal/language/logger.go +++ b/internal/language/logger.go @@ -1,6 +1,6 @@ package language -import "github.com/feditools/relay/internal/log" +import "git.ptzo.gdn/feditools/relay/internal/log" type empty struct{} diff --git a/internal/log/log.go b/internal/log/log.go index 97f589c..6c8286d 100644 --- a/internal/log/log.go +++ b/internal/log/log.go @@ -1,7 +1,7 @@ package log import ( - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/sirupsen/logrus" "github.com/spf13/viper" "reflect" @@ -22,10 +22,6 @@ func Init() error { return err } logrus.SetLevel(level) - - /*if level == logrus.TraceLevel { - logrus.SetReportCaller(true) - }*/ } return nil @@ -33,5 +29,5 @@ func Init() error { // WithPackageField creates a new logrus entry with the package name added as a field. func WithPackageField(m interface{}) *logrus.Entry { - return logrus.WithField("package", strings.ReplaceAll(strings.TrimPrefix(reflect.TypeOf(m).PkgPath(), "github.com/feditools/relay/"), "/", ".")) + return logrus.WithField("package", strings.ReplaceAll(strings.TrimPrefix(reflect.TypeOf(m).PkgPath(), "git.ptzo.gdn/feditools/relay/"), "/", ".")) } diff --git a/internal/logic/block.go b/internal/logic/block.go index b59cf62..14e6f23 100644 --- a/internal/logic/block.go +++ b/internal/logic/block.go @@ -2,7 +2,7 @@ package logic import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) type Block interface { diff --git a/internal/logic/instance.go b/internal/logic/instance.go index 6dd501e..db50df4 100644 --- a/internal/logic/instance.go +++ b/internal/logic/instance.go @@ -2,7 +2,7 @@ package logic import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "net/url" ) diff --git a/internal/logic/logic.go b/internal/logic/logic.go index bb83c78..af57b60 100644 --- a/internal/logic/logic.go +++ b/internal/logic/logic.go @@ -3,7 +3,7 @@ package logic import ( "context" "github.com/feditools/go-lib/fedihelper" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "net/http" "net/url" ) diff --git a/internal/logic/logic1/activity.go b/internal/logic/logic1/activity.go index da8f9d8..9105076 100644 --- a/internal/logic/logic1/activity.go +++ b/internal/logic/logic1/activity.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/feditools/go-lib/fedihelper" libhttp "github.com/feditools/go-lib/http" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "github.com/google/uuid" "github.com/sirupsen/logrus" "net/url" diff --git a/internal/logic/logic1/actor.go b/internal/logic/logic1/actor.go index 20cab9b..2a4110e 100644 --- a/internal/logic/logic1/actor.go +++ b/internal/logic/logic1/actor.go @@ -3,7 +3,7 @@ package logic1 import ( "context" "github.com/feditools/go-lib/fedihelper" - "github.com/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/logic" ) func (l *Logic) getActorFromDomain(ctx context.Context, domain string) (*fedihelper.Actor, error) { diff --git a/internal/logic/logic1/block.go b/internal/logic/logic1/block.go index 0bab78e..bee925c 100644 --- a/internal/logic/logic1/block.go +++ b/internal/logic/logic1/block.go @@ -3,8 +3,8 @@ package logic1 import ( "context" "errors" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/trace" ) diff --git a/internal/logic/logic1/block_add.go b/internal/logic/logic1/block_add.go index 5af3011..bf0f5ad 100644 --- a/internal/logic/logic1/block_add.go +++ b/internal/logic/logic1/block_add.go @@ -4,8 +4,8 @@ import ( "context" "errors" worker "github.com/contribsys/faktory_worker_go" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/sirupsen/logrus" ) diff --git a/internal/logic/logic1/block_delete.go b/internal/logic/logic1/block_delete.go index ab67259..1e6d63f 100644 --- a/internal/logic/logic1/block_delete.go +++ b/internal/logic/logic1/block_delete.go @@ -4,8 +4,8 @@ import ( "context" "errors" worker "github.com/contribsys/faktory_worker_go" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/sirupsen/logrus" "time" ) diff --git a/internal/logic/logic1/block_update.go b/internal/logic/logic1/block_update.go index e56f428..c51eda3 100644 --- a/internal/logic/logic1/block_update.go +++ b/internal/logic/logic1/block_update.go @@ -4,8 +4,8 @@ import ( "context" "errors" worker "github.com/contribsys/faktory_worker_go" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/sirupsen/logrus" ) diff --git a/internal/logic/logic1/config.go b/internal/logic/logic1/config.go index 44842a7..c760666 100644 --- a/internal/logic/logic1/config.go +++ b/internal/logic/logic1/config.go @@ -3,8 +3,8 @@ package logic1 import ( "context" "errors" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" "go.opentelemetry.io/otel/trace" ) diff --git a/internal/logic/logic1/fedi.go b/internal/logic/logic1/fedi.go index 206de9e..28f7839 100644 --- a/internal/logic/logic1/fedi.go +++ b/internal/logic/logic1/fedi.go @@ -2,8 +2,8 @@ package logic1 import ( "context" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "net/url" ) diff --git a/internal/logic/logic1/instance.go b/internal/logic/logic1/instance.go index b99802a..8085dac 100644 --- a/internal/logic/logic1/instance.go +++ b/internal/logic/logic1/instance.go @@ -4,10 +4,10 @@ import ( "context" "errors" "fmt" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/token" "github.com/sirupsen/logrus" "net/url" "time" diff --git a/internal/logic/logic1/instance_self.go b/internal/logic/logic1/instance_self.go index ac5ec46..21d3755 100644 --- a/internal/logic/logic1/instance_self.go +++ b/internal/logic/logic1/instance_self.go @@ -5,10 +5,10 @@ import ( "crypto/rand" "crypto/rsa" "errors" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/path" "github.com/spf13/viper" ) diff --git a/internal/logic/logic1/log_entry.go b/internal/logic/logic1/log_entry.go index 8abcaa4..cfb0f38 100644 --- a/internal/logic/logic1/log_entry.go +++ b/internal/logic/logic1/log_entry.go @@ -1,6 +1,6 @@ package logic1 -import "github.com/feditools/relay/internal/models" +import "git.ptzo.gdn/feditools/relay/internal/models" func genLogEntryBlockCreate(b *models.Block, a *models.Account) (*models.LogEntry, error) { logEntry := models.LogEntry{ diff --git a/internal/logic/logic1/logger.go b/internal/logic/logic1/logger.go index f7398be..9d10475 100644 --- a/internal/logic/logic1/logger.go +++ b/internal/logic/logic1/logger.go @@ -1,7 +1,7 @@ package logic1 import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/logic/logic1/logic.go b/internal/logic/logic1/logic.go index b489793..b9cf6c5 100644 --- a/internal/logic/logic1/logic.go +++ b/internal/logic/logic1/logic.go @@ -3,17 +3,17 @@ package logic1 import ( "context" "github.com/feditools/go-lib/fedihelper" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/db" - "github.com/feditools/relay/internal/fedi" - ihttp "github.com/feditools/relay/internal/http" - "github.com/feditools/relay/internal/kv" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/notification" - "github.com/feditools/relay/internal/path" - "github.com/feditools/relay/internal/runner" - "github.com/feditools/relay/internal/scheduler" - "github.com/feditools/relay/internal/token" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/db" + "git.ptzo.gdn/feditools/relay/internal/fedi" + ihttp "git.ptzo.gdn/feditools/relay/internal/http" + "git.ptzo.gdn/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/notification" + "git.ptzo.gdn/feditools/relay/internal/path" + "git.ptzo.gdn/feditools/relay/internal/runner" + "git.ptzo.gdn/feditools/relay/internal/scheduler" + "git.ptzo.gdn/feditools/relay/internal/token" "github.com/go-fed/activity/pub" "github.com/go-fed/httpsig" lru "github.com/hashicorp/golang-lru" diff --git a/internal/logic/logic1/maintenance.go b/internal/logic/logic1/maintenance.go index 0a814a9..d67cb28 100644 --- a/internal/logic/logic1/maintenance.go +++ b/internal/logic/logic1/maintenance.go @@ -2,7 +2,7 @@ package logic1 import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/sirupsen/logrus" "time" ) diff --git a/internal/logic/logic1/metrics_get.go b/internal/logic/logic1/metrics_get.go index cc0f6fe..8fce2fc 100644 --- a/internal/logic/logic1/metrics_get.go +++ b/internal/logic/logic1/metrics_get.go @@ -2,9 +2,9 @@ package logic1 import ( "context" - "github.com/feditools/relay/internal/kv" - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/kv" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/models" "go.opentelemetry.io/otel/trace" "time" ) diff --git a/internal/logic/logic1/notification.go b/internal/logic/logic1/notification.go index f117c88..08a505a 100644 --- a/internal/logic/logic1/notification.go +++ b/internal/logic/logic1/notification.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/trace" "strconv" diff --git a/internal/logic/logic1/scheduler.go b/internal/logic/logic1/scheduler.go index 0d7560f..3578ae2 100644 --- a/internal/logic/logic1/scheduler.go +++ b/internal/logic/logic1/scheduler.go @@ -1,8 +1,8 @@ package logic1 import ( - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/scheduler" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/scheduler" ) func (l *Logic) GetSchedulerJobs() ([]logic.SchedulerJob, error) { diff --git a/internal/logic/metrics.go b/internal/logic/metrics.go index a50d314..7c2570a 100644 --- a/internal/logic/metrics.go +++ b/internal/logic/metrics.go @@ -2,7 +2,7 @@ package logic import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "time" ) diff --git a/internal/models/config.go b/internal/models/config.go index dc81723..6b9a5ef 100644 --- a/internal/models/config.go +++ b/internal/models/config.go @@ -3,7 +3,7 @@ package models import ( "encoding/base64" "fmt" - "github.com/feditools/relay/internal/util" + "git.ptzo.gdn/feditools/relay/internal/util" "strconv" "time" ) diff --git a/internal/models/instance.go b/internal/models/instance.go index c0f7fc7..7ee17fe 100644 --- a/internal/models/instance.go +++ b/internal/models/instance.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "encoding/pem" "github.com/feditools/go-lib/fedihelper" - "github.com/feditools/relay/internal/util" + "git.ptzo.gdn/feditools/relay/internal/util" "github.com/sirupsen/logrus" "io" "strings" diff --git a/internal/models/logger.go b/internal/models/logger.go index d7112f9..eaec6a1 100644 --- a/internal/models/logger.go +++ b/internal/models/logger.go @@ -1,7 +1,7 @@ package models import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/models/testdata/instance.go b/internal/models/testdata/instance.go index 352d342..b045d27 100644 --- a/internal/models/testdata/instance.go +++ b/internal/models/testdata/instance.go @@ -1,7 +1,7 @@ package testdata import ( - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) // TestInstances contains a set of test instances diff --git a/internal/notification/manager/logger.go b/internal/notification/manager/logger.go index 6d71ee9..6ed220a 100644 --- a/internal/notification/manager/logger.go +++ b/internal/notification/manager/logger.go @@ -1,7 +1,7 @@ package manager import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/notification/manager/manager.go b/internal/notification/manager/manager.go index 10e7e57..3304681 100644 --- a/internal/notification/manager/manager.go +++ b/internal/notification/manager/manager.go @@ -1,8 +1,8 @@ package manager import ( - "github.com/feditools/relay/internal/models" - "github.com/feditools/relay/internal/notification" + "git.ptzo.gdn/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/notification" ) func New() (*Manager, error) { diff --git a/internal/notification/notifier.go b/internal/notification/notifier.go index 1595cdb..63c9f6e 100644 --- a/internal/notification/notifier.go +++ b/internal/notification/notifier.go @@ -2,7 +2,7 @@ package notification import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) // Notifier sends notifications. diff --git a/internal/notification/telegram/client.go b/internal/notification/telegram/client.go index c5fdac9..71f236c 100644 --- a/internal/notification/telegram/client.go +++ b/internal/notification/telegram/client.go @@ -3,7 +3,7 @@ package telegram import ( "context" "fmt" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/nickname76/telegrambot" "github.com/sirupsen/logrus" ) diff --git a/internal/notification/telegram/config.go b/internal/notification/telegram/config.go index 1eae4d0..07fbce2 100644 --- a/internal/notification/telegram/config.go +++ b/internal/notification/telegram/config.go @@ -2,7 +2,7 @@ package telegram import ( "fmt" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) func parseConfigMap(cm *models.ConfigMap) (bool, int, error) { diff --git a/internal/notification/telegram/enabled.go b/internal/notification/telegram/enabled.go index 267959c..34475f7 100644 --- a/internal/notification/telegram/enabled.go +++ b/internal/notification/telegram/enabled.go @@ -2,7 +2,7 @@ package telegram import ( "context" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) func (s *Service) isEnabled(ctx context.Context) (bool, error) { diff --git a/internal/notification/telegram/logger.go b/internal/notification/telegram/logger.go index cf9da3d..6c485dc 100644 --- a/internal/notification/telegram/logger.go +++ b/internal/notification/telegram/logger.go @@ -1,7 +1,7 @@ package telegram import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/notification/telegram/notification.go b/internal/notification/telegram/notification.go index 837c0ef..05ce503 100644 --- a/internal/notification/telegram/notification.go +++ b/internal/notification/telegram/notification.go @@ -3,7 +3,7 @@ package telegram import ( "context" "errors" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/nickname76/telegrambot" "github.com/sirupsen/logrus" "strings" diff --git a/internal/notification/telegram/telegram.go b/internal/notification/telegram/telegram.go index b72c22b..8121761 100644 --- a/internal/notification/telegram/telegram.go +++ b/internal/notification/telegram/telegram.go @@ -1,8 +1,8 @@ package telegram import ( - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/models" ) func New(l logic.Logic) (*Service, error) { diff --git a/internal/runner/faktory/logger.go b/internal/runner/faktory/logger.go index 22fc33d..3d3de64 100644 --- a/internal/runner/faktory/logger.go +++ b/internal/runner/faktory/logger.go @@ -1,7 +1,7 @@ package faktory import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/runner/faktory/middleware.go b/internal/runner/faktory/middleware.go index 05741eb..8766671 100644 --- a/internal/runner/faktory/middleware.go +++ b/internal/runner/faktory/middleware.go @@ -3,7 +3,7 @@ package faktory import ( "context" faktory "github.com/contribsys/faktory/client" - "github.com/feditools/relay/internal/runner" + "git.ptzo.gdn/feditools/relay/internal/runner" "go.opentelemetry.io/otel/trace" ) diff --git a/internal/runner/faktory/notification.go b/internal/runner/faktory/notification.go index b36413d..437ac5d 100644 --- a/internal/runner/faktory/notification.go +++ b/internal/runner/faktory/notification.go @@ -5,7 +5,7 @@ import ( "fmt" faktory "github.com/contribsys/faktory/client" worker "github.com/contribsys/faktory_worker_go" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" "github.com/sirupsen/logrus" ) diff --git a/internal/runner/faktory/runner.go b/internal/runner/faktory/runner.go index 95f5ed1..7aa06f3 100644 --- a/internal/runner/faktory/runner.go +++ b/internal/runner/faktory/runner.go @@ -3,8 +3,8 @@ package faktory import ( "context" worker "github.com/contribsys/faktory_worker_go" - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/logic" "github.com/spf13/viper" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" diff --git a/internal/runner/runner.go b/internal/runner/runner.go index f8709a3..e588770 100644 --- a/internal/runner/runner.go +++ b/internal/runner/runner.go @@ -3,7 +3,7 @@ package runner import ( "context" "github.com/feditools/go-lib/fedihelper" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/models" ) type Runner interface { diff --git a/internal/scheduler/logger.go b/internal/scheduler/logger.go index be74a2d..5f5c5d3 100644 --- a/internal/scheduler/logger.go +++ b/internal/scheduler/logger.go @@ -1,7 +1,7 @@ package scheduler import ( - "github.com/feditools/relay/internal/log" + "git.ptzo.gdn/feditools/relay/internal/log" ) type empty struct{} diff --git a/internal/scheduler/module.go b/internal/scheduler/module.go index fe56766..eff9b84 100644 --- a/internal/scheduler/module.go +++ b/internal/scheduler/module.go @@ -1,8 +1,8 @@ package scheduler import ( - "github.com/feditools/relay/internal/logic" - "github.com/feditools/relay/internal/runner" + "git.ptzo.gdn/feditools/relay/internal/logic" + "git.ptzo.gdn/feditools/relay/internal/runner" "github.com/go-co-op/gocron" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" diff --git a/internal/token/logger.go b/internal/token/logger.go index fad2548..74d7af6 100644 --- a/internal/token/logger.go +++ b/internal/token/logger.go @@ -1,6 +1,6 @@ package token -import "github.com/feditools/relay/internal/log" +import "git.ptzo.gdn/feditools/relay/internal/log" type empty struct{} diff --git a/internal/token/tokenizer.go b/internal/token/tokenizer.go index 006e8dd..475bbf1 100644 --- a/internal/token/tokenizer.go +++ b/internal/token/tokenizer.go @@ -1,8 +1,8 @@ package token import ( - "github.com/feditools/relay/internal/config" - "github.com/feditools/relay/internal/models" + "git.ptzo.gdn/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/models" hashids "github.com/speps/go-hashids/v2" "github.com/spf13/viper" ) diff --git a/internal/util/encrypted.go b/internal/util/encrypted.go index 25d59a4..318b2b1 100644 --- a/internal/util/encrypted.go +++ b/internal/util/encrypted.go @@ -9,7 +9,7 @@ import ( "io" "sync" - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/viper" ) diff --git a/internal/util/encrypted_test.go b/internal/util/encrypted_test.go index df1c200..ad508e5 100644 --- a/internal/util/encrypted_test.go +++ b/internal/util/encrypted_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/feditools/relay/internal/config" + "git.ptzo.gdn/feditools/relay/internal/config" "github.com/spf13/viper" "github.com/tmthrgd/go-hex" ) diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..ca6aefc --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,11 @@ +sonar.projectKey=tools.fedi.relay +sonar.projectName=FediTools Relay + +sonar.sources=. +sonar.exclusions=**/*_test.go + +sonar.tests=. +sonar.test.inclusions=**/*_test.go + +sonar.go.tests.reportPaths=test-report.out +sonar.go.coverage.reportPaths=coverage.out \ No newline at end of file