From 9626204f153ea59aad388b0fe259f558e3da46aa Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 10 Mar 2018 01:20:54 +0100 Subject: [PATCH] Log length increase and score update --- layout/sidebar/sidebar.pixy | 14 ++++++-------- pages/editlog/editlog.go | 2 +- pages/editor/editor.go | 10 +++++++++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/layout/sidebar/sidebar.pixy b/layout/sidebar/sidebar.pixy index f339ca05..6d62386c 100644 --- a/layout/sidebar/sidebar.pixy +++ b/layout/sidebar/sidebar.pixy @@ -33,16 +33,11 @@ component Sidebar(user *arn.User) if user != nil SidebarButton("Support", "/support", "heart") - if arn.IsDevelopment() - SidebarButton("Groups", "/groups", "users") + //- if arn.IsDevelopment() + //- SidebarButton("Groups", "/groups", "users") if user != nil && (user.Role == "editor" || user.Role == "admin") - if user.Role == "admin" - SidebarButton("Admin", "/admin", "wrench") - - if (user.Role == "editor" || user.Role == "admin") - SidebarButton("Editor", "/editor", "pencil") - + SidebarButton("Editor", "/editor", "pencil") SidebarButton("Log", "/log", "list") //- Disabled: @@ -61,6 +56,9 @@ component Sidebar(user *arn.User) .sidebar-button Icon("search") FuzzySearch + + if user != nil && user.Role == "admin" + SidebarButton("Admin", "/admin", "wrench") a.sidebar-link.action(href="#", data-action="toggleTheme", data-trigger="click") .sidebar-button diff --git a/pages/editlog/editlog.go b/pages/editlog/editlog.go index ad903f12..9576075d 100644 --- a/pages/editlog/editlog.go +++ b/pages/editlog/editlog.go @@ -12,7 +12,7 @@ import ( "github.com/animenotifier/notify.moe/utils" ) -const maxEntries = 40 +const maxEntries = 120 // Get edit log. func Get(ctx *aero.Context) string { diff --git a/pages/editor/editor.go b/pages/editor/editor.go index eb5dda37..d0731aeb 100644 --- a/pages/editor/editor.go +++ b/pages/editor/editor.go @@ -15,11 +15,15 @@ func Get(ctx *aero.Context) string { return ctx.Redirect("/") } + ignoreDifferences := arn.FilterIgnoreAnimeDifferences(func(entry *arn.IgnoreAnimeDifference) bool { + return entry.CreatedBy == user.ID + }) + logEntries := arn.FilterEditLogEntries(func(entry *arn.EditLogEntry) bool { return entry.UserID == user.ID }) - score := 0 + score := len(ignoreDifferences) for _, entry := range logEntries { switch entry.Action { @@ -29,6 +33,10 @@ func Get(ctx *aero.Context) string { case "edit": score += 2 + if entry.ObjectType == "Anime" && (entry.Key == "Summary" || entry.Key == "Synopsis") { + score += 2 + } + case "delete", "arrayRemove": score++