gabehf
/
Koito
mirror of https://github.com/gabehf/Koito.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: gabehf:c77481fd5950f6102ece3d131f99083fdaaa2756
Branches Tags
gabehf:main
gabehf:feat/login-gate
gabehf:dev
gabehf:feat/custom-artist-sep
...
compare: gabehf:fed2c5b95684964481539216fa7aa2ed8f830dba
Branches Tags
gabehf:main
gabehf:feat/login-gate
gabehf:dev
gabehf:feat/custom-artist-sep

2 Commits
c77481fd59 ... fed2c5b956

Author SHA1 Message Date
Gabe Farrell fed2c5b956 chore: add gitignore
2 weeks ago
Gabe Farrell daa1bb2456
feat: config to gate all statistics behind login (#99)
2 weeks ago
8 changed files with 192 additions and 127 deletions
Show Stats

1
.gitignore vendored
Unescape View File

@ -0,0 +1 @@
test_config_dir

2
client/app/components/LastPlays.tsx
Unescape View File

@ -72,6 +72,8 @@ export default function LastPlays(props: Props) {
return <p className="error">Error: {error.message}</p>; return <p className="error">Error: {error.message}</p>;
} }
if (!data.items) return;
const listens = items ?? data.items; const listens = items ?? data.items;
let params = ""; let params = "";

93
client/app/components/TopAlbums.tsx
Unescape View File

@ -1,42 +1,63 @@
import { useQuery } from "@tanstack/react-query" import { useQuery } from "@tanstack/react-query";
import ArtistLinks from "./ArtistLinks" import ArtistLinks from "./ArtistLinks";
import { getTopAlbums, getTopTracks, imageUrl, type getItemsArgs } from "api/api" import {
import { Link } from "react-router" getTopAlbums,
import TopListSkeleton from "./skeletons/TopListSkeleton" getTopTracks,
import TopItemList from "./TopItemList" imageUrl,
type getItemsArgs,
} from "api/api";
import { Link } from "react-router";
import TopListSkeleton from "./skeletons/TopListSkeleton";
import TopItemList from "./TopItemList";
interface Props { interface Props {
limit: number, limit: number;
period: string, period: string;
artistId?: Number artistId?: Number;
} }
export default function TopAlbums (props: Props) { export default function TopAlbums(props: Props) {
const { isPending, isError, data, error } = useQuery({
const { isPending, isError, data, error } = useQuery({ queryKey: [
queryKey: ['top-albums', {limit: props.limit, period: props.period, artistId: props.artistId, page: 0 }], "top-albums",
queryFn: ({ queryKey }) => getTopAlbums(queryKey[1] as getItemsArgs), {
}) limit: props.limit,
period: props.period,
if (isPending) { artistId: props.artistId,
return ( page: 0,
<div className="w-[300px]"> },
<h2>Top Albums</h2> ],
<p>Loading...</p> queryFn: ({ queryKey }) => getTopAlbums(queryKey[1] as getItemsArgs),
</div> });
)
}
if (isError) {
return <p className="error">Error:{error.message}</p>
}
if (isPending) {
return ( return (
<div> <div className="w-[300px]">
<h2 className="hover:underline"><Link to={`/chart/top-albums?period=${props.period}${props.artistId ? `&artist_id=${props.artistId}` : ''}`}>Top Albums</Link></h2> <h2>Top Albums</h2>
<div className="max-w-[300px]"> <p>Loading...</p>
<TopItemList type="album" data={data} /> </div>
{data.items.length < 1 ? 'Nothing to show' : ''} );
</div> }
</div> if (isError) {
) return <p className="error">Error:{error.message}</p>;
} }
if (!data.items) return;
return (
<div>
<h2 className="hover:underline">
<Link
to={`/chart/top-albums?period=${props.period}${
props.artistId ? `&artist_id=${props.artistId}` : ""
}`}
>
Top Albums
</Link>
</h2>
<div className="max-w-[300px]">
<TopItemList type="album" data={data} />
{data.items.length < 1 ? "Nothing to show" : ""}
</div>
</div>
);
}

81
client/app/components/TopArtists.tsx
Unescape View File

