mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-27 21:03:56 +01:00
68099f2f00
This PR touches the most interesting part of the "template refactoring".
1. Unclear variable type. Especially for "web/feed/convert.go":
sometimes it uses text, sometimes it uses HTML.
2. Assign text content to "RenderedContent" field, for example: `
project.RenderedContent = project.Description` in web/org/projects.go
3. Assign rendered content to text field, for example: `r.Note =
rendered content` in web/repo/release.go
4. (possible) Incorrectly calling `{{Str2html
.PackageDescriptor.Metadata.ReleaseNotes}}` in
package/content/nuget.tmpl, I guess the name Str2html misleads
developers to use it to "render string to html", but it only sanitizes.
if ReleaseNotes really contains HTML, then this is not a problem.
(cherry picked from commit e71eb8930a5d0f60874b038c223498b41ad65592)
Conflicts:
modules/templates/util_string.go
trivial context conflict
68 lines
1.3 KiB
Go
68 lines
1.3 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package templates
|
|
|
|
import (
|
|
"fmt"
|
|
"html/template"
|
|
"strings"
|
|
|
|
"code.gitea.io/gitea/modules/base"
|
|
)
|
|
|
|
type StringUtils struct{}
|
|
|
|
var stringUtils = StringUtils{}
|
|
|
|
func NewStringUtils() *StringUtils {
|
|
return &stringUtils
|
|
}
|
|
|
|
func (su *StringUtils) HasPrefix(s any, prefix string) bool {
|
|
switch v := s.(type) {
|
|
case string:
|
|
return strings.HasPrefix(v, prefix)
|
|
case template.HTML:
|
|
return strings.HasPrefix(string(v), prefix)
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (su *StringUtils) ToString(v any) string {
|
|
switch v := v.(type) {
|
|
case string:
|
|
return v
|
|
case template.HTML:
|
|
return string(v)
|
|
case fmt.Stringer:
|
|
return v.String()
|
|
default:
|
|
return fmt.Sprint(v)
|
|
}
|
|
}
|
|
|
|
func (su *StringUtils) Contains(s, substr string) bool {
|
|
return strings.Contains(s, substr)
|
|
}
|
|
|
|
func (su *StringUtils) Split(s, sep string) []string {
|
|
return strings.Split(s, sep)
|
|
}
|
|
|
|
func (su *StringUtils) Join(a []string, sep string) string {
|
|
return strings.Join(a, sep)
|
|
}
|
|
|
|
func (su *StringUtils) Cut(s, sep string) []any {
|
|
before, after, found := strings.Cut(s, sep)
|
|
return []any{before, after, found}
|
|
}
|
|
|
|
func (su *StringUtils) EllipsisString(s string, max int) string {
|
|
return base.EllipsisString(s, max)
|
|
}
|
|
|
|
func (su *StringUtils) ToUpper(s string) string {
|
|
return strings.ToUpper(s)
|
|
}
|