Telegram-Bots/gitlab-notification
4
1
Fork 0
Code Issues 21 Pull Requests 1 Packages Projects 2 Releases 1 Activity

мелкие исправления

Browse Source
This commit is contained in:
upagge 2020-03-13 00:30:13 +03:00
parent 6cff271d03
commit 8137493f77
No known key found for this signature in database
GPG Key ID: 15CD012E46F6BA34
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/tsc/bitbucketbot/scheduler/SchedulerComments.java
View File

@ -26,7 +26,7 @@ import java.util.regex.Pattern;
public class SchedulerComments { public class SchedulerComments {
private static final Integer COUNT = 100; private static final Integer COUNT = 100;
private static final Integer NO_COMMENT = 100; private static final Integer NO_COMMENT = 30;
private static final Pattern PATTERN = Pattern.compile("@[\\w]+"); private static final Pattern PATTERN = Pattern.compile("@[\\w]+");
private final CommentService commentService; private final CommentService commentService;

11
src/main/java/com/tsc/bitbucketbot/utils/Message.java
View File

@ -103,7 +103,7 @@ public class Message {
StringBuilder message = new StringBuilder().append(Smile.SUN).append(" Доброе утро ").append(Smile.SUN).append(Smile.HR); StringBuilder message = new StringBuilder().append(Smile.SUN).append(" Доброе утро ").append(Smile.SUN).append(Smile.HR);
if (!pullRequestsReviews.isEmpty()) { if (!pullRequestsReviews.isEmpty()) {
message.append("Сегодня тебя ждет проверка ").append(pullRequestsReviews.size()).append(" ПР!").append(Smile.TWO_BR) message.append("Сегодня тебя ждет проверка ").append(pullRequestsReviews.size()).append(" ПР!").append(Smile.TWO_BR)
.append("Топ старых ПР:").append(Smile.BR); .append("Самые старые:").append(Smile.BR);
List<PullRequest> oldPr = pullRequestsReviews.stream() List<PullRequest> oldPr = pullRequestsReviews.stream()
.sorted(COMPARATOR) .sorted(COMPARATOR)
.limit(PR_COUNT) .limit(PR_COUNT)
@ -115,7 +115,7 @@ public class Message {
.append("Поздравляю, у тебя ни одного ПР на проверку!").append(Smile.BR); .append("Поздравляю, у тебя ни одного ПР на проверку!").append(Smile.BR);
} }
if (!pullRequestsNeedWork.isEmpty()) { if (!pullRequestsNeedWork.isEmpty()) {
message.append(Smile.BR).append(Smile.DANGEROUS).append(" Так же у тебя на доработке находится ").append(pullRequestsNeedWork.size()).append(" ПР").append(Smile.BR); message.append(Smile.BR).append(Smile.DANGEROUS).append("Требуется доработать ").append(pullRequestsNeedWork.size()).append(" ПР:").append(Smile.BR);
message.append(needWorkPr(pullRequestsNeedWork)).append(Smile.BR); message.append(needWorkPr(pullRequestsNeedWork)).append(Smile.BR);
} }
if (dayX()) { if (dayX()) {
@ -162,11 +162,10 @@ public class Message {
} }
public static String personalNotify(@NonNull CommentJson comment, @NonNull String namePr, @NonNull String urlPr) { public static String personalNotify(@NonNull CommentJson comment, @NonNull String namePr, @NonNull String urlPr) {
return Smile.BELL + " *Новое упоминание*" + Smile.BR + return Smile.BELL + " *Новое упоминание* | " + comment.getAuthor().getName() + Smile.BR +
link(namePr, urlPr) + link(namePr, urlPr) +
Smile.HR + Smile.HR +
comment.getText().replaceAll("@[\\w]+", "") + comment.getText().replaceAll("@[\\w]+", "");
Smile.HR +
Smile.AUTHOR + ": " + comment.getAuthor().getName();
} }
} }