[WIP] Rewrite to Proxy class: (#5507)

[friendica.git] / src / Object / Post.php

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 27fdb7ceea9defafa21f314a92420358950ed957..a055f6525194b42d8ddda932de8647316ef6def6 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -16,6 +16,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Term;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 
 require_once 'include/dba.php';
@@ -112,8 +113,6 @@ class Post extends BaseObject
         */
        public function getTemplateData($conv_responses, $thread_level = 1)
        {
-               require_once "mod/proxy.php";
-
                $result = [];
 
                $a = self::getApp();
@@ -150,6 +149,7 @@ class Post extends BaseObject
                        || strlen($item['deny_cid']) || strlen($item['deny_gid']))))
                        ? L10n::t('Private Message')
                        : false);
+
                $shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != 1;
 
                if (local_user() && link_compare($a->contact['url'], $item['author-link'])) {
@@ -367,7 +367,7 @@ class Post extends BaseObject
                        'profile_url'     => $profile_link,
                        'item_photo_menu' => item_photo_menu($item),
                        'name'            => $name_e,
-                       'thumb'           => $a->remove_baseurl(proxy_url($item['author-avatar'], false, PROXY_SIZE_THUMB)),
+                       'thumb'           => $a->remove_baseurl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
                        'osparkle'        => $osparkle,
                        'sparkle'         => $sparkle,
                        'title'           => $title_e,
@@ -380,7 +380,7 @@ class Post extends BaseObject
                        'indent'          => $indent,
                        'shiny'           => $shiny,
                        'owner_url'       => $this->getOwnerUrl(),
-                       'owner_photo'     => $a->remove_baseurl(proxy_url($item['owner-avatar'], false, PROXY_SIZE_THUMB)),
+                       'owner_photo'     => $a->remove_baseurl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
                        'owner_name'      => htmlentities($owner_name_e),
                        'plink'           => get_plink($item),
                        'edpost'          => Feature::isEnabled($conv->getProfileOwner(), 'edit_posts') ? $edpost : '',