From 496aea9d0dc33d66992e41fe6c7250b21ae25a25 Mon Sep 17 00:00:00 2001 From: mkelvers Date: Tue, 23 Jun 2026 17:38:07 +0200 Subject: [PATCH] refactor: shorten function names in jikan relations --- integrations/jikan/relations.go | 21 +++++++++++---------- integrations/jikan/relations_test.go | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/integrations/jikan/relations.go b/integrations/jikan/relations.go index 769fdbe..574ef82 100644 --- a/integrations/jikan/relations.go +++ b/integrations/jikan/relations.go @@ -185,7 +185,8 @@ func (c *Client) handleWatchOrderError(ctx context.Context, id int, err error) ( return c.currentOnlyRelation(ctx, id) } -func buildAllowedWatchOrderEntries(result watchorder.WatchOrderResult, mode WatchOrderMode) ([]watchorder.WatchOrderEntry, map[int]bool) { +// relation filter +func allowedWatchOrder(result watchorder.WatchOrderResult, mode WatchOrderMode) ([]watchorder.WatchOrderEntry, map[int]bool) { allowedEntries := make([]watchorder.WatchOrderEntry, 0, len(result.WatchOrder)) seen := make(map[int]bool) hasTVEntry := false @@ -216,7 +217,7 @@ func buildAllowedWatchOrderEntries(result watchorder.WatchOrderResult, mode Watc return allowedEntries, seen } -func (c *Client) fetchRelationEntries(ctx context.Context, entries []watchorder.WatchOrderEntry) chan fetchResult { +func (c *Client) fetchEntries(ctx context.Context, entries []watchorder.WatchOrderEntry) chan fetchResult { g, gCtx := errgroup.WithContext(ctx) g.SetLimit(3) @@ -262,8 +263,8 @@ func (c *Client) fetchRelationEntries(ctx context.Context, entries []watchorder. return results } -func (c *Client) fetchRelationResults(ctx context.Context, entries []watchorder.WatchOrderEntry) []fetchResult { - results := c.fetchRelationEntries(ctx, entries) +func (c *Client) fetchResults(ctx context.Context, entries []watchorder.WatchOrderEntry) []fetchResult { + results := c.fetchEntries(ctx, entries) fetched := make([]fetchResult, 0, len(entries)) for res := range results { @@ -291,7 +292,7 @@ func (c *Client) fetchRelationResults(ctx context.Context, entries []watchorder. return fetched } -func buildRelationsFromResults(results []fetchResult, id int) []RelationEntry { +func buildRelations(results []fetchResult, id int) []RelationEntry { relations := make([]RelationEntry, 0, len(results)+1) for _, res := range results { relations = append(relations, RelationEntry{ @@ -305,7 +306,7 @@ func buildRelationsFromResults(results []fetchResult, id int) []RelationEntry { return relations } -func (c *Client) ensureCurrentRelation(ctx context.Context, id int, seen map[int]bool, relations []RelationEntry) ([]RelationEntry, error) { +func (c *Client) ensureCurrent(ctx context.Context, id int, seen map[int]bool, relations []RelationEntry) ([]RelationEntry, error) { if seen[id] { return relations, nil } @@ -336,10 +337,10 @@ func (c *Client) GetFullRelations(ctx context.Context, id int, mode WatchOrderMo return c.handleWatchOrderError(ctx, id, err) } - allowedEntries, seen := buildAllowedWatchOrderEntries(result, mode) - fetched := c.fetchRelationResults(ctx, allowedEntries) - relations := buildRelationsFromResults(fetched, id) - relations, err = c.ensureCurrentRelation(ctx, id, seen, relations) + allowedEntries, seen := allowedWatchOrder(result, mode) + fetched := c.fetchResults(ctx, allowedEntries) + relations := buildRelations(fetched, id) + relations, err = c.ensureCurrent(ctx, id, seen, relations) if err != nil { return nil, err } diff --git a/integrations/jikan/relations_test.go b/integrations/jikan/relations_test.go index b5377fc..95c630e 100644 --- a/integrations/jikan/relations_test.go +++ b/integrations/jikan/relations_test.go @@ -38,7 +38,7 @@ func TestBuildAllowedWatchOrderEntriesKeepsDefaultTypesWhenTVExists(t *testing.T }, } - entries, seen := buildAllowedWatchOrderEntries(result, WatchOrderModeMain) + entries, seen := allowedWatchOrder(result, WatchOrderModeMain) if len(entries) != 2 { t.Fatalf("expected 2 entries, got %d", len(entries)) } @@ -62,7 +62,7 @@ func TestBuildAllowedWatchOrderEntriesIncludesAllTypesWhenNoTVExists(t *testing. }, } - entries, seen := buildAllowedWatchOrderEntries(result, WatchOrderModeMain) + entries, seen := allowedWatchOrder(result, WatchOrderModeMain) if len(entries) != 3 { t.Fatalf("expected 3 entries, got %d", len(entries)) } @@ -86,7 +86,7 @@ func TestBuildAllowedWatchOrderEntriesIncludesAllTypesInCompleteMode(t *testing. }, } - entries, seen := buildAllowedWatchOrderEntries(result, WatchOrderModeComplete) + entries, seen := allowedWatchOrder(result, WatchOrderModeComplete) if len(entries) != 4 { t.Fatalf("expected 4 entries, got %d", len(entries)) }