refactor(go): bump the module version and support go install (#979)

BREAKING CHANGE: The original Go module name was `github.com/ArtalkJS/Artalk`, which has now been modified to `github.com/artalkjs/artalk/v2` (all lowercase). This change may affect the CI pipeline or other areas if you are compiling the Artalk server and have specified the fixed Go module name. Regarding the original `-ldflags -X github.com/ArtalkJS/Artalk/internal/config.Version` and `CommitHash` definitions, please remove them, as they are now obsolete. The `Version` has been hardcoded into the Go code, and the `CommitHash` is now read from the Go build info via runtime/debug’s vcs.revision value. This change only affects the server developers and does not impact the frontend UI client.
This commit is contained in:
qwqcode authored and qwqcode committed 2024-09-18 21:43:43 +08:00
1 parent 9cc3252c0f
commit cf7725edba
190 files changed
+481 -482

No files matched your search

+2 -3
View File
@@ -12,7 +12,6 @@ on:
env:
GO_VERSION: 1.22.6
PKG_NAME: github.com/ArtalkJS/Artalk
DOCKER_IMG: ghcr.io/goreleaser/goreleaser-cross
CACHE_DIR: /tmp/cache/docker-image
@@ -78,8 +77,8 @@ jobs:
--privileged \
-v /var/run/docker.sock:/var/run/docker.sock \
-v $(pwd)/sysroot:/sysroot \
-v $(pwd):/go/src/${PKG_NAME} \
-w /go/src/${PKG_NAME} \
-v $(pwd):/repo \
-w /repo \
-e CGO_ENABLED=1 \
--env-file local/.release-env \
ghcr.io/goreleaser/goreleaser-cross:v${GO_VERSION} \
+2 -2
View File
@@ -36,8 +36,8 @@ builds:
binary: "{{.ProjectName}}"
main: ./main.go
ldflags: &common_ldflags |
-X github.com/ArtalkJS/Artalk/internal/config.Version={{.Version}}
-X github.com/ArtalkJS/Artalk/internal/config.CommitHash={{ .ShortCommit }}
-X github.com/artalkjs/artalk/v2/internal/config.Version={{.Version}}
-X github.com/artalkjs/artalk/v2/internal/config.CommitHash={{ .ShortCommit }}
-s -w
# Linux (arm_64)
+1 -1
View File
@@ -1,4 +1,4 @@
PKG_NAME := github.com/ArtalkJS/Artalk
PKG_NAME := github.com/artalkjs/artalk/v2
BIN_NAME := ./bin/artalk
VERSION ?= $(shell git describe --tags --abbrev=0 --match 'v*')
COMMIT_HASH ?= $(shell git rev-parse --short HEAD)
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"strings"
"syscall"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/utils"
"github.com/spf13/cobra"
"golang.org/x/term"
)
+3 -3
View File
@@ -6,9 +6,9 @@ import (
"os/signal"
"syscall"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/core"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/core"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/fatih/color"
"github.com/spf13/cobra"
)
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"fmt"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/spf13/cobra"
)
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"path/filepath"
"time"
"github.com/ArtalkJS/Artalk/internal/artransfer"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/artransfer"
"github.com/artalkjs/artalk/v2/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/utils"
"github.com/spf13/cobra"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package cmd
import (
"github.com/ArtalkJS/Artalk/internal/core"
"github.com/artalkjs/artalk/v2/internal/core"
"github.com/spf13/cobra"
)
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"errors"
"os"
"github.com/ArtalkJS/Artalk/internal/artransfer"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/artransfer"
"github.com/artalkjs/artalk/v2/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/spf13/cobra"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package cmd
import (
"fmt"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/server"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/server"
"github.com/spf13/cobra"
)
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"os"
"strings"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/blang/semver"
"github.com/rhysd/go-github-selfupdate/selfupdate"
"github.com/spf13/cobra"
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/ArtalkJS/Artalk
module github.com/artalkjs/artalk/v2
go 1.22.6
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"reflect"
"strings"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/log"
)
var _ Checker = (*AkismetChecker)(nil)
+1 -1
View File
@@ -3,7 +3,7 @@ package anti_spam
import (
"fmt"
"github.com/ArtalkJS/Artalk/internal/cloud/aliyun"
"github.com/artalkjs/artalk/v2/internal/cloud/aliyun"
)
var _ Checker = (*AliyunChecker)(nil)
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"strconv"
"strings"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/samber/lo"
)
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"os"
"testing"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
)
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"strings"
"sync"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/utils"
)
var _ Checker = (*KeywordsChecker)(nil)
+1 -1
View File
@@ -3,7 +3,7 @@ package anti_spam
import (
"fmt"
"github.com/ArtalkJS/Artalk/internal/cloud/qcloud"
"github.com/artalkjs/artalk/v2/internal/cloud/qcloud"
)
var _ Checker = (*TencentChecker)(nil)
+3 -3
View File
@@ -3,9 +3,9 @@ package artransfer
import (
"fmt"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/i18n"
"gorm.io/gorm"
)
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"regexp"
"testing"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/internal/db"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/internal/db"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/test"
"github.com/stretchr/testify/assert"
)
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os"
"strings"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/jedib0t/go-pretty/v6/table"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package artransfer
import (
"encoding/json"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/utils"
"gorm.io/gorm"
)
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"strings"
"time"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/utils"
"github.com/cheggaaa/pb/v3"
"github.com/samber/lo"
"gorm.io/gorm"
+1 -1
View File
@@ -4,7 +4,7 @@
package artransfer
import (
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/entity"
"gorm.io/gorm"
)
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"strings"
"testing"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/internal/db"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/internal/db"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/stretchr/testify/assert"
)
+1 -1
View File
@@ -7,8 +7,8 @@ import (
"regexp"
"time"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/araddon/dateparse"
"github.com/artalkjs/artalk/v2/internal/i18n"
)
func readJsonFile(filename string) (string, error) {
+1 -1
View File
@@ -3,7 +3,7 @@ package auth
import (
"strings"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/markbates/goth"
"golang.org/x/text/cases"
"golang.org/x/text/language"
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"net/url"
"strings"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/markbates/goth"
"github.com/markbates/goth/providers/apple"
"github.com/markbates/goth/providers/auth0"
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"time"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/utils"
)
func RegisterSocialUser(dao *dao.Dao, u SocialUser) (entity.AuthIdentity, error) {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"reflect"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/eko/gocache/lib/v4/store"
"golang.org/x/sync/singleflight"
)
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"sync/atomic"
"testing"
"github.com/ArtalkJS/Artalk/internal/cache"
"github.com/artalkjs/artalk/v2/internal/cache"
"github.com/stretchr/testify/assert"
)
+2 -2
View File
@@ -5,9 +5,9 @@ import (
"strings"
"time"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/allegro/bigcache/v3"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/bradfitz/gomemcache/memcache"
lib_cache "github.com/eko/gocache/lib/v4/cache"
"github.com/eko/gocache/lib/v4/marshaler"
+2 -2
View File
@@ -3,8 +3,8 @@ package cache_test
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/cache"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/cache"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/stretchr/testify/assert"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package captcha
import (
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
)
type Map = map[string]interface{}
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"net/url"
"time"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/tidwall/gjson"
)
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"net/url"
"time"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/tidwall/gjson"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package captcha
import (
"github.com/ArtalkJS/Artalk/internal/captcha/image_captcha"
"github.com/artalkjs/artalk/v2/internal/captcha/image_captcha"
)
var _ Checker = (*ImageChecker)(nil)
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"net/url"
"time"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/tidwall/gjson"
)
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"net/url"
"time"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/tidwall/gjson"
)
@@ -7,7 +7,7 @@ import (
"strings"
"time"
"github.com/ArtalkJS/Artalk/internal/cache/simple_cache"
"github.com/artalkjs/artalk/v2/internal/cache/simple_cache"
"github.com/steambap/captcha"
)
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"strings"
"unicode"
"github.com/ArtalkJS/Artalk/internal/config/env_provider"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/config/env_provider"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/utils"
"github.com/knadh/koanf"
"github.com/knadh/koanf/parsers/yaml"
"github.com/knadh/koanf/providers/file"
+1 -1
View File
@@ -2,7 +2,7 @@
package config
import "github.com/ArtalkJS/Artalk/internal/config/meta"
import "github.com/artalkjs/artalk/v2/internal/config/meta"
// Cache result of `meta.GetEnvPathMap(config.Config{}, config.Template("en"))`
var EnvPathMapCache = map[string]string{"ATK_ADMIN_NOTIFY_BARK_ENABLED":"admin_notify.bark.enabled", "ATK_ADMIN_NOTIFY_BARK_SERVER":"admin_notify.bark.server", "ATK_ADMIN_NOTIFY_DING_TALK_ENABLED":"admin_notify.ding_talk.enabled", "ATK_ADMIN_NOTIFY_DING_TALK_SECRET":"admin_notify.ding_talk.secret", "ATK_ADMIN_NOTIFY_DING_TALK_TOKEN":"admin_notify.ding_talk.token", "ATK_ADMIN_NOTIFY_EMAIL":"admin_notify.email", "ATK_ADMIN_NOTIFY_EMAIL_ENABLED":"admin_notify.email.enabled", "ATK_ADMIN_NOTIFY_EMAIL_MAIL_SUBJECT":"admin_notify.email.mail_subject", "ATK_ADMIN_NOTIFY_EMAIL_MAIL_TPL":"admin_notify.email.mail_tpl", "ATK_ADMIN_NOTIFY_LARK_ENABLED":"admin_notify.lark.enabled", "ATK_ADMIN_NOTIFY_LARK_MSG_TYPE":"admin_notify.lark.msg_type", "ATK_ADMIN_NOTIFY_LARK_WEBHOOK_URL":"admin_notify.lark.webhook_url", "ATK_ADMIN_NOTIFY_LINE_CHANNEL_ACCESS_TOKEN":"admin_notify.line.channel_access_token", "ATK_ADMIN_NOTIFY_LINE_CHANNEL_SECRET":"admin_notify.line.channel_secret", "ATK_ADMIN_NOTIFY_LINE_ENABLED":"admin_notify.line.enabled", "ATK_ADMIN_NOTIFY_LINE_RECEIVERS":"admin_notify.line.receivers", "ATK_ADMIN_NOTIFY_LINE_RECEIVERS_$$":"admin_notify.line.receivers.$$", "ATK_ADMIN_NOTIFY_NOISE_MODE":"admin_notify.noise_mode", "ATK_ADMIN_NOTIFY_NOTIFY_PENDING":"admin_notify.notify_pending", "ATK_ADMIN_NOTIFY_NOTIFY_SUBJECT":"admin_notify.notify_subject", "ATK_ADMIN_NOTIFY_NOTIFY_TPL":"admin_notify.notify_tpl", "ATK_ADMIN_NOTIFY_SLACK_ENABLED":"admin_notify.slack.enabled", "ATK_ADMIN_NOTIFY_SLACK_OAUTH_TOKEN":"admin_notify.slack.oauth_token", "ATK_ADMIN_NOTIFY_SLACK_RECEIVERS":"admin_notify.slack.receivers", "ATK_ADMIN_NOTIFY_SLACK_RECEIVERS_$$":"admin_notify.slack.receivers.$$", "ATK_ADMIN_NOTIFY_TELEGRAM_API_TOKEN":"admin_notify.telegram.api_token", "ATK_ADMIN_NOTIFY_TELEGRAM_ENABLED":"admin_notify.telegram.enabled", "ATK_ADMIN_NOTIFY_TELEGRAM_RECEIVERS":"admin_notify.telegram.receivers", "ATK_ADMIN_NOTIFY_TELEGRAM_RECEIVERS_$$":"admin_notify.telegram.receivers.$$", "ATK_ADMIN_NOTIFY_WEBHOOK_ENABLED":"admin_notify.webhook.enabled", "ATK_ADMIN_NOTIFY_WEBHOOK_URL":"admin_notify.webhook.url", "ATK_ADMIN_USERS_$$_BADGE_COLOR":"admin_users.$$.badge_color", "ATK_ADMIN_USERS_$$_BADGE_NAME":"admin_users.$$.badge_name", "ATK_ADMIN_USERS_$$_EMAIL":"admin_users.$$.email", "ATK_ADMIN_USERS_$$_LINK":"admin_users.$$.link", "ATK_ADMIN_USERS_$$_NAME":"admin_users.$$.name", "ATK_ADMIN_USERS_$$_PASSWORD":"admin_users.$$.password", "ATK_ADMIN_USERS_$$_RECEIVE_EMAIL":"admin_users.$$.receive_email", "ATK_ADMIN__NOTIFY_BARK_ENABLED":"admin_notify.bark.enabled", "ATK_ADMIN__NOTIFY_BARK_SERVER":"admin_notify.bark.server", "ATK_ADMIN__NOTIFY_DING__TALK_ENABLED":"admin_notify.ding_talk.enabled", "ATK_ADMIN__NOTIFY_DING__TALK_SECRET":"admin_notify.ding_talk.secret", "ATK_ADMIN__NOTIFY_DING__TALK_TOKEN":"admin_notify.ding_talk.token", "ATK_ADMIN__NOTIFY_EMAIL":"admin_notify.email", "ATK_ADMIN__NOTIFY_LARK_ENABLED":"admin_notify.lark.enabled", "ATK_ADMIN__NOTIFY_LARK_MSG__TYPE":"admin_notify.lark.msg_type", "ATK_ADMIN__NOTIFY_LARK_WEBHOOK__URL":"admin_notify.lark.webhook_url", "ATK_ADMIN__NOTIFY_LINE_CHANNEL__ACCESS__TOKEN":"admin_notify.line.channel_access_token", "ATK_ADMIN__NOTIFY_LINE_CHANNEL__SECRET":"admin_notify.line.channel_secret", "ATK_ADMIN__NOTIFY_LINE_ENABLED":"admin_notify.line.enabled", "ATK_ADMIN__NOTIFY_LINE_RECEIVERS_$$":"admin_notify.line.receivers.$$", "ATK_ADMIN__NOTIFY_NOISE__MODE":"admin_notify.noise_mode", "ATK_ADMIN__NOTIFY_NOTIFY__PENDING":"admin_notify.notify_pending", "ATK_ADMIN__NOTIFY_NOTIFY__SUBJECT":"admin_notify.notify_subject", "ATK_ADMIN__NOTIFY_NOTIFY__TPL":"admin_notify.notify_tpl", "ATK_ADMIN__NOTIFY_SLACK_ENABLED":"admin_notify.slack.enabled", "ATK_ADMIN__NOTIFY_SLACK_OAUTH__TOKEN":"admin_notify.slack.oauth_token", "ATK_ADMIN__NOTIFY_SLACK_RECEIVERS_$$":"admin_notify.slack.receivers.$$", "ATK_ADMIN__NOTIFY_TELEGRAM_API__TOKEN":"admin_notify.telegram.api_token", "ATK_ADMIN__NOTIFY_TELEGRAM_ENABLED":"admin_notify.telegram.enabled", "ATK_ADMIN__NOTIFY_TELEGRAM_RECEIVERS_$$":"admin_notify.telegram.receivers.$$", "ATK_ADMIN__NOTIFY_WEBHOOK_ENABLED":"admin_notify.webhook.enabled", "ATK_ADMIN__NOTIFY_WEBHOOK_URL":"admin_notify.webhook.url", "ATK_ADMIN__USERS_$$_BADGE__COLOR":"admin_users.$$.badge_color", "ATK_ADMIN__USERS_$$_BADGE__NAME":"admin_users.$$.badge_name", "ATK_ADMIN__USERS_$$_EMAIL":"admin_users.$$.email", "ATK_ADMIN__USERS_$$_LINK":"admin_users.$$.link", "ATK_ADMIN__USERS_$$_NAME":"admin_users.$$.name", "ATK_ADMIN__USERS_$$_PASSWORD":"admin_users.$$.password", "ATK_ADMIN__USERS_$$_RECEIVE__EMAIL":"admin_users.$$.receive_email", "ATK_APP_KEY":"app_key", "ATK_APP__KEY":"app_key", "ATK_AUTH_ANONYMOUS":"auth.anonymous", "ATK_AUTH_APPLE_CLIENT_ID":"auth.apple.client_id", "ATK_AUTH_APPLE_CLIENT_SECRET":"auth.apple.client_secret", "ATK_AUTH_APPLE_CLIENT__ID":"auth.apple.client_id", "ATK_AUTH_APPLE_CLIENT__SECRET":"auth.apple.client_secret", "ATK_AUTH_APPLE_ENABLED":"auth.apple.enabled", "ATK_AUTH_AUTH0_CLIENT_ID":"auth.Line truncated
+4 -4
View File
@@ -11,9 +11,9 @@ import (
"strconv"
"strings"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/config/meta"
"github.com/ArtalkJS/Artalk/internal/pkged"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/config/meta"
"github.com/artalkjs/artalk/v2/internal/pkged"
"github.com/samber/lo"
)
@@ -103,7 +103,7 @@ func main() {
func getGo(metas []meta.OptionsMeta, mapping map[string]string) string {
str := "// Code generated by go run internal/config/meta/gen/main.go. DO NOT EDIT.\n\n"
str += "package " + pkgName + "\n\nimport \"github.com/ArtalkJS/Artalk/internal/config/meta\"\n\n"
str += "package " + pkgName + "\n\nimport \"github.com/artalkjs/artalk/v2/internal/config/meta\"\n\n"
str += "// Cache result of `meta.GetEnvPathMap(config.Config{}, config.Template(\"" + locale + "\"))`\n"
str += fmt.Sprintf("var EnvPathMapCache = %#v\n\n", mapping)
str += "// Cache result of `meta.GetOptionsMetaData(config.Template(\"" + locale + "\"))`\n"
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"strings"
"testing"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/config/meta"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/config/meta"
"github.com/artalkjs/artalk/v2/test"
)
func Test_GetEnvPathMapByModel(t *testing.T) {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"sort"
"strings"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/i18n"
"github.com/goccy/go-yaml"
"github.com/iancoleman/strcase"
"github.com/knadh/koanf/maps"
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"fmt"
"testing"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/config/meta"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/config/meta"
"github.com/artalkjs/artalk/v2/test"
)
func Test_GetOptionsMetaData(t *testing.T) {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"io"
"github.com/ArtalkJS/Artalk/internal/pkged"
"github.com/artalkjs/artalk/v2/internal/pkged"
)
const CONF_TPL_DEFAULT_PATH = "conf/artalk.example.yml"
+1 -1
View File
@@ -3,7 +3,7 @@ package config
import (
"strings"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/utils"
)
// Get the hash function according to the frontend gravatar.params configuration
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"reflect"
"testing"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/utils"
"github.com/stretchr/testify/assert"
)
+8 -8
View File
@@ -7,14 +7,14 @@ import (
"sync"
"time"
"github.com/ArtalkJS/Artalk/internal/cache"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/internal/db"
"github.com/ArtalkJS/Artalk/internal/hook"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/pkged"
"github.com/artalkjs/artalk/v2/internal/cache"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/internal/db"
"github.com/artalkjs/artalk/v2/internal/hook"
"github.com/artalkjs/artalk/v2/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/pkged"
)
type App struct {
+1 -1
View File
@@ -3,7 +3,7 @@ package core
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/stretchr/testify/assert"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package core
import (
"strconv"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
)
func (app *App) syncFromConf() {
+1 -1
View File
@@ -1,6 +1,6 @@
package core
import "github.com/ArtalkJS/Artalk/internal/config"
import "github.com/artalkjs/artalk/v2/internal/config"
// -------------------------------------------------------------------
// Event data
+5 -5
View File
@@ -8,11 +8,11 @@ import (
"path/filepath"
"strings"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/i18n"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/pkged"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/i18n"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/pkged"
"github.com/artalkjs/artalk/v2/internal/utils"
)
func Gen(genType string, specificPath string, overwrite bool) {
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"net/url"
"github.com/ArtalkJS/Artalk/internal/anti_spam"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/anti_spam"
"github.com/artalkjs/artalk/v2/internal/entity"
)
var _ Service = (*AntiSpamService)(nil)
+4 -4
View File
@@ -3,10 +3,10 @@ package core
import (
"time"
"github.com/ArtalkJS/Artalk/internal/email"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/template"
"github.com/artalkjs/artalk/v2/internal/email"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/template"
)
var _ Service = (*EmailService)(nil)
+1 -1
View File
@@ -1,6 +1,6 @@
package core
import "github.com/ArtalkJS/Artalk/internal/ip_region"
import "github.com/artalkjs/artalk/v2/internal/ip_region"
var _ Service = (*IPRegionService)(nil)
+2 -2
View File
@@ -1,8 +1,8 @@
package core
import (
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/notify_pusher"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/notify_pusher"
)
var _ Service = (*NotifyService)(nil)
+1 -1
View File
@@ -1,7 +1,7 @@
package dao
import (
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/entity"
)
// ===============
+1 -1
View File
@@ -3,7 +3,7 @@ package dao_test
import (
"testing"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/test"
"github.com/stretchr/testify/assert"
)
+4 -4
View File
@@ -3,10 +3,10 @@ package dao_test
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/cache"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/internal/db"
"github.com/artalkjs/artalk/v2/internal/cache"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/internal/db"
"github.com/stretchr/testify/assert"
"gorm.io/gorm"
)
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"github.com/ArtalkJS/Artalk/internal/cache"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/cache"
"github.com/artalkjs/artalk/v2/internal/entity"
"golang.org/x/exp/slices"
)
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"strings"
"testing"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/stretchr/testify/assert"
"gorm.io/gorm"
)
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"time"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
)
// 缓存预热
+2 -2
View File
@@ -5,8 +5,8 @@ package dao
import (
"strings"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/utils"
"github.com/samber/lo"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package dao
import (
"os"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
)
func (dao *Dao) MigrateModels() {
+1 -1
View File
@@ -1,7 +1,7 @@
package dao
import (
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/entity"
"gorm.io/gorm"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package dao
import (
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/entity"
)
// TODO: consider refactor make all delete operations in a transaction
+2 -2
View File
@@ -3,8 +3,8 @@ package dao_test
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/test"
"github.com/stretchr/testify/assert"
)
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"github.com/ArtalkJS/Artalk/internal/cache"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/cache"
"github.com/artalkjs/artalk/v2/internal/entity"
"golang.org/x/sync/singleflight"
)
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"fmt"
"strings"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/utils"
"golang.org/x/sync/singleflight"
)
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"testing"
"time"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/test"
"github.com/stretchr/testify/assert"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package dao_test
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/test"
"github.com/stretchr/testify/assert"
)
+2 -2
View File
@@ -1,8 +1,8 @@
package dao
import (
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
)
func (dao *Dao) NewSite(name string, urls string) entity.Site {
+2 -2
View File
@@ -3,8 +3,8 @@ package dao_test
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/test"
"github.com/stretchr/testify/assert"
)
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"time"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
)
// 更新评论
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"strings"
"time"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/utils"
)
// ===============
+2 -2
View File
@@ -3,8 +3,8 @@ package dao_test
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/test"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/test"
)
func Test_GetPageAccessibleURL(t *testing.T) {
+2 -2
View File
@@ -3,8 +3,8 @@ package db
import (
"fmt"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/db/logger"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/db/logger"
"gorm.io/gorm"
"gorm.io/gorm/schema"
)
+1 -1
View File
@@ -3,7 +3,7 @@ package db
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/stretchr/testify/assert"
)
+1 -1
View File
@@ -3,7 +3,7 @@ package db
import (
"fmt"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/samber/lo"
)
+1 -1
View File
@@ -3,7 +3,7 @@ package db
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
)
func TestGetDsnByConf(t *testing.T) {
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"strings"
"time"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/log"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"gorm.io/gorm"
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt"
"path/filepath"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/utils"
"gorm.io/driver/mysql"
"gorm.io/driver/postgres"
"gorm.io/driver/sqlite"
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"sync"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/log"
)
type EmailConf struct {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/stretchr/testify/assert"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package email
import (
"fmt"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/entity"
)
type Email struct {
+2 -2
View File
@@ -1,8 +1,8 @@
package email
import (
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/log"
aliyun_email "github.com/qwqcode/go-aliyun-email"
"github.com/samber/lo"
)
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"io"
"os/exec"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/log"
)
// CmdSender implements Sender
+2 -2
View File
@@ -1,8 +1,8 @@
package email
import (
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/log"
"gopkg.in/gomail.v2"
)
+1 -1
View File
@@ -3,7 +3,7 @@ package entity
import (
"time"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/utils"
"gorm.io/gorm"
)
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"sync"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/utils"
)
var ErrStopPropagation = errors.New("event hook propagation stopped")
+2 -2
View File
@@ -1,8 +1,8 @@
package i18n
import (
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/ArtalkJS/Artalk/internal/utils"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/artalkjs/artalk/v2/internal/utils"
"gopkg.in/yaml.v3"
)
+2 -2
View File
@@ -3,8 +3,8 @@ package ip_region
import (
"strings"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/log"
)
type IPRegion struct {
+1 -1
View File
@@ -3,7 +3,7 @@ package ip_region
import (
"strings"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
)
func ipScraper(ip string) string {
+1 -1
View File
@@ -3,7 +3,7 @@ package ip_region
import (
"testing"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/artalkjs/artalk/v2/internal/config"
)
func TestIpScraper(t *testing.T) {
+1 -1
View File
@@ -1,7 +1,7 @@
package limiter
import (
"github.com/ArtalkJS/Artalk/internal/cache/simple_cache"
"github.com/artalkjs/artalk/v2/internal/cache/simple_cache"
)
// 操作次数限制器(根据 IP)
+4 -4
View File
@@ -3,10 +3,10 @@ package notify_pusher
import (
"context"
"github.com/ArtalkJS/Artalk/internal/config"
"github.com/ArtalkJS/Artalk/internal/dao"
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/config"
"github.com/artalkjs/artalk/v2/internal/dao"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
"github.com/nikoksr/notify"
"github.com/nikoksr/notify/service/dingding"
"github.com/nikoksr/notify/service/line"
+1 -1
View File
@@ -1,7 +1,7 @@
package notify_pusher
import (
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/artalkjs/artalk/v2/internal/entity"
)
func (pusher *NotifyPusher) checkNeedSendEmailToUser(comment *entity.Comment, parentComment *entity.Comment) bool {
+2 -2
View File
@@ -1,8 +1,8 @@
package notify_pusher
import (
"github.com/ArtalkJS/Artalk/internal/entity"
"github.com/ArtalkJS/Artalk/internal/log"
"github.com/artalkjs/artalk/v2/internal/entity"
"github.com/artalkjs/artalk/v2/internal/log"
"golang.org/x/exp/slices"
)
Loaded 100 of 190 files, more files were not shown because too many files have changed in this diff. Show more