mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 13:33:21 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'claire/glitch-soc/merge-upstream'

Browse source
This commit is contained in:
Essem 2023-08-27 00:24:46 -05:00
commit 1fe16ad546
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
6 changed files with 477 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/flavours/glitch/components/status.jsx
View file

@ -20,6 +20,7 @@ import Bundle from '../features/ui/components/bundle';
import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
import AttachmentList from './attachment_list';
import { getHashtagBarForStatus } from './hashtag_bar';
import StatusActionBar from './status_action_bar';
import StatusContent from './status_content';
import StatusHeader from './status_header';
@ -787,6 +788,9 @@ class Status extends ImmutablePureComponent {
muted,
}, 'focusable');
const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
contentMedia.push(hashtagBar);
return (
<HotKeys handlers={handlers}>
<div
@ -835,6 +839,7 @@ class Status extends ImmutablePureComponent {
disabled={!router}
tagLinks={settings.get('tag_misleading_links')}
rewriteMentions={settings.get('rewrite_mentions')}
{...statusContentProps}
/>
<StatusReactions