From 0b1d4d0666fef1f4ce83def2c634c63f10117b64 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 6 Dec 2023 18:19:33 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20#191=20Image=E3=81=AEmediaType=E3=82=92n?= =?UTF-8?q?ullable=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hideout/activitypub/domain/model/Image.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt index 5b63ef5e..c3e4649a 100644 --- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt +++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Image.kt @@ -4,12 +4,11 @@ import dev.usbharu.hideout.activitypub.domain.model.objects.Object open class Image( type: List = emptyList(), - val mediaType: String, + val mediaType: String? = null, val url: String ) : Object( add(type, "Image") ) { - override fun equals(other: Any?): Boolean { if (this === other) return true if (javaClass != other?.javaClass) return false @@ -25,10 +24,18 @@ open class Image( override fun hashCode(): Int { var result = super.hashCode() - result = 31 * result + mediaType.hashCode() + result = 31 * result + (mediaType?.hashCode() ?: 0) result = 31 * result + url.hashCode() return result } - override fun toString(): String = "Image(mediaType=$mediaType, url=$url) ${super.toString()}" + override fun toString(): String { + return "Image(" + + "mediaType=$mediaType, " + + "url='$url'" + + ")" + + " ${super.toString()}" + } + + }