Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Link mentioned user in markdown only if they are visible to viewer #21554

Merged
merged 9 commits into from
Oct 23, 2022
Merged

Link mentioned user in markdown only if they are visible to viewer #21554

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a1c2cb3
Link mentioned user in markdown only if they are visible to viewer
yardenshoham Oct 22, 2022
08bdc8b
Update test
yardenshoham Oct 22, 2022
ef2e5c6
Revert "Update test"
yardenshoham Oct 22, 2022
eafd380
Handle bad context
yardenshoham Oct 22, 2022
d5687d2
Ease log level
yardenshoham Oct 22, 2022
7cb1417
fix tests
wxiaoguang Oct 23, 2022
4229f46
Merge branch 'main' into visible-mention
lunny Oct 23, 2022
11de8be
Update services/markup/processorhelper_test.go
wxiaoguang Oct 23, 2022
1ebb2a9
Merge branch 'main' into visible-mention
lunny Oct 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 10 additions & 8 deletions services/markup/processorhelper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,24 @@ import (
"context"

"code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/log"
module_context "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/markup"
)

func ProcessorHelper() *markup.ProcessorHelper {
return &markup.ProcessorHelper{
IsUsernameMentionable: func(ctx context.Context, username string) bool {
// TODO: cast ctx to modules/context.Context and use IsUserVisibleToViewer

// Only link if the user actually exists
userExists, err := user.IsUserExist(ctx, 0, username)
mentionedUser, err := user.GetUserByName(ctx, username)
if err != nil {
log.Error("Failed to validate user in mention %q exists, assuming it does", username)
userExists = true
return false
}

moduleCtx, ok := ctx.(*module_context.Context)
yardenshoham marked this conversation as resolved.
Show resolved Hide resolved
if !ok {
return false
}
return userExists

return user.IsUserVisibleToViewer(moduleCtx, mentionedUser, moduleCtx.Doer)
},
}
}