feat: add button to manually scrobble from ui

Split name out of the Theme struct to simplify custom theme saving/reading

.github/workflows/docker.yml

@@ -13,8 +13,6 @@ on:
   push:
     tags:
       - 'v*'
-    branches:
-      - dev
 
   workflow_dispatch:
 
@@ -23,37 +21,42 @@ jobs:
     name: Go Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
 
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
 
-      - name: Install libvips
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libvips-dev
+    - name: Install libvips
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libvips-dev
 
-      - name: Verify libvips install
-        run: vips --version
+    - name: Verify libvips install
+      run: vips --version
 
-      - name: Build
-        run: go build -v ./...
+    - name: Build
+      run: go build -v ./...
 
-      - name: Test
-        uses: robherley/go-test-action@v0
+    - name: Test
+      uses: robherley/go-test-action@v0
 
   push_to_registry:
-    name: Push Docker image to Docker Hub (release)
-    if: startsWith(github.ref, 'refs/tags/')
+    name: Push Docker image to Docker Hub
     needs: test
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
     steps:
-      - uses: actions/checkout@v4
+      - name: Check out the repo
+        uses: actions/checkout@v4
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
@@ -61,12 +64,19 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: gabehf/koito
+
       - name: Extract tag version
+        id: extract_version
         run: echo "KOITO_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
-      - name: Build and push release image
+      - name: Build and push Docker image
         id: push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
           context: .
           file: ./Dockerfile
@@ -78,32 +88,9 @@ jobs:
             KOITO_VERSION=${{ env.KOITO_VERSION }}
           platforms: linux/amd64,linux/arm64     
 
-  push_dev:
-    name: Push Docker image (dev branch)
-    if: github.ref == 'refs/heads/dev'
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push dev image
-        uses: docker/build-push-action@v6
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v2
         with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: |
-            gabehf/koito:dev
-            gabehf/koito:dev-${{ github.sha }}
-          build-args: |
-            KOITO_VERSION=dev
-          platforms: linux/amd64,linux/arm64
+          subject-name: index.docker.io/gabehf/koito
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true

client/api/api.ts

@@ -101,11 +101,6 @@ function logout(): Promise<Response> {
     })
 }
 
