You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

82 lines
3.3 KiB

Allow hiding of reblogs from followed users (#5762) * 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.
6 years ago
  1. # frozen_string_literal: true
  2. class FollowService < BaseService
  3. include Redisable
  4. include Payloadable
  5. include DomainControlHelper
  6. # Follow a remote user, notify remote user about the follow
  7. # @param [Account] source_account From which to follow
  8. # @param [Account] target_account Account to follow
  9. # @param [Hash] options
  10. # @option [Boolean] :reblogs Whether or not to show reblogs, defaults to true
  11. # @option [Boolean] :notify Whether to create notifications about new posts, defaults to false
  12. # @option [Boolean] :bypass_locked
  13. # @option [Boolean] :bypass_limit Allow following past the total follow number
  14. # @option [Boolean] :with_rate_limit
  15. def call(source_account, target_account, options = {})
  16. @source_account = source_account
  17. @target_account = target_account
  18. @options = { bypass_locked: false, bypass_limit: false, with_rate_limit: false }.merge(options)
  19. raise ActiveRecord::RecordNotFound if following_not_possible?
  20. raise Mastodon::NotPermittedError if following_not_allowed?
  21. if @source_account.following?(@target_account)
  22. return change_follow_options!
  23. elsif @source_account.requested?(@target_account)
  24. return change_follow_request_options!
  25. end
  26. ActivityTracker.increment('activity:interactions')
  27. if (@target_account.locked? && !@options[:bypass_locked]) || @source_account.silenced? || @target_account.activitypub?
  28. request_follow!
  29. elsif @target_account.local?
  30. direct_follow!
  31. end
  32. end
  33. private
  34. def following_not_possible?
  35. @target_account.nil? || @target_account.id == @source_account.id || @target_account.suspended?
  36. end
  37. def following_not_allowed?
  38. domain_not_allowed?(@target_account.domain) || @target_account.blocking?(@source_account) || @source_account.blocking?(@target_account) || @target_account.moved? || (!@target_account.local? && @target_account.ostatus?) || @source_account.domain_blocking?(@target_account.domain)
  39. end
  40. def change_follow_options!
  41. @source_account.follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify])
  42. end
  43. def change_follow_request_options!
  44. @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify])
  45. end
  46. def request_follow!
  47. follow_request = @source_account.request_follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify], rate_limit: @options[:with_rate_limit], bypass_limit: @options[:bypass_limit])
  48. if @target_account.local?
  49. LocalNotificationWorker.perform_async(@target_account.id, follow_request.id, follow_request.class.name, :follow_request)
  50. elsif @target_account.activitypub?
  51. ActivityPub::DeliveryWorker.perform_async(build_json(follow_request), @source_account.id, @target_account.inbox_url)
  52. end
  53. follow_request
  54. end
  55. def direct_follow!
  56. follow = @source_account.follow!(@target_account, reblogs: @options[:reblogs], notify: @options[:notify], rate_limit: @options[:with_rate_limit], bypass_limit: @options[:bypass_limit])
  57. LocalNotificationWorker.perform_async(@target_account.id, follow.id, follow.class.name, :follow)
  58. MergeWorker.perform_async(@target_account.id, @source_account.id)
  59. follow
  60. end
  61. def build_json(follow_request)
  62. Oj.dump(serialize_payload(follow_request, ActivityPub::FollowSerializer))
  63. end
  64. end