moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix remaining <Emoji /> usages

This commit is contained in:
Alex Gleason 2024-11-15 19:54:42 -06:00
parent 1738f4365a
commit 158b961bfc
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
9 changed files with 71 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/features/bookmark-folders/index.tsx
View File

@ -51,24 +51,28 @@ const BookmarkFolders: React.FC = () => {
</HStack>
}
/>
{bookmarkFolders?.map((folder) => (
<ListItem
key={folder.id}
to={`/bookmarks/${folder.id}`}
label={
<HStack alignItems='center' space={2}>
{folder.emoji ? (
<Emoji
emoji={folder.emoji}
src={folder.emoji_url || undefined}
className='size-5 flex-none'
/>
) : <Icon src={folderIcon} size={20} />}
<span>{folder.name}</span>
</HStack>
}
/>
))}
{bookmarkFolders?.map((folder) => {
let icon = <Icon src={folderIcon} size={20} />;
if (folder.emoji_url) {
icon = <img src={folder.emoji_url} alt={folder.emoji} className='size-5' />;
} else if (folder.emoji) {
icon = <Emoji size={20} emoji={folder.emoji} />;
}
return (
<ListItem
key={folder.id}
to={`/bookmarks/${folder.id}`}
label={
<HStack alignItems='center' space={2}>
<div className='flex-none'>{icon}</div>
<span>{folder.name}</span>
</HStack>
}
/>
);
})}
</List>
</Stack>
</Column>

7
src/features/crypto-donate/components/lightning-address.tsx
View File

@ -15,11 +15,8 @@ const LightningAddress: React.FC<ILightningAddress> = (props): JSX.Element => {
return (
<Stack>
<HStack alignItems='center' className='mb-1'>
<Emoji
className='mr-2.5 flex w-6 items-start justify-center rtl:ml-2.5 rtl:mr-0'
emoji='⚡'
/>
<HStack space={2.5} alignItems='center' className='mb-1'>
<Emoji size={24} emoji='⚡' />
<Text weight='bold'>
<FormattedMessage id='crypto.lightning' defaultMessage='Lightning' />

2
src/features/edit-identity/index.tsx
View File

@ -129,7 +129,7 @@ const EditIdentity: React.FC<IEditIdentity> = () => {
{(account.source?.nostr?.nip05 === identifier && account.acct !== identifier) && (
<Tooltip text={intl.formatMessage(messages.unverified)}>
<div>
<Emoji className='size-4' emoji='⚠️' />
<Emoji emoji='⚠️' />
</div>
</Tooltip>
)}

2
src/features/emoji/index.ts
View File

@ -63,7 +63,7 @@ const validEmojiChar = (c: string) => {
};
const convertCustom = (shortname: string, filename: string) => {
return `<img draggable="false" class="emojione" alt="${shortname}" title="${shortname}" src="${filename}" />`;
return `<img draggable="false" class="inline-block w-4 h-4" alt="${shortname}" title="${shortname}" src="${filename}" />`;
};
const convertUnicode = (c: string) => {

12
src/features/notifications/components/notification.tsx
View File

@ -315,13 +315,11 @@ const Notification: React.FC<INotification> = (props) => {
const renderIcon = (): React.ReactNode => {
if (type === 'pleroma:emoji_reaction' && notification.emoji) {
return (
<Emoji
emoji={notification.emoji}
src={notification.emoji_url || undefined}
className='size-4 flex-none'
/>
);
if (notification.emoji_url) {
return <img src={notification.emoji_url} alt={notification.emoji} className='size-4 flex-none' />;
} else {
return <Emoji emoji={notification.emoji} />;
}
} else if (validType(type)) {
return (
<Icon

15
src/features/status/components/status-interaction-bar.tsx
View File

@ -182,15 +182,12 @@ const StatusInteractionBar: React.FC<IStatusInteractionBar> = ({ status }): JSX.
return (
<InteractionCounter count={count} onClick={features.exposableReactions ? handleClick : undefined}>
<HStack space={0.5} alignItems='center'>
{emojiReacts.take(3).map((e, i) => {
return (
<Emoji
key={i}
className='size-4.5 flex-none'
emoji={e.name}
src={e.url}
/>
);
{emojiReacts.take(3).map((emoji, i) => {
if (emoji.url) {
return <img key={i} src={emoji.url} alt={emoji.name} className='size-4.5 flex-none' />;
} else {
return <div key={i} className='flex-none'><Emoji size={18} emoji={emoji.name} /></div>;
}
})}
</HStack>
</InteractionCounter>

2
src/features/ui/components/modals/edit-bookmark-folder-modal.tsx
View File

@ -63,7 +63,7 @@ const EmojiPicker: React.FC<IEmojiPicker> = ({ emoji, emojiUrl, ...props }) => {
tabIndex={0}
>
{emoji
? <Emoji height={20} width={20} emoji={emoji} />
? <Emoji size={20} emoji={emoji} />
: <Icon className='size-5 text-gray-600 hover:text-gray-700 dark:hover:text-gray-500' src={moodHappyIcon} />}
</button>

14
src/features/ui/components/modals/reactions-modal.tsx
View File

@ -62,10 +62,16 @@ const ReactionsModal: React.FC<IReactionsModal> = ({ onClose, statusId, reaction
reactions!.forEach(reaction => items.push(
{
text: <div className='flex items-center gap-1'>
<Emoji className='size-4' emoji={reaction.name} src={reaction.url || undefined} />
{reaction.count}
</div>,
text: (
<div className='flex items-center gap-1'>
{reaction.url ? (
<img src={reaction.url} alt='' className='size-4' />
) : (
<Emoji emoji={reaction.name} />
)}
{reaction.count}
</div>
),
action: () => setReaction(reaction.name),
name: reaction.name,
},

42
src/features/ui/components/modals/select-bookmark-folder-modal.tsx
View File

@ -60,25 +60,29 @@ const SelectBookmarkFolderModal: React.FC<ISelectBookmarkFolderModal> = ({ statu
];
if (!isFetching) {
items.push(...(bookmarkFolders.map((folder) => (
<RadioItem
key={folder.id}
label={
<HStack alignItems='center' space={2}>
{folder.emoji ? (
<Emoji
emoji={folder.emoji}
src={folder.emoji_url || undefined}
className='size-5 flex-none'
/>
) : <Icon src={folderIcon} size={20} />}
<span>{folder.name}</span>
</HStack>
}
checked={selectedFolder === folder.id}
value={folder.id}
/>
))));
items.push(...(bookmarkFolders.map((folder) => {
let icon = <Icon src={folderIcon} size={20} />;
if (folder.emoji_url) {
icon = <img src={folder.emoji_url} alt={folder.emoji} className='size-5' />;
} else if (folder.emoji) {
icon = <Emoji size={20} emoji={folder.emoji} />;
}
return (
<RadioItem
key={folder.id}
label={
<HStack alignItems='center' space={2}>
<div className='flex-none'>{icon}</div>
<span>{folder.name}</span>
</HStack>
}
checked={selectedFolder === folder.id}
value={folder.id}
/>
);
})));
}
const body = isFetching ? <Spinner /> : (