From 04373033ccef6e3c534a089161543c31f79dee7b Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Tue, 27 Jun 2017 12:39:41 +0200 Subject: [PATCH] Updated to latest ARN API --- jobs/popular-anime/main.go | 8 +------- jobs/search-index/main.go | 2 +- jobs/sync-anime/main.go | 2 +- main.go | 3 +++ mixins/Navigation.pixy | 2 +- pages/dashboard/dashboard.go | 6 +++++- pages/dashboard/dashboard.pixy | 2 +- pages/music/music.go | 8 ++++++++ patches/post-texts/main.go | 2 +- patches/thread-posts/main.go | 2 +- 10 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 pages/music/music.go diff --git a/jobs/popular-anime/main.go b/jobs/popular-anime/main.go index c90015f2..9a1a0143 100644 --- a/jobs/popular-anime/main.go +++ b/jobs/popular-anime/main.go @@ -14,7 +14,7 @@ const maxPopularAnime = 10 func main() { color.Yellow("Caching popular anime") - animeChan, err := arn.AllAnime() + animeList, err := arn.AllAnime() if err != nil { color.Red("Failed fetching anime channel") @@ -22,12 +22,6 @@ func main() { return } - var animeList []*arn.Anime - - for anime := range animeChan { - animeList = append(animeList, anime) - } - sort.Slice(animeList, func(i, j int) bool { return animeList[i].Rating.Overall > animeList[j].Rating.Overall }) diff --git a/jobs/search-index/main.go b/jobs/search-index/main.go index aa98d388..d4b90078 100644 --- a/jobs/search-index/main.go +++ b/jobs/search-index/main.go @@ -21,7 +21,7 @@ func updateAnimeIndex() { animeSearchIndex := arn.NewSearchIndex() // Anime - animeStream, err := arn.AllAnime() + animeStream, err := arn.StreamAnime() if err != nil { panic(err) diff --git a/jobs/sync-anime/main.go b/jobs/sync-anime/main.go index ea44093f..abc45851 100644 --- a/jobs/sync-anime/main.go +++ b/jobs/sync-anime/main.go @@ -15,7 +15,7 @@ func main() { color.Yellow("Syncing Anime") // Get a stream of all anime - allAnime := kitsu.AllAnime() + allAnime := kitsu.StreamAnime() // Iterate over the stream for anime := range allAnime { diff --git a/main.go b/main.go index e97f2b24..301f8874 100644 --- a/main.go +++ b/main.go @@ -18,6 +18,7 @@ import ( "github.com/animenotifier/notify.moe/pages/forum" "github.com/animenotifier/notify.moe/pages/forums" "github.com/animenotifier/notify.moe/pages/login" + "github.com/animenotifier/notify.moe/pages/music" "github.com/animenotifier/notify.moe/pages/newthread" "github.com/animenotifier/notify.moe/pages/popularanime" "github.com/animenotifier/notify.moe/pages/posts" @@ -67,7 +68,9 @@ func configure(app *aero.Application) *aero.Application { app.Ajax("/user/:nick/animelist/:id", animelistitem.Get) app.Ajax("/new/thread", newthread.Get) app.Ajax("/settings", settings.Get) + app.Ajax("/music", music.Get) app.Ajax("/admin", admin.Get) + app.Ajax("/search", search.Get) app.Ajax("/search/:term", search.Get) app.Ajax("/users", users.Get) app.Ajax("/login", login.Get) diff --git a/mixins/Navigation.pixy b/mixins/Navigation.pixy index a8c01021..156546c2 100644 --- a/mixins/Navigation.pixy +++ b/mixins/Navigation.pixy @@ -26,7 +26,7 @@ component LoggedInMenu(user *arn.User) NavigationButton("Dash", "/", "dashboard") NavigationButton("Profile", "/+", "user") NavigationButton("Forum", "/forum", "comment") - NavigationButton("Anime", "/anime", "television") + NavigationButton("Music", "/music", "music") FuzzySearch diff --git a/pages/dashboard/dashboard.go b/pages/dashboard/dashboard.go index f8774e06..03366114 100644 --- a/pages/dashboard/dashboard.go +++ b/pages/dashboard/dashboard.go @@ -33,9 +33,13 @@ func dashboard(ctx *aero.Context) string { user := utils.GetUser(ctx) flow.Parallel(func() { - posts, err = arn.AllPostsSlice() + posts, err = arn.AllPosts() arn.SortPostsLatestFirst(posts) posts = arn.FilterPostsWithUniqueThreads(posts, maxPosts) + }, func() { + // threads, err = arn.AllThreadsSlice() + // arn.SortPostsLatestFirst(posts) + // posts = arn.FilterPostsWithUniqueThreads(posts, maxPosts) }, func() { userList, err = arn.DB.GetMany("User", user.Following) followingList = userList.([]*arn.User) diff --git a/pages/dashboard/dashboard.pixy b/pages/dashboard/dashboard.pixy index 22a71b50..1ad95cac 100644 --- a/pages/dashboard/dashboard.pixy +++ b/pages/dashboard/dashboard.pixy @@ -15,7 +15,7 @@ component Dashboard(posts []*arn.Post, following []*arn.User) h3.widget-title Forums each post in posts - a.widget-element.ajax(href=post.Thread().Link() + "#" + post.ID) + a.widget-element.ajax(href=post.Thread().Link()) .widget-element-text Icon(arn.GetForumIcon(post.Thread().Tags[0])) span= post.Thread().Title diff --git a/pages/music/music.go b/pages/music/music.go new file mode 100644 index 00000000..490a9930 --- /dev/null +++ b/pages/music/music.go @@ -0,0 +1,8 @@ +package music + +import "github.com/aerogo/aero" + +// Get renders the music page. +func Get(ctx *aero.Context) string { + return ctx.HTML("Coming soon.") +} diff --git a/patches/post-texts/main.go b/patches/post-texts/main.go index 540eaca9..c277a66e 100644 --- a/patches/post-texts/main.go +++ b/patches/post-texts/main.go @@ -7,7 +7,7 @@ import ( func main() { // Get a stream of all posts - allPosts, err := arn.AllPosts() + allPosts, err := arn.StreamPosts() arn.PanicOnError(err) // Iterate over the stream diff --git a/patches/thread-posts/main.go b/patches/thread-posts/main.go index dbaf8dd4..c668ab73 100644 --- a/patches/thread-posts/main.go +++ b/patches/thread-posts/main.go @@ -6,7 +6,7 @@ import ( func main() { // Get a stream of all posts - allPosts, err := arn.AllPosts() + allPosts, err := arn.StreamPosts() arn.PanicOnError(err) threadToPosts := make(map[string][]string)