commit: eeaec39888f66bf312ac9a4c58f315ffd8f874f2
parent: b8efb5daed9825323f17039b416527850d017ff2
Author: aschmitz <andy.schmitz@gmail.com>
Date: Tue, 28 Nov 2017 08:00:35 -0600
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.
Diffstat:
22 files changed, 252 insertions(+), 40 deletions(-)
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
@@ -13,9 +13,9 @@ class Api::V1::AccountsController < Api::BaseController
end
def follow
- FollowService.new.call(current_user.account, @account.acct)
+ FollowService.new.call(current_user.account, @account.acct, reblogs: params[:reblogs])
- options = @account.locked? ? {} : { following_map: { @account.id => true }, requested_map: { @account.id => false } }
+ options = @account.locked? ? {} : { following_map: { @account.id => { reblogs: params[:reblogs] } }, requested_map: { @account.id => false } }
render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
end
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
@@ -105,12 +105,13 @@ export function fetchAccountFail(id, error) {
};
};
-export function followAccount(id) {
+export function followAccount(id, reblogs = true) {
return (dispatch, getState) => {
+ const alreadyFollowing = getState().getIn(['relationships', id, 'following']);
dispatch(followAccountRequest(id));
- api(getState).post(`/api/v1/accounts/${id}/follow`).then(response => {
- dispatch(followAccountSuccess(response.data));
+ api(getState).post(`/api/v1/accounts/${id}/follow`, { reblogs }).then(response => {
+ dispatch(followAccountSuccess(response.data, alreadyFollowing));
}).catch(error => {
dispatch(followAccountFail(error));
});
@@ -136,10 +137,11 @@ export function followAccountRequest(id) {
};
};
-export function followAccountSuccess(relationship) {
+export function followAccountSuccess(relationship, alreadyFollowing) {
return {
type: ACCOUNT_FOLLOW_SUCCESS,
relationship,
+ alreadyFollowing,
};
};
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
@@ -93,7 +93,7 @@ export default class Account extends ImmutablePureComponent {
</div>
);
} else {
- buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />;
+ buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following ? true : false} />;
}
}
diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -20,6 +20,8 @@ const messages = defineMessages({
media: { id: 'account.media', defaultMessage: 'Media' },
blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
+ hideReblogs: { id: 'account.hide_reblogs', defaultMessage: 'Hide boosts from @{name}' },
+ showReblogs: { id: 'account.show_reblogs', defaultMessage: 'Show boosts from @{name}' },
});
@injectIntl
@@ -30,6 +32,7 @@ export default class ActionBar extends React.PureComponent {
onFollow: PropTypes.func,
onBlock: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired,
+ onReblogToggle: PropTypes.func.isRequired,
onReport: PropTypes.func.isRequired,
onMute: PropTypes.func.isRequired,
onBlockDomain: PropTypes.func.isRequired,
@@ -60,6 +63,15 @@ export default class ActionBar extends React.PureComponent {
if (account.get('id') === me) {
menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
} else {
+ const following = account.getIn(['relationship', 'following']);
+ if (following) {
+ if (following.get('reblogs')) {
+ menu.push({ text: intl.formatMessage(messages.hideReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });
+ } else {
+ menu.push({ text: intl.formatMessage(messages.showReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });
+ }
+ }
+
if (account.getIn(['relationship', 'muting'])) {
menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.props.onMute });
} else {
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -14,6 +14,7 @@ export default class Header extends ImmutablePureComponent {
onFollow: PropTypes.func.isRequired,
onBlock: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired,
+ onReblogToggle: PropTypes.func.isRequired,
onReport: PropTypes.func.isRequired,
onMute: PropTypes.func.isRequired,
onBlockDomain: PropTypes.func.isRequired,
@@ -40,6 +41,10 @@ export default class Header extends ImmutablePureComponent {
this.props.onReport(this.props.account);
}
+ handleReblogToggle = () => {
+ this.props.onReblogToggle(this.props.account);
+ }
+
handleMute = () => {
this.props.onMute(this.props.account);
}
@@ -80,6 +85,7 @@ export default class Header extends ImmutablePureComponent {
account={account}
onBlock={this.handleBlock}
onMention={this.handleMention}
+ onReblogToggle={this.handleReblogToggle}
onReport={this.handleReport}
onMute={this.handleMute}
onBlockDomain={this.handleBlockDomain}
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -67,6 +67,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
dispatch(mentionCompose(account, router));
},
+ onReblogToggle (account) {
+ if (account.getIn(['relationship', 'following', 'reblogs'])) {
+ dispatch(followAccount(account.get('id'), false));
+ } else {
+ dispatch(followAccount(account.get('id'), true));
+ }
+ },
+
onReport (account) {
dispatch(initReport(account));
},
diff --git a/app/javascript/mastodon/reducers/accounts_counters.js b/app/javascript/mastodon/reducers/accounts_counters.js
@@ -126,7 +126,8 @@ export default function accountsCounters(state = initialState, action) {
case STATUS_FETCH_SUCCESS:
return normalizeAccountFromStatus(state, action.status);
case ACCOUNT_FOLLOW_SUCCESS:
- return state.updateIn([action.relationship.id, 'followers_count'], num => num + 1);
+ return action.alreadyFollowing ? state :
+ state.updateIn([action.relationship.id, 'followers_count'], num => num + 1);
case ACCOUNT_UNFOLLOW_SUCCESS:
return state.updateIn([action.relationship.id, 'followers_count'], num => Math.max(0, num - 1));
default:
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
@@ -159,14 +159,15 @@ class FeedManager
return true if Block.where(account_id: receiver_id, target_account_id: check_for_blocks).any?
- if status.reply? && !status.in_reply_to_account_id.nil? # Filter out if it's a reply
- should_filter = !Follow.where(account_id: receiver_id, target_account_id: status.in_reply_to_account_id).exists? # and I'm not following the person it's a reply to
- should_filter &&= receiver_id != status.in_reply_to_account_id # and it's not a reply to me
- should_filter &&= status.account_id != status.in_reply_to_account_id # and it's not a self-reply
+ if status.reply? && !status.in_reply_to_account_id.nil? # Filter out if it's a reply
+ should_filter = !Follow.where(account_id: receiver_id, target_account_id: status.in_reply_to_account_id).exists? # and I'm not following the person it's a reply to
+ should_filter &&= receiver_id != status.in_reply_to_account_id # and it's not a reply to me
+ should_filter &&= status.account_id != status.in_reply_to_account_id # and it's not a self-reply
return should_filter
- elsif status.reblog? # Filter out a reblog
- should_filter = Block.where(account_id: status.reblog.account_id, target_account_id: receiver_id).exists? # or if the author of the reblogged status is blocking me
- should_filter ||= AccountDomainBlock.where(account_id: receiver_id, domain: status.reblog.account.domain).exists? # or the author's domain is blocked
+ elsif status.reblog? # Filter out a reblog
+ should_filter = Follow.where(account_id: receiver_id, target_account_id: status.account_id, show_reblogs: false).exists? # if the reblogger's reblogs are suppressed
+ should_filter ||= Block.where(account_id: status.reblog.account_id, target_account_id: receiver_id).exists? # or if the author of the reblogged status is blocking me
+ should_filter ||= AccountDomainBlock.where(account_id: receiver_id, domain: status.reblog.account.domain).exists? # or the author's domain is blocked
return should_filter
end
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
@@ -5,7 +5,11 @@ module AccountInteractions
class_methods do
def following_map(target_account_ids, account_id)
- follow_mapping(Follow.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
+ Follow.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow, mapping|
+ mapping[follow.target_account_id] = {
+ reblogs: follow.show_reblogs?,
+ }
+ end
end
def followed_by_map(target_account_ids, account_id)
@@ -25,7 +29,11 @@ module AccountInteractions
end
def requested_map(target_account_ids, account_id)
- follow_mapping(FollowRequest.where(target_account_id: target_account_ids, account_id: account_id), :target_account_id)
+ FollowRequest.where(target_account_id: target_account_ids, account_id: account_id).each_with_object({}) do |follow_request, mapping|
+ mapping[follow_request.target_account_id] = {
+ reblogs: follow_request.show_reblogs?,
+ }
+ end
end
def domain_blocking_map(target_account_ids, account_id)
@@ -66,8 +74,12 @@ module AccountInteractions
has_many :domain_blocks, class_name: 'AccountDomainBlock', dependent: :destroy
end
- def follow!(other_account)
- active_relationships.find_or_create_by!(target_account: other_account)
+ def follow!(other_account, reblogs: nil)
+ reblogs = true if reblogs.nil?
+ rel = active_relationships.create_with(show_reblogs: reblogs).find_or_create_by!(target_account: other_account)
+ rel.update!(show_reblogs: reblogs)
+
+ rel
end
def block!(other_account)
@@ -140,6 +152,10 @@ module AccountInteractions
mute_relationships.where(target_account: other_account, hide_notifications: true).exists?
end
+ def muting_reblogs?(other_account)
+ active_relationships.where(target_account: other_account, show_reblogs: false).exists?
+ end
+
def requested?(other_account)
follow_requests.where(target_account: other_account).exists?
end
diff --git a/app/models/follow.rb b/app/models/follow.rb
@@ -8,6 +8,7 @@
# updated_at :datetime not null
# account_id :integer not null
# target_account_id :integer not null
+# show_reblogs :boolean default(TRUE), not null
#
class Follow < ApplicationRecord
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
@@ -8,6 +8,7 @@
# updated_at :datetime not null
# account_id :integer not null
# target_account_id :integer not null
+# show_reblogs :boolean default(TRUE), not null
#
class FollowRequest < ApplicationRecord
@@ -21,7 +22,7 @@ class FollowRequest < ApplicationRecord
validates :account_id, uniqueness: { scope: :target_account_id }
def authorize!
- account.follow!(target_account)
+ account.follow!(target_account, reblogs: show_reblogs)
MergeWorker.perform_async(target_account.id, account.id)
destroy!
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
@@ -6,25 +6,38 @@ class FollowService < BaseService
# 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)
- def call(source_account, uri)
+ # @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)
- return if source_account.following?(target_account) || source_account.requested?(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)
+ request_follow(source_account, target_account, reblogs: reblogs)
else
- direct_follow(source_account, target_account)
+ direct_follow(source_account, target_account, reblogs: reblogs)
end
end
private
- def request_follow(source_account, target_account)
- follow_request = FollowRequest.create!(account: source_account, target_account: target_account)
+ 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)
@@ -38,8 +51,8 @@ class FollowService < BaseService
follow_request
end
- def direct_follow(source_account, target_account)
- follow = source_account.follow!(target_account)
+ 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)
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
@@ -29,7 +29,7 @@ class NotifyService < BaseService
end
def blocked_reblog?
- false
+ @recipient.muting_reblogs?(@notification.from_account)
end
def blocked_follow_request?
diff --git a/db/migrate/20171028221157_add_reblogs_to_follows.rb b/db/migrate/20171028221157_add_reblogs_to_follows.rb
@@ -0,0 +1,19 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddReblogsToFollows < ActiveRecord::Migration[5.1]
+ include Mastodon::MigrationHelpers
+
+ disable_ddl_transaction!
+
+ def up
+ safety_assured do
+ add_column_with_default :follows, :show_reblogs, :boolean, default: true, allow_null: false
+ add_column_with_default :follow_requests, :show_reblogs, :boolean, default: true, allow_null: false
+ end
+ end
+
+ def down
+ remove_column :follows, :show_reblogs
+ remove_column :follow_requests, :show_reblogs
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -160,6 +160,7 @@ ActiveRecord::Schema.define(version: 20171125190735) do
t.datetime "updated_at", null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
+ t.boolean "show_reblogs", default: true, null: false
t.index ["account_id", "target_account_id"], name: "index_follow_requests_on_account_id_and_target_account_id", unique: true
end
@@ -168,6 +169,7 @@ ActiveRecord::Schema.define(version: 20171125190735) do
t.datetime "updated_at", null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
+ t.boolean "show_reblogs", default: true, null: false
t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
end
diff --git a/spec/controllers/api/v1/accounts/relationships_controller_spec.rb b/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
@@ -32,7 +32,7 @@ describe Api::V1::Accounts::RelationshipsController do
json = body_as_json
expect(json).to be_a Enumerable
- expect(json.first[:following]).to be true
+ expect(json.first[:following]).to be_truthy
expect(json.first[:followed_by]).to be false
end
end
@@ -51,7 +51,7 @@ describe Api::V1::Accounts::RelationshipsController do
expect(json).to be_a Enumerable
expect(json.first[:id]).to eq simon.id.to_s
- expect(json.first[:following]).to be true
+ expect(json.first[:following]).to be_truthy
expect(json.first[:followed_by]).to be false
expect(json.first[:muting]).to be false
expect(json.first[:requested]).to be false
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -31,10 +31,10 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
expect(response).to have_http_status(:success)
end
- it 'returns JSON with following=true and requested=false' do
+ it 'returns JSON with following=truthy and requested=false' do
json = body_as_json
- expect(json[:following]).to be true
+ expect(json[:following]).to be_truthy
expect(json[:requested]).to be false
end
@@ -50,11 +50,11 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
expect(response).to have_http_status(:success)
end
- it 'returns JSON with following=false and requested=true' do
+ it 'returns JSON with following=false and requested=truthy' do
json = body_as_json
expect(json[:following]).to be false
- expect(json[:requested]).to be true
+ expect(json[:requested]).to be_truthy
end
it 'creates a follow request relation between user and target user' do
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
@@ -56,6 +56,13 @@ RSpec.describe FeedManager do
expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
end
+ it 'returns true for reblog from account with reblogs disabled' do
+ status = Fabricate(:status, text: 'Hello world', account: jeff)
+ reblog = Fabricate(:status, reblog: status, account: alice)
+ bob.follow!(alice, reblogs: false)
+ expect(FeedManager.instance.filter?(:home, reblog, bob.id)).to be true
+ end
+
it 'returns false for reply by followee to another followee' do
status = Fabricate(:status, text: 'Hello world', account: jeff)
reply = Fabricate(:status, text: 'Nay', thread: status, account: alice)
diff --git a/spec/models/concerns/account_interactions_spec.rb b/spec/models/concerns/account_interactions_spec.rb
@@ -14,7 +14,7 @@ describe AccountInteractions do
context 'account with Follow' do
it 'returns { target_account_id => true }' do
Fabricate(:follow, account: account, target_account: target_account)
- is_expected.to eq(target_account_id => true)
+ is_expected.to eq(target_account_id => { reblogs: true })
end
end
@@ -583,4 +583,41 @@ describe AccountInteractions do
end
end
end
+
+ describe 'ignoring reblogs from an account' do
+ before do
+ @me = Fabricate(:account, username: 'Me')
+ @you = Fabricate(:account, username: 'You')
+ end
+
+ context 'with the reblogs option unspecified' do
+ before do
+ @me.follow!(@you)
+ end
+
+ it 'defaults to showing reblogs' do
+ expect(@me.muting_reblogs?(@you)).to be(false)
+ end
+ end
+
+ context 'with the reblogs option set to false' do
+ before do
+ @me.follow!(@you, reblogs: false)
+ end
+
+ it 'does mute reblogs' do
+ expect(@me.muting_reblogs?(@you)).to be(true)
+ end
+ end
+
+ context 'with the reblogs option set to true' do
+ before do
+ @me.follow!(@you, reblogs: true)
+ end
+
+ it 'does not mute reblogs' do
+ expect(@me.muting_reblogs?(@you)).to be(false)
+ end
+ end
+ end
end
diff --git a/spec/models/follow_request_spec.rb b/spec/models/follow_request_spec.rb
@@ -7,10 +7,24 @@ RSpec.describe FollowRequest, type: :model do
let(:target_account) { Fabricate(:account) }
it 'calls Account#follow!, MergeWorker.perform_async, and #destroy!' do
- expect(account).to receive(:follow!).with(target_account)
+ expect(account).to receive(:follow!).with(target_account, reblogs: true)
expect(MergeWorker).to receive(:perform_async).with(target_account.id, account.id)
expect(follow_request).to receive(:destroy!)
follow_request.authorize!
end
+
+ it 'correctly passes show_reblogs when true' do
+ follow_request = Fabricate.create(:follow_request, show_reblogs: true)
+ follow_request.authorize!
+ target = follow_request.target_account
+ expect(follow_request.account.muting_reblogs?(target)).to be false
+ end
+
+ it 'correctly passes show_reblogs when false' do
+ follow_request = Fabricate.create(:follow_request, show_reblogs: false)
+ follow_request.authorize!
+ target = follow_request.target_account
+ expect(follow_request.account.muting_reblogs?(target)).to be true
+ end
end
end
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
@@ -13,8 +13,20 @@ RSpec.describe FollowService do
subject.call(sender, bob.acct)
end
- it 'creates a follow request' do
- expect(FollowRequest.find_by(account: sender, target_account: bob)).to_not be_nil
+ it 'creates a follow request with reblogs' do
+ expect(FollowRequest.find_by(account: sender, target_account: bob, show_reblogs: true)).to_not be_nil
+ end
+ end
+
+ describe 'locked account, no reblogs' do
+ let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
+
+ before do
+ subject.call(sender, bob.acct, reblogs: false)
+ end
+
+ it 'creates a follow request without reblogs' do
+ expect(FollowRequest.find_by(account: sender, target_account: bob, show_reblogs: false)).to_not be_nil
end
end
@@ -25,8 +37,22 @@ RSpec.describe FollowService do
subject.call(sender, bob.acct)
end
- it 'creates a following relation' do
+ it 'creates a following relation with reblogs' do
+ expect(sender.following?(bob)).to be true
+ expect(sender.muting_reblogs?(bob)).to be false
+ end
+ end
+
+ describe 'unlocked account, no reblogs' do
+ let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+
+ before do
+ subject.call(sender, bob.acct, reblogs: false)
+ end
+
+ it 'creates a following relation without reblogs' do
expect(sender.following?(bob)).to be true
+ expect(sender.muting_reblogs?(bob)).to be true
end
end
@@ -42,6 +68,32 @@ RSpec.describe FollowService do
expect(sender.following?(bob)).to be true
end
end
+
+ describe 'already followed account, turning reblogs off' do
+ let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+
+ before do
+ sender.follow!(bob, reblogs: true)
+ subject.call(sender, bob.acct, reblogs: false)
+ end
+
+ it 'disables reblogs' do
+ expect(sender.muting_reblogs?(bob)).to be true
+ end
+ end
+
+ describe 'already followed account, turning reblogs on' do
+ let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+
+ before do
+ sender.follow!(bob, reblogs: false)
+ subject.call(sender, bob.acct, reblogs: true)
+ end
+
+ it 'disables reblogs' do
+ expect(sender.muting_reblogs?(bob)).to be false
+ end
+ end
end
context 'remote OStatus account' do
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
@@ -81,6 +81,26 @@ RSpec.describe NotifyService do
end
end
+ describe 'reblogs' do
+ let(:status) { Fabricate(:status, account: Fabricate(:account)) }
+ let(:activity) { Fabricate(:status, account: sender, reblog: status) }
+
+ it 'shows reblogs by default' do
+ recipient.follow!(sender)
+ is_expected.to change(Notification, :count)
+ end
+
+ it 'shows reblogs when explicitly enabled' do
+ recipient.follow!(sender, reblogs: true)
+ is_expected.to change(Notification, :count)
+ end
+
+ it 'hides reblogs when disabled' do
+ recipient.follow!(sender, reblogs: false)
+ is_expected.to_not change(Notification, :count)
+ end
+ end
+
context do
let(:asshole) { Fabricate(:account, username: 'asshole') }
let(:reply_to) { Fabricate(:status, account: asshole) }
