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.

62 lines
1.7 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.
7 years ago
  1. # frozen_string_literal: true
  2. # == Schema Information
  3. #
  4. # Table name: follows
  5. #
  6. # id :bigint(8) not null, primary key
  7. # created_at :datetime not null
  8. # updated_at :datetime not null
  9. # account_id :bigint(8) not null
  10. # target_account_id :bigint(8) not null
  11. # show_reblogs :boolean default(TRUE), not null
  12. # uri :string
  13. #
  14. class Follow < ApplicationRecord
  15. include Paginable
  16. include RelationshipCacheable
  17. belongs_to :account
  18. belongs_to :target_account, class_name: 'Account'
  19. has_one :notification, as: :activity, dependent: :destroy
  20. validates :account_id, uniqueness: { scope: :target_account_id }
  21. validates_with FollowLimitValidator, on: :create
  22. scope :recent, -> { reorder(id: :desc) }
  23. def local?
  24. false # Force uri_for to use uri attribute
  25. end
  26. def revoke_request!
  27. FollowRequest.create!(account: account, target_account: target_account, show_reblogs: show_reblogs, uri: uri)
  28. destroy!
  29. end
  30. before_validation :set_uri, only: :create
  31. after_create :increment_cache_counters
  32. after_destroy :remove_endorsements
  33. after_destroy :decrement_cache_counters
  34. private
  35. def set_uri
  36. self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
  37. end
  38. def remove_endorsements
  39. AccountPin.where(target_account_id: target_account_id, account_id: account_id).delete_all
  40. end
  41. def increment_cache_counters
  42. account&.increment_count!(:following_count)
  43. target_account&.increment_count!(:followers_count)
  44. end
  45. def decrement_cache_counters
  46. account&.decrement_count!(:following_count)
  47. target_account&.decrement_count!(:followers_count)
  48. end
  49. end