Merge pull request #8063 from MrPetovan/bug/8058-use-default-user-acl-events

[friendica.git] / src / Model / Group.php

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 50160baaf4a88d56a5bcf53d47514ded6f128641..b87458756a94e14d487a593704a78a4034abcb6b 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -6,7 +6,6 @@
 namespace Friendica\Model;
 
 use Friendica\BaseModule;
-use Friendica\BaseObject;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -16,7 +15,7 @@ use Friendica\Database\DBA;
 /**
  * @brief functions for interacting with the group database table
  */
-class Group extends BaseObject
+class Group
 {
        const FOLLOWERS = '~';
        const MUTUALS = '&';
@@ -328,13 +327,28 @@ class Group extends BaseObject
                }
 
                $return = [];
+               $pubmail = false;
+               $networks = Protocol::SUPPORT_PRIVATE;
+
+               $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', $uid]);
+               if (DBA::isResult($mailacct)) {
+                       $pubmail = $mailacct['pubmail'];
+               }
+
+               if (!$pubmail) {
+                       $networks = array_diff($networks, [Protocol::MAIL]);
+               }
 
                $key = array_search(self::FOLLOWERS, $group_ids);
                if ($key !== false) {
                        $followers = Contact::selectToArray(['id'], [
                                'uid' => $uid,
                                'rel' => [Contact::FOLLOWER, Contact::FRIEND],
-                               'protocol' => Protocol::SUPPORT_PRIVATE,
+                               'network' => $networks,
+                               'contact-type' => [Contact::TYPE_UNKNOWN, Contact::TYPE_PERSON],
+                               'archive' => false,
+                               'pending' => false,
+                               'blocked' => false,
                        ]);
 
                        foreach ($followers as $follower) {
@@ -349,7 +363,11 @@ class Group extends BaseObject
                        $mutuals = Contact::selectToArray(['id'], [
                                'uid' => $uid,
                                'rel' => [Contact::FRIEND],
-                               'protocol' => Protocol::SUPPORT_PRIVATE,
+                               'network' => $networks,
+                               'contact-type' => [Contact::TYPE_UNKNOWN, Contact::TYPE_PERSON],
+                               'archive' => false,
+                               'pending' => false,
+                               'blocked' => false,
                        ]);
 
                        foreach ($mutuals as $mutual) {
@@ -366,7 +384,7 @@ class Group extends BaseObject
                DBA::close($stmt);
 
                if ($check_dead) {
-                       Contact::pruneUnavailable($return);
+                       $return = Contact::pruneUnavailable($return);
                }
 
                return $return;