X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FUser.php;h=af7a81a15dccc4a2ad22879d68beae7cb5eea192;hb=f2c1ecd19bb344137a91faab58d9a2524e0c8893;hp=89d75849fe9430057a65a34953c718e7b68d516f;hpb=0ea93bfba14d708d1e9f5b747f406b6f39f97ff4;p=friendica.git

diff --git a/src/Model/User.php b/src/Model/User.php
index 89d75849fe..af7a81a15d 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -37,6 +37,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Module;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Security\TwoFactor\Model\AppSpecificPassword;
 use Friendica\Network\HTTPException;
 use Friendica\Object\Image;
@@ -880,6 +881,20 @@ class User
 		]);
 	}
 
+	/**
+	 * Returns if the given uid is valid and a moderator
+	 *
+	 * @param int $uid
+	 *
+	 * @return bool
+	 * @throws Exception
+	 */
+	public static function isModerator(int $uid): bool
+	{
+		// @todo Replace with a moderator check in the future
+		return self::isSiteAdmin($uid);
+	}
+
 	/**
 	 * Checks if a nickname is in the list of the forbidden nicknames
 	 *
@@ -1314,33 +1329,18 @@ class User
 	/**
 	 * Update a user entry and distribute the changes if needed
 	 *
-	 * @param array $fields
+	 * @param array   $fields
 	 * @param integer $uid
 	 * @return boolean
+	 * @throws Exception
 	 */
 	public static function update(array $fields, int $uid): bool
 	{
-		$old_owner = self::getOwnerDataById($uid);
-		if (empty($old_owner)) {
-			return false;
-		}
-
 		if (!DBA::update('user', $fields, ['uid' => $uid])) {
 			return false;
 		}
 
-		$update = Contact::updateSelfFromUserID($uid);
-
-		$owner = self::getOwnerDataById($uid);
-		if (empty($owner)) {
-			return false;
-		}
-
-		if ($old_owner['name'] != $owner['name']) {
-			Profile::update(['name' => $owner['name']], $uid);
-		}
-
-		if ($update) {
+		if (Contact::updateSelfFromUserID($uid)) {
 			Profile::publishUpdate($uid);
 		}