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

feat: 投稿のURLで取得できるNoteの情報を正確に表すように

This commit is contained in:
usbharu 2023-10-21 16:07:58 +09:00
parent 16f67dc040
commit 05142e0a55
1 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/main/kotlin/dev/usbharu/hideout/query/activitypub/NoteQueryServiceImpl.kt
View File

@ -1,38 +1,69 @@
package dev.usbharu.hideout.query.activitypub package dev.usbharu.hideout.query.activitypub
import dev.usbharu.hideout.domain.model.ap.Document
import dev.usbharu.hideout.domain.model.ap.Note import dev.usbharu.hideout.domain.model.ap.Note
import dev.usbharu.hideout.domain.model.hideout.entity.Post import dev.usbharu.hideout.domain.model.hideout.entity.Post
import dev.usbharu.hideout.exception.FailedToGetResourcesException import dev.usbharu.hideout.domain.model.hideout.entity.Visibility
import dev.usbharu.hideout.repository.Posts import dev.usbharu.hideout.repository.*
import dev.usbharu.hideout.repository.Users import dev.usbharu.hideout.service.ap.APNoteServiceImpl.Companion.public
import dev.usbharu.hideout.repository.toPost import org.jetbrains.exposed.sql.Query
import dev.usbharu.hideout.util.singleOr
import org.jetbrains.exposed.sql.ResultRow import org.jetbrains.exposed.sql.ResultRow
import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.select
import org.springframework.stereotype.Repository import org.springframework.stereotype.Repository
import java.time.Instant import java.time.Instant
@Repository @Repository
class NoteQueryServiceImpl : NoteQueryService { class NoteQueryServiceImpl(private val postRepository: PostRepository) : NoteQueryService {
override suspend fun findById(id: Long): Pair<Note, Post> { override suspend fun findById(id: Long): Pair<Note, Post> {
return Posts return Posts
.leftJoin(Users) .leftJoin(Users)
.leftJoin(PostsMedia)
.leftJoin(Media)
.select { Posts.id eq id } .select { Posts.id eq id }
.singleOr { FailedToGetResourcesException("id $id is duplicate or does not exist.") } .let { it.toNote() to it.toPost().first() }
.let { it.toNote() to it.toPost() }
} }
private fun ResultRow.toNote(): Note { private suspend fun ResultRow.toNote(mediaList: List<dev.usbharu.hideout.domain.model.hideout.entity.Media>): Note {
val replyId = this[Posts.replyId]
val replyTo = if (replyId != null) {
postRepository.findById(replyId).url
} else {
null
}
val visibility1 =
visibility(
Visibility.values().first { visibility -> visibility.ordinal == this[Posts.visibility] },
this[Users.followers]
)
return Note( return Note(
name = "Post", name = "Post",
id = this[Posts.apId], id = this[Posts.apId],
attributedTo = this[Users.url], attributedTo = this[Users.url],
content = this[Posts.text], content = this[Posts.text],
published = Instant.ofEpochMilli(this[Posts.createdAt]).toString(), published = Instant.ofEpochMilli(this[Posts.createdAt]).toString(),
to = listOf(), to = visibility1.first,
cc = listOf(), cc = visibility1.second,
inReplyTo = null, inReplyTo = replyTo,
sensitive = false sensitive = this[Posts.sensitive],
attachment = mediaList.map { Document(url = it.url, mediaType = "image/jpeg") }
) )
} }
private suspend fun Query.toNote(): Note {
return this.groupBy { it[Posts.id] }
.map { it.value }
.map { it.first().toNote(it.mapNotNull { it.toMediaOrNull() }) }
.first()
}
private fun visibility(visibility: Visibility, followers: String?): Pair<List<String>, List<String>> {
return when (visibility) {
Visibility.PUBLIC -> listOf(public) to listOf(public)
Visibility.UNLISTED -> listOfNotNull(followers) to listOf(public)
Visibility.FOLLOWERS -> listOfNotNull(followers) to listOfNotNull(followers)
Visibility.DIRECT -> TODO()
}
}
} }