disable formatbar in xs screens

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 6aaf67a6eb3d9314538799816fcbe95718dd9332..ca01997f6aa17df4db0d4966d56f037f20bef1f2 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.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\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -411,7 +412,8 @@ function conv_get_blocklist()
        $blocklist = [];
 
        foreach (explode(',', $str_blocked) as $entry) {
-               $cid = Contact::getIdForURL(trim($entry), 0, true);
+               // The 4th parameter guarantees that there always will be a public contact entry
+               $cid = Contact::getIdForURL(trim($entry), 0, true, ['url' => trim($entry)]);
                if (!empty($cid)) {
                        $blocklist[] = $cid;
                }
@@ -469,6 +471,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                . "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
                }
        } elseif ($mode === 'profile') {
+               $items = conversation_add_children($items, false, $order, $uid);
                $profile_owner = $a->profile['profile_uid'];
 
                if (!$update) {
@@ -488,6 +491,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                        }
                }
        } elseif ($mode === 'notes') {
+               $items = conversation_add_children($items, false, $order, $uid);
                $profile_owner = local_user();
 
                if (!$update) {
@@ -496,6 +500,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                . "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
                }
        } elseif ($mode === 'display') {
+               $items = conversation_add_children($items, false, $order, $uid);
                $profile_owner = $a->profile['uid'];
 
                if (!$update) {
@@ -512,6 +517,15 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                . "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 10)
                                ."/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
                }
+       } elseif ($mode === 'contacts') {
+               $items = conversation_add_children($items, true, $order, $uid);
+               $profile_owner = 0;
+
+               if (!$update) {
+                       $live_update_div = '<div id="live-contacts"></div>' . "\r\n"
+                               . "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 9)
+                               ."/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+               }
        } elseif ($mode === 'search') {
                $live_update_div = '<div id="live-search"></div>' . "\r\n";
        }
@@ -539,10 +553,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
        $page_template = get_markup_template("conversation.tpl");
 
        if (!empty($items)) {
-               if ($mode === 'community') {
+               if (in_array($mode, ['community', 'contacts'])) {
                        $writable = true;
                } else {
-                       $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+                       $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
                }
 
                if (!local_user()) {
@@ -575,7 +589,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                $sparkle     = '';
 
                                // prevent private email from leaking.
-                               if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+                               if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
                                        continue;
                                }
 
@@ -713,7 +727,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                builtin_activity_puller($item, $conv_responses);
 
                                // Only add what is visible
-                               if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+                               if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
                                        continue;
                                }
 
@@ -793,7 +807,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
        foreach ($items as $index => $item) {
                if ($item['uid'] == 0) {
-                       $items[$index]['writable'] = in_array($item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+                       $items[$index]['writable'] = in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
                }
        }
 
@@ -842,7 +856,7 @@ function item_photo_menu($item) {
                $contact_url = 'contacts/' . $cid;
                $posts_link = 'contacts/' . $cid . '/posts';
 
-               if (in_array($network, [NETWORK_DFRN, NETWORK_DIASPORA])) {
+               if (in_array($network, [Protocol::DFRN, Protocol::DIASPORA])) {
                        $pm_url = 'message/new/' . $cid;
                }
        }
@@ -858,12 +872,12 @@ function item_photo_menu($item) {
                        L10n::t('Send PM') => $pm_url
                ];
 
-               if ($network == NETWORK_DFRN) {
+               if ($network == Protocol::DFRN) {
                        $menu[L10n::t("Poke")] = $poke_link;
                }
 
                if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
-                       in_array($item['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
+                       in_array($item['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
                        $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
                }
        } else {