From 7d7844a47fdfb8862847f025dc4c1b1bc5fdafe5 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 10 Sep 2017 09:58:38 +0200 Subject: Default follows for new users (#4871) When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only) --- app/services/follow_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/services/follow_service.rb') diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 941556b60..791773f25 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -5,9 +5,9 @@ class FollowService < BaseService # Follow a remote user, notify remote user about the follow # @param [Account] source_account From which to follow - # @param [String] uri User URI to follow in the form of username@domain + # @param [String, Account] uri User URI to follow in the form of username@domain (or account record) def call(source_account, uri) - target_account = ResolveRemoteAccountService.new.call(uri) + target_account = uri.is_a?(Account) ? uri : ResolveRemoteAccountService.new.call(uri) raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended? raise Mastodon::NotPermittedError if target_account.blocking?(source_account) || source_account.blocking?(target_account) -- cgit