From 9e43937f8c7f51c1bcd4e8009c6d1233868d5479 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 4 Aug 2015 12:36:00 +0200 Subject: PubSubHubbub prevent subscribing too often in case of error https://github.com/FreshRSS/FreshRSS/issues/939 --- app/Models/Feed.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'app/Models') diff --git a/app/Models/Feed.php b/app/Models/Feed.php index bf7ed3967..23491ee8d 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -475,7 +475,14 @@ class FreshRSS_Feed extends Minz_Model { file_put_contents($hubFilename, json_encode($hubJson)); } - return substr($info['http_code'], 0, 1) == '2'; + if (substr($info['http_code'], 0, 1) == '2') { + return true; + } else { + $hubJson['lease_start'] = time(); //Prevent trying again too soon + $hubJson['error'] = true; + file_put_contents($hubFilename, json_encode($hubJson)); + return false; + } } return false; } -- cgit v1.2.3 From 271d43b5692de4d56f05d38ca802b7807c8743cf Mon Sep 17 00:00:00 2001 From: Alexis Degrugillier Date: Fri, 11 Sep 2015 18:45:25 -0400 Subject: Fix feed and category side effect Before, when deleting a feed or a category, the user queries were deleted as well. No matter if they were related or not. Now, they are deleted only if they are related. I this this fix is not the best way to handle that. I think it would be better if we could find a way to create a UserQuery object from the array. The same applies when displaying the user queries in the interface. See #980 --- app/Models/ConfigurationSetter.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/Models') diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index 992a3a387..5c8a1ce29 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -119,6 +119,8 @@ class FreshRSS_ConfigurationSetter { foreach ($values as $value) { if ($value instanceof FreshRSS_UserQuery) { $data['queries'][] = $value->toArray(); + } elseif (is_array($value)) { + $data['queries'][] = $value; } } } -- cgit v1.2.3