web/notify.moe
Code Issues Pull Requests Activity

API Cleanup

Browse Source
This commit is contained in:
Eduard Urbach 2017-11-18 11:37:29 +01:00
parent bd293de4be
commit c5cb497722
7 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/anime/anime.go
View File

@ -72,7 +72,7 @@ func Get(ctx *aero.Context) string {
}
// Soundtracks
tracks, err := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
tracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
return !track.IsDraft && len(track.Media) > 0 && arn.Contains(track.Tags, "anime:"+anime.ID)
})
@ -80,10 +80,6 @@ func Get(ctx *aero.Context) string {
return tracks[i].Title < tracks[j].Title
})
if err != nil {
return ctx.Error(http.StatusNotFound, "Error fetching soundtracks", err)
}
// Open Graph
description := anime.Summary

6
pages/anime/tracks.go
View File

@ -19,13 +19,9 @@ func Tracks(ctx *aero.Context) string {
return ctx.Error(http.StatusNotFound, "Anime not found", err)
}
tracks, err := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
tracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
return !track.IsDraft && len(track.Media) > 0 && arn.Contains(track.Tags, "anime:"+anime.ID)
})
if err != nil {
return ctx.Error(http.StatusNotFound, "Error fetching soundtracks", err)
}
return ctx.HTML(components.AnimeTracks(anime, tracks))
}

31
pages/companies/companies.go Normal file
View File

@ -0,0 +1,31 @@
package companies
import (
"net/http"
"github.com/aerogo/aero"
"github.com/animenotifier/arn"
"github.com/animenotifier/notify.moe/components"
"github.com/animenotifier/notify.moe/utils"
)
const maxEntries = 12
// Get renders the companies page.
func Get(ctx *aero.Context) string {
user := utils.GetUser(ctx)
companies := arn.FilterCompanies(func(company *arn.Company) bool {
return !company.IsDraft
})
if err != nil {
return ctx.Error(http.StatusInternalServerError, "Error fetching companies", err)
}
if len(companies) > maxEntries {
companies = companies[:maxEntries]
}
return ctx.HTML(components.Companies(companies, user))
}

0
pages/companies/companies.pixy Normal file
View File

7
pages/dashboard/dashboard.go
View File

@ -72,15 +72,10 @@ func Get(ctx *aero.Context) string {
upcomingEpisodes = upcomingEpisodes[:maxScheduleItems]
}
}, func() {
var err error
soundTracks, err = arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
soundTracks = arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
return !track.IsDraft && len(track.Media) > 0
})
if err != nil {
return
}
arn.SortSoundTracksLatestFirst(soundTracks)
if len(soundTracks) > maxSoundTracks {

6
pages/profile/tracks.go
View File

@ -19,14 +19,10 @@ func GetSoundTracksByUser(ctx *aero.Context) string {
return ctx.Error(http.StatusNotFound, "User not found", err)
}
tracks, err := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
tracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
return !track.IsDraft && len(track.Media) > 0 && track.CreatedBy == viewUser.ID
})
if err != nil {
return ctx.Error(http.StatusInternalServerError, "Error fetching soundtracks", err)
}
arn.SortSoundTracksLatestFirst(tracks)
return ctx.HTML(components.TrackList(tracks, viewUser, user, ctx.URI()))

12
pages/soundtracks/soundtracks.go
View File

@ -16,14 +16,10 @@ const maxTracks = 12
func Get(ctx *aero.Context) string {
user := utils.GetUser(ctx)
tracks, err := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
tracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
return !track.IsDraft && len(track.Media) > 0
})
if err != nil {
return ctx.Error(http.StatusInternalServerError, "Error fetching soundtracks", err)
}
arn.SortSoundTracksLatestFirst(tracks)
if len(tracks) > maxTracks {
@ -42,14 +38,10 @@ func From(ctx *aero.Context) string {
return ctx.Error(http.StatusBadRequest, "Invalid start index", err)
}
allTracks, err := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
allTracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool {
return !track.IsDraft && len(track.Media) > 0
})
if err != nil {
return ctx.Error(http.StatusInternalServerError, "Error fetching soundtracks", err)
}
if index < 0 || index >= len(allTracks) {
return ctx.Error(http.StatusBadRequest, "Invalid start index (maximum is "+strconv.Itoa(len(allTracks))+")", nil)
}