web/notify.moe
Code Issues Pull Requests Activity

Activity page shows create events only

Browse Source
This commit is contained in:
Eduard Urbach 2019-08-27 15:03:29 +09:00
parent f1ccc6c0c6
commit b13b337990
Signed by: akyoto
GPG Key ID: C874F672B1AF20C0
6 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arn/ActivityCreate.go
View File

@ -61,3 +61,16 @@ func StreamActivityCreates() <-chan *ActivityCreate {
return channel
}
// FilterActivityCreates filters all ActivityCreates by a custom function.
func FilterActivityCreates(filter func(Activity) bool) []Activity {
var filtered []Activity
for obj := range StreamActivityCreates() {
if filter(obj) {
filtered = append(filtered, obj)
}
}
return filtered
}

5
arn/Post.go
View File

@ -56,6 +56,11 @@ func (post *Post) GetParentID() string {
return post.ParentID
}
// GetParentType returns the object type of the parent.
func (post *Post) GetParentType() string {
return post.ParentType
}
// SetParent sets a new parent.
func (post *Post) SetParent(newParent PostParent) {
// Remove from old parent

1
arn/Postable.go
View File

@ -23,6 +23,7 @@ type Postable interface {
GetText() string
GetCreated() string
GetParentID() string
GetParentType() string
}
// ToPostables converts a slice of specific types to a slice of generic postables.

5
arn/Thread.go
View File

@ -54,6 +54,11 @@ func (thread *Thread) GetParentID() string {
return ""
}
// GetParentType always returns an empty string for threads.
func (thread *Thread) GetParentType() string {
return ""
}
// TypeName returns the type name.
func (thread *Thread) TypeName() string {
return "Thread"

20
pages/activity/activity.go
View File

@ -28,7 +28,7 @@ func fetchActivities(user *arn.User, followedOnly bool) []arn.Activity {
followedUserIDs = user.Follows().Items
}
activities := arn.FilterActivities(func(activity arn.Activity) bool {
activities := arn.FilterActivityCreates(func(activity arn.Activity) bool {
if followedOnly && !arn.Contains(followedUserIDs, activity.GetCreatedBy()) {
return false
}
@ -37,22 +37,14 @@ func fetchActivities(user *arn.User, followedOnly bool) []arn.Activity {
return false
}
if activity.TypeName() == "ActivityCreate" {
obj := activity.(*arn.ActivityCreate).Object()
obj := activity.(*arn.ActivityCreate).Object()
if obj == nil {
return false
}
draft, isDraftable := obj.(arn.Draftable)
return !isDraftable || !draft.GetIsDraft()
if obj == nil {
return false
}
if activity.TypeName() == "ActivityConsumeAnime" {
return activity.(*arn.ActivityConsumeAnime).Anime() != nil
}
return false
draft, isDraftable := obj.(arn.Draftable)
return !isDraftable || !draft.GetIsDraft()
})
arn.SortActivitiesLatestFirst(activities)

8
pages/activity/activity.pixy
View File

@ -66,13 +66,15 @@ component ActivityConsumeAnimeText(activity *arn.ActivityConsumeAnime, user *arn
span= fmt.Sprintf(" episode %d.", activity.ToEpisode)
component ActivityCreateMeta(activity *arn.ActivityCreate, user *arn.User)
span in
if activity.ObjectType == "Post"
a(href=activity.Postable().Parent().Link())= activity.Postable().Parent().TitleByUser(user)
if activity.Postable().GetParentType() != "User" || activity.Postable().GetParentID() != activity.CreatedBy
span in
a(href=activity.Postable().Parent().Link())= activity.Postable().Parent().TitleByUser(user)
else if activity.ObjectType == "Thread"
span in
a(href=activity.Postable().Link())= activity.Postable().TitleByUser(user)
else if activity.ObjectType == "AMV" || activity.ObjectType == "SoundTrack" || activity.ObjectType == "Quote"
span in
a(href=activity.Object().(arn.PostParent).Link())= activity.Object().(arn.PostParent).TitleByUser(user)
component ActivityCreateText(activity *arn.ActivityCreate, user *arn.User)