release: 2.1.4 (#383)

Author: devxb

.github/workflows/deploy.yml

@@ -75,6 +75,7 @@ jobs:
             "SLACK_TOKEN=${{ secrets.SLACK_TOKEN }}"
             "RELAY_APPROVE_TOKEN=${{ secrets.RELAY_APPROVE_TOKEN }}"
             "INTERNAL_AUTH_SECRET=${{ secrets.INTERNAL_AUTH_SECRET }}"
+            "INTERNAL_IMAGE_SECRET=${{ secrets.INTERNAL_IMAGE_SECRET }}"
 
       - name: build and push filebeat
         uses: docker/build-push-action@v4

deploy/api/Dockerfile

@@ -10,6 +10,7 @@ ARG INTERNAL_SECRET
 ARG SLACK_TOKEN
 ARG RELAY_APPROVE_TOKEN
 ARG INTERNAL_AUTH_SECRET
+ARG INTERNAL_IMAGE_SECRET
 
 ARG JAR_FILE=./*.jar
 COPY ${JAR_FILE} gitanimals-render.jar
@@ -23,7 +24,8 @@ ENV db_url=${DB_URL} \
   internal_secret=${INTERNAL_SECRET} \
   slack_token=${SLACK_TOKEN} \
   relay_approve_token=${RELAY_APPROVE_TOKEN} \
-  internal_auth_secret=${INTERNAL_AUTH_SECRET}
+  internal_auth_secret=${INTERNAL_AUTH_SECRET} \
+  internal_image_secret=${INTERNAL_IMAGE_SECRET}
 
 ENTRYPOINT java -jar gitanimals-render.jar \
   --spring.datasource.url=${db_url} \
@@ -35,4 +37,5 @@ ENTRYPOINT java -jar gitanimals-render.jar \
   --internal.secret=${internal_secret} \
   --slack.token=${slack_token} \
   --relay.approve.token=${relay_approve_token} \
-  --internal.auth.secret=${internal_auth_secret}
+  --internal.auth.secret=${internal_auth_secret} \
+  --internal.image.secret=${internal_image_secret}

src/main/kotlin/org/gitanimals/core/Mode.kt

@@ -5,5 +5,6 @@ enum class Mode {
     LINE,
     LINE_NO_CONTRIBUTION,
     NAME_WITH_LEVEL,
+    NONE,
     ;
 }

src/main/kotlin/org/gitanimals/core/PersonaType.kt

@@ -2156,13 +2156,13 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
         mode: Mode
     ): String =
         loadSvg(name, animationId, level, mode)
-            .drawContribution(mode, contributionCount)
+            .drawDisplayOptions(mode, contributionCount)
 
     protected abstract fun loadSvg(name: String, animationId: Long, level: Long, mode: Mode): String
 
     protected abstract fun act(id: Long, flippedWidth: Double = 0.0): String
 
-    protected fun String.drawContribution(
+    protected fun String.drawDisplayOptions(
         mode: Mode,
         contributionCount: Long,
     ): String {
@@ -2179,27 +2179,39 @@ enum class PersonaType(val weight: Double, private var dropRate: String? = null)
                         contributionCount.toSvg(0.0, 2.0)
                     ).replace("*{contribution-display}", "default")
                     .replace("*{level-tag-display}", "default")
+                    .replace("*{level-display}", "default")
             }
 
             Mode.LINE_NO_CONTRIBUTION -> {
                 this.replace("*{username-tag-display}", "none")
                     .replace("*{username-display}", "none")
                     .replace("*{contribution-display}", "none")
                     .replace("*{level-tag-display}", "default")
+                    .replace("*{level-display}", "default")
             }
 
             Mode.NAME_WITH_LEVEL -> {
                 this.replace("*{username-tag-display}", "none")
                     .replace("*{username-display}", "default")
                     .replace("*{level-tag-display}", "none")
                     .replace("*{contribution-display}", "none")
+                    .replace("*{level-display}", "default")
+            }
+
+            Mode.NONE -> {
+                this.replace("*{username-tag-display}", "none")
+                    .replace("*{username-display}", "none")
+                    .replace("*{contribution-display}", "none")
+                    .replace("*{level-tag-display}", "none")
+                    .replace("*{level-display}", "none")
             }
 
             else -> {
                 this.replace("*{username-tag-display}", "none")
                     .replace("*{username-display}", "none")
                     .replace("*{contribution-display}", "none")
                     .replace("*{level-tag-display}", "none")
+                    .replace("*{level-display}", "default")
             }
         }
     }

src/main/kotlin/org/gitanimals/core/extension/HttpResponseExtension.kt

@@ -0,0 +1,16 @@
+package org.gitanimals.core.extension
+
+import jakarta.servlet.http.HttpServletResponse
+import org.springframework.http.HttpHeaders
+
+object HttpResponseExtension {
+
+    fun HttpServletResponse.cacheControl(maxAgeSeconds: Int): HttpServletResponse {
+        this.setHeader(
+            HttpHeaders.CACHE_CONTROL,
+            "no-cache, no-store, must-revalidate, max-age=$maxAgeSeconds"
+        )
+        this.setHeader(HttpHeaders.PRAGMA, "no-cache")
+        return this
+    }
+}

src/main/kotlin/org/gitanimals/render/controller/AnimationController.kt

@@ -2,10 +2,10 @@ package org.gitanimals.render.controller
 
 import jakarta.servlet.http.HttpServletResponse
 import org.gitanimals.core.Mode
+import org.gitanimals.core.extension.HttpResponseExtension.cacheControl
 import org.gitanimals.core.extension.StringExtension.deleteBrackets
 import org.gitanimals.core.extension.StringExtension.trimNotDigitCharacters
 import org.gitanimals.render.app.AnimationFacade
-import org.springframework.http.HttpHeaders
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestParam
@@ -45,13 +45,4 @@ class AnimationController(
             mode = mode,
         )
     }
-
-    private fun HttpServletResponse.cacheControl(maxAgeSeconds: Int): HttpServletResponse {
-        this.setHeader(
-            HttpHeaders.CACHE_CONTROL,
-            "no-cache, no-store, must-revalidate, max-age=$maxAgeSeconds"
-        )
-        this.setHeader(HttpHeaders.PRAGMA, "no-cache")
-        return this
-    }
 }

src/main/kotlin/org/gitanimals/render/controller/InternalAnimationController.kt

@@ -0,0 +1,38 @@
+package org.gitanimals.render.controller
+
+import jakarta.servlet.http.HttpServletResponse
+import org.gitanimals.core.Mode
+import org.gitanimals.core.extension.HttpResponseExtension.cacheControl
+import org.gitanimals.core.extension.StringExtension.deleteBrackets
+import org.gitanimals.core.extension.StringExtension.trimNotDigitCharacters
+import org.gitanimals.render.app.AnimationFacade
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestHeader
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class InternalAnimationController(
+    private val animationFacade: AnimationFacade,
+    @Value("\${internal.image.secret}") private val internalImageSecret: String,
+) {
+
+    @GetMapping(value = ["/lines/{username}/only-pets"], produces = ["image/svg+xml"])
+    fun getOnlyPetAnimation(
+        @PathVariable("username") username: String,
+        @RequestParam(name = "pet-id", defaultValue = "0") personaId: String,
+        @RequestHeader("Image-Secret") renderSecret: String,
+        response: HttpServletResponse,
+    ): String {
+        require(renderSecret == this.internalImageSecret)
+        response.cacheControl(3600)
+
+        return animationFacade.getLineAnimation(
+            username = username.deleteBrackets(),
+            personaId = personaId.trimNotDigitCharacters().toLong(),
+            mode = Mode.NONE,
+        )
+    }
+}

src/main/resources/application.properties

@@ -30,6 +30,7 @@ sentry.traces-sample-rate=1.0
 
 internal.secret=a
 internal.auth.secret=b
+internal.image.secret=c
 
 spring.application.name=render.gitanimals
 management.endpoints.web.exposure.include=health,prometheus