Skip to content

Commit cf7725e

Browse files
qwqcodeqwqcode
committed
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.
1 parent 9cc3252 commit cf7725e

File tree

190 files changed

+481
-482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+481
-482
lines changed

‎.github/workflows/build-app.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212

1313
env:
1414
GO_VERSION: 1.22.6
15-
PKG_NAME: github.com/ArtalkJS/Artalk
1615
DOCKER_IMG: ghcr.io/goreleaser/goreleaser-cross
1716
CACHE_DIR: /tmp/cache/docker-image
1817

@@ -78,8 +77,8 @@ jobs:
7877
--privileged \
7978
-v /var/run/docker.sock:/var/run/docker.sock \
8079
-v $(pwd)/sysroot:/sysroot \
81-
-v $(pwd):/go/src/${PKG_NAME} \
82-
-w /go/src/${PKG_NAME} \
80+
-v $(pwd):/repo \
81+
-w /repo \
8382
-e CGO_ENABLED=1 \
8483
--env-file local/.release-env \
8584
ghcr.io/goreleaser/goreleaser-cross:v${GO_VERSION} \

‎.goreleaser.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ builds:
3636
binary: "{{.ProjectName}}"
3737
main: ./main.go
3838
ldflags: &common_ldflags |
39-
-X github.com/ArtalkJS/Artalk/internal/config.Version={{.Version}}
40-
-X github.com/ArtalkJS/Artalk/internal/config.CommitHash={{ .ShortCommit }}
39+
-X github.com/artalkjs/artalk/v2/internal/config.Version={{.Version}}
40+
-X github.com/artalkjs/artalk/v2/internal/config.CommitHash={{ .ShortCommit }}
4141
-s -w
4242

4343
# Linux (arm_64)

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PKG_NAME := github.com/ArtalkJS/Artalk
1+
PKG_NAME := github.com/artalkjs/artalk/v2
22
BIN_NAME := ./bin/artalk
33
VERSION ?= $(shell git describe --tags --abbrev=0 --match 'v*')
44
COMMIT_HASH ?= $(shell git rev-parse --short HEAD)

‎cmd/admin.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"strings"
88
"syscall"
99

10-
"github.com/ArtalkJS/Artalk/internal/entity"
11-
"github.com/ArtalkJS/Artalk/internal/i18n"
12-
"github.com/ArtalkJS/Artalk/internal/log"
13-
"github.com/ArtalkJS/Artalk/internal/utils"
10+
"github.com/artalkjs/artalk/v2/internal/entity"
11+
"github.com/artalkjs/artalk/v2/internal/i18n"
12+
"github.com/artalkjs/artalk/v2/internal/log"
13+
"github.com/artalkjs/artalk/v2/internal/utils"
1414
"github.com/spf13/cobra"
1515
"golang.org/x/term"
1616
)

‎cmd/base.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"os/signal"
77
"syscall"
88

9-
"github.com/ArtalkJS/Artalk/internal/config"
10-
"github.com/ArtalkJS/Artalk/internal/core"
11-
"github.com/ArtalkJS/Artalk/internal/log"
9+
"github.com/artalkjs/artalk/v2/internal/config"
10+
"github.com/artalkjs/artalk/v2/internal/core"
11+
"github.com/artalkjs/artalk/v2/internal/log"
1212
"github.com/fatih/color"
1313
"github.com/spf13/cobra"
1414
)

‎cmd/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/json"
55
"fmt"
66

7-
"github.com/ArtalkJS/Artalk/internal/log"
7+
"github.com/artalkjs/artalk/v2/internal/log"
88
"github.com/spf13/cobra"
99
)
1010

‎cmd/export.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"path/filepath"
88
"time"
99

