From dba40e58704a374755677ef1f24f6872a34bad80 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Fri, 24 Apr 2020 16:29:19 +0200 Subject: WebSub move fixes (#2922) Small fixes related to when WebSub changes address: * When unsubscribing, one must use the current/old address, not the newly found selfUrl; * This change https://github.com/FreshRSS/FreshRSS/pull/2659#discussion_r347263068 was wrong, so reverted to the first version. We must obey the rules also for feeds for which the initial WebSub enabling is not finished, otherwise we never have a chance to redirect the feed to the proper selfUrl. --- app/Models/Feed.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/Models/Feed.php') diff --git a/app/Models/Feed.php b/app/Models/Feed.php index c0bc90b2d..0fc92f0bd 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -695,7 +695,11 @@ class FreshRSS_Feed extends Minz_Model { //Parameter true to subscribe, false to unsubscribe. public function pubSubHubbubSubscribe($state) { - $url = $this->selfUrl ? $this->selfUrl : $this->url; + if ($state) { + $url = $this->selfUrl ? $this->selfUrl : $this->url; + } else { + $url = $this->url; //Always use current URL during unsubscribe + } if ($url && (Minz_Request::serverIsPublic(FreshRSS_Context::$system_conf->base_url) || !$state)) { $hubFilename = PSHB_PATH . '/feeds/' . base64url_encode($url) . '/!hub.json'; $hubFile = @file_get_contents($hubFilename); -- cgit v1.2.3