Merge branch 'develop' into item-activities

diff --cc boot.php
Simple merge

diff --cc database.sql
Simple merge

diff --cc include/api.php
index 19d4a944d59cb0e20fd2bccf86bd1371b279ce79,af6f54fe607568e20ad0ddd6971516e03b97bdbf..ad991485a4da241e0c536d0746f2e85f98c8fd0c
--- 1/include/api.php
--- 2/include/api.php
+++ b/include/api.php
@@@ -1814,10 -1820,10 +1820,10 @@@ function api_statuses_show($type
  
        logger('API: api_statuses_show: ' . $id);
  
-       $conversation = (x($_REQUEST, 'conversation') ? 1 : 0);
+       $conversation = !empty($_REQUEST['conversation']);
  
        // try to fetch the item for the local user - or the public item, if there is no local one
 -      $uri_item = dba::selectFirst('item', ['uri'], ['id' => $id]);
 +      $uri_item = Item::selectFirst(['uri'], ['id' => $id]);
        if (!DBM::is_result($uri_item)) {
                throw new BadRequestException("There is no status with this id.");
        }

diff --cc mod/item.php
Simple merge

diff --cc src/Database/DBStructure.php
Simple merge

diff --cc src/Model/Item.php
Simple merge

diff --cc src/Protocol/OStatus.php
Simple merge