diff --git a/app/assets/javascripts/components/actions/accounts.jsx b/app/assets/javascripts/components/actions/accounts.jsx
index 4a0777a64c1feade79e7e6346a1ceea9217d2c6f..759435afe4ac11b430b1af6457e6e3f2e73be6dc 100644
--- a/app/assets/javascripts/components/actions/accounts.jsx
+++ b/app/assets/javascripts/components/actions/accounts.jsx
@@ -246,7 +246,8 @@ export function blockAccount(id) {
dispatch(blockAccountRequest(id));
api(getState).post(`/api/v1/accounts/${id}/block`).then(response => {
- dispatch(blockAccountSuccess(response.data));
+ // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
+ dispatch(blockAccountSuccess(response.data, getState().get('statuses')));
}).catch(error => {
dispatch(blockAccountFail(id, error));
});
@@ -272,10 +273,11 @@ export function blockAccountRequest(id) {
};
};
-export function blockAccountSuccess(relationship) {
+export function blockAccountSuccess(relationship, statuses) {
return {
type: ACCOUNT_BLOCK_SUCCESS,
- relationship
+ relationship,
+ statuses
};
};
diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx
index bf851e5bf4b3e620b86f2601c2b1a20ea2d5943d..603561ab38d94280bc9ee46b79f0549243d61108 100644
--- a/app/assets/javascripts/components/components/status.jsx
+++ b/app/assets/javascripts/components/components/status.jsx
@@ -34,6 +34,7 @@ const Status = React.createClass({
onReblog: React.PropTypes.func,
onDelete: React.PropTypes.func,
onOpenMedia: React.PropTypes.func,
+ onBlock: React.PropTypes.func,
me: React.PropTypes.number,
muted: React.PropTypes.bool
},
diff --git a/app/assets/javascripts/components/components/status_action_bar.jsx b/app/assets/javascripts/components/components/status_action_bar.jsx
index dec1decff03c83b97c7f19d29c2ea5193a97821f..35feda88b21dc31f549a3009b0672a16d022162c 100644
--- a/app/assets/javascripts/components/components/status_action_bar.jsx
+++ b/app/assets/javascripts/components/components/status_action_bar.jsx
@@ -7,6 +7,7 @@ import { defineMessages, injectIntl } from 'react-intl';
const messages = defineMessages({
delete: { id: 'status.delete', defaultMessage: 'Delete' },
mention: { id: 'status.mention', defaultMessage: 'Mention' },
+ block: { id: 'account.block', defaultMessage: 'Block' },
reply: { id: 'status.reply', defaultMessage: 'Reply' },
reblog: { id: 'status.reblog', defaultMessage: 'Reblog' },
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' }
@@ -24,7 +25,8 @@ const StatusActionBar = React.createClass({
onFavourite: React.PropTypes.func,
onReblog: React.PropTypes.func,
onDelete: React.PropTypes.func,
- onMention: React.PropTypes.func
+ onMention: React.PropTypes.func,
+ onBlock: React.PropTypes.func
},
mixins: [PureRenderMixin],
@@ -49,6 +51,10 @@ const StatusActionBar = React.createClass({
this.props.onMention(this.props.status.get('account'));
},
+ handleBlockClick () {
+ this.props.onBlock(this.props.status.get('account'));
+ },
+
render () {
const { status, me, intl } = this.props;
let menu = [];
@@ -57,6 +63,7 @@ const StatusActionBar = React.createClass({
menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
} else {
menu.push({ text: intl.formatMessage(messages.mention), action: this.handleMentionClick });
+ menu.push({ text: intl.formatMessage(messages.block), action: this.handleBlockClick });
}
return (
diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index 87c7c65f342ae4c7097b6ba4566ddf6f8583936d..c9f037ec217faa47c8ddd6f0bcbfadc2c4ed492f 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -75,11 +75,6 @@ const Mastodon = React.createClass({
return store.dispatch(updateTimeline(data.timeline, JSON.parse(data.message)));
case 'delete':
return store.dispatch(deleteFromTimelines(data.id));
- case 'merge':
- case 'unmerge':
- return store.dispatch(refreshTimeline('home', true));
- case 'block':
- return store.dispatch(refreshTimeline('mentions', true));
case 'notification':
return store.dispatch(updateNotifications(JSON.parse(data.message), getMessagesForLocale(locale), locale));
}
diff --git a/app/assets/javascripts/components/containers/status_container.jsx b/app/assets/javascripts/components/containers/status_container.jsx
index 28756b5ef4aee2ce54c48ca897ee9bf8c526e3a7..6a882eab4c1f76f155345989a34b6e04322231c9 100644
--- a/app/assets/javascripts/components/containers/status_container.jsx
+++ b/app/assets/javascripts/components/containers/status_container.jsx
@@ -1,18 +1,19 @@
-import { connect } from 'react-redux';
-import Status from '../components/status';
+import { connect } from 'react-redux';
+import Status from '../components/status';
import { makeGetStatus } from '../selectors';
import {
replyCompose,
mentionCompose
-} from '../actions/compose';
+} from '../actions/compose';
import {
reblog,
favourite,
unreblog,
unfavourite
-} from '../actions/interactions';
-import { deleteStatus } from '../actions/statuses';
-import { openMedia } from '../actions/modal';
+} from '../actions/interactions';
+import { blockAccount } from '../actions/accounts';
+import { deleteStatus } from '../actions/statuses';
+import { openMedia } from '../actions/modal';
import { createSelector } from 'reselect'
const mapStateToProps = (state, props) => ({
@@ -91,6 +92,10 @@ const mapDispatchToProps = (dispatch) => ({
onOpenMedia (url) {
dispatch(openMedia(url));
+ },
+
+ onBlock (account) {
+ dispatch(blockAccount(account.get('id')));
}
});
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 7c42e481d24700e3f84bdda92661bd43ff688835..5ad1ca172fedeb8ccc1963b3b8d52574da4adab2 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -8,7 +8,7 @@ import Autosuggest from 'react-autosuggest';
import AutosuggestAccountContainer from '../../compose/containers/autosuggest_account_container';
import { debounce } from 'react-decoration';
import UploadButtonContainer from '../containers/upload_button_container';
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import Toggle from 'react-toggle';
const messages = defineMessages({
@@ -188,7 +188,7 @@ const ComposeForm = React.createClass({
<label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle', marginTop: '10px', borderTop: '1px solid #616b86', paddingTop: '10px' }}>
<Toggle checked={this.props.sensitive} onChange={this.handleChangeSensitivity} />
- <span style={{ display: 'inline-block', verticalAlign: 'middle', marginBottom: '14px', marginLeft: '8px', color: '#9baec8' }}>Sensitive content</span>
+ <span style={{ display: 'inline-block', verticalAlign: 'middle', marginBottom: '14px', marginLeft: '8px', color: '#9baec8' }}><FormattedMessage id='compose_form.sensitive' defaultMessage='Mark content as sensitive' /></span>
</label>
</div>
);
diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx
index f3326bf90c66898ae2f9ce4f4a18d26d20768aa1..0ea324f66f692049eb6c79eb6c8425d32a215dfc 100644
--- a/app/assets/javascripts/components/locales/en.jsx
+++ b/app/assets/javascripts/components/locales/en.jsx
@@ -8,6 +8,8 @@ const en = {
"status.reblog": "Reblog",
"status.favourite": "Favourite",
"status.reblogged_by": "{name} reblogged",
+ "status.sensitive_warning": "Sensitive content",
+ "status.sensitive_toggle": "Click to view",
"video_player.toggle_sound": "Toggle sound",
"account.mention": "Mention",
"account.edit_profile": "Edit profile",
@@ -35,6 +37,7 @@ const en = {
"tabs_bar.notifications": "Notifications",
"compose_form.placeholder": "What is on your mind?",
"compose_form.publish": "Toot",
+ "compose_form.sensitive": "Mark content as sensitive",
"navigation_bar.settings": "Settings",
"navigation_bar.public_timeline": "Public timeline",
"navigation_bar.logout": "Logout",
diff --git a/app/assets/javascripts/components/reducers/notifications.jsx b/app/assets/javascripts/components/reducers/notifications.jsx
index 0e67e732a36adcbcd6ea8b150ca035feb7d0ac9a..617a833d28fa10c8217f6c2c5b71213f8ab6384c 100644
--- a/app/assets/javascripts/components/reducers/notifications.jsx
+++ b/app/assets/javascripts/components/reducers/notifications.jsx
@@ -3,6 +3,7 @@ import {
NOTIFICATIONS_REFRESH_SUCCESS,
NOTIFICATIONS_EXPAND_SUCCESS
} from '../actions/notifications';
+import { ACCOUNT_BLOCK_SUCCESS } from '../actions/accounts';
import Immutable from 'immutable';
const initialState = Immutable.Map({
@@ -43,6 +44,10 @@ const appendNormalizedNotifications = (state, notifications, next) => {
return state.update('items', list => list.push(...items)).set('next', next);
};
+const filterNotifications = (state, relationship) => {
+ return state.update('items', list => list.filterNot(item => item.get('account') === relationship.id));
+};
+
export default function notifications(state = initialState, action) {
switch(action.type) {
case NOTIFICATIONS_UPDATE:
@@ -51,6 +56,8 @@ export default function notifications(state = initialState, action) {
return normalizeNotifications(state, action.notifications, action.next);
case NOTIFICATIONS_EXPAND_SUCCESS:
return appendNormalizedNotifications(state, action.notifications, action.next);
+ case ACCOUNT_BLOCK_SUCCESS:
+ return filterNotifications(state, action.relationship);
default:
return state;
}
diff --git a/app/assets/javascripts/components/reducers/statuses.jsx b/app/assets/javascripts/components/reducers/statuses.jsx
index 2a24a75e45b5ccbe060a81a7cc423c81d4e8073a..f42b1a481832944d072480d0d0119356334c6f8d 100644
--- a/app/assets/javascripts/components/reducers/statuses.jsx
+++ b/app/assets/javascripts/components/reducers/statuses.jsx
@@ -16,7 +16,8 @@ import {
} from '../actions/timelines';
import {
ACCOUNT_TIMELINE_FETCH_SUCCESS,
- ACCOUNT_TIMELINE_EXPAND_SUCCESS
+ ACCOUNT_TIMELINE_EXPAND_SUCCESS,
+ ACCOUNT_BLOCK_SUCCESS
} from '../actions/accounts';
import {
NOTIFICATIONS_UPDATE,
@@ -56,6 +57,18 @@ const deleteStatus = (state, id, references) => {
return state.delete(id);
};
+const filterStatuses = (state, relationship) => {
+ state.forEach(status => {
+ if (status.get('account') !== relationship.id) {
+ return;
+ }
+
+ state = deleteStatus(state, status.get('id'), state.filter(item => item.get('reblog') === status.get('id')));
+ });
+
+ return state;
+};
+
const initialState = Immutable.Map();
export default function statuses(state = initialState, action) {
@@ -79,6 +92,8 @@ export default function statuses(state = initialState, action) {
return normalizeStatuses(state, action.statuses);
case TIMELINE_DELETE:
return deleteStatus(state, action.id, action.references);
+ case ACCOUNT_BLOCK_SUCCESS:
+ return filterStatuses(state, action.relationship);
default:
return state;
}
diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx
index 9e79a410081966ed9b91244e10ddb6478d2355cf..358734eaf9419b394e357afe6f8e37c9b60cee33 100644
--- a/app/assets/javascripts/components/reducers/timelines.jsx
+++ b/app/assets/javascripts/components/reducers/timelines.jsx
@@ -13,7 +13,8 @@ import {
import {
ACCOUNT_FETCH_SUCCESS,
ACCOUNT_TIMELINE_FETCH_SUCCESS,
- ACCOUNT_TIMELINE_EXPAND_SUCCESS
+ ACCOUNT_TIMELINE_EXPAND_SUCCESS,
+ ACCOUNT_BLOCK_SUCCESS
} from '../actions/accounts';
import {
STATUS_FETCH_SUCCESS,
@@ -140,6 +141,21 @@ const deleteStatus = (state, id, accountId, references) => {
return state;
};
+const filterTimelines = (state, relationship, statuses) => {
+ let references;
+
+ statuses.forEach(status => {
+ if (status.get('account') !== relationship.id) {
+ return;
+ }
+
+ references = statuses.filter(item => item.get('reblog') === status.get('id')).map(item => [item.get('id'), item.get('account')]);
+ state = deleteStatus(state, status.get('id'), status.get('account'), references);
+ });
+
+ return state;
+};
+
const normalizeContext = (state, id, ancestors, descendants) => {
const ancestorsIds = ancestors.map(ancestor => ancestor.get('id'));
const descendantsIds = descendants.map(descendant => descendant.get('id'));
@@ -166,6 +182,8 @@ export default function timelines(state = initialState, action) {
return normalizeAccountTimeline(state, action.id, Immutable.fromJS(action.statuses), action.replace);
case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
return appendNormalizedAccountTimeline(state, action.id, Immutable.fromJS(action.statuses));
+ case ACCOUNT_BLOCK_SUCCESS:
+ return filterTimelines(state, action.relationship, action.statuses);
default:
return state;
}
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index 388a592e0925c56cd6bf6ccad2b8bad14a9a099d..6a032a5a1a1f79876aacab89fd35d4bad4ca6923 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -6,19 +6,27 @@ class BlockService < BaseService
UnfollowService.new.call(account, target_account) if account.following?(target_account)
account.block!(target_account)
- clear_mentions(account, target_account)
+ clear_timelines(account, target_account)
+ clear_notifications(account, target_account)
end
private
- def clear_mentions(account, target_account)
- timeline_key = FeedManager.instance.key(:mentions, account.id)
+ def clear_timelines(account, target_account)
+ mentions_key = FeedManager.instance.key(:mentions, account.id)
+ home_key = FeedManager.instance.key(:home, account.id)
target_account.statuses.select('id').find_each do |status|
- redis.zrem(timeline_key, status.id)
+ redis.zrem(mentions_key, status.id)
+ redis.zrem(home_key, status.id)
end
+ end
- FeedManager.instance.broadcast(account.id, type: 'block', id: target_account.id)
+ def clear_notifications(account, target_account)
+ Notification.where(account: account).joins(:follow).where(activity_type: 'Follow', follows: { account_id: target_account.id }).destroy_all
+ Notification.where(account: account).joins(mention: :status).where(activity_type: 'Mention', statuses: { account_id: target_account.id }).destroy_all
+ Notification.where(account: account).joins(:favourite).where(activity_type: 'Favourite', favourites: { account_id: target_account.id }).destroy_all
+ Notification.where(account: account).joins(:status).where(activity_type: 'Status', statuses: { account_id: target_account.id }).destroy_all
end
def redis
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index cdae254bff1f220b6fb9c8da76185fd1ed8584d7..a57e1b28af4ddbe1ac2c90b47ec06851fa544990 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -33,7 +33,6 @@ class FollowService < BaseService
end
FeedManager.instance.trim(:home, into_account.id)
- FeedManager.instance.broadcast(into_account.id, type: 'merge')
end
def redis
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index b3386a99c16bfc63c69cecf96b874e8028eeb7a7..7973a361116e22fbc4d1b07cf9ee350cf77e34fe 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -17,9 +17,8 @@ class UnfollowService < BaseService
from_account.statuses.select('id').find_each do |status|
redis.zrem(timeline_key, status.id)
+ redis.zremrangebyscore(timeline_key, status.id, status.id)
end
-
- FeedManager.instance.broadcast(into_account.id, type: 'unmerge')
end
def redis