X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact%2FGroup.php;h=f18e344d03fda4e59402cf0225fc68672862f929;hb=f609386ca11d805838f5526261068a69b489eab0;hp=bb05d3cc3f0ca9a68e9697e6e9d6aa122f27754e;hpb=1d44e544cfcde5f3e754af7af392b34eeb8fa0da;p=friendica.git

diff --git a/src/Model/Contact/Group.php b/src/Model/Contact/Group.php
index bb05d3cc3f..f18e344d03 100644
--- a/src/Model/Contact/Group.php
+++ b/src/Model/Contact/Group.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,7 @@
 namespace Friendica\Model\Contact;
 
 use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 
 /**
  * This class provides information about contact groups based on the "group_member" table.
@@ -35,7 +36,7 @@ class Group
 	 * @return array
 	 * @throws \Exception
 	 */
-	public static function getById(int $gid)
+	public static function getById(int $gid): array
 	{
 		$return = [];
 
@@ -52,7 +53,7 @@ class Group
 				AND NOT `contact`.`pending`
 				ORDER BY `contact`.`name` ASC',
 				$gid,
-				local_user()
+				DI::userSession()->getLocalUserId()
 			);
 
 			if (DBA::isResult($stmt)) {
@@ -73,21 +74,11 @@ class Group
 	 * @return array
 	 * @throws \Exception
 	 */
-	public static function getUngrouped(int $uid)
+	public static function listUngrouped(int $uid)
 	{
-		return q("SELECT *
-			   FROM `contact`
-			   WHERE `uid` = %d
-			   AND NOT `self`
-			   AND NOT `deleted`
-			   AND NOT `blocked`
-			   AND NOT `pending`
-			   AND `id` NOT IN (
-			   	SELECT DISTINCT(`contact-id`)
-			   	FROM `group_member`
-			   	INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
-			   	WHERE `group`.`uid` = %d
-			   )", intval($uid), intval($uid));
+		return Contact::selectToArray([], ["`uid` = ? AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `failed`
+			AND `id` NOT IN (SELECT DISTINCT(`contact-id`) FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
+			   	WHERE `group`.`uid` = ?)", $uid, $uid]);
 	}
 
 	/**