fix(anilist): decode array-shaped airingSchedule/relations and isolate per-service sync errors

The 1.6.1 fix exposed a latent decoding bug: AniList returns airingSchedule.nodes and relations.nodes as arrays, but the Go Media struct declared Nodes as single structs. Every full-media response failed json.Unmarshal partway through - the update path turned that into a rejected promise which skipped the MAL and Simkl syncs and all table updates, while page loads silently continued with partially decoded data (the reason the old tags/genres copy workaround existed). - Media.AiringSchedule.Nodes is now []AiringScheduleNode and Media.Relations is an exported []MediaRelation (previously an unexported field silently dropped by encoding/json); title and fuzzy-date sub-structs promoted to named types. - Regenerate wailsjs models for the new shapes. - Anime.svelte: handleSubmit and deleteEntries now wrap each service in its own try/catch surfaced via setApiError/ErrorModal, so one service failing can no longer skip the others; removed the obsolete tags/genres copy workaround. - AniListUpdateEntry/AniListDeleteEntry log HTTP status and response body on failure for terminal diagnostics. Bump productVersion to 1.6.2.
fix(anilist): repair SaveMediaListEntry mutation and surface update failures
2026-09-01 20:18:42 -04:00 · 2026-09-01 19:49:47 -04:00 · 2026-08-29 13:13:42 -04:00 · 2026-08-29 13:13:37 -04:00 · 2026-08-29 13:13:25 -04:00 · 2026-08-29 13:12:22 -04:00
62 changed files with 4129 additions and 2610 deletions
@@ -33,3 +33,8 @@ environment.go

 # REST (http files)
 http-client.private.env.json
+
+# Build artifacts
+*.tar
+*.tar.gz
+/AniTrack
@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"log"
 	"net/http"
@@ -76,23 +77,69 @@ func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
 				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
@@ -183,7 +230,7 @@ func (a *App) GetAniListItem(aniId int, login bool) AniListGetSingleAnime {
 	return post
 }

-func (a *App) AniListSearch(query string) any {
+func (a *App) AniListSearch(query string) (interface{}, error) {
 	type Variables struct {
 		Search   string `json:"search"`
 		ListType string `json:"listType"`
@@ -206,23 +253,69 @@ func (a *App) AniListSearch(query string) any {
 					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
@@ -234,6 +327,7 @@ func (a *App) AniListSearch(query string) any {
 					  }
 				    isAdult
 				}
+
 				}
 			}
 		`,
@@ -242,18 +336,20 @@ func (a *App) AniListSearch(query string) any {
 			ListType: "ANIME",
 		},
 	}
-	returnedBody, _ := AniListQuery(body, false)
-
+	returnedBody, status := AniListQuery(body, false)
+	if status != "200 OK" {
+		return nil, fmt.Errorf("API search failed with status: %s", status)
+	}
 	var post interface{}
 	err := json.Unmarshal(returnedBody, &post)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return nil, fmt.Errorf("Failed to parse search results")
+	}
+	return post, nil
 }

-	return post
-}
-
-func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) AniListCurrentUserWatchList {
+func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) (AniListCurrentUserWatchList, error) {
 	user := a.GetAniListLoggedInUser()
 	type Variables struct {
 		Page     int    `json:"page"`
@@ -292,23 +388,69 @@ func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) Ani
      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
@@ -320,6 +462,7 @@ func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) Ani
 						  }
 					    isAdult
 					}
+
      status
      startedAt {
        year
@@ -404,36 +547,40 @@ func (a *App) GetAniListUserWatchingList(page int, perPage int, sort string) Ani
 		err := json.Unmarshal(returnedBody, &badPost)
 		if err != nil {
 			log.Printf("Failed at unmarshal, %s\n", err)
+			return post, fmt.Errorf("API authentication error")
 		}
-		log.Fatal(badPost.Errors[0].Message)
+		return post, fmt.Errorf("AniList API error: %s", badPost.Errors[0].Message)
+	}
+	if status != "200 OK" {
+		return post, fmt.Errorf("API request failed with status: %s", status)
 	}

-	return post
+	return post, nil
 }

-func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSingleAnime {
+func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) (AniListGetSingleAnime, error) {
 	body := struct {
 		Query     string                 `json:"query"`
 		Variables AniListUpdateVariables `json:"variables"`
 	}{
 		Query: `
 		mutation (
-			  $mediaId:Int,
-			  $progress:Int,
-			  $status:MediaListStatus,
-			  $score:Float,
-			  $repeat:Int,
-			  $notes:String,
-			  $startedAt:FuzzyDateInput,
-			  $completedAt:FuzzyDateInput,
+  $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,
+    mediaId: $mediaId
+    progress: $progress
+    status: $status
+    score: $score
+    repeat: $repeat
+    notes: $notes
    startedAt: $startedAt
    completedAt: $completedAt
  ) {
@@ -444,23 +591,78 @@ func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSi
      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
@@ -501,22 +703,53 @@ func (a *App) AniListUpdateEntry(updateBody AniListUpdateVariables) AniListGetSi
 		Variables: updateBody,
 	}

-	returnedBody, _ := AniListQuery(body, true)
+	returnedBody, status := AniListQuery(body, true)
+
+	var badPost struct {
+		Errors []struct {
+			Message   string `json:"message"`
+			Status    int    `json:"status"`
+			Locations []struct {
+				Line   int `json:"line"`
+				Column int `json:"column"`
+			} `json:"locations"`
+		} `json:"errors"`
+		Data any `json:"data"`
+	}
+
+	if status == "403 Forbidden" {
+		err := json.Unmarshal(returnedBody, &badPost)
+		if err != nil {
+			log.Printf("Failed at unmarshal, %s\n", err)
+			return AniListGetSingleAnime{}, fmt.Errorf("API authentication error")
+		}
+		return AniListGetSingleAnime{}, fmt.Errorf("AniList API error: %s", badPost.Errors[0].Message)
+	}
+	if status != "200 OK" {
+		log.Printf("AniListUpdateEntry failed with status: %s, body: %s\n", status, string(returnedBody))
+		return AniListGetSingleAnime{}, fmt.Errorf("API request failed with status: %s", status)
+	}

 	var returnedJson AniListUpdateReturn
 	err := json.Unmarshal(returnedBody, &returnedJson)
 	if err != nil {
-		log.Printf("Failed at unmarshal, %s\n", err)
+		log.Printf("AniListUpdateEntry failed to unmarshal response: %s, body: %s\n", err, string(returnedBody))
+		return AniListGetSingleAnime{}, fmt.Errorf("failed to parse AniList update response")
+	}
+
+	if returnedJson.Data.SaveMediaListEntry.MediaID == 0 {
+		log.Printf("AniListUpdateEntry returned no saved entry, body: %s\n", string(returnedBody))
+		return AniListGetSingleAnime{}, fmt.Errorf("AniList returned no saved entry")
 	}

 	var post AniListGetSingleAnime

 	post.Data.MediaList = returnedJson.Data.SaveMediaListEntry

-	return post
+	return post, nil
 }

-func (a *App) AniListDeleteEntry(mediaListId int) DeleteAniListReturn {
+func (a *App) AniListDeleteEntry(mediaListId int) (DeleteAniListReturn, error) {
 	type Variables = struct {
 		Id int `json:"id"`
 	}
@@ -541,13 +774,352 @@ func (a *App) AniListDeleteEntry(mediaListId int) DeleteAniListReturn {
 		},
 	}

-	returnedBody, _ := AniListQuery(body, true)
+	returnedBody, status := AniListQuery(body, true)
+
+	var badPost struct {
+		Errors []struct {
+			Message   string `json:"message"`
+			Status    int    `json:"status"`
+			Locations []struct {
+				Line   int `json:"line"`
+				Column int `json:"column"`
+			} `json:"locations"`
+		} `json:"errors"`
+		Data any `json:"data"`
+	}
+
+	if status == "403 Forbidden" {
+		err := json.Unmarshal(returnedBody, &badPost)
+		if err != nil {
+			log.Printf("Failed at unmarshal, %s\n", err)
+			return DeleteAniListReturn{}, fmt.Errorf("API authentication error")
+		}
+		return DeleteAniListReturn{}, fmt.Errorf("AniList API error: %s", badPost.Errors[0].Message)
+	}
+	if status != "200 OK" {
+		log.Printf("AniListDeleteEntry failed with status: %s, body: %s\n", status, string(returnedBody))
+		return DeleteAniListReturn{}, fmt.Errorf("API request failed with status: %s", status)
+	}

 	var post DeleteAniListReturn
 	err := json.Unmarshal(returnedBody, &post)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return DeleteAniListReturn{}, fmt.Errorf("failed to parse AniList delete response")
 	}

-	return post
+	return post, nil
+}
+
+func (a *App) AniListBrowse(
+	page int,
+	perPage int,
+	id int,
+	isAdult bool,
+	search string,
+	format []string,
+	status string,
+	countryOfOrigin string,
+	source string,
+	season string,
+	seasonYear int,
+	year string,
+	onList bool,
+	yearLesser int,
+	yearGreater int,
+	episodeLesser int,
+	episodeGreater int,
+	durationLesser int,
+	durationGreater int,
+	chapterLesser int,
+	chapterGreater int,
+	volumeLesser int,
+	volumeGreater int,
+	licensedBy []int,
+	isLicensed bool,
+	genres []string,
+	excludedGenres []string,
+	tags []string,
+	excludedTags []string,
+	minimumTagRank int,
+	sort []string) (AniListCurrentUserWatchList, error) {
+	// user := a.GetAniListLoggedInUser()
+	type Variables struct {
+		Page            int      `json:"page"`
+		PerPage         int      `json:"perPage"`
+		Id              int      `json:"id"`
+		IsAdult         bool     `json:"isAdult"`
+		Search          string   `json:"search"`
+		Format          []string `json:"format"`
+		Status          string   `json:"status"`
+		CountryOfOrigin string   `json:"countryOfOrigin"`
+		Source          string   `json:"source"`
+		Season          string   `json:"season"`
+		SeasonYear      int      `json:"seasonYear"`
+		Year            string   `json:"year"`
+		OnList          bool     `json:"onList"`
+		YearLesser      int      `json:"yearLesser"`
+		YearGreater     int      `json:"yearGreater"`
+		EpisodeLesser   int      `json:"episodeLesser"`
+		EpisodeGreater  int      `json:"episodeGreater"`
+		DurationLesser  int      `json:"durationLesser"`
+		DurationGreater int      `json:"durationGreater"`
+		ChapterLesser   int      `json:"chapterLesser"`
+		ChapterGreater  int      `json:"chapterGreater"`
+		VolumeLesser    int      `json:"volumeLesser"`
+		VolumeGreater   int      `json:"volumeGreater"`
+		LicensedBy      []int    `json:"licensedBy"`
+		IsLicensed      bool     `json:"isLicensed"`
+		Genres          []string `json:"genres"`
+		ExcludedGenres  []string `json:"excludedGenres"`
+		Tags            []string `json:"tags"`
+		ExcludedTags    []string `json:"excludedTags"`
+		MinimumTagRank  int      `json:"minimumTagRank"`
+		Sort            []string `json:"sort"`
+	}
+	body := struct {
+		Query     string    `json:"query"`
+		Variables Variables `json:"variables"`
+	}{
+		Query: `
+			query (
+			  $page: Int = 1
+			  $perPage: Int = 20
+			  $id: Int
+			  $isAdult: Boolean = false
+			  $search: String
+			  $format: [MediaFormat]
+			  $status: MediaStatus
+			  $countryOfOrigin: CountryCode
+			  $source: MediaSource
+			  $season: MediaSeason
+			  $seasonYear: Int
+			  $year: String
+			  $onList: Boolean
+			  $yearLesser: FuzzyDateInt
+			  $yearGreater: FuzzyDateInt
+			  $episodeLesser: Int
+			  $episodeGreater: Int
+			  $durationLesser: Int
+			  $durationGreater: Int
+			  $chapterLesser: Int
+			  $chapterGreater: Int
+			  $volumeLesser: Int
+			  $volumeGreater: Int
+			  $licensedBy: [Int]
+			  $isLicensed: Boolean
+			  $genres: [String]
+			  $excludedGenres: [String]
+			  $tags: [String]
+			  $excludedTags: [String]
+			  $minimumTagRank: Int
+			  $sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC]
+			) {
+			  Page(page: $page, perPage: $perPage) {
+			    pageInfo {
+			      total
+			      perPage
+			      currentPage
+			      lastPage
+			      hasNextPage
+			    }
+			    media(
+			      id: $id
+			      type: ANIME
+			      season: $season
+			      format_in: $format
+			      status: $status
+			      countryOfOrigin: $countryOfOrigin
+			      source: $source
+			      search: $search
+			      onList: $onList
+			      seasonYear: $seasonYear
+			      startDate_like: $year
+			      startDate_lesser: $yearLesser
+			      startDate_greater: $yearGreater
+			      episodes_lesser: $episodeLesser
+			      episodes_greater: $episodeGreater
+			      duration_lesser: $durationLesser
+			      duration_greater: $durationGreater
+			      chapters_lesser: $chapterLesser
+			      chapters_greater: $chapterGreater
+			      volumes_lesser: $volumeLesser
+			      volumes_greater: $volumeGreater
+			      licensedById_in: $licensedBy
+			      isLicensed: $isLicensed
+			      genre_in: $genres
+			      genre_not_in: $excludedGenres
+			      tag_in: $tags
+			      tag_not_in: $excludedTags
+			      minimumTagRank: $minimumTagRank
+			      sort: $sort
+			      isAdult: $isAdult
+			    ) {
+							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
+    }
+
+			  }
+			}
+		`,
+		Variables: Variables{
+			Page:            page,
+			PerPage:         perPage,
+			Id:              id,
+			IsAdult:         isAdult,
+			Search:          search,
+			Format:          format,
+			Status:          status,
+			CountryOfOrigin: countryOfOrigin,
+			Source:          source,
+			Season:          season,
+			SeasonYear:      seasonYear,
+			Year:            year,
+			OnList:          onList,
+			YearLesser:      yearLesser,
+			YearGreater:     yearGreater,
+			EpisodeLesser:   episodeLesser,
+			EpisodeGreater:  episodeGreater,
+			DurationLesser:  durationLesser,
+			DurationGreater: durationGreater,
+			ChapterLesser:   chapterLesser,
+			ChapterGreater:  chapterGreater,
+			VolumeLesser:    volumeLesser,
+			VolumeGreater:   volumeGreater,
+			LicensedBy:      licensedBy,
+			IsLicensed:      isLicensed,
+			Genres:          genres,
+			ExcludedGenres:  excludedGenres,
+			Tags:            tags,
+			ExcludedTags:    excludedTags,
+			MinimumTagRank:  minimumTagRank,
+			Sort:            sort,
+		},
+	}
+
+	returnedBody, status := AniListQuery(body, true)
+
+	var badPost struct {
+		Errors []struct {
+			Message   string `json:"message"`
+			Status    int    `json:"status"`
+			Locations []struct {
+				Line   int `json:"line"`
+				Column int `json:"column"`
+			} `json:"locations"`
+		} `json:"errors"`
+		Data any `json:"data"`
+	}
+	var post AniListCurrentUserWatchList
+	if status == "200 OK" {
+		err := json.Unmarshal(returnedBody, &post)
+		if err != nil {
+			log.Printf("Failed at unmarshal, %s\n", err)
+		}
+		// Getting the real total, finding the real last page and storing that in the Page info
+		statuses := post.Data.Page.MediaList[0].User.Statistics.Anime.Statuses
+		var total int
+		for _, status := range statuses {
+			if status.Status == "CURRENT" {
+				total = status.Count
+			}
+		}
+
+		lastPage := total / perPage
+
+		post.Data.Page.PageInfo.Total = total
+		post.Data.Page.PageInfo.LastPage = lastPage
+	}
+
+	if status == "403 Forbidden" {
+		err := json.Unmarshal(returnedBody, &badPost)
+		if err != nil {
+			log.Printf("Failed at unmarshal, %s\n", err)
+			return post, fmt.Errorf("API authentication error")
+		}
+		return post, fmt.Errorf("AniList API error: %s", badPost.Errors[0].Message)
+	}
+	if status != "200 OK" {
+		return post, fmt.Errorf("API request failed with status: %s", status)
+	}
+
+	return post, nil
 }
@@ -37,6 +37,20 @@ type AniListCurrentUserWatchList struct {
 	} `json:"data"`
 }

