logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 6b2be5dbfb73e2daf78cf050e5f24c2a8b31ece5
parent: 69957ed10a4b7987fd50351da89944b146952b33
Author: James <james.vogon@gmail.com>
Date:   Thu, 31 Aug 2017 06:44:00 -0700

Guarantee Subscription service first account has proper URL details (#4732)

* Guarantee Subscription service first account has proper URL details

Subscription Service potentially could break if the first user suspended
themselves, creating a situation where the urls that populate throughout
subscription service's PuSH request would cause the remote API to throw 503 errors.

Guaranteeing that the first account picked is not suspended prevents this problem.

* Fix style issue

Diffstat:

Mapp/services/subscribe_service.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb @@ -42,7 +42,7 @@ class SubscribeService < BaseService end def some_local_account - @some_local_account ||= Account.local.first + @some_local_account ||= Account.local.where(suspended: false).first end # Any response in the 3xx or 4xx range, except for 429 (rate limit)