Merge branch 'main' of https://github.com/mooxphp/moox

packages/press/src/Resources/WpUserResource/Pages/EditWpUser.php

@@ -10,7 +10,6 @@
 use Moox\Press\Models\WpBasePost;
 use Moox\Press\Models\WpPostMeta;
 use Moox\Press\Models\WpUser;
-use Moox\Press\Models\WpUserMeta;
 use Moox\Press\Resources\WpUserResource;
 use Symfony\Component\Mime\MimeTypes;
 
@@ -58,6 +57,13 @@ protected function afterSave(): void
 
         $user->save();
 
+        $metaFields = config('press.default_user_meta', []);
+        foreach ($metaFields as $metaKey => $defaultValue) {
+            if (isset($this->data[$metaKey])) {
+                $user->addOrUpdateMeta($metaKey, $this->data[$metaKey]);
+            }
+        }
+
         $temporaryFilePath = $this->data['temporary_file_path'] ?? null;
         $originalName = $this->data['original_name'] ?? null;
         $attachmentId = null;
@@ -138,33 +144,6 @@ protected function afterSave(): void
             Storage::delete($temporaryFilePath);
         }
 
-        $metaDataConfig = config('press.default_user_meta');
-
-        foreach ($metaDataConfig as $metaKey => $defaultValue) {
-            $metaValue = $this->data[$metaKey] ?? $defaultValue;
-
-            if ($metaKey === 'nickname') {
-                $metaValue = $this->data['user_login'];
-            }
-
-            if ($metaKey === 'mm_sua_attachment_id') {
-                if ($temporaryFilePath) {
-                    $metaValue = $attachmentId;
-                } elseif (empty($this->data['image_url'])) {
-                    $metaValue = '';
-                }
-            }
-
-            if ($this->record instanceof WpUser) {
-                $userId = $this->record->ID;
-
-                WpUserMeta::updateOrCreate(
-                    ['user_id' => $userId, 'meta_key' => $metaKey],
-                    ['meta_value' => $metaValue]
-                );
-            }
-        }
-
         Event::dispatch('eloquent.updated: '.get_class($this->record), $this->record);
     }
 }