diff options
| author | Nanguan Lin <nanguanlin6@gmail.com> | 2024-03-17 21:28:11 +0100 |
|---|---|---|
| committer | Earl Warren <contact@earl-warren.org> | 2024-03-26 19:04:25 +0100 |
| commit | a2f4ab60e8a9bd92fa6c81da3b97c00ca0a5adc6 (patch) | |
| tree | 7e03e3a99b9e06aa8c8d1c967a27accdf428806d /routers | |
| parent | fix telegram webhook (#29864) (diff) | |
| download | forgejo-a2f4ab60e8a9bd92fa6c81da3b97c00ca0a5adc6.tar.xz forgejo-a2f4ab60e8a9bd92fa6c81da3b97c00ca0a5adc6.zip | |
Fix missing code in the user profile (#29865)
fix #29820
deleted by
https://github.com/go-gitea/gitea/pull/29248/files#diff-2b0b591787f16325539485e648a09ab6d3177f47dc129cfe84a35ffe141dfd19L39-L62,
which causing malfunction of follow/unfollow and missing description in
the user profile page.
(cherry picked from commit 5ca65d33906ebbca1e502536ffef18942b541c1d)
Conflicts:
routers/web/shared/user/header.go
trivial context conflict because of user blocking code
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/web/shared/user/header.go | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index f007772d6c..7d0b34cb7d 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -16,6 +16,8 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/markup" + "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/services/context" @@ -35,6 +37,7 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) { prepareContextForCommonProfile(ctx) ctx.Data["IsBlocked"] = ctx.Doer != nil && user_model.IsBlocked(ctx, ctx.Doer.ID, ctx.ContextUser.ID) + ctx.Data["IsFollowing"] = ctx.Doer != nil && user_model.IsFollowing(ctx, ctx.Doer.ID, ctx.ContextUser.ID) ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate if setting.Service.UserLocationMapURL != "" { ctx.Data["ContextUserLocationMapURL"] = setting.Service.UserLocationMapURL + url.QueryEscape(ctx.ContextUser.Location) @@ -46,6 +49,17 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) { return } ctx.Data["OpenIDs"] = openIDs + if len(ctx.ContextUser.Description) != 0 { + content, err := markdown.RenderString(&markup.RenderContext{ + Metas: map[string]string{"mode": "document"}, + Ctx: ctx, + }, ctx.ContextUser.Description) + if err != nil { + ctx.ServerError("RenderString", err) + return + } + ctx.Data["RenderedDescription"] = content + } showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID) orgs, err := db.Find[organization.Organization](ctx, organization.FindOrgOptions{ |