@ -1,43 +1,50 @@
import { useQuery } from "@tanstack/react-query" import { useQuery } from "@tanstack/react-query";
import ArtistLinks from "./ArtistLinks" import ArtistLinks from "./ArtistLinks";
import { getTopArtists, imageUrl, type getItemsArgs } from "api/api" import { getTopArtists, imageUrl, type getItemsArgs } from "api/api";
import { Link } from "react-router" import { Link } from "react-router";
import TopListSkeleton from "./skeletons/TopListSkeleton" import TopListSkeleton from "./skeletons/TopListSkeleton";
import TopItemList from "./TopItemList" import TopItemList from "./TopItemList";
interface Props { interface Props {
limit: number, limit: number;
period: string, period: string;
artistId?: Number artistId?: Number;
albumId?: Number albumId?: Number;
} }
export default function TopArtists (props: Props) { export default function TopArtists(props: Props) {
const { isPending, isError, data, error } = useQuery({
const { isPending, isError, data, error } = useQuery({ queryKey: [
queryKey: ['top-artists', {limit: props.limit, period: props.period, page: 0 }], "top-artists",
queryFn: ({ queryKey }) => getTopArtists(queryKey[1] as getItemsArgs), { limit: props.limit, period: props.period, page: 0 },
}) ],
queryFn: ({ queryKey }) => getTopArtists(queryKey[1] as getItemsArgs),
if (isPending) { });
return (
<div className="w-[300px]">
<h2>Top Artists</h2>
<p>Loading...</p>
</div>
)
}
if (isError) {
return <p className="error">Error:{error.message}</p>
}
if (isPending) {
return ( return (
<div> <div className="w-[300px]">
<h2 className="hover:underline"><Link to={`/chart/top-artists?period=${props.period}`}>Top Artists</Link></h2> <h2>Top Artists</h2>
<div className="max-w-[300px]"> <p>Loading...</p>
<TopItemList type="artist" data={data} /> </div>
{data.items.length < 1 ? 'Nothing to show' : ''} );
</div> }
</div> if (isError) {
) return <p className="error">Error:{error.message}</p>;
} }
if (!data.items) return;
return (
<div>
<h2 className="hover:underline">
<Link to={`/chart/top-artists?period=${props.period}`}>
Top Artists
</Link>
</h2>
<div className="max-w-[300px]">
<TopItemList type="artist" data={data} />
{data.items.length < 1 ? "Nothing to show" : ""}
</div>
</div>
);
}

95
client/app/components/TopTracks.tsx
Unescape View File

@ -1,50 +1,63 @@
import { useQuery } from "@tanstack/react-query" import { useQuery } from "@tanstack/react-query";
import ArtistLinks from "./ArtistLinks" import ArtistLinks from "./ArtistLinks";
import { getTopTracks, imageUrl, type getItemsArgs } from "api/api" import { getTopTracks, imageUrl, type getItemsArgs } from "api/api";
import { Link } from "react-router" import { Link } from "react-router";
import TopListSkeleton from "./skeletons/TopListSkeleton" import TopListSkeleton from "./skeletons/TopListSkeleton";
import { useEffect } from "react" import { useEffect } from "react";
import TopItemList from "./TopItemList" import TopItemList from "./TopItemList";
interface Props { interface Props {
limit: number, limit: number;
period: string, period: string;
artistId?: Number artistId?: Number;
albumId?: Number albumId?: Number;
} }
const TopTracks = (props: Props) => { const TopTracks = (props: Props) => {
const { isPending, isError, data, error } = useQuery({
queryKey: [
"top-tracks",
{
limit: props.limit,
period: props.period,
artist_id: props.artistId,
album_id: props.albumId,
page: 0,
},
],
queryFn: ({ queryKey }) => getTopTracks(queryKey[1] as getItemsArgs),
});
const { isPending, isError, data, error } = useQuery({ if (isPending) {
queryKey: ['top-tracks', {limit: props.limit, period: props.period, artist_id: props.artistId, album_id: props.albumId, page: 0}], return (
queryFn: ({ queryKey }) => getTopTracks(queryKey[1] as getItemsArgs), <div className="w-[300px]">
}) <h2>Top Tracks</h2>
<p>Loading...</p>
</div>
);
}
if (isError) {
return <p className="error">Error:{error.message}</p>;
}
if (!data.items) return;
if (isPending) { let params = "";
return ( params += props.artistId ? `&artist_id=${props.artistId}` : "";
<div className="w-[300px]"> params += props.albumId ? `&album_id=${props.albumId}` : "";
<h2>Top Tracks</h2>
<p>Loading...</p>
</div>
)
}
if (isError) {
return <p className="error">Error:{error.message}</p>
}
let params = ''
params += props.artistId ? `&artist_id=${props.artistId}` : ''
params += props.albumId ? `&album_id=${props.albumId}` : ''
return ( return (
<div> <div>
<h2 className="hover:underline"><Link to={`/chart/top-tracks?period=${props.period}${params}`}>Top Tracks</Link></h2> <h2 className="hover:underline">
<div className="max-w-[300px]"> <Link to={`/chart/top-tracks?period=${props.period}${params}`}>
<TopItemList type="track" data={data}/> Top Tracks
{data.items.length < 1 ? 'Nothing to show' : ''} </Link>
</div> </h2>
</div> <div className="max-w-[300px]">
) <TopItemList type="track" data={data} />
} {data.items.length < 1 ? "Nothing to show" : ""}
</div>
</div>
);
};
export default TopTracks export default TopTracks;

3
docs/src/content/docs/reference/configuration.md
Unescape View File

@ -26,6 +26,9 @@ If the environment variable is defined without **and** with the suffix at the sa
##### KOITO_DEFAULT_THEME ##### KOITO_DEFAULT_THEME
- Default: `yuu` - 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. - 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_LOGIN_GATE
- Default: `false`
- Description: When `true`, Koito will not show any statistics unless the user is logged in.
##### KOITO_BIND_ADDR ##### KOITO_BIND_ADDR
- Description: The address to bind to. The default blank value is equivalent to `0.0.0.0`. - Description: The address to bind to. The default blank value is equivalent to `0.0.0.0`.
##### KOITO_LISTEN_PORT ##### KOITO_LISTEN_PORT

