Merge pull request #10109 from annando/post-type

[friendica.git] / mod / pubsubhubbub.php

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 2ffaaf729efedcb5cb42cccd6b496b83a41a86c1..f376e9e8567663ab555f05e6626dba5cd95fa869 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,11 +1,29 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\PushSubscriber;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 function post_var($name) {
@@ -65,18 +83,12 @@ function pubsubhubbub_init(App $a) {
 
                // fetch user from database given the nickname
                $condition = ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false];
-               $owner = DBA::selectFirst('user', ['uid', 'hidewall', 'nickname'], $condition);
+               $owner = DBA::selectFirst('user', ['uid', 'nickname'], $condition);
                if (!DBA::isResult($owner)) {
                        Logger::log('Local account not found: ' . $nick . ' - topic: ' . $hub_topic . ' - callback: ' . $hub_callback);
                        throw new \Friendica\Network\HTTPException\NotFoundException();
                }
 
-               // abort if user's wall is supposed to be private
-               if ($owner['hidewall']) {
-                       Logger::log('Local user ' . $nick . 'has chosen to hide wall, ignoring.');
-                       throw new \Friendica\Network\HTTPException\ForbiddenException();
-               }
-
                // get corresponding row from contact table
                $condition = ['uid' => $owner['uid'], 'blocked' => false,
                        'pending' => false, 'self' => true];
@@ -113,7 +125,7 @@ function pubsubhubbub_init(App $a) {
                $hub_callback = rtrim($hub_callback, ' ?&#');
                $separator = parse_url($hub_callback, PHP_URL_QUERY) === null ? '?' : '&';
 
-               $fetchResult = Network::fetchUrlFull($hub_callback . $separator . $params);
+               $fetchResult = DI::httpRequest()->fetchFull($hub_callback . $separator . $params);
                $body = $fetchResult->getBody();
                $ret = $fetchResult->getReturnCode();