The Unified and Autonomous Development Platform
Fix issue #1233 - "Commented by" criteria for issue / pull request / code comment
Robin Shen5cf5305a0476
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.javaindex ab0be4b872..22bf635ee0 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentReply.java@@ -14,6 +14,8 @@ public class CodeCommentReply extends EntityComment {private static final long serialVersionUID = 1L;+ public static final String PROP_COMMENT = "comment";+public static final String PROP_COMPARE_CONTEXT = "compareContext";@ManyToOne(fetch=FetchType.LAZY)diff --git a/server-core/src/main/java/io/onedev/server/model/IssueComment.java b/server-core/src/main/java/io/onedev/server/model/IssueComment.javaindex 04ec74e8a7..50a034331f 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueComment.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueComment.java@@ -11,6 +11,8 @@ public class IssueComment extends EntityComment {private static final long serialVersionUID = 1L;+ public static final String PROP_ISSUE = "issue";+@ManyToOne@JoinColumn(nullable=false)private Issue issue;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.javaindex 7c38fa2d6d..a3c0b10c29 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java@@ -10,6 +10,8 @@ public class PullRequestComment extends EntityComment {private static final long serialVersionUID = 1L;+ public static final String PROP_REQUEST = "request";+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private PullRequest request;diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java b/server-core/src/main/java/io/onedev/server/model/support/EntityComment.javaindex 37daffa169..400728a4c8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityComment.java@@ -16,6 +16,8 @@ public abstract class EntityComment extends AbstractEntity {public static final int MAX_CONTENT_LEN = 100000;+ public static final String PROP_USER = "user";+public static final String PROP_CONTENT = "content";@Column(nullable=false)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4index ee25320fb7..b07a06c12b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(CreatedByMe|MentionedMe|Resolved|Unresolved) #OperatorCriteria- | operator=(CreatedBy|Mentioned|OnCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria+ : operator=(CreatedByMe|RepliedByMe|MentionedMe|Resolved|Unresolved) #OperatorCriteria+ | operator=(CreatedBy|RepliedBy|Mentioned|OnCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsUntil|IsSince|IsGreaterThan|IsLessThan|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -24,6 +24,10 @@ CreatedByMe: 'created' WS+ 'by' WS+ 'me';+RepliedByMe+ : 'replied' WS+ 'by' WS+ 'me'+ ;+MentionedMe: 'mentioned' WS+ 'me';@@ -40,6 +44,10 @@ CreatedBy: 'created' WS+ 'by';+RepliedBy+ : 'replied' WS+ 'by'+ ;+Mentioned: 'mentioned';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.javaindex 9d51bca3bd..9110b00df0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java@@ -103,10 +103,16 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new MentionedMeCriteria();- default:+ case CodeCommentQueryLexer.CreatedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new CreatedByMeCriteria();+ case CodeCommentQueryLexer.RepliedByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new RepliedByMeCriteria();+ default:+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());}}@@ -118,6 +124,8 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {return new MentionedCriteria(getUser(value));} else if (operator == CodeCommentQueryLexer.CreatedBy) {return new CreatedByCriteria(getUser(value));+ } else if (operator == CodeCommentQueryLexer.RepliedBy) {+ return new RepliedByCriteria(getUser(value));} else {ProjectScopedCommit commitId = getCommitId(project, value);return new OnCommitCriteria(commitId.getProject(), commitId.getCommitId());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.javanew file mode 100644index 0000000000..3d908e346e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.search.entity.codecomment;++import io.onedev.server.model.CodeComment;+import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class RepliedByCriteria extends Criteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ private final User user;++ public RepliedByCriteria(User user) {+ this.user = user;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {+ Subquery<CodeCommentReply> replyQuery = query.subquery(CodeCommentReply.class);+ Root<CodeCommentReply> reply = replyQuery.from(CodeCommentReply.class);+ replyQuery.select(reply);+ replyQuery.where(builder.and(+ builder.equal(reply.get(CodeCommentReply.PROP_COMMENT), from),+ builder.equal(reply.get(CodeCommentReply.PROP_USER), user)));+ return builder.exists(replyQuery);+ }++ @Override+ public boolean matches(CodeComment comment) {+ return comment.getReplies().stream().anyMatch(it->it.getUser().equals(user));+ }++ @Override+ public String toStringWithoutParens() {+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.RepliedBy) + " " + quote(user.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.javanew file mode 100644index 0000000000..bdea84ab9f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByMeCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.search.entity.codecomment;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.CodeCommentReply;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class RepliedByMeCriteria extends Criteria<CodeComment> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {+ if (User.get() != null) {+ Subquery<CodeCommentReply> replyQuery = query.subquery(CodeCommentReply.class);+ Root<CodeCommentReply> reply = replyQuery.from(CodeCommentReply.class);+ replyQuery.select(reply);+ replyQuery.where(builder.and(+ builder.equal(reply.get(CodeCommentReply.PROP_COMMENT), from),+ builder.equal(reply.get(CodeCommentReply.PROP_USER), User.get())));+ return builder.exists(replyQuery);+ } else {+ throw new ExplicitException("Please login to perform this query");+ }+ }++ @Override+ public boolean matches(CodeComment comment) {+ if (User.get() != null)+ return comment.getReplies().stream().anyMatch(it->it.getUser().equals(User.get()));+ else+ throw new ExplicitException("Please login to perform this query");+ }++ @Override+ public String toStringWithoutParens() {+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.RepliedByMe);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.javanew file mode 100644index 0000000000..f517c48d12--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.search.entity.issue;++import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class CommentedByCriteria extends Criteria<Issue> {++ private static final long serialVersionUID = 1L;++ private final User user;++ public CommentedByCriteria(User user) {+ this.user = user;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {+ Subquery<IssueComment> commentQuery = query.subquery(IssueComment.class);+ Root<IssueComment> comment = commentQuery.from(IssueComment.class);+ commentQuery.select(comment);+ commentQuery.where(builder.and(+ builder.equal(comment.get(IssueComment.PROP_ISSUE), from),+ builder.equal(comment.get(IssueComment.PROP_USER), user)));+ return builder.exists(commentQuery);+ }++ @Override+ public boolean matches(Issue issue) {+ return issue.getComments().stream().anyMatch(it->it.getUser().equals(user));+ }++ @Override+ public String toStringWithoutParens() {+ return IssueQuery.getRuleName(IssueQueryLexer.CommentedBy) + " " + quote(user.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.javanew file mode 100644index 0000000000..25f56efc41--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByMeCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.search.entity.issue;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueComment;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class CommentedByMeCriteria extends Criteria<Issue> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {+ if (User.get() != null) {+ Subquery<IssueComment> commentQuery = query.subquery(IssueComment.class);+ Root<IssueComment> comment = commentQuery.from(IssueComment.class);+ commentQuery.select(comment);+ commentQuery.where(builder.and(+ builder.equal(comment.get(IssueComment.PROP_ISSUE), from),+ builder.equal(comment.get(IssueComment.PROP_USER), User.get())));+ return builder.exists(commentQuery);+ } else {+ throw new ExplicitException("Please login to perform this query");+ }+ }++ @Override+ public boolean matches(Issue issue) {+ if (User.get() != null)+ return issue.getComments().stream().anyMatch(it->it.getUser().equals(User.get()));+ else+ throw new ExplicitException("Please login to perform this query");+ }++ @Override+ public String toStringWithoutParens() {+ return IssueQuery.getRuleName(IssueQueryLexer.CommentedByMe);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index 3ea9d1d9a4..a25e5eb88b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(Confidential|SubmittedByMe|MentionedMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest|CurrentIssue) #OperatorCriteria- | operator=(SubmittedBy|Mentioned|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=Quoted #OperatorValueCriteria+ : operator=(Confidential|SubmittedByMe|CommentedByMe|MentionedMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest|CurrentIssue) #OperatorCriteria+ | operator=(SubmittedBy|CommentedBy|Mentioned|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=Quoted #OperatorValueCriteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|IsAfter|IsBefore|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria@@ -35,6 +35,10 @@ SubmittedBy: 'submitted' WS+ 'by';+CommentedBy+ : 'commented' WS+ 'by'+ ;+FixedInCommit: 'fixed' WS+ 'in' WS+ 'commit';@@ -74,6 +78,10 @@ FixedBetweenSubmittedByMe: 'submitted' WS+ 'by' WS+ 'me';++CommentedByMe+ : 'commented' WS+ 'by' WS+ 'me'+ ;Confidential: 'confidential'diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex cf1e45e28c..f609293936 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -144,6 +144,10 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>if (!option.withCurrentUserCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new SubmittedByMeCriteria();+ case IssueQueryLexer.CommentedByMe:+ if (!option.withCurrentUserCriteria())+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new CommentedByMeCriteria();case IssueQueryLexer.FixedInCurrentBuild:if (!option.withCurrentBuildCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");@@ -196,8 +200,10 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>String value = getValue(ctx.Quoted().getText());if (ctx.Mentioned() != null)return new MentionedCriteria(getUser(value));- if (ctx.SubmittedBy() != null)+ else if (ctx.SubmittedBy() != null)return new SubmittedByCriteria(getUser(value));+ else if (ctx.CommentedBy() != null)+ return new CommentedByCriteria(getUser(value));else if (ctx.FixedInBuild() != null)return new FixedInBuildCriteria(project, value);else if (ctx.FixedInPullRequest() != null)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.javanew file mode 100644index 0000000000..aa18ffe088--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.search.entity.pullrequest;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestComment;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class CommentedByCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final User user;++ public CommentedByCriteria(User user) {+ this.user = user;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ Subquery<PullRequestComment> commentQuery = query.subquery(PullRequestComment.class);+ Root<PullRequestComment> comment = commentQuery.from(PullRequestComment.class);+ commentQuery.select(comment);+ commentQuery.where(builder.and(+ builder.equal(comment.get(PullRequestComment.PROP_REQUEST), from),+ builder.equal(comment.get(PullRequestComment.PROP_USER), user)));+ return builder.exists(commentQuery);+ }++ @Override+ public boolean matches(PullRequest request) {+ return request.getComments().stream().anyMatch(it->it.getUser().equals(user));+ }++ @Override+ public String toStringWithoutParens() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.CommentedBy) + " " + quote(user.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.javanew file mode 100644index 0000000000..2bd2477e5f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.search.entity.pullrequest;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestComment;+import io.onedev.server.model.User;+import io.onedev.server.util.criteria.Criteria;++import javax.persistence.criteria.*;++public class CommentedByMeCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ if (User.get() != null) {+ Subquery<PullRequestComment> commentQuery = query.subquery(PullRequestComment.class);+ Root<PullRequestComment> comment = commentQuery.from(PullRequestComment.class);+ commentQuery.select(comment);+ commentQuery.where(builder.and(+ builder.equal(comment.get(PullRequestComment.PROP_REQUEST), from),+ builder.equal(comment.get(PullRequestComment.PROP_USER), User.get())));+ return builder.exists(commentQuery);+ } else {+ throw new ExplicitException("Please login to perform this query");+ }+ }++ @Override+ public boolean matches(PullRequest request) {+ if (User.get() != null)+ return request.getComments().stream().anyMatch(it->it.getUser().equals(User.get()));+ else+ throw new ExplicitException("Please login to perform this query");+ }++ @Override+ public String toStringWithoutParens() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.CommentedByMe);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4index 3c7e995774..01448f9238 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(Open|Merged|Discarded|AssignedToMe|SubmittedByMe|ToBeReviewedByMe|RequestedForChangesByMe|ApprovedByMe|MentionedMe|SomeoneRequestedForChanges|HasPendingReviews|HasFailedBuilds|ToBeVerifiedByBuilds|HasMergeConflicts) #OperatorCriteria- | operator=(ToBeReviewedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|Mentioned|IncludesCommit|IncludesIssue) WS+ criteriaValue=Quoted #OperatorValueCriteria+ : operator=(Open|Merged|Discarded|AssignedToMe|SubmittedByMe|CommentedByMe|ToBeReviewedByMe|RequestedForChangesByMe|ApprovedByMe|MentionedMe|SomeoneRequestedForChanges|HasPendingReviews|HasFailedBuilds|ToBeVerifiedByBuilds|HasMergeConflicts) #OperatorCriteria+ | operator=(ToBeReviewedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|CommentedBy|Mentioned|IncludesCommit|IncludesIssue) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -52,6 +52,10 @@ SubmittedByMe: 'submitted' WS+ 'by' WS+ 'me';+CommentedByMe+ : 'commented' WS+ 'by' WS+ 'me'+ ;+MentionedMe: 'mentioned' WS+ 'me';@@ -96,6 +100,10 @@ SubmittedBy: 'submitted' WS+ 'by';+CommentedBy+ : 'commented' WS+ 'by'+ ;+Mentioned: 'mentioned';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex baad106a4c..5688917078 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -98,6 +98,10 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new SubmittedByMeCriteria();+ case PullRequestQueryLexer.CommentedByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new CommentedByMeCriteria();case PullRequestQueryLexer.ToBeReviewedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");@@ -145,6 +149,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {return new MentionedCriteria(getUser(value));case PullRequestQueryLexer.SubmittedBy:return new SubmittedByCriteria(getUser(value));+ case PullRequestQueryLexer.CommentedBy:+ return new CommentedByCriteria(getUser(value));case PullRequestQueryLexer.IncludesCommit:return new IncludesCommitCriteria(project, value);case PullRequestQueryLexer.IncludesIssue:diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex d32ef126ed..a1b70cd6e0 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -74,7 +74,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = CodeCommentQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == Mentioned || operator == CreatedBy)+ if (operator == Mentioned || operator == CreatedBy || operator == RepliedBy)return SuggestionUtils.suggestUsers(matchWith);elsereturn null;@@ -112,7 +112,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))- || !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(CreatedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))) {+ || !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(CreatedByMe)) || suggestedLiteral.equals(getRuleName(RepliedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))) {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex e62b7946dd..07ba86fec6 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -120,7 +120,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == Mentioned || operator == SubmittedBy)+ if (operator == Mentioned || operator == SubmittedBy || operator == CommentedBy)return SuggestionUtils.suggestUsers(matchWith);else if (operator == FixedInBuild)return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);@@ -216,7 +216,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!option.withOrder() && suggestedLiteral.equals(getRuleName(OrderBy))- || !option.withCurrentUserCriteria() && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))+ || !option.withCurrentUserCriteria() && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(CommentedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))|| !option.withCurrentBuildCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentBuild))|| !option.withCurrentPullRequestCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentPullRequest))|| !option.withCurrentCommitCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentCommit))diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 3633fd6011..b7bbc5657b 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -155,7 +155,10 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))- || !withCurrentUserCriteria && ((suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))+ || !withCurrentUserCriteria &&+ (suggestedLiteral.equals(getRuleName(SubmittedByMe))+ || suggestedLiteral.equals(getRuleName(CommentedByMe))+ || suggestedLiteral.equals(getRuleName(MentionedMe))|| suggestedLiteral.equals(getRuleName(ToBeReviewedByMe))|| suggestedLiteral.equals(getRuleName(RequestedForChangesByMe))|| suggestedLiteral.equals(getRuleName(ApprovedByMe))