DE translation updates

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 79a90d403c561c4454401f5bff385d019931a093..2be55b8a55dc70121c3c1a64d63e81897d409635 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -925,9 +925,9 @@ class DFRN
 
                foreach ($mentioned as $mention) {
                        $condition = ['uid' => $owner["uid"], 'nurl' => Strings::normaliseLink($mention)];
-                       $contact = DBA::selectFirst('contact', ['forum', 'prv'], $condition);
+                       $contact = DBA::selectFirst('contact', ['contact-type'], $condition);
 
-                       if (DBA::isResult($contact) && ($contact["forum"] || $contact["prv"])) {
+                       if (DBA::isResult($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
                                XML::addElement(
                                        $doc,
                                        $entry,
@@ -1547,7 +1547,7 @@ class DFRN
                if ($item["thr-parent"] != $item["uri"]) {
                        $community = false;
 
-                       if ($importer["page-flags"] == User::PAGE_FLAGS_COMMUNITY || $importer["page-flags"] == User::PAGE_FLAGS_PRVGROUP) {
+                       if ($importer['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
                                $sql_extra = "";
                                $community = true;
                                Logger::notice("possible community action");
@@ -1557,22 +1557,11 @@ class DFRN
 
                        // was the top-level post for this action written by somebody on this site?
                        // Specifically, the recipient?
-                       $parent = Post::selectFirst(['forum_mode', 'wall'],
+                       $parent = Post::selectFirst(['wall'],
                                ["`uri` = ? AND `uid` = ?" . $sql_extra, $item["thr-parent"], $importer["importer_uid"]]);
 
                        $is_a_remote_action = DBA::isResult($parent);
 
-                       /*
-                        * Does this have the characteristics of a community or private group action?
-                        * If it's an action to a wall post on a community/prvgroup page it's a
-                        * valid community action. Also forum_mode makes it valid for sure.
-                        * If neither, it's not.
-                        */
-                       if ($is_a_remote_action && $community && (!$parent["forum_mode"]) && (!$parent["wall"])) {
-                               $is_a_remote_action = false;
-                               Logger::notice("not a community action");
-                       }
-
                        if ($is_a_remote_action) {
                                return DFRN::REPLY_RC;
                        } else {
@@ -1679,7 +1668,7 @@ class DFRN
                        }
                        if ($activity->match($item["verb"], Activity::UNFRIEND)) {
                                Logger::notice("Lost sharer");
-                               Contact::removeSharer($importer, $contact, $item);
+                               Contact::removeSharer($contact);
                                return false;
                        }
                } else {
@@ -2381,14 +2370,11 @@ class DFRN
                        return false;
                }
 
-               $user = DBA::selectFirst('user', ['page-flags', 'nickname'], ['uid' => $uid]);
+               $user = DBA::selectFirst('user', ['account-type', 'nickname'], ['uid' => $uid]);
                if (!DBA::isResult($user)) {
                        return false;
                }
 
-               $community_page = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY);
-               $prvgroup = ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP);
-
                $link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']);
 
                /*
@@ -2411,7 +2397,7 @@ class DFRN
                        return false;
                }
 
-               return $community_page || $prvgroup;
+               return ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);
        }
 
        /**