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

[Glitch] Remove hashtags from the last line of a status if it only contains hashtags

Browse source 
Port 061fd66ee6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Renaud Chaput 2023-08-21 19:39:01 +02:00 • committed by Claire
commit 7402adf6e2
6 changed files with 428 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,8 +19,8 @@ import Card from '../features/status/components/card';
import Bundle from '../features/ui/components/bundle';
import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
import { HashtagBar } from './hashtag_bar';
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';
@ -743,10 +743,6 @@ class Status extends ImmutablePureComponent {
contentMediaIcons.push('tasks');
}
media.push(
<HashtagBar hashtags={status.get('tags')} text={status.get('content')} />
);
// Here we prepare extra data-* attributes for CSS selectors.
// Users can use those for theming, hiding avatars etc via UserStyle
const selectorAttribs = {
@ -787,6 +783,9 @@ class Status extends ImmutablePureComponent {
muted,
}, 'focusable');
const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
media.push(hashtagBar);
return (
<HotKeys handlers={handlers}>
<div
@ -835,6 +834,7 @@ class Status extends ImmutablePureComponent {
disabled={!router}
tagLinks={settings.get('tag_misleading_links')}
rewriteMentions={settings.get('rewrite_mentions')}
{...statusContentProps}
/>
{!isCollapsed || !(muted || !settings.getIn(['collapsed', 'show_action_bar'])) ? (