From 79022c04a88d26d60d0a34b9b8d2d161f37ca2ae Mon Sep 17 00:00:00 2001 From: John O'Keefe Date: Thu, 24 Sep 2026 13:50:31 -0400 Subject: [PATCH] style(go): reformat embedded GraphQL queries with consistent indentation Normalize the AniList GraphQL query strings in AniListFunctions.go and AniListUserFunctions.go so every operation uses the same indentation scheme: two-space steps, field and nested selection sets uniformly indented, and keywords/arguments spaced consistently (query ($search: String!), relations {, startDate {, etc.). Also break the AniListBrowse parameter list onto its own trailing parameter line for readability. The queries themselves are unchanged - this is whitespace-only normalization of the raw string literals, done with the new project-local Neovim setup (.nvim.lua) that formats embedded GraphQL via prettier. No behavior change; queries return identical results. --- AniListFunctions.go | 954 ++++++++++++++++++++-------------------- AniListUserFunctions.go | 22 +- 2 files changed, 486 insertions(+), 490 deletions(-) diff --git a/AniListFunctions.go b/AniListFunctions.go index 71b2903..4284a74 100644 --- a/AniListFunctions.go +++ b/AniListFunctions.go @@ -115,121 +115,121 @@ func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime { Variables interface{} `json:"variables"` }{ Query: ` - query($userId: Int, $mediaId: Int, $listType: MediaType) { + query ($userId: Int, $mediaId: Int, $listType: MediaType) { MediaList(mediaId: $mediaId, userId: $userId, type: $listType) { - id - mediaId - userId - media { - id - idMal - title { - userPreferred - romaji - english - native - } - description - coverImage { - extraLarge - large - medium - color - } - startDate { - year - month - day - } - endDate { - year - month - day - } - bannerImage - format - season - seasonYear - status - episodes - duration - countryOfOrigin - source - synonyms - averageScore - meanScore - popularity - trending - favourites - isFavourite - relations { - nodes { - id - title { - userPreferred - romaji - english - native - } - } - } - nextAiringEpisode { - airingAt - timeUntilAiring - episode - } - airingSchedule { - nodes { - id - airingAt - timeUntilAiring - episode - mediaId - } - } - genres - tags { - id - name - description - rank - isMediaSpoiler - isAdult - } - isAdult - } - status - startedAt{ - year - month - day - } - completedAt{ - year - month - day - } - notes - progress - score - repeat - user { - id - name - avatar { - large - medium - } - statistics { - anime { - count - statuses { - status - count - } - } - } - } + id + mediaId + userId + media { + id + idMal + title { + userPreferred + romaji + english + native + } + description + coverImage { + extraLarge + large + medium + color + } + startDate { + year + month + day + } + endDate { + year + month + day + } + bannerImage + format + season + seasonYear + status + episodes + duration + countryOfOrigin + source + synonyms + averageScore + meanScore + popularity + trending + favourites + isFavourite + relations { + nodes { + id + title { + userPreferred + romaji + english + native + } + } + } + nextAiringEpisode { + airingAt + timeUntilAiring + episode + } + airingSchedule { + nodes { + id + airingAt + timeUntilAiring + episode + mediaId + } + } + genres + tags { + id + name + description + rank + isMediaSpoiler + isAdult + } + isAdult + } + status + startedAt { + year + month + day + } + completedAt { + year + month + day + } + notes + progress + score + repeat + user { + id + name + avatar { + large + medium + } + statistics { + anime { + count + statuses { + status + count + } + } + } + } } } `, @@ -288,94 +288,93 @@ func (a *App) AniListSearch(query string) (interface{}, error) { }{ Query: ` query ($search: String!, $listType: MediaType) { - Page (page: 1, perPage: 100) { - pageInfo { - total - currentPage - lastPage - hasNextPage - perPage - } - media (search: $search, type: $listType) { - id - idMal - title { - userPreferred - romaji - english - native - } - description - coverImage { - extraLarge - large - medium - color - } - bannerImage - format - season - seasonYear - status - episodes - duration - countryOfOrigin - source - synonyms - averageScore - meanScore - popularity - trending - favourites - isFavourite - relations{ - nodes{ - id - title{ - userPreferred - romaji - english - native - } - } - } - startDate{ - year - month - day - } - endDate{ - year - month - day - } - nextAiringEpisode{ - airingAt - timeUntilAiring - episode - } - airingSchedule{ - nodes{ - id - airingAt - timeUntilAiring - episode - mediaId - } - } - genres - tags{ - id - name - description - rank - isMediaSpoiler - isAdult - } - isAdult - } - - } + Page(page: 1, perPage: 100) { + pageInfo { + total + currentPage + lastPage + hasNextPage + perPage + } + media(search: $search, type: $listType) { + id + idMal + title { + userPreferred + romaji + english + native + } + description + coverImage { + extraLarge + large + medium + color + } + bannerImage + format + season + seasonYear + status + episodes + duration + countryOfOrigin + source + synonyms + averageScore + meanScore + popularity + trending + favourites + isFavourite + relations { + nodes { + id + title { + userPreferred + romaji + english + native + } + } + } + startDate { + year + month + day + } + endDate { + year + month + day + } + nextAiringEpisode { + airingAt + timeUntilAiring + episode + } + airingSchedule { + nodes { + id + airingAt + timeUntilAiring + episode + mediaId + } + } + genres + tags { + id + name + description + rank + isMediaSpoiler + isAdult + } + isAdult + } + } } `, Variables: Variables{ @@ -417,140 +416,140 @@ func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) (An Variables Variables `json:"variables"` }{ Query: ` - query ( - $page: Int - $perPage: Int - $userId: Int - $listType: MediaType - $status: MediaListStatus - $sort: [MediaListSort] -) { - Page(page: $page, perPage: $perPage) { - pageInfo { - total - perPage - currentPage - lastPage - hasNextPage - } - mediaList(userId: $userId, type: $listType, status: $status, sort: $sort) { - id - mediaId - userId - media { - id - idMal - title { - userPreferred - romaji - english - native - } - description - coverImage { - extraLarge - large - medium - color - } - bannerImage - format - season - seasonYear - status - episodes - duration - countryOfOrigin - source - synonyms - averageScore - meanScore - popularity - trending - favourites - isFavourite - relations{ - nodes{ - id - title{ - userPreferred - romaji - english - native - } - } - } - startDate{ - year - month - day - } - endDate{ - year - month - day - } - nextAiringEpisode{ - airingAt - timeUntilAiring - episode - } - airingSchedule{ - nodes{ - id - airingAt - timeUntilAiring - episode - mediaId - } - } - genres - tags{ - id - name - description - rank - isMediaSpoiler - isAdult - } - isAdult - } + query ( + $page: Int + $perPage: Int + $userId: Int + $listType: MediaType + $status: MediaListStatus + $sort: [MediaListSort] + ) { + Page(page: $page, perPage: $perPage) { + pageInfo { + total + perPage + currentPage + lastPage + hasNextPage + } + mediaList(userId: $userId, type: $listType, status: $status, sort: $sort) { + id + mediaId + userId + media { + id + idMal + title { + userPreferred + romaji + english + native + } + description + coverImage { + extraLarge + large + medium + color + } + bannerImage + format + season + seasonYear + status + episodes + duration + countryOfOrigin + source + synonyms + averageScore + meanScore + popularity + trending + favourites + isFavourite + relations { + nodes { + id + title { + userPreferred + romaji + english + native + } + } + } + startDate { + year + month + day + } + endDate { + year + month + day + } + nextAiringEpisode { + airingAt + timeUntilAiring + episode + } + airingSchedule { + nodes { + id + airingAt + timeUntilAiring + episode + mediaId + } + } + genres + tags { + id + name + description + rank + isMediaSpoiler + isAdult + } + isAdult + } - status - startedAt { - year - month - day - } - completedAt { - year - month - day - } - notes - progress - score - repeat - user { - id - name - avatar { - large - medium - } - statistics { - anime { - count - statuses { - status - count - } - } - } - } - } - } -} + status + startedAt { + year + month + day + } + completedAt { + year + month + day + } + notes + progress + score + repeat + user { + id + name + avatar { + large + medium + } + statistics { + anime { + count + statuses { + status + count + } + } + } + } + } + } + } `, Variables: Variables{ Page: page, @@ -617,141 +616,141 @@ func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) (AniListGetS Variables AniListUpdateVariables `json:"variables"` }{ Query: ` - mutation ( - $mediaId: Int - $progress: Int - $status: MediaListStatus - $score: Float - $repeat: Int - $notes: String - $startedAt: FuzzyDateInput - $completedAt: FuzzyDateInput -) { - SaveMediaListEntry( - mediaId: $mediaId - progress: $progress - status: $status - score: $score - repeat: $repeat - notes: $notes - startedAt: $startedAt - completedAt: $completedAt - ) { - id - mediaId - userId - media { - id - idMal - title { - userPreferred - romaji - english - native - } - description - coverImage { - extraLarge - large - medium - color - } - bannerImage - format - season - seasonYear - status - episodes - duration - countryOfOrigin - source - synonyms - averageScore - meanScore - popularity - trending - favourites - isFavourite - relations { - nodes { - id - title { - userPreferred - romaji - english - native - } - } - } - startDate { - year - month - day - } - endDate { - year - month - day - } - nextAiringEpisode { - airingAt - timeUntilAiring - episode - } - airingSchedule { - nodes { - id - airingAt - timeUntilAiring - episode - mediaId - } - } - genres - tags { - id - name - description - rank - isMediaSpoiler - isAdult - } - isAdult - } - status - startedAt { - year - month - day - } - completedAt { - year - month - day - } - notes - progress - score - repeat - user { - id - name - avatar { - large - medium - } - statistics { - anime { - count - statuses { - status - count - } - } - } - } - } -} + mutation ( + $mediaId: Int + $progress: Int + $status: MediaListStatus + $score: Float + $repeat: Int + $notes: String + $startedAt: FuzzyDateInput + $completedAt: FuzzyDateInput + ) { + SaveMediaListEntry( + mediaId: $mediaId + progress: $progress + status: $status + score: $score + repeat: $repeat + notes: $notes + startedAt: $startedAt + completedAt: $completedAt + ) { + id + mediaId + userId + media { + id + idMal + title { + userPreferred + romaji + english + native + } + description + coverImage { + extraLarge + large + medium + color + } + bannerImage + format + season + seasonYear + status + episodes + duration + countryOfOrigin + source + synonyms + averageScore + meanScore + popularity + trending + favourites + isFavourite + relations { + nodes { + id + title { + userPreferred + romaji + english + native + } + } + } + startDate { + year + month + day + } + endDate { + year + month + day + } + nextAiringEpisode { + airingAt + timeUntilAiring + episode + } + airingSchedule { + nodes { + id + airingAt + timeUntilAiring + episode + mediaId + } + } + genres + tags { + id + name + description + rank + isMediaSpoiler + isAdult + } + isAdult + } + status + startedAt { + year + month + day + } + completedAt { + year + month + day + } + notes + progress + score + repeat + user { + id + name + avatar { + large + medium + } + statistics { + anime { + count + statuses { + status + count + } + } + } + } + } + } `, Variables: updateBody, } @@ -812,14 +811,10 @@ func (a *App) AniListDeleteEntry(mediaListId int) (DeleteAniListReturn, error) { Variables Variables `json:"variables"` }{ Query: ` - mutation( - $id:Int, - ){ - DeleteMediaListEntry( - id:$id, - ){ - deleted - } + mutation ($id: Int) { + DeleteMediaListEntry(id: $id) { + deleted + } } `, Variables: Variables{ @@ -895,7 +890,8 @@ func (a *App) AniListBrowse( tags []string, excludedTags []string, minimumTagRank int, - sort []string) (AniListCurrentUserWatchList, error) { + sort []string, +) (AniListCurrentUserWatchList, error) { // user := a.GetAniListLoggedInUser() type Variables struct { Page int `json:"page"` diff --git a/AniListUserFunctions.go b/AniListUserFunctions.go index 8be4425..9d15d95 100644 --- a/AniListUserFunctions.go +++ b/AniListUserFunctions.go @@ -179,18 +179,18 @@ func (a *App) GetAniListLoggedInUser() AniListUser { Query string `json:"query"` }{ Query: ` - query { - Viewer { - id - name - avatar { - large - medium + query { + Viewer { + id + name + avatar { + large + medium + } + bannerImage + siteUrl + } } - bannerImage - siteUrl - } - } `, }