diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt index b1838ed4..24a54ef5 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/ApAcceptProcessor.kt @@ -35,8 +35,8 @@ class ApAcceptProcessor( val user = userQueryService.findByUrl(userUrl) val follower = userQueryService.findByUrl(followerUrl) - relationshipService.acceptFollowRequest(follower.id, user.id) - logger.debug("SUCCESS Follow from ${follower.url} to ${user.url}.") + relationshipService.acceptFollowRequest(user.id, follower.id) + logger.debug("SUCCESS Follow from ${user.url} to ${follower.url}.") } override fun isSupported(activityType: ActivityType): Boolean = activityType == ActivityType.Accept diff --git a/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt b/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt index 988b5b1a..482760e1 100644 --- a/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt +++ b/src/main/kotlin/dev/usbharu/hideout/core/external/job/DeliverBlockJob.kt @@ -39,14 +39,14 @@ class DeliverBlockJob(@Qualifier("activitypub") private val objectMapper: Object override fun convert(value: DeliverBlockJobParam): ScheduleContext.(DeliverBlockJob) -> Unit = { props[block] = objectMapper.writeValueAsString(value.block) props[reject] = objectMapper.writeValueAsString(value.reject) - props[reject] = value.inbox + props[inbox] = value.inbox props[signer] = value.signer } override fun convert(props: JobProps): DeliverBlockJobParam = DeliverBlockJobParam( - props[signer], - objectMapper.readValue(props[block]), - objectMapper.readValue(props[reject]), - props[inbox] + signer = props[signer], + block = objectMapper.readValue(props[block]), + reject = objectMapper.readValue(props[reject]), + inbox = props[inbox] ) }