mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 10:43:43 +01:00
eeaec39888
* Allow hiding of reblogs from followed users
This adds a new entry to the account menu to allow users to hide
future reblogs from a user (and then if they've done that, to show
future reblogs instead).
This does not remove or add historical reblogs from/to the user's
timeline; it only affects new statuses.
The API for this operates by sending a "reblogs" key to the follow
endpoint. If this is sent when starting a new follow, it will be
respected from the beginning of the follow relationship (even if
the follow request must be approved by the followee). If this is
sent when a follow relationship already exists, it will simply
update the existing follow relationship. As with the notification
muting, this will now return an object ({reblogs: [true|false]}) or
false for each follow relationship when requesting relationship
information for an account. This should cause few issues due to an
object being truthy in many languages, but some modifications may
need to be made in pickier languages.
Database changes: adds a show_reblogs column (default true,
non-nullable) to the follows and follow_requests tables. Because
these are non-nullable, we use the existing MigrationHelpers to
perform this change without locking those tables, although the
tables are likely to be small anyway.
Tests included.
See also <https://github.com/glitch-soc/mastodon/pull/212>.
* Rubocop fixes
* Code review changes
* Test fixes
This patchset closes #648 and resolves #3271.
* Rubocop fix
* Revert reblogs defaulting in argument, fix tests
It turns out we needed this for the same reason we needed it in muting:
if nil gets passed in somehow (most usually by an API client not passing
any value), we need to detect and handle it.
We could specify a default in the parameter and then also catch nil, but
there's no great reason to duplicate the default value.
89 lines
3.4 KiB
Ruby
89 lines
3.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class FollowService < BaseService
|
|
include StreamEntryRenderer
|
|
|
|
# Follow a remote user, notify remote user about the follow
|
|
# @param [Account] source_account From which to follow
|
|
# @param [String, Account] uri User URI to follow in the form of username@domain (or account record)
|
|
# @param [true, false, nil] reblogs Whether or not to show reblogs, defaults to true
|
|
def call(source_account, uri, reblogs: nil)
|
|
reblogs = true if reblogs.nil?
|
|
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)
|
|
|
|
if source_account.following?(target_account)
|
|
# We're already following this account, but we'll call follow! again to
|
|
# make sure the reblogs status is set correctly.
|
|
source_account.follow!(target_account, reblogs: reblogs)
|
|
return
|
|
elsif source_account.requested?(target_account)
|
|
# This isn't managed by a method in AccountInteractions, so we modify it
|
|
# ourselves if necessary.
|
|
req = follow_requests.find_by(target_account: other_account)
|
|
req.update!(show_reblogs: reblogs)
|
|
return
|
|
end
|
|
|
|
if target_account.locked? || target_account.activitypub?
|
|
request_follow(source_account, target_account, reblogs: reblogs)
|
|
else
|
|
direct_follow(source_account, target_account, reblogs: reblogs)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def request_follow(source_account, target_account, reblogs: true)
|
|
follow_request = FollowRequest.create!(account: source_account, target_account: target_account, show_reblogs: reblogs)
|
|
|
|
if target_account.local?
|
|
NotifyService.new.call(target_account, follow_request)
|
|
elsif target_account.ostatus?
|
|
NotificationWorker.perform_async(build_follow_request_xml(follow_request), source_account.id, target_account.id)
|
|
AfterRemoteFollowRequestWorker.perform_async(follow_request.id)
|
|
elsif target_account.activitypub?
|
|
ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), source_account.id, target_account.inbox_url)
|
|
end
|
|
|
|
follow_request
|
|
end
|
|
|
|
def direct_follow(source_account, target_account, reblogs: true)
|
|
follow = source_account.follow!(target_account, reblogs: reblogs)
|
|
|
|
if target_account.local?
|
|
NotifyService.new.call(target_account, follow)
|
|
else
|
|
Pubsubhubbub::SubscribeWorker.perform_async(target_account.id) unless target_account.subscribed?
|
|
NotificationWorker.perform_async(build_follow_xml(follow), source_account.id, target_account.id)
|
|
AfterRemoteFollowWorker.perform_async(follow.id)
|
|
end
|
|
|
|
MergeWorker.perform_async(target_account.id, source_account.id)
|
|
|
|
follow
|
|
end
|
|
|
|
def redis
|
|
Redis.current
|
|
end
|
|
|
|
def build_follow_request_xml(follow_request)
|
|
OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.follow_request_salmon(follow_request))
|
|
end
|
|
|
|
def build_follow_xml(follow)
|
|
OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.follow_salmon(follow))
|
|
end
|
|
|
|
def build_json(follow_request)
|
|
Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
|
|
follow_request,
|
|
serializer: ActivityPub::FollowSerializer,
|
|
adapter: ActivityPub::Adapter
|
|
).as_json).sign!(follow_request.account))
|
|
end
|
|
end
|