diff --git a/.deploy/artwork-evolution-release/app/Http/Controllers/News/NewsController.php b/.deploy/artwork-evolution-release/app/Http/Controllers/News/NewsController.php index fd592a99..7f24833b 100644 --- a/.deploy/artwork-evolution-release/app/Http/Controllers/News/NewsController.php +++ b/.deploy/artwork-evolution-release/app/Http/Controllers/News/NewsController.php @@ -172,7 +172,9 @@ class NewsController extends Controller $userId = Auth::id(); $session = 'news_view_' . $article->id; - if ($request->session()->has($session)) { + $canReadSession = $request->hasSession() && ! $request->attributes->get('skinbase.session_skipped'); + + if ($canReadSession && $request->session()->has($session)) { return; } @@ -185,7 +187,9 @@ class NewsController extends Controller $article->incrementViews(); - $request->session()->put($session, true); + if ($canReadSession) { + $request->session()->put($session, true); + } } private function sidebarData(): array diff --git a/.deploy/artwork-evolution-release/app/Services/Sitemaps/SitemapCacheService.php b/.deploy/artwork-evolution-release/app/Services/Sitemaps/SitemapCacheService.php index fb5874ca..0cbaa417 100644 --- a/.deploy/artwork-evolution-release/app/Services/Sitemaps/SitemapCacheService.php +++ b/.deploy/artwork-evolution-release/app/Services/Sitemaps/SitemapCacheService.php @@ -92,7 +92,7 @@ final class SitemapCacheService { $prefix = trim((string) config('sitemaps.pre_generated.path', 'generated-sitemaps'), '/'); $segments = $name === self::INDEX_DOCUMENT - ? [$prefix, 'sitemap.xml'] + ? [$prefix, 'sitemaps', 'sitemap.xml'] : [$prefix, 'sitemaps', $name . '.xml']; return implode('/', array_values(array_filter($segments, static fn (string $segment): bool => $segment !== ''))); diff --git a/.deploy/artwork-evolution-release/app/Services/Sitemaps/SitemapReleaseManager.php b/.deploy/artwork-evolution-release/app/Services/Sitemaps/SitemapReleaseManager.php index 991bb0e1..3ab03e49 100644 --- a/.deploy/artwork-evolution-release/app/Services/Sitemaps/SitemapReleaseManager.php +++ b/.deploy/artwork-evolution-release/app/Services/Sitemaps/SitemapReleaseManager.php @@ -124,7 +124,7 @@ final class SitemapReleaseManager public function documentRelativePath(string $documentName): string { return $documentName === SitemapCacheService::INDEX_DOCUMENT - ? 'sitemap.xml' + ? 'sitemaps/sitemap.xml' : 'sitemaps/' . $documentName . '.xml'; } diff --git a/.deploy/artwork-evolution-release/resources/js/Pages/Moderation/ArtworkMaturityQueue.jsx b/.deploy/artwork-evolution-release/resources/js/Pages/Moderation/ArtworkMaturityQueue.jsx index b4c73c92..7aacb790 100644 --- a/.deploy/artwork-evolution-release/resources/js/Pages/Moderation/ArtworkMaturityQueue.jsx +++ b/.deploy/artwork-evolution-release/resources/js/Pages/Moderation/ArtworkMaturityQueue.jsx @@ -107,7 +107,7 @@ export default function ArtworkMaturityQueue() { ], [stats]) return ( -