[pull] main from AzuraCast:main

Dockerfile

@@ -12,7 +12,7 @@ RUN go install github.com/jwilder/dockerize@v0.9.2
 
 RUN go install github.com/aptible/supercronic@v0.2.33
 
-RUN go install github.com/centrifugal/centrifugo/v6@v6.0.0
+RUN go install github.com/centrifugal/centrifugo/v5@v5.4.9
 
 RUN strip /go/bin/*
 

backend/src/Controller/Frontend/PublicPages/PodcastsAction.php

@@ -58,7 +58,9 @@ public function __invoke(
                 'hide_footer' => $isEmbedded,
             ],
             props: [
+                'stationId' => $station->getIdRequired(),
                 'stationName' => $station->getName(),
+                'stationTz' => $station->getTimezone(),
                 'baseUrl' => $router->fromHere('public:index'),
                 'groupLayout' => $groupLayout,
             ],

frontend/components/Public/Podcasts/Podcast.vue

@@ -182,22 +182,27 @@ import PlayButton from "~/components/Common/PlayButton.vue";
 import useStationDateTimeFormatter from "~/functions/useStationDateTimeFormatter.ts";
 import PodcastCommon from "./PodcastCommon.vue";
 import GridLayout from "~/components/Common/GridLayout.vue";
-import {usePodcastGroupLayout} from "~/components/Public/Podcasts/usePodcastGroupLayout.ts";
 import {ApiPodcast, ApiPodcastEpisode} from "~/entities/ApiInterfaces.ts";
+import {usePodcastGlobals} from "~/components/Public/Podcasts/usePodcastGlobals.ts";
+import {computed} from "vue";
 
-const {groupLayout} = usePodcastGroupLayout();
+const {groupLayout, stationId, stationTz} = usePodcastGlobals();
 
-const {params} = useRoute();
-
-const podcastUrl = getStationApiUrl(`/public/podcast/${params.podcast_id}`);
+const podcastUrl = getStationApiUrl(computed(() => {
+    const {params} = useRoute();
+    return `/public/podcast/${params.podcast_id}`;
+}), stationId);
 
 const {axios} = useAxios();
 const {state: podcast, isLoading} = useRefreshableAsyncState<ApiPodcast>(
     () => axios.get(podcastUrl.value).then((r) => r.data),
     {},
 );
 
-const episodesUrl = getStationApiUrl(`/public/podcast/${params.podcast_id}/episodes`);
+const episodesUrl = getStationApiUrl(computed(() => {
+    const {params} = useRoute();
+    return `/public/podcast/${params.podcast_id}/episodes`;
+}), stationId);
 
 const {$gettext} = useTranslate();
 const fields: DataTableField<ApiPodcastEpisode>[] = [
@@ -207,5 +212,5 @@ const fields: DataTableField<ApiPodcastEpisode>[] = [
     {key: 'actions', label: $gettext('Actions'), sortable: false, class: 'shrink'}
 ];
 
-const {formatTimestampAsDateTime} = useStationDateTimeFormatter();
+const {formatTimestampAsDateTime} = useStationDateTimeFormatter(stationTz);
 </script>

frontend/components/Public/Podcasts/PodcastEpisode.vue

@@ -101,11 +101,20 @@ import AlbumArt from "~/components/Common/AlbumArt.vue";
 import PlayButton from "~/components/Common/PlayButton.vue";
 import useStationDateTimeFormatter from "~/functions/useStationDateTimeFormatter.ts";
 import PodcastCommon from "./PodcastCommon.vue";
+import {usePodcastGlobals} from "~/components/Public/Podcasts/usePodcastGlobals.ts";
+import {computed} from "vue";
 
-const {params} = useRoute();
+const {stationId, stationTz} = usePodcastGlobals();
 
-const podcastUrl = getStationApiUrl(`/public/podcast/${params.podcast_id}`);
-const episodeUrl = getStationApiUrl(`/public/podcast/${params.podcast_id}/episode/${params.episode_id}`);
+const podcastUrl = getStationApiUrl(computed(() => {
+    const {params} = useRoute();
+    return `/public/podcast/${params.podcast_id}`;
+}), stationId);
+
+const episodeUrl = getStationApiUrl(computed(() => {
+    const {params} = useRoute();
+    return `/public/podcast/${params.podcast_id}/episode/${params.episode_id}`;
+}), stationId);
 
 const {axios} = useAxios();
 
@@ -119,5 +128,5 @@ const {state: episode, isLoading: episodeLoading} = useRefreshableAsyncState(
     {},
 );
 
-const {formatTimestampAsDateTime} = useStationDateTimeFormatter();
+const {formatTimestampAsDateTime} = useStationDateTimeFormatter(stationTz);
 </script>

frontend/components/Public/Podcasts/PodcastList.vue

@@ -124,13 +124,13 @@ import {getStationApiUrl} from "~/router.ts";
 import {useTranslate} from "~/vendor/gettext.ts";
 import {IconRss} from "~/components/Common/icons.ts";
 import Icon from "~/components/Common/Icon.vue";
-import {usePodcastGroupLayout} from "~/components/Public/Podcasts/usePodcastGroupLayout.ts";
 import GridLayout from "~/components/Common/GridLayout.vue";
 import {ApiPodcast} from "~/entities/ApiInterfaces.ts";
+import {usePodcastGlobals} from "~/components/Public/Podcasts/usePodcastGlobals.ts";
 
-const {groupLayout} = usePodcastGroupLayout();
+const {groupLayout, stationId} = usePodcastGlobals();
 
-const apiUrl = getStationApiUrl('/public/podcasts');
+const apiUrl = getStationApiUrl('/public/podcasts', stationId);
 
 const {$gettext} = useTranslate();
 

frontend/components/Public/Podcasts/PodcastsLayout.vue

@@ -26,18 +26,14 @@
 import FullHeightCard from "~/components/Public/FullHeightCard.vue";
 import InlinePlayer from "~/components/InlinePlayer.vue";
 import MinimalLayout from "~/components/MinimalLayout.vue";
-import {useProvidePodcastGroupLayout} from "~/components/Public/Podcasts/usePodcastGroupLayout.ts";
+import {PodcastLayoutProps, useProvidePodcastGlobals} from "~/components/Public/Podcasts/usePodcastGlobals.ts";
 
 const props = withDefaults(
-    defineProps<{
-        stationName: string | null,
-        baseUrl: string,
-        groupLayout?: string,
-    }>(),
+    defineProps<PodcastLayoutProps>(),
     {
         groupLayout: 'table'
     }
 );
 
-useProvidePodcastGroupLayout(props.groupLayout);
+useProvidePodcastGlobals(props);
 </script>

frontend/components/Public/Podcasts/usePodcastGlobals.ts

@@ -0,0 +1,15 @@
+import {createInjectionState} from "@vueuse/shared";
+
+export interface PodcastLayoutProps {
+    stationId: string | number,
+    stationName: string | null,
+    stationTz: string,
+    baseUrl: string,
+    groupLayout?: string,
+}
+
+const [useProvidePodcastGlobals, usePodcastGlobals] = createInjectionState(
+    (props: PodcastLayoutProps) => props,
+);
+
+export {useProvidePodcastGlobals, usePodcastGlobals};

frontend/functions/useStationDateTimeFormatter.ts

@@ -2,10 +2,20 @@ import {useLuxon} from "~/vendor/luxon.ts";
 import {useAzuraCast, useAzuraCastStation} from "~/vendor/azuracast.ts";
 import {DateTimeMaybeValid} from "luxon";
 
-export default function useStationDateTimeFormatter() {
+export default function useStationDateTimeFormatter(
+    timezone?: string
+) {
     const {DateTime} = useLuxon();
     const {timeConfig} = useAzuraCast();
-    const {timezone} = useAzuraCastStation();
+
+    if (!timezone) {
+        const station = useAzuraCastStation();
+        if (station) {
+            timezone = station.timezone;
+        } else {
+            throw new Error("Cannot get timezone!");
+        }
+    }
 
     const now = (): DateTimeMaybeValid =>
         DateTime.local({zone: timezone});

frontend/router.ts

@@ -1,17 +1,30 @@
+import {computed, ComputedRef, MaybeRefOrGetter, toValue} from "vue";
 import {useAzuraCastStation} from "~/vendor/azuracast.ts";
-import {computed, ComputedRef} from "vue";
 
 export function getApiUrl(suffix: string): ComputedRef<string> {
     return computed((): string => {
         return `/api${suffix}`;
     });
 }
 
-export function getStationApiUrl(suffix: string): ComputedRef<string> {
-    const {id} = useAzuraCastStation();
+export function getStationApiUrl(
+    suffix: MaybeRefOrGetter<string>,
+    id?: MaybeRefOrGetter<string | number>
+): ComputedRef<string> {
+    if (!id) {
+        const station = useAzuraCastStation();
+        if (station) {
+            id = station.id;
+        } else {
+            throw new Error("Can't find station ID!");
+        }
+    }
 
     return computed((): string => {
-        const stationSuffix = `/station/${id}${suffix}`;
+        const idValue = toValue(id);
+        const suffixValue = toValue(suffix);
+
+        const stationSuffix = `/station/${idValue}${suffixValue}`;
         return getApiUrl(stationSuffix).value;
     });
 }

util/docker/stations/setup/liquidsoap.sh

@@ -18,7 +18,9 @@ if [[ "$(uname -m)" = "aarch64" ]]; then
     ARCHITECTURE=arm64
 fi
 
-wget -O /tmp/liquidsoap.deb "https://github.com/savonet/liquidsoap-release-assets/releases/download/rolling-release-v2.3.x/liquidsoap-c0cd13a_2.3.1-debian-bookworm-1_${ARCHITECTURE}.deb"
+# Temporarily use 2.3.0 until upstream RRs are fixed
+# wget -O /tmp/liquidsoap.deb "https://github.com/savonet/liquidsoap-release-assets/releases/download/rolling-release-v2.3.x/liquidsoap-c0cd13a_2.3.1-debian-bookworm-1_${ARCHITECTURE}.deb"
+wget -O /tmp/liquidsoap.deb "https://github.com/savonet/liquidsoap/releases/download/v2.3.0/liquidsoap_2.3.0-debian-bookworm-1_${ARCHITECTURE}.deb"
 
 dpkg -i /tmp/liquidsoap.deb
 apt-get install -y -f --no-install-recommends