bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ditto-trends' into 'develop'

Browse source 
Ditto trends

See merge request soapbox-pub/soapbox!2632
This commit is contained in:
Alex Gleason 2023-07-26 18:08:18 +00:00
commit 0d5b21ca04
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/soapbox/components/hashtag.tsx
View file

@ -23,7 +23,7 @@ const Hashtag: React.FC<IHashtag> = ({ hashtag }) => {
<Text tag='span' size='sm' weight='semibold'>#{hashtag.name}</Text> <Text tag='span' size='sm' weight='semibold'>#{hashtag.name}</Text>
</Link> </Link>
{hashtag.history && ( {Boolean(count) && (
<Text theme='muted' size='sm'> <Text theme='muted' size='sm'>
<FormattedMessage <FormattedMessage
id='trends.count_by_accounts' id='trends.count_by_accounts'

1
app/soapbox/utils/features.ts
View file

@ -960,6 +960,7 @@ const getInstanceFeatures = (instance: Instance) => {
v.software === FRIENDICA && gte(v.version, '2022.12.0'), v.software === FRIENDICA && gte(v.version, '2022.12.0'),
v.software === MASTODON && gte(v.compatVersion, '3.0.0'), v.software === MASTODON && gte(v.compatVersion, '3.0.0'),
v.software === TRUTHSOCIAL, v.software === TRUTHSOCIAL,
v.software === DITTO,
]), ]),
/** /**