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

style: fix lint (CI)

This commit is contained in:
usbharu 2024-09-05 15:35:56 +00:00 committed by github-actions[bot]
parent ed41c025cf
commit 5036e01c89
10 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/ActorDetail.kt
View File

@ -35,4 +35,4 @@ data class ActorDetail(
)
}
}
}
}

6
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/actor/GetActorDetailApplicationService.kt
View File

@ -18,14 +18,14 @@ class GetActorDetailApplicationService(
transaction: Transaction
) :
AbstractApplicationService<GetActorDetail, ActorDetail>(
transaction, logger
transaction,
logger
) {
override suspend fun internalExecute(command: GetActorDetail, principal: Principal): ActorDetail {
val actor = if (command.id != null) {
actorRepository.findById(ActorId(command.id))
?: throw IllegalArgumentException("Actor ${command.id} not found.")
} else if (command.actorName != null) {
val host = if (command.actorName.host.isEmpty()) {
applicationConfig.url.host
} else {
@ -46,4 +46,4 @@ class GetActorDetailApplicationService(
companion object {
private val logger = LoggerFactory.getLogger(GetActorDetailApplicationService::class.java)
}
}
}

6
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/instance/GetLocalInstanceApplicationService.kt
View File

@ -29,9 +29,9 @@ class GetLocalInstanceApplicationService(
}
val instance = (
instanceRepository.findByUrl(applicationConfig.url.toURI())
?: throw InternalServerException("Local instance not found.")
)
instanceRepository.findByUrl(applicationConfig.url.toURI())
?: throw InternalServerException("Local instance not found.")
)
cachedInstance = Instance.of(instance)
@Suppress("UnsafeCallOnNullableType")

17
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/application/timeline/GetUserTimelineApplicationService.kt
View File

@ -35,15 +35,18 @@ class GetUserTimelineApplicationService(
val postDetailMap = userTimelineQueryService.findByIdAll(postIdList, principal).associateBy { it.id }
return PaginationList(postList.mapNotNull {
postDetailMap[it.id.id]?.copy(
repost = postDetailMap[it.repostId?.id],
reply = postDetailMap[it.replyId?.id]
)
}, postList.next, postList.prev)
return PaginationList(
postList.mapNotNull {
postDetailMap[it.id.id]?.copy(
repost = postDetailMap[it.repostId?.id],
reply = postDetailMap[it.replyId?.id]
)
},
postList.next, postList.prev
)
}
companion object {
private val logger = LoggerFactory.getLogger(GetUserTimelineApplicationService::class.java)
}
}
}

2
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/config/MessageSourceConfig.kt
View File

@ -25,4 +25,4 @@ class MessageSourceConfig {
fun messageSourceProperties(): MessageSourceProperties {
return MessageSourceProperties()
}
}
}

10
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt
View File

@ -39,10 +39,10 @@ class ExposedUserTimelineQueryService : UserTimelineQueryService, AbstractReposi
.select(Posts.columns)
.where {
Posts.visibility eq Visibility.PUBLIC.name or
(Posts.visibility eq Visibility.UNLISTED.name) or
(Posts.visibility eq Visibility.DIRECT.name and (PostsVisibleActors.actorId eq principal.actorId.id)) or
(Posts.visibility eq Visibility.FOLLOWERS.name and (Relationships.blocking eq false and (relationshipsAlias[Relationships.following] eq true))) or
(Posts.actorId eq principal.actorId.id)
(Posts.visibility eq Visibility.UNLISTED.name) or
(Posts.visibility eq Visibility.DIRECT.name and (PostsVisibleActors.actorId eq principal.actorId.id)) or
(Posts.visibility eq Visibility.FOLLOWERS.name and (Relationships.blocking eq false and (relationshipsAlias[Relationships.following] eq true))) or
(Posts.actorId eq principal.actorId.id)
}
.alias("authorized_table")
}
@ -107,4 +107,4 @@ class ExposedUserTimelineQueryService : UserTimelineQueryService, AbstractReposi
companion object {
private val logger = LoggerFactory.getLogger(ExposedUserTimelineQueryService::class.java)
}
}
}

3
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/SPAInterceptor.kt
View File

@ -11,7 +11,6 @@ import org.springframework.web.servlet.ModelAndView
class SPAInterceptor : HandlerInterceptor {
override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
if (request.getParameter("s") == "f") {
request.session.setAttribute("s", "f")
} else if (request.getParameter("s") == "t") {
@ -37,4 +36,4 @@ class SPAInterceptor : HandlerInterceptor {
modelAndView?.addObject("ogp", ogp)
modelAndView?.viewName = "index"
}
}
}

2
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/interfaces/web/IndexController.kt
View File

@ -25,4 +25,4 @@ class IndexController(
model.addAttribute("applicationConfig", applicationConfig)
return "top"
}
}
}

8
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/interfaces/web/user/UserController.kt
View File

@ -39,13 +39,15 @@ class UserController(
actorDetail
)
model.addAttribute(
"userTimeline", getUserTimelineApplicationService.execute(
"userTimeline",
getUserTimelineApplicationService.execute(
GetUserTimeline(
actorDetail.id,
Page.of(maxId, sinceId, minId, 20)
), principal
),
principal
)
)
return "userById"
}
}
}

2
hideout-core/src/main/kotlin/dev/usbharu/hideout/core/query/usertimeline/UserTimelineQueryService.kt
View File

@ -9,4 +9,4 @@ interface UserTimelineQueryService {
* replyやrepost等はnullになります
*/
suspend fun findByIdAll(idList: List<PostId>, principal: Principal): List<PostDetail>
}
}