From 25efe83176ad3768fe4c893f5825299fb1d463eb Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:59:32 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20undo=E3=81=ABpublished=E3=81=8C=E5=BF=85?=
 =?UTF-8?q?=E9=A0=88=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../usbharu/hideout/activitypub/domain/model/Undo.kt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt
index 178373fd..6f27026e 100644
--- a/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/activitypub/domain/model/Undo.kt
@@ -11,7 +11,7 @@ open class Undo(
     override val id: String,
     @JsonDeserialize(using = ObjectDeserializer::class)
     @JsonProperty("object") val apObject: Object,
-    val published: String
+    val published: String?
 ) : Object(add(type, "Undo")), HasId, HasActor {
 
     override fun equals(other: Any?): Boolean {
@@ -21,20 +21,20 @@ open class Undo(
 
         other as Undo
 
-        if (apObject != other.apObject) return false
-        if (published != other.published) return false
         if (actor != other.actor) return false
         if (id != other.id) return false
+        if (apObject != other.apObject) return false
+        if (published != other.published) return false
 
         return true
     }
 
     override fun hashCode(): Int {
         var result = super.hashCode()
-        result = 31 * result + apObject.hashCode()
-        result = 31 * result + published.hashCode()
         result = 31 * result + actor.hashCode()
         result = 31 * result + id.hashCode()
+        result = 31 * result + apObject.hashCode()
+        result = 31 * result + (published?.hashCode() ?: 0)
         return result
     }
 
@@ -43,7 +43,7 @@ open class Undo(
                 "actor='$actor', " +
                 "id='$id', " +
                 "apObject=$apObject, " +
-                "published='$published'" +
+                "published=$published" +
                 ")" +
                 " ${super.toString()}"
     }