From ce7aa5c72d88f6cee714e3108e8942d143d8e6a5 Mon Sep 17 00:00:00 2001 From: Yannis Vogel Date: Wed, 30 Apr 2025 22:49:20 +0200 Subject: [PATCH] remove debug/todos for live tests --- php/federator/api/fedusers.php | 6 ------ php/federator/api/fedusers/outbox.php | 2 +- php/federator/api/v1/newcontent.php | 2 +- php/federator/api/wellknown/webfinger.php | 6 ------ plugins/federator/contentnation.php | 3 ++- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/php/federator/api/fedusers.php b/php/federator/api/fedusers.php index 026164c..7e530dd 100644 --- a/php/federator/api/fedusers.php +++ b/php/federator/api/fedusers.php @@ -156,12 +156,6 @@ class FedUsers implements APIInterface 'type' => $user->type ]; $this->response = $this->main->renderTemplate('user.json', $data); - // todo remove HTTP again - $this->response = str_replace( - 'https://192.168.178.143/', - 'http://192.168.178.143/', - $this->response - ); return true; } /** diff --git a/php/federator/api/fedusers/outbox.php b/php/federator/api/fedusers/outbox.php index 2dc4458..e943dbb 100644 --- a/php/federator/api/fedusers/outbox.php +++ b/php/federator/api/fedusers/outbox.php @@ -84,7 +84,7 @@ class Outbox implements \Federator\Api\FedUsers\FedUsersInterface $outbox->setPrev($id . '&min=' . $oldestId); } $obj = $outbox->toObject(); - return json_encode($obj, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT); // todo remove pretty + return json_encode($obj); } /** diff --git a/php/federator/api/v1/newcontent.php b/php/federator/api/v1/newcontent.php index 16a064f..450ef18 100644 --- a/php/federator/api/v1/newcontent.php +++ b/php/federator/api/v1/newcontent.php @@ -129,7 +129,7 @@ class NewContent implements \Federator\Api\APIInterface } } - if (empty($users)) { // todo remove, debugging for now + if (empty($users)) { // todo remove after proper implementation, debugging for now $rootDir = $_SERVER['DOCUMENT_ROOT'] . '../'; // Save the raw input and parsed JSON to a file for inspection file_put_contents( diff --git a/php/federator/api/wellknown/webfinger.php b/php/federator/api/wellknown/webfinger.php index f2c9a40..4eaef6a 100644 --- a/php/federator/api/wellknown/webfinger.php +++ b/php/federator/api/wellknown/webfinger.php @@ -67,12 +67,6 @@ class WebFinger 'domain' => $domain, ]; $response = $this->main->renderTemplate('webfinger_acct.json', $data); - // todo remove HTTP again - $response = str_replace( - 'https://192.168.178.143', - 'http://192.168.178.143', - $response - ); $this->wellKnown->setResponse($response); return true; } diff --git a/plugins/federator/contentnation.php b/plugins/federator/contentnation.php index 8775777..f0704af 100644 --- a/plugins/federator/contentnation.php +++ b/plugins/federator/contentnation.php @@ -58,10 +58,11 @@ class ContentNation implements Connector */ public function getRemoteFollowersOfUser($userId) { + // todo implement queue for this, move to DIO if (preg_match("#^([^@]+)@([^/]+)#", $userId, $matches) == 1) { $userId = $matches[1]; } - $remoteURL = $this->service . '/api/profile/' . urlencode($userId) . '/followers'; // todo implement/change + $remoteURL = $this->service . '/api/profile/' . urlencode($userId) . '/followers'; [$response, $info] = \Federator\Main::getFromRemote($remoteURL, []); if ($info['http_code'] != 200) {