Merge remote-tracking branch 'upstream/2018.08-rc' into ap1

diff --combined composer.json
index 329c22664f031604e296a90c1826d44f0951a92c,c717775506f74ca26e145e6f8332d77c03195963..b1fde04eb910080fe1dcf48cc90a5ee514b64957
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -18,13 -18,12 +18,12 @@@
                "asika/simple-console": "^1.0",
                "divineomega/password_exposed": "^2.4",
                "ezyang/htmlpurifier": "~4.7.0",
-               "league/html-to-markdown": "~4.4.1",
+               "league/html-to-markdown": "~4.8.0",
                "lightopenid/lightopenid": "dev-master",
                "michelf/php-markdown": "^1.7",
                "mobiledetect/mobiledetectlib": "2.8.*",
                "paragonie/random_compat": "^2.0",
                "pear/Text_LanguageDetect": "1.*",
-               "pear/Text_Highlighter": "dev-master",
                "seld/cli-prompt": "^1.0",
                "smarty/smarty": "^3.1",
                "fxp/composer-asset-plugin": "~1.3",
@@@ -38,8 -37,7 +37,8 @@@
                "npm-asset/jgrowl": "^1.4",
                "npm-asset/fullcalendar": "^3.0.1",
                "npm-asset/cropperjs": "1.2.2",
 -              "npm-asset/imagesloaded": "4.1.4"
 +              "npm-asset/imagesloaded": "4.1.4",
 +              "digitalbazaar/json-ld": "^0.4.7"
        },
        "repositories": [
                {

diff --combined composer.lock
index a564990347847311060b709b2d99cdd31000bf88,b0ff745c681f2eaf75187c29fdda973dc68959ad..42e6c3661bf9e4810809a29dd26e40f418edb9e7
--- 1/composer.lock
--- 2/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,7 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
          "This file is @generated automatically"
      ],
 -    "content-hash": "5f6a43237dc52758484cd21cd76e8ce6",
 +    "content-hash": "7bfbddde186f6599a2f2012bb13cbbd8",
      "packages": [
          {
              "name": "asika/simple-console",
@@@ -149,52 -149,6 +149,52 @@@
              },
              "type": "bower-asset-library"
          },
 +        {
 +            "name": "digitalbazaar/json-ld",
 +            "version": "0.4.7",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/digitalbazaar/php-json-ld.git",
 +                "reference": "dc1bd23f0ee2efd27ccf636d32d2738dabcee182"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/digitalbazaar/php-json-ld/zipball/dc1bd23f0ee2efd27ccf636d32d2738dabcee182",
 +                "reference": "dc1bd23f0ee2efd27ccf636d32d2738dabcee182",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "ext-json": "*",
 +                "php": ">=5.3.0"
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "files": [
 +                    "jsonld.php"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "BSD-3-Clause"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Digital Bazaar, Inc.",
 +                    "email": "support@digitalbazaar.com"
 +                }
 +            ],
 +            "description": "A JSON-LD Processor and API implementation in PHP.",
 +            "homepage": "https://github.com/digitalbazaar/php-json-ld",
 +            "keywords": [
 +                "JSON-LD",
 +                "Linked Data",
 +                "RDF",
 +                "Semantic Web",
 +                "json",
 +                "jsonld"
 +            ],
 +            "time": "2016-04-25T04:17:52+00:00"
 +        },
          {
              "name": "divineomega/password_exposed",
              "version": "v2.5.1",
@@@ -529,16 -483,16 +529,16 @@@
          },
          {
              "name": "league/html-to-markdown",
-             "version": "4.4.1",
+             "version": "4.8.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/thephpleague/html-to-markdown.git",
-                 "reference": "82ea375b5b2b1da1da222644c0565c695bf88186"
+                 "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/82ea375b5b2b1da1da222644c0565c695bf88186",
-                 "reference": "82ea375b5b2b1da1da222644c0565c695bf88186",
+                 "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/f9a879a068c68ff47b722de63f58bec79e448f9d",
+                 "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d",
                  "shasum": ""
              },
              "require": {
@@@ -557,7 -511,7 +557,7 @@@
              "type": "library",
              "extra": {
                  "branch-alias": {
-                     "dev-master": "4.5-dev"
+                     "dev-master": "4.9-dev"
                  }
              },
              "autoload": {
@@@ -570,17 -524,17 +570,17 @@@
                  "MIT"
              ],
              "authors": [
-                 {
-                     "name": "Colin O'Dell",
-                     "email": "colinodell@gmail.com",
-                     "homepage": "http://www.colinodell.com",
-                     "role": "Lead Developer"
-                 },
                  {
                      "name": "Nick Cernis",
                      "email": "nick@cern.is",
                      "homepage": "http://modernnerd.net",
                      "role": "Original Author"
+                 },
+                 {
+                     "name": "Colin O'Dell",
+                     "email": "colinodell@gmail.com",
+                     "homepage": "https://www.colinodell.com",
+                     "role": "Lead Developer"
                  }
              ],
              "description": "An HTML-to-markdown conversion helper for PHP",
@@@ -589,7 -543,7 +589,7 @@@
                  "html",
                  "markdown"
              ],
