From 1c0dc143170089979a842bd7db34a07b70a6de08 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Wed, 5 Jun 2019 16:18:04 +0900 Subject: [PATCH] Fixed unused parameters --- main_test.go | 3 +-- pages/anime/anime.go | 4 ++-- pages/editor/filtersoundtracks/utils.go | 4 ++-- pages/group/feed.go | 2 +- pages/group/info.go | 2 +- pages/group/members.go | 2 +- pages/group/opengraph.go | 3 +-- pages/post/opengraph.go | 3 +-- pages/post/post.go | 2 +- pages/soundtrack/lyrics.go | 2 +- pages/soundtrack/opengraph.go | 3 +-- pages/soundtrack/soundtrack.go | 2 +- pages/thread/opengraph.go | 3 +-- pages/thread/thread.go | 2 +- utils/editform/editform.go | 4 ++-- 15 files changed, 18 insertions(+), 23 deletions(-) diff --git a/main_test.go b/main_test.go index cd205a09..25273baa 100644 --- a/main_test.go +++ b/main_test.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "net/http" "net/http/httptest" "strings" @@ -121,6 +120,6 @@ func testRoute(t *testing.T, app *aero.Application, route string) { case http.StatusOK, http.StatusTemporaryRedirect, http.StatusPermanentRedirect: // OK default: - panic(fmt.Errorf("%s | Wrong status code | %v instead of %v", route, status, http.StatusOK)) + t.Fatalf("%s | Wrong status code | %v instead of %v", route, status, http.StatusOK) } } diff --git a/pages/anime/anime.go b/pages/anime/anime.go index c7c02252..b791711e 100644 --- a/pages/anime/anime.go +++ b/pages/anime/anime.go @@ -123,12 +123,12 @@ func Get(ctx aero.Context) error { // Open Graph customCtx := ctx.(*middleware.OpenGraphContext) - customCtx.OpenGraph = getOpenGraph(ctx, anime) + customCtx.OpenGraph = getOpenGraph(anime) return ctx.HTML(components.Anime(anime, animeListItem, tracks, amvs, amvAppearances, episodes, friends, friendsAnimeListItems, episodeToFriends, user)) } -func getOpenGraph(ctx aero.Context, anime *arn.Anime) *arn.OpenGraph { +func getOpenGraph(anime *arn.Anime) *arn.OpenGraph { description := anime.Summary if len(description) > maxDescriptionLength { diff --git a/pages/editor/filtersoundtracks/utils.go b/pages/editor/filtersoundtracks/utils.go index 66bf6af3..3b351eb5 100644 --- a/pages/editor/filtersoundtracks/utils.go +++ b/pages/editor/filtersoundtracks/utils.go @@ -20,7 +20,7 @@ func editorList(ctx aero.Context, title string, filter func(*arn.SoundTrack) boo return ctx.Error(http.StatusUnauthorized, "Not authorized") } - tracks, count := filterSoundTracks(ctx, user, filter) + tracks, count := filterSoundTracks(filter) url := strings.TrimPrefix(ctx.Path(), "/_") return ctx.HTML(components.SoundTracksEditorListFull( @@ -34,7 +34,7 @@ func editorList(ctx aero.Context, title string, filter func(*arn.SoundTrack) boo } // filterSoundTracks filters soundtracks by the given filter function. -func filterSoundTracks(ctx aero.Context, user *arn.User, filter func(*arn.SoundTrack) bool) ([]*arn.SoundTrack, int) { +func filterSoundTracks(filter func(*arn.SoundTrack) bool) ([]*arn.SoundTrack, int) { // Filter tracks := arn.FilterSoundTracks(func(track *arn.SoundTrack) bool { return !track.IsDraft && filter(track) diff --git a/pages/group/feed.go b/pages/group/feed.go index 2f7bf013..52a5bc36 100644 --- a/pages/group/feed.go +++ b/pages/group/feed.go @@ -27,6 +27,6 @@ func Feed(ctx aero.Context) error { } customCtx := ctx.(*middleware.OpenGraphContext) - customCtx.OpenGraph = getOpenGraph(ctx, group) + customCtx.OpenGraph = getOpenGraph(group) return ctx.HTML(components.GroupFeed(group, member, user)) } diff --git a/pages/group/info.go b/pages/group/info.go index 27b510df..40fcfffd 100644 --- a/pages/group/info.go +++ b/pages/group/info.go @@ -27,6 +27,6 @@ func Info(ctx aero.Context) error { } customCtx := ctx.(*middleware.OpenGraphContext) - customCtx.OpenGraph = getOpenGraph(ctx, group) + customCtx.OpenGraph = getOpenGraph(group) return ctx.HTML(components.GroupInfo(group, member, user)) } diff --git a/pages/group/members.go b/pages/group/members.go index 1868ce37..cd4ed8c1 100644 --- a/pages/group/members.go +++ b/pages/group/members.go @@ -27,6 +27,6 @@ func Members(ctx aero.Context) error { } customCtx := ctx.(*middleware.OpenGraphContext) - customCtx.OpenGraph = getOpenGraph(ctx, group) + customCtx.OpenGraph = getOpenGraph(group) return ctx.HTML(components.GroupMembers(group, member, user)) } diff --git a/pages/group/opengraph.go b/pages/group/opengraph.go index 35e97b78..952a080a 100644 --- a/pages/group/opengraph.go +++ b/pages/group/opengraph.go @@ -1,12 +1,11 @@ package group import ( - "github.com/aerogo/aero" "github.com/animenotifier/notify.moe/arn" "github.com/animenotifier/notify.moe/assets" ) -func getOpenGraph(ctx aero.Context, group *arn.Group) *arn.OpenGraph { +func getOpenGraph(group *arn.Group) *arn.OpenGraph { return &arn.OpenGraph{ Tags: map[string]string{ "og:title": group.Name, diff --git a/pages/post/opengraph.go b/pages/post/opengraph.go index 0dc9f47a..ea520891 100644 --- a/pages/post/opengraph.go +++ b/pages/post/opengraph.go @@ -1,13 +1,12 @@ package post import ( - "github.com/aerogo/aero" "github.com/animenotifier/notify.moe/arn" "github.com/animenotifier/notify.moe/assets" "github.com/animenotifier/notify.moe/utils" ) -func getOpenGraph(ctx aero.Context, post *arn.Post) *arn.OpenGraph { +func getOpenGraph(post *arn.Post) *arn.OpenGraph { openGraph := &arn.OpenGraph{ Tags: map[string]string{ "og:title": post.TitleByUser(nil), diff --git a/pages/post/post.go b/pages/post/post.go index f15906f6..839a0e03 100644 --- a/pages/post/post.go +++ b/pages/post/post.go @@ -21,6 +21,6 @@ func Get(ctx aero.Context) error { } customCtx := ctx.(*middleware.OpenGraphContext) - customCtx.OpenGraph = getOpenGraph(ctx, post) + customCtx.OpenGraph = getOpenGraph(post) return ctx.HTML(components.Post(post, user)) } diff --git a/pages/soundtrack/lyrics.go b/pages/soundtrack/lyrics.go index 5f470cb7..41a93a51 100644 --- a/pages/soundtrack/lyrics.go +++ b/pages/soundtrack/lyrics.go @@ -20,7 +20,7 @@ func Lyrics(ctx aero.Context) error { return ctx.Error(http.StatusNotFound, "Track not found", err) } - openGraph := getOpenGraph(ctx, track) + openGraph := getOpenGraph(track) if track.Lyrics.Native != "" { openGraph.Tags["og:description"] = utils.CutLongDescription(track.Lyrics.Native) diff --git a/pages/soundtrack/opengraph.go b/pages/soundtrack/opengraph.go index 2b1f5732..76c0f215 100644 --- a/pages/soundtrack/opengraph.go +++ b/pages/soundtrack/opengraph.go @@ -3,12 +3,11 @@ package soundtrack import ( "strings" - "github.com/aerogo/aero" "github.com/animenotifier/notify.moe/arn" "github.com/animenotifier/notify.moe/assets" ) -func getOpenGraph(ctx aero.Context, track *arn.SoundTrack) *arn.OpenGraph { +func getOpenGraph(track *arn.SoundTrack) *arn.OpenGraph { openGraph := &arn.OpenGraph{ Tags: map[string]string{ "og:title": track.Title.ByUser(nil), diff --git a/pages/soundtrack/soundtrack.go b/pages/soundtrack/soundtrack.go index bf32ba38..37eb2975 100644 --- a/pages/soundtrack/soundtrack.go +++ b/pages/soundtrack/soundtrack.go @@ -21,6 +21,6 @@ func Get(ctx aero.Context) error { } customCtx := ctx.(*middleware.OpenGraphContext) - customCtx.OpenGraph = getOpenGraph(ctx, track) + customCtx.OpenGraph = getOpenGraph(track) return ctx.HTML(components.SoundTrackPage(track, user)) } diff --git a/pages/thread/opengraph.go b/pages/thread/opengraph.go index d4bed01d..6a8fb2c9 100644 --- a/pages/thread/opengraph.go +++ b/pages/thread/opengraph.go @@ -1,13 +1,12 @@ package thread import ( - "github.com/aerogo/aero" "github.com/animenotifier/notify.moe/arn" "github.com/animenotifier/notify.moe/assets" "github.com/animenotifier/notify.moe/utils" ) -func getOpenGraph(ctx aero.Context, thread *arn.Thread) *arn.OpenGraph { +func getOpenGraph(thread *arn.Thread) *arn.OpenGraph { openGraph := &arn.OpenGraph{ Tags: map[string]string{ "og:title": thread.Title, diff --git a/pages/thread/thread.go b/pages/thread/thread.go index 851d37e4..22bfc178 100644 --- a/pages/thread/thread.go +++ b/pages/thread/thread.go @@ -23,6 +23,6 @@ func Get(ctx aero.Context) error { } customCtx := ctx.(*middleware.OpenGraphContext) - customCtx.OpenGraph = getOpenGraph(ctx, thread) + customCtx.OpenGraph = getOpenGraph(thread) return ctx.HTML(components.Thread(thread, user)) } diff --git a/utils/editform/editform.go b/utils/editform/editform.go index 79c1cd76..6c7ac375 100644 --- a/utils/editform/editform.go +++ b/utils/editform/editform.go @@ -168,7 +168,7 @@ func RenderField(b *strings.Builder, v *reflect.Value, field reflect.StructField // Any kind of array if strings.HasPrefix(fieldType, "[]") { - renderSliceField(b, v, field, idPrefix, fieldType, fieldValue) + renderSliceField(b, field, idPrefix, fieldType, fieldValue) return } @@ -258,7 +258,7 @@ func renderStringField(b *strings.Builder, v *reflect.Value, field reflect.Struc } // Slice field -func renderSliceField(b *strings.Builder, v *reflect.Value, field reflect.StructField, idPrefix string, fieldType string, fieldValue reflect.Value) { +func renderSliceField(b *strings.Builder, field reflect.StructField, idPrefix string, fieldType string, fieldValue reflect.Value) { b.WriteString(`
`) b.WriteString(`

`) b.WriteString(field.Name)