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

Merge pull request #26 from usbharu/feature/deliver-reaction 

Feature/deliver reaction
This commit is contained in:
usbharu 2023-08-08 18:01:55 +09:00 committed by GitHub
parent 93444af8ad 3764d476c0
commit 93c6dcc6e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 921 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -59,7 +59,7 @@ kotlin {
}
sourceSets.main {
java.srcDirs("build/generated/ksp/main/kotlin")
kotlin.srcDirs("$buildDir/generated/ksp/main")
}
dependencies {

694
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -14,7 +14,7 @@
"@suid/vite-plugin": "^0.1.3",
"rollup-plugin-visualizer": "^5.9.2",
"typescript": "^5.0.4",
"vite": "^4.2.1",
"vite": "4.2.3",
"vite-plugin-solid": "^2.7.0"
},
"scripts": {

17
src/main/kotlin/dev/usbharu/hideout/Application.kt
View File

@ -8,6 +8,8 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import dev.usbharu.hideout.config.Config
import dev.usbharu.hideout.config.ConfigData
import dev.usbharu.hideout.domain.model.job.DeliverPostJob
import dev.usbharu.hideout.domain.model.job.DeliverReactionJob
import dev.usbharu.hideout.domain.model.job.DeliverRemoveReactionJob
import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
import dev.usbharu.hideout.plugins.*
import dev.usbharu.hideout.repository.IUserRepository
@ -24,6 +26,7 @@ import dev.usbharu.hideout.service.core.IdGenerateService
import dev.usbharu.hideout.service.core.TwitterSnowflakeIdGenerateService
import dev.usbharu.hideout.service.job.JobQueueParentService
import dev.usbharu.hideout.service.job.KJobJobQueueParentService
import dev.usbharu.hideout.service.reaction.IReactionService
import dev.usbharu.hideout.service.user.IUserAuthService
import dev.usbharu.hideout.service.user.IUserService
import dev.usbharu.kjob.exposed.ExposedKJob
@ -102,6 +105,7 @@ fun Application.parent() {
configureSerialization()
register(inject<IUserService>().value)
configureSecurity(
inject<JwkProvider>().value,
inject<IMetaService>().value
)
@ -112,6 +116,7 @@ fun Application.parent() {
activityPubUserService = inject<ActivityPubUserService>().value,
postService = inject<IPostApiService>().value,
userApiService = inject<IUserApiService>().value,
reactionService = inject<IReactionService>().value,
userAuthService = inject<IUserAuthService>().value,
userRepository = inject<IUserRepository>().value,
jwtService = inject<IJwtService>().value,
@ -137,4 +142,16 @@ fun Application.worker() {
activityPubService.processActivity(this, it)
}
}
kJob.register(DeliverReactionJob) {
execute {
activityPubService.processActivity(this, it)
}
}
kJob.register(DeliverRemoveReactionJob) {
execute {
activityPubService.processActivity(this, it)
}
}
}

4
src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Like.kt
View File

@ -11,13 +11,13 @@ open class Like : Object {
protected constructor() : super()
constructor(
type: List<String>,
type: List<String> = emptyList(),
name: String?,
actor: String?,
id: String?,
`object`: String?,
content: String?,
tag: List<Object>
tag: List<Object> = emptyList()
) : super(
type = add(type, "Like"),
name = name,

2
src/main/kotlin/dev/usbharu/hideout/domain/model/ap/ObjectDeserializer.kt
View File

@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode
import dev.usbharu.hideout.service.activitypub.ExtendedActivityVocabulary
class ObjectDeserializer : JsonDeserializer<Object>() {
@Suppress("LongMethod")
@Suppress("LongMethod", "CyclomaticComplexMethod")
override fun deserialize(p: JsonParser?, ctxt: DeserializationContext?): Object {
requireNotNull(p)
val treeNode: JsonNode = requireNotNull(p.codec?.readTree(p))

4
src/main/kotlin/dev/usbharu/hideout/domain/model/hideout/dto/PostResponse.kt
View File

@ -5,7 +5,7 @@ import dev.usbharu.hideout.domain.model.hideout.entity.User
import dev.usbharu.hideout.domain.model.hideout.entity.Visibility
data class PostResponse(
val id: Long,
val id: String,
val user: UserResponse,
val overview: String? = null,
val text: String? = null,
@ -17,7 +17,7 @@ data class PostResponse(
companion object {
fun from(post: Post, user: User): PostResponse {
return PostResponse(
id = post.id,
id = post.id.toString(),
user = UserResponse.from(user),
overview = post.overview,
text = post.text,

10
src/main/kotlin/dev/usbharu/hideout/domain/model/hideout/dto/ReactionResponse.kt Normal file
View File

@ -0,0 +1,10 @@
package dev.usbharu.hideout.domain.model.hideout.dto
data class ReactionResponse(
val reaction: String,
val isUnicodeEmoji: Boolean = true,
val iconUrl: String,
val accounts: List<Account>
)
data class Account(val screenName: String, val iconUrl: String, val url: String)

4
src/main/kotlin/dev/usbharu/hideout/domain/model/hideout/dto/UserResponse.kt
View File

@ -3,7 +3,7 @@ package dev.usbharu.hideout.domain.model.hideout.dto
import dev.usbharu.hideout.domain.model.hideout.entity.User
data class UserResponse(
val id: Long,
val id: String,
val name: String,
val domain: String,
val screenName: String,
@ -14,7 +14,7 @@ data class UserResponse(
companion object {
fun from(user: User): UserResponse {
return UserResponse(
id = user.id,
id = user.id.toString(),
name = user.name,
domain = user.domain,
screenName = user.screenName,

3
src/main/kotlin/dev/usbharu/hideout/domain/model/hideout/form/Reaction.kt Normal file
View File

@ -0,0 +1,3 @@
package dev.usbharu.hideout.domain.model.hideout.form
data class Reaction(val reaction: String?)

15
src/main/kotlin/dev/usbharu/hideout/domain/model/job/HideoutJob.kt
View File

@ -15,3 +15,18 @@ object DeliverPostJob : HideoutJob("DeliverPostJob") {
val actor = string("actor")
val inbox = string("inbox")
}
object DeliverReactionJob : HideoutJob("DeliverReactionJob") {
val reaction = string("reaction")
val postUrl = string("postUrl")
val actor = string("actor")
val inbox = string("inbox")
val id = string("id")
}
object DeliverRemoveReactionJob : HideoutJob("DeliverRemoveReactionJob") {
val id = string("id")
val inbox = string("inbox")
val actor = string("actor")
val like = string("like")
}

4
src/main/kotlin/dev/usbharu/hideout/plugins/Routing.kt
View File

@ -15,6 +15,7 @@ import dev.usbharu.hideout.service.api.IUserApiService
import dev.usbharu.hideout.service.auth.HttpSignatureVerifyService
import dev.usbharu.hideout.service.auth.IJwtService
import dev.usbharu.hideout.service.core.IMetaService
import dev.usbharu.hideout.service.reaction.IReactionService
import dev.usbharu.hideout.service.user.IUserAuthService
import dev.usbharu.hideout.service.user.IUserService
import io.ktor.server.application.*
@ -29,6 +30,7 @@ fun Application.configureRouting(
activityPubUserService: ActivityPubUserService,
postService: IPostApiService,
userApiService: IUserApiService,
reactionService: IReactionService,
userAuthService: IUserAuthService,
userRepository: IUserRepository,
jwtService: IJwtService,
@ -41,7 +43,7 @@ fun Application.configureRouting(
usersAP(activityPubUserService, userService)
webfinger(userService)
route("/api/internal/v1") {
posts(postService)
posts(postService, reactionService)
users(userService, userApiService)
auth(userAuthService, userRepository, jwtService)
}

6
src/main/kotlin/dev/usbharu/hideout/repository/ReactionRepository.kt
View File

@ -6,4 +6,10 @@ interface ReactionRepository {
suspend fun generateId(): Long
suspend fun save(reaction: Reaction): Reaction
suspend fun reactionAlreadyExist(postId: Long, userId: Long, emojiId: Long): Boolean
suspend fun findByPostId(postId: Long): List<Reaction>
suspend fun delete(reaction: Reaction): Reaction
suspend fun deleteById(id: Long)
suspend fun deleteByPostId(postId: Long)
suspend fun deleteByUserId(userId: Long)
suspend fun deleteByPostIdAndUserId(postId: Long, userId: Long)
}

45
src/main/kotlin/dev/usbharu/hideout/repository/ReactionRepositoryImpl.kt
View File

@ -5,6 +5,7 @@ import dev.usbharu.hideout.service.core.IdGenerateService
import kotlinx.coroutines.Dispatchers
import org.jetbrains.exposed.dao.id.LongIdTable
import org.jetbrains.exposed.sql.*
import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
import org.jetbrains.exposed.sql.transactions.transaction
import org.koin.core.annotation.Single
@ -57,6 +58,50 @@ class ReactionRepositoryImpl(
}.empty().not()
}
}
override suspend fun findByPostId(postId: Long): List<Reaction> {
return query {
Reactions.select {
Reactions.postId.eq(postId)
}.map { it.toReaction() }
}
}
override suspend fun delete(reaction: Reaction): Reaction {
query {
Reactions.deleteWhere {
id.eq(reaction.id)
.and(postId.eq(reaction.postId))
.and(userId.eq(reaction.postId))
.and(emojiId.eq(reaction.emojiId))
}
}
return reaction
}
override suspend fun deleteById(id: Long) {
query {
Reactions.deleteWhere { Reactions.id.eq(id) }
}
}
override suspend fun deleteByPostId(postId: Long) {
query {
Reactions.deleteWhere { Reactions.postId.eq(postId) }
}
}
override suspend fun deleteByUserId(userId: Long) {
query {
Reactions.deleteWhere { Reactions.userId.eq(userId) }
}
}
override suspend fun deleteByPostIdAndUserId(postId: Long, userId: Long) {
query {
Reactions.deleteWhere { Reactions.postId.eq(postId).and(Reactions.userId.eq(userId)) }
}
}
}
fun ResultRow.toReaction(): Reaction {

37
src/main/kotlin/dev/usbharu/hideout/routing/api/internal/v1/Posts.kt
View File

@ -1,9 +1,11 @@
package dev.usbharu.hideout.routing.api.internal.v1
import dev.usbharu.hideout.domain.model.hideout.form.Post
import dev.usbharu.hideout.domain.model.hideout.form.Reaction
import dev.usbharu.hideout.exception.ParameterNotExistException
import dev.usbharu.hideout.plugins.TOKEN_AUTH
import dev.usbharu.hideout.service.api.IPostApiService
import dev.usbharu.hideout.service.reaction.IReactionService
import dev.usbharu.hideout.util.InstantParseUtil
import io.ktor.http.*
import io.ktor.server.application.*
@ -14,7 +16,7 @@ import io.ktor.server.response.*
import io.ktor.server.routing.*
@Suppress("LongMethod")
fun Route.posts(postApiService: IPostApiService) {
fun Route.posts(postApiService: IPostApiService, reactionService: IReactionService) {
route("/posts") {
authenticate(TOKEN_AUTH) {
post {
@ -26,6 +28,39 @@ fun Route.posts(postApiService: IPostApiService) {
call.response.header("Location", create.url)
call.respond(HttpStatusCode.OK)
}
route("/{id}/reactions") {
get {
val principal = call.principal<JWTPrincipal>() ?: throw IllegalStateException("no principal")
val userId = principal.payload.getClaim("uid").asLong()
val postId = (
call.parameters["id"]?.toLong()
?: throw ParameterNotExistException("Parameter(id='postsId') does not exist.")
)
call.respond(reactionService.findByPostIdForUser(postId, userId))
}
post {
val jwtPrincipal = call.principal<JWTPrincipal>() ?: throw IllegalStateException("no principal")
val userId = jwtPrincipal.payload.getClaim("uid").asLong()
val postId = call.parameters["id"]?.toLong()
?: throw ParameterNotExistException("Parameter(id='postsId') does not exist.")
val reaction = try {
call.receive<Reaction>()
} catch (e: ContentTransformationException) {
Reaction(null)
}
reactionService.sendReaction(reaction.reaction ?: "❤", userId, postId)
call.respond(HttpStatusCode.NoContent)
}
delete {
val jwtPrincipal = call.principal<JWTPrincipal>() ?: throw IllegalStateException("no principal")
val userId = jwtPrincipal.payload.getClaim("uid").asLong()
val postId = call.parameters["id"]?.toLong()
?: throw ParameterNotExistException("Parameter(id='postsId') does not exist.")
reactionService.removeReaction(userId, postId)
call.respond(HttpStatusCode.NoContent)
}
}
}
authenticate(TOKEN_AUTH, optional = true) {
get {

2
src/main/kotlin/dev/usbharu/hideout/routing/api/internal/v1/Users.kt
View File

@ -81,7 +81,7 @@ fun Route.users(userService: IUserService, userApiService: IUserApiService) {
}
val acct = AcctUtil.parse(userParameter)
val targetUser = userApiService.findByAcct(acct)
if (userService.followRequest(targetUser.id, userId)) {
if (userService.followRequest(targetUser.id.toLong(), userId)) {
return@post call.respond(HttpStatusCode.OK)
} else {
return@post call.respond(HttpStatusCode.Accepted)

13
src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubReactionService.kt Normal file
View File

@ -0,0 +1,13 @@
package dev.usbharu.hideout.service.activitypub
import dev.usbharu.hideout.domain.model.hideout.entity.Reaction
import dev.usbharu.hideout.domain.model.job.DeliverReactionJob
import dev.usbharu.hideout.domain.model.job.DeliverRemoveReactionJob
import kjob.core.job.JobProps
interface ActivityPubReactionService {
suspend fun reaction(like: Reaction)
suspend fun removeReaction(like: Reaction)
suspend fun reactionJob(props: JobProps<DeliverReactionJob>)
suspend fun removeReactionJob(props: JobProps<DeliverRemoveReactionJob>)
}

93
src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubReactionServiceImpl.kt Normal file
View File

@ -0,0 +1,93 @@
package dev.usbharu.hideout.service.activitypub
import com.fasterxml.jackson.module.kotlin.readValue
import dev.usbharu.hideout.config.Config
import dev.usbharu.hideout.domain.model.ap.Like
import dev.usbharu.hideout.domain.model.ap.Undo
import dev.usbharu.hideout.domain.model.hideout.entity.Reaction
import dev.usbharu.hideout.domain.model.job.DeliverReactionJob
import dev.usbharu.hideout.domain.model.job.DeliverRemoveReactionJob
import dev.usbharu.hideout.exception.PostNotFoundException
import dev.usbharu.hideout.plugins.postAp
import dev.usbharu.hideout.repository.IPostRepository
import dev.usbharu.hideout.service.job.JobQueueParentService
import dev.usbharu.hideout.service.user.IUserService
import io.ktor.client.*
import kjob.core.job.JobProps
import org.koin.core.annotation.Single
import java.time.Instant
@Single
class ActivityPubReactionServiceImpl(
private val userService: IUserService,
private val jobQueueParentService: JobQueueParentService,
private val iPostRepository: IPostRepository,
private val httpClient: HttpClient
) : ActivityPubReactionService {
override suspend fun reaction(like: Reaction) {
val followers = userService.findFollowersById(like.userId)
val user = userService.findById(like.userId)
val post =
iPostRepository.findOneById(like.postId) ?: throw PostNotFoundException("${like.postId} was not found.")
followers.forEach { follower ->
jobQueueParentService.schedule(DeliverReactionJob) {
props[it.actor] = user.url
props[it.reaction] = "❤"
props[it.inbox] = follower.inbox
props[it.postUrl] = post.url
props[it.id] = post.id.toString()
}
}
}
override suspend fun removeReaction(like: Reaction) {
val followers = userService.findFollowersById(like.userId)
val user = userService.findById(like.userId)
val post =
iPostRepository.findOneById(like.postId) ?: throw PostNotFoundException("${like.postId} was not found.")
followers.forEach { follower ->
jobQueueParentService.schedule(DeliverRemoveReactionJob) {
props[it.actor] = user.url
props[it.inbox] = follower.inbox
props[it.id] = post.id.toString()
props[it.like] = Config.configData.objectMapper.writeValueAsString(like)
}
}
}
override suspend fun reactionJob(props: JobProps<DeliverReactionJob>) {
val inbox = props[DeliverReactionJob.inbox]
val actor = props[DeliverReactionJob.actor]
val postUrl = props[DeliverReactionJob.postUrl]
val id = props[DeliverReactionJob.id]
val content = props[DeliverReactionJob.reaction]
httpClient.postAp(
urlString = inbox,
username = "$actor#pubkey",
jsonLd = Like(
name = "Like",
actor = actor,
`object` = postUrl,
id = "${Config.configData.url}/like/note/$id",
content = content
)
)
}
override suspend fun removeReactionJob(props: JobProps<DeliverRemoveReactionJob>) {
val inbox = props[DeliverRemoveReactionJob.inbox]
val actor = props[DeliverRemoveReactionJob.actor]
val like = Config.configData.objectMapper.readValue<Like>(props[DeliverRemoveReactionJob.like])
httpClient.postAp(
urlString = inbox,
username = "$actor#pubkey",
jsonLd = Undo(
name = "Undo Reaction",
actor = actor,
`object` = like,
id = "${Config.configData.url}/undo/note/${like.id}",
published = Instant.now()
)
)
}
}

11
src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubServiceImpl.kt
View File

@ -5,9 +5,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
import dev.usbharu.hideout.config.Config.configData
import dev.usbharu.hideout.domain.model.ActivityPubResponse
import dev.usbharu.hideout.domain.model.ap.Follow
import dev.usbharu.hideout.domain.model.job.DeliverPostJob
import dev.usbharu.hideout.domain.model.job.HideoutJob
import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
import dev.usbharu.hideout.domain.model.job.*
import dev.usbharu.hideout.exception.JsonParseException
import kjob.core.dsl.JobContextWithProps
import kjob.core.job.JobProps
@ -22,7 +20,8 @@ class ActivityPubServiceImpl(
private val activityPubUndoService: ActivityPubUndoService,
private val activityPubAcceptService: ActivityPubAcceptService,
private val activityPubCreateService: ActivityPubCreateService,
private val activityPubLikeService: ActivityPubLikeService
private val activityPubLikeService: ActivityPubLikeService,
private val activityPubReactionService: ActivityPubReactionService
) : ActivityPubService {
val logger: Logger = LoggerFactory.getLogger(this::class.java)
@ -71,6 +70,10 @@ class ActivityPubServiceImpl(
)
DeliverPostJob -> activityPubNoteService.createNoteJob(job.props as JobProps<DeliverPostJob>)
DeliverReactionJob -> activityPubReactionService.reactionJob(job.props as JobProps<DeliverReactionJob>)
DeliverRemoveReactionJob -> activityPubReactionService.removeReactionJob(
job.props as JobProps<DeliverRemoveReactionJob>
)
}
}
}

5
src/main/kotlin/dev/usbharu/hideout/service/reaction/IReactionService.kt
View File

@ -1,5 +1,10 @@
package dev.usbharu.hideout.service.reaction
import dev.usbharu.hideout.domain.model.hideout.dto.ReactionResponse
interface IReactionService {
suspend fun receiveReaction(name: String, domain: String, userId: Long, postId: Long)
suspend fun sendReaction(name: String, userId: Long, postId: Long)
suspend fun removeReaction(userId: Long, postId: Long)
suspend fun findByPostIdForUser(postId: Long, userId: Long): List<ReactionResponse>
}

41
src/main/kotlin/dev/usbharu/hideout/service/reaction/ReactionServiceImpl.kt
View File

@ -1,11 +1,23 @@
package dev.usbharu.hideout.service.reaction
import dev.usbharu.hideout.domain.model.hideout.dto.Account
import dev.usbharu.hideout.domain.model.hideout.dto.ReactionResponse
import dev.usbharu.hideout.domain.model.hideout.entity.Reaction
import dev.usbharu.hideout.repository.ReactionRepository
import dev.usbharu.hideout.repository.Reactions
import dev.usbharu.hideout.repository.Users
import dev.usbharu.hideout.service.activitypub.ActivityPubReactionService
import org.jetbrains.exposed.sql.ResultRow
import org.jetbrains.exposed.sql.leftJoin
import org.jetbrains.exposed.sql.select
import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
import org.koin.core.annotation.Single
@Single
class ReactionServiceImpl(private val reactionRepository: ReactionRepository) : IReactionService {
class ReactionServiceImpl(
private val reactionRepository: ReactionRepository,
private val activityPubReactionService: ActivityPubReactionService
) : IReactionService {
override suspend fun receiveReaction(name: String, domain: String, userId: Long, postId: Long) {
if (reactionRepository.reactionAlreadyExist(postId, userId, 0).not()) {
reactionRepository.save(
@ -13,4 +25,31 @@ class ReactionServiceImpl(private val reactionRepository: ReactionRepository) :
)
}
}
override suspend fun sendReaction(name: String, userId: Long, postId: Long) {
if (reactionRepository.reactionAlreadyExist(postId, userId, 0)) {
// delete
reactionRepository.deleteByPostIdAndUserId(postId, userId)
} else {
val reaction = Reaction(reactionRepository.generateId(), 0, postId, userId)
reactionRepository.save(reaction)
activityPubReactionService.reaction(reaction)
}
}
override suspend fun removeReaction(userId: Long, postId: Long) {
reactionRepository.deleteByPostIdAndUserId(postId, userId)
}
override suspend fun findByPostIdForUser(postId: Long, userId: Long): List<ReactionResponse> {
return newSuspendedTransaction {
Reactions
.leftJoin(Users, onColumn = { Reactions.userId }, otherColumn = { id })
.select { Reactions.postId.eq(postId) }
.groupBy { resultRow: ResultRow -> ReactionResponse("❤", true, "", listOf()) }
.map { entry: Map.Entry<ReactionResponse, List<ResultRow>> ->
entry.key.copy(accounts = entry.value.map { Account(it[Users.screenName], "", it[Users.url]) })
}
}
}
}

118
src/main/resources/openapi/api.yaml
View File

@ -74,6 +74,71 @@ paths:
$ref: "#/components/responses/NotFoundOrForbidden"
429:
$ref: "#/components/responses/TooManyRequests"
/posts/{postId}/reactions:
get:
summary: リアクションを数件返す
security:
- BearerAuth: [ ]
parameters:
- $ref: "#/components/parameters/postId"
responses:
200:
description: 成功
content:
application/json:
schema:
$ref: "#/components/schemas/ReactionResponse"
401:
$ref: "#/components/responses/Unauthorized"
403:
$ref: "#/components/responses/Forbidden"
404:
$ref: "#/components/responses/NotFoundOrForbidden"
429:
$ref: "#/components/responses/TooManyRequests"
post:
summary: リアクションを付ける
security:
- BearerAuth: [ ]
parameters:
- $ref: "#/components/parameters/postId"
requestBody:
description: 付けるリアクション
required: true
content:
application/json:
schema:
$ref: "#/components/schemas/Reaction"
responses:
200:
description: 成功
401:
$ref: "#/components/responses/Unauthorized"
403:
$ref: "#/components/responses/Forbidden"
404:
$ref: "#/components/responses/NotFoundOrForbidden"
429:
$ref: "#/components/responses/TooManyRequests"
delete:
summary: リアクションを削除する
security:
- BearerAuth: [ ]
parameters:
- $ref: "#/components/parameters/postId"
responses:
200:
description: 成功
401:
$ref: "#/components/responses/Unauthorized"
403:
$ref: "#/components/responses/Forbidden"
404:
$ref: "#/components/responses/NotFoundOrForbidden"
429:
$ref: "#/components/responses/TooManyRequests"
/users/{userName}/posts:
get:
summary: 権限に応じてユーザーの投稿一覧を返す
@ -290,8 +355,7 @@ components:
description: 投稿ID
required: true
schema:
type: integer
format: int64
type: string
userName:
name: userName
in: path
@ -320,8 +384,7 @@ components:
- createdAt
properties:
id:
type: number
format: int64
type: string
readOnly: true
name:
type: string
@ -337,7 +400,7 @@ components:
type: string
readOnly: true
createdAt:
type: number
type: integer
readOnly: true
PostResponse:
type: object
@ -351,8 +414,7 @@ components:
- sensitive
properties:
id:
type: integer
format: int64
type: string
readOnly: true
user:
$ref: "#/components/schemas/UserResponse"
@ -371,12 +433,10 @@ components:
format: uri
readOnly: true
repostId:
type: integer
format: int64
type: string
readOnly: true
replyId:
type: integer
format: int64
type: string
readOnly: true
sensitive:
type: boolean
@ -391,11 +451,9 @@ components:
visibility:
$ref: "#/components/schemas/Visibility"
repostId:
type: integer
format: int64
type: string
replyId:
type: integer
format: int64
type: string
sensitive:
type: boolean
@ -421,6 +479,36 @@ components:
password:
type: string
Reaction:
type: object
properties:
reaction:
type: string
ReactionResponse:
type: object
properties:
reaction:
type: string
isUnicodeEmoji:
type: boolean
iconUrl:
type: string
accounts:
type: array
items:
$ref: "#/components/schemas/Account"
Account:
type: object
properties:
screenName:
type: string
iconUrl:
type: string
url:
type: string
securitySchemes:
BearerAuth:
type: http

10
src/main/web/organisms/Post.tsx
View File

@ -4,14 +4,22 @@ import {Avatar} from "../atoms/Avatar";
import {Favorite, MoreVert, Reply, ScreenRotationAlt} from "@suid/icons-material";
import {ShareScopeIndicator} from "../molecules/ShareScopeIndicator";
import {PostResponse} from "../generated";
import {useApi} from "../lib/ApiProvider";
export const Post: Component<{ post: PostResponse }> = (props) => {
const api = useApi()
const [anchorEl, setAnchorEl] = createSignal<null | HTMLElement>(null)
const open = () => Boolean(anchorEl());
const handleClose = () => {
setAnchorEl(null);
}
const handleFavorite = () => {
api().postsPostIdReactionsPost({reaction: "❤"}, props.post.id)
}
return (
<Card>
<CardHeader avatar={<Avatar src={props.post.user.url + "/icon.jpg"}/>} title={props.post.user.screenName}
@ -32,7 +40,7 @@ export const Post: Component<{ post: PostResponse }> = (props) => {
<IconButton>
<ScreenRotationAlt/>
</IconButton>
<IconButton>
<IconButton onclick={handleFavorite}>
<Favorite/>
</IconButton>
<Box sx={{marginLeft: "auto"}}>

92
src/test/kotlin/dev/usbharu/hideout/routing/api/internal/v1/PostsTest.kt
View File

@ -35,7 +35,7 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -45,7 +45,7 @@ class PostsTest {
)
val posts = listOf(
PostResponse(
id = 12345,
id = "12345",
user = user,
text = "test1",
visibility = Visibility.PUBLIC,
@ -53,7 +53,7 @@ class PostsTest {
url = "https://example.com/posts/1"
),
PostResponse(
id = 123456,
id = "123456",
user = user,
text = "test2",
visibility = Visibility.PUBLIC,
@ -78,7 +78,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -101,7 +101,7 @@ class PostsTest {
on { getClaim(eq("uid")) } doReturn claim
}
val user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -111,7 +111,7 @@ class PostsTest {
)
val posts = listOf(
PostResponse(
id = 12345,
id = "12345",
user = user,
text = "test1",
visibility = Visibility.PUBLIC,
@ -119,7 +119,7 @@ class PostsTest {
url = "https://example.com/posts/1"
),
PostResponse(
id = 123456,
id = "123456",
user = user,
text = "test2",
visibility = Visibility.PUBLIC,
@ -127,7 +127,7 @@ class PostsTest {
url = "https://example.com/posts/2"
),
PostResponse(
id = 1234567,
id = "1234567",
user = user,
text = "Followers only",
visibility = Visibility.FOLLOWERS,
@ -159,7 +159,7 @@ class PostsTest {
configureSerialization()
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -176,7 +176,7 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -185,7 +185,7 @@ class PostsTest {
createdAt = Instant.now().toEpochMilli()
)
val post = PostResponse(
id = 12345,
id = "12345",
user = user,
text = "aaa",
visibility = Visibility.PUBLIC,
@ -200,7 +200,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -216,9 +216,9 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val post = PostResponse(
12345,
"12345",
UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -251,7 +251,7 @@ class PostsTest {
}
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -279,9 +279,9 @@ class PostsTest {
val argument = it.getArgument<dev.usbharu.hideout.domain.model.hideout.form.Post>(0)
val userId = it.getArgument<Long>(1)
PostResponse(
id = 123L,
id = "123",
user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -308,7 +308,7 @@ class PostsTest {
}
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
configureSerialization()
@ -335,7 +335,7 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -345,7 +345,7 @@ class PostsTest {
)
val posts = listOf(
PostResponse(
id = 12345,
id = "12345",
user = user,
text = "test1",
visibility = Visibility.PUBLIC,
@ -353,7 +353,7 @@ class PostsTest {
url = "https://example.com/posts/1"
),
PostResponse(
id = 123456,
id = "123456",
user = user,
text = "test2",
visibility = Visibility.PUBLIC,
@ -379,7 +379,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -396,7 +396,7 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -406,7 +406,7 @@ class PostsTest {
)
val posts = listOf(
PostResponse(
id = 12345,
id = "12345",
user = user,
text = "test1",
visibility = Visibility.PUBLIC,
@ -414,7 +414,7 @@ class PostsTest {
url = "https://example.com/posts/1"
),
PostResponse(
id = 123456,
id = "123456",
user = user,
text = "test2",
visibility = Visibility.PUBLIC,
@ -440,7 +440,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -457,7 +457,7 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -467,7 +467,7 @@ class PostsTest {
)
val posts = listOf(
PostResponse(
id = 12345,
id = "12345",
user = user,
text = "test1",
visibility = Visibility.PUBLIC,
@ -475,7 +475,7 @@ class PostsTest {
url = "https://example.com/posts/1"
),
PostResponse(
id = 123456,
id = "123456",
user = user,
text = "test2",
visibility = Visibility.PUBLIC,
@ -501,7 +501,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -518,7 +518,7 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -528,7 +528,7 @@ class PostsTest {
)
val posts = listOf(
PostResponse(
id = 12345,
id = "12345",
user = user,
text = "test1",
visibility = Visibility.PUBLIC,
@ -536,7 +536,7 @@ class PostsTest {
url = "https://example.com/posts/1"
),
PostResponse(
id = 123456,
id = "123456",
user = user,
text = "test2",
visibility = Visibility.PUBLIC,
@ -562,7 +562,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -579,9 +579,9 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val post = PostResponse(
id = 123456,
id = "123456",
user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -602,7 +602,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -619,9 +619,9 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val post = PostResponse(
id = 123456,
id = "123456",
user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -642,7 +642,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -659,9 +659,9 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val post = PostResponse(
id = 123456,
id = "123456",
user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -682,7 +682,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}
@ -699,9 +699,9 @@ class PostsTest {
config = ApplicationConfig("empty.conf")
}
val post = PostResponse(
id = 123456,
id = "123456",
user = UserResponse(
id = 54321,
id = "54321",
name = "user1",
domain = "example.com",
screenName = "user 1",
@ -722,7 +722,7 @@ class PostsTest {
configureSecurity(mock(), mock())
routing {
route("/api/internal/v1") {
posts(postService)
posts(postService, mock())
}
}
}

44
src/test/kotlin/dev/usbharu/hideout/routing/api/internal/v1/UsersTest.kt
View File

@ -25,7 +25,7 @@ import org.mockito.kotlin.*
import utils.JsonObjectMapper
import java.time.Instant
import kotlin.test.assertEquals
@Suppress("LargeClass")
class UsersTest {
@Test
fun `users にGETするとユーザー一覧を取得できる`() = testApplication {
@ -35,7 +35,7 @@ class UsersTest {
val users = listOf(
UserResponse(
12345,
"12345",
"test1",
"example.com",
"test",
@ -44,7 +44,7 @@ class UsersTest {
Instant.now().toEpochMilli()
),
UserResponse(
12343,
"12343",
"tes2",
"example.com",
"test",
@ -149,7 +149,7 @@ class UsersTest {
config = ApplicationConfig("empty.conf")
}
val userResponse = UserResponse(
1234,
"1234",
"test1",
"example.com",
"test",
@ -182,7 +182,7 @@ class UsersTest {
config = ApplicationConfig("empty.conf")
}
val userResponse = UserResponse(
1234,
"1234",
"test1",
"example.com",
"test",
@ -215,7 +215,7 @@ class UsersTest {
config = ApplicationConfig("empty.conf")
}
val userResponse = UserResponse(
1234,
"1234",
"test1",
"example.com",
"test",
@ -248,7 +248,7 @@ class UsersTest {
config = ApplicationConfig("empty.conf")
}
val userResponse = UserResponse(
1234,
"1234",
"test1",
"example.com",
"test",
@ -283,7 +283,7 @@ class UsersTest {
val followers = listOf(
UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -292,7 +292,7 @@ class UsersTest {
Instant.now().toEpochMilli()
),
UserResponse(
1236,
"1236",
"follower2",
"example.com",
"test",
@ -328,7 +328,7 @@ class UsersTest {
val followers = listOf(
UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -337,7 +337,7 @@ class UsersTest {
Instant.now().toEpochMilli()
),
UserResponse(
1236,
"1236",
"follower2",
"example.com",
"test",
@ -373,7 +373,7 @@ class UsersTest {
val followers = listOf(
UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -382,7 +382,7 @@ class UsersTest {
Instant.now().toEpochMilli()
),
UserResponse(
1236,
"1236",
"follower2",
"example.com",
"test",
@ -425,7 +425,7 @@ class UsersTest {
val userApiService = mock<IUserApiService> {
onBlocking { findByAcct(any()) } doReturn UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -475,7 +475,7 @@ class UsersTest {
val userApiService = mock<IUserApiService> {
onBlocking { findByAcct(any()) } doReturn UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -525,7 +525,7 @@ class UsersTest {
val userApiService = mock<IUserApiService> {
onBlocking { findById(any()) } doReturn UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -568,7 +568,7 @@ class UsersTest {
val followers = listOf(
UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -577,7 +577,7 @@ class UsersTest {
Instant.now().toEpochMilli()
),
UserResponse(
1236,
"1236",
"follower2",
"example.com",
"test",
@ -613,7 +613,7 @@ class UsersTest {
val followers = listOf(
UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -622,7 +622,7 @@ class UsersTest {
Instant.now().toEpochMilli()
),
UserResponse(
1236,
"1236",
"follower2",
"example.com",
"test",
@ -658,7 +658,7 @@ class UsersTest {
val followers = listOf(
UserResponse(
1235,
"1235",
"follower1",
"example.com",
"test",
@ -667,7 +667,7 @@ class UsersTest {
Instant.now().toEpochMilli()
),
UserResponse(
1236,
"1236",
"follower2",
"example.com",
"test",