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

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

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

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

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

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

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

8
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) .select(Posts.columns)
.where { .where {
Posts.visibility eq Visibility.PUBLIC.name or Posts.visibility eq Visibility.PUBLIC.name or
(Posts.visibility eq Visibility.UNLISTED.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.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.visibility eq Visibility.FOLLOWERS.name and (Relationships.blocking eq false and (relationshipsAlias[Relationships.following] eq true))) or
(Posts.actorId eq principal.actorId.id) (Posts.actorId eq principal.actorId.id)
} }
.alias("authorized_table") .alias("authorized_table")
} }

1
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 { class SPAInterceptor : HandlerInterceptor {
override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean { override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
if (request.getParameter("s") == "f") { if (request.getParameter("s") == "f") {
request.session.setAttribute("s", "f") request.session.setAttribute("s", "f")
} else if (request.getParameter("s") == "t") { } else if (request.getParameter("s") == "t") {

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

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