From 1a02140b1c9550094d8e01af7efee55d2fd1e87b Mon Sep 17 00:00:00 2001 From: JFronny Date: Sun, 9 Apr 2023 14:45:35 +0200 Subject: [PATCH] Bump --- .../gitlab/jfronny/gitea/helpdesk/Main.java | 9 +- .../jfronny/gitea/helpdesk/UpdateTask.java | 6 +- templates/repo/issue/list.tmpl | 148 +++++++++++++----- templates/repo/issue/view.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 36 ++--- 5 files changed, 139 insertions(+), 62 deletions(-) diff --git a/src/main/java/io/gitlab/jfronny/gitea/helpdesk/Main.java b/src/main/java/io/gitlab/jfronny/gitea/helpdesk/Main.java index 18547ee..f765eb0 100644 --- a/src/main/java/io/gitlab/jfronny/gitea/helpdesk/Main.java +++ b/src/main/java/io/gitlab/jfronny/gitea/helpdesk/Main.java @@ -15,6 +15,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.sql.SQLException; import java.util.Objects; +import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -40,7 +41,13 @@ public class Main { try (DBInterface db = new DBInterface(config.database); MailInterface mail = new MailInterface(config.email); WebInterface web = new WebInterface(config.web, config.email.address, db, gitea)) { - UpdateTask updateTask = new UpdateTask(db, mail, gitea, web, config.ban.ignored); + Predicate ignore = config.ban.ignored + .stream() + .map(Pattern::compile) + .map(Pattern::asMatchPredicate) + .reduce(Predicate::or) + .orElse(s -> true); + UpdateTask updateTask = new UpdateTask(db, mail, gitea, web, ignore); while (true) { updateTask.run(); Thread.sleep(config.email.waitTime * 1000); diff --git a/src/main/java/io/gitlab/jfronny/gitea/helpdesk/UpdateTask.java b/src/main/java/io/gitlab/jfronny/gitea/helpdesk/UpdateTask.java index 8ab93a5..8a3d179 100644 --- a/src/main/java/io/gitlab/jfronny/gitea/helpdesk/UpdateTask.java +++ b/src/main/java/io/gitlab/jfronny/gitea/helpdesk/UpdateTask.java @@ -13,9 +13,9 @@ import org.commonmark.renderer.html.HtmlRenderer; import java.io.FileNotFoundException; import java.io.IOException; -import java.util.List; +import java.util.function.Predicate; -public record UpdateTask(DBInterface db, MailInterface mail, GiteaInterface gitea, WebInterface web, List ignored) implements Runnable { +public record UpdateTask(DBInterface db, MailInterface mail, GiteaInterface gitea, WebInterface web, Predicate ignored) implements Runnable { private static final Parser MARKDOWN_PARSER = Parser.builder().build(); private static final HtmlRenderer MARKDOWN_RENDER = HtmlRenderer.builder().build(); private static final String TEMPLATE = Main.getResource("/mail/template.html"); @@ -75,7 +75,7 @@ public record UpdateTask(DBInterface db, MailInterface mail, GiteaInterface gite try (WrappedMessageSet wms = mail.getInbox()) { for (WrappedMessage message : wms) { try { - if (ignored.contains(message.getSender())) { + if (ignored.test(message.getSender())) { message.delete(); continue; } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index c3a73f5..4ef24e1 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
@@ -15,7 +15,7 @@ {{if .IsSigned}} {{.locale.Tr "repo.issues.new"}} {{end}} - Helpdesk + Helpdesk {{else}} {{.locale.Tr "repo.pulls.new"}} {{end}} @@ -32,9 +32,8 @@
{{if $.CanWriteIssuesOrPulls}} -
- - +
+
{{end}} {{template "repo/issue/openclose" .}} @@ -49,13 +48,19 @@
- {{svg "octicon-search" 16}} + {{svg "octicon-search" 16}}
{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} - {{.locale.Tr "repo.issues.filter_label_no_select"}} + {{.locale.Tr "repo.issues.filter_label_no_select"}} + {{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} - {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{svg "octicon-check"}}{{end}} {{.Name | RenderEmoji}} + {{$exclusiveScope := .ExclusiveScope}} + {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}} +
+ {{end}} + {{$previousExclusiveScope = $exclusiveScope}} + {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} {{end}}
@@ -68,12 +73,52 @@
- {{svg "octicon-search" 16}} + {{svg "octicon-search" 16}}
{{.locale.Tr "repo.issues.filter_milestone_no_select"}} {{range .Milestones}} - {{.Name}} + {{.Name}} + {{end}} +
+
+ + +
+ + {{.locale.Tr "repo.issues.filter_project"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+
+ {{svg "octicon-search" 16}} + +
+ {{.locale.Tr "repo.issues.filter_project_all"}} + {{.locale.Tr "repo.issues.filter_project_none"}} + {{if .OpenProjects}} +
+
+ {{.locale.Tr "repo.issues.new.open_projects"}} +
+ {{range .OpenProjects}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.Title}} + + {{end}} + {{end}} + {{if .ClosedProjects}} +
+
+ {{.locale.Tr "repo.issues.new.closed_projects"}} +
+ {{range .ClosedProjects}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.Title}} + + {{end}} {{end}}
@@ -86,13 +131,13 @@
- {{svg "octicon-search" 16}} + {{svg "octicon-search" 16}}
- {{.locale.Tr "repo.issues.filter_poster_no_select"}} + {{.locale.Tr "repo.issues.filter_poster_no_select"}} {{range .Posters}} - - {{avatar .}} {{.GetDisplayName}} + + {{avatar $.Context .}} {{.GetDisplayName}} {{end}}
@@ -106,13 +151,13 @@
- {{svg "octicon-search" 16}} + {{svg "octicon-search" 16}}
- {{.locale.Tr "repo.issues.filter_assginee_no_select"}} + {{.locale.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - - {{avatar .}} {{.GetDisplayName}} + + {{avatar $.Context .}} {{.GetDisplayName}} {{end}}
@@ -126,12 +171,12 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{.locale.Tr "repo.issues.filter_type.all_issues"}} - {{.locale.Tr "repo.issues.filter_type.assigned_to_you"}} - {{.locale.Tr "repo.issues.filter_type.created_by_you"}} - {{.locale.Tr "repo.issues.filter_type.mentioning_you"}} + {{.locale.Tr "repo.issues.filter_type.all_issues"}} + {{.locale.Tr "repo.issues.filter_type.assigned_to_you"}} + {{.locale.Tr "repo.issues.filter_type.created_by_you"}} + {{.locale.Tr "repo.issues.filter_type.mentioning_you"}} {{if .PageIsPullList}} - {{.locale.Tr "repo.issues.filter_type.review_requested"}} + {{.locale.Tr "repo.issues.filter_type.review_requested"}} {{end}}
@@ -144,20 +189,20 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{.locale.Tr "repo.issues.filter_sort.latest"}} - {{.locale.Tr "repo.issues.filter_sort.oldest"}} - {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} - {{.locale.Tr "repo.issues.filter_sort.mostcomment"}} - {{.locale.Tr "repo.issues.filter_sort.leastcomment"}} - {{.locale.Tr "repo.issues.filter_sort.nearduedate"}} - {{.locale.Tr "repo.issues.filter_sort.farduedate"}} + {{.locale.Tr "repo.issues.filter_sort.latest"}} + {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{.locale.Tr "repo.issues.filter_sort.mostcomment"}} + {{.locale.Tr "repo.issues.filter_sort.leastcomment"}} + {{.locale.Tr "repo.issues.filter_sort.nearduedate"}} + {{.locale.Tr "repo.issues.filter_sort.farduedate"}}
-
+
{{template "repo/issue/openclose" .}}
@@ -181,9 +226,15 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+ {{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} + {{$exclusiveScope := .ExclusiveScope}} + {{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}} +
+ {{end}} + {{$previousExclusiveScope = $exclusiveScope}}
- {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{.Name | RenderEmoji}} + {{if contain $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}}
{{end}}
@@ -208,19 +259,38 @@
-
+
{{.locale.Tr "repo.project_board"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{.locale.Tr "repo.issues.new.no_projects"}} + {{.locale.Tr "repo.issues.new.clear_projects"}}
- {{range .Projects}} -
- {{.Title}} + {{if .OpenProjects}} +
+
+ {{.locale.Tr "repo.issues.new.open_projects"}}
+ {{range .OpenProjects}} +
+ {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.Title}} +
+ {{end}} + {{end}} + {{if .ClosedProjects}} +
+
+ {{.locale.Tr "repo.issues.new.closed_projects"}} +
+ {{range .ClosedProjects}} +
+ {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.Title}} +
+ {{end}} {{end}}
@@ -237,7 +307,7 @@
{{range .Assignees}}
- {{avatar .}} {{.GetDisplayName}} + {{avatar $.Context .}} {{.GetDisplayName}}
{{end}}
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index bb7037d..f91f975 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 9b349f4..8e67075 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -23,14 +23,14 @@ {{else}} - {{avatar .Issue.Poster}} + {{avatar $.Context .Issue.Poster}} {{end}}
-
-
+
+
{{if .Issue.OriginalAuthor}} - + {{svg (MigrationIcon .Repository.GetOriginalURLHostname)}} {{.Issue.OriginalAuthor}} @@ -42,7 +42,7 @@ {{else}} - {{avatar .Issue.Poster}} + {{avatar $.Context .Issue.Poster}} {{template "shared/user/authorlink" .Issue.Poster}} @@ -50,7 +50,7 @@ {{end}}
-
+
{{if gt .Issue.ShowRole 0}} {{if (.Issue.ShowRole.HasRole "Writer")}}
@@ -69,7 +69,7 @@ {{end}}
-
+
{{if .Issue.RenderedContent}} {{.Issue.RenderedContent|Str2html}} @@ -77,15 +77,15 @@ {{.locale.Tr "repo.issues.no_content"}} {{end}}
-
{{.Issue.Content}}
-
+
{{.Issue.Content}}
+
{{if .Issue.Attachments}} {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}} {{end}}
{{$reactions := .Issue.Reactions.GroupByType}} {{if $reactions}} -
+
{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index) "Reactions" $reactions}}
{{end}} @@ -101,7 +101,7 @@ {{if and (or .IsRepoAdmin .HasIssuesOrPullsWritePermission (not .Issue.IsLocked)) (not .Repository.IsArchived)}}
- {{avatar .SignedUser}} + {{avatar $.Context .SignedUser}}
@@ -152,7 +152,7 @@ {{if .Repository.IsArchived}}
- {{avatar .SignedUser}} + {{avatar $.Context .SignedUser}}
@@ -183,9 +183,9 @@ {{end}} {{else}} {{if .Issue.IsPull}} -
- {{.locale.Tr "repo.issues.sign_in_require_desc" (.SignInLink|Escape) | Safe}} -
+
+ {{.locale.Tr "repo.issues.sign_in_require_desc" (.SignInLink|Escape) | Safe}} +
{{else}} {{.locale.Tr "repo.issues.create_comment"}} {{end}} @@ -198,11 +198,11 @@ {{template "repo/issue/view_content/sidebar" .}}
-
+
{{$.locale.Tr "write"}} - {{$.locale.Tr "preview"}} + {{$.locale.Tr "preview"}}
@@ -228,7 +228,7 @@ {{template "repo/issue/view_content/reference_issue_dialog" .}} -
+
{{.locale.Tr "repo.issues.no_content"}}