2016-10-30 10:06:43 -04:00
|
|
|
import {
|
2016-11-23 17:34:12 -05:00
|
|
|
REBLOG_REQUEST,
|
2016-10-30 10:06:43 -04:00
|
|
|
REBLOG_SUCCESS,
|
2016-11-23 17:34:12 -05:00
|
|
|
REBLOG_FAIL,
|
2016-10-30 10:06:43 -04:00
|
|
|
UNREBLOG_SUCCESS,
|
2016-11-23 17:34:12 -05:00
|
|
|
FAVOURITE_REQUEST,
|
2016-10-30 10:06:43 -04:00
|
|
|
FAVOURITE_SUCCESS,
|
2016-11-23 17:34:12 -05:00
|
|
|
FAVOURITE_FAIL,
|
2017-05-20 11:31:47 -04:00
|
|
|
UNFAVOURITE_SUCCESS,
|
2017-08-24 19:41:18 -04:00
|
|
|
PIN_SUCCESS,
|
|
|
|
UNPIN_SUCCESS,
|
2016-10-30 10:06:43 -04:00
|
|
|
} from '../actions/interactions';
|
|
|
|
import {
|
|
|
|
STATUS_FETCH_SUCCESS,
|
Feature conversations muting (#3017)
* Add <ostatus:conversation /> tag to Atom input/output
Only uses ref attribute (not href) because href would be
the alternate link that's always included also.
Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.
* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute
Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle
* Display "Dismiss notifications" on all statuses in notifications column, not just own
* Add "muted" as a boolean attribute on statuses JSON
For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested
Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column
* Up max class length
* Remove pending test for conversation mute
* Add tests, clean up
* Rename to "mute conversation" and "unmute conversation"
* Raise validation error when trying to mute/unmute status without conversation
2017-05-14 21:04:13 -04:00
|
|
|
CONTEXT_FETCH_SUCCESS,
|
|
|
|
STATUS_MUTE_SUCCESS,
|
2017-05-20 11:31:47 -04:00
|
|
|
STATUS_UNMUTE_SUCCESS,
|
2016-10-30 10:06:43 -04:00
|
|
|
} from '../actions/statuses';
|
|
|
|
import {
|
|
|
|
TIMELINE_REFRESH_SUCCESS,
|
|
|
|
TIMELINE_UPDATE,
|
|
|
|
TIMELINE_DELETE,
|
2017-05-20 11:31:47 -04:00
|
|
|
TIMELINE_EXPAND_SUCCESS,
|
2016-10-30 10:06:43 -04:00
|
|
|
} from '../actions/timelines';
|
|
|
|
import {
|
2017-05-20 11:31:47 -04:00
|
|
|
ACCOUNT_BLOCK_SUCCESS,
|
2017-10-02 20:01:54 -04:00
|
|
|
ACCOUNT_MUTE_SUCCESS,
|
2016-10-30 10:06:43 -04:00
|
|
|
} from '../actions/accounts';
|
2016-11-20 13:39:18 -05:00
|
|
|
import {
|
|
|
|
NOTIFICATIONS_UPDATE,
|
|
|
|
NOTIFICATIONS_REFRESH_SUCCESS,
|
2017-05-20 11:31:47 -04:00
|
|
|
NOTIFICATIONS_EXPAND_SUCCESS,
|
2016-11-20 13:39:18 -05:00
|
|
|
} from '../actions/notifications';
|
2017-01-16 07:27:58 -05:00
|
|
|
import {
|
|
|
|
FAVOURITED_STATUSES_FETCH_SUCCESS,
|
2017-05-20 11:31:47 -04:00
|
|
|
FAVOURITED_STATUSES_EXPAND_SUCCESS,
|
2017-01-16 07:27:58 -05:00
|
|
|
} from '../actions/favourites';
|
2017-09-07 03:58:11 -04:00
|
|
|
import {
|
|
|
|
PINNED_STATUSES_FETCH_SUCCESS,
|
|
|
|
} from '../actions/pin_statuses';
|
2017-03-31 13:59:54 -04:00
|
|
|
import { SEARCH_FETCH_SUCCESS } from '../actions/search';
|
2017-10-05 21:42:34 -04:00
|
|
|
import emojify from '../features/emoji/emoji';
|
2017-07-10 19:00:14 -04:00
|
|
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
2017-08-07 14:32:03 -04:00
|
|
|
import escapeTextContentForBrowser from 'escape-html';
|
|
|
|
|
|
|
|
const domParser = new DOMParser();
|
2016-10-30 10:06:43 -04:00
|
|
|
|
|
|
|
const normalizeStatus = (state, status) => {
|
2016-11-20 13:39:18 -05:00
|
|
|
if (!status) {
|
|
|
|
return state;
|
|
|
|
}
|
|
|
|
|
2017-02-26 17:06:27 -05:00
|
|
|
const normalStatus = { ...status };
|
|
|
|
normalStatus.account = status.account.id;
|
2016-10-30 10:06:43 -04:00
|
|
|
|
2016-11-03 11:57:44 -04:00
|
|
|
if (status.reblog && status.reblog.id) {
|
2017-02-26 17:06:27 -05:00
|
|
|
state = normalizeStatus(state, status.reblog);
|
|
|
|
normalStatus.reblog = status.reblog.id;
|
2016-10-30 10:06:43 -04:00
|
|
|
}
|
|
|
|
|
2017-10-06 20:38:52 -04:00
|
|
|
const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n');
|
|
|
|
|
2017-09-18 20:42:40 -04:00
|
|
|
const emojiMap = normalStatus.emojis.reduce((obj, emoji) => {
|
2017-10-06 20:38:52 -04:00
|
|
|
obj[`:${emoji.shortcode}:`] = emoji;
|
2017-09-18 20:42:40 -04:00
|
|
|
return obj;
|
|
|
|
}, {});
|
|
|
|
|
2017-08-07 14:32:03 -04:00
|
|
|
normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
|
2017-09-18 20:42:40 -04:00
|
|
|
normalStatus.contentHtml = emojify(normalStatus.content, emojiMap);
|
|
|
|
normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap);
|
2017-04-16 10:33:38 -04:00
|
|
|
|
2017-07-10 19:00:14 -04:00
|
|
|
return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus)));
|
2016-10-30 10:06:43 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
const normalizeStatuses = (state, statuses) => {
|
|
|
|
statuses.forEach(status => {
|
|
|
|
state = normalizeStatus(state, status);
|
|
|
|
});
|
|
|
|
|
|
|
|
return state;
|
|
|
|
};
|
|
|
|
|
|
|
|
const deleteStatus = (state, id, references) => {
|
|
|
|
references.forEach(ref => {
|
|
|
|
state = deleteStatus(state, ref[0], []);
|
|
|
|
});
|
|
|
|
|
|
|
|
return state.delete(id);
|
|
|
|
};
|
|
|
|
|
2016-11-23 16:57:57 -05:00
|
|
|
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;
|
|
|
|
};
|
|
|
|
|
2017-07-10 19:00:14 -04:00
|
|
|
const initialState = ImmutableMap();
|
2016-10-30 10:06:43 -04:00
|
|
|
|
|
|
|
export default function statuses(state = initialState, action) {
|
|
|
|
switch(action.type) {
|
2017-01-16 07:27:58 -05:00
|
|
|
case TIMELINE_UPDATE:
|
|
|
|
case STATUS_FETCH_SUCCESS:
|
|
|
|
case NOTIFICATIONS_UPDATE:
|
|
|
|
return normalizeStatus(state, action.status);
|
|
|
|
case REBLOG_SUCCESS:
|
|
|
|
case UNREBLOG_SUCCESS:
|
|
|
|
case FAVOURITE_SUCCESS:
|
|
|
|
case UNFAVOURITE_SUCCESS:
|
2017-08-24 19:41:18 -04:00
|
|
|
case PIN_SUCCESS:
|
|
|
|
case UNPIN_SUCCESS:
|
2017-01-16 07:27:58 -05:00
|
|
|
return normalizeStatus(state, action.response);
|
|
|
|
case FAVOURITE_REQUEST:
|
|
|
|
return state.setIn([action.status.get('id'), 'favourited'], true);
|
|
|
|
case FAVOURITE_FAIL:
|
|
|
|
return state.setIn([action.status.get('id'), 'favourited'], false);
|
|
|
|
case REBLOG_REQUEST:
|
|
|
|
return state.setIn([action.status.get('id'), 'reblogged'], true);
|
|
|
|
case REBLOG_FAIL:
|
|
|
|
return state.setIn([action.status.get('id'), 'reblogged'], false);
|
Feature conversations muting (#3017)
* Add <ostatus:conversation /> tag to Atom input/output
Only uses ref attribute (not href) because href would be
the alternate link that's always included also.
Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.
* Conversation muting - prevents notifications that reference a conversation
(including replies, favourites, reblogs) from being created. API endpoints
/api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute
Currently no way to tell when a status/conversation is muted, so the web UI
only has a "disable notifications" button, doesn't work as a toggle
* Display "Dismiss notifications" on all statuses in notifications column, not just own
* Add "muted" as a boolean attribute on statuses JSON
For now always false on contained reblogs, since it's only relevant for
statuses returned from the notifications endpoint, which are not nested
Remove "Disable notifications" from detailed status view, since it's
only relevant in the notifications column
* Up max class length
* Remove pending test for conversation mute
* Add tests, clean up
* Rename to "mute conversation" and "unmute conversation"
* Raise validation error when trying to mute/unmute status without conversation
2017-05-14 21:04:13 -04:00
|
|
|
case STATUS_MUTE_SUCCESS:
|
|
|
|
return state.setIn([action.id, 'muted'], true);
|
|
|
|
case STATUS_UNMUTE_SUCCESS:
|
|
|
|
return state.setIn([action.id, 'muted'], false);
|
2017-01-16 07:27:58 -05:00
|
|
|
case TIMELINE_REFRESH_SUCCESS:
|
|
|
|
case TIMELINE_EXPAND_SUCCESS:
|
|
|
|
case CONTEXT_FETCH_SUCCESS:
|
|
|
|
case NOTIFICATIONS_REFRESH_SUCCESS:
|
|
|
|
case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
|
|
case FAVOURITED_STATUSES_FETCH_SUCCESS:
|
|
|
|
case FAVOURITED_STATUSES_EXPAND_SUCCESS:
|
2017-09-07 03:58:11 -04:00
|
|
|
case PINNED_STATUSES_FETCH_SUCCESS:
|
2017-03-31 13:59:54 -04:00
|
|
|
case SEARCH_FETCH_SUCCESS:
|
2017-01-16 07:27:58 -05:00
|
|
|
return normalizeStatuses(state, action.statuses);
|
|
|
|
case TIMELINE_DELETE:
|
|
|
|
return deleteStatus(state, action.id, action.references);
|
|
|
|
case ACCOUNT_BLOCK_SUCCESS:
|
2017-10-02 20:01:54 -04:00
|
|
|
case ACCOUNT_MUTE_SUCCESS:
|
2017-01-16 07:27:58 -05:00
|
|
|
return filterStatuses(state, action.relationship);
|
|
|
|
default:
|
|
|
|
return state;
|
2016-10-30 10:06:43 -04:00
|
|
|
}
|
|
|
|
};
|