DE translation updates

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

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 833c616ab9b2eafaf438b305757b6844a9c99d00..2be55b8a55dc70121c3c1a64d63e81897d409635 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -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,
@@ -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 {