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

fix: ブロックとフォロー承認が出来なかった問題を修正

This commit is contained in:
usbharu 2023-12-11 11:29:15 +09:00
parent 539c65ada2
commit 2dd0bfcb8d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt
View File

@ -35,8 +35,8 @@ class ApAcceptProcessor(
val user = userQueryService.findByUrl(userUrl) val user = userQueryService.findByUrl(userUrl)
val follower = userQueryService.findByUrl(followerUrl) val follower = userQueryService.findByUrl(followerUrl)
relationshipService.acceptFollowRequest(follower.id, user.id) relationshipService.acceptFollowRequest(user.id, follower.id)
logger.debug("SUCCESS Follow from ${follower.url} to ${user.url}.") logger.debug("SUCCESS Follow from ${user.url} to ${follower.url}.")
} }
override fun isSupported(activityType: ActivityType): Boolean = activityType == ActivityType.Accept override fun isSupported(activityType: ActivityType): Boolean = activityType == ActivityType.Accept

10
src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt vendored
View File

@ -39,14 +39,14 @@ class DeliverBlockJob(@Qualifier("activitypub") private val objectMapper: Object
override fun convert(value: DeliverBlockJobParam): ScheduleContext<DeliverBlockJob>.(DeliverBlockJob) -> Unit = { override fun convert(value: DeliverBlockJobParam): ScheduleContext<DeliverBlockJob>.(DeliverBlockJob) -> Unit = {
props[block] = objectMapper.writeValueAsString(value.block) props[block] = objectMapper.writeValueAsString(value.block)
props[reject] = objectMapper.writeValueAsString(value.reject) props[reject] = objectMapper.writeValueAsString(value.reject)
props[reject] = value.inbox props[inbox] = value.inbox
props[signer] = value.signer props[signer] = value.signer
} }
override fun convert(props: JobProps<DeliverBlockJob>): DeliverBlockJobParam = DeliverBlockJobParam( override fun convert(props: JobProps<DeliverBlockJob>): DeliverBlockJobParam = DeliverBlockJobParam(
props[signer], signer = props[signer],
objectMapper.readValue(props[block]), block = objectMapper.readValue(props[block]),
objectMapper.readValue(props[reject]), reject = objectMapper.readValue(props[reject]),
props[inbox] inbox = props[inbox]
) )
} }