From 33636dad8eeecb697bdeb8eae944de33406283ae Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sun, 8 Apr 2018 12:01:18 +0200 Subject: [PATCH] Use HasCreator and HasEditor mixins --- mixins/Postable.pixy | 10 +++++----- mixins/ThreadLink.pixy | 2 +- pages/profile/posts.pixy | 2 +- pages/quote/quote.pixy | 2 +- pages/search/search.pixy | 8 ++++---- pages/soundtrack/soundtrack.pixy | 2 +- pages/threads/threads.pixy | 4 ++-- .../add-forum-creators/add-forum-creators.go | 17 +++++++++++++++++ 8 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 patches/add-forum-creators/add-forum-creators.go diff --git a/mixins/Postable.pixy b/mixins/Postable.pixy index 7da54759..575d8a16 100644 --- a/mixins/Postable.pixy +++ b/mixins/Postable.pixy @@ -1,7 +1,7 @@ component Postable(post arn.Postable, user *arn.User, highlightAuthorID string) - .post.mountable(id=strings.ToLower(post.Type()) + "-" + toString(post.ID()), data-highlight=post.Author().ID == highlightAuthorID, data-pro=post.Author().IsPro(), data-api="/api/" + strings.ToLower(post.Type()) + "/" + post.ID()) + .post.mountable(id=strings.ToLower(post.Type()) + "-" + toString(post.ID()), data-highlight=post.Creator().ID == highlightAuthorID, data-pro=post.Creator().IsPro(), data-api="/api/" + strings.ToLower(post.Type()) + "/" + post.ID()) .post-author - Avatar(post.Author()) + Avatar(post.Creator()) //- if post.recipient && post.recipient.ID !== post.author.ID //- a.user.post-recipient(href="/+" + post.recipient.nick, title=post.recipient.nick) @@ -9,7 +9,7 @@ component Postable(post arn.Postable, user *arn.User, highlightAuthorID string) .post-content div(id="render-" + post.ID())!= post.HTML() - if user != nil && user.ID == post.Author().ID + if user != nil && user.ID == post.Creator().ID .post-edit-interface if post.Type() == "Thread" input.post-title-input.hidden(id="title-" + post.ID(), value=post.Title(), type="text", placeholder="Thread title") @@ -30,7 +30,7 @@ component Postable(post arn.Postable, user *arn.User, highlightAuthorID string) .post-likes(id="likes-" + post.ID(), title="Likes")= len(post.Likes()) if user != nil - if user.ID != post.Author().ID + if user.ID != post.Creator().ID if post.LikedBy(user.ID) a.post-tool.post-unlike.action(id="unlike-" + post.ID(), title="Unlike", data-action="unlike", data-trigger="click") Icon("thumbs-down") @@ -38,7 +38,7 @@ component Postable(post arn.Postable, user *arn.User, highlightAuthorID string) a.post-tool.post-like.action(id="like-" + post.ID(), title="Like", data-action="like", data-trigger="click") Icon("thumbs-up") - if user.ID == post.Author().ID + if user.ID == post.Creator().ID a.post-tool.post-edit.action(data-action="editPost", data-trigger="click", data-id=post.ID(), title="Edit") Icon("pencil") diff --git a/mixins/ThreadLink.pixy b/mixins/ThreadLink.pixy index cd9ba9b0..25c6b8c9 100644 --- a/mixins/ThreadLink.pixy +++ b/mixins/ThreadLink.pixy @@ -1,7 +1,7 @@ component ThreadLink(thread *arn.Thread) .thread-link.mountable(data-sticky=thread.Sticky) .post-author.thread-author - Avatar(thread.Author()) + Avatar(thread.Creator()) .thread-content-container .thread-content if thread.Sticky != 0 diff --git a/pages/profile/posts.pixy b/pages/profile/posts.pixy index 3f8309d5..29c4f82d 100644 --- a/pages/profile/posts.pixy +++ b/pages/profile/posts.pixy @@ -8,7 +8,7 @@ component LatestPosts(postables []arn.Postable, viewUser *arn.User, user *arn.Us ProfileForumTabs(viewUser) if len(postables) > 0 - h1.page-title= len(postables), " latest posts by ", postables[0].Author().Nick + h1.page-title= len(postables), " latest posts by ", postables[0].Creator().Nick PostableList(postables, user) else p.no-data.mountable= viewUser.Nick + " hasn't written any posts yet." \ No newline at end of file diff --git a/pages/quote/quote.pixy b/pages/quote/quote.pixy index a78b3f1f..c5101789 100644 --- a/pages/quote/quote.pixy +++ b/pages/quote/quote.pixy @@ -16,7 +16,7 @@ component QuoteMainColumn(quote *arn.Quote, user *arn.User) span Edited span.utc-date(data-date=quote.Edited) span by - a(href=quote.EditedByUser().Link())= quote.EditedByUser().Nick + a(href=quote.Editor().Link())= quote.Editor().Nick else span Posted span.utc-date(data-date=quote.Created) diff --git a/pages/search/search.pixy b/pages/search/search.pixy index 9d03edec..0aeb97bd 100644 --- a/pages/search/search.pixy +++ b/pages/search/search.pixy @@ -85,16 +85,16 @@ component ForumSearchResults(posts []*arn.Post, threads []*arn.Thread) .forum-search-result.mountable(data-mountable-type="forum") .forum-search-result-header a.forum-search-result-title(href=thread.Link())= thread.Title - if thread.Author().HasNick() - .forum-search-result-author= thread.Author().Nick + if thread.Creator().HasNick() + .forum-search-result-author= thread.Creator().Nick .forum-search-result-sample= thread.Text each post in posts .forum-search-result.mountable(data-mountable-type="forum") .forum-search-result-header a.forum-search-result-title(href=post.Link(), data-mountable-type="forum")= post.Thread().Title - if post.Author().HasNick() - .forum-search-result-author= post.Author().Nick + if post.Creator().HasNick() + .forum-search-result-author= post.Creator().Nick .forum-search-result-sample= post.Text component SoundTrackSearchResults(tracks []*arn.SoundTrack) diff --git a/pages/soundtrack/soundtrack.pixy b/pages/soundtrack/soundtrack.pixy index f851366c..0397e580 100644 --- a/pages/soundtrack/soundtrack.pixy +++ b/pages/soundtrack/soundtrack.pixy @@ -61,7 +61,7 @@ component SoundTrackPage(track *arn.SoundTrack, user *arn.User) span Edited span.utc-date(data-date=track.Edited) span by - span= track.EditedByUser().Nick + span= track.Editor().Nick else span Posted span.utc-date(data-date=track.Created) diff --git a/pages/threads/threads.pixy b/pages/threads/threads.pixy index 5a7f4ff2..496d3854 100644 --- a/pages/threads/threads.pixy +++ b/pages/threads/threads.pixy @@ -3,10 +3,10 @@ component Thread(thread *arn.Thread, posts []*arn.Post, user *arn.User) #thread.thread(data-id=thread.ID) .posts - Postable(thread.ToPostable(), user, thread.Author().ID) + Postable(thread.ToPostable(), user, thread.Creator().ID) each post in posts - Postable(post.ToPostable(), user, thread.Author().ID) + Postable(post.ToPostable(), user, thread.Creator().ID) // Reply if user != nil diff --git a/patches/add-forum-creators/add-forum-creators.go b/patches/add-forum-creators/add-forum-creators.go new file mode 100644 index 00000000..7b4acb67 --- /dev/null +++ b/patches/add-forum-creators/add-forum-creators.go @@ -0,0 +1,17 @@ +package main + +import "github.com/animenotifier/arn" + +func main() { + defer arn.Node.Close() + + for post := range arn.StreamPosts() { + post.CreatedBy = post.AuthorID + post.Save() + } + + for thread := range arn.StreamThreads() { + thread.CreatedBy = thread.AuthorID + thread.Save() + } +}