Skip to content

Ignore mentions for users with no access #8395

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

Merged
merged 15 commits into from
Oct 10, 2019
Merged

Ignore mentions for users with no access #8395

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a0a88a2
Draft for ResolveMentionsByVisibility()
guillep2k Oct 5, 2019
82aee51
Correct typo
guillep2k Oct 5, 2019
f1df07d
Resolve teams instead of orgs for mentions
guillep2k Oct 5, 2019
7db4179
Create test for ResolveMentionsByVisibility
guillep2k Oct 5, 2019
4edc976
Fix check for individual users and doer
guillep2k Oct 5, 2019
f5936eb
Test and fix team mentions
guillep2k Oct 6, 2019
02cc0c0
Run all mentions through visibility filter
guillep2k Oct 6, 2019
89f5f29
Fix error check
guillep2k Oct 6, 2019
f585681
Merge branch 'master' into fix-8303
guillep2k Oct 9, 2019
ca3206a
Simplify code, fix doer included in teams
guillep2k Oct 9, 2019
6824e70
Merge branch 'fix-8303' of github.com:guillep2k/gitea into fix-8303
guillep2k Oct 9, 2019
0c8e644
Merge branch 'master' into fix-8303
guillep2k Oct 10, 2019
c485546
Merge branch 'master' into fix-8303
sapk Oct 10, 2019
8b2a714
Simplify team id list build
guillep2k Oct 10, 2019
ad88962
Merge branch 'fix-8303' of github.com:guillep2k/gitea into fix-8303
guillep2k Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix error check
  • Loading branch information
@guillep2k
guillep2k committed Oct 6, 2019
commit 89f5f2939313ad0bf3be4a1e2286da41ace9d58f
3 changes: 3 additions & 0 deletions services/mailer/mail_comment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue
func mailParticipantsComment(ctx models.DBContext, c *models.Comment, opType models.ActionType, issue *models.Issue) (err error) {
rawMentions := markup.FindAllMentions(c.Content)
userMentions, err := issue.ResolveMentionsByVisibility(ctx, c.Poster, rawMentions)
if err != nil {
return fmt.Errorf("ResolveMentionsByVisibility [%d]: %v", c.IssueID, err)
}
if err = models.UpdateIssueMentions(ctx, c.IssueID, userMentions); err != nil {
return fmt.Errorf("UpdateIssueMentions [%d]: %v", c.IssueID, err)
}
Expand Down
3 changes: 3 additions & 0 deletions services/mailer/mail_issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ func MailParticipants(issue *models.Issue, doer *models.User, opType models.Acti
func mailParticipants(ctx models.DBContext, issue *models.Issue, doer *models.User, opType models.ActionType) (err error) {
rawMentions := markup.FindAllMentions(issue.Content)
userMentions, err := issue.ResolveMentionsByVisibility(ctx, doer, rawMentions)
if err != nil {
return fmt.Errorf("ResolveMentionsByVisibility [%d]: %v", issue.ID, err)
}
if err = models.UpdateIssueMentions(ctx, issue.ID, userMentions); err != nil {
return fmt.Errorf("UpdateIssueMentions [%d]: %v", issue.ID, err)
}
Expand Down