10-
"github.com/ArtalkJS/Artalk/internal/artransfer"
11-
"github.com/ArtalkJS/Artalk/internal/i18n"
12-
"github.com/ArtalkJS/Artalk/internal/log"
13-
"github.com/ArtalkJS/Artalk/internal/utils"
10+
"github.com/artalkjs/artalk/v2/internal/artransfer"
11+
"github.com/artalkjs/artalk/v2/internal/i18n"
12+
"github.com/artalkjs/artalk/v2/internal/log"
13+
"github.com/artalkjs/artalk/v2/internal/utils"
1414
"github.com/spf13/cobra"
1515
)
1616

‎cmd/gen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cmd
22

33
import (
4-
"github.com/ArtalkJS/Artalk/internal/core"
4+
"github.com/artalkjs/artalk/v2/internal/core"
55
"github.com/spf13/cobra"
66
)
77

‎cmd/import.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"errors"
66
"os"
77

8-
"github.com/ArtalkJS/Artalk/internal/artransfer"
9-
"github.com/ArtalkJS/Artalk/internal/i18n"
10-
"github.com/ArtalkJS/Artalk/internal/log"
8+
"github.com/artalkjs/artalk/v2/internal/artransfer"
9+
"github.com/artalkjs/artalk/v2/internal/i18n"
10+
"github.com/artalkjs/artalk/v2/internal/log"
1111
"github.com/spf13/cobra"
1212
)
1313

‎cmd/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cmd
33
import (
44
"fmt"
55

6-
"github.com/ArtalkJS/Artalk/internal/log"
7-
"github.com/ArtalkJS/Artalk/server"
6+
"github.com/artalkjs/artalk/v2/internal/log"
7+
"github.com/artalkjs/artalk/v2/server"
88

99
"github.com/spf13/cobra"
1010
)

‎cmd/upgrade.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"os"
66
"strings"
77

8-
"github.com/ArtalkJS/Artalk/internal/config"
9-
"github.com/ArtalkJS/Artalk/internal/i18n"
10-
"github.com/ArtalkJS/Artalk/internal/log"
8+
"github.com/artalkjs/artalk/v2/internal/config"
9+
"github.com/artalkjs/artalk/v2/internal/i18n"
10+
"github.com/artalkjs/artalk/v2/internal/log"
1111
"github.com/blang/semver"
1212
"github.com/rhysd/go-github-selfupdate/selfupdate"
1313
"github.com/spf13/cobra"

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/ArtalkJS/Artalk
1+
module github.com/artalkjs/artalk/v2
22

33
go 1.22.6
44

‎internal/anti_spam/akismet.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"reflect"
99
"strings"
1010

11-
"github.com/ArtalkJS/Artalk/internal/log"
11+
"github.com/artalkjs/artalk/v2/internal/log"
1212
)
1313

1414
var _ Checker = (*AkismetChecker)(nil)

‎internal/anti_spam/aliyun.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package anti_spam
33
import (
44
"fmt"
55

6-
"github.com/ArtalkJS/Artalk/internal/cloud/aliyun"
6+
"github.com/artalkjs/artalk/v2/internal/cloud/aliyun"
77
)
88

99
var _ Checker = (*AliyunChecker)(nil)

‎internal/anti_spam/base.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"strconv"
66
"strings"
77

8-
"github.com/ArtalkJS/Artalk/internal/config"
9-
"github.com/ArtalkJS/Artalk/internal/log"
8+
"github.com/artalkjs/artalk/v2/internal/config"
9+
"github.com/artalkjs/artalk/v2/internal/log"
1010
"github.com/samber/lo"
1111
)
1212

‎internal/anti_spam/base_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"testing"
77

8-
"github.com/ArtalkJS/Artalk/internal/config"
8+
"github.com/artalkjs/artalk/v2/internal/config"
99
"github.com/samber/lo"
1010
"github.com/stretchr/testify/assert"
1111
)

‎internal/anti_spam/keywords.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88
"sync"
99

10-
"github.com/ArtalkJS/Artalk/internal/log"
11-
"github.com/ArtalkJS/Artalk/internal/utils"
10+
"github.com/artalkjs/artalk/v2/internal/log"
11+
"github.com/artalkjs/artalk/v2/internal/utils"
1212
)
1313

