From b359e3263046a8313099e2464f447d7a33f4682a Mon Sep 17 00:00:00 2001
From: Ziedelth <watteaupierre@gmail.com>
Date: Fri, 29 Mar 2024 14:08:50 +0100
Subject: [PATCH 1/2] Fix some AHREFS alerts

---
 src/main/resources/templates/site/anime.ftl   |  2 +-
 .../resources/templates/site/calendar.ftl     |  4 ++-
 src/main/resources/templates/site/catalog.ftl | 26 ++++++++++++-------
 src/main/resources/templates/site/home.ftl    |  4 ++-
 src/main/resources/templates/site/search.ftl  |  4 ++-
 .../resources/templates/site/seo/sitemap.ftl  |  8 ++++++
 6 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/site/anime.ftl b/src/main/resources/templates/site/anime.ftl
index 7fc7d780..8640b318 100644
--- a/src/main/resources/templates/site/anime.ftl
+++ b/src/main/resources/templates/site/anime.ftl
@@ -11,7 +11,7 @@
             </div>
 
             <div class="col-md-8 col-12 text-start mt-md-0 mt-5 d-flex flex-column justify-content-center">
-                <h6 class="h6">${anime.shortName?upper_case}</h6>
+                <h1 class="h6">${anime.shortName?upper_case}</h1>
                 <p class="text-muted">${anime.name}</p>
 
                 <#if (anime.simulcasts?size > 1)>
diff --git a/src/main/resources/templates/site/calendar.ftl b/src/main/resources/templates/site/calendar.ftl
index 352eb84e..2f1c0256 100644
--- a/src/main/resources/templates/site/calendar.ftl
+++ b/src/main/resources/templates/site/calendar.ftl
@@ -1,6 +1,8 @@
 <#import "_navigation.ftl" as navigation />
 
-<@navigation.display>
+<#assign canonicalUrl = "<link rel=\"canonical\" href=\"https://www.shikkanime.fr/calendar\"/>" />
+
+<@navigation.display header="${canonicalUrl}">
     <div class="table-responsive">
         <table class="table table-dark table-borderless my-5">
             <thead>
diff --git a/src/main/resources/templates/site/catalog.ftl b/src/main/resources/templates/site/catalog.ftl
index 8362a3e3..e6c3d695 100644
--- a/src/main/resources/templates/site/catalog.ftl
+++ b/src/main/resources/templates/site/catalog.ftl
@@ -2,18 +2,26 @@
 <#import "components/episode.ftl" as episodeComponent />
 <#import "components/anime.ftl" as animeComponent />
 
-<@navigation.display>
+<#assign canonicalUrl = "<link rel=\"canonical\" href=\"https://www.shikkanime.fr/catalog/${selectedSimulcast.slug}\"/>" />
+
+<@navigation.display header="${canonicalUrl}">
     <div class="mt-3">
         <#if selectedSimulcast??>
-            <button class="btn btn-dark dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                ${selectedSimulcast.label}
-            </button>
+            <div class="d-flex align-items-center">
+                <h1 class="h3 me-3 mb-0">Simulcast par saison</h1>
 
-            <ul class="dropdown-menu dropdown-menu-dark" style="max-height: 300px; overflow-y: auto;">
-                <#list simulcasts as simulcast>
-                    <li><a class="dropdown-item" href="/catalog/${simulcast.slug}">${simulcast.label}</a></li>
-                </#list>
-            </ul>
+                <div>
+                    <button class="btn btn-dark dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                        ${selectedSimulcast.label}
+                    </button>
+
+                    <ul class="dropdown-menu dropdown-menu-dark" style="max-height: 300px; overflow-y: auto;">
+                        <#list simulcasts as simulcast>
+                            <li><a class="dropdown-item" href="/catalog/${simulcast.slug}">${simulcast.label}</a></li>
+                        </#list>
+                    </ul>
+                </div>
+            </div>
 
             <div class="row mt-3 justify-content-center">
                 <#list animes as anime>
