diff --git a/src/main/kotlin/fr/shikkanime/entities/enums/ConfigPropertyKey.kt b/src/main/kotlin/fr/shikkanime/entities/enums/ConfigPropertyKey.kt index fef2e098..1a690c6e 100644 --- a/src/main/kotlin/fr/shikkanime/entities/enums/ConfigPropertyKey.kt +++ b/src/main/kotlin/fr/shikkanime/entities/enums/ConfigPropertyKey.kt @@ -11,4 +11,5 @@ enum class ConfigPropertyKey(val key: String) { SEO_DESCRIPTION("seo_description"), SOCIAL_NETWORK_EPISODES_SIZE_LIMIT("social_network_episodes_size_limit"), FETCH_OLD_EPISODE_DESCRIPTION_SIZE("fetch_old_episode_description_size"), + GOOGLE_SITE_VERIFICATION_ID("google_site_verification_id"), } \ No newline at end of file diff --git a/src/main/kotlin/fr/shikkanime/plugins/Routing.kt b/src/main/kotlin/fr/shikkanime/plugins/Routing.kt index 17fe0d55..315bda9c 100644 --- a/src/main/kotlin/fr/shikkanime/plugins/Routing.kt +++ b/src/main/kotlin/fr/shikkanime/plugins/Routing.kt @@ -261,6 +261,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) ?: "" + configCacheService.getValueAsString(ConfigPropertyKey.GOOGLE_SITE_VERIFICATION_ID)?.let { modelMap["googleSiteVerification"] = it } call.respond(FreeMarkerContent(map["template"] as String, modelMap, "", response.contentType)) } diff --git a/src/main/resources/db/changelog/2024/02/06-changelog.xml b/src/main/resources/db/changelog/2024/02/06-changelog.xml new file mode 100644 index 00000000..624de86f --- /dev/null +++ b/src/main/resources/db/changelog/2024/02/06-changelog.xml @@ -0,0 +1,24 @@ + + + + + + + + SELECT COUNT(*) + FROM config + WHERE property_key = 'google_site_verification_id' + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/db.changelog-master.xml b/src/main/resources/db/changelog/db.changelog-master.xml index 2b7b848e..0a0f8f26 100644 --- a/src/main/resources/db/changelog/db.changelog-master.xml +++ b/src/main/resources/db/changelog/db.changelog-master.xml @@ -23,4 +23,5 @@ + \ No newline at end of file diff --git a/src/main/resources/templates/_freemarker_implicit.ftl b/src/main/resources/templates/_freemarker_implicit.ftl index 2d754afb..43459cdc 100644 --- a/src/main/resources/templates/_freemarker_implicit.ftl +++ b/src/main/resources/templates/_freemarker_implicit.ftl @@ -19,4 +19,5 @@ [#-- @ftlvariable name="originalSize" type="java.lang.String" --] [#-- @ftlvariable name="compressedSize" type="java.lang.String" --] [#-- @ftlvariable name="simulcasts" type="kotlin.collections.AbstractList" --] -[#-- @ftlvariable name="currentSimulcast" type="fr.shikkanime.dtos.SimulcastDto" --] \ No newline at end of file +[#-- @ftlvariable name="currentSimulcast" type="fr.shikkanime.dtos.SimulcastDto" --] +[#-- @ftlvariable name="googleSiteVerification" type="java.lang.String" --] \ No newline at end of file diff --git a/src/main/resources/templates/site/_layout.ftl b/src/main/resources/templates/site/_layout.ftl index aa55fc5c..129638e9 100644 --- a/src/main/resources/templates/site/_layout.ftl +++ b/src/main/resources/templates/site/_layout.ftl @@ -11,10 +11,14 @@ Shikkanime - <#if description??> + <#if description?? && description?length != 0> + <#if googleSiteVerification?? && googleSiteVerification?length != 0> + + + <#-- Favicons -->