Skip to content

Commit 696d045

Browse files
hiifonghiifong
committed
test
1 parent 2af7bdb commit 696d045

File tree

10 files changed

+11
-63
lines changed

10 files changed

+11
-63
lines changed

‎models/issues/reaction.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func FindIssueReactions(ctx context.Context, issueID int64, listOptions db.ListO
162162
func FindReactions(ctx context.Context, opts FindReactionsOptions) (ReactionList, int64, error) {
163163
sess := db.GetEngine(ctx).
164164
Where(opts.toConds()).
165-
In("reaction.`type`", setting.Config().UI.Reactions.Value(ctx)).
165+
In("reaction.`type`", setting.UI.Reactions).
166166
Asc("reaction.issue_id", "reaction.comment_id", "reaction.created_unix", "reaction.id")
167167
if opts.Page > 0 {
168168
sess = db.SetSessionPagination(sess, &opts)
@@ -220,7 +220,7 @@ type ReactionOptions struct {
220220

221221
// CreateReaction creates reaction for issue or comment.
222222
func CreateReaction(ctx context.Context, opts *ReactionOptions) (*Reaction, error) {
223-
if !setting.Config().UI.ReactionsLookup.Contains(opts.Type) {
223+
if !setting.UI.ReactionsLookup.Contains(opts.Type) {
224224
return nil, ErrForbiddenIssueReaction{opts.Type}
225225
}
226226

‎modules/markup/html_emoji.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func emojiShortCodeProcessor(ctx *RenderContext, node *html.Node) {
7474
converted := emoji.FromAlias(alias)
7575
if converted == nil {
7676
// check if this is a custom reaction
77-
if _, exist := setting.Config().UI.CustomEmojisMap[alias]; exist {
77+
if _, exist := setting.UI.CustomEmojisMap[alias]; exist {
7878
replaceContent(node, m[0], m[1], createCustomEmoji(ctx, alias))
7979
node = node.NextSibling.NextSibling
8080
start = 0

‎modules/markup/html_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ func TestRender_emoji(t *testing.T) {
313313
test(
314314
":custom-emoji:",
315315
`<p>:custom-emoji:</p>`)
316-
setting.Config().UI.CustomEmojisMap["custom-emoji"] = ":custom-emoji:"
316+
setting.UI.CustomEmojisMap["custom-emoji"] = ":custom-emoji:"
317317
test(
318318
":custom-emoji:",
319319
`<p><span class="emoji" aria-label="custom-emoji"><img alt=":custom-emoji:" src="`+setting.StaticURLPrefix+`/assets/img/emoji/custom-emoji.png"/></span></p>`)

‎modules/setting/config.go‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"strings"
99
"sync"
1010

11-
"code.gitea.io/gitea/modules/container"
1211
"code.gitea.io/gitea/modules/log"
1312
"code.gitea.io/gitea/modules/setting/config"
1413
)
@@ -71,10 +70,6 @@ type UIStruct struct {
7170
DefaultShowFullName *config.Value[bool]
7271
DefaultTheme *config.Value[string]
7372
Themes *config.Value[[]string]
74-
Reactions *config.Value[[]string]
75-
ReactionsLookup container.Set[string]
76-
CustomEmojis *config.Value[[]string]
77-
CustomEmojisMap map[string]string
7873
SearchRepoDescription *config.Value[bool]
7974
OnlyShowRelevantRepos *config.Value[bool]
8075
ExploreDefaultSort *config.Value[string]
@@ -83,19 +78,11 @@ type UIStruct struct {
8378
}
8479

8580
func (u *UIStruct) ToStruct(ctx context.Context) UIForm {
86-
var themes, reactions, customEmojis string
81+
var themes string
8782
for _, v := range u.Themes.Value(ctx) {
8883
themes += v + ","
8984
}
9085
themes = strings.TrimSuffix(themes, ",")
91-
for _, v := range u.Reactions.Value(ctx) {
92-
reactions += v + ","
93-
}
94-
reactions = strings.TrimSuffix(reactions, ",")
95-
for _, v := range u.CustomEmojis.Value(ctx) {
96-
customEmojis += v + ","
97-
}
98-
customEmojis = strings.TrimSuffix(customEmojis, ",")
9986
return UIForm{
10087
ExplorePagingNum: u.ExplorePagingNum.Value(ctx),
10188
SitemapPagingNum: u.SitemapPagingNum.Value(ctx),
@@ -113,8 +100,6 @@ func (u *UIStruct) ToStruct(ctx context.Context) UIForm {
113100
DefaultShowFullName: u.DefaultShowFullName.Value(ctx),
114101
DefaultTheme: u.DefaultTheme.Value(ctx),
115102
Themes: themes,
116-
Reactions: reactions,
117-
CustomEmojis: customEmojis,
118103
SearchRepoDescription: u.SearchRepoDescription.Value(ctx),
119104
OnlyShowRelevantRepos: u.OnlyShowRelevantRepos.Value(ctx),
120105
ExplorePagingDefaultSort: u.ExploreDefaultSort.Value(ctx),
@@ -142,8 +127,6 @@ type UIForm struct {
142127
DefaultShowFullName bool
143128
DefaultTheme string
144129
Themes string
145-
Reactions string
146-
CustomEmojis string
147130
SearchRepoDescription bool
148131
OnlyShowRelevantRepos bool
149132
ExplorePagingDefaultSort string
@@ -191,8 +174,6 @@ func initDefaultConfig() {
191174
DefaultShowFullName: config.ValueJSON[bool]("ui.default_show_full_name").WithFileConfig(config.CfgSecKey{Sec: "ui", Key: "DEFAULT_SHOW_FULL_NAME"}),
192175
DefaultTheme: config.ValueJSON[string]("ui.default_theme").WithFileConfig(config.CfgSecKey{Sec: "ui", Key: "DEFAULT_THEME"}),
193176
Themes: config.ValueJSON[[]string]("ui.themes").WithFileConfig(config.CfgSecKey{Sec: "ui", Key: "THEMES"}),
194-
Reactions: config.ValueJSON[[]string]("ui.reactions").WithFileConfig(config.CfgSecKey{Sec: "ui", Key: "REACTIONS"}),
195-
CustomEmojis: config.ValueJSON[[]string]("ui.custom_emojis").WithFileConfig(config.CfgSecKey{Sec: "ui", Key: "CUSTOM_EMOJIS"}),
196177
SearchRepoDescription: config.ValueJSON[bool]("ui.search_repo_description").WithFileConfig(config.CfgSecKey{Sec: "ui", Key: "SEARCH_REPO_DESCRIPTION"}),
197178
OnlyShowRelevantRepos: config.ValueJSON[bool]("ui.only_show_relevant_repos").WithFileConfig(config.CfgSecKey{Sec: "ui", Key: "ONLY_SHOW_RELEVANT_REPOS"}),
198179
ExploreDefaultSort: config.ValueJSON[string]("ui.explore_paging_default_sort").WithFileConfig(config.CfgSecKey{Sec: "ui", Key: "EXPLORE_PAGING_DEFAULT_SORT"}),
@@ -204,15 +185,6 @@ func initDefaultConfig() {
204185

205186
func Config() *ConfigStruct {
206187
defaultConfigOnce.Do(initDefaultConfig)
207-
ctx := context.Background()
208-
defaultConfig.UI.ReactionsLookup = make(container.Set[string])
209-
for _, reaction := range defaultConfig.UI.Reactions.Value(ctx) {
210-
defaultConfig.UI.ReactionsLookup.Add(reaction)
211-
}
212-
defaultConfig.UI.CustomEmojisMap = make(map[string]string)
213-
for _, emoji := range defaultConfig.UI.CustomEmojis.Value(ctx) {
214-
defaultConfig.UI.CustomEmojisMap[emoji] = ":" + emoji + ":"
215-
}
216188
return defaultConfig
217189
}
218190

‎modules/templates/helper.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ func NewFuncMap() template.FuncMap {
116116
return setting.Other.ShowFooterPoweredBy
117117
},
118118
"AllowedReactions": func() []string {
119-
return setting.Config().UI.Reactions.Value(ctx)
119+
return setting.UI.Reactions
120120
},
121121
"CustomEmojis": func() map[string]string {
122-
return setting.Config().UI.CustomEmojisMap
122+
return setting.UI.CustomEmojisMap
123123
},
124124
"MetaAuthor": func() string {
125125
return setting.UI.Meta.Author

‎routers/api/v1/settings/settings.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ func GetGeneralUISettings(ctx *context.APIContext) {
2323
// "$ref": "#/responses/GeneralUISettings"
2424
ctx.JSON(http.StatusOK, api.GeneralUISettings{
2525
DefaultTheme: setting.Config().UI.DefaultTheme.Value(ctx),
26-
AllowedReactions: setting.Config().UI.Reactions.Value(ctx),
27-
CustomEmojis: setting.Config().UI.CustomEmojis.Value(ctx),
26+
AllowedReactions: setting.UI.Reactions,
27+
CustomEmojis: setting.UI.CustomEmojis,
2828
})
2929
}
3030

‎routers/web/admin/config.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -264,16 +264,6 @@ func ChangeUIConfig(ctx *context.Context) {
264264
} else {
265265
form.Themes = nil
266266
}
267-
if len(form.Reactions) == 1 {
268-
form.Reactions = strings.Split(form.Reactions[0], ",")
269-
} else {
270-
form.Reactions = nil
271-
}
272-
if len(form.CustomEmojis) == 1 {
273-
form.CustomEmojis = strings.Split(form.CustomEmojis[0], ",")
274-
} else {
275-
form.CustomEmojis = nil
276-
}
277267
log.Debug("ChangeUIConfig form: %+v", form)
278268
formMap, err := util.ConfigSectionToMap(form, "ui")
279269
if err != nil {

‎services/forms/admin_config_form.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ type UIForm struct {
2929
DefaultShowFullName bool
3030
DefaultTheme string
3131
Themes []string
32-
Reactions []string
33-
CustomEmojis []string
3432
SearchRepoDescription bool
3533
OnlyShowRelevantRepos bool
3634
ExplorePagingDefaultSort string `binding:"In(recentupdate,alphabetically,reverselastlogin,newest,oldest)"`

‎templates/admin/config_settings.tmpl‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,24 +89,12 @@
8989
<input name="themes" value="{{.UI.Themes}}">
9090
</div>
9191
</dd>
92-
<dt>{{ctx.Locale.Tr "admin.config.ui.reactions"}}</dt>
93-
<dd>
94-
<div class="inline field">
95-
<input name="reactions" value="{{.UI.Reactions}}">
96-
</div>
97-
</dd>
9892
<dt>{{ctx.Locale.Tr "admin.config.ui.reaction_max_user_num"}}</dt>
9993
<dd>
10094
<div class="inline field">
10195
<input name="reaction_max_user_num" type="number" min="0" value="{{.UI.ReactionMaxUserNum}}">
10296
</div>
10397
</dd>
104-
<dt>{{ctx.Locale.Tr "admin.config.ui.custom_emojis"}}</dt>
105-
<dd>
106-
<div class="inline field">
107-
<input name="custom_emojis" value="{{.UI.CustomEmojis}}">
108-
</div>
109-
</dd>
11098
<dt>{{ctx.Locale.Tr "admin.config.ui.explore_paging_default_sort"}}</dt>
11199
<dd>
112100
<div class="inline field">

‎tests/integration/api_settings_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ func TestAPIExposedSettings(t *testing.T) {
2222
resp := MakeRequest(t, req, http.StatusOK)
2323

2424
DecodeJSON(t, resp, &ui)
25-
assert.Len(t, ui.AllowedReactions, len(setting.Config().UI.Reactions.Value(t.Context())))
26-
assert.ElementsMatch(t, setting.Config().UI.Reactions.Value(t.Context()), ui.AllowedReactions)
25+
assert.Len(t, ui.AllowedReactions, len(setting.UI.Reactions))
26+
assert.ElementsMatch(t, setting.UI.Reactions, ui.AllowedReactions)
2727

2828
apiSettings := new(api.GeneralAPISettings)
2929
req = NewRequest(t, "GET", "/api/v1/settings/api")

0 commit comments

Comments
 (0)