matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace link to /reblogs, require authentication

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2022-01-06 20:55:06 +01:00
parent f28a6c5256
commit bf3272d113
4 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/soapbox/features/status/components/status_interaction_bar.js
View File

@ -13,15 +13,20 @@ import { getSoapboxConfig } from 'soapbox/actions/soapbox';
import { openModal } from 'soapbox/actions/modal';
const mapStateToProps = state => {
const me = state.get('me');
const instance = state.get('instance');
return {
me,
allowedEmoji: getSoapboxConfig(state).get('allowedEmoji'),
features: getFeatures(instance),
};
};
const mapDispatchToProps = (dispatch) => ({
onOpenUnauthorizedModal() {
dispatch(openModal('UNAUTHORIZED'));
},
onOpenReblogsModal(username, statusId) {
dispatch(openModal('REBLOGS', {
username,
@ -66,9 +71,10 @@ class StatusInteractionBar extends ImmutablePureComponent {
}
handleOpenReblogsModal = () => {
const { status, onOpenReblogsModal } = this.props;
const { me, status, onOpenUnauthorizedModal, onOpenReblogsModal } = this.props;
onOpenReblogsModal(status.getIn(['account', 'acct']), status.get('id'));
if (!me) onOpenUnauthorizedModal();
else onOpenReblogsModal(status.getIn(['account', 'acct']), status.get('id'));
}
getReposts = () => {
@ -94,9 +100,10 @@ class StatusInteractionBar extends ImmutablePureComponent {
}
handleOpenFavouritesModal = () => {
const { status, onOpenFavouritesModal } = this.props;
const { me, status, onOpenUnauthorizedModal, onOpenFavouritesModal } = this.props;
onOpenFavouritesModal(status.getIn(['account', 'acct']), status.get('id'));
if (!me) onOpenUnauthorizedModal();
else onOpenFavouritesModal(status.getIn(['account', 'acct']), status.get('id'));
}
getFavourites = () => {
@ -136,9 +143,10 @@ class StatusInteractionBar extends ImmutablePureComponent {
}
handleOpenReactionsModal = (reaction) => () => {
const { status, onOpenReactionsModal } = this.props;
const { me, status, onOpenUnauthorizedModal, onOpenReactionsModal } = this.props;
onOpenReactionsModal(status.getIn(['account', 'acct']), status.get('id'), reaction.get('name'));
if (!me) onOpenUnauthorizedModal();
else onOpenReactionsModal(status.getIn(['account', 'acct']), status.get('id'), reaction.get('name'));
}
getEmojiReacts = () => {

4
app/soapbox/features/ui/components/unauthorized_modal.js
View File

@ -146,9 +146,9 @@ class UnauthorizedModal extends ImmutablePureComponent {
}
render() {
const { intl, features, siteTitle } = this.props;
const { intl, features, siteTitle, action } = this.props;
if (features.remoteInteractionsAPI && features.federating) return this.renderRemoteInteractions();
if (action && features.remoteInteractionsAPI && features.federating) return this.renderRemoteInteractions();
return (
<div className='modal-root__modal compose-modal unauthorized-modal'>