1414
var _ Checker = (*KeywordsChecker)(nil)

‎internal/anti_spam/tencent.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package anti_spam
33
import (
44
"fmt"
55

6-
"github.com/ArtalkJS/Artalk/internal/cloud/qcloud"
6+
"github.com/artalkjs/artalk/v2/internal/cloud/qcloud"
77
)
88

99
var _ Checker = (*TencentChecker)(nil)

‎internal/artransfer/base.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package artransfer
33
import (
44
"fmt"
55

6-
"github.com/ArtalkJS/Artalk/internal/dao"
7-
"github.com/ArtalkJS/Artalk/internal/entity"
8-
"github.com/ArtalkJS/Artalk/internal/i18n"
6+
"github.com/artalkjs/artalk/v2/internal/dao"
7+
"github.com/artalkjs/artalk/v2/internal/entity"
8+
"github.com/artalkjs/artalk/v2/internal/i18n"
99
"gorm.io/gorm"
1010
)
1111

‎internal/artransfer/base_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"regexp"
88
"testing"
99

10-
"github.com/ArtalkJS/Artalk/internal/dao"
11-
"github.com/ArtalkJS/Artalk/internal/db"
12-
"github.com/ArtalkJS/Artalk/internal/entity"
13-
"github.com/ArtalkJS/Artalk/test"
10+
"github.com/artalkjs/artalk/v2/internal/dao"
11+
"github.com/artalkjs/artalk/v2/internal/db"
12+
"github.com/artalkjs/artalk/v2/internal/entity"
13+
"github.com/artalkjs/artalk/v2/test"
1414
"github.com/stretchr/testify/assert"
1515
)
1616

‎internal/artransfer/console.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"os"
77
"strings"
88

9-
"github.com/ArtalkJS/Artalk/internal/log"
9+
"github.com/artalkjs/artalk/v2/internal/log"
1010
"github.com/jedib0t/go-pretty/v6/table"
1111
)
1212

‎internal/artransfer/exporter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package artransfer
33
import (
44
"encoding/json"
55

6-
"github.com/ArtalkJS/Artalk/internal/entity"
7-
"github.com/ArtalkJS/Artalk/internal/utils"
6+
"github.com/artalkjs/artalk/v2/internal/entity"
7+
"github.com/artalkjs/artalk/v2/internal/utils"
88
"gorm.io/gorm"
99
)
1010

‎internal/artransfer/importer.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/ArtalkJS/Artalk/internal/entity"
12-
"github.com/ArtalkJS/Artalk/internal/i18n"
13-
"github.com/ArtalkJS/Artalk/internal/utils"
11+
"github.com/artalkjs/artalk/v2/internal/entity"
12+
"github.com/artalkjs/artalk/v2/internal/i18n"
13+
"github.com/artalkjs/artalk/v2/internal/utils"
1414
"github.com/cheggaaa/pb/v3"
1515
"github.com/samber/lo"
1616
"gorm.io/gorm"

‎internal/artransfer/importer_query.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package artransfer
55

66
import (
7-
"github.com/ArtalkJS/Artalk/internal/entity"
7+
"github.com/artalkjs/artalk/v2/internal/entity"
88
"gorm.io/gorm"
99
)
1010

‎internal/artransfer/importer_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"strings"
66
"testing"
77

8-
"github.com/ArtalkJS/Artalk/internal/dao"
9-
"github.com/ArtalkJS/Artalk/internal/db"
10-
"github.com/ArtalkJS/Artalk/internal/entity"
8+
"github.com/artalkjs/artalk/v2/internal/dao"
9+
"github.com/artalkjs/artalk/v2/internal/db"
10+
"github.com/artalkjs/artalk/v2/internal/entity"
1111
"github.com/stretchr/testify/assert"
1212
)
1313

‎internal/artransfer/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"regexp"
88
"time"
99

10-
"github.com/ArtalkJS/Artalk/internal/i18n"
1110
"github.com/araddon/dateparse"
11+
"github.com/artalkjs/artalk/v2/internal/i18n"
1212
)
1313

