Merge branch 'main' into squash-merge-msg

Author: hiifong

Makefile

@@ -29,7 +29,7 @@ AIR_PACKAGE ?= github.com/air-verse/air@v1
 EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3
 GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
 GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/[email protected]
-GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected].12
+GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected].15
 MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/[email protected]
 SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
 XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest

assets/go-licenses.json

@@ -16,7 +16,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v74/github"
 	"github.com/urfave/cli/v3"
 	"gopkg.in/yaml.v3"
 )

contrib/backport/backport.go

@@ -14,6 +14,7 @@ import (
 	indexer_internal "code.gitea.io/gitea/modules/indexer/internal"
 	inner_meilisearch "code.gitea.io/gitea/modules/indexer/internal/meilisearch"
 	"code.gitea.io/gitea/modules/indexer/issues/internal"
+	"code.gitea.io/gitea/modules/json"
 
 	"github.com/meilisearch/meilisearch-go"
 )
@@ -106,7 +107,8 @@ func (b *Indexer) Index(_ context.Context, issues ...*internal.IndexerData) erro
 		return nil
 	}
 	for _, issue := range issues {
-		_, err := b.inner.Client.Index(b.inner.VersionedIndexName()).AddDocuments(issue)
+		// use default primary key which should be "id"
+		_, err := b.inner.Client.Index(b.inner.VersionedIndexName()).AddDocuments(issue, nil)
 		if err != nil {
 			return err
 		}
@@ -299,18 +301,13 @@ func doubleQuoteKeyword(k string) string {
 func convertHits(searchRes *meilisearch.SearchResponse) ([]internal.Match, error) {
 	hits := make([]internal.Match, 0, len(searchRes.Hits))
 	for _, hit := range searchRes.Hits {
-		hit, ok := hit.(map[string]any)
-		if !ok {
-			return nil, ErrMalformedResponse
-		}
-
-		issueID, ok := hit["id"].(float64)
-		if !ok {
+		var issueID int64
+		if err := json.Unmarshal(hit["id"], &issueID); err != nil {
 			return nil, ErrMalformedResponse
 		}
 
 		hits = append(hits, internal.Match{
-			ID: int64(issueID),
+			ID: issueID,
 		})
 	}
 	return hits, nil

go.mod

@@ -12,6 +12,7 @@ import (
 
 	"code.gitea.io/gitea/modules/indexer/issues/internal"
 	"code.gitea.io/gitea/modules/indexer/issues/internal/tests"
+	"code.gitea.io/gitea/modules/json"
 
 	"github.com/meilisearch/meilisearch-go"
 	"github.com/stretchr/testify/assert"
@@ -45,30 +46,42 @@ func TestMeilisearchIndexer(t *testing.T) {
 }
 
 func TestConvertHits(t *testing.T) {
+	convert := func(d any) []byte {
+		b, _ := json.Marshal(d)
+		return b
+	}
+
 	_, err := convertHits(&meilisearch.SearchResponse{
-		Hits: []any{"aa", "bb", "cc", "dd"},
+		Hits: []meilisearch.Hit{
+			{
+				"aa": convert(1),
+				"bb": convert(2),
+				"cc": convert(3),
+				"dd": convert(4),
+			},
+		},
 	})
 	assert.ErrorIs(t, err, ErrMalformedResponse)
 
 	validResponse := &meilisearch.SearchResponse{
-		Hits: []any{
-			map[string]any{
-				"id":       float64(11),
-				"title":    "a title",
-				"content":  "issue body with no match",
-				"comments": []any{"hey whats up?", "I'm currently bowling", "nice"},
+		Hits: []meilisearch.Hit{
+			{
+				"id":       convert(float64(11)),
+				"title":    convert("a title"),
+				"content":  convert("issue body with no match"),
+				"comments": convert([]any{"hey whats up?", "I'm currently bowling", "nice"}),
 			},
-			map[string]any{
-				"id":       float64(22),
-				"title":    "Bowling as title",
-				"content":  "",
-				"comments": []any{},
+			{
+				"id":       convert(float64(22)),
+				"title":    convert("Bowling as title"),
+				"content":  convert(""),
+				"comments": convert([]any{}),
 			},
-			map[string]any{
-				"id":       float64(33),
-				"title":    "Bowl-ing as fuzzy match",
-				"content":  "",
-				"comments": []any{},
+			{
+				"id":       convert(float64(33)),
+				"title":    convert("Bowl-ing as fuzzy match"),
+				"content":  convert(""),
+				"comments": convert([]any{}),
 			},
 		},
 	}

go.sum

@@ -120,6 +120,7 @@ error404=您正尝试访问的页面 <strong>不存在</strong> 或 <strong>您
 error503=服务器无法完成您的请求，请稍后重试。
 go_back=返回
 invalid_data=无效数据： %v
+nothing_has_been_changed=没有任何更改。
 
 never=从不
 unknown=未知
@@ -2844,6 +2845,11 @@ settings.location=所在地区
 settings.permission=权限
 settings.repoadminchangeteam=仓库管理员可以添加或移除团队的访问权限
 settings.visibility=可见性
+settings.change_visibility=更改可见性
+settings.change_visibility_notices_1=如果组织被转换为私有，仓库的所有点赞将被删除且无法恢复。
+settings.change_visibility_notices_2=如果可见性更改为私有，非成员将无法访问该组织的仓库。
+settings.change_visibility_success=组织 %s 的可见性已成功更改。
+settings.visibility_desc=更改谁可以查看组织及其仓库。
 settings.visibility.public=公开
 settings.visibility.limited=受限 (仅对认证用户可见)
 settings.visibility.limited_shortname=受限
@@ -3420,6 +3426,7 @@ config.picture_service=图片服务
 config.disable_gravatar=禁用 Gravatar 头像
 config.enable_federated_avatar=启用 Federated 头像
 config.open_with_editor_app_help=用于克隆菜单的编辑器。如果为空将使用默认值。展开可以查看默认值。
+config.git_guide_remote_name=指南中 git 命令使用的仓库远程名称
 
 config.git_config=Git 配置
 config.git_disable_diff_highlight=禁用差异对比语法高亮

modules/indexer/issues/meilisearch/meilisearch.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"errors"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v74/github"
 )
 
 // ErrRepoNotCreated returns the error that repository not created

modules/indexer/issues/meilisearch/meilisearch_test.go

@@ -20,7 +20,7 @@ import (
 	"code.gitea.io/gitea/modules/proxy"
 	"code.gitea.io/gitea/modules/structs"
 
-	"github.com/google/go-github/v71/github"
+	"github.com/google/go-github/v74/github"
 	"golang.org/x/oauth2"
 )