32
engine/routes.go
Unescape View File

@ -36,19 +36,25 @@ func bindRoutes(
r.Route("/apis/web/v1", func(r chi.Router) { r.Route("/apis/web/v1", func(r chi.Router) {
r.Get("/config", handlers.GetCfgHandler()) r.Get("/config", handlers.GetCfgHandler())
r.Get("/artist", handlers.GetArtistHandler(db))
r.Get("/artists", handlers.GetArtistsForItemHandler(db)) r.Group(func(r chi.Router) {
r.Get("/album", handlers.GetAlbumHandler(db)) if cfg.LoginGate() {
r.Get("/track", handlers.GetTrackHandler(db)) r.Use(middleware.ValidateSession(db))
r.Get("/top-tracks", handlers.GetTopTracksHandler(db)) }
r.Get("/top-albums", handlers.GetTopAlbumsHandler(db)) r.Get("/artist", handlers.GetArtistHandler(db))
r.Get("/top-artists", handlers.GetTopArtistsHandler(db)) r.Get("/artists", handlers.GetArtistsForItemHandler(db))
r.Get("/listens", handlers.GetListensHandler(db)) r.Get("/album", handlers.GetAlbumHandler(db))
r.Get("/listen-activity", handlers.GetListenActivityHandler(db)) r.Get("/track", handlers.GetTrackHandler(db))
r.Get("/now-playing", handlers.NowPlayingHandler(db)) r.Get("/top-tracks", handlers.GetTopTracksHandler(db))
r.Get("/stats", handlers.StatsHandler(db)) r.Get("/top-albums", handlers.GetTopAlbumsHandler(db))
r.Get("/search", handlers.SearchHandler(db)) r.Get("/top-artists", handlers.GetTopArtistsHandler(db))
r.Get("/aliases", handlers.GetAliasesHandler(db)) r.Get("/listens", handlers.GetListensHandler(db))
r.Get("/listen-activity", handlers.GetListenActivityHandler(db))
r.Get("/now-playing", handlers.NowPlayingHandler(db))
r.Get("/stats", handlers.StatsHandler(db))
r.Get("/search", handlers.SearchHandler(db))
r.Get("/aliases", handlers.GetAliasesHandler(db))
})
r.Post("/logout", handlers.LogoutHandler(db)) r.Post("/logout", handlers.LogoutHandler(db))
if !cfg.RateLimitDisabled() { if !cfg.RateLimitDisabled() {
r.With(httprate.Limit( r.With(httprate.Limit(

12
internal/cfg/cfg.go
Unescape View File

@ -47,6 +47,7 @@ const (
IMPORT_AFTER_UNIX_ENV = "KOITO_IMPORT_AFTER_UNIX" IMPORT_AFTER_UNIX_ENV = "KOITO_IMPORT_AFTER_UNIX"
FETCH_IMAGES_DURING_IMPORT_ENV = "KOITO_FETCH_IMAGES_DURING_IMPORT" FETCH_IMAGES_DURING_IMPORT_ENV = "KOITO_FETCH_IMAGES_DURING_IMPORT"
ARTIST_SEPARATORS_ENV = "KOITO_ARTIST_SEPARATORS_REGEX" ARTIST_SEPARATORS_ENV = "KOITO_ARTIST_SEPARATORS_REGEX"
LOGIN_GATE_ENV = "KOITO_LOGIN_GATE"
) )
type config struct { type config struct {
@ -83,6 +84,7 @@ type config struct {
importBefore time.Time importBefore time.Time
importAfter time.Time importAfter time.Time
artistSeparators []*regexp.Regexp artistSeparators []*regexp.Regexp
loginGate bool
} }
var ( var (
@ -204,6 +206,10 @@ func loadConfig(getenv func(string) string, version string) (*config, error) {
cfg.artistSeparators = []*regexp.Regexp{regexp.MustCompile(`\s+·\s+`)} cfg.artistSeparators = []*regexp.Regexp{regexp.MustCompile(`\s+·\s+`)}
} }
if strings.ToLower(getenv(LOGIN_GATE_ENV)) == "true" {
cfg.loginGate = true
}
switch strings.ToLower(getenv(LOG_LEVEL_ENV)) { switch strings.ToLower(getenv(LOG_LEVEL_ENV)) {
case "debug": case "debug":
cfg.logLevel = 0 cfg.logLevel = 0
@ -409,3 +415,9 @@ func ArtistSeparators() []*regexp.Regexp {
defer lock.RUnlock() defer lock.RUnlock()
return globalConfig.artistSeparators return globalConfig.artistSeparators
} }
func LoginGate() bool {
lock.RLock()
defer lock.RUnlock()
return globalConfig.loginGate
}

Write Preview
Loading…
Cancel
Save