Update

Author: hiifong

modules/templates/helper.go

@@ -262,7 +262,7 @@ func evalTokens(tokens ...any) (any, error) {
 	return n.Value, err
 }
 
-func userThemeName(ctx context.Context, user *user_model.User) string {
+func userThemeName(user *user_model.User) string {
 	if user == nil || user.Theme == "" {
 		return setting.UI.DefaultTheme
 	}

modules/templates/util_date.go

@@ -4,7 +4,6 @@
 package templates
 
 import (
-	"context"
 	"fmt"
 	"html"
 	"html/template"
@@ -36,8 +35,8 @@ func (du *DateUtils) FullTime(time any) template.HTML {
 	return dateTimeFormat("full", time)
 }
 
-func (du *DateUtils) TimeSince(ctx context.Context, time any) template.HTML {
-	return TimeSince(ctx, time)
+func (du *DateUtils) TimeSince(time any) template.HTML {
+	return TimeSince(time)
 }
 
 // ParseLegacy parses the datetime in legacy format, eg: "2016-01-02" in server's timezone.
@@ -126,7 +125,7 @@ func timeSinceTo(then any, now time.Time) template.HTML {
 }
 
 // TimeSince renders relative time HTML given a time
-func TimeSince(ctx context.Context, then any) template.HTML {
+func TimeSince(then any) template.HTML {
 	if setting.UI.PreferredTimestampTense == "absolute" {
 		return dateTimeFormat("full", then)
 	}

modules/templates/util_date_legacy.go

@@ -4,7 +4,6 @@
 package templates
 
 import (
-	"context"
 	"html/template"
 
 	"code.gitea.io/gitea/modules/translation"
@@ -18,7 +17,7 @@ func dateTimeLegacy(format string, datetime any, _ ...string) template.HTML {
 	return dateTimeFormat(format, datetime)
 }
 
-func timeSinceLegacy(ctx context.Context, time any, _ translation.Locale) template.HTML {
+func timeSinceLegacy(time any, _ translation.Locale) template.HTML {
 	panicIfDevOrTesting()
-	return TimeSince(ctx, time)
+	return TimeSince(time)
 }

modules/templates/util_date_test.go

@@ -56,17 +56,17 @@ func TestTimeSince(t *testing.T) {
 	defer test.MockVariableValue(&setting.IsInTesting, false)()
 
 	du := NewDateUtils()
-	assert.EqualValues(t, "-", du.TimeSince(t.Context(), nil))
+	assert.EqualValues(t, "-", du.TimeSince(nil))
 
 	refTimeStr := "2018-01-01T00:00:00Z"
 	refTime, _ := time.Parse(time.RFC3339, refTimeStr)
 
-	actual := du.TimeSince(t.Context(), refTime)
+	actual := du.TimeSince(refTime)
 	assert.EqualValues(t, `<relative-time prefix="" tense="past" datetime="2018-01-01T00:00:00Z" data-tooltip-content data-tooltip-interactive="true">2018-01-01 00:00:00 +00:00</relative-time>`, actual)
 
 	actual = timeSinceTo(&refTime, time.Time{})
 	assert.EqualValues(t, `<relative-time prefix="" tense="future" datetime="2018-01-01T00:00:00Z" data-tooltip-content data-tooltip-interactive="true">2018-01-01 00:00:00 +00:00</relative-time>`, actual)
 
-	actual = timeSinceLegacy(t.Context(), timeutil.TimeStampNano(refTime.UnixNano()), nil)
+	actual = timeSinceLegacy(timeutil.TimeStampNano(refTime.UnixNano()), nil)
 	assert.EqualValues(t, `<relative-time prefix="" tense="past" datetime="2017-12-31T19:00:00-05:00" data-tooltip-content data-tooltip-interactive="true">2017-12-31 19:00:00 -05:00</relative-time>`, actual)
 }

routers/api/v1/repo/file.go

@@ -384,7 +384,7 @@ func GetEditorconfig(ctx *context.APIContext) {
 	//   "404":
 	//     "$ref": "#/responses/notFound"
 
-	ec, _, err := ctx.Repo.GetEditorconfig(ctx, ctx.Repo.Commit)
+	ec, _, err := ctx.Repo.GetEditorconfig(ctx.Repo.Commit)
 	if err != nil {
 		if git.IsErrNotExist(err) {
 			ctx.APIErrorNotFound(err)

routers/api/v1/repo/repo.go

@@ -1200,7 +1200,7 @@ func GetIssueTemplates(ctx *context.APIContext) {
 	//     "$ref": "#/responses/IssueTemplates"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
-	ret := issue.ParseTemplatesFromDefaultBranch(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo)
+	ret := issue.ParseTemplatesFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo)
 	if cnt := len(ret.TemplateErrors); cnt != 0 {
 		ctx.Resp.Header().Add("X-Gitea-Warning", "error occurs when parsing issue template: count="+strconv.Itoa(cnt))
 	}

routers/api/v1/user/settings.go

@@ -24,7 +24,7 @@ func GetUserSettings(ctx *context.APIContext) {
 	// responses:
 	//   "200":
 	//     "$ref": "#/responses/UserSettings"
-	ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx, ctx.Doer))
+	ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.Doer))
 }
 
 // UpdateUserSettings returns user settings
@@ -61,5 +61,5 @@ func UpdateUserSettings(ctx *context.APIContext) {
 		return
 	}
 
-	ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx, ctx.Doer))
+	ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.Doer))
 }

routers/common/errpage.go

@@ -39,8 +39,6 @@ func RenderPanicErrorPage(w http.ResponseWriter, req *http.Request, err any) {
 	tmplCtx["Locale"] = middleware.Locale(w, req)
 	ctxData := middleware.GetContextData(req.Context())
 
-	ctxData["Ctx"] = req.Context()
-
 	// This recovery handler could be called without Gitea's web context, so we shouldn't touch that context too much.
 	// Otherwise, the 500-page may cause new panics, eg: cache.GetContextWithData, it makes the developer&users couldn't find the original panic.
 	user, _ := ctxData[middleware.ContextDataKeySignedUser].(*user_model.User)

routers/web/repo/blame.go

@@ -278,7 +278,7 @@ func renderBlame(ctx *context.Context, blameParts []*git.BlamePart, commitNames
 				commitCnt++
 
 				// User avatar image
-				commitSince := templates.TimeSince(ctx, commit.Author.When)
+				commitSince := templates.TimeSince(commit.Author.When)
 
 				var avatar string
 				if commit.User != nil {

routers/web/repo/editor.go

@@ -201,7 +201,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
 
 // GetEditorConfig returns a editorconfig JSON string for given treePath or "null"
 func GetEditorConfig(ctx *context.Context, treePath string) string {
-	ec, _, err := ctx.Repo.GetEditorconfig(ctx)
+	ec, _, err := ctx.Repo.GetEditorconfig()
 	if err == nil {
 		def, err := ec.GetDefinitionForFilename(treePath)
 		if err == nil {