-function getCfg(): Promise<Config> {
-    return fetch(`/apis/web/v1/config`).then(r => r.json() as Promise<Config>)
-
-}
-
 function submitListen(id: string, ts: Date): Promise<Response> {
     const form = new URLSearchParams
     form.append("track_id", id)
@@ -231,7 +226,6 @@ export {
     imageUrl,
     login,
     logout,
-    getCfg,
     deleteItem,
     updateUser,
     getAliases,
@@ -328,9 +322,6 @@ type ApiKey = {
 type ApiError = {
     error: string
 }
-type Config = {
-    default_theme: string
-}
 
 export type {
     getItemsArgs,
@@ -345,6 +336,5 @@ export type {
     User,
     Alias,
     ApiKey,
-    ApiError,
-    Config
+    ApiError
 }

client/app/components/ActivityOptsSelector.tsx

@@ -43,8 +43,7 @@ export default function ActivityOptsSelector({
 
     useEffect(() => {
         if (!disableCache) {
-            // TODO: the '182' here overwrites the default range as configured in the ActivityGrid. This is bad. Only one of these should determine the default.
-            const cachedRange = parseInt(localStorage.getItem('activity_range_' + window.location.pathname.split('/')[1]) ?? '182');
+            const cachedRange = parseInt(localStorage.getItem('activity_range_' + window.location.pathname.split('/')[1]) ?? '35');
             if (cachedRange) rangeSetter(cachedRange);
             const cachedStep = localStorage.getItem('activity_step_' + window.location.pathname.split('/')[1]);
             if (cachedStep) stepSetter(cachedStep);

client/app/components/themeSwitcher/ThemeSwitcher.tsx

@@ -1,11 +1,12 @@
-import { useState } from 'react';
+// ThemeSwitcher.tsx
+import { useEffect, useState } from 'react';
 import { useTheme } from '../../hooks/useTheme';
 import themes from '~/styles/themes.css';
 import ThemeOption from './ThemeOption';
 import { AsyncButton } from '../AsyncButton';
 
 export function ThemeSwitcher() {
-    const { setTheme } = useTheme();
+    const { theme, themeName, setTheme } = useTheme();
         const initialTheme = {
             bg: "#1e1816",
             bgSecondary: "#2f2623",
@@ -23,7 +24,7 @@ export function ThemeSwitcher() {
             info: "#87b8dd",
         }
     
-        const { setCustomTheme, getCustomTheme, resetTheme } = useTheme()
+        const { setCustomTheme, getCustomTheme } = useTheme()
         const [custom, setCustom] = useState(JSON.stringify(getCustomTheme() ?? initialTheme, null, "  "))
     
         const handleCustomTheme = () => {
@@ -41,12 +42,7 @@ export function ThemeSwitcher() {
     return (
         <div className='flex flex-col gap-10'>
             <div>
-                <div className='flex items-center gap-3'>
-                    <h2>Select Theme</h2>
-                    <div className='mb-3'>
-                        <AsyncButton onClick={resetTheme}>Reset</AsyncButton>
-                    </div>
-                </div>
+                <h2>Select Theme</h2>
                 <div className="grid grid-cols-2 items-center gap-2">
                     {Object.entries(themes).map(([name, themeData]) => (
                         <ThemeOption setTheme={setTheme} key={name} theme={themeData} themeName={name} />

client/app/providers/AppProvider.tsx

@@ -1,11 +1,10 @@
-import { getCfg, type User } from "api/api";
+import type { User } from "api/api";
 import { createContext, useContext, useEffect, useState } from "react";
 
 interface AppContextType {
   user: User | null | undefined;
   configurableHomeActivity: boolean;
   homeItems: number;
-  defaultTheme: string;
   setConfigurableHomeActivity: (value: boolean) => void;
   setHomeItems: (value: number) => void;
   setUsername: (value: string) => void;
@@ -23,7 +22,6 @@ export const useAppContext = () => {
 
 export const AppProvider = ({ children }: { children: React.ReactNode }) => {
   const [user, setUser] = useState<User | null | undefined>(undefined);
-  const [defaultTheme, setDefaultTheme] = useState<string | undefined>(undefined)
   const [configurableHomeActivity, setConfigurableHomeActivity] = useState<boolean>(false);
   const [homeItems, setHomeItems] = useState<number>(0);
 
@@ -44,15 +42,9 @@ export const AppProvider = ({ children }: { children: React.ReactNode }) => {
 
     setConfigurableHomeActivity(true);
     setHomeItems(12);
-
-    getCfg().then(cfg => {
-      console.log(cfg)
-      setDefaultTheme(cfg.default_theme)
-    })
   }, []);
 
-  // Block rendering the app until config is loaded
-  if (user === undefined || defaultTheme === undefined) {
+  if (user === undefined) {
     return null;
   }
 
@@ -60,7 +52,6 @@ export const AppProvider = ({ children }: { children: React.ReactNode }) => {
     user,
     configurableHomeActivity,
     homeItems,
-    defaultTheme,
     setConfigurableHomeActivity,
     setHomeItems,
     setUsername,

client/app/providers/ThemeProvider.tsx

@@ -1,13 +1,11 @@
 import { createContext, useEffect, useState, useCallback, type ReactNode } from 'react';
 import { type Theme, themes } from '~/styles/themes.css';
 import { themeVars } from '~/styles/vars.css';
-import { useAppContext } from './AppProvider';
 
 interface ThemeContextValue {
     themeName: string;
     theme: Theme;
     setTheme: (theme: string) => void;
-    resetTheme: () => void;
     setCustomTheme: (theme: Theme) => void;
     getCustomTheme: () => Theme | undefined;
 }
@@ -45,19 +43,19 @@ function getStoredCustomTheme(): Theme | undefined {
 }
 
 export function ThemeProvider({
+    theme: initialTheme,
     children,
 }: {
+    theme: string;
     children: ReactNode;
 }) {
-    let defaultTheme = useAppContext().defaultTheme
-    let initialTheme = localStorage.getItem("theme") ?? defaultTheme
     const [themeName, setThemeName] = useState(initialTheme);
     const [currentTheme, setCurrentTheme] = useState<Theme>(() => {
         if (initialTheme === 'custom') {
             const customTheme = getStoredCustomTheme();
-            return customTheme || themes[defaultTheme];
+            return customTheme || themes.yuu;
         }
-        return themes[initialTheme] || themes[defaultTheme];
+        return themes[initialTheme] || themes.yuu;
     });
 
     const setTheme = (newThemeName: string) => {
@@ -68,29 +66,21 @@ export function ThemeProvider({
                 setCurrentTheme(customTheme);
             } else {
                 // Fallback to default theme if no custom theme found
-                setThemeName(defaultTheme);
-                setCurrentTheme(themes[defaultTheme]);
+                setThemeName('yuu');
+                setCurrentTheme(themes.yuu);
             }
         } else {
             const foundTheme = themes[newThemeName];
             if (foundTheme) {
-                localStorage.setItem('theme', newThemeName)
                 setCurrentTheme(foundTheme);
             }
         }
     }
 
-    const resetTheme = () => {
-        setThemeName(defaultTheme)
-        localStorage.removeItem('theme')
-        setCurrentTheme(themes[defaultTheme])
-    }
-
     const setCustomTheme = useCallback((customTheme: Theme) => {
         localStorage.setItem('custom-theme', JSON.stringify(customTheme));
         applyCustomThemeVars(customTheme);
         setThemeName('custom');
-        localStorage.setItem('theme', 'custom')
         setCurrentTheme(customTheme);
     }, []);
 
@@ -102,6 +92,7 @@ export function ThemeProvider({
         const root = document.documentElement;
 
         root.setAttribute('data-theme', themeName);
+        localStorage.setItem('theme', themeName);
 
         if (themeName === 'custom') {
             applyCustomThemeVars(currentTheme);
@@ -111,14 +102,7 @@ export function ThemeProvider({
     }, [themeName, currentTheme]);
 
     return (
-        <ThemeContext.Provider value={{ 
-            themeName, 
-            theme: currentTheme, 
-            setTheme,
-            resetTheme, 
-            setCustomTheme, 
-            getCustomTheme
-        }}>
+        <ThemeContext.Provider value={{ themeName, theme: currentTheme, setTheme, setCustomTheme, getCustomTheme }}>
             {children}
         </ThemeContext.Provider>
     );

client/app/root.tsx

@@ -58,10 +58,12 @@ export function Layout({ children }: { children: React.ReactNode }) {
 }
 
 export default function App() {
+    let theme = localStorage.getItem('theme') ?? 'yuu'
+
   return (
     <>
         <AppProvider>
-            <ThemeProvider>
+            <ThemeProvider theme={theme}>
             <QueryClientProvider client={queryClient}>
                 <div className="flex-col flex sm:flex-row">
                   <Sidebar />
@@ -97,12 +99,18 @@ export function ErrorBoundary() {
         stack = error.stack;
     }
 
+    let theme = 'yuu'
+    try {
+        theme = localStorage.getItem('theme') ?? theme
+    } catch(err) {
+        console.log(err)
+    }
 
     const title = `${message} - Koito`
 
     return (
         <AppProvider>
-            <ThemeProvider>
+            <ThemeProvider theme={theme}>
             <title>{title}</title>
                 <div className="flex">
                     <Sidebar />

client/public/site.webmanifest

@@ -1,6 +1,6 @@
 {
-  "name": "Koito",
-  "short_name": "Koito",
+  "name": "MyWebSite",
+  "short_name": "MySite",
   "icons": [
     {
       "src": "/web-app-manifest-192x192.png",

db/queries/release.sql

@@ -74,8 +74,8 @@ JOIN artist_releases ar ON r.id = ar.release_id
 WHERE ar.artist_id = $1;
 
 -- name: AssociateArtistToRelease :exec
-INSERT INTO artist_releases (artist_id, release_id, is_primary)
-VALUES ($1, $2, $3)
+INSERT INTO artist_releases (artist_id, release_id)
+VALUES ($1, $2)
 ON CONFLICT DO NOTHING;
 
 -- name: GetReleasesWithoutImages :many

db/queries/track.sql

@@ -4,8 +4,8 @@ VALUES ($1, $2, $3)
 RETURNING *;
 
 -- name: AssociateArtistToTrack :exec
-INSERT INTO artist_tracks (artist_id, track_id, is_primary)
-VALUES ($1, $2, $3)
+INSERT INTO artist_tracks (artist_id, track_id)
+VALUES ($1, $2)
 ON CONFLICT DO NOTHING;
 
 -- name: GetTrack :one

docs/src/content/docs/reference/configuration.md

@@ -23,9 +23,6 @@ If the environment variable is defined without **and** with the suffix at the sa
 ##### KOITO_DEFAULT_PASSWORD
 - Default: `changeme`
 - Description: The password for the user that is created on first startup. Only applies when running Koito for the first time.
-##### KOITO_DEFAULT_THEME
-- Default: `yuu`
-- Description: The lowercase name of the default theme to be used by the client. Overridden if a user picks a theme in the theme switcher.
 ##### KOITO_BIND_ADDR
 - Description: The address to bind to. The default blank value is equivalent to `0.0.0.0`.
 ##### KOITO_LISTEN_PORT

engine/handlers/manual_scrobble.go

@@ -36,7 +36,7 @@ func SubmitListenWithIDHandler(store db.DB) http.HandlerFunc {
 		}
 
 		trackIDStr := r.FormValue("track_id")
-		timestampStr := r.FormValue("unix")
+		timestampStr := r.FormValue("unix") // unix
 		client := r.FormValue("client")
 		if client == "" {
 			client = defaultClientStr
@@ -54,8 +54,8 @@ func SubmitListenWithIDHandler(store db.DB) http.HandlerFunc {
 			return
 		}
 		unix, err := strconv.ParseInt(timestampStr, 10, 64)
-		if err != nil || time.Now().Unix() < unix {
-			l.Debug().AnErr("error", err).Msg("SubmitListenWithIDHandler: Invalid unix timestamp")
+		if err != nil {
+			l.Debug().AnErr("error", err).Msg("SubmitListenWithIDHandler: Invalid track id")
 			utils.WriteError(w, "invalid timestamp", http.StatusBadRequest)
 			return
 		}

engine/handlers/server_cfg.go

@@ -1,18 +0,0 @@
-package handlers
-
-import (
-	"net/http"
-
-	"github.com/gabehf/koito/internal/cfg"
-	"github.com/gabehf/koito/internal/utils"
-)
-
-type ServerConfig struct {
-	DefaultTheme string `json:"default_theme"`
-}
-
-func GetCfgHandler() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		utils.WriteJSON(w, http.StatusOK, ServerConfig{DefaultTheme: cfg.DefaultTheme()})
-	}
-}

engine/long_test.go

@@ -11,7 +11,6 @@ import (
 	"net/url"
 	"os"
 	"path"
-	"strconv"
 	"strings"
 	"sync"
 	"testing"
@@ -891,29 +890,3 @@ func TestSetPrimaryArtist(t *testing.T) {
 	require.NoError(t, err)
 	assert.EqualValues(t, 1, count, "expected only one primary artist for track")
 }
-
-func TestManualListen(t *testing.T) {
-
-	t.Run("Submit Listens", doSubmitListens)
-
-	ctx := context.Background()
-
-	// happy
-	formdata := url.Values{}
-	formdata.Set("track_id", "1")
-	formdata.Set("unix", strconv.FormatInt(time.Now().Unix()-60, 10))
-	body := formdata.Encode()
-	resp, err := makeAuthRequest(t, session, "POST", "/apis/web/v1/listen", strings.NewReader(body))
-	require.NoError(t, err)
-	assert.Equal(t, http.StatusCreated, resp.StatusCode)
-	count, _ := store.Count(ctx, `SELECT COUNT(*) FROM listens WHERE track_id = $1`, 1)
-	assert.Equal(t, 2, count)
-
-	// 400
-	formdata.Set("track_id", "1")
-	formdata.Set("unix", strconv.FormatInt(time.Now().Unix()+60, 10))
-	body = formdata.Encode()
-	resp, err = makeAuthRequest(t, session, "POST", "/apis/web/v1/listen", strings.NewReader(body))
-	require.NoError(t, err)
-	assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
-}

engine/routes.go

@@ -35,7 +35,6 @@ func bindRoutes(
 		Get("/images/{size}/{filename}", handlers.ImageHandler(db))
 
 	r.Route("/apis/web/v1", func(r chi.Router) {
-		r.Get("/config", handlers.GetCfgHandler())
 		r.Get("/artist", handlers.GetArtistHandler(db))
 		r.Get("/artists", handlers.GetArtistsForItemHandler(db))
 		r.Get("/album", handlers.GetAlbumHandler(db))

internal/catalog/submit_listen_test.go

@@ -203,22 +203,6 @@ func TestSubmitListen_CreateAllNoMbzIDsNoArtistNamesNoReleaseTitle(t *testing.T)
     )`, "Madeline Kenney")
 	require.NoError(t, err)
 	assert.True(t, exists, "expected featured artist to be created")
-
-	// assert that Rat Tally is the primary artist
-	exists, err = store.RowExists(ctx, `
-    SELECT EXISTS (
-      SELECT 1 FROM artist_tracks
-      WHERE artist_id = $1 AND is_primary = $2
-    )`, 1, true)
-	require.NoError(t, err)
-	assert.True(t, exists, "expected primary artist to be marked as primary for track")
-	exists, err = store.RowExists(ctx, `
-    SELECT EXISTS (
-      SELECT 1 FROM artist_releases
-      WHERE artist_id = $1 AND is_primary = $2
-    )`, 1, true)
-	require.NoError(t, err)
-	assert.True(t, exists, "expected primary artist to be marked as primary for release")
 }
 
 func TestSubmitListen_MatchAllMbzIDs(t *testing.T) {

internal/cfg/cfg.go

@@ -31,7 +31,6 @@ const (
 	CONFIG_DIR_ENV                 = "KOITO_CONFIG_DIR"
 	DEFAULT_USERNAME_ENV           = "KOITO_DEFAULT_USERNAME"
 	DEFAULT_PASSWORD_ENV           = "KOITO_DEFAULT_PASSWORD"
-	DEFAULT_THEME_ENV              = "KOITO_DEFAULT_THEME"
 	DISABLE_DEEZER_ENV             = "KOITO_DISABLE_DEEZER"
 	DISABLE_COVER_ART_ARCHIVE_ENV  = "KOITO_DISABLE_COVER_ART_ARCHIVE"
 	DISABLE_MUSICBRAINZ_ENV        = "KOITO_DISABLE_MUSICBRAINZ"
@@ -61,7 +60,6 @@ type config struct {
 	lbzRelayToken          string
 	defaultPw              string
 	defaultUsername        string
-	defaultTheme           string
 	disableDeezer          bool
 	disableCAA             bool
 	disableMusicBrainz     bool
@@ -164,8 +162,6 @@ func loadConfig(getenv func(string) string, version string) (*config, error) {
 		cfg.defaultPw = getenv(DEFAULT_PASSWORD_ENV)
 	}
 
-	cfg.defaultTheme = getenv(DEFAULT_THEME_ENV)
-
 	cfg.configDir = getenv(CONFIG_DIR_ENV)
 	if cfg.configDir == "" {
 		cfg.configDir = "/etc/koito"
@@ -281,12 +277,6 @@ func DefaultUsername() string {
 	return globalConfig.defaultUsername
 }
 
-func DefaultTheme() string {
-	lock.RLock()
-	defer lock.RUnlock()
-	return globalConfig.defaultTheme
-}
-
 func FullImageCacheEnabled() bool {
 	lock.RLock()
 	defer lock.RUnlock()

internal/db/psql/album.go

@@ -144,7 +144,6 @@ func (d *Psql) SaveAlbum(ctx context.Context, opts db.SaveAlbumOpts) (*models.Al
 		err = qtx.AssociateArtistToRelease(ctx, repository.AssociateArtistToReleaseParams{
 			ArtistID:  artistId,
 			ReleaseID: r.ID,
-			IsPrimary: opts.ArtistIDs[0] == artistId,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("SaveAlbum: AssociateArtistToRelease: %w", err)

internal/db/psql/track.go

@@ -132,9 +132,8 @@ func (d *Psql) SaveTrack(ctx context.Context, opts db.SaveTrackOpts) (*models.Tr
 	// insert associated artists
 	for _, aid := range opts.ArtistIDs {
 		err = qtx.AssociateArtistToTrack(ctx, repository.AssociateArtistToTrackParams{
-			ArtistID:  aid,
-			TrackID:   trackRow.ID,
-			IsPrimary: opts.ArtistIDs[0] == aid,
+			ArtistID: aid,
+			TrackID:  trackRow.ID,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("SaveTrack: AssociateArtistToTrack: %w", err)

internal/repository/alias.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: alias.sql
 
 package repository

internal/repository/artist.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: artist.sql
 
 package repository

internal/repository/db.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 
 package repository
 

internal/repository/etc.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: etc.sql
 
 package repository

internal/repository/listen.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: listen.sql
 
 package repository

internal/repository/models.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 
 package repository
 

internal/repository/release.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: release.sql
 
 package repository
@@ -14,19 +14,18 @@ import (
 )
 
 const associateArtistToRelease = `-- name: AssociateArtistToRelease :exec
-INSERT INTO artist_releases (artist_id, release_id, is_primary)
-VALUES ($1, $2, $3)
+INSERT INTO artist_releases (artist_id, release_id)
+VALUES ($1, $2)
 ON CONFLICT DO NOTHING
 `
 
 type AssociateArtistToReleaseParams struct {
 	ArtistID  int32
 	ReleaseID int32
-	IsPrimary bool
 }
 
 func (q *Queries) AssociateArtistToRelease(ctx context.Context, arg AssociateArtistToReleaseParams) error {
-	_, err := q.db.Exec(ctx, associateArtistToRelease, arg.ArtistID, arg.ReleaseID, arg.IsPrimary)
+	_, err := q.db.Exec(ctx, associateArtistToRelease, arg.ArtistID, arg.ReleaseID)
 	return err
 }
 

internal/repository/search.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: search.sql
 
 package repository

internal/repository/sessions.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: sessions.sql
 
 package repository

internal/repository/track.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: track.sql
 
 package repository
@@ -13,19 +13,18 @@ import (
 )
 
 const associateArtistToTrack = `-- name: AssociateArtistToTrack :exec
-INSERT INTO artist_tracks (artist_id, track_id, is_primary)
-VALUES ($1, $2, $3)
+INSERT INTO artist_tracks (artist_id, track_id)
+VALUES ($1, $2)
 ON CONFLICT DO NOTHING
 `
 
 type AssociateArtistToTrackParams struct {
-	ArtistID  int32
-	TrackID   int32
-	IsPrimary bool
+	ArtistID int32
+	TrackID  int32
 }
 
 func (q *Queries) AssociateArtistToTrack(ctx context.Context, arg AssociateArtistToTrackParams) error {
-	_, err := q.db.Exec(ctx, associateArtistToTrack, arg.ArtistID, arg.TrackID, arg.IsPrimary)
+	_, err := q.db.Exec(ctx, associateArtistToTrack, arg.ArtistID, arg.TrackID)
 	return err
 }
 

internal/repository/users.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: users.sql
 
 package repository

internal/repository/year.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.30.0
+//   sqlc v1.29.0
 // source: year.sql
 
 package repository