-             "time": "2017-03-16T00:45:59+00:00"
+             "time": "2018-09-18T12:18:08+00:00"
          },
          {
              "name": "lightopenid/lightopenid",
@@@ -1715,204 -1669,6 +1715,6 @@@
              ],
              "time": "2018-02-15T05:50:20+00:00"
          },
-         {
-             "name": "pear/console_getopt",
-             "version": "v1.4.1",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/pear/Console_Getopt.git",
-                 "reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
-                 "reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
-                 "shasum": ""
-             },
-             "type": "library",
-             "autoload": {
-                 "psr-0": {
-                     "Console": "./"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "include-path": [
-                 "./"
-             ],
-             "license": [
-                 "BSD-2-Clause"
-             ],
-             "authors": [
-                 {
-                     "name": "Greg Beaver",
-                     "email": "cellog@php.net",
-                     "role": "Helper"
-                 },
-                 {
-                     "name": "Andrei Zmievski",
-                     "email": "andrei@php.net",
-                     "role": "Lead"
-                 },
-                 {
-                     "name": "Stig Bakken",
-                     "email": "stig@php.net",
-                     "role": "Developer"
-                 }
-             ],
-             "description": "More info available on: http://pear.php.net/package/Console_Getopt",
-             "time": "2015-07-20T20:28:12+00:00"
-         },
-         {
-             "name": "pear/pear-core-minimal",
-             "version": "v1.10.3",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/pear/pear-core-minimal.git",
-                 "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/070f0b600b2caca2501e2c9b7e553016e4b0d115",
-                 "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115",
-                 "shasum": ""
-             },
-             "require": {
-                 "pear/console_getopt": "~1.4",
-                 "pear/pear_exception": "~1.0"
-             },
-             "replace": {
-                 "rsky/pear-core-min": "self.version"
-             },
-             "type": "library",
-             "autoload": {
-                 "psr-0": {
-                     "": "src/"
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "include-path": [
-                 "src/"
-             ],
-             "license": [
-                 "BSD-3-Clause"
-             ],
-             "authors": [
-                 {
-                     "name": "Christian Weiske",
-                     "email": "cweiske@php.net",
-                     "role": "Lead"
-                 }
-             ],
-             "description": "Minimal set of PEAR core files to be used as composer dependency",
-             "time": "2017-02-28T16:46:11+00:00"
-         },
-         {
-             "name": "pear/pear_exception",
-             "version": "v1.0.0",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/pear/PEAR_Exception.git",
-                 "reference": "8c18719fdae000b690e3912be401c76e406dd13b"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/8c18719fdae000b690e3912be401c76e406dd13b",
-                 "reference": "8c18719fdae000b690e3912be401c76e406dd13b",
-                 "shasum": ""
-             },
-             "require": {
-                 "php": ">=4.4.0"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "*"
-             },
-             "type": "class",
-             "extra": {
-                 "branch-alias": {
-                     "dev-master": "1.0.x-dev"
-                 }
-             },
-             "autoload": {
-                 "psr-0": {
-                     "PEAR": ""
-                 }
-             },
-             "notification-url": "https://packagist.org/downloads/",
-             "include-path": [
-                 "."
-             ],
-             "license": [
-                 "BSD-2-Clause"
-             ],
-             "authors": [
-                 {
-                     "name": "Helgi Thormar",
-                     "email": "dufuz@php.net"
-                 },
-                 {
-                     "name": "Greg Beaver",
-                     "email": "cellog@php.net"
-                 }
-             ],
-             "description": "The PEAR Exception base class.",
-             "homepage": "https://github.com/pear/PEAR_Exception",
-             "keywords": [
-                 "exception"
-             ],
-             "time": "2015-02-10T20:07:52+00:00"
-         },
-         {
-             "name": "pear/text_highlighter",
-             "version": "dev-master",
-             "source": {
-                 "type": "git",
-                 "url": "https://github.com/pear/Text_Highlighter.git",
-                 "reference": "2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855"
-             },
-             "dist": {
-                 "type": "zip",
-                 "url": "https://api.github.com/repos/pear/Text_Highlighter/zipball/2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855",
-                 "reference": "2ccac2d9eaf55dc08bbbdb7136c93fb399d0f855",
-                 "shasum": ""
-             },
-             "require": {
-                 "pear/pear-core-minimal": "~1.10.0",
-                 "php": ">=5.4.0"
-             },
-             "require-dev": {
-                 "phpunit/phpunit": "@stable"
-             },
-             "type": "library",
-             "autoload": {
-                 "psr-0": {
-                     "Text": "./"
-                 }
-             },
-             "include-path": [
-                 "./"
-             ],
-             "license": [
-                 "PHP-3.01"
-             ],
-             "authors": [
-                 {
-                     "email": "ssttoo@gmail.com",
-                     "name": "Stoyan Stefanov",
-                     "role": "Lead"
-                 },
-                 {
-                     "email": "demenev@gmail.com",
-                     "name": "Andrey Demenev",
-                     "role": "Lead"
-                 }
-             ],
-             "description": "More info available on: http://pear.php.net/package/Text_Highlighter",
-             "support": {
-                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Text_Highlighter",
-                 "source": "https://github.com/pear/Text_Highlighter"
-             },
-             "time": "2018-01-27T08:24:15+00:00"
-         },
          {
              "name": "pear/text_languagedetect",
              "version": "v1.0.0",
@@@ -3715,8 -3471,7 +3517,7 @@@
      "aliases": [],
      "minimum-stability": "stable",
      "stability-flags": {
-         "lightopenid/lightopenid": 20,
-         "pear/text_highlighter": 20
+         "lightopenid/lightopenid": 20
      },
      "prefer-stable": false,
      "prefer-lowest": false,

diff --combined include/conversation.php
index 835d2274775f27be7dbd0f6949790f8dab3b6342,e41b697b547824d869ad487107b05503bb80e956..dc563af4098170e56dad0eee537fe7e9121b049d
--- 1/include/conversation.php
--- 2/include/conversation.php
+++ b/include/conversation.php
@@@ -556,7 -556,7 +556,7 @@@ function conversation(App $a, array $it
                if (in_array($mode, ['community', 'contacts'])) {
                        $writable = true;
                } else {
 -                      $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 +                      $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
                }
  
                if (!local_user()) {
@@@ -807,7 -807,7 +807,7 @@@ function conversation_add_children(arra
  
        foreach ($items as $index => $item) {
                if ($item['uid'] == 0) {
 -                      $items[$index]['writable'] = in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 +                      $items[$index]['writable'] = in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
                }
        }
  
@@@ -877,7 -877,7 +877,7 @@@ function item_photo_menu($item) 
                }
  
                if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
 -                      in_array($item['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
 +                      in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
                        $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
                }
        } else {
@@@ -1454,7 -1454,7 +1454,7 @@@ function get_responses(array $conv_resp
        $ret = [];
        foreach ($response_verbs as $v) {
                $ret[$v] = [];
-               $ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], '');
+               $ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], 0);
                $ret[$v]['list']  = defaults($conv_responses[$v], $item['uri'] . '-l', []);
                $ret[$v]['self']  = defaults($conv_responses[$v], $item['uri'] . '-self', '0');
                if (count($ret[$v]['list']) > MAX_LIKERS) {