Merge branch 'main' into issue-9115

Author: SuperGrut

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [2.85.3](https://github.com/EddieHubCommunity/BioDrop/compare/v2.85.2...v2.85.3) (2023-11-10)
+
+
+### Bug Fixes
+
+* profile settings domain ([#9758](https://github.com/EddieHubCommunity/BioDrop/issues/9758)) ([17d43e6](https://github.com/EddieHubCommunity/BioDrop/commit/17d43e6fb0095d96599e47f99e3a82a7b1840e9f))
+
+
+
 ## [2.85.2](https://github.com/EddieHubCommunity/BioDrop/compare/v2.85.1...v2.85.2) (2023-11-08)
 
 
@@ -34,12 +43,3 @@
 
 
 
-## [2.84.4](https://github.com/EddieHubCommunity/BioDrop/compare/v2.84.3...v2.84.4) (2023-11-05)
-
-
-### Bug Fixes
-
-* navbar menu z-index issue in mobile dark mode ([#9732](https://github.com/EddieHubCommunity/BioDrop/issues/9732)) ([78c8079](https://github.com/EddieHubCommunity/BioDrop/commit/78c807939a88b3ae49d68b507112db8e9ed404af))
-
-
-

config/app.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.85.2",
+  "version": "2.85.3",
   "alerts": [],
   "layouts": [
     "classic",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "biodrop",
-  "version": "2.85.2",
+  "version": "2.85.3",
   "private": false,
   "homepage": "https://biodrop.io",
   "engines": {

package.json

@@ -112,12 +112,12 @@ export async function updateSettingsApi(context, username, data) {
   update.domain = update.domain.replaceAll(".", "|"); // TODO: use getter/setter instead
 
   // check if domain is already used
-  if (update.domain) {
+  if (data.domain && data.domain !== beforeUpdate.domain) {
     const domainCheck = await Profile.findOne({
       "settings.domain": update.domain,
     });
     if (domainCheck) {
-      const domainCheckError = `Domain "${update.domain}" is already in use for username: ${username}`;
+      const domainCheckError = `Domain "${data.domain}" is already in use for username: ${username}`;
       log.error(domainCheckError);
       return { error: domainCheckError };
     }