usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: runBlockingで包むように

This commit is contained in:
usbharu 2023-09-24 11:37:15 +09:00
parent 0171012912
commit 721cdc9d49
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/dev/usbharu/hideout/controller/wellknown/WebFingerController.kt
View File

@ -4,23 +4,22 @@ import dev.usbharu.hideout.config.ApplicationConfig
import dev.usbharu.hideout.domain.model.wellknown.WebFinger import dev.usbharu.hideout.domain.model.wellknown.WebFinger
import dev.usbharu.hideout.service.api.WebFingerApiService import dev.usbharu.hideout.service.api.WebFingerApiService
import dev.usbharu.hideout.util.AcctUtil import dev.usbharu.hideout.util.AcctUtil
import kotlinx.coroutines.runBlocking
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
import org.springframework.http.ResponseEntity import org.springframework.http.ResponseEntity
import org.springframework.stereotype.Controller import org.springframework.stereotype.Controller
import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RequestParam import org.springframework.web.bind.annotation.RequestParam
import java.net.URL import java.net.URL
@Controller @Controller
@RequestMapping("/.well-known")
class WebFingerController( class WebFingerController(
private val webFingerApiService: WebFingerApiService, private val webFingerApiService: WebFingerApiService,
private val applicationConfig: ApplicationConfig private val applicationConfig: ApplicationConfig
) { ) {
@GetMapping("/webfinger") @GetMapping("/.well-known/webfinger")
suspend fun webfinger(@RequestParam resource: String): ResponseEntity<WebFinger> { fun webfinger(@RequestParam("resource") resource: String): ResponseEntity<WebFinger> = runBlocking {
val acct = AcctUtil.parse(resource) val acct = AcctUtil.parse(resource.replace("acct:", ""))
val user = val user =
webFingerApiService.findByNameAndDomain(acct.username, acct.domain ?: URL(applicationConfig.url).host) webFingerApiService.findByNameAndDomain(acct.username, acct.domain ?: URL(applicationConfig.url).host)
val webFinger = WebFinger( val webFinger = WebFinger(
@ -33,6 +32,6 @@ class WebFingerController(
) )
) )
) )
return ResponseEntity(webFinger, HttpStatus.OK) ResponseEntity(webFinger, HttpStatus.OK)
} }
} }