Merge pull request #149 from Shikkanime/dev

Fix bugs
Shikkanime · Feb 7, 2024 · aba3794 · aba3794
2 parents 2905a66 + fc4a9d0
commit aba3794
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt b/src/main/kotlin/fr/shikkanime/controllers/site/SiteController.kt
@@ -2,7 +2,6 @@ package fr.shikkanime.controllers.site
 
 import com.google.inject.Inject
 import fr.shikkanime.entities.SortParameter
-import fr.shikkanime.entities.enums.ConfigPropertyKey
 import fr.shikkanime.entities.enums.CountryCode
 import fr.shikkanime.entities.enums.Link
 import fr.shikkanime.services.caches.AnimeCacheService
@@ -37,7 +36,6 @@ class SiteController {
         return Response.template(
             Link.HOME,
             mutableMapOf(
-                "description" to configCacheService.getValueAsString(ConfigPropertyKey.SEO_DESCRIPTION),
                 "animes" to animeCacheService.findAllBy(
                     CountryCode.FR,
                     null,
@@ -99,7 +97,6 @@ class SiteController {
         return Response.template(
             Link.CATALOG,
             mutableMapOf(
-                "description" to configCacheService.getValueAsString(ConfigPropertyKey.SEO_DESCRIPTION),
                 "simulcasts" to findAll,
                 "currentSimulcast" to currentSimulcast,
                 "animes" to animeCacheService.findAllBy(
@@ -118,7 +115,7 @@ class SiteController {
     private fun error404(): Response {
         return Response.template(
             "/site/404.ftl",
-            "Page introuvable",
+            "Page introuvable"
         )
     }
 
@@ -131,7 +128,6 @@ class SiteController {
             "/site/anime.ftl",
             anime.shortName,
             mutableMapOf(
-                "description" to configCacheService.getValueAsString(ConfigPropertyKey.SEO_DESCRIPTION),
                 "anime" to anime,
                 "episodes" to episodeCacheService.findAllBy(
                     CountryCode.FR,

diff --git a/src/main/kotlin/fr/shikkanime/plugins/Routing.kt b/src/main/kotlin/fr/shikkanime/plugins/Routing.kt
@@ -2,8 +2,10 @@ package fr.shikkanime.plugins
 
 import fr.shikkanime.dtos.TokenDto
 import fr.shikkanime.entities.LinkObject
+import fr.shikkanime.entities.enums.ConfigPropertyKey
 import fr.shikkanime.entities.enums.CountryCode
 import fr.shikkanime.entities.enums.Platform
+import fr.shikkanime.services.caches.ConfigCacheService
 import fr.shikkanime.utils.Constant
 import fr.shikkanime.utils.LoggerFactory
 import fr.shikkanime.utils.routes.*
@@ -216,6 +218,11 @@ private suspend fun handleRequest(
     try {
         val response = callMethodWithParameters(method, controller, call, parameters)
 
+        if (method.hasAnnotation<Cached>()) {
+            val cached = method.findAnnotation<Cached>()!!.maxAgeSeconds
+            call.caching = CachingOptions(CacheControl.MaxAge(maxAgeSeconds = cached))
+        }
+
         response.session?.let { call.sessions.set(it) }
 
         when (response.type) {
@@ -236,6 +243,7 @@ private suspend fun handleMultipartResponse(call: ApplicationCall, response: Res
 }
 
 private suspend fun handleTemplateResponse(call: ApplicationCall, controller: Any, replacedPath: String, response: Response) {
+    val configCacheService = Constant.injector.getInstance(ConfigCacheService::class.java)
     val map = response.data as Map<String, Any>
     val modelMap = (map["model"] as Map<String, Any>).toMutableMap()
 
@@ -251,6 +259,7 @@ private suspend fun handleTemplateResponse(call: ApplicationCall, controller: An
 
     val title = map["title"] as String?
     modelMap["title"] = if (title?.contains(Constant.NAME) == true) title else (if (!title.isNullOrBlank()) "$title - " else "") + Constant.NAME
+    modelMap["description"] = configCacheService.getValueAsString(ConfigPropertyKey.SEO_DESCRIPTION) ?: ""
 
     call.respond(FreeMarkerContent(map["template"] as String, modelMap, "", response.contentType))
 }

diff --git a/src/main/resources/templates/site/anime.ftl b/src/main/resources/templates/site/anime.ftl
@@ -5,7 +5,7 @@
     <div class="container">
         <div class="row g-3 mt-3">
             <div class="col-md-4 col-12 mt-0 text-center">
-                <img src="https://api.shikkanime.fr/v1/attachments?uuid=${anime.uuid}&type=image"
+                <img loading="lazy" src="https://api.shikkanime.fr/v1/attachments?uuid=${anime.uuid}&type=image"
                      alt="${anime.shortName?replace("\"", "'")} anime image" class="w-50">
             </div>
 

diff --git a/src/main/resources/templates/site/components/anime.ftl b/src/main/resources/templates/site/components/anime.ftl
@@ -3,7 +3,7 @@
         <article>
             <a href="/animes/${anime.uuid}" class="text-decoration-none text-white">
                 <div class="hover-card position-relative">
-                    <img src="https://api.shikkanime.fr/v1/attachments?uuid=${anime.uuid}&type=image"
+                    <img loading="lazy" src="https://api.shikkanime.fr/v1/attachments?uuid=${anime.uuid}&type=image"
                          alt="${anime.shortName?replace("\"", "'")} anime image" class="w-100">
                     <span class="h6 mt-2 text-truncate-2">${anime.shortName}</span>
 

diff --git a/src/main/resources/templates/site/components/episode.ftl b/src/main/resources/templates/site/components/episode.ftl
@@ -4,7 +4,7 @@
             <a href="${episode.url}" target="_blank" class="text-decoration-none text-white">
                 <div class="hover-card position-relative">
                     <div class="position-relative">
-                        <img src="https://api.shikkanime.fr/v1/attachments?uuid=${episode.uuid}&type=image"
+                        <img loading="lazy" src="https://api.shikkanime.fr/v1/attachments?uuid=${episode.uuid}&type=image"
                              alt="${episode.anime.shortName?replace("\"", "'")} episode preview image"
                              class="w-100<#if episode.uncensored> blur</#if>">
                         <img src="https://www.shikkanime.fr/assets/img/platforms/${episode.platform.image}"