1414
func readJsonFile(filename string) (string, error) {

‎internal/auth/info.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package auth
33
import (
44
"strings"
55

6-
"github.com/ArtalkJS/Artalk/internal/config"
6+
"github.com/artalkjs/artalk/v2/internal/config"
77
"github.com/markbates/goth"
88
"golang.org/x/text/cases"
99
"golang.org/x/text/language"

‎internal/auth/providers.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"net/url"
66
"strings"
77

8-
"github.com/ArtalkJS/Artalk/internal/config"
9-
"github.com/ArtalkJS/Artalk/internal/log"
8+
"github.com/artalkjs/artalk/v2/internal/config"
9+
"github.com/artalkjs/artalk/v2/internal/log"
1010
"github.com/markbates/goth"
1111
"github.com/markbates/goth/providers/apple"
1212
"github.com/markbates/goth/providers/auth0"

‎internal/auth/social_register.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"time"
66

7-
"github.com/ArtalkJS/Artalk/internal/dao"
8-
"github.com/ArtalkJS/Artalk/internal/entity"
9-
"github.com/ArtalkJS/Artalk/internal/utils"
7+
"github.com/artalkjs/artalk/v2/internal/dao"
8+
"github.com/artalkjs/artalk/v2/internal/entity"
9+
"github.com/artalkjs/artalk/v2/internal/utils"
1010
)
1111

1212
func RegisterSocialUser(dao *dao.Dao, u SocialUser) (entity.AuthIdentity, error) {

‎internal/cache/action.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"reflect"
66

7-
"github.com/ArtalkJS/Artalk/internal/log"
7+
"github.com/artalkjs/artalk/v2/internal/log"
88
"github.com/eko/gocache/lib/v4/store"
99
"golang.org/x/sync/singleflight"
1010
)

‎internal/cache/action_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sync/atomic"
77
"testing"
88

9-
"github.com/ArtalkJS/Artalk/internal/cache"
9+
"github.com/artalkjs/artalk/v2/internal/cache"
1010
"github.com/stretchr/testify/assert"
1111
)
1212

‎internal/cache/base.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"strings"
66
"time"
77

8-
"github.com/ArtalkJS/Artalk/internal/config"
9-
"github.com/ArtalkJS/Artalk/internal/log"
108
"github.com/allegro/bigcache/v3"
9+
"github.com/artalkjs/artalk/v2/internal/config"
10+
"github.com/artalkjs/artalk/v2/internal/log"
1111
"github.com/bradfitz/gomemcache/memcache"
1212
lib_cache "github.com/eko/gocache/lib/v4/cache"
1313
"github.com/eko/gocache/lib/v4/marshaler"

‎internal/cache/base_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cache_test
33
import (
44
"testing"
55

6-
"github.com/ArtalkJS/Artalk/internal/cache"
7-
"github.com/ArtalkJS/Artalk/internal/config"
6+
"github.com/artalkjs/artalk/v2/internal/cache"
7+
"github.com/artalkjs/artalk/v2/internal/config"
88
"github.com/stretchr/testify/assert"
99
)
1010

‎internal/captcha/checker.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package captcha
22

33
import (
4-
"github.com/ArtalkJS/Artalk/internal/config"
4+
"github.com/artalkjs/artalk/v2/internal/config"
55
)
66

77
type Map = map[string]interface{}

‎internal/captcha/checker_geetest.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/url"
99
"time"
1010

11-
"github.com/ArtalkJS/Artalk/internal/config"
11+
"github.com/artalkjs/artalk/v2/internal/config"
1212
"github.com/tidwall/gjson"
1313
)
1414

‎internal/captcha/checker_hcaptcha.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/url"
88
"time"
99

10-
"github.com/ArtalkJS/Artalk/internal/config"
10+
"github.com/artalkjs/artalk/v2/internal/config"
1111
"github.com/tidwall/gjson"
1212
)
1313

0 commit comments

Comments
 (0)