switch to new user system (#167)

YDWK · Jun 20, 2023 · 476f492 · 476f492
1 parent 7951f41
commit 476f492
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 org.gradle.daemon=true
 kotlin.code.style=official
-version = 1.6.5
+version = 1.7.0
 
 ## Dependencies Versions and Plugin
 
@@ -20,7 +20,7 @@ sysoutOverSlf4jVersion = 1.0.2
 jconfigVersion = 1.0.8
 okhttp3Version = 5.0.0-alpha.11
 nvWebsocketClientVersion = 2.14
-ydeVersion = 1.0.8
+ydeVersion = 1.0.9
 kotlinTestVersion = 1.8.10
 kotlinxCoroutinesCoreVersion = 1.7.1
 jsr305Version = 3.0.2

diff --git a/src/main/kotlin/io/github/ydwk/ydwk/evm/event/events/user/UserAvatarUpdateEvent.kt b/src/main/kotlin/io/github/ydwk/ydwk/evm/event/events/user/UserAvatarUpdateEvent.kt
@@ -19,6 +19,7 @@
 package io.github.ydwk.ydwk.evm.event.events.user
 
 import io.github.ydwk.yde.entities.User
+import io.github.ydwk.yde.entities.user.Avatar
 import io.github.ydwk.ydwk.YDWK
 import io.github.ydwk.ydwk.evm.annotations.UserEvent
 
@@ -34,6 +35,6 @@ import io.github.ydwk.ydwk.evm.annotations.UserEvent
 data class UserAvatarUpdateEvent(
     override val ydwk: YDWK,
     override val entity: User,
-    val oldAvatar: String,
-    val newAvatar: String,
-) : GenericUserUpdateEvent<String>(ydwk, entity, oldAvatar, newAvatar)
+    val oldAvatar: Avatar?,
+    val newAvatar: Avatar?,
+) : GenericUserUpdateEvent<Avatar?>(ydwk, entity, oldAvatar, newAvatar)
diff --git a/src/main/kotlin/io/github/ydwk/ydwk/evm/handler/handlers/user/UserUpdateHandler.kt b/src/main/kotlin/io/github/ydwk/ydwk/evm/handler/handlers/user/UserUpdateHandler.kt
@@ -60,10 +60,13 @@ class UserUpdateHandler(ydwk: YDWKImpl, json: JsonNode) : Handler(ydwk, json) {
                 UserDiscriminatorUpdateEvent(ydwk, user, oldDiscriminator, newDiscriminator))
         }
 
+        val oldAvatarHash = user.avatarHash
         val oldAvatar = user.avatar
-        val newAvatar = userJson.get("avatar").asText()
-        if (!Objects.deepEquals(oldAvatar, newAvatar)) {
-            user.avatar = newAvatar
+        val newAvatarHash = if (json.hasNonNull("avatar")) json["avatar"].asText() else null
+        if (!Objects.deepEquals(oldAvatarHash, newAvatarHash)) {
+            user.avatarHash = newAvatarHash
+            val newAvatar =
+                (user as UserImpl).getAvatar(ydwk, user.discriminator, newAvatarHash, null)
             ydwk.emitEvent(UserAvatarUpdateEvent(ydwk, user, oldAvatar, newAvatar))
         }