From 41e74ec9cd6076109c91128047d8b866c36a3005 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 27 Jun 2022 10:36:16 +0200
Subject: Fix broken feeds with published live

---
 shared/server-commands/feeds/feeds-command.ts | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'shared/server-commands/feeds/feeds-command.ts')

diff --git a/shared/server-commands/feeds/feeds-command.ts b/shared/server-commands/feeds/feeds-command.ts
index 3c95f9536..939b18dee 100644
--- a/shared/server-commands/feeds/feeds-command.ts
+++ b/shared/server-commands/feeds/feeds-command.ts
@@ -1,4 +1,4 @@
-
+import { buildUUID } from '@shared/extra-utils'
 import { HttpStatusCode } from '@shared/models'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
 
@@ -8,16 +8,22 @@ export class FeedCommand extends AbstractCommand {
 
   getXML (options: OverrideCommandOptions & {
     feed: FeedType
+    ignoreCache: boolean
     format?: string
   }) {
-    const { feed, format } = options
+    const { feed, format, ignoreCache } = options
     const path = '/feeds/' + feed + '.xml'
 
+    const query: { [id: string]: string } = {}
+
+    if (ignoreCache) query.v = buildUUID()
+    if (format) query.format = format
+
     return this.getRequestText({
       ...options,
 
       path,
-      query: format ? { format } : undefined,
+      query,
       accept: 'application/xml',
       implicitToken: false,
       defaultExpectedStatus: HttpStatusCode.OK_200
@@ -26,16 +32,21 @@ export class FeedCommand extends AbstractCommand {
 
   getJSON (options: OverrideCommandOptions & {
     feed: FeedType
+    ignoreCache: boolean
     query?: { [ id: string ]: any }
   }) {
-    const { feed, query } = options
+    const { feed, query = {}, ignoreCache } = options
     const path = '/feeds/' + feed + '.json'
 
+    const cacheQuery = ignoreCache
+      ? { v: buildUUID() }
+      : {}
+
     return this.getRequestText({
       ...options,
 
       path,
-      query,
+      query: { ...query, ...cacheQuery },
       accept: 'application/json',
       implicitToken: false,
       defaultExpectedStatus: HttpStatusCode.OK_200
-- 
cgit v1.2.3