Merge pull request #8191 from MrPetovan/task/7967-mastodon-api-custom_emojis

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index cbee264585dbd71e95a09e4d8a1f5b9f064c1866..d8941e51ade5c6de1caa52d71197d6693bc06c8e 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -6,12 +6,9 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Protocol\PortableContact;
@@ -22,7 +19,7 @@ use Friendica\Util\XML;
 function poco_init(App $a) {
        $system_mode = false;
 
-       if (intval(Config::get('system', 'block_public')) || (Config::get('system', 'block_local_dir'))) {
+       if (intval(DI::config()->get('system', 'block_public')) || (DI::config()->get('system', 'block_local_dir'))) {
                throw new \Friendica\Network\HTTPException\ForbiddenException();
        }
 
@@ -70,7 +67,7 @@ function poco_init(App $a) {
 
        if (! $system_mode && ! $global) {
                $users = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
-                       where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
+                       where `user`.`nickname` = '%s' limit 1",
                        DBA::escape($nickname)
                );
                if (! DBA::isResult($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
@@ -143,7 +140,7 @@ function poco_init(App $a) {
                                `profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`, `user`.`account-type`
                        FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
                                INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-                       WHERE `self` = 1 AND `profile`.`is-default`
+                       WHERE `self` = 1
                        AND `contact`.`uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) LIMIT %d, %d",
                        intval($startIndex),
                        intval($itemsPerPage)
@@ -256,7 +253,7 @@ function poco_init(App $a) {
                                if (isset($contact['account-type'])) {
                                        $contact['contact-type'] = $contact['account-type'];
                                }
-                               $about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
+                               $about = DI::cache()->get("about:" . $contact['updated'] . ":" . $contact['nurl']);
                                if (is_null($about)) {
                                        $about = BBCode::convert($contact['about'], false);
                                        DI::cache()->set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);