Merge pull request #12852 from annando/instance-fix

Fix v1 endpoint

diff --git a/src/Object/Api/Mastodon/Instance.php b/src/Object/Api/Mastodon/Instance.php
index 5459694e6a39a5c3365bc4ad9c405a818ccc6f4d..118d491fc91fad7f889a5aca1323f561fcbd36cd 100644 (file)
--- a/src/Object/Api/Mastodon/Instance.php
+++ b/src/Object/Api/Mastodon/Instance.php
@@ -84,14 +84,14 @@ class Instance extends BaseDataTransferObject
        {
                $register_policy = intval($config->get('config', 'register_policy'));
 
-               $this->uri               = $baseUrl;
+               $this->uri               = $baseUrl->getHost();
                $this->title             = $config->get('config', 'sitename');
                $this->short_description = $this->description = $config->get('config', 'info');
                $this->email             = implode(',', User::getAdminEmailList());
                $this->version           = '2.8.0 (compatible; Friendica ' . App::VERSION . ')';
                $this->urls              = null; // Not supported
                $this->stats             = new Stats($config, $database);
-               $this->thumbnail         = $baseUrl . 'images/friendica-banner.jpg';
+               $this->thumbnail         = $baseUrl . '/images/friendica-banner.jpg';
                $this->languages         = [$config->get('system', 'language')];
                $this->max_toot_chars    = (int)$config->get('config', 'api_import_size', $config->get('config', 'max_import_size'));
                $this->registrations     = ($register_policy != Register::CLOSED);