diff --git a/src/main/resources/templates/site/home.ftl b/src/main/resources/templates/site/home.ftl
index ea29b935..c24bbeaa 100644
--- a/src/main/resources/templates/site/home.ftl
+++ b/src/main/resources/templates/site/home.ftl
@@ -2,7 +2,9 @@
 <#import "components/episode.ftl" as episodeComponent />
 <#import "components/anime.ftl" as animeComponent />
 
-<@navigation.display>
+<#assign canonicalUrl = "<link rel=\"canonical\" href=\"https://www.shikkanime.fr\"/>" />
+
+<@navigation.display header="${canonicalUrl}">
     <h1 class="h3 my-3">Nouveaux épisodes</h1>
 
     <#if episodes?? && episodes?size != 0>
diff --git a/src/main/resources/templates/site/search.ftl b/src/main/resources/templates/site/search.ftl
index db385bf3..5f63b4d4 100644
--- a/src/main/resources/templates/site/search.ftl
+++ b/src/main/resources/templates/site/search.ftl
@@ -1,6 +1,8 @@
 <#import "_navigation.ftl" as navigation />
 
-<@navigation.display>
+<#assign canonicalUrl = "<link rel=\"canonical\" href=\"https://www.shikkanime.fr/search\"/>" />
+
+<@navigation.display header="${canonicalUrl}">
     <div class="container my-3">
         <input type="text" id="search" class="form-control-lg w-100 bg-dark text-white"
                placeholder="Rechercher" value="<#if query??>${query}</#if>" autofocus>
diff --git a/src/main/resources/templates/site/seo/sitemap.ftl b/src/main/resources/templates/site/seo/sitemap.ftl
index fa65c1b1..af5fca64 100644
--- a/src/main/resources/templates/site/seo/sitemap.ftl
+++ b/src/main/resources/templates/site/seo/sitemap.ftl
@@ -6,7 +6,15 @@
             <loc>${baseUrl}/</loc>
             <lastmod>${episode.releaseDateTime?replace("Z", "+00:00")}</lastmod>
         </url>
+        <url>
+            <loc>${baseUrl}/calendar</loc>
+            <lastmod>${episode.releaseDateTime?replace("Z", "+00:00")}</lastmod>
+        </url>
     </#if>
+    <url>
+        <loc>${baseUrl}/search</loc>
+        <lastmod>2024-03-20T17:00:00+00:00</lastmod>
+    </url>
     <#list simulcasts as simulcast>
         <url>
             <loc>${baseUrl}/catalog/${simulcast.slug}</loc>

From c12f5843dd912109f8dfdeb55b1037bd18957be9 Mon Sep 17 00:00:00 2001
From: Ziedelth <watteaupierre@gmail.com>
Date: Fri, 29 Mar 2024 15:34:03 +0100
Subject: [PATCH 2/2] Remove APNS config

---
 .../kotlin/fr/shikkanime/utils/FirebaseNotification.kt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/fr/shikkanime/utils/FirebaseNotification.kt b/src/main/kotlin/fr/shikkanime/utils/FirebaseNotification.kt
index 048cdc3a..f50425f5 100644
--- a/src/main/kotlin/fr/shikkanime/utils/FirebaseNotification.kt
+++ b/src/main/kotlin/fr/shikkanime/utils/FirebaseNotification.kt
@@ -3,7 +3,10 @@ package fr.shikkanime.utils
 import com.google.auth.oauth2.GoogleCredentials
 import com.google.firebase.FirebaseApp
 import com.google.firebase.FirebaseOptions
-import com.google.firebase.messaging.*
+import com.google.firebase.messaging.AndroidConfig
+import com.google.firebase.messaging.FirebaseMessaging
+import com.google.firebase.messaging.Message
+import com.google.firebase.messaging.Notification
 import fr.shikkanime.dtos.EpisodeDto
 import java.io.File
 import java.io.FileInputStream
@@ -43,11 +46,6 @@ object FirebaseNotification {
                             .setPriority(AndroidConfig.Priority.HIGH)
                             .build()
                     )
-                    .setApnsConfig(
-                        ApnsConfig.builder()
-                            .putHeader("apns-priority", "5")
-                            .build()
-                    )
                     .setTopic("global")
                     .build()
             )