+type AniListBrowseList struct {
+	Data struct {
+		Page struct {
+			PageInfo struct {
+				Total       int  `json:"total"`
+				PerPage     int  `json:"perPage"`
+				CurrentPage int  `json:"currentPage"`
+				LastPage    int  `json:"lastPage"`
+				HasNextPage bool `json:"hasNextPage"`
+			} `json:"pageInfo"`
+			Media []Media `json:"mediaList"`
+		} `json:"Page"`
+	} `json:"data"`
+}
 type AniListGetSingleAnime struct {
 	Data struct {
 		MediaList MediaList `json:"MediaList"`
@@ -49,31 +63,42 @@ type AniListUpdateReturn struct {
 	}
 }

-type MediaList struct {
-	ID      int `json:"id"`
-	MediaID int `json:"mediaId"`
-	UserID  int `json:"userId"`
-	Media   struct {
+type Media struct {
 	ID          int        `json:"id"`
 	IDMal       int        `json:"idMal"`
-		Title struct {
-			Romaji  string `json:"romaji"`
-			English string `json:"english"`
-			Native  string `json:"native"`
-		} `json:"title"`
+	Title       MediaTitle `json:"title"`
 	Description string     `json:"description"`
 	CoverImage  struct {
+		ExtraLarge string
 		Large      string `json:"large"`
+		Medium     string
+		Color      string
 	} `json:"coverImage"`
+	BannerImage       string
+	Format            string
 	Season            string `json:"season"`
 	SeasonYear        int    `json:"seasonYear"`
 	Status            string `json:"status"`
 	Episodes          int    `json:"episodes"`
+	Duration          int
+	CountryOfOrigin   string
+	Source            string
+	Synonyms          []string
+	AverageScore      int
+	MeanScore         int
+	Popularity        int
+	Trending          int
+	Favourites        int
+	isFavourite       bool
+	Relations         MediaRelations `json:"relations"`
+	StartDate         MediaFuzzyDate `json:"startDate"`
+	EndDate           MediaFuzzyDate `json:"endDate"`
 	NextAiringEpisode struct {
 		AiringAt        int `json:"airingAt"`
 		TimeUntilAiring int `json:"timeUntilAiring"`
 		Episode         int `json:"episode"`
 	} `json:"nextAiringEpisode"`
+	AiringSchedule MediaAiringSchedule `json:"airingSchedule"`
 	Genres         []string            `json:"genres"`
 	Tags           []struct {
 		Id             int    `json:"id"`
@@ -84,8 +109,48 @@ type MediaList struct {
 		IsAdult        bool   `json:"isAdult"`
 	} `json:"tags"`
 	IsAdult bool `json:"isAdult"`
-	} `json:"media"`
+}
+
+type MediaTitle struct {
+	UserPreferred string `json:"userPreferred"`
+	Romaji        string `json:"romaji"`
+	English       string `json:"english"`
+	Native        string `json:"native"`
+}
+
+type MediaRelations struct {
+	Nodes []MediaRelation `json:"nodes"`
+}
+
+type MediaRelation struct {
+	Id    int        `json:"id"`
+	Title MediaTitle `json:"title"`
+}
+
+type MediaFuzzyDate struct {
+	Year  int `json:"year"`
+	Month int `json:"month"`
+	Day   int `json:"day"`
+}
+
+type MediaAiringSchedule struct {
+	Nodes []AiringScheduleNode `json:"nodes"`
+}
+
+type AiringScheduleNode struct {
+	Id              int `json:"id"`
+	AiringAt        int `json:"airingAt"`
+	TimeUntilAiring int `json:"timeUntilAiring"`
+	Episode         int `json:"episode"`
+	MediaId         int `json:"mediaId"`
+}
+
+type MediaList struct {
+	ID        int    `json:"id"`
+	MediaID   int    `json:"mediaId"`
+	UserID    int    `json:"userId"`
 	Status    string `json:"status"`
+	Media     Media  `json:"media"`
 	StartedAt struct {
 		Year  int `json:"year"`
 		Month int `json:"month"`
@@ -11,10 +11,34 @@ import (
 	"strings"
 )

-func MALHelper(method string, malUrl string, body url.Values) (json.RawMessage, string) {
+// Unmarshalling accidental numbers received from MAL to strings
+func (f *FlexString) UnmarshalJSON(data []byte) error {
+	var s string
+	if err := json.Unmarshal(data, &s); err == nil {
+		*f = FlexString(s)
+		return nil
+	}
+	var n json.Number
+	if err := json.Unmarshal(data, &n); err == nil {
+		*f = FlexString(string(n))
+		return nil
+	}
+	return fmt.Errorf("FlexString: invalid value")
+}
+
+func MALHelper(method string, malUrl string, body url.Values) (json.RawMessage, string, error) {
 	client := &http.Client{}

-	req, _ := http.NewRequest(method, malUrl, strings.NewReader(body.Encode()))
+	req, err := http.NewRequest(method, malUrl, strings.NewReader(body.Encode()))
+
+	if err != nil {
+		message, _ := json.Marshal(struct {
+			Message string `json:"message"`
+		}{
+			Message: "Failed to create request: " + err.Error(),
+		})
+		return message, "", fmt.Errorf("failed to create request: %w", err)
+	}

 	req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Add("Authorization", "Bearer "+myAnimeListJwt.AccessToken)
@@ -22,47 +46,57 @@ func MALHelper(method string, malUrl string, body url.Values) (json.RawMessage,
 	resp, err := client.Do(req)

 	if err != nil {
-		fmt.Println("Errored when sending request to the server")
 		message, _ := json.Marshal(struct {
-			Message string `json:"message" ts_type:"message"`
+			Message string `json:"message"`
 		}{
-			Message: "Errored when sending request to the server" + err.Error(),
+			Message: "Network error: " + err.Error(),
 		})
-
-		return message, resp.Status
+		return message, "", fmt.Errorf("network error: %w", err)
 	}

 	defer resp.Body.Close()
-	respBody, _ := io.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)
+
+	if err != nil {
+		return nil, resp.Status, fmt.Errorf("failed to read response: %w", err)
+	}

 	if resp.Status == "401 Unauthorized" {
 		refreshMyAnimeListAuthorizationToken()
-		MALHelper(method, malUrl, body)
+		return MALHelper(method, malUrl, body)
 	}

-	return respBody, resp.Status
+	if resp.Status != "200 OK" && resp.Status != "201 Created" && resp.Status != "202 Accepted" {
+		return respBody, resp.Status, fmt.Errorf("API returned status: %s", resp.Status)
+	}
+	return respBody, resp.Status, nil
 }

-func (a *App) GetMyAnimeList(count int) MALWatchlist {
+func (a *App) GetMyAnimeList(count int) (MALWatchlist, error) {
 	limit := strconv.Itoa(count)
 	user := a.GetMyAnimeListLoggedInUser()
 	malUrl := "https://api.myanimelist.net/v2/users/" + user.Name + "/animelist?fields=list_status&status=watching&limit=" + limit

 	var malList MALWatchlist

-	respBody, resStatus := MALHelper("GET", malUrl, nil)
+	respBody, resStatus, err := MALHelper("GET", malUrl, nil)
+
+	if err != nil {
+		return malList, fmt.Errorf("failed to get MAL watchlist: %w", err)
+	}

 	if resStatus == "200 OK" {
 		err := json.Unmarshal(respBody, &malList)
 		if err != nil {
 			log.Printf("Failed to unmarshal json response, %s\n", err)
+			return malList, fmt.Errorf("failed to parse response: %w", err)
 		}
 	}

-	return malList
+	return malList, nil
 }

-func (a *App) MyAnimeListUpdate(anime MALAnime, update MALUploadStatus) MalListStatus {
+func (a *App) MyAnimeListUpdate(anime MALAnime, update MALUploadStatus) (MalListStatus, error) {
 	if update.NumTimesRewatched >= 1 {
 		update.IsRewatching = true
 	} else {
@@ -78,39 +112,52 @@ func (a *App) MyAnimeListUpdate(anime MALAnime, update MALUploadStatus) MalListS

 	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(anime.Id) + "/my_list_status"
 	var status MalListStatus
-	respBody, respStatus := MALHelper("PATCH", malUrl, body)
+	respBody, respStatus, err := MALHelper("PATCH", malUrl, body)
+
+	if err != nil {
+		return status, fmt.Errorf("failed to update MAL entry: %w", err)
+	}

 	if respStatus == "200 OK" {
 		err := json.Unmarshal(respBody, &status)
 		if err != nil {
 			log.Printf("Failed to unmarshal json response, %s\n", err)
+			return status, fmt.Errorf("failed to parse response: %w", err)
 		}
 	}
+	return status, nil
+}

-	return status
-}
-
-func (a *App) GetMyAnimeListAnime(id int) MALAnime {
+func (a *App) GetMyAnimeListAnime(id int) (MALAnime, error) {
 	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(id) + "?fields=id,title,main_picture,alternative_titles,start_date,end_date,synopsis,mean,rank,popularity,num_list_users,num_scoring_users,nsfw,genres,created_at,updated_at,media_type,status,my_list_status,num_episodes,start_season,broadcast,source,average_episode_duration,rating,pictures,background,related_anime,recommendations,studios,statistics"
-	respBody, respStatus := MALHelper("GET", malUrl, nil)
 	var malAnime MALAnime
+	respBody, respStatus, err := MALHelper("GET", malUrl, nil)
+
+	if err != nil {
+		return malAnime, fmt.Errorf("failed to get MAL anime: %w", err)
+	}

 	if respStatus == "200 OK" {
 		err := json.Unmarshal(respBody, &malAnime)
 		if err != nil {
 			log.Printf("Failed to unmarshal json response, %s\n", err)
+			return malAnime, fmt.Errorf("failed to parse response: %w", err)
 		}
 	}
+	return malAnime, nil
+}

-	return malAnime
-}
-
-func (a *App) DeleteMyAnimeListEntry(id int) bool {
+func (a *App) DeleteMyAnimeListEntry(id int) (bool, error) {
 	malUrl := "https://api.myanimelist.net/v2/anime/" + strconv.Itoa(id) + "/my_list_status"
-	_, respStatus := MALHelper("DELETE", malUrl, nil)
+	_, respStatus, err := MALHelper("DELETE", malUrl, nil)
+
+	if err != nil {
+		return false, fmt.Errorf("failed to delete MAL entry: %w", err)
+	}
+
 	if respStatus == "200 OK" {
-		return true
+		return true, nil
 	} else {
-		return false
+		return false, fmt.Errorf("delete failed with status: %s", respStatus)
 	}
 }
@@ -1,6 +1,10 @@
 package main

-import "time"
+import (
+	"time"
+)
+
+type FlexString string

 type MyAnimeListJWT struct {
 	TokenType    string `json:"token_type"`
@@ -129,11 +133,11 @@ type MALAnime struct {
 	Statistics struct {
 		NumListUsers int `json:"num_list_users" ts_type:"numListUsers"`
 		Status       struct {
-			Watching    string `json:"watching" ts_type:"watching"`
-			Completed   string `json:"completed" ts_type:"completed"`
-			OnHold      string `json:"on_hold" ts_type:"onHold"`
-			Dropped     string `json:"dropped" ts_type:"dropped"`
-			PlanToWatch string `json:"plan_to_watch" ts_type:"planToWatch"`
+			Watching    FlexString `json:"watching" ts_type:"string"`
+			Completed   FlexString `json:"completed" ts_type:"string"`
+			OnHold      FlexString `json:"on_hold" ts_type:"string"`
+			Dropped     FlexString `json:"dropped" ts_type:"string"`
+			PlanToWatch FlexString `json:"plan_to_watch" ts_type:"string"`
 		}
 	}
 }
@@ -176,7 +176,7 @@ func (a *App) handleMyAnimeListCallback(wg *sync.WaitGroup, verifier *CodeVerifi
 	go func() {
 		defer wg.Done()
 		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			log.Fatalf("listen: %s\n", err)
+			log.Printf("Server error: %s\n", err)
 		}
 		fmt.Println("Shutting down...")
 	}()
@@ -235,7 +235,7 @@ func getMyAnimeListAuthorizationToken(content string, verifier *CodeVerifier) My
 	return post
 }

-func refreshMyAnimeListAuthorizationToken() {
+func refreshMyAnimeListAuthorizationToken() bool {
 	dataForURLs := struct {
 		GrantType    string `json:"grant_type"`
 		RefreshToken string `json:"refresh_token"`
@@ -260,13 +260,15 @@ func refreshMyAnimeListAuthorizationToken() {
 	response, err := http.NewRequest("POST", "https://myanimelist.net/v1/oauth2/token", strings.NewReader(data.Encode()))
 	if err != nil {
 		log.Printf("Failed at response, %s\n", err)
+		return false
 	}
 	response.Header.Add("Content-Type", "application/x-www-form-urlencoded")

 	client := &http.Client{}
 	res, resErr := client.Do(response)
 	if resErr != nil {
-		log.Printf("Failed at res, %s\n", err)
+		log.Printf("Failed at res, %s\n", resErr)
+		return false
 	}

 	defer res.Body.Close()
@@ -274,13 +276,22 @@ func refreshMyAnimeListAuthorizationToken() {
 	returnedBody, err := io.ReadAll(res.Body)
 	if err != nil {
 		log.Printf("Could not read returned body, %s\n", err)
+		return false
 	}

-	err = json.Unmarshal(returnedBody, &myAnimeListJwt)
+	var refreshed MyAnimeListJWT
+	err = json.Unmarshal(returnedBody, &refreshed)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return false
 	}

+	if refreshed.AccessToken == "" {
+		return false
+	}
+
+	myAnimeListJwt = refreshed
+
 	_ = myAnimeListRing.Set(keyring.Item{
 		Key:  "MyAnimeListTokenType",
 		Data: []byte(myAnimeListJwt.TokenType),
@@ -297,26 +308,33 @@ func refreshMyAnimeListAuthorizationToken() {
 		Key:  "MyAnimeListRefreshToken",
 		Data: []byte(myAnimeListJwt.RefreshToken),
 	})
-	_, err = runtime.MessageDialog(*wailsContext, runtime.MessageDialogOptions{
-		Title:   "MyAnimeList Authorization",
-		Message: "It is now safe to close your browser tab",
-	})
-	if err != nil {
-		fmt.Println(err)
-	}
+	return true
 }

 func (a *App) GetMyAnimeListLoggedInUser() MyAnimeListUser {
 	a.MyAnimeListLogin()
 	user := createUser()
-	if user.Name == "" {
-		refreshMyAnimeListAuthorizationToken()
+	if user.Name == "" && !a.refreshMyAnimeListAndGetUser(&user) {
+		a.LogoutMyAnimeList()
+		a.MyAnimeListLogin()
 		user = createUser()
 	}

 	return user
 }

+func (a *App) refreshMyAnimeListAndGetUser(user *MyAnimeListUser) bool {
+	if !refreshMyAnimeListAuthorizationToken() {
+		return false
+	}
+	freshUser := createUser()
+	if freshUser.Name == "" {
+		return false
+	}
+	*user = freshUser
+	return true
+}
+
 func createUser() MyAnimeListUser {
 	client := &http.Client{}

@@ -0,0 +1,12 @@
+TAGS := webkit2_41
+
+.PHONY: dev build clean
+
+dev:
+	wails dev -tags $(TAGS)
+
+build:
+	wails build -tags $(TAGS)
+
+clean:
+	rm -rf build/bin/*
@@ -14,16 +14,24 @@ import (

 var SimklWatchList SimklWatchListType

-func SimklHelper(method string, url string, body interface{}) json.RawMessage {
-	reader, _ := json.Marshal(body)
+func SimklHelper(method string, url string, body interface{}) (json.RawMessage, error) {
+	reader, err := json.Marshal(body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to marshal body: %w", err)
+	}
+
 	var req *http.Request

 	client := &http.Client{}

 	if body != nil {
-		req, _ = http.NewRequest(method, url, bytes.NewBuffer(reader))
+		req, err = http.NewRequest(method, url, bytes.NewBuffer(reader))
 	} else {
-		req, _ = http.NewRequest(method, url, nil)
+		req, err = http.NewRequest(method, url, nil)
+	}
+
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
 	}

 	req.Header.Add("Content-Type", "application/json")
@@ -32,41 +40,45 @@ func SimklHelper(method string, url string, body interface{}) json.RawMessage {

 	resp, err := client.Do(req)
 	if err != nil {
-		fmt.Println("Errored when sending request to the server")
-		message, _ := json.Marshal(struct {
-			Message string `json:"message"`
-		}{
-			Message: "Errored when sending request to the server" + err.Error(),
-		})
-
-		return message
+		return nil, fmt.Errorf("network error: %w", err)
 	}

 	defer resp.Body.Close()
-	respBody, _ := io.ReadAll(resp.Body)
+	respBody, err := io.ReadAll(resp.Body)

-	return respBody
+	if err != nil {
+		return nil, fmt.Errorf("failed to read response: %w", err)
+	}
+	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+		return respBody, fmt.Errorf("API returned status: %d", resp.StatusCode)
+	}
+	return respBody, nil
 }

-func (a *App) SimklGetUserWatchlist() SimklWatchListType {
+func (a *App) SimklGetUserWatchlist() (SimklWatchListType, error) {
 	method := "GET"
 	url := "https://api.simkl.com/sync/all-items/anime"

-	respBody := SimklHelper(method, url, nil)
+	respBody, err := SimklHelper(method, url, nil)
+
+	if err != nil {
+		return SimklWatchListType{}, fmt.Errorf("failed to get Simkl watchlist: %w", err)
+	}

 	var errCheck struct {
 		Error   string `json:"error"`
 		Message string `json:"message"`
 	}

-	err := json.Unmarshal(respBody, &errCheck)
+	err = json.Unmarshal(respBody, &errCheck)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return SimklWatchListType{}, fmt.Errorf("failed to parse error response: %w", err)
 	}

 	if errCheck.Error != "" {
 		a.LogoutSimkl()
-		return SimklWatchListType{}
+		return SimklWatchListType{}, fmt.Errorf("Simkl API error: %s", errCheck.Message)
 	}

 	var watchlist SimklWatchListType
@@ -74,14 +86,15 @@ func (a *App) SimklGetUserWatchlist() SimklWatchListType {
 	err = json.Unmarshal(respBody, &watchlist)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return SimklWatchListType{}, fmt.Errorf("failed to parse watchlist: %w", err)
 	}

 	SimklWatchList = watchlist

-	return watchlist
+	return watchlist, nil
 }

-func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) SimklAnime {
+func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) (SimklAnime, error) {
 	var episodes []Episode
 	var url string
 	var shows []SimklPostShow
@@ -112,13 +125,19 @@ func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) SimklAnime {

 	simklSync := SimklSyncHistoryType{shows}

-	respBody := SimklHelper("POST", url, simklSync)
+	respBody, err := SimklHelper("POST", url, simklSync)
+
+	if err != nil {
+		log.Printf("Failed to sync episodes: %s\n", err)
+		return anime, fmt.Errorf("failed to sync episodes: %w", err)
+	}

 	var success interface{}

-	err := json.Unmarshal(respBody, &success)
+	err = json.Unmarshal(respBody, &success)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return anime, fmt.Errorf("failed to parse response: %w", err)
 	}

 	for i, simklAnime := range SimklWatchList.Anime {
@@ -131,10 +150,10 @@ func (a *App) SimklSyncEpisodes(anime SimklAnime, progress int) SimklAnime {

 	WatchListUpdate(anime)

-	return anime
+	return anime, nil
 }

-func (a *App) SimklSyncRating(anime SimklAnime, rating int) SimklAnime {
+func (a *App) SimklSyncRating(anime SimklAnime, rating int) (SimklAnime, error) {
 	var url string
 	showWithRating := ShowWithRating{
 		Title: anime.Show.Title,
@@ -169,13 +188,17 @@ func (a *App) SimklSyncRating(anime SimklAnime, rating int) SimklAnime {
 		Shows []interface{} `json:"shows" ts_type:"shows"`
 	}{shows}

-	respBody := SimklHelper("POST", url, simklSync)
-
+	respBody, err := SimklHelper("POST", url, simklSync)
+	if err != nil {
+		log.Printf("Failed to sync rating: %s\n", err)
+		return anime, fmt.Errorf("failed to sync rating: %w", err)
+	}
 	var success interface{}

-	err := json.Unmarshal(respBody, &success)
+	err = json.Unmarshal(respBody, &success)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return anime, fmt.Errorf("failed to parse response: %w", err)
 	}

 	for i, simklAnime := range SimklWatchList.Anime {
@@ -188,10 +211,10 @@ func (a *App) SimklSyncRating(anime SimklAnime, rating int) SimklAnime {

 	WatchListUpdate(anime)

-	return anime
+	return anime, nil
 }

-func (a *App) SimklSyncStatus(anime SimklAnime, status string) SimklAnime {
+func (a *App) SimklSyncStatus(anime SimklAnime, status string) (SimklAnime, error) {
 	url := "https://api.simkl.com/sync/add-to-list"
 	show := SimklShowStatus{
 		Title: anime.Show.Title,
@@ -211,13 +234,17 @@ func (a *App) SimklSyncStatus(anime SimklAnime, status string) SimklAnime {
 		Shows []SimklShowStatus `json:"shows" ts_type:"shows"`
 	}{shows}

-	respBody := SimklHelper("POST", url, simklSync)
-
+	respBody, err := SimklHelper("POST", url, simklSync)
+	if err != nil {
+		log.Printf("Failed to sync status: %s\n", err)
+		return anime, fmt.Errorf("failed to sync status: %w", err)
+	}
 	var success interface{}

-	err := json.Unmarshal(respBody, &success)
+	err = json.Unmarshal(respBody, &success)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return anime, fmt.Errorf("failed to parse response: %w", err)
 	}

 	for i, simklAnime := range SimklWatchList.Anime {
@@ -230,15 +257,20 @@ func (a *App) SimklSyncStatus(anime SimklAnime, status string) SimklAnime {

 	WatchListUpdate(anime)

-	return anime
+	return anime, nil
 }

-func (a *App) SimklSearch(aniListAnime MediaList) SimklAnime {
+func (a *App) SimklSearch(aniListAnime MediaList) (SimklAnime, error) {
 	var result SimklAnime

 	if reflect.DeepEqual(SimklWatchList, SimklWatchListType{}) {
 		fmt.Println("Watchlist empty. Calling...")
-		SimklWatchList = a.SimklGetUserWatchlist()
+		watchlist, err := a.SimklGetUserWatchlist()
+		if err != nil {
+			log.Printf("Failed to get watchlist: %s\n", err)
+			return result, fmt.Errorf("failed to load watchlist for search: %w", err)
+		}
+		SimklWatchList = watchlist
 	}

 	for _, anime := range SimklWatchList.Anime {
@@ -255,22 +287,30 @@ func (a *App) SimklSearch(aniListAnime MediaList) SimklAnime {
 		var anime SimklSearchType
 		url := "https://api.simkl.com/search/id?anilist=" + strconv.Itoa(aniListAnime.Media.ID)

-		respBody := SimklHelper("GET", url, nil)
-
-		err := json.Unmarshal(respBody, &anime)
+		respBody, err := SimklHelper("GET", url, nil)
+		if err != nil {
+			log.Printf("Failed to search Simkl: %s\n", err)
+			return result, fmt.Errorf("failed to search Simkl by AniList ID: %w", err)
+		}
+		err = json.Unmarshal(respBody, &anime)

 		if len(anime) == 0 {
 			url = "https://api.simkl.com/search/id?mal=" + strconv.Itoa(aniListAnime.Media.IDMal)
-			respBody = SimklHelper("GET", url, nil)
+			respBody, err = SimklHelper("GET", url, nil)
+			if err != nil {
+				log.Printf("Failed to search Simkl by MAL ID: %s\n", err)
+				return result, fmt.Errorf("failed to search by MAL ID: %w", err)
+			}
 			err = json.Unmarshal(respBody, &anime)
 		}

 		if err != nil {
 			log.Printf("Failed at unmarshal, %s\n", err)
+			return result, fmt.Errorf("failed to parse search results: %w", err)
 		}

 		if len(anime) == 0 {
-			return result
+			return result, nil
 		}

 		for _, watchListAnime := range SimklWatchList.Anime {
@@ -288,10 +328,10 @@ func (a *App) SimklSearch(aniListAnime MediaList) SimklAnime {
 		}
 	}

-	return result
+	return result, nil
 }

-func (a *App) SimklSyncRemove(anime SimklAnime) bool {
+func (a *App) SimklSyncRemove(anime SimklAnime) (bool, error) {
 	url := "https://api.simkl.com/sync/history/remove"
 	var showArray []SimklShowStatus

@@ -312,25 +352,28 @@ func (a *App) SimklSyncRemove(anime SimklAnime) bool {
 		Shows: showArray,
 	}

-	respBody := SimklHelper("POST", url, show)
+	respBody, err := SimklHelper("POST", url, show)

+	if err != nil {
+		log.Printf("Failed to sync remove: %s\n", err)
+		return false, fmt.Errorf("failed to sync remove: %w", err)
+	}
 	var success SimklDeleteType
-
-	err := json.Unmarshal(respBody, &success)
+	err = json.Unmarshal(respBody, &success)
 	if err != nil {
 		log.Printf("Failed at unmarshal, %s\n", err)
+		return false, fmt.Errorf("failed to parse response: %w", err)
 	}
-
 	if success.Deleted.Shows >= 1 {
 		for i, simklAnime := range SimklWatchList.Anime {
 			if simklAnime.Show.Ids.Simkl == anime.Show.Ids.Simkl {
 				SimklWatchList.Anime = slices.Delete(SimklWatchList.Anime, i, i+1)
 			}
 		}
-		return true
-	} else {
-		return false
+		return true, nil
 	}
+
+	return false, fmt.Errorf("no shows were deleted")
 }

 func WatchListUpdate(anime SimklAnime) {
@@ -116,7 +116,7 @@ func (a *App) handleSimklCallback(wg *sync.WaitGroup) {
 	go func() {
 		defer wg.Done()
 		if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			log.Fatalf("listen: %s\n", err)
+			log.Printf("Server error: %s\n", err)
 		}
 		fmt.Println("Shutting down...")
 	}()
@@ -138,7 +138,8 @@ func getSimklAuthorizationToken(content string) SimklJWT {
 	}
 	jsonData, err := json.Marshal(data)
 	if err != nil {
-		log.Fatal(err)
+		log.Printf("Failed to marshal data: %s\n", err)
+		return SimklJWT{}
 	}

 	response, err := http.NewRequest("POST", "https://api.simkl.com/oauth/token", bytes.NewBuffer(jsonData))
@@ -16,7 +16,6 @@ headers {
 }

 body:graphql {
-  # Write your query or mutation here
  query (
    $page: Int
    $perPage: Int
@@ -41,23 +40,79 @@ body:graphql {
          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 {
@@ -18,31 +18,107 @@ headers {

 body:graphql {
  mutation (
-  			  $mediaId:Int, 
-  			  $progress:Int, 
-  			  $status:MediaListStatus,
-  			  $score:Float,
-  			  $repeat:Int,
-  			  $notes:String,
-  			  $startedAt:FuzzyDateInput,
-  			  $completedAt:FuzzyDateInput,
+    $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,
+      mediaId: $mediaId
+      progress: $progress
+      status: $status
+      score: $score
+      repeat: $repeat
+      notes: $notes
      startedAt: $startedAt
      completedAt: $completedAt
    ) {
+      id
      mediaId
-  				progress
+      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
-  				score
-  				repeat
-  				notes
      startedAt {
        year
        month
@@ -53,16 +129,38 @@ body:graphql {
        month
        day
      }
+      notes
+      progress
+      score
+      repeat
+      user {
+        id
+        name
+        avatar {
+          large
+          medium
+        }
+        statistics {
+          anime {
+            count
+            statuses {
+              status
+              count
            }
          }
        }
+      }
+    }
+  }
+  
+}

 body:graphql:vars {
  {
    "mediaId": 170998,
    "progress": 5,
    "status": "CURRENT",
-  			  "score":9.0,
+    "score": 9,
    "repeat": 0,
    "notes": ",malSync::eyJ1IjoiaHR0cHM6Ly93d3cuY3J1bmNoeXJvbGwuY29tL3Nlcmllcy9HVkRIWDg1Wk4vI3NlYXNvbj1HNjNWQzJHUUsiLCJwIjoiIn0=::",
    "startedAt": {
@@ -0,0 +1,191 @@
+meta {
+  name: SeasonBasedBrowse
+  type: graphql
+  seq: 1
+}
+
+post {
+  url: https://graphql.anilist.co
+  body: graphql
+  auth: inherit
+}
+
+body:graphql {
+  query (
+    $page: Int = 1
+    $perPage: Int = 20
+    $id: Int
+    $type: MediaType
+    $isAdult: Boolean = false
+    $search: String
+    $format: [MediaFormat]
+    $status: MediaStatus
+    $countryOfOrigin: CountryCode
+    $source: MediaSource
+    $season: MediaSeason
+    $seasonYear: Int
+    $year: String
+    $onList: Boolean
+    $yearLesser: FuzzyDateInt
+    $yearGreater: FuzzyDateInt
+    $episodeLesser: Int
+    $episodeGreater: Int
+    $durationLesser: Int
+    $durationGreater: Int
+    $chapterLesser: Int
+    $chapterGreater: Int
+    $volumeLesser: Int
+    $volumeGreater: Int
+    $licensedBy: [Int]
+    $isLicensed: Boolean
+    $genres: [String]
+    $excludedGenres: [String]
+    $tags: [String]
+    $excludedTags: [String]
+    $minimumTagRank: Int
+    $sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC]
+  ) {
+    Page(page: $page, perPage: $perPage) {
+      pageInfo {
+        total
+        perPage
+        currentPage
+        lastPage
+        hasNextPage
+      }
+      media(
+        id: $id
+        type: $type
+        season: $season
+        format_in: $format
+        status: $status
+        countryOfOrigin: $countryOfOrigin
+        source: $source
+        search: $search
+        onList: $onList
+        seasonYear: $seasonYear
+        startDate_like: $year
+        startDate_lesser: $yearLesser
+        startDate_greater: $yearGreater
+        episodes_lesser: $episodeLesser
+        episodes_greater: $episodeGreater
+        duration_lesser: $durationLesser
+        duration_greater: $durationGreater
+        chapters_lesser: $chapterLesser
+        chapters_greater: $chapterGreater
+        volumes_lesser: $volumeLesser
+        volumes_greater: $volumeGreater
+        licensedById_in: $licensedBy
+        isLicensed: $isLicensed
+        genre_in: $genres
+        genre_not_in: $excludedGenres
+        tag_in: $tags
+        tag_not_in: $excludedTags
+        minimumTagRank: $minimumTagRank
+        sort: $sort
+        isAdult: $isAdult
+      ) {
+        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
+      }
+    }
+  }
+  
+}
+
+body:graphql:vars {
+  {
+    "page": 1,
+    "perPage": 20,
+    "season": "SUMMER",
+    "seasonYear": 2026,
+    "type": "ANIME",
+    "excludedTags": [
+      "Ecchi",
+      "LGBTQ+ Themes",
+      "Yuri"
+    ],
+    "excludedGenres": [
+      "Boy's Love"
+    ]
+  }
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}
@@ -0,0 +1,8 @@
+meta {
+  name: AniListCalendar
+  seq: 4
+}
+
+auth {
+  mode: inherit
+}
@@ -1,26 +1,39 @@
 #!/bin/bash

 # copy desktop file
-if [ -e "~/.local/share/applications/AniTrack.desktop" ]; then
+if [ ! -f "$HOME/.local/share/applications/AniTrack.desktop" ]; then
  if [ -d "~/.local/share/applications/" ]; then
+    echo "Copying desktop file..."
    cp ./AniTrack.desktop ~/.local/share/applications/
  else
    mkdir -p ~/.local/share/applications/
+    echo "Copying desktop file..."
    cp ./AniTrack.desktop ~/.local/share/applications/
  fi
+else
+  echo "Desktop file already installed..."
 fi

 # copy icons to xdg folders
 for size in 32 48 64 128; do
+  if [ ! -f $HOME/.local/share/icons/hicolor/${size}x${size}/apps/AniTrack.png ]; then
+    echo "Installing ${size} icon size..."
    xdg-icon-resource install --novendor --context apps --size $size ./icon/$size/AniTrack.png AniTrack
+  else
+    echo "${size} icon size already exists..."
+  fi
 done

 # copy AniTrack Binary to $HOME/Applications/
-if ! [ -d "~/Applications" ]; then
+if ! [ -d "$HOME/Applications" ]; then
  mkdir -p ~/Applications
+  echo "Installing app to ~/Applications..."
  cp ./bin/AniTrack ~/Applications/
-elif ! [[ -e ~/Applications/AniTrack ]]; then
+elif ! [[ -e $HOME/Applications/AniTrack ]]; then
+  echo "Installing app to ~/Applications"
  cp ./bin/AniTrack ~/Applications/
+else
+  echo "AniTrack already in Applications..."
 fi

 echo "AniTrack has been successfully installed."
@@ -1,5 +0,0 @@
-{
-  "recommendations": [
-    "svelte.svelte-vscode"
-  ]
-}
@@ -3,40 +3,73 @@
    aniListLoggedIn,
    malLoggedIn,
    simklLoggedIn,
+    watchlistNeedsRefresh,
+    aniListPrimary,
+    malPrimary,
+    simklPrimary,
+    malWatchList,
+    simklWatchList,
+    serviceLoggingIn,
  } from "./helperModules/GlobalVariablesAndHelperFunctions.svelte";
  import { onMount } from "svelte";
-    import Router from "svelte-spa-router"
+  import Router from "svelte-spa-router";
  import Home from "./routes/Home.svelte";
  import { wrap } from "svelte-spa-router/wrap";
  import Spinner from "./helperComponents/Spinner.svelte";
  import Header from "./helperComponents/Header.svelte";
  import { CheckIfAniListLoggedInAndLoadWatchList } from "./helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
  import { CheckIfMALLoggedInAndSetUser } from "./helperModules/CheckIfMyAnimeListLoggedIn.svelte";
-    import {CheckIfSimklLoggedInAndSetUser} from "./helperModules/CheckIsSimklLoggedIn.svelte"
-    import {CheckIfAniListLoggedIn} from "../wailsjs/go/main/App";
+  import { CheckIfSimklLoggedInAndSetUser } from "./helperModules/CheckIsSimklLoggedIn.svelte";
+  import {
+    CheckIfAniListLoggedIn,
+    GetMyAnimeList,
+    SimklGetUserWatchlist,
+  } from "../wailsjs/go/main/App";
+  import { loc } from "svelte-spa-router";
+  import ErrorModal from "./helperComponents/ErrorModal.svelte";

  onMount(async () => {
-        let isAniListLoggedIn: boolean
-        let isMALLoggedIn: boolean
-        let isSimklLoggedIn: boolean
-        aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
-        malLoggedIn.subscribe((value) => isMALLoggedIn = value)
-        simklLoggedIn.subscribe((value) => isSimklLoggedIn = value)
+    let isAniListLoggedIn: boolean;
+    let isMALLoggedIn: boolean;
+    let isSimklLoggedIn: boolean;
+    aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+    malLoggedIn.subscribe((value) => (isMALLoggedIn = value));
+    simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));

-        console.log(isAniListLoggedIn)
-        !isAniListLoggedIn && await CheckIfAniListLoggedInAndLoadWatchList()
-        !isMALLoggedIn && await CheckIfMALLoggedInAndSetUser()
-        !isSimklLoggedIn && await CheckIfSimklLoggedInAndSetUser()
-    })
+    serviceLoggingIn.set(["anilist", "mal", "simkl"]);
+
+    !isAniListLoggedIn && (await CheckIfAniListLoggedInAndLoadWatchList());
+    !isMALLoggedIn && (await CheckIfMALLoggedInAndSetUser());
+    !isSimklLoggedIn && (await CheckIfSimklLoggedInAndSetUser());
+  });
+
+  $: if ($loc?.location === "/" && $watchlistNeedsRefresh) {
+    (async () => {
+      if ($aniListLoggedIn && $aniListPrimary) {
+        await CheckIfAniListLoggedInAndLoadWatchList();
+      }
+      if ($malLoggedIn && $malPrimary) {
+        await GetMyAnimeList(1000).then((w) => malWatchList.set(w));
+      }
+      if ($simklLoggedIn && $simklPrimary) {
+        await SimklGetUserWatchlist().then((w) => simklWatchList.set(w));
+      }
+
+      watchlistNeedsRefresh.set(false);
+    })();
+  }
 </script>

 <Header />
-<Router routes={{
-    '/': Home,
-    '/anime/:id': wrap({
-        asyncComponent: () => import('./routes/AnimeRoutePage.svelte'),
+<ErrorModal />
+<Router
+  routes={{
+    "/": Home,
+    "/anime/:id": wrap({
+      asyncComponent: () => import("./routes/AnimeRoutePage.svelte"),
      conditions: [async () => await CheckIfAniListLoggedIn()],
-        loadingComponent: Spinner
+      loadingComponent: Spinner,
    }),
    // '*': "Not Found"
-}} />
+  }}
+/>
@@ -4,8 +4,10 @@
    aniListLoggedIn,
    malAnime,
    malLoggedIn,
+    setApiError,
    simklAnime,
    simklLoggedIn,
+    watchlistNeedsRefresh,
  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
  import { push } from "svelte-spa-router";
  import WebsiteLink from "./WebsiteLink.svelte";
@@ -23,10 +25,7 @@
  } from "../mal/types/MALTypes";
  import type { SimklAnime } from "../simkl/types/simklTypes";
  import { writable } from "svelte/store";
-    import type {
-        StatusOption,
-        StatusOptions,
-    } from "../helperTypes/StatusTypes";
+  import type { StatusOption, StatusOptions } from "../helperTypes/StatusTypes";
  import type { AniListUpdateVariables } from "../anilist/types/AniListTypes";
  import { convertDateToAniList } from "../helperFunctions/convertDateToAniList";
  import {
@@ -81,8 +80,7 @@
    { id: 5, aniList: "REPEATING", mal: "rewatching", simkl: "watching" },
  ];
  let startingAnilistStatusOption: StatusOption = statusOptions.filter(
-        (option) =>
-            currentAniListAnime.data.MediaList.status === option.aniList,
+    (option) => currentAniListAnime.data.MediaList.status === option.aniList,
  )[0];
  let startedAtDate: Date | null = convertAniListDateToDate(
    currentAniListAnime.data.MediaList.startedAt,
@@ -113,15 +111,11 @@
    let startDate = "";
    let finishDate = "";
    if (currentMalAnime.my_list_status.start_date !== "") {
-            const startArray = re.exec(
-                currentMalAnime.my_list_status.start_date,
-            );
+      const startArray = re.exec(currentMalAnime.my_list_status.start_date);
      startDate = `${startArray[2]}-${startArray[3]}-${startArray[1]}`;
    }
    if (currentMalAnime.my_list_status.finish_date !== "") {
-            const finishArray = re.exec(
-                currentMalAnime.my_list_status.finish_date,
-            );
+      const finishArray = re.exec(currentMalAnime.my_list_status.finish_date);
      finishDate = `${finishArray[2]}-${finishArray[3]}-${finishArray[1]}`;
    }
    AddAnimeServiceToTable({
@@ -198,6 +192,7 @@
      submitData[key] = value;
    }

+    try {
      if (
        isAniListLoggedIn &&
        currentAniListAnime.data.MediaList.mediaId !== 0
@@ -212,10 +207,16 @@
          startedAt: convertDateToAniList(startedAtDate),
          completedAt: convertDateToAniList(completedAtDate),
        };
-            await AniListUpdateEntry(body).then(
-                (value: AniListGetSingleAnime) => {
-                    value.data.MediaList.media.tags =
-                        currentAniListAnime.data.MediaList.media.tags;
+        await AniListUpdateEntry(body).then((value: AniListGetSingleAnime) => {
+          if (!value.data?.MediaList || value.data.MediaList.mediaId === 0) {
+            setApiError(
+              "anilist",
+              "AniList update failed: no saved entry was returned",
+              undefined,
+              true,
+            );
+            return;
+          }
          aniListAnime.update((newValue) => {
            newValue = value;
            return newValue;
@@ -236,10 +237,20 @@
            repeat: currentAniListAnime.data.MediaList.repeat,
            notes: currentAniListAnime.data.MediaList.notes,
          });
-                },
+        });
+      }
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : String(error);
+      console.error("Error submitting AniList changes:", error);
+      setApiError(
+        "anilist",
+        `Failed to sync AniList: ${errorMsg}`,
+        undefined,
+        true,
      );
    }

+    try {
      if (malLoggedIn && currentMalAnime.id !== 0) {
        let body: MALUploadStatus = {
          status: submitData.status.mal,
@@ -254,8 +265,7 @@
          (malAnimeReturn: MalListStatus) => {
            malAnime.update((value) => {
              value.my_list_status.status = malAnimeReturn.status;
-                        value.my_list_status.is_rewatching =
-                            malAnimeReturn.is_rewatching;
+              value.my_list_status.is_rewatching = malAnimeReturn.is_rewatching;
              value.my_list_status.score = malAnimeReturn.score;
              value.my_list_status.num_episodes_watched =
                malAnimeReturn.num_episodes_watched;
@@ -282,28 +292,33 @@
              id: `m-${currentMalAnime.id}`,
              title: currentMalAnime.title,
              service: "MyAnimeList",
-                        progress:
-                            currentMalAnime.my_list_status.num_episodes_watched,
+              progress: currentMalAnime.my_list_status.num_episodes_watched,
              status: currentMalAnime.my_list_status.status,
              startedAt: startDate,
              completedAt: finishDate,
              score: currentMalAnime.my_list_status.score,
-                        repeat: currentMalAnime.my_list_status
-                            .num_times_rewatched,
+              repeat: currentMalAnime.my_list_status.num_times_rewatched,
              notes: currentMalAnime.my_list_status.comments,
            });
          },
        );
      }
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : String(error);
+      console.error("Error submitting MyAnimeList changes:", error);
+      setApiError(
+        "mal",
+        `Failed to sync MyAnimeList: ${errorMsg}`,
+        undefined,
+        true,
+      );
+    }

+    try {
      if (simklLoggedIn && currentSimklAnime.show.ids.simkl !== 0) {
-            if (
-                currentSimklAnime.watched_episodes_count !== submitData.episodes
-            ) {
-                await SimklSyncEpisodes(
-                    currentSimklAnime,
-                    submitData.episodes,
-                ).then((value: SimklAnime) => {
+        if (currentSimklAnime.watched_episodes_count !== submitData.episodes) {
+          await SimklSyncEpisodes(currentSimklAnime, submitData.episodes).then(
+            (value: SimklAnime) => {
              AddAnimeServiceToTable({
                id: `s-${value.show.ids.simkl}`,
                title: value.show.title,
@@ -320,14 +335,13 @@
                newValue = value;
                return newValue;
              });
-                });
+            },
+          );
        }

        if (currentSimklAnime.user_rating !== submitData.rating) {
-                await SimklSyncRating(
-                    currentSimklAnime,
-                    submitData.rating,
-                ).then((value) => {
+          await SimklSyncRating(currentSimklAnime, submitData.rating).then(
+            (value) => {
              AddAnimeServiceToTable({
                id: `s-${value.show.ids.simkl}`,
                title: value.show.title,
@@ -344,7 +358,8 @@
                newValue = value;
                return newValue;
              });
-                });
+            },
+          );
        }

        if (currentSimklAnime.status !== submitData.status.simkl) {
@@ -371,14 +386,25 @@
          });
        }
      }
-
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : String(error);
+      console.error("Error submitting Simkl changes:", error);
+      setApiError(
+        "simkl",
+        `Failed to sync Simkl: ${errorMsg}`,
+        undefined,
+        true,
+      );
+    }
    submitting.set(false);
    submitSuccess.set(true);
+    watchlistNeedsRefresh.set(true);
    setTimeout(() => submitSuccess.set(false), 2000);
  };

  const deleteEntries = async () => {
    submitting.set(true);
+    try {
      if (
        isAniListLoggedIn &&
        currentAniListAnime.data.MediaList.mediaId !== 0
@@ -397,6 +423,18 @@
          notes: "",
        });
      }
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : String(error);
+      console.error("Error deleting AniList entry:", error);
+      setApiError(
+        "anilist",
+        `Failed to delete AniList entry: ${errorMsg}`,
+        undefined,
+        true,
+      );
+    }
+
+    try {
      if (malLoggedIn && currentMalAnime.id !== 0) {
        await DeleteMyAnimeListEntry(currentMalAnime.id);
        AddAnimeServiceToTable({
@@ -412,6 +450,18 @@
          notes: "",
        });
      }
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : String(error);
+      console.error("Error deleting MyAnimeList entry:", error);
+      setApiError(
+        "mal",
+        `Failed to delete MyAnimeList entry: ${errorMsg}`,
+        undefined,
+        true,
+      );
+    }
+
+    try {
      if (simklLoggedIn && currentSimklAnime.show.ids.simkl !== 0) {
        await SimklSyncRemove(currentSimklAnime);
        AddAnimeServiceToTable({
@@ -427,8 +477,19 @@
          notes: "",
        });
      }
+    } catch (error) {
+      const errorMsg = error instanceof Error ? error.message : String(error);
+      console.error("Error deleting Simkl entry:", error);
+      setApiError(
+        "simkl",
+        `Failed to delete Simkl entry: ${errorMsg}`,
+        undefined,
+        true,
+      );
+    }
    submitting.set(false);
    submitSuccess.set(true);
+    watchlistNeedsRefresh.set(true);
    setTimeout(() => submitSuccess.set(false), 2000);
  };

@@ -442,8 +503,7 @@
    currentAniListAnime.data.MediaList.media.nextAiringEpisode.episode !== 0
  ) {
    max =
-            currentAniListAnime.data.MediaList.media.nextAiringEpisode.episode -
-            1;
+      currentAniListAnime.data.MediaList.media.nextAiringEpisode.episode - 1;
  }
 </script>

@@ -479,21 +539,18 @@
              on:click={() => {
                currentAniListAnime.data.MediaList.progress -= 1;
                if (
-                                    currentAniListAnime.data.MediaList
-                                        .progress <
-                                    currentAniListAnime.data.MediaList.media
-                                        .episodes
+                  currentAniListAnime.data.MediaList.progress <
+                  currentAniListAnime.data.MediaList.media.episodes
                ) {
-                                    startingAnilistStatusOption =
-                                        statusOptions[0];
-                                    if (
-                                        currentAniListAnime.data.MediaList
-                                            .repeat === 0
-                                    )
+                  startingAnilistStatusOption = statusOptions[0];
+                  if (currentAniListAnime.data.MediaList.repeat === 0)
                    completedAtDate = null;
                }
              }}
-                            class="bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
+              disabled={currentAniListAnime.data.MediaList.progress <= 0}
+              class={currentAniListAnime.data.MediaList.progress <= 0
+                ? "border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
+                : "bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"}
            >
              <svg
                class="w-3 h-3 text-white"
@@ -519,22 +576,18 @@
              id="episodes"
              class="border border-x-0 p-2.5 h-11 text-center text-sm block w-full placeholder-gray-400 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none
                            {currentAniListAnime.data.MediaList.progress < 0 ||
-                            (currentAniListAnime.data.MediaList.media.episodes >
-                                0 &&
+              (currentAniListAnime.data.MediaList.media.episodes > 0 &&
                currentAniListAnime.data.MediaList.progress >
-                                    currentAniListAnime.data.MediaList.media
-                                        .episodes) ||
-                            (currentAniListAnime.data.MediaList.media
-                                .nextAiringEpisode.episode > 0 &&
+                  currentAniListAnime.data.MediaList.media.episodes) ||
+              (currentAniListAnime.data.MediaList.media.nextAiringEpisode
+                .episode > 0 &&
                currentAniListAnime.data.MediaList.progress >
-                                    currentAniListAnime.data.MediaList.media
-                                        .nextAiringEpisode.episode -
+                  currentAniListAnime.data.MediaList.media.nextAiringEpisode
+                    .episode -
                    1)
                ? 'border-red-500 border-[2px] text-rose-300 focus:ring-red-500 focus:border-red-500'
                : 'bg-gray-700 hover:bg-gray-600 border-gray-600 text-white focus:ring-blue-500 focus:border-blue-500'} w-24"
-                            bind:value={
-                                currentAniListAnime.data.MediaList.progress
-                            }
+              bind:value={currentAniListAnime.data.MediaList.progress}
              required
            />
            <button
@@ -544,27 +597,38 @@
              on:click={() => {
                currentAniListAnime.data.MediaList.progress += 1;
                if (
-                                    currentAniListAnime.data.MediaList.media
-                                        .episodes ===
+                  currentAniListAnime.data.MediaList.media.episodes ===
                  currentAniListAnime.data.MediaList.progress
                ) {
-                                    startingAnilistStatusOption =
-                                        statusOptions[2];
+                  startingAnilistStatusOption = statusOptions[2];
                  completedAtDate = new Date();
                }
-                                if (
-                                    currentAniListAnime.data.MediaList
-                                        .progress -
-                                        1 ===
-                                    0
-                                ) {
-                                    startingAnilistStatusOption =
-                                        statusOptions[0];
-                                    if (startedAtDate === null)
-                                        startedAtDate = new Date();
+                if (currentAniListAnime.data.MediaList.progress - 1 === 0) {
+                  startingAnilistStatusOption = statusOptions[0];
+                  if (startedAtDate === null) startedAtDate = new Date();
                }
              }}
-                            class="bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
+              disabled={(currentAniListAnime.data.MediaList.media.episodes >
+                0 &&
+                currentAniListAnime.data.MediaList.progress >=
+                  currentAniListAnime.data.MediaList.media.episodes) ||
+                (currentAniListAnime.data.MediaList.media.nextAiringEpisode
+                  .episode > 0 &&
+                  currentAniListAnime.data.MediaList.progress >
+                    currentAniListAnime.data.MediaList.media.nextAiringEpisode
+                      .episode -
+                      2)}
+              class={(currentAniListAnime.data.MediaList.media.episodes > 0 &&
+                currentAniListAnime.data.MediaList.progress >=
+                  currentAniListAnime.data.MediaList.media.episodes) ||
+              (currentAniListAnime.data.MediaList.media.nextAiringEpisode
+                .episode > 0 &&
+                currentAniListAnime.data.MediaList.progress >
+                  currentAniListAnime.data.MediaList.media.nextAiringEpisode
+                    .episode -
+                    2)
+                ? "border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
+                : "bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"}
            >
              <svg
                class="w-3 h-3 text-white"
@@ -584,16 +648,15 @@
            </button>
          </div>
          <div>
-                        / {currentAniListAnime.data.MediaList.media
-                            .nextAiringEpisode.episode !== 0
-                            ? currentAniListAnime.data.MediaList.media
-                                  .nextAiringEpisode.episode - 1
+            / {currentAniListAnime.data.MediaList.media.nextAiringEpisode
+              .episode !== 0
+              ? currentAniListAnime.data.MediaList.media.nextAiringEpisode
+                  .episode - 1
              : currentAniListAnime.data.MediaList.media.episodes}
          </div>
          {#if currentAniListAnime.data.MediaList.media.nextAiringEpisode.episode !== 0}
            <div>
-                            of {currentAniListAnime.data.MediaList.media
-                                .episodes}
+              of {currentAniListAnime.data.MediaList.media.episodes}
            </div>
          {/if}
        </div>
@@ -665,8 +728,7 @@
            name="repeat"
            min="0"
            id="repeat"
-                        class="border {currentAniListAnime.data.MediaList
-                            .repeat < 0
+            class="border {currentAniListAnime.data.MediaList.repeat < 0
              ? 'border-red-500 border-[2px] text-rose-300 focus:ring-red-500 focus:border-red-500'
              : 'border-gray-500 text-white focus:ring-blue-500 focus:border-blue-500'} text-sm rounded-lg block w-24 p-2.5 bg-gray-600 placeholder-gray-400 text-white"
            bind:value={currentAniListAnime.data.MediaList.repeat}
@@ -730,6 +792,7 @@
        Sync Changes
      </button>
      <button
+        type="button"
        class="text-white bg-gray-800 border border-gray-600 focus:outline-none hover:bg-gray-700 focus:ring-4
                    focus:ring-gray-700 font-medium rounded-lg text-sm px-5 py-2.5 me-2 mb-2
                    hover:border-gray-600"
@@ -829,7 +892,7 @@
  <div class="flex m-5">
    <div>
      <h3 class="text-2xl">Genres</h3>
-            {#each currentAniListAnime.data.MediaList.media.genres as genre}
+      {#each currentAniListAnime.data.MediaList.media.genres || [] as genre}
        <div>
          <Badge large border color="blue" class="m-1 w-52">
            <div>
@@ -13,7 +13,8 @@
    loginToSimkl,
    logoutOfAniList,
    logoutOfMAL,
-        logoutOfSimkl
+    logoutOfSimkl,
+    serviceLoggingIn,
  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
  import * as runtime from "../../wailsjs/runtime";
  import type { MyAnimeListUser } from "../mal/types/MALTypes";
@@ -26,30 +27,35 @@
  let isAniListLoggedIn: boolean;
  let isSimklLoggedIn: boolean;
  let isMALLoggedIn: boolean;
+  let loggingIn: string[] = [];

  aniListUser.subscribe((value) => (currentAniListUser = value));
-    malUser.subscribe((value) => (currentMALUser = value))
-    simklUser.subscribe(value => currentSimklUser = value)
+  malUser.subscribe((value) => (currentMALUser = value));
+  simklUser.subscribe((value) => (currentSimklUser = value));
  aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
  simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
  malLoggedIn.subscribe((value) => (isMALLoggedIn = value));
+  serviceLoggingIn.subscribe((value) => (loggingIn = value));

  function dropdownUser(): void {
    let dropdown = document.querySelector("#userDropdown");
    dropdown.classList.toggle("hidden");

    if (!dropdown.classList.contains("hidden")) {
-            document.addEventListener("click", clickOutside)
+      document.addEventListener("click", clickOutside);
    }
  }

  function clickOutside(event: Event): void {
-        let dropdown = document.querySelector("#userDropdown")
-        let toggleBtn = document.querySelector("#userDropdownButton")
+    let dropdown = document.querySelector("#userDropdown");
+    let toggleBtn = document.querySelector("#userDropdownButton");

-        if (!dropdown.contains(event.target as Node) && !toggleBtn.contains(event.target as Node)) {
-            dropdown.classList.add("hidden")
-            document.removeEventListener("click", clickOutside)
+    if (
+      !dropdown.contains(event.target as Node) &&
+      !toggleBtn.contains(event.target as Node)
+    ) {
+      dropdown.classList.add("hidden");
+      document.removeEventListener("click", clickOutside);
    }
  }
 </script>
@@ -60,7 +66,9 @@
      <Avatar
        src={currentAniListUser.data.Viewer.avatar.medium}
        class="cursor-pointer"
-                dot={{ color: "green" }}
+        dot={isAniListLoggedIn && isMALLoggedIn && isSimklLoggedIn
+          ? { color: "green" }
+          : { color: "yellow" }}
      />
    {:else}
      <Avatar class="cursor-pointer" dot={{ color: "red" }} />
@@ -87,18 +95,30 @@
            on:click={logoutOfAniList}
            class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-green-800 hover:text-white"
          >
-                        <span class="maple-font text-lg text-green-200 mr-4">A</span>Logout {currentAniListUser.data.Viewer.name}
+            <span class="maple-font text-lg text-green-200 mr-4">A</span>Logout {currentAniListUser
+              .data.Viewer.name}
          </button>
        </li>
      {:else}
        <li>
-                    <button on:click={() => {
-                        dropdownUser()
-                        loginToAniList()
+          {#if loggingIn.includes("anilist")}
+            <span class="flex items-center px-4 py-2 w-full truncate">
+              <span
+                class="inline-block w-4 h-4 mr-4 border-2 border-gray-300 border-t-transparent rounded-full animate-spin"
+              ></span>
+              <span class="maple-font text-lg mr-4">A</span>Checking AniList
+            </span>
+          {:else}
+            <button
+              on:click={() => {
+                dropdownUser();
+                loginToAniList();
              }}
-                            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
+              class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white"
+            >
              <span class="maple-font text-lg mr-4">A</span>Login to AniList
            </button>
+          {/if}
        </li>
      {/if}
      {#if isMALLoggedIn}
@@ -112,13 +132,24 @@
        </li>
      {:else}
        <li>
-                    <button on:click={() => {
-                        dropdownUser()
-                        loginToMAL()
+          {#if loggingIn.includes("mal")}
+            <span class="flex items-center px-4 py-2 w-full truncate">
+              <span
+                class="inline-block w-4 h-4 mr-4 border-2 border-gray-300 border-t-transparent rounded-full animate-spin"
+              ></span>
+              <span class="maple-font text-lg mr-4">M</span>Checking MyAnimeList
+            </span>
+          {:else}
+            <button
+              on:click={() => {
+                dropdownUser();
+                loginToMAL();
              }}
-                            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
+              class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white"
+            >
              <span class="maple-font text-lg mr-4">M</span>Login to MyAnimeList
            </button>
+          {/if}
        </li>
      {/if}
      {#if isSimklLoggedIn}
@@ -127,26 +158,38 @@
            on:click={logoutOfSimkl}
            class="block px-4 py-2 w-full hover:bg-gray-600 truncate bg-indigo-800 hover:text-white"
          >
-                        <span class="maple-font text-lg text-indigo-200 mr-4">S</span>Logout {currentSimklUser.user.name}
+            <span class="maple-font text-lg text-indigo-200 mr-4">S</span>Logout {currentSimklUser
+              .user.name}
          </button>
        </li>
      {:else}
        <li>
-                    <button on:click={() => {
-                        dropdownUser()
-                        loginToSimkl()
+          {#if loggingIn.includes("simkl")}
+            <span class="flex items-center px-4 py-2 w-full truncate">
+              <span
+                class="inline-block w-4 h-4 mr-4 border-2 border-gray-300 border-t-transparent rounded-full animate-spin"
+              ></span>
+              <span class="maple-font text-lg mr-4">S</span>Checking Simkl
+            </span>
+          {:else}
+            <button
+              on:click={() => {
+                dropdownUser();
+                loginToSimkl();
              }}
-                            class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white">
+              class="block px-4 py-2 w-full hover:bg-gray-600 truncate hover:text-white"
+            >
              <span class="maple-font text-lg mr-4">S</span>Login to Simkl
            </button>
+          {/if}
        </li>
      {/if}
    </ul>
    <div class="py-2">
      <button
        on:click={() => {
-                        dropdownUser()
-                        ShowVersion()
+          dropdownUser();
+          ShowVersion();
        }}
        class="block px-4 py-2 w-full text-sm hover:bg-gray-600 text-gray-200 over:text-white"
      >
@@ -0,0 +1,73 @@
+<script lang="ts">
+  import {
+    apiError,
+    isApiDown,
+    clearApiError,
+    setApiError,
+  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
+  import { CheckIfAniListLoggedInAndLoadWatchList } from "../helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
+  import { CheckIfMALLoggedInAndSetUser } from "../helperModules/CheckIfMyAnimeListLoggedIn.svelte";
+  import { CheckIfSimklLoggedInAndSetUser } from "../helperModules/CheckIsSimklLoggedIn.svelte";
+  import { Modal, Button } from "flowbite-svelte";
+  let showModal = false;
+  $: if ($apiError) {
+    showModal = true;
+  }
+  async function handleRetry() {
+    const service = $apiError?.service;
+    clearApiError();
+
+    try {
+      if (service === "anilist") {
+        await CheckIfAniListLoggedInAndLoadWatchList();
+      } else if (service === "mal") {
+        await CheckIfMALLoggedInAndSetUser();
+      } else if (service === "simkl") {
+        await CheckIfSimklLoggedInAndSetUser();
+      }
+    } catch (err) {
+      const errorMsg = err instanceof Error ? err.message : String(err);
+      setApiError(
+        service || "unknown",
+        `Retry failed: ${errorMsg}`,
+        undefined,
+        true,
+      );
+    }
+  }
+  function handleDismiss() {
+    clearApiError();
+    showModal = false;
+  }
+</script>
+
+{#if showModal && $apiError}
+  <Modal
+    open={showModal}
+    title="{$apiError.service.toUpperCase()} API Error"
+    size="md"
+  >
+    <div class="space-y-4">
+      <div class="p-4 bg-red-50 border border-red-200 rounded-lg">
+        <p class="text-red-800 font-medium">{$apiError.message}</p>
+        {#if $apiError.statusCode}
+          <p class="text-red-600 text-sm mt-2">
+            Status: {$apiError.statusCode}
+          </p>
+        {/if}
+      </div>
+      <p class="text-gray-600">
+        The application will remain open. You can retry the connection or
+        dismiss this message to continue with limited functionality.
+      </p>
+    </div>
+    <div slot="footer" class="flex gap-3 justify-end">
+      {#if $apiError.canRetry}
+        <Button on:click={handleRetry} class="bg-blue-600 hover:bg-blue-700">
+          Retry Connection
+        </Button>
+      {/if}
+      <Button on:click={handleDismiss} color="alternative">Dismiss</Button>
+    </div>
+  </Modal>
+{/if}
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import Search from "./Search.svelte"
+    import Search from "./Search.svelte";
    import {
        aniListLoggedIn,
        loginToAniList,
@@ -7,64 +7,120 @@
        loginToSimkl,
        malLoggedIn,
        simklLoggedIn,
-    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte"
+        serviceLoggingIn,
+    } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
    import AvatarMenu from "./AvatarMenu.svelte";
-    import logo from "../assets/images/AniTrackLogo.svg"
+    import logo from "../assets/images/AniTrackLogo.svg";
+    import { link } from "svelte-spa-router";

-    let isAniListLoggedIn: boolean
-    let isSimklLoggedIn: boolean
-    let isMALLoggedIn: boolean
+    let isAniListLoggedIn: boolean;
+    let isSimklLoggedIn: boolean;
+    let isMALLoggedIn: boolean;
+    let loggingIn: string[] = [];

-    aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
-    simklLoggedIn.subscribe((value) => isSimklLoggedIn = value)
-    malLoggedIn.subscribe((value) => isMALLoggedIn = value)
+    aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+    simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
+    malLoggedIn.subscribe((value) => (isMALLoggedIn = value));
+    serviceLoggingIn.subscribe((value) => (loggingIn = value));
 </script>

 <nav class="border-gray-200 bg-gray-900">
-    <div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
+    <div
+        class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4"
+    >
        <div class="flex items-center space-x-3 rtl:space-x-reverse">
-                <a href="/"><img src={logo} class="h-8" alt="AniTrack Logo"/></a>
+            <a href="/" use:link
+                ><img src={logo} class="h-8" alt="AniTrack Logo" /></a
+            >
        </div>
-        <div class="flex items-center min-[950px]:order-2 space-x-3 min-[950px]:space-x-0 rtl:space-x-reverse">
+        <div
+            class="flex items-center min-[950px]:order-2 space-x-3 min-[950px]:space-x-0 rtl:space-x-reverse"
+        >
            <div class="min-[950px]:block min-[950px]:mr-4">
                <Search />
            </div>
            <AvatarMenu />
-            <button on:click={() => {
-                let menu = document.querySelector("#navbar-user")
-                menu.classList.toggle("hidden")
-            }} type="button"
+            <button
+                on:click={() => {
+                    let menu = document.querySelector("#navbar-user");
+                    menu.classList.toggle("hidden");
+                }}
+                type="button"
                class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm rounded-lg min-[950px]:hidden focus:outline-none focus:ring-2 text-gray-400 hover:bg-gray-700 focus:ring-gray-600"
-                    aria-controls="navbar-user" aria-expanded="false">
+                aria-controls="navbar-user"
+                aria-expanded="false"
+            >
                <span class="sr-only">Open main menu</span>
-                <svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none"
-                     viewBox="0 0 17 14">
-                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                          d="M1 1h15M1 7h15M1 13h15"/>
+                <svg
+                    class="w-5 h-5"
+                    aria-hidden="true"
+                    xmlns="http://www.w3.org/2000/svg"
+                    fill="none"
+                    viewBox="0 0 17 14"
+                >
+                    <path
+                        stroke="currentColor"
+                        stroke-linecap="round"
+                        stroke-linejoin="round"
+                        stroke-width="2"
+                        d="M1 1h15M1 7h15M1 13h15"
+                    />
                </svg>
            </button>
        </div>
-        <div class="hidden items-center justify-between w-full pb-4 min-[950px]:pb-0 min-[950px]:flex min-[950px]:w-auto min-[950px]:order-1 border border-gray-700 min-[950px]:border-0 bg-gray-800 min-[950px]:bg-transparent rounded-lg" id="navbar-user">
-            <ul class="flex flex-col font-medium pb-6 min-[950px]:p-0 mt-4 min-[950px]:space-x-8 rtl:space-x-reverse min-[950px]:flex-row min-[950px]:mt-0">
+        <div
+            class="hidden items-center justify-between w-full pb-4 min-[950px]:pb-0 min-[950px]:flex min-[950px]:w-auto min-[950px]:order-1 border border-gray-700 min-[950px]:border-0 bg-gray-800 min-[950px]:bg-transparent rounded-lg"
+            id="navbar-user"
+        >
+            <ul
+                class="flex flex-col font-medium pb-6 min-[950px]:p-0 mt-4 min-[950px]:space-x-8 rtl:space-x-reverse min-[950px]:flex-row min-[950px]:mt-0"
+            >
                <li>
                    {#if !isAniListLoggedIn}
-                        <button on:click={loginToAniList}>
-<!--                                class="block py-2 px-3 w-full min-[950px]:w-auto rounded text-gray-300 min-[950px]:hover:text-blue-500 hover:bg-gray-700 hover:text-white min-[950px]:hover:bg-transparent border-gray-700">-->
+                        <button
+                            disabled={loggingIn.includes("anilist")}
+                            on:click={loginToAniList}
+                        >
+                            {#if loggingIn.includes("anilist")}
+                                <span
+                                    class="inline-block w-4 h-4 mr-2 border-2 border-gray-300 border-t-transparent rounded-full animate-spin align-middle"
+                                ></span
+                                >Checking AniList
+                            {:else}
                                AniList Login
+                            {/if}
                        </button>
                    {/if}
                    {#if !isMALLoggedIn}
-                        <button on:click={loginToMAL}>
-<!--                                class="block py-2 px-3 w-full min-[950px]:w-auto rounded min-[950px]:p-0 text-gray-300 min-[950px]:hover:text-blue-500 hover:bg-gray-700 hover:text-white min-[950px]:hover:bg-transparent border-gray-700">-->
+                        <button
+                            disabled={loggingIn.includes("mal")}
+                            on:click={loginToMAL}
+                        >
+                            {#if loggingIn.includes("mal")}
+                                <span
+                                    class="inline-block w-4 h-4 mr-2 border-2 border-gray-300 border-t-transparent rounded-full animate-spin align-middle"
+                                ></span
+                                >Checking MAL
+                            {:else}
                                MyAnimeList Login
+                            {/if}
                        </button>
                    {/if}
                </li>
                <li>
                    {#if !isSimklLoggedIn}
-                        <button on:click={loginToSimkl}>
-<!--                                class="block py-2 px-3 w-full min-[950px]:w-auto rounded min-[950px]:p-0 text-gray-300 min-[950px]:hover:text-blue-500 hover:bg-gray-700 hover:text-white min-[950px]:hover:bg-transparent border-gray-700">-->
+                        <button
+                            disabled={loggingIn.includes("simkl")}
+                            on:click={loginToSimkl}
+                        >
+                            {#if loggingIn.includes("simkl")}
+                                <span
+                                    class="inline-block w-4 h-4 mr-2 border-2 border-gray-300 border-t-transparent rounded-full animate-spin align-middle"
+                                ></span
+                                >Checking Simkl
+                            {:else}
                                Simkl Login
+                            {/if}
                        </button>
                    {/if}
                </li>
@@ -1,46 +1,57 @@
 <script lang="ts">
  import {
    aniListLoggedIn,
+    aniListSort,
    aniListWatchlist,
    animePerPage,
    watchListPage,
  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";

-    import type {AniListCurrentUserWatchList} from "../anilist/types/AniListCurrentUserWatchListType"
+  import type { AniListCurrentUserWatchList } from "../anilist/types/AniListCurrentUserWatchListType";
  import { GetAniListUserWatchingList } from "../../wailsjs/go/main/App";
-    import {MediaListSort} from "../anilist/types/AniListTypes";

-    let aniListWatchListLoaded: AniListCurrentUserWatchList
-    let page: number
-    let perPage: number
+  let aniListWatchListLoaded: AniListCurrentUserWatchList;
+  let page: number;
+  let perPage: number;
+  let sort: string;

-    watchListPage.subscribe(value => page = value)
-    animePerPage.subscribe(value => perPage = value)
-    aniListWatchlist.subscribe((value) => aniListWatchListLoaded = value)
+  watchListPage.subscribe((value) => (page = value));
+  animePerPage.subscribe((value) => (perPage = value));
+  aniListWatchlist.subscribe((value) => (aniListWatchListLoaded = value));
+  aniListSort.subscribe((value) => (sort = value));

-    const perPageOptions = [10, 20, 50]
+  const perPageOptions = [10, 20, 50];

  function ChangeWatchListPage(newPage: number) {
-        GetAniListUserWatchingList(newPage, perPage, MediaListSort.UpdatedTimeDesc).then((result) => {
-            watchListPage.set(newPage)
-            aniListWatchlist.set(result)
-            aniListLoggedIn.set(true)
-        })
+    GetAniListUserWatchingList(newPage, perPage, sort).then((result) => {
+      watchListPage.set(newPage);
+      aniListWatchlist.set(result);
+      aniListLoggedIn.set(true);
+    });
  }

-    function changePage(e): void {
-        if ((e.key === "Enter" || e.key === "Tab") && Number(e.target.value) !== page) ChangeWatchListPage(Number(e.target.value))
+  function changePage(
+    e: KeyboardEvent & { currentTarget: HTMLInputElement },
+  ): void {
+    if (
+      (e.key === "Enter" || e.key === "Tab") &&
+      Number(e.currentTarget.value) !== page
+    )
+      ChangeWatchListPage(Number(e.currentTarget.value));
  }

-    function changeCountPerPage(e): void {
-        GetAniListUserWatchingList(1, Number(e.target.value), MediaListSort.UpdatedTimeDesc).then((result) => {
-            animePerPage.set(Number(e.target.value))
-            watchListPage.set(1)
-            aniListWatchlist.set(result)
-            aniListLoggedIn.set(true)
-        })
+  function changeCountPerPage(
+    e: Event & { currentTarget: HTMLSelectElement },
+  ): void {
+    GetAniListUserWatchingList(1, Number(e.currentTarget.value), sort).then(
+      (result) => {
+        animePerPage.set(Number(e.currentTarget.value));
+        watchListPage.set(1);
+        aniListWatchlist.set(result);
+        aniListLoggedIn.set(true);
+      },
+    );
  }
-
 </script>

 <div class="mb-8">
@@ -49,15 +60,19 @@
      <ul class="inline-flex -space-x-px text-base h-10">
        {#if page === 1}
          <li>
-                        <button disabled
-                                class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 cursor-default">
+            <button
+              disabled
+              class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 cursor-default"
+            >
              Previous
            </button>
          </li>
        {:else}
          <li>
-                        <button on:click={() => ChangeWatchListPage(page-1)}
-                                class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white">
+            <button
+              on:click={() => ChangeWatchListPage(page - 1)}
+              class="flex items-center justify-center px-4 h-10 ms-0 leading-tight border border-e-0 rounded-s-lg border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white"
+            >
              Previous
            </button>
          </li>
@@ -65,27 +80,37 @@
        {#each { length: aniListWatchListLoaded.data.Page.pageInfo.lastPage } as _, i}
          {#if i + 1 === page}
            <li>
-                            <button on:click={() => ChangeWatchListPage(i+1)}
-                                    class="flex items-center justify-center px-4 h-10 leading-tight border bg-gray-100 border-gray-700 bg-gray-700 text-white">{i + 1}</button>
+              <button
+                on:click={() => ChangeWatchListPage(i + 1)}
+                class="flex items-center justify-center px-4 h-10 leading-tight border hover:bg-gray-100 border-gray-700 bg-gray-700 text-white"
+                >{i + 1}</button
+              >
            </li>
          {:else}
            <li>
-                            <button on:click={() => ChangeWatchListPage(i+1)}
-                                    class="flex items-center justify-center px-4 h-10 leading-tight border dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white">{i + 1}</button>
+              <button
+                on:click={() => ChangeWatchListPage(i + 1)}
+                class="flex items-center justify-center px-4 h-10 leading-tight border dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white"
+                >{i + 1}</button
+              >
            </li>
          {/if}
        {/each}
        {#if page === aniListWatchListLoaded.data.Page.pageInfo.lastPage}
          <li>
-                        <button disabled
-                                class="flex items-center justify-center px-4 h-10 leading-tight border rounded-e-lg dark border-gray-700 text-gray-400 cursor-default">
+            <button
+              disabled
+              class="flex items-center justify-center px-4 h-10 leading-tight border rounded-e-lg dark border-gray-700 text-gray-400 cursor-default"
+            >
              Next
            </button>
          </li>
        {:else}
          <li>
-                        <button on:click={() => ChangeWatchListPage(page+1)}
-                                class="flex items-center justify-center px-4 h-10 leading-tight border rounded-e-lg dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white">
+            <button
+              on:click={() => ChangeWatchListPage(page + 1)}
+              class="flex items-center justify-center px-4 h-10 leading-tight border rounded-e-lg dark border-gray-700 text-gray-400 hover:bg-gray-700 hover:text-white"
+            >
              Next
            </button>
          </li>
@@ -93,10 +118,14 @@
      </ul>
    </nav>
  {/if}
-    <div class="flex mt-5">
+  <div class="flex">
    <div class="w-20 mx-auto">
-            <select bind:value={perPage} on:change={(e) => changeCountPerPage(e)} id="countPerPage"
-                    class="border text-sm rounded-lg block w-full p-2.5 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500">
+      <select
+        bind:value={perPage}
+        on:change={(e) => changeCountPerPage(e)}
+        id="countPerPage"
+        class="border text-sm rounded-lg block w-full p-2.5 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500"
+      >
        {#each perPageOptions as option}
          <option value={option}>
            {option}
@@ -108,35 +137,81 @@
    <div>
      <div>Total Anime: {aniListWatchListLoaded.data.Page.pageInfo.total}</div>
      {#if aniListWatchListLoaded.data.Page.pageInfo.lastPage <= 12}
-                <div class="md:hidden">Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}</div>
+        <div class="md:hidden">
+          Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}
+        </div>
      {:else}
-                <div>Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}</div>
+        <div>
+          Page: {page} of {aniListWatchListLoaded.data.Page.pageInfo.lastPage}
+        </div>
      {/if}
    </div>

    <div class="max-w-xs mx-auto">
      <div class="relative flex items-center max-w-[11rem]">
-                <button type="button" id="decrement-button" on:click={() => ChangeWatchListPage(page-1)}
-                        class="bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none">
-                    <svg class="w-3 h-3 text-white" aria-hidden="true"
-                         xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 2">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                              d="M1 1h16"/>
+        <button
+          type="button"
+          id="decrement-button"
+          on:click={() => ChangeWatchListPage(page - 1)}
+          class={page <= 1
+            ? "border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
+            : "bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-s-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"}
+          disabled={page <= 1}
+        >
+          <svg
+            class="w-3 h-3 text-white"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 18 2"
+          >
+            <path
+              stroke="currentColor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="2"
+              d="M1 1h16"
+            />
          </svg>
        </button>
-                <input type="number" min="1" max="{aniListWatchListLoaded.data.Page.pageInfo.lastPage}"
-                       on:keydown={changePage} id="page-counter"
+        <input
+          type="number"
+          min="1"
+          max={aniListWatchListLoaded.data.Page.pageInfo.lastPage}
+          on:keydown={changePage}
+          id="page-counter"
          class="[appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none border-x-0 h-11 font-medium text-center text-sm block w-full pb-6 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500"
-                       value={page} required/>
-                <div class="absolute bottom-1 start-1/2 -translate-x-1/2 rtl:translate-x-1/2 flex items-center text-xs text-gray-400 space-x-1 rtl:space-x-reverse">
+          value={page}
+          required
+        />
+        <div
+          class="absolute bottom-1 start-1/2 -translate-x-1/2 rtl:translate-x-1/2 flex items-center text-xs text-gray-400 space-x-1 rtl:space-x-reverse"
+        >
          <span>Page #</span>
        </div>
-                <button type="button" id="increment-button" on:click={() => ChangeWatchListPage(page+1)}
-                        class="hover:bg-gray-600 border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none">
-                    <svg class="w-3 h-3 text-white" aria-hidden="true"
-                         xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 18">
-                        <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                              d="M9 1v16M1 9h16"/>
+        <button
+          type="button"
+          id="increment-button"
+          on:click={() => ChangeWatchListPage(page + 1)}
+          class={page >= aniListWatchListLoaded.data.Page.pageInfo.lastPage
+            ? "border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"
+            : "bg-gray-700 hover:bg-gray-600 border-gray-600 border rounded-e-lg p-3 h-11 focus:ring-gray-700 focus:ring-2 focus:outline-none"}
+          disabled={page >= aniListWatchListLoaded.data.Page.pageInfo.lastPage}
+        >
+          <svg
+            class="w-3 h-3 text-white"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 18 18"
+          >
+            <path
+              stroke="currentColor"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+              stroke-width="2"
+              d="M9 1v16M1 9h16"
+            />
          </svg>
        </button>
      </div>
@@ -0,0 +1,18 @@
+<script lang="ts">
+  import { CheckIfAniListLoggedInAndLoadWatchList } from "../helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
+  import { loading } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
+</script>
+
+<div class="flex justify-end">
+  <button
+    type="button"
+    class="py-2 px-4 mt-4 mr-4 bg-gray-700 rounded-lg"
+    on:click={async () => {
+      loading.set(true);
+      await CheckIfAniListLoggedInAndLoadWatchList();
+      loading.set(false);
+    }}
+  >
+    Refresh WatchList
+  </button>
+</div>
@@ -0,0 +1,77 @@
+<script lang="ts">
+  import {
+    aniListSort,
+    watchListPage,
+    animePerPage,
+    aniListWatchlist,
+  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
+  import { MediaListSort } from "../anilist/types/AniListTypes";
+  import { GetAniListUserWatchingList } from "../../wailsjs/go/main/App";
+
+  const sortTypes = [
+    { value: MediaListSort.MediaId, name: "Media Id Asc" },
+    { value: MediaListSort.MediaIdDesc, name: "Media Id Desc" },
+    { value: MediaListSort.Score, name: "Score Asc" },
+    { value: MediaListSort.ScoreDesc, name: "Score Desc" },
+    { value: MediaListSort.Status, name: "Status Asc" },
+    { value: MediaListSort.StatusDesc, name: "Status Desc" },
+    { value: MediaListSort.Progress, name: "Progress Asc" },
+    { value: MediaListSort.ProgressDesc, name: "Progress Desc" },
+    { value: MediaListSort.ProgressVolumes, name: "Progress Valumes Asc" },
+    { value: MediaListSort.ProgressVolumesDesc, name: "Progress Valumes Desc" },
+    { value: MediaListSort.Repeat, name: "Repeat Asc" },
+    { value: MediaListSort.RepeatDesc, name: "Repeat Desc" },
+    { value: MediaListSort.Priority, name: "Priority Asc" },
+    { value: MediaListSort.PriorityDesc, name: "Priority Desc" },
+    { value: MediaListSort.StartedOn, name: "Started On Asc" },
+    { value: MediaListSort.StartedOnDesc, name: "Started On Desc" },
+    { value: MediaListSort.FinishedOn, name: "Finished On Asc" },
+    { value: MediaListSort.FinishedOnDesc, name: "Finished On Desc" },
+    { value: MediaListSort.AddedTime, name: "Added Time Asc" },
+    { value: MediaListSort.AddedTimeDesc, name: "Added Time Desc" },
+    { value: MediaListSort.UpdatedTime, name: "Updated Time Asc" },
+    { value: MediaListSort.UpdatedTimeDesc, name: "Updated Time Desc" },
+    { value: MediaListSort.MediaTitleRomaji, name: "Media Title Romaji Asc" },
+    {
+      value: MediaListSort.MediaTitleRomajiDesc,
+      name: "Media Title Romaji Desc",
+    },
+    { value: MediaListSort.MediaTitleEnglish, name: "Media Title English Asc" },
+    {
+      value: MediaListSort.MediaTitleEnglishDesc,
+      name: "Media Title English Desc",
+    },
+    { value: MediaListSort.MediaTitleNative, name: "Media Title Native Asc" },
+    {
+      value: MediaListSort.MediaTitleNativeDesc,
+      name: "Media Title Native Desc",
+    },
+    { value: MediaListSort.MediaPopularity, name: "Media Popularity Asc" },
+    { value: MediaListSort.MediaPopularityDesc, name: "Media Popularity Desc" },
+  ];
+
+  let sort: string;
+  aniListSort.subscribe((value) => (sort = value));
+  console.log(sort);
+
+  async function changeWatchListSort() {
+    const result = await GetAniListUserWatchingList(
+      $watchListPage,
+      $animePerPage,
+      $aniListSort,
+    );
+    aniListWatchlist.set(result);
+  }
+</script>
+
+<select
+  id="sort"
+  class="border rounded-lg block p-1.5 bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:ring-blue-500 focus:border-blue-500"
+  bind:value={$aniListSort}
+  on:change={() => changeWatchListSort()}
+>
+  <option value="" disabled>Sort WatchList</option>
+  {#each sortTypes as sort}
+    <option value={sort.value}>{sort.name}</option>
+  {/each}
+</select>
@@ -6,30 +6,41 @@
    loading,
  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
  import { push } from "svelte-spa-router";
-    import type {AniListCurrentUserWatchList} from "../anilist/types/AniListCurrentUserWatchListType"
+  import type { AniListCurrentUserWatchList } from "../anilist/types/AniListCurrentUserWatchListType";
  import { Rating } from "flowbite-svelte";
-    import loader from '../helperFunctions/loader'
+  import loader from "../helperFunctions/loader";
+  import { CheckIfAniListLoggedInAndLoadWatchList } from "../helperModules/CheckIfAniListLoggedInAndLoadWatchList.svelte";
+  import Sort from "../helperComponents/Sort.svelte";

+  let isAniListLoggedIn: boolean;
+  let aniListWatchListLoaded: AniListCurrentUserWatchList;

-    let isAniListLoggedIn: boolean
-    let aniListWatchListLoaded: AniListCurrentUserWatchList
-
-    aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
-    aniListWatchlist.subscribe((value) => aniListWatchListLoaded = value)
-
+  aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
+  aniListWatchlist.subscribe((value) => (aniListWatchListLoaded = value));
 </script>

 <div>
  {#if isAniListLoggedIn}
-        <div class="mx-auto max-w-2xl p-4 sm:p-6 lg:max-w-7xl lg:px-8 relative items-center">
-            <h1 class="text-left text-xl font-bold mb-4">Your AniList WatchList</h1>
+    <div
+      class="mx-auto max-w-2xl p-4 sm:p-6 lg:max-w-7xl lg:px-8 relative items-center"
+    >
+      <div class="flex justify-between items-center mb-4">
+        <h1 class="text-left text-xl font-bold">Your AniList WatchList</h1>
+        <Sort />
+      </div>

-            <div class="grid grid-cols-1 gap-x-6 gap-y-10 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 xl:gap-x-8">
+      <div
+        class="grid grid-cols-1 gap-x-6 gap-y-10 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 xl:gap-x-8"
+      >
        {#each aniListWatchListLoaded.data.Page.mediaList as media}
-                    <div use:loader={loading} class="aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-lg xl:aspect-h-8 xl:aspect-w-7">
+          <div
+            use:loader={loading}
+            class="aspect-h-1 aspect-w-1 w-full overflow-hidden rounded-lg xl:aspect-h-8 xl:aspect-w-7"
+          >
            <div class="flex flex-col items-center group">
-                            <button on:click={() => {
-                                push(`#/anime/${media.media.id}`)
+              <button
+                on:click={() => {
+                  push(`#/anime/${media.media.id}`);
                  // loading.set(true)
                  // GetAniListSingleItem(media.media.id, true).then(() => {
                  //     loading.set(false)
@@ -37,27 +48,38 @@
                  // })
                }}
              >
-                                <img class="rounded-lg" src={media.media.coverImage.large} alt={
-                                media.media.title.english === "" ?
-                                    media.media.title.romaji :
-                                    media.media.title.english
-                            }/>
+                <img
+                  class="rounded-lg w-[230px] h-[330px] object-cover"
+                  src={media.media.coverImage.large}
+                  alt={media.media.title.english === ""
+                    ? media.media.title.romaji
+                    : media.media.title.english}
+                />
              </button>
-                            <Rating id="anime-rating" total={5} size={35} rating={media.score/2.0}/>
-                            <button class="mt-4 text-md font-semibold text-white-700"
-                                    on:click={() => GetAnimeSingleItem(media.media.id, true)}>
-                                {
-                                    media.media.title.english === "" ?
-                                        media.media.title.romaji :
-                                        media.media.title.english
-                                }
+              <Rating
+                id="anime-rating"
+                total={5}
+                size={35}
+                rating={media.score / 2.0}
+              />
+              <button
+                class="mt-4 text-md font-semibold text-white-700"
+                on:click={() => GetAnimeSingleItem(media.media.id, true)}
+              >
+                {media.media.title.english === ""
+                  ? media.media.title.romaji
+                  : media.media.title.english}
              </button>
-                            <p class="mt-1 text-lg font-medium text-white-900">{media.progress}
-                                / {media.media.nextAiringEpisode.episode !== 0 ?
-                                    media.media.nextAiringEpisode.episode - 1 : media.media.episodes}</p>
+              <p class="mt-1 text-lg font-medium text-white-900">
+                {media.progress}
+                / {media.media.nextAiringEpisode.episode !== 0
+                  ? media.media.nextAiringEpisode.episode - 1
+                  : media.media.episodes}
+              </p>
              {#if media.media.episodes > 0}
-                                <p class="mt-1 text-lg font-medium text-white-900">Total
-                                    Episodes: {media.media.episodes}</p>
+                <p class="mt-1 text-lg font-medium text-white-900">
+                  Total Episodes: {media.media.episodes}
+                </p>
              {/if}
            </div>
          </div>
@@ -1,34 +1,85 @@
 <script lang="ts" context="module">
-    import {CheckIfAniListLoggedIn, GetAniListLoggedInUser, GetAniListUserWatchingList} from "../../wailsjs/go/main/App";
-    import {MediaListSort} from "../anilist/types/AniListTypes";
-    import { aniListUser, watchListPage, animePerPage, aniListPrimary, aniListLoggedIn, aniListWatchlist } from "./GlobalVariablesAndHelperFunctions.svelte"
+  import {
+    CheckIfAniListLoggedIn,
+    GetAniListLoggedInUser,
+    GetAniListUserWatchingList,
+  } from "../../wailsjs/go/main/App";
+  import {
+    aniListUser,
+    watchListPage,
+    animePerPage,
+    aniListPrimary,
+    aniListLoggedIn,
+    aniListWatchlist,
+    aniListSort,
+    clearApiError,
+    setApiError,
+    serviceLoggingIn,
+  } from "./GlobalVariablesAndHelperFunctions.svelte";

-    let isAniListPrimary: boolean
-    let page: number
-    let perPage: number
+  let isAniListPrimary: boolean;
+  let page: number;
+  let perPage: number;
+  let sort: string;

-    aniListPrimary.subscribe(value => isAniListPrimary = value)
-    watchListPage.subscribe(value => page = value)
-    animePerPage.subscribe(value => perPage = value)
+  aniListPrimary.subscribe((value) => (isAniListPrimary = value));
+  watchListPage.subscribe((value) => (page = value));
+  animePerPage.subscribe((value) => (perPage = value));
+  aniListSort.subscribe((value) => (sort = value));

  export const LoadAniListUser = async () => {
-        await GetAniListLoggedInUser().then(user => {
-            aniListUser.set(user)
-        })
+    try {
+      await GetAniListLoggedInUser().then((user) => {
+        aniListUser.set(user);
+      });
+    } catch (err) {
+      const errorMsg = err instanceof Error ? err.message : String(err);
+      setApiError(
+        "anilist",
+        `Failed to load user: ${errorMsg}`,
+        undefined,
+        true,
+      );
+      throw err;
    }
+  };

  export const LoadAniListWatchList = async () => {
-        await GetAniListUserWatchingList(page, perPage, MediaListSort.UpdatedTimeDesc).then((watchList) => {
-            aniListWatchlist.set(watchList)
-        })
+    try {
+      const watchList = await GetAniListUserWatchingList(page, perPage, sort);
+      aniListWatchlist.set(watchList);
+      clearApiError();
+    } catch (err) {
+      const errorMsg = err instanceof Error ? err.message : String(err);
+      setApiError(
+        "anilist",
+        `Failed to load watch list: ${errorMsg}`,
+        undefined,
+        true,
+      );
+      throw err;
    }
-
+  };
  export const CheckIfAniListLoggedInAndLoadWatchList = async () => {
-        const loggedIn = await CheckIfAniListLoggedIn()
+    serviceLoggingIn.update((s) => [...s, "anilist"]);
+    try {
+      const loggedIn = await CheckIfAniListLoggedIn();
      if (loggedIn) {
-            await LoadAniListUser()
-            if (isAniListPrimary) await LoadAniListWatchList()
+        await LoadAniListUser();
+        if (isAniListPrimary) await LoadAniListWatchList();
      }
-        aniListLoggedIn.set(loggedIn)
+      aniListLoggedIn.set(loggedIn);
+    } catch (err) {
+      const errorMsg = err instanceof Error ? err.message : String(err);
+      setApiError(
+        "anilist",
+        `Authentication failed: ${errorMsg}`,
+        undefined,
+        true,
+      );
+      aniListLoggedIn.set(false);
+    } finally {
+      serviceLoggingIn.update((s) => s.filter((item) => item !== "anilist"));
    }
+  };
 </script>
@@ -1,14 +1,21 @@
 <script lang="ts" context="module">
    import {CheckIfMyAnimeListLoggedIn, GetMyAnimeList, GetMyAnimeListLoggedInUser} from "../../wailsjs/go/main/App";
-    import {malUser, malPrimary, malWatchList, malLoggedIn} from "./GlobalVariablesAndHelperFunctions.svelte"
+    import {malUser, malPrimary, malWatchList, malLoggedIn, serviceLoggingIn} from "./GlobalVariablesAndHelperFunctions.svelte"
+    import type { MyAnimeListUser } from "../mal/types/MALTypes";

    let isMalPrimary: boolean
    malPrimary.subscribe(value => isMalPrimary = value)

    export const CheckIfMALLoggedInAndSetUser = async () => {
+        serviceLoggingIn.update((s) => [...s, "mal"])
        await CheckIfMyAnimeListLoggedIn().then(loggedIn => {
            if (loggedIn) {
                GetMyAnimeListLoggedInUser().then(user => {
+                    if (!user.name) {
+                        malUser.set({} as MyAnimeListUser)
+                        malLoggedIn.set(false)
+                        return
+                    }
                    malUser.set(user)
                    if (isMalPrimary) {
                        GetMyAnimeList(1000).then(watchList => {
@@ -20,6 +27,8 @@
                    }
                })
            }
+        }).finally(() => {
+            serviceLoggingIn.update((s) => s.filter(item => item !== "mal"))
        })
    }
 </script>
@@ -1,11 +1,12 @@
 <script lang="ts" context="module">
    import {CheckIfSimklLoggedIn, GetSimklLoggedInUser, SimklGetUserWatchlist} from "../../wailsjs/go/main/App";
-    import { simklLoggedIn, simklUser, simklPrimary, simklWatchList } from "./GlobalVariablesAndHelperFunctions.svelte";
+    import { simklLoggedIn, simklUser, simklPrimary, simklWatchList, serviceLoggingIn } from "./GlobalVariablesAndHelperFunctions.svelte";

    let isSimklPrimary: boolean
    simklPrimary.subscribe(value => isSimklPrimary = value)

    export const CheckIfSimklLoggedInAndSetUser = async () => {
+        serviceLoggingIn.update((s) => [...s, "simkl"])
        await CheckIfSimklLoggedIn().then(loggedIn => {
            if (loggedIn) {
                GetSimklLoggedInUser().then(user => {
@@ -24,6 +25,8 @@
                    }
                })
            }
+        }).finally(() => {
+            serviceLoggingIn.update((s) => s.filter(item => item !== "simkl"))
        })
    }
 </script>
@@ -10,153 +10,235 @@
    LogoutMyAnimeList,
    LogoutSimkl,
    SimklGetUserWatchlist,
-        SimklSearch
+    SimklSearch,
  } from "../../wailsjs/go/main/App";
  import type {
    AniListCurrentUserWatchList,
-        AniListGetSingleAnime
+    AniListGetSingleAnime,
  } from "../anilist/types/AniListCurrentUserWatchListType.js";
-    import {writable} from 'svelte/store'
-    import type {SimklAnime, SimklUser, SimklWatchList} from "../simkl/types/simklTypes";
-    import {type AniListUser, MediaListSort} from "../anilist/types/AniListTypes";
-    import type {MALAnime, MALWatchlist, MyAnimeListUser} from "../mal/types/MALTypes";
+  import { writable } from "svelte/store";
+  import type {
+    SimklAnime,
+    SimklUser,
+    SimklWatchList,
+  } from "../simkl/types/simklTypes";
+  import {
+    type AniListUser,
+    MediaListSort,
+  } from "../anilist/types/AniListTypes";
+  import type {
+    MALAnime,
+    MALWatchlist,
+    MyAnimeListUser,
+  } from "../mal/types/MALTypes";
  import type { TableItems } from "../helperTypes/TableTypes";
  import { AniListGetSingleAnimeDefaultData } from "../helperDefaults/AniListGetSingleAnime";

-    export let aniListAnime = writable(AniListGetSingleAnimeDefaultData)
-    export let title = writable("")
-    export let aniListLoggedIn = writable(false)
-    export let simklLoggedIn = writable(false)
-    export let malLoggedIn = writable(false)
-    export let simklWatchList = writable({} as SimklWatchList)
-    export let aniListPrimary = writable(true)
-    export let simklPrimary = writable(false)
-    export let malPrimary = writable(false)
-    export let simklUser = writable({} as SimklUser)
-    export let aniListUser = writable({} as AniListUser)
-    export let malUser = writable({} as MyAnimeListUser)
-    export let aniListWatchlist = writable({} as AniListCurrentUserWatchList)
-    export let malWatchList = writable({} as MALWatchlist)
-    export let malAnime = writable({} as MALAnime)
-    export let simklAnime = writable({} as SimklAnime)
-    export let loading = writable(false)
-    export let tableItems = writable([] as TableItems)
+  export let aniListAnime = writable(AniListGetSingleAnimeDefaultData);
+  export let title = writable("");
+  export let aniListLoggedIn = writable(false);
+  export let simklLoggedIn = writable(false);
+  export let malLoggedIn = writable(false);
+  export const serviceLoggingIn = writable([] as string[]);
+  export let simklWatchList = writable({} as SimklWatchList);
+  export let aniListPrimary = writable(true);
+  export let simklPrimary = writable(false);
+  export let malPrimary = writable(false);
+  export let simklUser = writable({} as SimklUser);
+  export let aniListUser = writable({} as AniListUser);
+  export let malUser = writable({} as MyAnimeListUser);
+  export let aniListWatchlist = writable({} as AniListCurrentUserWatchList);
+  export let malWatchList = writable({} as MALWatchlist);
+  export let malAnime = writable({} as MALAnime);
+  export let simklAnime = writable({} as SimklAnime);
+  export let loading = writable(false);
+  export let tableItems = writable([] as TableItems);
+  export let watchlistNeedsRefresh = writable(false);
+  export let aniListSort = writable(MediaListSort.UpdatedTimeDesc);

-    export let watchListPage = writable(1)
-    export let animePerPage = writable(20)
+  export let watchListPage = writable(1);
+  export let animePerPage = writable(20);

-    let isAniListPrimary: boolean
-    let page: number
-    let perPage: number
-    let aniWatchlist: AniListCurrentUserWatchList
-    let currentAniListAnime: AniListGetSingleAnime
+  let isAniListPrimary: boolean;
+  let page: number;
+  let perPage: number;
+  let sort: string;
+  let aniWatchlist: AniListCurrentUserWatchList;
+  let currentAniListAnime: AniListGetSingleAnime;

-    let isMalLoggedIn: boolean
-    let isSimklLoggedIn: boolean
+  let isMalLoggedIn: boolean;
+  let isSimklLoggedIn: boolean;

-    aniListPrimary.subscribe(value => isAniListPrimary = value)
-    watchListPage.subscribe(value => page = value)
-    animePerPage.subscribe(value => perPage = value)
-    aniListWatchlist.subscribe(value => aniWatchlist = value)
-    malLoggedIn.subscribe(value => isMalLoggedIn = value)
-    simklLoggedIn.subscribe(value => isSimklLoggedIn = value)
-    aniListAnime.subscribe(value => currentAniListAnime = value)
+  aniListPrimary.subscribe((value) => (isAniListPrimary = value));
+  watchListPage.subscribe((value) => (page = value));
+  animePerPage.subscribe((value) => (perPage = value));
+  aniListWatchlist.subscribe((value) => (aniWatchlist = value));
+  malLoggedIn.subscribe((value) => (isMalLoggedIn = value));
+  simklLoggedIn.subscribe((value) => (isSimklLoggedIn = value));
+  aniListAnime.subscribe((value) => (currentAniListAnime = value));
+  aniListSort.subscribe((value) => (sort = value));

-
-    export async function GetAnimeSingleItem(aniId: number, login: boolean): Promise<""> {
-        await GetAniListItem(aniId, login).then(aniListResult => {
-            let finalResult: AniListGetSingleAnime
-            finalResult = aniListResult
-            if (login === false) {
-                finalResult.data.MediaList.status = ""
-                finalResult.data.MediaList.score = 0
-                finalResult.data.MediaList.progress = 0
-                finalResult.data.MediaList.notes = ""
-                finalResult.data.MediaList.repeat = 0
-                finalResult.data.MediaList.startedAt.day = 0
-                finalResult.data.MediaList.startedAt.month = 0
-                finalResult.data.MediaList.startedAt.year = 0
-                finalResult.data.MediaList.completedAt.day = 0
-                finalResult.data.MediaList.completedAt.month = 0
-                finalResult.data.MediaList.completedAt.year = 0
+  export interface ApiError {
+    service: string;
+    message: string;
+    statusCode?: string;
+    canRetry: boolean;
  }
-            aniListAnime.set(finalResult)
-            title.set(currentAniListAnime.data.MediaList.media.title.english === "" ?
-                currentAniListAnime.data.MediaList.media.title.romaji :
-                currentAniListAnime.data.MediaList.media.title.english)
-        })
+  export const apiError = writable<ApiError | null>(null);
+  export const isApiDown = writable(false);
+  export function setApiError(
+    service: string,
+    message: string,
+    statusCode?: string,
+    canRetry: boolean = true,
+  ) {
+    apiError.set({
+      service,
+      message,
+      statusCode,
+      canRetry,
+    });
+    isApiDown.set(true);
+  }
+  export function clearApiError() {
+    apiError.set(null);
+    isApiDown.set(false);
+  }
+
+  export async function GetAnimeSingleItem(
+    aniId: number,
+    login: boolean,
+  ): Promise<""> {
+    await GetAniListItem(aniId, login).then((aniListResult) => {
+      let finalResult: AniListGetSingleAnime;
+      finalResult = aniListResult;
+      if (login === false) {
+        finalResult.data.MediaList.status = "";
+        finalResult.data.MediaList.score = 0;
+        finalResult.data.MediaList.progress = 0;
+        finalResult.data.MediaList.notes = "";
+        finalResult.data.MediaList.repeat = 0;
+        finalResult.data.MediaList.startedAt.day = 0;
+        finalResult.data.MediaList.startedAt.month = 0;
+        finalResult.data.MediaList.startedAt.year = 0;
+        finalResult.data.MediaList.completedAt.day = 0;
+        finalResult.data.MediaList.completedAt.month = 0;
+        finalResult.data.MediaList.completedAt.year = 0;
+      }
+      aniListAnime.set(finalResult);
+      title.set(
+        currentAniListAnime.data.MediaList.media.title.english === ""
+          ? currentAniListAnime.data.MediaList.media.title.romaji
+          : currentAniListAnime.data.MediaList.media.title.english,
+      );
+    });
    if (isMalLoggedIn) {
-            await GetMyAnimeListAnime(currentAniListAnime.data.MediaList.media.idMal).then(malResult => {
-                malAnime.set(malResult)
-            })
+      await GetMyAnimeListAnime(
+        currentAniListAnime.data.MediaList.media.idMal,
+      ).then((malResult) => {
+        malAnime.set(malResult);
+      });
    }
    if (isSimklLoggedIn) {
-            await SimklSearch(currentAniListAnime.data.MediaList).then((value: SimklAnime) => {
-                simklAnime.set(value)
-            })
+      await SimklSearch(currentAniListAnime.data.MediaList).then(
+        (value: SimklAnime) => {
+          simklAnime.set(value);
+        },
+      );
    }
-        return ""
+    return "";
+  }
+
+  export function setServiceLoggingIn(service: string, isLoggingIn: boolean): void {
+    serviceLoggingIn.update((services) => {
+      if (isLoggingIn) {
+        return services.includes(service) ? services : [...services, service];
+      }
+      return services.filter((s) => s !== service);
+    });
+  }
+
+  export function isServiceLoggingIn(service: string): boolean {
+    let loggingIn = false;
+    serviceLoggingIn.subscribe((services) => {
+      loggingIn = services.includes(service);
+    })();
+    return loggingIn;
  }

  export function loginToSimkl(): void {
-        GetSimklLoggedInUser().then(user => {
+    setServiceLoggingIn("simkl", true);
+    GetSimklLoggedInUser()
+      .then((user) => {
        if (Object.keys(user).length === 0) {
-                simklLoggedIn.set(false)
+          simklLoggedIn.set(false);
        } else {
-                simklUser.set(user)
-                SimklGetUserWatchlist().then(result => {
-                    simklWatchList.set(result)
-                    simklLoggedIn.set(true)
-                })
+          simklUser.set(user);
+          SimklGetUserWatchlist().then((result) => {
+            simklWatchList.set(result);
+            simklLoggedIn.set(true);
+          });
        }
      })
+      .finally(() => setServiceLoggingIn("simkl", false));
  }

  export function loginToAniList(): void {
-        GetAniListLoggedInUser().then(result => {
-            aniListUser.set(result)
+    setServiceLoggingIn("anilist", true);
+    GetAniListLoggedInUser()
+      .then((result) => {
+        aniListUser.set(result);
        if (isAniListPrimary) {
-                GetAniListUserWatchingList(page, perPage, MediaListSort.UpdatedTimeDesc).then((result) => {
-                    aniListWatchlist.set(result)
-                    aniListLoggedIn.set(true)
-                })
+          GetAniListUserWatchingList(page, perPage, sort).then((result) => {
+            aniListWatchlist.set(result);
+            aniListLoggedIn.set(true);
+          });
        } else {
-                aniListLoggedIn.set(true)
+          aniListLoggedIn.set(true);
        }
      })
+      .finally(() => setServiceLoggingIn("anilist", false));
  }

  export function loginToMAL(): void {
-        GetMyAnimeListLoggedInUser().then(result => {
-            malUser.set(result)
-            malLoggedIn.set(true)
+    setServiceLoggingIn("mal", true);
+    GetMyAnimeListLoggedInUser()
+      .then((result) => {
+        if (!result.name) {
+          malUser.set({} as MyAnimeListUser);
+          malLoggedIn.set(false);
+          return;
+        }
+        malUser.set(result);
+        malLoggedIn.set(true);
      })
+      .finally(() => setServiceLoggingIn("mal", false));
  }

  export function logoutOfAniList(): void {
-        LogoutAniList().then(result => {
-            console.log(result)
+    LogoutAniList().then((result) => {
+      console.log(result);
      if (Object.keys(aniWatchlist).length !== 0) {
-                aniListWatchlist.set({} as AniListCurrentUserWatchList)
+        aniListWatchlist.set({} as AniListCurrentUserWatchList);
      }
-            aniListUser.set({} as AniListUser)
-            aniListLoggedIn.set(false)
-        })
+      aniListUser.set({} as AniListUser);
+      aniListLoggedIn.set(false);
+    });
  }

  export function logoutOfMAL(): void {
-        LogoutMyAnimeList().then(result => {
-            console.log(result)
-            malUser.set({} as MyAnimeListUser)
-            malLoggedIn.set(false)
-        })
+    LogoutMyAnimeList().then((result) => {
+      console.log(result);
+      malUser.set({} as MyAnimeListUser);
+      malLoggedIn.set(false);
+    });
  }

  export function logoutOfSimkl(): void {
-        LogoutSimkl().then(result => {
-            console.log(result)
-            simklUser.set({} as SimklUser)
-            simklLoggedIn.set(false)
-        })
+    LogoutSimkl().then((result) => {
+      console.log(result);
+      simklUser.set({} as SimklUser);
+      simklLoggedIn.set(false);
+    });
  }
 </script>
@@ -1,20 +1,52 @@
 <script lang="ts">
  import Pagination from "../helperComponents/Pagination.svelte";
  import WatchList from "../helperComponents/WatchList.svelte";
+  import RefreshWatchListButton from "../helperComponents/RefreshWatchListButton.svelte";
  import {
    aniListLoggedIn,
    aniListPrimary,
    loading,
+    isApiDown,
+    apiError,
  } from "../helperModules/GlobalVariablesAndHelperFunctions.svelte";
-import loader from '../helperFunctions/loader'
+  import loader from "../helperFunctions/loader";

-let isAniListPrimary: boolean
-let isAniListLoggedIn: boolean
+  let isAniListPrimary: boolean;
+  let isAniListLoggedIn: boolean;

-aniListPrimary.subscribe((value) => isAniListPrimary = value)
-aniListLoggedIn.subscribe((value) => isAniListLoggedIn = value)
+  aniListPrimary.subscribe((value) => (isAniListPrimary = value));
+  aniListLoggedIn.subscribe((value) => (isAniListLoggedIn = value));
 </script>
-{#if isAniListLoggedIn && isAniListPrimary}
+
+{#if $isApiDown}
+  <div class="container py-10">
+    <div
+      class="bg-yellow-50 border border-yellow-200 rounded-lg p-6 text-center"
+    >
+      <svg
+        class="mx-auto h-12 w-12 text-yellow-600 mb-4"
+        fill="none"
+        viewBox="0 0 24 24"
+        stroke="currentColor"
+      >
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
+        />
+      </svg>
+      <h2 class="text-xl font-semibold text-yellow-900 mb-2">
+        API Unavailable
+      </h2>
+      <p class="text-yellow-700 mb-4">
+        The {$apiError?.service || "service"} is currently unavailable. The app will
+        remain open, and you can retry when the service is back online.
+      </p>
+    </div>
+  </div>
+{:else if isAniListLoggedIn && isAniListPrimary}
+  <RefreshWatchListButton />
  <div class="container py-10">
    <Pagination />
    <WatchList />
@@ -1,10 +0,0 @@
-// vite.config.ts
-import { defineConfig } from "file:///home/nymusicman/Code/AniTrack/frontend/node_modules/vite/dist/node/index.js";
-import { svelte } from "file:///home/nymusicman/Code/AniTrack/frontend/node_modules/@sveltejs/vite-plugin-svelte/src/index.js";
-var vite_config_default = defineConfig({
-  plugins: [svelte()]
-});
-export {
-  vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCIvaG9tZS9ueW11c2ljbWFuL0NvZGUvQW5pVHJhY2svZnJvbnRlbmRcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIi9ob21lL255bXVzaWNtYW4vQ29kZS9BbmlUcmFjay9mcm9udGVuZC92aXRlLmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vaG9tZS9ueW11c2ljbWFuL0NvZGUvQW5pVHJhY2svZnJvbnRlbmQvdml0ZS5jb25maWcudHNcIjtpbXBvcnQge2RlZmluZUNvbmZpZ30gZnJvbSAndml0ZSdcbmltcG9ydCB7c3ZlbHRlfSBmcm9tICdAc3ZlbHRlanMvdml0ZS1wbHVnaW4tc3ZlbHRlJ1xuXG4vLyBodHRwczovL3ZpdGVqcy5kZXYvY29uZmlnL1xuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKHtcbiAgcGx1Z2luczogW3N2ZWx0ZSgpXVxufSlcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBdVMsU0FBUSxvQkFBbUI7QUFDbFUsU0FBUSxjQUFhO0FBR3JCLElBQU8sc0JBQVEsYUFBYTtBQUFBLEVBQzFCLFNBQVMsQ0FBQyxPQUFPLENBQUM7QUFDcEIsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K
@@ -2,6 +2,8 @@
 // This file is automatically generated. DO NOT EDIT
 import {main} from '../models';

+export function AniListBrowse(arg1:number,arg2:number,arg3:number,arg4:boolean,arg5:string,arg6:Array<string>,arg7:string,arg8:string,arg9:string,arg10:string,arg11:number,arg12:string,arg13:boolean,arg14:number,arg15:number,arg16:number,arg17:number,arg18:number,arg19:number,arg20:number,arg21:number,arg22:number,arg23:number,arg24:Array<number>,arg25:boolean,arg26:Array<string>,arg27:Array<string>,arg28:Array<string>,arg29:Array<string>,arg30:number,arg31:Array<string>):Promise<main.AniListCurrentUserWatchList>;
+
 export function AniListDeleteEntry(arg1:number):Promise<main.DeleteAniListReturn>;

 export function AniListLogin():Promise<void>;
@@ -2,6 +2,10 @@
 // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL
 // This file is automatically generated. DO NOT EDIT

+export function AniListBrowse(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20, arg21, arg22, arg23, arg24, arg25, arg26, arg27, arg28, arg29, arg30, arg31) {
+  return window['go']['main']['App']['AniListBrowse'](arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20, arg21, arg22, arg23, arg24, arg25, arg26, arg27, arg28, arg29, arg30, arg31);
+}
+
 export function AniListDeleteEntry(arg1) {
  return window['go']['main']['App']['AniListDeleteEntry'](arg1);
 }
@@ -1,5 +1,25 @@
 export namespace main {
 	
+	export class AiringScheduleNode {
+	    id: number;
+	    airingAt: number;
+	    timeUntilAiring: number;
+	    episode: number;
+	    mediaId: number;
+	
+	    static createFrom(source: any = {}) {
+	        return new AiringScheduleNode(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.id = source["id"];
+	        this.airingAt = source["airingAt"];
+	        this.timeUntilAiring = source["timeUntilAiring"];
+	        this.episode = source["episode"];
+	        this.mediaId = source["mediaId"];
+	    }
+	}
 	export class AniListCurrentUserWatchList {
 	    data: struct { Page struct { PageInfo struct { Total int "json:\"total\""; PerPage int "json:\"perPage\""; CurrentPage int "json:\"currentPage\""; LastPage int "json:\"lastPage\""; HasNextPage bool "json:\"hasNextPage\"" } "json:\"pageInfo\""; MediaList []main.;
 	
@@ -230,8 +250,7 @@ export namespace main {
 	    background: background;
 	    related_anime: relatedAnime;
 	    recommendations: recommendations;
-	    // Go type: struct { NumListUsers int "json:\"num_list_users\" ts_type:\"numListUsers\""; Status struct { Watching string "json:\"watching\" ts_type:\"watching\""; Completed string "json:\"completed\" ts_type:\"completed\""; OnHold string "json:\"on_hold\" ts_type:\"onHold\""; Dropped string "json:\"dropped\" ts_type:\"dropped\""; PlanToWatch string "json:\"plan_to_watch\" ts_type:\"planToWatch\"" } }
-	    Statistics: any;
+	    Statistics: struct { NumListUsers int "json:\"num_list_users\" ts_type:\"numListUsers\""; Status struct { Watching main.;
 	
 	    static createFrom(source: any = {}) {
 	        return new MALAnime(source);
@@ -360,13 +379,248 @@ export namespace main {
 	        this.updated_at = source["updated_at"];
 	    }
 	}
+	export class  {
+	    id: number;
+	    name: string;
+	    description: string;
+	    rank: number;
+	    isMediaSpoiler: boolean;
+	    isAdult: boolean;
+	
+	    static createFrom(source: any = {}) {
+	        return new (source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.id = source["id"];
+	        this.name = source["name"];
+	        this.description = source["description"];
+	        this.rank = source["rank"];
+	        this.isMediaSpoiler = source["isMediaSpoiler"];
+	        this.isAdult = source["isAdult"];
+	    }
+	}
+	export class MediaAiringSchedule {
+	    nodes: AiringScheduleNode[];
+	
+	    static createFrom(source: any = {}) {
+	        return new MediaAiringSchedule(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.nodes = this.convertValues(source["nodes"], AiringScheduleNode);
+	    }
+	
+		convertValues(a: any, classs: any, asMap: boolean = false): any {
+		    if (!a) {
+		        return a;
+		    }
+		    if (a.slice && a.map) {
+		        return (a as any[]).map(elem => this.convertValues(elem, classs));
+		    } else if ("object" === typeof a) {
+		        if (asMap) {
+		            for (const key of Object.keys(a)) {
+		                a[key] = new classs(a[key]);
+		            }
+		            return a;
+		        }
+		        return new classs(a);
+		    }
+		    return a;
+		}
+	}
+	export class MediaFuzzyDate {
+	    year: number;
+	    month: number;
+	    day: number;
+	
+	    static createFrom(source: any = {}) {
+	        return new MediaFuzzyDate(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.year = source["year"];
+	        this.month = source["month"];
+	        this.day = source["day"];
+	    }
+	}
+	export class MediaRelation {
+	    id: number;
+	    title: MediaTitle;
+	
+	    static createFrom(source: any = {}) {
+	        return new MediaRelation(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.id = source["id"];
+	        this.title = this.convertValues(source["title"], MediaTitle);
+	    }
+	
+		convertValues(a: any, classs: any, asMap: boolean = false): any {
+		    if (!a) {
+		        return a;
+		    }
+		    if (a.slice && a.map) {
+		        return (a as any[]).map(elem => this.convertValues(elem, classs));
+		    } else if ("object" === typeof a) {
+		        if (asMap) {
+		            for (const key of Object.keys(a)) {
+		                a[key] = new classs(a[key]);
+		            }
+		            return a;
+		        }
+		        return new classs(a);
+		    }
+		    return a;
+		}
+	}
+	export class MediaRelations {
+	    nodes: MediaRelation[];
+	
+	    static createFrom(source: any = {}) {
+	        return new MediaRelations(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.nodes = this.convertValues(source["nodes"], MediaRelation);
+	    }
+	
+		convertValues(a: any, classs: any, asMap: boolean = false): any {
+		    if (!a) {
+		        return a;
+		    }
+		    if (a.slice && a.map) {
+		        return (a as any[]).map(elem => this.convertValues(elem, classs));
+		    } else if ("object" === typeof a) {
+		        if (asMap) {
+		            for (const key of Object.keys(a)) {
+		                a[key] = new classs(a[key]);
+		            }
+		            return a;
+		        }
+		        return new classs(a);
+		    }
+		    return a;
+		}
+	}
+	export class MediaTitle {
+	    userPreferred: string;
+	    romaji: string;
+	    english: string;
+	    native: string;
+	
+	    static createFrom(source: any = {}) {
+	        return new MediaTitle(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.userPreferred = source["userPreferred"];
+	        this.romaji = source["romaji"];
+	        this.english = source["english"];
+	        this.native = source["native"];
+	    }
+	}
+	export class Media {
+	    id: number;
+	    idMal: number;
+	    title: MediaTitle;
+	    description: string;
+	    // Go type: struct { ExtraLarge string; Large string "json:\"large\""; Medium string; Color string }
+	    coverImage: any;
+	    BannerImage: string;
+	    Format: string;
+	    season: string;
+	    seasonYear: number;
+	    status: string;
+	    episodes: number;
+	    Duration: number;
+	    CountryOfOrigin: string;
+	    Source: string;
+	    Synonyms: string[];
+	    AverageScore: number;
+	    MeanScore: number;
+	    Popularity: number;
+	    Trending: number;
+	    Favourites: number;
+	    relations: MediaRelations;
+	    startDate: MediaFuzzyDate;
+	    endDate: MediaFuzzyDate;
+	    // Go type: struct { AiringAt int "json:\"airingAt\""; TimeUntilAiring int "json:\"timeUntilAiring\""; Episode int "json:\"episode\"" }
+	    nextAiringEpisode: any;
+	    airingSchedule: MediaAiringSchedule;
+	    genres: string[];
+	    tags: [];
+	    isAdult: boolean;
+	
+	    static createFrom(source: any = {}) {
+	        return new Media(source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.id = source["id"];
+	        this.idMal = source["idMal"];
+	        this.title = this.convertValues(source["title"], MediaTitle);
+	        this.description = source["description"];
+	        this.coverImage = this.convertValues(source["coverImage"], Object);
+	        this.BannerImage = source["BannerImage"];
+	        this.Format = source["Format"];
+	        this.season = source["season"];
+	        this.seasonYear = source["seasonYear"];
+	        this.status = source["status"];
+	        this.episodes = source["episodes"];
+	        this.Duration = source["Duration"];
+	        this.CountryOfOrigin = source["CountryOfOrigin"];
+	        this.Source = source["Source"];
+	        this.Synonyms = source["Synonyms"];
+	        this.AverageScore = source["AverageScore"];
+	        this.MeanScore = source["MeanScore"];
+	        this.Popularity = source["Popularity"];
+	        this.Trending = source["Trending"];
+	        this.Favourites = source["Favourites"];
+	        this.relations = this.convertValues(source["relations"], MediaRelations);
+	        this.startDate = this.convertValues(source["startDate"], MediaFuzzyDate);
+	        this.endDate = this.convertValues(source["endDate"], MediaFuzzyDate);
+	        this.nextAiringEpisode = this.convertValues(source["nextAiringEpisode"], Object);
+	        this.airingSchedule = this.convertValues(source["airingSchedule"], MediaAiringSchedule);
+	        this.genres = source["genres"];
+	        this.tags = this.convertValues(source["tags"], );
+	        this.isAdult = source["isAdult"];
+	    }
+	
+		convertValues(a: any, classs: any, asMap: boolean = false): any {
+		    if (!a) {
+		        return a;
+		    }
+		    if (a.slice && a.map) {
+		        return (a as any[]).map(elem => this.convertValues(elem, classs));
+		    } else if ("object" === typeof a) {
+		        if (asMap) {
+		            for (const key of Object.keys(a)) {
+		                a[key] = new classs(a[key]);
+		            }
+		            return a;
+		        }
+		        return new classs(a);
+		    }
+		    return a;
+		}
+	}
+	
+	
 	export class MediaList {
 	    id: number;
 	    mediaId: number;
 	    userId: number;
-	    // Go type: struct { ID int "json:\"id\""; IDMal int "json:\"idMal\""; Title struct { Romaji string "json:\"romaji\""; English string "json:\"english\""; Native string "json:\"native\"" } "json:\"title\""; Description string "json:\"description\""; CoverImage struct { Large string "json:\"large\"" } "json:\"coverImage\""; Season string "json:\"season\""; SeasonYear int "json:\"seasonYear\""; Status string "json:\"status\""; Episodes int "json:\"episodes\""; NextAiringEpisode struct { AiringAt int "json:\"airingAt\""; TimeUntilAiring int "json:\"timeUntilAiring\""; Episode int "json:\"episode\"" } "json:\"nextAiringEpisode\""; Genres []string "json:\"genres\""; Tags []struct { Id int "json:\"id\""; Name string "json:\"name\""; Description string "json:\"description\""; Rank int "json:\"rank\""; IsMediaSpoiler bool "json:\"isMediaSpoiler\""; IsAdult bool "json:\"isAdult\"" } "json:\"tags\""; IsAdult bool "json:\"isAdult\"" }
-	    media: any;
 	    status: string;
+	    media: Media;
 	    // Go type: struct { Year int "json:\"year\""; Month int "json:\"month\""; Day int "json:\"day\"" }
 	    startedAt: any;
 	    // Go type: struct { Year int "json:\"year\""; Month int "json:\"month\""; Day int "json:\"day\"" }
@@ -387,8 +641,8 @@ export namespace main {
 	        this.id = source["id"];
 	        this.mediaId = source["mediaId"];
 	        this.userId = source["userId"];
-	        this.media = this.convertValues(source["media"], Object);
 	        this.status = source["status"];
+	        this.media = this.convertValues(source["media"], Media);
 	        this.startedAt = this.convertValues(source["startedAt"], Object);
 	        this.completedAt = this.convertValues(source["completedAt"], Object);
 	        this.notes = source["notes"];
@@ -416,6 +670,9 @@ export namespace main {
 		    return a;
 		}
 	}
+	
+	
+	
 	export class MyAnimeListUser {
 	    id: id;
 	    name: name;
@@ -624,6 +881,43 @@ export namespace struct { Node struct { Id int "json:\"id\" ts_type:\"id\""; Tit

 }

+export namespace struct { NumListUsers int "json:\"num_list_users\" ts_type:\"numListUsers\""; Status struct { Watching main {
+	
+	export class  {
+	    num_list_users: numListUsers;
+	    Status: struct { Watching main.;
+	
+	    static createFrom(source: any = {}) {
+	        return new (source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.num_list_users = source["num_list_users"];
+	        this.Status = this.convertValues(source["Status"], Object);
+	    }
+	
+		convertValues(a: any, classs: any, asMap: boolean = false): any {
+		    if (!a) {
+		        return a;
+		    }
+		    if (a.slice && a.map) {
+		        return (a as any[]).map(elem => this.convertValues(elem, classs));
+		    } else if ("object" === typeof a) {
+		        if (asMap) {
+		            for (const key of Object.keys(a)) {
+		                a[key] = new classs(a[key]);
+		            }
+		            return a;
+		        }
+		        return new classs(a);
+		    }
+		    return a;
+		}
+	}
+
+}
+
 export namespace struct { Status string "json:\"status\" ts_type:\"status\""; Score int "json:\"score\" ts_type:\"score\""; NumEpisodesWatched int "json:\"num_episodes_watched\" ts_type:\"numEpisodesWatched\""; IsRewatching bool "json:\"is_rewatching\" ts_type:\"isRewatching\""; UpdatedAt time {
 	
 	export class  {
@@ -653,3 +947,28 @@ export namespace struct { Status string "json:\"status\" ts_type:\"status\""; Sc

 }

+export namespace struct { Watching main {
+	
+	export class  {
+	    watching: string;
+	    completed: string;
+	    on_hold: string;
+	    dropped: string;
+	    plan_to_watch: string;
+	
+	    static createFrom(source: any = {}) {
+	        return new (source);
+	    }
+	
+	    constructor(source: any = {}) {
+	        if ('string' === typeof source) source = JSON.parse(source);
+	        this.watching = source["watching"];
+	        this.completed = source["completed"];
+	        this.on_hold = source["on_hold"];
+	        this.dropped = source["dropped"];
+	        this.plan_to_watch = source["plan_to_watch"];
+	    }
+	}
+
+}
+
@@ -247,3 +247,84 @@ export function CanResolveFilePaths(): boolean;

 // Resolves file paths for an array of files
 export function ResolveFilePaths(files: File[]): void
+
+// Notification types
+export interface NotificationOptions {
+    id: string;
+    title: string;
+    subtitle?: string; // macOS and Linux only
+    body?: string;
+    categoryId?: string;
+    data?: { [key: string]: any };
+}
+
+export interface NotificationAction {
+    id?: string;
+    title?: string;
+    destructive?: boolean; // macOS-specific
+}
+
+export interface NotificationCategory {
+    id?: string;
+    actions?: NotificationAction[];
+    hasReplyField?: boolean;
+    replyPlaceholder?: string;
+    replyButtonTitle?: string;
+}
+
+// [InitializeNotifications](https://wails.io/docs/reference/runtime/notification#initializenotifications)
+// Initializes the notification service for the application.
+// This must be called before sending any notifications.
+export function InitializeNotifications(): Promise<void>;
+
+// [CleanupNotifications](https://wails.io/docs/reference/runtime/notification#cleanupnotifications)
+// Cleans up notification resources and releases any held connections.
+export function CleanupNotifications(): Promise<void>;
+
+// [IsNotificationAvailable](https://wails.io/docs/reference/runtime/notification#isnotificationavailable)
+// Checks if notifications are available on the current platform.
+export function IsNotificationAvailable(): Promise<boolean>;
+
+// [RequestNotificationAuthorization](https://wails.io/docs/reference/runtime/notification#requestnotificationauthorization)
+// Requests notification authorization from the user (macOS only).
+export function RequestNotificationAuthorization(): Promise<boolean>;
+
+// [CheckNotificationAuthorization](https://wails.io/docs/reference/runtime/notification#checknotificationauthorization)
+// Checks the current notification authorization status (macOS only).
+export function CheckNotificationAuthorization(): Promise<boolean>;
+
+// [SendNotification](https://wails.io/docs/reference/runtime/notification#sendnotification)
+// Sends a basic notification with the given options.
+export function SendNotification(options: NotificationOptions): Promise<void>;
+
+// [SendNotificationWithActions](https://wails.io/docs/reference/runtime/notification#sendnotificationwithactions)
+// Sends a notification with action buttons. Requires a registered category.
+export function SendNotificationWithActions(options: NotificationOptions): Promise<void>;
+
+// [RegisterNotificationCategory](https://wails.io/docs/reference/runtime/notification#registernotificationcategory)
+// Registers a notification category that can be used with SendNotificationWithActions.
+export function RegisterNotificationCategory(category: NotificationCategory): Promise<void>;
+
+// [RemoveNotificationCategory](https://wails.io/docs/reference/runtime/notification#removenotificationcategory)
+// Removes a previously registered notification category.
+export function RemoveNotificationCategory(categoryId: string): Promise<void>;
+
+// [RemoveAllPendingNotifications](https://wails.io/docs/reference/runtime/notification#removeallpendingnotifications)
+// Removes all pending notifications from the notification center.
+export function RemoveAllPendingNotifications(): Promise<void>;
+
+// [RemovePendingNotification](https://wails.io/docs/reference/runtime/notification#removependingnotification)
+// Removes a specific pending notification by its identifier.
+export function RemovePendingNotification(identifier: string): Promise<void>;
+
+// [RemoveAllDeliveredNotifications](https://wails.io/docs/reference/runtime/notification#removealldeliverednotifications)
+// Removes all delivered notifications from the notification center.
+export function RemoveAllDeliveredNotifications(): Promise<void>;
+
+// [RemoveDeliveredNotification](https://wails.io/docs/reference/runtime/notification#removedeliverednotification)
+// Removes a specific delivered notification by its identifier.
+export function RemoveDeliveredNotification(identifier: string): Promise<void>;
+
+// [RemoveNotification](https://wails.io/docs/reference/runtime/notification#removenotification)
+// Removes a notification by its identifier (cross-platform convenience function).
+export function RemoveNotification(identifier: string): Promise<void>;
@@ -48,6 +48,10 @@ export function EventsOff(eventName, ...additionalEventNames) {
    return window.runtime.EventsOff(eventName, ...additionalEventNames);
 }

+export function EventsOffAll() {
+  return window.runtime.EventsOffAll();
+}
+
 export function EventsOnce(eventName, callback) {
    return EventsOnMultiple(eventName, callback, 1);
 }
@@ -236,3 +240,59 @@ export function CanResolveFilePaths() {
 export function ResolveFilePaths(files) {
    return window.runtime.ResolveFilePaths(files);
 }
+
+export function InitializeNotifications() {
+    return window.runtime.InitializeNotifications();
+}
+
+export function CleanupNotifications() {
+    return window.runtime.CleanupNotifications();
+}
+
+export function IsNotificationAvailable() {
+    return window.runtime.IsNotificationAvailable();
+}
+
+export function RequestNotificationAuthorization() {
+    return window.runtime.RequestNotificationAuthorization();
+}
+
+export function CheckNotificationAuthorization() {
+    return window.runtime.CheckNotificationAuthorization();
+}
+
+export function SendNotification(options) {
+    return window.runtime.SendNotification(options);
+}
+
+export function SendNotificationWithActions(options) {
+    return window.runtime.SendNotificationWithActions(options);
+}
+
+export function RegisterNotificationCategory(category) {
+    return window.runtime.RegisterNotificationCategory(category);
+}
+
+export function RemoveNotificationCategory(categoryId) {
+    return window.runtime.RemoveNotificationCategory(categoryId);
+}
+
+export function RemoveAllPendingNotifications() {
+    return window.runtime.RemoveAllPendingNotifications();
+}
+
+export function RemovePendingNotification(identifier) {
+    return window.runtime.RemovePendingNotification(identifier);
+}
+
+export function RemoveAllDeliveredNotifications() {
+    return window.runtime.RemoveAllDeliveredNotifications();
+}
+
+export function RemoveDeliveredNotification(identifier) {
+    return window.runtime.RemoveDeliveredNotification(identifier);
+}
+
+export function RemoveNotification(identifier) {
+    return window.runtime.RemoveNotification(identifier);
+}
@@ -1,49 +1,51 @@
 module AniTrack

-go 1.24.0
+go 1.25.0

 require (
 	github.com/99designs/keyring v1.2.2
-	github.com/tidwall/gjson v1.18.0
-	github.com/wailsapp/wails/v2 v2.10.1
+	github.com/tidwall/gjson v1.19.0
+	github.com/wailsapp/wails/v2 v2.15.0
 )

 require (
+	git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/bep/debounce v1.2.1 // indirect
-	github.com/danieljoos/wincred v1.2.2 // indirect
+	github.com/danieljoos/wincred v1.2.3 // indirect
 	github.com/dvsekhvalnov/jose2go v1.8.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
-	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/godbus/dbus/v5 v5.2.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
-	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
-	github.com/labstack/echo/v4 v4.13.3 // indirect
-	github.com/labstack/gommon v0.4.2 // indirect
+	github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 // indirect
+	github.com/labstack/echo/v4 v4.15.2 // indirect
+	github.com/labstack/gommon v0.5.0 // indirect
 	github.com/leaanthony/go-ansi-parser v1.6.1 // indirect
 	github.com/leaanthony/gosod v1.0.4 // indirect
 	github.com/leaanthony/slicer v1.6.0 // indirect
 	github.com/leaanthony/u v1.1.1 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-isatty v0.0.22 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/samber/lo v1.49.1 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
+	github.com/samber/lo v1.53.0 // indirect
+	github.com/tidwall/match v1.2.0 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tkrajina/go-reflector v0.5.8 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	github.com/wailsapp/go-webview2 v1.0.19 // indirect
+	github.com/wailsapp/go-webview2 v1.0.23 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/net v0.47.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/term v0.37.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/crypto v0.53.0 // indirect
+	golang.org/x/net v0.56.0 // indirect
+	golang.org/x/sys v0.46.0 // indirect
+	golang.org/x/term v0.44.0 // indirect
+	golang.org/x/text v0.39.0 // indirect
 )

 // replace github.com/wailsapp/wails/v2 v2.9.1 => /home/nymusicman/go/pkg/mod
@@ -1,11 +1,13 @@
+git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3 h1:N3IGoHHp9pb6mj1cbXbuaSXV/UMKwmbKLf53nQmtqMA=
+git.sr.ht/~jackmordaunt/go-toast/v2 v2.0.3/go.mod h1:QtOLZGz8olr4qH2vWK0QH0w0O4T9fEIjMuWpKUsH7nc=
 github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs=
 github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
 github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0=
 github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk=
 github.com/bep/debounce v1.2.1 h1:v67fRdBA9UQu2NhLFXrSg0Brw7CexQekrBwDMM8bzeY=
 github.com/bep/debounce v1.2.1/go.mod h1:H8yggRPQKLUhUoqrJC1bO2xNya7vanpDl7xR3ISbCJ0=
-github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0=
-github.com/danieljoos/wincred v1.2.2/go.mod h1:w7w4Utbrz8lqeMbDAK0lkNJUv5sAOkFi7nd/ogr0Uh8=
+github.com/danieljoos/wincred v1.2.3 h1:v7dZC2x32Ut3nEfRH+vhoZGvN72+dQ/snVXo/vMFLdQ=
+github.com/danieljoos/wincred v1.2.3/go.mod h1:6qqX0WNrS4RzPZ1tnroDzq9kY3fu1KwE7MRLQK4X0bs=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dvsekhvalnov/jose2go v1.8.0 h1:LqkkVKAlHFfH9LOEl5fe4p/zL02OhWE7pCufMBG2jLA=
@@ -14,22 +16,23 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
 github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
-github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
-github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
+github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
 github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
-github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
-github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
+github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1 h1:njuLRcjAuMKr7kI3D85AXWkw6/+v9PwtV6M6o11sWHQ=
+github.com/jchv/go-winloader v0.0.0-20250406163304-c1995be93bd1/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
-github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
-github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
-github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
+github.com/labstack/echo/v4 v4.15.2 h1:nnh2sCzGCVYnU+wCisMPiYapEg/QVo/gcI9ePKg5/T4=
+github.com/labstack/echo/v4 v4.15.2/go.mod h1:Xzp1Ns1RA2c9fY7nSgUJkpkUZGNbEIVHZbtbOMPktBI=
+github.com/labstack/gommon v0.5.0 h1:6VSQ2NOzsnEJ5W6+84E0RbcaDDmgB6NIAzWCczTEe6c=
+github.com/labstack/gommon v0.5.0/go.mod h1:Rzlg7HHy1maLfzBYGg9NZcVuz1sA68HHhLjhcEllYE0=
 github.com/leaanthony/debme v1.2.1 h1:9Tgwf+kjcrbMQ4WnPcEIUcQuIZYqdWftzZkBr+i/oOc=
 github.com/leaanthony/debme v1.2.1/go.mod h1:3V+sCm5tYAgQymvSOfYQ5Xx2JCr+OXiD9Jkw3otUjiA=
 github.com/leaanthony/go-ansi-parser v1.6.1 h1:xd8bzARK3dErqkPFtoF9F3/HgN8UQk0ed1YDKpEz01A=
@@ -45,8 +48,8 @@ github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ=
 github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
+github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
 github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
@@ -60,17 +63,16 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
-github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
+github.com/samber/lo v1.53.0 h1:t975lj2py4kJPQ6haz1QMgtId2gtmfktACxIXArw3HM=
+github.com/samber/lo v1.53.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
-github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
+github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
+github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM=
+github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tkrajina/go-reflector v0.5.8 h1:yPADHrwmUbMq4RGEyaOUpz2H90sRsETNVpjzo3DLVQQ=
@@ -79,30 +81,29 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/wailsapp/go-webview2 v1.0.19 h1:7U3QcDj1PrBPaxJNCui2k1SkWml+Q5kvFUFyTImA6NU=
-github.com/wailsapp/go-webview2 v1.0.19/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
+github.com/wailsapp/go-webview2 v1.0.23 h1:jmv8qhz1lHibCc79bMM/a/FqOnnzOGEisLav+a0b9P0=
+github.com/wailsapp/go-webview2 v1.0.23/go.mod h1:qJmWAmAmaniuKGZPWwne+uor3AHMB5PFhqiK0Bbj8kc=
 github.com/wailsapp/mimetype v1.4.1 h1:pQN9ycO7uo4vsUUuPeHEYoUkLVkaRntMnHJxVwYhwHs=
 github.com/wailsapp/mimetype v1.4.1/go.mod h1:9aV5k31bBOv5z6u+QP8TltzvNGJPmNJD4XlAL3U+j3o=
-github.com/wailsapp/wails/v2 v2.10.1 h1:QWHvWMXII2nI/nXz77gpPG8P3ehl6zKe+u4su5BWIns=
-github.com/wailsapp/wails/v2 v2.10.1/go.mod h1:zrebnFV6MQf9kx8HI4iAv63vsR5v67oS7GTEZ7Pz1TY=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+github.com/wailsapp/wails/v2 v2.15.0 h1:u7cHK+UesZOlYxyJxfYLteaCPhws6UsZoDdqUejuX6Q=
+github.com/wailsapp/wails/v2 v2.15.0/go.mod h1:scxrgwfsv6yR6fE6cCF+Flfl+JeU+SR87T9x4kILJ6M=
+golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
+golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
-golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
+golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
 golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
-golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
+golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus=
+golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1,79 +0,0 @@
-# @name AniChart
-
-POST https://graphql.anilist.co
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-
-query ($page: Int, $perPage: Int, $airingAt_greater:Int) {
-  Page(page: $page, perPage: $perPage) {
-    pageInfo {
-      total
-      perPage
-      currentPage
-      lastPage
-      hasNextPage
-    }
-    airingSchedules(airingAt_greater:$airingAt_greater){
-      id
-      airingAt
-      timeUntilAiring
-      episode
-      mediaId
-      media{
-        id
-        title{
-          english
-          romaji
-          native
-        }
-        type
-        format
-        status
-        startDate{
-          year
-          month
-          day
-        }
-        endDate{
-          year
-          month
-          day
-        }
-        season
-        seasonYear
-        episodes
-        duration
-        coverImage{
-          medium
-          large
-          color
-          extraLarge
-        }
-        bannerImage
-        genres
-        averageScore
-        meanScore
-        popularity
-        trending
-        favourites
-        tags{
-          id
-          name
-          description
-          category
-          rank
-          isGeneralSpoiler
-          isMediaSpoiler
-          isAdult
-        }
-        isAdult
-      }
-    }
-  }
-}
-
-{
-  "page": 50,
-  "perPage": 20,
-  "airingAt_greater": 1730260800
-}
@@ -1,83 +0,0 @@
-# @name AniList Item
-
-POST https://graphql.anilist.co
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
-
-query ($userId: Int, $mediaId: Int, $listType: MediaType) {
-  MediaList(mediaId: $mediaId, userId: $userId, type: $listType) {
-    id
-    mediaId
-    userId
-    media {
-      id
-      idMal
-      tags {
-        id
-        name
-        description
-        rank
-        isMediaSpoiler
-        isAdult
-      }
-      title {
-        romaji
-        english
-        native
-      }
-      description
-      coverImage {
-        large
-      }
-      season
-      seasonYear
-      status
-      episodes
-      nextAiringEpisode {
-        airingAt
-        timeUntilAiring
-        episode
-      }
-      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
-          }
-        }
-      }
-    }
-  }
-}
-
-{
-  "userId": 413504,
-  "mediaId": 170998,
-  "listType": "ANIME"
-}
@@ -1,70 +0,0 @@
-# @name AniList MediaList User Query
-
-POST https://graphql.anilist.co
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-
-query(
-  $page: Int
-  $perPage: Int
-  $userId: Int
-  $listType: MediaType
-  $status: MediaListStatus
-) {
-  Page(page: $page, perPage: $perPage) {
-    pageInfo {
-      total
-      perPage
-      currentPage
-      lastPage
-      hasNextPage
-    }
-    mediaList(userId: $userId, type: $listType, status: $status) {
-      id
-      mediaId
-      userId
-      media {
-        id
-        idMal
-        title {
-          romaji
-          english
-          native
-        }
-        description
-        coverImage {
-          large
-        }
-        season
-        seasonYear
-        episodes
-      }
-      status
-      notes
-      progress
-      score
-      repeat
-      user {
-        id
-        statistics {
-          anime {
-            count
-            statuses {
-              status
-              count
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-
-{
-  "page": 1,
-  "perPage": 20,
-  "userId": 413504,
-  "listType": "ANIME",
-  "status": "CURRENT"
-}
@@ -1,44 +0,0 @@
-# @name AniList Search
-
-POST https://graphql.anilist.co
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-
-query ($search: String!, $listType: MediaType) {
-				 Page (page: 1, perPage: 100) {
-					pageInfo {
-					  total
-					  currentPage
-					  lastPage
-					  hasNextPage
-					  perPage
-					}
-					media (search: $search, type: $listType) {
-						id						
-						idMal
-						title {
-						  romaji
-						  english
-						  native
-						}
-						description
-						coverImage {
-						  large
-						}
-						season
-						seasonYear
-						status
-						episodes
-						nextAiringEpisode{
-						  airingAt
-						  timeUntilAiring
-						  episode
-						}
-					}
-				}
-			}
-
-{
-  "search": "dan-da-dan",
-  "listType": "ANIME"
-}
@@ -1,93 +0,0 @@
-# @name GetAniListUserWatchList
-
-POST https://graphql.anilist.co
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-
-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 {
-          romaji
-          english
-          native
-        }
-        description
-        coverImage {
-          large
-        }
-        season
-        seasonYear
-        status
-        episodes
-        nextAiringEpisode {
-          airingAt
-          timeUntilAiring
-          episode
-        }
-      }
-      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
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-
-{
-  "page": 1,
-  "perPage": 20,
-  "userId": 413504,
-  "listType": "ANIME",
-  "status": "CURRENT",
-  "sort": "UPDATED_TIME_DESC"
-}
@@ -1,3 +0,0 @@
-# @name GetAuthorizationToken
-
-GET https://anilist.co/api/v2/oauth/authorize?client_id={{ANILIST_APP_ID}}&redirect_uri=http://localhost:6734/callback&response_type=code
@@ -1,11 +0,0 @@
-# @name Load AniList Oauth Token
-
-POST https://anilist.co/api/v2/oauth/token
-Content-Type: application/x-www-form-urlencoded
-Accept: application/json
-
-grant_type=authorization_code
-client_id={{ANILIST_APP_ID}}
-client_secret={{ANILIST_SECRET_ID}}
-redirect_uri=http://localhost:6734/callback
-code={{ANILIST_CODE}}
@@ -1,76 +0,0 @@
-# @name AniList Change Episode Watched
-
-POST https://graphql.anilist.co
-Content-Type: applicaton/json
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
-
-mutation($mediaId:Int, $progress:Int, $status:MediaListStatus){
-  SaveMediaListEntry(mediaId:$mediaId, progress:$progress, status:$status){   
-    id
-    mediaId
-    userId
-    media {
-      id
-      idMal
-      title {
-        romaji
-        english
-        native
-      }
-      description
-      coverImage {
-        large
-      }
-      season
-      seasonYear
-      status
-      episodes
-      nextAiringEpisode {
-        airingAt
-        timeUntilAiring
-        episode
-      }
-      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
-          }
-        }
-      }
-    }
-  }
-}
-
-{
-  "mediaId": 169417,
-  "progress": 12,
-  "status":"COMPLETED"
-}
@@ -1,19 +0,0 @@
-# @name AniList Change Status
-
-POST https://graphql.anilist.co
-Content-Type: applicaton/json
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
-
-mutation($mediaId:Int, $status:MediaListStatus){
-  SaveMediaListEntry(mediaId:$mediaId, status:$status){
-    id
-    status
-  }
-}
-
-{
-  "mediaId": 1,
-  "status": "CURRENT"
-}
@@ -1,65 +0,0 @@
-# @name AniList Change Count
-
-POST https://graphql.anilist.co
-Content-Type: applicaton/json
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
-
-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
-  ) {
-    mediaId
-    progress
-    status
-    score
-    repeat
-    notes
-    startedAt {
-      year
-      month
-      day
-    }
-    completedAt {
-      year
-      month
-      day
-    }
-  }
-}
-
-{
-  "mediaId": 170998,
-  "progress": 5,
-  "status": "CURRENT",
-  "score": 9.0,
-  "repeat": 0,
-  "notes": ",malSync::eyJ1IjoiaHR0cHM6Ly93d3cuY3J1bmNoeXJvbGwuY29tL3Nlcmllcy9HVkRIWDg1Wk4vI3NlYXNvbj1HNjNWQzJHUUsiLCJwIjoiIn0=::",
-  "startedAt": {
-    "year": 2024,
-    "month": 7,
-    "day": 10
-  },
-  "completedAt": {
-    "year": 0,
-    "month": 0,
-    "day": 0
-  }
-}
@@ -1,17 +0,0 @@
-# @name AniList Delete Media
-
-POST https://graphql.anilist.co
-Content-Type: applicaton/json
-Accept: applicaton/json
-X-REQUEST-TYPE: Graphql
-Authorization: Bearer {{ANILIST_ACCESS_TOKEN}}
-
-mutation ($id: Int) {
-  DeleteMediaListEntry(id: $id) {
-    deleted
-  }
-}
-
-{
-  "id": 430978266
-}
@@ -1,6 +0,0 @@
-# @name Get AnimeList
-
-GET https://api.myanimelist.net/v2/users/{{MAL_USER}}/animelist?fields=list_status&status=watching&limit=1000
-Content-Type application/x-www-form-urlencoded
-Accept: application/json
-Authorization: Bearer {{MAL_ACCESS_TOKEN}}
@@ -1,12 +0,0 @@
-# @name Get Authorization
-
-POST https://myanimelist.net/v1/oauth2/token
-Content-Type: application/x-www-form-urlencoded
-Accept: application/json
-
-grant_type=authorization_code&
-client_id={{MAL_CLIENT_ID}}&
-client_secret={{MAL_CLIENT_SECRET}}&
-redirect_uri=http://localhost:6734/callback&
-code={{MAL_CODE}}&
-code_verifier={{MAL_VERIFIER}}
@@ -1,5 +0,0 @@
-# @name Get Single Anime
-
-GET https://api.myanimelist.net/v2/anime/57380?fields=id,title,main_picture,alternative_titles,start_date,end_date,synopsis,mean,rank,popularity,num_list_users,num_scoring_users,nsfw,genres,created_at,updated_at,media_type,status,my_list_status,num_episodes,start_season,broadcast,source,average_episode_duration,rating,pictures,background,related_anime,recommendations,studios,statistics
-Accept: application/json
-Authorization: Bearer {{MAL_ACCESS_TOKEN}}
@@ -1,5 +0,0 @@
-# @name MAL Oauth Page
-
-GET https://myanimelist.net/v1/oauth2/authorize?response_type=code&client_id={{MAL_CLIENT_ID}}&redirect_uri={{MAL_CALLBACK_URI}}
-cookie MALSESSIONID=5ad688aafb78239bfd84752752ce193f; MALHLOGSESSID=632f67c3955267b4e57fc3d74b373ebb
-Accept: application/json
@@ -1,8 +0,0 @@
-# @name Update Anime Status
-
-PATCH https://api.myanimelist.net/v2/anime/50205/my_list_status
-Content-Type: application/x-www-form-urlencoded
-Accept: application/json
-Authorization: Bearer {{MAL_ACCESS_TOKEN}}
-
-num_watched_episodes=3
@@ -1,3 +0,0 @@
-# @name Get Code
-
-GET https://simkl.com/oauth/authorize?response_type=code&client_id={{SIMKL_CLIENT_ID}}&redirect_uri=http://localhost:6734/callback
@@ -1,5 +0,0 @@
-# @name Get Anime Full Info
-
-GET https://api.simkl.com/anime/40084?extended=full
-Accept application/json
-simkl-api-key {{SIMKL_CLIENT_ID}}
@@ -1,7 +0,0 @@
-# @name GetUser WatchList
-
-GET https://api.simkl.com/sync/all-items/anime/
-Content-Type application/json
-Accept application/json
-simkl-api-key {{SIMKL_CLIENT_ID}}
-Authorization Bearer {{SIMKL_AUTH_TOKEN}}
@@ -1,5 +0,0 @@
-# @name Search By MALID to Get Simkl ID
-
-GET https://api.simkl.com/search/id?anilist=174576
-Accept application/json
-simkl-api-key {{SIMKL_CLIENT_ID}}
@@ -1,17 +0,0 @@
-# @name Delete Entry
-
-GET https://api.simkl.com/sync/history/remove
-Content-Type application/json
-Accept application/json
-simkl-api-key {{SIMKL_CLIENT_ID}}
-Authorization Bearer {{SIMKL_AUTH_TOKEN}}
-
-{
-  "shows": [
-    {
-      "ids": {
-        "simkl": 909121
-      }
-    }
-  ]
-}
@@ -1,40 +0,0 @@
-# @name Update Episode
-
-GET https://api.simkl.com/sync/history
-Content-Type application/json
-Accept application/json
-simkl-api-key {{SIMKL_CLIENT_ID}}
-Authorization Bearer {{SIMKL_AUTH_TOKEN}}
-
-{
-  "shows": [
-    {
-      "title": "Ramen Aka Neko",
-      "ids": {
-        "simkl": 2307708,
-        "mal": "57325",
-        "anilist": "170998"
-      },
-      "episodes": [
-        {
-          "number": 1
-        },
-        {
-          "number": 2
-        },
-        {
-          "number": 3
-        },
-        {
-          "number": 4
-        },
-        {
-          "number": 5
-        },
-        {
-          "number": 6
-        }
-      ]
-    }
-  ]
-}
@@ -1,12 +0,0 @@
-# @name SimklGetAuthorizationToken
-
-POST https://api.simkl.com/oauth/token
-Content-Type application/json
-
-{
-  "grant_type": "authorization_code",
-  "client_id": "{{SIMKL_CLIENT_ID}}",
-  "client_secret": "{{SIMKL_CLIENT_SECRET}}",
-  "redirect_uri": "http://localhost:6734/callback",
-  "code": {{SIMKL_CODE}}
-}
@@ -1,19 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/mistweaverco/kulala.nvim/main/schemas/http-client.env.schema.json",
-  "dev": {
-    "ANILIST_ACCESS_TOKEN": "",
-    "ANILIST_APP_ID": "",
-    "ANILIST_SECRET": "",
-    "ANILSIT_CODE": "",
-    "MAL_ACCESS_TOKEN": "",
-    "MAL_CLIENT_ID": "",
-    "MAL_CLIENT_SECRET": "",
-    "MAL_CODE": "",
-    "MAL_USER": "",
-    "MAL_VERIFIER": "",
-    "SIMKL_AUTH_TOKEN": "",
-    "SIMKL_CODE": "",
-    "SIMKL_CLIENT_ID": "",
-    "SIMKL_CLIENT_SECRET": ""
-  }
-}
@@ -8,10 +8,10 @@
  "frontend:dev:serverUrl": "auto",
  "author": {
    "name": "John O'Keefe",
-    "email": "jokeefe@fastmail.com"
+    "email": "admin@linuxhg.com"
  },
  "info": {
    "productName": "AniTrack",
-    "productVersion": "0.5.0"
+    "productVersion": "1.6.2"
  }
 }