Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / src / Object / Post.php

diff --git a/src/Object/Post.php b/src/Object/Post.php
index a055f6525194b42d8ddda932de8647316ef6def6..35805e1fddb5112c55cd3c1b7a314f957c3c5a2a 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -11,6 +11,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
@@ -84,14 +85,14 @@ class Post extends BaseObject
                if (!empty($data['children'])) {
                        foreach ($data['children'] as $item) {
                                // Only add will be displayed
-                               if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+                               if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
                                        continue;
                                } elseif (!visible_activity($item)) {
                                        continue;
                                }
 
                                // You can always comment on Diaspora and OStatus items
-                               if (in_array($item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA]) && (local_user() == $item['uid'])) {
+                               if (in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA]) && (local_user() == $item['uid'])) {
                                        $item['writable'] = true;
                                }
 
@@ -156,7 +157,7 @@ class Post extends BaseObject
                        if ($item["event-id"] != 0) {
                                $edpost = ["events/event/" . $item['event-id'], L10n::t("Edit")];
                        } else {
-                               $edpost = ["editpost/" . $item['id'], L10n::t("Edit")];
+                               $edpost = ["editpost/" . $item['id'] . "/" . base64_encode($a->cmd), L10n::t("Edit")];
                        }
                        $dropping = in_array($item['uid'], [0, local_user()]);
                } else {
@@ -252,6 +253,18 @@ class Post extends BaseObject
                $tagger = '';
 
                if ($this->isToplevel()) {
+                       $thread = Item::selectFirstThreadForUser(local_user(), ['ignored'], ['iid' => $item['id']]);
+                       if (DBA::isResult($thread)) {
+                               $ignore = [
+                                       'do'        => L10n::t("ignore thread"),
+                                       'undo'      => L10n::t("unignore thread"),
+                                       'toggle'    => L10n::t("toggle ignore status"),
+                                       'classdo'   => $thread['ignored'] ? "hidden" : "",
+                                       'classundo' => $thread['ignored'] ? "" : "hidden",
+                                       'ignored'   => L10n::t('ignored'),
+                               ];
+                       }
+
                        if ($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) {
                                $isstarred = (($item['starred']) ? "starred" : "unstarred");
 
@@ -264,18 +277,6 @@ class Post extends BaseObject
                                        'starred'   => L10n::t('starred'),
                                ];
 
-                               $thread = DBA::selectFirst('thread', ['ignored'], ['uid' => $item['uid'], 'iid' => $item['id']]);
-                               if (DBA::isResult($thread)) {
-                                       $ignore = [
-                                               'do'        => L10n::t("ignore thread"),
-                                               'undo'      => L10n::t("unignore thread"),
-                                               'toggle'    => L10n::t("toggle ignore status"),
-                                               'classdo'   => $thread['ignored'] ? "hidden" : "",
-                                               'classundo' => $thread['ignored'] ? "" : "hidden",
-                                               'ignored'   => L10n::t('ignored'),
-                                       ];
-                               }
-
                                if (Feature::isEnabled($conv->getProfileOwner(), 'commtag')) {
                                        $tagger = [
                                                'add'   => L10n::t("add tag"),
@@ -323,17 +324,17 @@ class Post extends BaseObject
                $owner_name_e = $this->getOwnerName();
 
                // Disable features that aren't available in several networks
-               if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) {
+               if (!in_array($item["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA]) && isset($buttons["dislike"])) {
                        unset($buttons["dislike"]);
                        $isevent = false;
                        $tagger = '';
                }
 
-               if (($item["network"] == NETWORK_FEED) && isset($buttons["like"])) {
+               if (($item["network"] == Protocol::FEED) && isset($buttons["like"])) {
                        unset($buttons["like"]);
                }
 
-               if (($item["network"] == NETWORK_MAIL) && isset($buttons["like"])) {
+               if (($item["network"] == Protocol::MAIL) && isset($buttons["like"])) {
                        unset($buttons["like"]);
                }
 
@@ -401,7 +402,7 @@ class Post extends BaseObject
                        'thread_level'    => $thread_level,
                        'edited'          => $edited,
                        'network'         => $item["network"],
-                       'network_name'    => ContactSelector::networkToName($item['network'], $profile_link),
+                       'network_name'    => ContactSelector::networkToName($item['network'], $item['author-link']),
                        'received'        => $item['received'],
                        'commented'       => $item['commented'],
                        'created_date'    => $item['created'],
@@ -489,7 +490,7 @@ class Post extends BaseObject
                /*
                 * Only add what will be displayed
                 */
-               if ($item->getDataValue('network') === NETWORK_MAIL && local_user() != $item->getDataValue('uid')) {
+               if ($item->getDataValue('network') === Protocol::MAIL && local_user() != $item->getDataValue('uid')) {
                        return false;
                } elseif (activity_match($item->getDataValue('verb'), ACTIVITY_LIKE) || activity_match($item->getDataValue('verb'), ACTIVITY_DISLIKE)) {
                        return false;