mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 07:13:44 +01:00
904a2479dd
* Fix: Switching between composing direct message and mention from menus Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that. * Fix: Add missing proptype check for onMention in Status component * Add the ability to send a direct message to a user from the menu on Statuses * Add space between "Embed" and "Mention" on expanded statuses menu
305 lines
9.8 KiB
JavaScript
305 lines
9.8 KiB
JavaScript
import {
|
|
COMPOSE_MOUNT,
|
|
COMPOSE_UNMOUNT,
|
|
COMPOSE_CHANGE,
|
|
COMPOSE_REPLY,
|
|
COMPOSE_REPLY_CANCEL,
|
|
COMPOSE_DIRECT,
|
|
COMPOSE_MENTION,
|
|
COMPOSE_SUBMIT_REQUEST,
|
|
COMPOSE_SUBMIT_SUCCESS,
|
|
COMPOSE_SUBMIT_FAIL,
|
|
COMPOSE_UPLOAD_REQUEST,
|
|
COMPOSE_UPLOAD_SUCCESS,
|
|
COMPOSE_UPLOAD_FAIL,
|
|
COMPOSE_UPLOAD_UNDO,
|
|
COMPOSE_UPLOAD_PROGRESS,
|
|
COMPOSE_SUGGESTIONS_CLEAR,
|
|
COMPOSE_SUGGESTIONS_READY,
|
|
COMPOSE_SUGGESTION_SELECT,
|
|
COMPOSE_SUGGESTION_TAGS_UPDATE,
|
|
COMPOSE_TAG_HISTORY_UPDATE,
|
|
COMPOSE_SENSITIVITY_CHANGE,
|
|
COMPOSE_SPOILERNESS_CHANGE,
|
|
COMPOSE_SPOILER_TEXT_CHANGE,
|
|
COMPOSE_VISIBILITY_CHANGE,
|
|
COMPOSE_COMPOSING_CHANGE,
|
|
COMPOSE_EMOJI_INSERT,
|
|
COMPOSE_UPLOAD_CHANGE_REQUEST,
|
|
COMPOSE_UPLOAD_CHANGE_SUCCESS,
|
|
COMPOSE_UPLOAD_CHANGE_FAIL,
|
|
COMPOSE_RESET,
|
|
} from '../actions/compose';
|
|
import { TIMELINE_DELETE } from '../actions/timelines';
|
|
import { STORE_HYDRATE } from '../actions/store';
|
|
import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
|
|
import uuid from '../uuid';
|
|
import { me } from '../initial_state';
|
|
|
|
const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
|
|
|
|
const initialState = ImmutableMap({
|
|
mounted: 0,
|
|
sensitive: false,
|
|
spoiler: false,
|
|
spoiler_text: '',
|
|
privacy: null,
|
|
text: '',
|
|
focusDate: null,
|
|
preselectDate: null,
|
|
in_reply_to: null,
|
|
is_composing: false,
|
|
is_submitting: false,
|
|
is_uploading: false,
|
|
progress: 0,
|
|
media_attachments: ImmutableList(),
|
|
suggestion_token: null,
|
|
suggestions: ImmutableList(),
|
|
default_privacy: 'public',
|
|
default_sensitive: false,
|
|
resetFileKey: Math.floor((Math.random() * 0x10000)),
|
|
idempotencyKey: null,
|
|
tagHistory: ImmutableList(),
|
|
});
|
|
|
|
function statusToTextMentions(state, status) {
|
|
let set = ImmutableOrderedSet([]);
|
|
|
|
if (status.getIn(['account', 'id']) !== me) {
|
|
set = set.add(`@${status.getIn(['account', 'acct'])} `);
|
|
}
|
|
|
|
return set.union(status.get('mentions').filterNot(mention => mention.get('id') === me).map(mention => `@${mention.get('acct')} `)).join('');
|
|
};
|
|
|
|
function clearAll(state) {
|
|
return state.withMutations(map => {
|
|
map.set('text', '');
|
|
map.set('spoiler', false);
|
|
map.set('spoiler_text', '');
|
|
map.set('is_submitting', false);
|
|
map.set('in_reply_to', null);
|
|
map.set('privacy', state.get('default_privacy'));
|
|
map.set('sensitive', false);
|
|
map.update('media_attachments', list => list.clear());
|
|
map.set('idempotencyKey', uuid());
|
|
});
|
|
};
|
|
|
|
function appendMedia(state, media) {
|
|
const prevSize = state.get('media_attachments').size;
|
|
|
|
return state.withMutations(map => {
|
|
map.update('media_attachments', list => list.push(media));
|
|
map.set('is_uploading', false);
|
|
map.set('resetFileKey', Math.floor((Math.random() * 0x10000)));
|
|
map.set('focusDate', new Date());
|
|
map.set('idempotencyKey', uuid());
|
|
|
|
if (prevSize === 0 && (state.get('default_sensitive') || state.get('spoiler'))) {
|
|
map.set('sensitive', true);
|
|
}
|
|
});
|
|
};
|
|
|
|
function removeMedia(state, mediaId) {
|
|
const prevSize = state.get('media_attachments').size;
|
|
|
|
return state.withMutations(map => {
|
|
map.update('media_attachments', list => list.filterNot(item => item.get('id') === mediaId));
|
|
map.set('idempotencyKey', uuid());
|
|
|
|
if (prevSize === 1) {
|
|
map.set('sensitive', false);
|
|
}
|
|
});
|
|
};
|
|
|
|
const insertSuggestion = (state, position, token, completion) => {
|
|
return state.withMutations(map => {
|
|
map.update('text', oldText => `${oldText.slice(0, position)}${completion} ${oldText.slice(position + token.length)}`);
|
|
map.set('suggestion_token', null);
|
|
map.update('suggestions', ImmutableList(), list => list.clear());
|
|
map.set('focusDate', new Date());
|
|
map.set('idempotencyKey', uuid());
|
|
});
|
|
};
|
|
|
|
const updateSuggestionTags = (state, token) => {
|
|
const prefix = token.slice(1);
|
|
|
|
return state.merge({
|
|
suggestions: state.get('tagHistory')
|
|
.filter(tag => tag.startsWith(prefix))
|
|
.slice(0, 4)
|
|
.map(tag => '#' + tag),
|
|
suggestion_token: token,
|
|
});
|
|
};
|
|
|
|
const insertEmoji = (state, position, emojiData) => {
|
|
const oldText = state.get('text');
|
|
const needsSpace = emojiData.custom && position > 0 && !allowedAroundShortCode.includes(oldText[position - 1]);
|
|
const emoji = needsSpace ? ' ' + emojiData.native : emojiData.native;
|
|
|
|
return state.merge({
|
|
text: `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`,
|
|
focusDate: new Date(),
|
|
idempotencyKey: uuid(),
|
|
});
|
|
};
|
|
|
|
const privacyPreference = (a, b) => {
|
|
if (a === 'direct' || b === 'direct') {
|
|
return 'direct';
|
|
} else if (a === 'private' || b === 'private') {
|
|
return 'private';
|
|
} else if (a === 'unlisted' || b === 'unlisted') {
|
|
return 'unlisted';
|
|
} else {
|
|
return 'public';
|
|
}
|
|
};
|
|
|
|
const hydrate = (state, hydratedState) => {
|
|
state = clearAll(state.merge(hydratedState));
|
|
|
|
if (hydratedState.has('text')) {
|
|
state = state.set('text', hydratedState.get('text'));
|
|
}
|
|
|
|
return state;
|
|
};
|
|
|
|
export default function compose(state = initialState, action) {
|
|
switch(action.type) {
|
|
case STORE_HYDRATE:
|
|
return hydrate(state, action.state.get('compose'));
|
|
case COMPOSE_MOUNT:
|
|
return state.set('mounted', state.get('mounted') + 1);
|
|
case COMPOSE_UNMOUNT:
|
|
return state
|
|
.set('mounted', Math.max(state.get('mounted') - 1, 0))
|
|
.set('is_composing', false);
|
|
case COMPOSE_SENSITIVITY_CHANGE:
|
|
return state.withMutations(map => {
|
|
if (!state.get('spoiler')) {
|
|
map.set('sensitive', !state.get('sensitive'));
|
|
}
|
|
|
|
map.set('idempotencyKey', uuid());
|
|
});
|
|
case COMPOSE_SPOILERNESS_CHANGE:
|
|
return state.withMutations(map => {
|
|
map.set('spoiler_text', '');
|
|
map.set('spoiler', !state.get('spoiler'));
|
|
map.set('idempotencyKey', uuid());
|
|
|
|
if (!state.get('sensitive') && state.get('media_attachments').size >= 1) {
|
|
map.set('sensitive', true);
|
|
}
|
|
});
|
|
case COMPOSE_SPOILER_TEXT_CHANGE:
|
|
return state
|
|
.set('spoiler_text', action.text)
|
|
.set('idempotencyKey', uuid());
|
|
case COMPOSE_VISIBILITY_CHANGE:
|
|
return state
|
|
.set('privacy', action.value)
|
|
.set('idempotencyKey', uuid());
|
|
case COMPOSE_CHANGE:
|
|
return state
|
|
.set('text', action.text)
|
|
.set('idempotencyKey', uuid());
|
|
case COMPOSE_COMPOSING_CHANGE:
|
|
return state.set('is_composing', action.value);
|
|
case COMPOSE_REPLY:
|
|
return state.withMutations(map => {
|
|
map.set('in_reply_to', action.status.get('id'));
|
|
map.set('text', statusToTextMentions(state, action.status));
|
|
map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
|
|
map.set('focusDate', new Date());
|
|
map.set('preselectDate', new Date());
|
|
map.set('idempotencyKey', uuid());
|
|
|
|
if (action.status.get('spoiler_text').length > 0) {
|
|
map.set('spoiler', true);
|
|
map.set('spoiler_text', action.status.get('spoiler_text'));
|
|
} else {
|
|
map.set('spoiler', false);
|
|
map.set('spoiler_text', '');
|
|
}
|
|
});
|
|
case COMPOSE_REPLY_CANCEL:
|
|
case COMPOSE_RESET:
|
|
return state.withMutations(map => {
|
|
map.set('in_reply_to', null);
|
|
map.set('text', '');
|
|
map.set('spoiler', false);
|
|
map.set('spoiler_text', '');
|
|
map.set('privacy', state.get('default_privacy'));
|
|
map.set('idempotencyKey', uuid());
|
|
});
|
|
case COMPOSE_SUBMIT_REQUEST:
|
|
case COMPOSE_UPLOAD_CHANGE_REQUEST:
|
|
return state.set('is_submitting', true);
|
|
case COMPOSE_SUBMIT_SUCCESS:
|
|
return clearAll(state);
|
|
case COMPOSE_SUBMIT_FAIL:
|
|
case COMPOSE_UPLOAD_CHANGE_FAIL:
|
|
return state.set('is_submitting', false);
|
|
case COMPOSE_UPLOAD_REQUEST:
|
|
return state.set('is_uploading', true);
|
|
case COMPOSE_UPLOAD_SUCCESS:
|
|
return appendMedia(state, fromJS(action.media));
|
|
case COMPOSE_UPLOAD_FAIL:
|
|
return state.set('is_uploading', false);
|
|
case COMPOSE_UPLOAD_UNDO:
|
|
return removeMedia(state, action.media_id);
|
|
case COMPOSE_UPLOAD_PROGRESS:
|
|
return state.set('progress', Math.round((action.loaded / action.total) * 100));
|
|
case COMPOSE_MENTION:
|
|
return state.withMutations(map => {
|
|
map.update('text', text => [text.trim(), `@${action.account.get('acct')} `].filter((str) => str.length !== 0).join(' '));
|
|
map.set('focusDate', new Date());
|
|
map.set('idempotencyKey', uuid());
|
|
});
|
|
case COMPOSE_DIRECT:
|
|
return state.withMutations(map => {
|
|
map.update('text', text => [text.trim(), `@${action.account.get('acct')} `].filter((str) => str.length !== 0).join(' '));
|
|
map.set('privacy', 'direct');
|
|
map.set('focusDate', new Date());
|
|
map.set('idempotencyKey', uuid());
|
|
});
|
|
case COMPOSE_SUGGESTIONS_CLEAR:
|
|
return state.update('suggestions', ImmutableList(), list => list.clear()).set('suggestion_token', null);
|
|
case COMPOSE_SUGGESTIONS_READY:
|
|
return state.set('suggestions', ImmutableList(action.accounts ? action.accounts.map(item => item.id) : action.emojis)).set('suggestion_token', action.token);
|
|
case COMPOSE_SUGGESTION_SELECT:
|
|
return insertSuggestion(state, action.position, action.token, action.completion);
|
|
case COMPOSE_SUGGESTION_TAGS_UPDATE:
|
|
return updateSuggestionTags(state, action.token);
|
|
case COMPOSE_TAG_HISTORY_UPDATE:
|
|
return state.set('tagHistory', fromJS(action.tags));
|
|
case TIMELINE_DELETE:
|
|
if (action.id === state.get('in_reply_to')) {
|
|
return state.set('in_reply_to', null);
|
|
} else {
|
|
return state;
|
|
}
|
|
case COMPOSE_EMOJI_INSERT:
|
|
return insertEmoji(state, action.position, action.emoji);
|
|
case COMPOSE_UPLOAD_CHANGE_SUCCESS:
|
|
return state
|
|
.set('is_submitting', false)
|
|
.update('media_attachments', list => list.map(item => {
|
|
if (item.get('id') === action.media.id) {
|
|
return fromJS(action.media);
|
|
}
|
|
|
|
return item;
|
|
}));
|
|
default:
|
|
return state;
|
|
}
|
|
};
|