a27fcf5e30
Squashed commit of the following: commit 7b2ba61c4841e23081552fb79270e4e430dd1fe0 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 16:03:52 2020 +0900 Add the ability to change to a new circle by replying to a circle commit 7013a228c65c7bd147885de458b50095f3c24334 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 16:10:57 2020 +0900 fixup! add-limited-visibility-icon-to-status commit 679aa8a7f9bef42ee5d0b326d9ae4925a1999939 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 15:12:53 2020 +0900 Fix 14666 commit b3addd8220d8bb3512ff345b32ca83c714dadd2a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:44:12 2020 +0900 Add Japanese translation for circle commit b7f4b773a0cd554084d5ad6a5923adb06b3acfc4 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:40:12 2020 +0900 Squashed commit of the following: commit b85a4685b27c49462288aba5f38723b91e936c4a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 10:50:03 2020 +0900 Changed to remove restrictions on privacy options and allow users to switch circles when replying commit 0a8c0140c73d7c5333e4f8017964adb5061a7cf1 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:33:07 2020 +0900 Change limited visibility icon commit b64adf19788d828249408454ec6afa9beb3d4872 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Aug 31 06:50:56 2020 +0900 Fix a change to limited-visibility-bearcaps replies commit ed361405b5e38857a2f42b0515a599ddcdd412cf Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 27 15:53:18 2020 +0900 Fix composer text when change visibility commit 4da3adddb6ffde43070d743e34c5b56e06579b30 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Aug 22 22:34:23 2020 +0900 Fix wrong circle_id when changing visibility commit 752d7fc2a3c9e34fab9993d767f83c6eae7ba55a Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Aug 9 13:12:51 2020 +0900 Add circle reply and redraft commit 5978bc04a24695edce6717bda89dcf6f861ef2c4 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 27 01:07:52 2020 +0900 Fix remove unused props commit 7970f69676c24b4aa9385fee8b1635c46ba52fcd Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Jul 26 21:17:07 2020 +0900 Separate circle choice from privacy commit 36f6a684c0b0c895d4d0f1b9d09b05c91b104666 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 10:54:25 2020 +0900 Add UI for posting to circles commit 7ef48003c1407275663dd603b124d292db2aa93a Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 12:55:10 2020 +0900 Fix silent mention by circle commit 7a1caed49333c3d3241301afb77639cdf1cabdc0 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:38:10 2020 +0900 Squashed commit of the following: commit dca71fab86c830932ca760b7d8b3f89cc25c453e Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:31:26 2020 +0900 Revert "Add focus setting when opening the circle column" This reverts commit 3a93ac99312a13b68b7edc2b81313fb0ffb7bcdc. commit 0a1bc8307bb699c7eb3024072ce14a440df1fc87 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:31:11 2020 +0900 Change limited visibility icon commit 9784f8b562f6592e9d9190ca29d2b2e870006d10 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 13 21:52:07 2020 +0900 Add focus setting when opening the circle column commit a84f680c167fab9276550850c60f9108d251144e Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 13 15:55:27 2020 +0900 Fix message commit e3f11c4adac57b6e6a15c981ed6f4721a1634212 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 27 01:01:23 2020 +0900 Fix light-theme commit d7d96eda5b86d3e3f654ce79888e7cf5aa535db5 Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Jul 26 21:50:56 2020 +0900 Fix circles loading in share page and followers search commit 10b821f7b8c0a87cea3df51f09deeadc2cb40b32 Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 14:08:00 2020 +0900 Refactor list items commit e020072915572ce409039ccf799d08f8d8b5b393 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 20:15:38 2020 +0900 Fixed a bug that circle name change is not reflected in the list commit 735bc41161b4c09a8dafe2c0064096b3ca79f2a0 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 08:49:47 2020 +0900 Add UI for managing circle members commit d7c3145b8fa84be0631bf7f41bb229f3e6d03ff1 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 07:34:52 2020 +0900 Add the followers option to AccountSearchSercive commit 65e2b0c4299b72ede440b50089c1bd6afa6c9c05 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 07:05:56 2020 +0900 Add CircleSerializer commit a639e1803abf5590068846dbe98bc5edfaa2ad82 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:37:30 2020 +0900 Squashed commit of the following: commit 9cb3fb9d980e3ee066083076f508c5ab1447176a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 07:15:19 2020 +0900 Move the link to the mention list to the menu commit b32dd87b43f4e09b8e2c437f1fb5d3ebd6221215 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 00:56:12 2020 +0900 Change limited visibility icon commit 8db0d024119d1c2cef8de849f2501496a166a2dd Author: noellabo <noel.yoshiba@gmail.com> Date: Tue Sep 1 01:42:13 2020 +0900 Fix to disallow getting the list of mentions in limited replies commit 490a9d65a59a3dd0d86e81f6780e879dc4313dff Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 11:36:24 2020 +0900 Add column to list mentioned accounts of limited status commit 62a423ac2729c16f26fafe111f257bc373218df2 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 13:30:17 2020 +0900 Fix visibility compatibility more commit a5cfa54b259054f41e89037f299fa928a2361818 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 20 05:39:49 2020 +0900 Fix visibility compatibility commit 7900ca5650c77565b86ddc594a221dfa3b5321b4 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 20 02:01:27 2020 +0900 Add limited visibility icon to status commit 66b83965ef068e9ee8c940249c68bcbde15731fe Author: Eugen Rochko <eugen@zeonfederated.com> Date: Wed Aug 26 03:16:47 2020 +0200 Add conversation-based forwarding for limited visibility statuses through bearcaps commit 561abc65e0ace89318b3952047025b8d98515fbb Author: Eugen Rochko <eugen@zeonfederated.com> Date: Sun Jul 19 02:05:16 2020 +0200 Add REST API for managing and posting to circles Circles are the conceptual opposite of lists. A list is a subdivision of your follows, a circle is a subdivision of your followers. Posting to a circle means making content available to only some of your followers. Circles have been internally supported in Mastodon for the purposes of federation since #8950, this adds the REST API necessary for making use of them in Mastodon itsef.
298 lines
9.4 KiB
JavaScript
298 lines
9.4 KiB
JavaScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import Status from '../components/status';
|
|
import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
|
|
import {
|
|
replyCompose,
|
|
quoteCompose,
|
|
mentionCompose,
|
|
directCompose,
|
|
} from '../actions/compose';
|
|
import {
|
|
reblog,
|
|
favourite,
|
|
bookmark,
|
|
unreblog,
|
|
unfavourite,
|
|
unbookmark,
|
|
pin,
|
|
unpin,
|
|
} from '../actions/interactions';
|
|
import {
|
|
muteStatus,
|
|
unmuteStatus,
|
|
deleteStatus,
|
|
hideStatus,
|
|
revealStatus,
|
|
toggleStatusCollapse,
|
|
hideQuote,
|
|
revealQuote,
|
|
} from '../actions/statuses';
|
|
import {
|
|
followAccount,
|
|
unfollowAccount,
|
|
subscribeAccount,
|
|
unsubscribeAccount,
|
|
unmuteAccount,
|
|
unblockAccount,
|
|
} from '../actions/accounts';
|
|
import {
|
|
blockDomain,
|
|
unblockDomain,
|
|
} from '../actions/domain_blocks';
|
|
|
|
import { initMuteModal } from '../actions/mutes';
|
|
import { initBlockModal } from '../actions/blocks';
|
|
import { initBoostModal } from '../actions/boosts';
|
|
import { initReport } from '../actions/reports';
|
|
import { openModal } from '../actions/modal';
|
|
import { deployPictureInPicture } from '../actions/picture_in_picture';
|
|
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
|
import { boostModal, deleteModal, unfollowModal, unsubscribeModal } from '../initial_state';
|
|
import { showAlertForError } from '../actions/alerts';
|
|
|
|
const messages = defineMessages({
|
|
deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
|
|
deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
|
|
redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
|
|
redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? Favourites and boosts will be lost, and replies to the original post will be orphaned.' },
|
|
replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
|
|
replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
|
|
quoteConfirm: { id: 'confirmations.quote.confirm', defaultMessage: 'Quote' },
|
|
quoteMessage: { id: 'confirmations.quote.message', defaultMessage: 'Quoting now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
|
|
blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
|
|
unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
|
|
unsubscribeConfirm: { id: 'confirmations.unsubscribe.confirm', defaultMessage: 'Unsubscribe' },
|
|
});
|
|
|
|
const makeMapStateToProps = () => {
|
|
const getStatus = makeGetStatus();
|
|
const getPictureInPicture = makeGetPictureInPicture();
|
|
|
|
const mapStateToProps = (state, props) => ({
|
|
status: getStatus(state, props),
|
|
pictureInPicture: getPictureInPicture(state, props),
|
|
});
|
|
|
|
return mapStateToProps;
|
|
};
|
|
|
|
const mapDispatchToProps = (dispatch, { intl }) => ({
|
|
|
|
onReply (status, router) {
|
|
dispatch((_, getState) => {
|
|
let state = getState();
|
|
|
|
if (state.getIn(['compose', 'text']).trim().length !== 0) {
|
|
dispatch(openModal('CONFIRM', {
|
|
message: intl.formatMessage(messages.replyMessage),
|
|
confirm: intl.formatMessage(messages.replyConfirm),
|
|
onConfirm: () => dispatch(replyCompose(status, router)),
|
|
}));
|
|
} else {
|
|
dispatch(replyCompose(status, router));
|
|
}
|
|
});
|
|
},
|
|
|
|
onModalReblog (status, privacy) {
|
|
if (status.get('reblogged')) {
|
|
dispatch(unreblog(status));
|
|
} else {
|
|
dispatch(reblog(status, privacy));
|
|
}
|
|
},
|
|
|
|
onReblog (status, e) {
|
|
if ((e && e.shiftKey) || !boostModal) {
|
|
this.onModalReblog(status);
|
|
} else {
|
|
dispatch(initBoostModal({ status, onReblog: this.onModalReblog }));
|
|
}
|
|
},
|
|
|
|
onQuote (status, router) {
|
|
dispatch((_, getState) => {
|
|
let state = getState();
|
|
|
|
if (state.getIn(['compose', 'text']).trim().length !== 0) {
|
|
dispatch(openModal('CONFIRM', {
|
|
message: intl.formatMessage(messages.quoteMessage),
|
|
confirm: intl.formatMessage(messages.quoteConfirm),
|
|
onConfirm: () => dispatch(quoteCompose(status, router)),
|
|
}));
|
|
} else {
|
|
dispatch(quoteCompose(status, router));
|
|
}
|
|
});
|
|
},
|
|
|
|
onFavourite (status) {
|
|
if (status.get('favourited')) {
|
|
dispatch(unfavourite(status));
|
|
} else {
|
|
dispatch(favourite(status));
|
|
}
|
|
},
|
|
|
|
onBookmark (status) {
|
|
if (status.get('bookmarked')) {
|
|
dispatch(unbookmark(status));
|
|
} else {
|
|
dispatch(bookmark(status));
|
|
}
|
|
},
|
|
|
|
onPin (status) {
|
|
if (status.get('pinned')) {
|
|
dispatch(unpin(status));
|
|
} else {
|
|
dispatch(pin(status));
|
|
}
|
|
},
|
|
|
|
onEmbed (status) {
|
|
dispatch(openModal('EMBED', {
|
|
url: status.get('url'),
|
|
onError: error => dispatch(showAlertForError(error)),
|
|
}));
|
|
},
|
|
|
|
onDelete (status, history, withRedraft = false) {
|
|
if (!deleteModal) {
|
|
dispatch(deleteStatus(status.get('id'), history, withRedraft));
|
|
} else {
|
|
dispatch(openModal('CONFIRM', {
|
|
message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
|
|
confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
|
|
onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
|
|
}));
|
|
}
|
|
},
|
|
|
|
onDirect (account, router) {
|
|
dispatch(directCompose(account, router));
|
|
},
|
|
|
|
onMemberList (status, history) {
|
|
history.push(`/statuses/${status.get('id')}/mentions`);
|
|
},
|
|
|
|
onMention (account, router) {
|
|
dispatch(mentionCompose(account, router));
|
|
},
|
|
|
|
onOpenMedia (statusId, media, index) {
|
|
dispatch(openModal('MEDIA', { statusId, media, index }));
|
|
},
|
|
|
|
onOpenVideo (statusId, media, options) {
|
|
dispatch(openModal('VIDEO', { statusId, media, options }));
|
|
},
|
|
|
|
onBlock (status) {
|
|
const account = status.get('account');
|
|
dispatch(initBlockModal(account));
|
|
},
|
|
|
|
onUnblock (account) {
|
|
dispatch(unblockAccount(account.get('id')));
|
|
},
|
|
|
|
onReport (status) {
|
|
dispatch(initReport(status.get('account'), status));
|
|
},
|
|
|
|
onMute (account) {
|
|
dispatch(initMuteModal(account));
|
|
},
|
|
|
|
onUnmute (account) {
|
|
dispatch(unmuteAccount(account.get('id')));
|
|
},
|
|
|
|
onMuteConversation (status) {
|
|
if (status.get('muted')) {
|
|
dispatch(unmuteStatus(status.get('id')));
|
|
} else {
|
|
dispatch(muteStatus(status.get('id')));
|
|
}
|
|
},
|
|
|
|
onToggleHidden (status) {
|
|
if (status.get('hidden')) {
|
|
dispatch(revealStatus(status.get('id')));
|
|
} else {
|
|
dispatch(hideStatus(status.get('id')));
|
|
}
|
|
},
|
|
|
|
onToggleCollapsed (status, isCollapsed) {
|
|
dispatch(toggleStatusCollapse(status.get('id'), isCollapsed));
|
|
},
|
|
|
|
onBlockDomain (domain) {
|
|
dispatch(openModal('CONFIRM', {
|
|
message: <FormattedMessage id='confirmations.domain_block.message' defaultMessage='Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable. You will not see content from that domain in any public timelines or your notifications. Your followers from that domain will be removed.' values={{ domain: <strong>{domain}</strong> }} />,
|
|
confirm: intl.formatMessage(messages.blockDomainConfirm),
|
|
onConfirm: () => dispatch(blockDomain(domain)),
|
|
}));
|
|
},
|
|
|
|
onUnblockDomain (domain) {
|
|
dispatch(unblockDomain(domain));
|
|
},
|
|
|
|
deployPictureInPicture (status, type, mediaProps) {
|
|
dispatch(deployPictureInPicture(status.get('id'), status.getIn(['account', 'id']), type, mediaProps));
|
|
},
|
|
|
|
onQuoteToggleHidden (status) {
|
|
if (status.get('quote_hidden')) {
|
|
dispatch(revealQuote(status.get('id')));
|
|
} else {
|
|
dispatch(hideQuote(status.get('id')));
|
|
}
|
|
},
|
|
|
|
onFollow (account) {
|
|
if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
|
|
if (unfollowModal) {
|
|
dispatch(openModal('CONFIRM', {
|
|
message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
|
|
confirm: intl.formatMessage(messages.unfollowConfirm),
|
|
onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
|
|
}));
|
|
} else {
|
|
dispatch(unfollowAccount(account.get('id')));
|
|
}
|
|
} else {
|
|
dispatch(followAccount(account.get('id')));
|
|
}
|
|
},
|
|
|
|
onSubscribe (account) {
|
|
if (account.getIn(['relationship', 'subscribing', '-1'], new Map).size > 0) {
|
|
if (unsubscribeModal) {
|
|
dispatch(openModal('CONFIRM', {
|
|
message: <FormattedMessage id='confirmations.unsubscribe.message' defaultMessage='Are you sure you want to unsubscribe {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
|
|
confirm: intl.formatMessage(messages.unsubscribeConfirm),
|
|
onConfirm: () => dispatch(unsubscribeAccount(account.get('id'))),
|
|
}));
|
|
} else {
|
|
dispatch(unsubscribeAccount(account.get('id')));
|
|
}
|
|
} else {
|
|
dispatch(subscribeAccount(account.get('id')));
|
|
}
|
|
},
|
|
|
|
onAddToList (account){
|
|
dispatch(openModal('LIST_ADDER', {
|
|
accountId: account.get('id'),
|
|
}));
|
|
},
|
|
|
|
});
|
|
|
|
export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
|