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

feat: misskeyが要求してくるアカウント名の形式にも対応

This commit is contained in:
usbharu 2023-03-24 17:46:01 +09:00
parent 819ec3ba52
commit de0516d710
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/kotlin/dev/usbharu/hideout/routing/WellKnownRouting.kt
View File

@ -1,7 +1,6 @@
package dev.usbharu.hideout.routing package dev.usbharu.hideout.routing
import dev.usbharu.hideout.config.Config import dev.usbharu.hideout.config.Config
import dev.usbharu.hideout.exception.UserNotFoundException
import dev.usbharu.hideout.service.UserService import dev.usbharu.hideout.service.UserService
import dev.usbharu.hideout.util.HttpUtil.Activity import dev.usbharu.hideout.util.HttpUtil.Activity
import io.ktor.http.* import io.ktor.http.*
@ -46,26 +45,33 @@ fun Application.wellKnown(userService: UserService) {
} }
get("/webfinger") { get("/webfinger") {
val uri = call.request.queryParameters["resource"] ?: return@get call.respondText("resource was not found", val uri = call.request.queryParameters["resource"] ?: return@get call.respondText(
"resource was not found",
status = HttpStatusCode.BadRequest status = HttpStatusCode.BadRequest
) )
val decodeURLPart = uri.decodeURLPart() val decodeURLPart = uri.decodeURLPart()
if (!decodeURLPart.startsWith("acct:")) { if (!decodeURLPart.startsWith("acct:")) {
return@get call.respondText("$uri was not found.",status =HttpStatusCode.BadRequest) return@get call.respondText(
"$uri was not found.",
status = HttpStatusCode.BadRequest
)
} }
val accountName = uri.substringBeforeLast("@").substringAfter("@") val accountName =
uri.substringBeforeLast("@").substringAfter("acct:").trimStart('@')
val userEntity = userService.findByName(accountName) val userEntity = userService.findByName(accountName)
return@get call.respond(WebFingerResource( return@get call.respond(
subject = decodeURLPart, WebFingerResource(
listOf( subject = decodeURLPart,
WebFingerResource.Link( listOf(
rel ="self", WebFingerResource.Link(
type = ContentType.Application.Activity.toString(), rel = "self",
href = "${Config.configData.hostname}/users/${userEntity.name}" type = ContentType.Application.Activity.toString(),
href = "${Config.configData.hostname}/users/${userEntity.name}"
)
) )
) )
)) )
} }
} }
@ -73,7 +79,7 @@ fun Application.wellKnown(userService: UserService) {
} }
@Serializable @Serializable
data class WebFingerResource(val subject:String,val links:List<Link>){ data class WebFingerResource(val subject: String, val links: List<Link>) {
@Serializable @Serializable
data class Link(val rel:String,val type:String,val href:String) data class Link(val rel: String, val type: String, val href: String)
} }