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.
137 lines
4.1 KiB
JavaScript
137 lines
4.1 KiB
JavaScript
import {
|
|
ACCOUNT_FETCH_SUCCESS,
|
|
FOLLOWERS_FETCH_SUCCESS,
|
|
FOLLOWERS_EXPAND_SUCCESS,
|
|
FOLLOWING_FETCH_SUCCESS,
|
|
FOLLOWING_EXPAND_SUCCESS,
|
|
FOLLOW_REQUESTS_FETCH_SUCCESS,
|
|
FOLLOW_REQUESTS_EXPAND_SUCCESS,
|
|
ACCOUNT_FOLLOW_SUCCESS,
|
|
ACCOUNT_UNFOLLOW_SUCCESS,
|
|
} from '../actions/accounts';
|
|
import {
|
|
BLOCKS_FETCH_SUCCESS,
|
|
BLOCKS_EXPAND_SUCCESS,
|
|
} from '../actions/blocks';
|
|
import {
|
|
MUTES_FETCH_SUCCESS,
|
|
MUTES_EXPAND_SUCCESS,
|
|
} from '../actions/mutes';
|
|
import { COMPOSE_SUGGESTIONS_READY } from '../actions/compose';
|
|
import {
|
|
REBLOG_SUCCESS,
|
|
UNREBLOG_SUCCESS,
|
|
FAVOURITE_SUCCESS,
|
|
UNFAVOURITE_SUCCESS,
|
|
REBLOGS_FETCH_SUCCESS,
|
|
FAVOURITES_FETCH_SUCCESS,
|
|
} from '../actions/interactions';
|
|
import {
|
|
TIMELINE_REFRESH_SUCCESS,
|
|
TIMELINE_UPDATE,
|
|
TIMELINE_EXPAND_SUCCESS,
|
|
} from '../actions/timelines';
|
|
import {
|
|
STATUS_FETCH_SUCCESS,
|
|
CONTEXT_FETCH_SUCCESS,
|
|
} from '../actions/statuses';
|
|
import { SEARCH_FETCH_SUCCESS } from '../actions/search';
|
|
import {
|
|
NOTIFICATIONS_UPDATE,
|
|
NOTIFICATIONS_REFRESH_SUCCESS,
|
|
NOTIFICATIONS_EXPAND_SUCCESS,
|
|
} from '../actions/notifications';
|
|
import {
|
|
FAVOURITED_STATUSES_FETCH_SUCCESS,
|
|
FAVOURITED_STATUSES_EXPAND_SUCCESS,
|
|
} from '../actions/favourites';
|
|
import { STORE_HYDRATE } from '../actions/store';
|
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
|
|
|
const normalizeAccount = (state, account) => state.set(account.id, fromJS({
|
|
followers_count: account.followers_count,
|
|
following_count: account.following_count,
|
|
statuses_count: account.statuses_count,
|
|
}));
|
|
|
|
const normalizeAccounts = (state, accounts) => {
|
|
accounts.forEach(account => {
|
|
state = normalizeAccount(state, account);
|
|
});
|
|
|
|
return state;
|
|
};
|
|
|
|
const normalizeAccountFromStatus = (state, status) => {
|
|
state = normalizeAccount(state, status.account);
|
|
|
|
if (status.reblog && status.reblog.account) {
|
|
state = normalizeAccount(state, status.reblog.account);
|
|
}
|
|
|
|
return state;
|
|
};
|
|
|
|
const normalizeAccountsFromStatuses = (state, statuses) => {
|
|
statuses.forEach(status => {
|
|
state = normalizeAccountFromStatus(state, status);
|
|
});
|
|
|
|
return state;
|
|
};
|
|
|
|
const initialState = ImmutableMap();
|
|
|
|
export default function accountsCounters(state = initialState, action) {
|
|
switch(action.type) {
|
|
case STORE_HYDRATE:
|
|
return state.merge(action.state.get('accounts').map(item => fromJS({
|
|
followers_count: item.get('followers_count'),
|
|
following_count: item.get('following_count'),
|
|
statuses_count: item.get('statuses_count'),
|
|
})));
|
|
case ACCOUNT_FETCH_SUCCESS:
|
|
case NOTIFICATIONS_UPDATE:
|
|
return normalizeAccount(state, action.account);
|
|
case FOLLOWERS_FETCH_SUCCESS:
|
|
case FOLLOWERS_EXPAND_SUCCESS:
|
|
case FOLLOWING_FETCH_SUCCESS:
|
|
case FOLLOWING_EXPAND_SUCCESS:
|
|
case REBLOGS_FETCH_SUCCESS:
|
|
case FAVOURITES_FETCH_SUCCESS:
|
|
case COMPOSE_SUGGESTIONS_READY:
|
|
case FOLLOW_REQUESTS_FETCH_SUCCESS:
|
|
case FOLLOW_REQUESTS_EXPAND_SUCCESS:
|
|
case BLOCKS_FETCH_SUCCESS:
|
|
case BLOCKS_EXPAND_SUCCESS:
|
|
case MUTES_FETCH_SUCCESS:
|
|
case MUTES_EXPAND_SUCCESS:
|
|
return action.accounts ? normalizeAccounts(state, action.accounts) : state;
|
|
case NOTIFICATIONS_REFRESH_SUCCESS:
|
|
case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
case SEARCH_FETCH_SUCCESS:
|
|
return normalizeAccountsFromStatuses(normalizeAccounts(state, action.accounts), action.statuses);
|
|
case TIMELINE_REFRESH_SUCCESS:
|
|
case TIMELINE_EXPAND_SUCCESS:
|
|
case CONTEXT_FETCH_SUCCESS:
|
|
case FAVOURITED_STATUSES_FETCH_SUCCESS:
|
|
case FAVOURITED_STATUSES_EXPAND_SUCCESS:
|
|
return normalizeAccountsFromStatuses(state, action.statuses);
|
|
case REBLOG_SUCCESS:
|
|
case FAVOURITE_SUCCESS:
|
|
case UNREBLOG_SUCCESS:
|
|
case UNFAVOURITE_SUCCESS:
|
|
return normalizeAccountFromStatus(state, action.response);
|
|
case TIMELINE_UPDATE:
|
|
case STATUS_FETCH_SUCCESS:
|
|
return normalizeAccountFromStatus(state, action.status);
|
|
case ACCOUNT_FOLLOW_SUCCESS:
|
|
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:
|
|
return state;
|
|
}
|
|
};
|