web/notify.moe
Code Issues Pull Requests Activity

Show threads in activity view

Browse Source
This commit is contained in:
Eduard Urbach 2018-11-05 13:19:42 +09:00
parent e21e3498f7
commit e74253df96
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mixins/Postable.pixy
View File

@ -50,10 +50,6 @@ component Postable(post arn.Postable, user *arn.User, headerContent string, high
if user != nil && (user.Role == "admin" || user.Role == "editor")
a.post-tool.post-delete.tip.action(data-action="deletePost", data-trigger="click", data-id=post.GetID(), aria-label="Delete")
Icon("trash")
a.post-tool.post-permalink.tip(href=post.Link(), aria-label="Link")
Icon("link")
//- if type === "Messages" && user && (user.ID === post.authorId || user.ID === post.recipientId)
//- a.post-tool.post-delete(onclick=`if(confirm("Do you really want to delete this ${typeSingular.toLowerCase()} from ${post.author.nick}?")) $.delete${typeSingular}("${post.ID}")`, title="Delete")
//- i.fa.fa-trash.fa-fw
a.post-tool.post-permalink.tip(href=post.Link(), aria-label="Link")
Icon("link")

18
pages/activity/activity.go
View File

@ -21,7 +21,23 @@ func Get(ctx *aero.Context) string {
// })
entries := arn.FilterEditLogEntries(func(entry *arn.EditLogEntry) bool {
return entry.Action == "create" && entry.ObjectType == "Post" && entry.Object() != nil
if entry.Action != "create" {
return false
}
obj := entry.Object()
if obj == nil {
return false
}
_, isPostable := obj.(arn.Postable)
if !isPostable {
return false
}
return true
})
arn.SortEditLogEntriesLatestFirst(entries)

17
pages/activity/activity.pixy
View File

@ -3,14 +3,11 @@ component ActivityFeed(entries []*arn.EditLogEntry, user *arn.User)
.activities
each entry in entries
if entry.ObjectType == "Post"
.activity
ActivityPost(entry.Object().(*arn.Post), user)
.activity
ActivityPost(entry.Object().(arn.Postable), user)
component ActivityPost(post *arn.Post, user *arn.User)
//- .activity-header.mountable
//- a(href=post.Creator().Link())= post.Creator().Nick
//- span commented on
//- a(href=post.Parent().Link())= post.Parent().TitleByUser(user)
Postable(post, user, fmt.Sprintf(`<p class="activity-header"><a href="%s">%s</a></p>`, post.Parent().Link(), html.EscapeString(post.Parent().TitleByUser(user))), "")
component ActivityPost(post arn.Postable, user *arn.User)
if post.Parent() != nil
Postable(post, user, fmt.Sprintf(`<p class="activity-header"><a href="%s">%s</a></p>`, post.Parent().Link(), html.EscapeString(post.Parent().TitleByUser(user))), "")
else
Postable(post, user, fmt.Sprintf(`<p class="activity-header"><a href="%s">%s</a></p>`, post.Link(), html.EscapeString(post.TitleByUser(user))), "")