Remove deprecated code

[friendica.git] / src / Protocol / OStatus.php

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index a250d35bc7f9c3ad0f298a4cc192e0418be8d309..dc30b596fcc2b54098e3dc7e3db1a4dacff18ced 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -9,8 +9,6 @@ use DOMXPath;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
@@ -1270,14 +1268,14 @@ class OStatus
                $selfUri = '/feed/' . $owner["nick"] . '/';
                switch ($filter) {
                        case 'activity':
-                               $title = L10n::t('%s\'s timeline', $owner['name']);
+                               $title = DI::l10n()->t('%s\'s timeline', $owner['name']);
                                $selfUri .= $filter;
                                break;
                        case 'posts':
-                               $title = L10n::t('%s\'s posts', $owner['name']);
+                               $title = DI::l10n()->t('%s\'s posts', $owner['name']);
                                break;
                        case 'comments':
-                               $title = L10n::t('%s\'s comments', $owner['name']);
+                               $title = DI::l10n()->t('%s\'s comments', $owner['name']);
                                $selfUri .= $filter;
                                break;
                }
@@ -1290,7 +1288,7 @@ class OStatus
                XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
                XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]);
                XML::addElement($doc, $root, "title", $title);
-               XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], Config::get('config', 'sitename')));
+               XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], DI::config()->get('config', 'sitename')));
                XML::addElement($doc, $root, "logo", $owner["photo"]);
                XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
@@ -1384,7 +1382,7 @@ class OStatus
                                break;
                }
 
-               if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
+               if (!DI::config()->get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
                        $imgdata = Images::getInfoFromURLCached($siteinfo["image"]);
                        if ($imgdata) {
                                $attributes = ["rel" => "enclosure",
@@ -1430,7 +1428,7 @@ class OStatus
         */
        private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
        {
-               $profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
+               $profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid']]);
                $author = $doc->createElement("author");
                XML::addElement($doc, $author, "id", $owner["url"]);
                if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
@@ -1832,12 +1830,12 @@ class OStatus
                }
 
                if ($item['verb'] == Activity::FOLLOW) {
-                       $message = L10n::t('%s is now following %s.');
-                       $title = L10n::t('following');
+                       $message = DI::l10n()->t('%s is now following %s.');
+                       $title = DI::l10n()->t('following');
                        $action = "subscription";
                } else {
-                       $message = L10n::t('%s stopped following %s.');
-                       $title = L10n::t('stopped following');
+                       $message = DI::l10n()->t('%s stopped following %s.');
+                       $title = DI::l10n()->t('stopped following');
                        $action = "unfollow";
                }
 
@@ -2227,7 +2225,7 @@ class OStatus
                $root = self::addHeader($doc, $owner, $filter, $feed_mode);
 
                foreach ($items as $item) {
-                       if (Config::get('system', 'ostatus_debug')) {
+                       if (DI::config()->get('system', 'ostatus_debug')) {
                                $item['body'] .= '🍼';
                        }
 
@@ -2264,7 +2262,7 @@ class OStatus
                $doc = new DOMDocument('1.0', 'utf-8');
                $doc->formatOutput = true;
 
-               if (Config::get('system', 'ostatus_debug')) {
+               if (DI::config()->get('system', 'ostatus_debug')) {
                        $item['body'] .= '🐟';
                }