From d3e3c1eb3efebe68ffec7efe4a5d71f9f09dc61c Mon Sep 17 00:00:00 2001
From: silverpill <silverpill@firemail.cc>
Date: Mon, 14 Feb 2022 21:36:52 +0000
Subject: [PATCH] Refactor struct conversion in create_account() handler

---
 src/activitypub/actor.rs           |  1 +
 src/mastodon_api/accounts/types.rs | 15 ---------------
 src/mastodon_api/accounts/views.rs | 12 ++++++++++--
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/activitypub/actor.rs b/src/activitypub/actor.rs
index dbd5fa9..92f2658 100644
--- a/src/activitypub/actor.rs
+++ b/src/activitypub/actor.rs
@@ -38,6 +38,7 @@ pub struct Image {
 #[derive(Clone, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ActorCapabilities {
+    // Actpr accepts ChatMessage objects
     accepts_chat_messages: Option<bool>,
 }
 
diff --git a/src/mastodon_api/accounts/types.rs b/src/mastodon_api/accounts/types.rs
index b62eb99..7fde10f 100644
--- a/src/mastodon_api/accounts/types.rs
+++ b/src/mastodon_api/accounts/types.rs
@@ -15,7 +15,6 @@ use crate::models::users::types::{
     validate_local_username,
     validate_wallet_address,
     User,
-    UserCreateData,
 };
 use crate::utils::files::{FileError, save_validated_b64_file, get_file_url};
 
@@ -122,20 +121,6 @@ impl AccountCreateData {
         };
         Ok(())
     }
-
-    pub fn into_user_data(
-        self,
-        password_hash: String,
-        private_key_pem: String,
-    ) -> UserCreateData {
-        UserCreateData {
-            username: self.username,
-            password_hash,
-            private_key_pem,
-            wallet_address: self.wallet_address,
-            invite_code: self.invite_code,
-        }
-    }
 }
 
 #[derive(Deserialize)]
diff --git a/src/mastodon_api/accounts/views.rs b/src/mastodon_api/accounts/views.rs
index 0dc9534..c6c3eb8 100644
--- a/src/mastodon_api/accounts/views.rs
+++ b/src/mastodon_api/accounts/views.rs
@@ -40,6 +40,7 @@ use crate::models::users::queries::{
     is_valid_invite_code,
     create_user,
 };
+use crate::models::users::types::UserCreateData;
 use crate::utils::crypto::{
     hash_password,
     generate_private_key,
@@ -90,8 +91,15 @@ pub async fn create_account(
     let private_key_pem = serialize_private_key(private_key)
         .map_err(|_| HttpError::InternalError)?;
 
-    let user_data = account_data.into_inner()
-        .into_user_data(password_hash, private_key_pem);
+    let AccountCreateData { username, wallet_address, invite_code, .. } =
+        account_data.into_inner();
+    let user_data = UserCreateData {
+        username,
+        password_hash,
+        private_key_pem,
+        wallet_address,
+        invite_code,
+    };
     let user = match create_user(db_client, user_data).await {
         Ok(user) => user,
         Err(DatabaseError::AlreadyExists(_)) =>