Merge pull request #481 from VernissageApp/develop

Merge develop into main

Author: mczachurski

Sources/VernissageServer/Models/UserType.swift

@@ -73,14 +73,14 @@ extension PersonDto {
                 }
             }
 
-            return self.getPreferredUsername(userName: self.preferredUsername, host: personUrl)
+            return self.getPreferredUsername(userName: self.preferredUsername, host: personUrl.host)
         default:
             let urls = self.url?.values()
             guard let urls, let personUrl = urls.first else {
                 throw PersonError.missingUrl
             }
 
-            return self.getPreferredUsername(userName: self.preferredUsername, host: personUrl)
+            return self.getPreferredUsername(userName: self.preferredUsername, host: personUrl.host)
         }
     }
 

Sources/VernissageServer/Services/SearchService.swift

@@ -120,24 +120,24 @@ final class SearchService: SearchServiceType {
         let profileImageFileName = await self.downloadHeaderImage(personProfile: personProfile, on: context)
 
         // Update profile in internal database and return it.
-        let user = await self.update(personProfile: personProfile,
-                                     profileIconFileName: profileIconFileName,
-                                     profileImageFileName: profileImageFileName,
-                                     on: context)
+        guard let user = await self.update(personProfile: personProfile,
+                                           profileIconFileName: profileIconFileName,
+                                           profileImageFileName: profileImageFileName,
+                                           on: context) else {
+            // When we cannot update new user profile into database we have to return existing user data.
+            return userFromDatabase
+        }
 
-        if let user {
-            // Downlaod updated flexi fields.
-            let flexiFieldService = context.services.flexiFieldService
-            let flexiFields = try? await flexiFieldService.getFlexiFields(for: user.requireID(), on: context.db)
-            
-            // Enqueue job for flexi field URL validator.
-            if let flexiFields {
-                try? await flexiFieldService.dispatchUrlValidator(flexiFields: flexiFields, on: context)
-            }
+        // Downlaod updated flexi fields.
+        let flexiFieldService = context.services.flexiFieldService
+        let flexiFields = try? await flexiFieldService.getFlexiFields(for: user.requireID(), on: context.db)
+        
+        // Enqueue job for flexi field URL validator.
+        if let flexiFields {
+            try? await flexiFieldService.dispatchUrlValidator(flexiFields: flexiFields, on: context)
         }
 
-        // If the user is updated successfully, we return the new data - otherwise, we return the user data from the database.
-        return user ?? userFromDatabase
+        return user
     }
 
     func getRemoteActivityPubProfile(userName: String, on context: ExecutionContext) async -> String? {