Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / mod / profile.php

diff --git a/mod/profile.php b/mod/profile.php
index fd23964e4160906949dc2f1eb5d715452c655987..aa284d1669a0184a1e6fdf05c84074d76e02ce46 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -50,11 +50,12 @@ function profile_init(App $a)
                DFRN::autoRedir($a, $which);
        }
 
-       if (stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json')) {
+       if (ActivityPub::isRequest()) {
                $user = DBA::selectFirst('user', ['uid'], ['nickname' => $which]);
-               if ($user['uid'] == 180) {
-                       $data = ActivityPub::profile($user['uid']);
+               if (DBA::isResult($user)) {
+                       $data = ActivityPub\Transmitter::getProfile($user['uid']);
                        echo json_encode($data);
+                       header('Content-Type: application/activity+json');
                        exit();
                }
        }
@@ -90,7 +91,7 @@ function profile_init(App $a)
        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\r\n";
        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\r\n";
        $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\r\n";
-       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''));
+       $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->getHostName() . ($a->getURLPath() ? '/' . $a->getURLPath() : ''));
        $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
        header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
@@ -306,7 +307,7 @@ function profile_content(App $a, $update = 0)
                        $itemspage_network = $a->force_max_items;
                }
 
-               $a->set_pager_itemspage($itemspage_network);
+               $a->setPagerItemsPage($itemspage_network);
 
                $pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));