Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-29 23:23:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Emoji: Statuses

Browse Source 
Port 0c1ca6c969 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Echo
2025-10-08 16:18:11 +02:00
committed by Claire
parent c4ef050eb6
commit c08a874ba9
14 changed files with 128 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx
View File

@@ -8,10 +8,11 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import CheckIcon from '@/material-icons/400-24px/check.svg?react';
import CloseIcon from '@/material-icons/400-24px/close.svg?react';
import { Avatar } from '../../../components/avatar';
import { DisplayName } from '../../../components/display_name';
import { IconButton } from '../../../components/icon_button';
import { Permalink } from '../../../components/permalink';
import { Avatar } from '@/flavours/glitch/components/avatar';
import { DisplayName } from '@/flavours/glitch/components/display_name';
import { IconButton } from '@/flavours/glitch/components/icon_button';
import { EmojiHTML } from '@/flavours/glitch/components/emoji/html';
import { Permalink } from '@/flavours/glitch/components/permalink';
const messages = defineMessages({
authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
@@ -29,7 +30,6 @@ class AccountAuthorize extends ImmutablePureComponent {
render () {
const { intl, account, onAuthorize, onReject } = this.props;
const content = { __html: account.get('note_emojified') };
return (
<div className='account-authorize__wrapper'>
@@ -39,7 +39,11 @@ class AccountAuthorize extends ImmutablePureComponent {
<DisplayName account={account} />
</Permalink>
<div className='account__header__content translate' dangerouslySetInnerHTML={content} />
<EmojiHTML
className='account__header__content translate'
htmlString={account.get('note_emojified')}
extraEmojis={account.get('emojis')}
/>
</div>
<div className='account--panel'>