Merge pull request #14189 from annando/blocked-users

Blocked users need to be blocked

database.sql

@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2024.06-dev (Yellow Archangel)
--- DB_UPDATE_VERSION 1563
+-- DB_UPDATE_VERSION 1564
 -- ------------------------------------------
 
 

src/Model/Contact.php

@@ -626,11 +626,8 @@ class Contact
 	 */
 	public static function getPublicIdByUserId(int $uid)
 	{
-		$self = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
+		$self = self::selectFirstAccountUser(['pid'], ['self' => true, 'uid' => $uid]);
-		if (!DBA::isResult($self)) {
+		return $self['pid'] ?? false;
-			return false;
-		}
-		return self::getIdForURL($self['url']);
 	}
 
 	/**

src/Model/User.php

@@ -1492,6 +1492,12 @@ class User
 	 */
 	public static function block(int $uid, bool $block = true): bool
 	{
+		$self = Contact::getPublicIdByUserId($uid);
+		if ($block) {
+			Contact::block($self['id']);
+		} else {
+			Contact::unblock($self['id']);
+		}
 		return DBA::update('user', ['blocked' => $block], ['uid' => $uid]);
 	}
 

static/dbstructure.config.php

@@ -56,7 +56,7 @@ use Friendica\Database\DBA;
 
 // This file is required several times during the test in DbaDefinition which justifies this condition
 if (!defined('DB_UPDATE_VERSION')) {
-	define('DB_UPDATE_VERSION', 1563);
+	define('DB_UPDATE_VERSION', 1564);
 }
 
 return [

update.php

@@ -1467,3 +1467,14 @@ function update_1560()
 		return Update::FAILED;
 	}
 }
+
+function update_1564()
+{
+	$users = DBA::select('user', ['uid'], ['blocked' => true]);
+	while ($user = DBA::fetch($users)) {
+		User::block($user['uid']);
+	}
+	DBA::close($users);
+
+	return Update::SUCCESS;
+}