CloudToys/puyopuyotetr.is
1
0
Fork 0
Code

[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code

Browse Source
This commit is contained in:
Jeremy Kescher 2024-05-21 00:46:17 +02:00 committed by Essem
parent 524dd8c447
commit 8104b63e6c
No known key found for this signature in database
GPG Key ID: 7D497397CC3A2A8C
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/flavours/glitch/components/status.jsx
View File

@ -12,6 +12,7 @@ import { HotKeys } from 'react-hotkeys';
import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder'; import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
import PollContainer from 'flavours/glitch/containers/poll_container'; import PollContainer from 'flavours/glitch/containers/poll_container';
import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container'; import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';
import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning'; import { autoUnfoldCW } from 'flavours/glitch/utils/content_warning';
import { withOptionalRouter, WithOptionalRouterPropTypes } from 'flavours/glitch/utils/react_router'; import { withOptionalRouter, WithOptionalRouterPropTypes } from 'flavours/glitch/utils/react_router';
@ -77,6 +78,7 @@ class Status extends ImmutablePureComponent {
static contextType = SensitiveMediaContext; static contextType = SensitiveMediaContext;
static propTypes = { static propTypes = {
identity: identityContextPropShape,
containerId: PropTypes.string, containerId: PropTypes.string,
id: PropTypes.string, id: PropTypes.string,
status: ImmutablePropTypes.map, status: ImmutablePropTypes.map,
@ -541,6 +543,7 @@ class Status extends ImmutablePureComponent {
onOpenMedia, onOpenMedia,
notification, notification,
history, history,
identity,
...other ...other
} = this.props; } = this.props;
const { isCollapsed } = this.state; const { isCollapsed } = this.state;
@ -849,7 +852,7 @@ class Status extends ImmutablePureComponent {
numVisible={visibleReactions} numVisible={visibleReactions}
addReaction={this.props.onReactionAdd} addReaction={this.props.onReactionAdd}
removeReaction={this.props.onReactionRemove} removeReaction={this.props.onReactionRemove}
canReact={this.context.identity.signedIn} canReact={this.props.identity.signedIn}
/> />
{(!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar']))) && ( {(!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar']))) && (
@ -874,4 +877,4 @@ class Status extends ImmutablePureComponent {
} }
export default withOptionalRouter(injectIntl(Status)); export default withOptionalRouter(injectIntl((withIdentity(Status))));

11
app/javascript/flavours/glitch/features/status/components/detailed_status.jsx
View File

@ -15,6 +15,7 @@ import { getHashtagBarForStatus } from 'flavours/glitch/components/hashtag_bar';
import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder'; import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon'; import { VisibilityIcon } from 'flavours/glitch/components/visibility_icon';
import PollContainer from 'flavours/glitch/containers/poll_container'; import PollContainer from 'flavours/glitch/containers/poll_container';
import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router'; import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
import { Avatar } from '../../../components/avatar'; import { Avatar } from '../../../components/avatar';
@ -29,12 +30,8 @@ import Video from '../../video';
import Card from './card'; import Card from './card';
class DetailedStatus extends ImmutablePureComponent { class DetailedStatus extends ImmutablePureComponent {
static contextTypes = {
identity: PropTypes.object,
};
static propTypes = { static propTypes = {
identity: identityContextPropShape,
status: ImmutablePropTypes.map, status: ImmutablePropTypes.map,
settings: ImmutablePropTypes.map.isRequired, settings: ImmutablePropTypes.map.isRequired,
onOpenMedia: PropTypes.func.isRequired, onOpenMedia: PropTypes.func.isRequired,
@ -319,7 +316,7 @@ class DetailedStatus extends ImmutablePureComponent {
reactions={status.get('reactions')} reactions={status.get('reactions')}
addReaction={this.props.onReactionAdd} addReaction={this.props.onReactionAdd}
removeReaction={this.props.onReactionRemove} removeReaction={this.props.onReactionRemove}
canReact={this.context.identity.signedIn} canReact={this.props.identity.signedIn}
/> />
<div className='detailed-status__meta'> <div className='detailed-status__meta'>
@ -348,4 +345,4 @@ class DetailedStatus extends ImmutablePureComponent {
} }
export default withRouter(DetailedStatus); export default withRouter(withIdentity(DetailedStatus));

4
app/javascript/flavours/glitch/features/status/index.jsx
View File

@ -282,8 +282,8 @@ class Status extends ImmutablePureComponent {
}; };
handleReactionAdd = (statusId, name, url) => { handleReactionAdd = (statusId, name, url) => {
const { dispatch } = this.props; const { dispatch, identity } = this.props;
const { signedIn } = this.context.identity; const { signedIn } = identity;
if (signedIn) { if (signedIn) {
dispatch(addReaction(statusId, name, url)); dispatch(addReaction(statusId, name, url));