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

fix: #214

This commit is contained in:
usbharu 2023-12-13 16:07:43 +09:00
parent b3723da219
commit 8a7ff91a95
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Person.kt
View File

@ -6,9 +6,9 @@ open class Person
@Suppress("LongParameterList") @Suppress("LongParameterList")
constructor( constructor(
type: List<String> = emptyList(), type: List<String> = emptyList(),
override val name: String, val name: String?,
override val id: String, override val id: String,
var preferredUsername: String?, var preferredUsername: String,
var summary: String?, var summary: String?,
var inbox: String, var inbox: String,
var outbox: String, var outbox: String,
@ -19,7 +19,7 @@ constructor(
var followers: String?, var followers: String?,
var following: String?, var following: String?,
val manuallyApprovesFollowers: Boolean? = false val manuallyApprovesFollowers: Boolean? = false
) : Object(add(type, "Person")), HasId, HasName { ) : Object(add(type, "Person")), HasId {
@Suppress("CyclomaticComplexMethod", "CognitiveComplexMethod") @Suppress("CyclomaticComplexMethod", "CognitiveComplexMethod")
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
@ -67,20 +67,20 @@ constructor(
override fun toString(): String { override fun toString(): String {
return "Person(" + return "Person(" +
"name='$name', " + "name='$name', " +
"id='$id', " + "id='$id', " +
"preferredUsername=$preferredUsername, " + "preferredUsername=$preferredUsername, " +
"summary=$summary, " + "summary=$summary, " +
"inbox='$inbox', " + "inbox='$inbox', " +
"outbox='$outbox', " + "outbox='$outbox', " +
"url='$url', " + "url='$url', " +
"icon=$icon, " + "icon=$icon, " +
"publicKey=$publicKey, " + "publicKey=$publicKey, " +
"endpoints=$endpoints, " + "endpoints=$endpoints, " +
"followers=$followers, " + "followers=$followers, " +
"following=$following, " + "following=$following, " +
"manuallyApprovesFollowers=$manuallyApprovesFollowers" + "manuallyApprovesFollowers=$manuallyApprovesFollowers" +
")" + ")" +
" ${super.toString()}" " ${super.toString()}"
} }
} }

2
src/main/kotlin/dev/usbharu/hideout/activitypub/service/objects/user/APUserService.kt
View File

@ -96,7 +96,7 @@ class APUserServiceImpl(
name = person.preferredUsername name = person.preferredUsername
?: throw IllegalActivityPubObjectException("preferredUsername is null"), ?: throw IllegalActivityPubObjectException("preferredUsername is null"),
domain = id.substringAfter("://").substringBefore("/"), domain = id.substringAfter("://").substringBefore("/"),
screenName = person.name, screenName = person.name ?: person.preferredUsername,
description = person.summary.orEmpty(), description = person.summary.orEmpty(),
inbox = person.inbox, inbox = person.inbox,
outbox = person.outbox, outbox = person.outbox,