From c9c71028835d3370a8e4dc2292f5be7b7798c348 Mon Sep 17 00:00:00 2001
From: Roman Ivanov <ivanov.roman.alexeevich@gmail.com>
Date: Tue, 2 Jul 2024 13:58:37 +0300
Subject: [PATCH] Update Gitea version to 1.22.0 (#46)

---
 gradle.properties                                |  2 +-
 .../vcsfacade/service/impl/GiteaService.kt       | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 38ed50e..de53cb9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ springdoc-openapi.version=2.3.0
 external-systems-client.version=2.0.43
 gitlab4j-api.version=6.0.0-rc.4
 bitbucket.version=8.14.0-jdk11
-gitea.version=1.21.10
+gitea.version=1.22.0
 gitlab.version=16.2.4-ce.0
 postgres.version=13-alpine
 opensearch.version=2.11.1
diff --git a/server/src/main/kotlin/org/octopusden/octopus/vcsfacade/service/impl/GiteaService.kt b/server/src/main/kotlin/org/octopusden/octopus/vcsfacade/service/impl/GiteaService.kt
index 076ef8f..d903bc8 100644
--- a/server/src/main/kotlin/org/octopusden/octopus/vcsfacade/service/impl/GiteaService.kt
+++ b/server/src/main/kotlin/org/octopusden/octopus/vcsfacade/service/impl/GiteaService.kt
@@ -1,6 +1,8 @@
 package org.octopusden.octopus.vcsfacade.service.impl
 
 import java.math.BigInteger
+import java.net.URI
+import java.net.URISyntaxException
 import java.security.MessageDigest
 import java.util.Date
 import org.octopusden.octopus.infrastructure.client.commons.ClientParametersProvider
@@ -272,7 +274,19 @@ class GiteaService(
         val organization = giteaRepository.fullName.lowercase().removeSuffix("/$repository")
         return Repository("ssh://git@$host/$organization/$repository.git", //TODO: add "useColon" parameter?
             "$httpUrl/$organization/$repository",
-            giteaRepository.avatarUrl.ifBlank { null })
+            //IMPORTANT:
+            //Gitea version 1.22.0 started to return host url instead of empty string as avatar_url for repository with no avatar
+            //Will be fixed in 1.22.1, see https://github.com/go-gitea/gitea/pull/31187
+            giteaRepository.avatarUrl.let {
+                val path = try {
+                    URI(it).path
+                } catch (e: URISyntaxException) {
+                    ""
+                }
+                if (path.trim('/').isEmpty()) null else it
+            }
+            //TODO: restore `giteaRepository.avatarUrl.ifBlank { null }` after Gitea update to 1.22.1 or higher
+        )
     }
 
     companion object {