Skip to content

Improve emoji reactions #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Steffo99 wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Improve emoji reactions #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83aa879
Improve emoji reaction display
Steffo99 Oct 16, 2024
3112164
Merge branch 'main' into feature/reactions-v2
Steffo99 Dec 9, 2024
d89611b
Localization
Steffo99 Dec 9, 2024
eca2a63
Barely handle Chuckya's `reaction` notification type
Steffo99 Dec 9, 2024
db22548
Run prettier
Steffo99 Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/components/custom-emoji.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export default function CustomEmoji({ staticUrl, alt, url }) {
src={url}
alt={alt}
class="shortcode-emoji emoji"
width="16"
height="16"
loading="lazy"
decoding="async"
fetchPriority="low"
Expand Down
6 changes: 5 additions & 1 deletion src/components/notification.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const NOTIFICATION_ICONS = {
'admin.report': 'account-warning',
severed_relationships: 'heart-break',
moderation_warning: 'alert',
reaction: 'emoji2',
emoji_reaction: 'emoji2',
'pleroma:emoji_reaction': 'emoji2',
annual_report: 'celebrate',
Expand Down Expand Up @@ -260,6 +261,7 @@ const contentText = {
<Trans>Moderation warning</Trans>
</b>
),
reaction: ({ account }) => <Trans>{account} reacted to your post.</Trans>,
emoji_reaction: emojiText,
'pleroma:emoji_reaction': emojiText,
annual_report: ({ year }) => <Trans>Your {year} #Wrapstodon is here!</Trans>,
Expand Down Expand Up @@ -397,7 +399,9 @@ function Notification({
text = text({ name: targetName });
}
} else if (
(type === 'emoji_reaction' || type === 'pleroma:emoji_reaction') &&
(type === 'reaction' ||
type === 'emoji_reaction' ||
type === 'pleroma:emoji_reaction') &&
notification.emoji
) {
const emojiURL =
Expand Down
15 changes: 13 additions & 2 deletions src/components/status.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2532,13 +2532,24 @@ a.card:is(:hover, :focus):visited {
.shortcode-emoji {
width: auto;
min-width: 1.2em;
max-width: 100%;
max-width: 96cqw;
height: 1.2em;
vertical-align: text-bottom;
vertical-align: sub;
object-fit: contain;
/* object-position: left; */
}

.emoji-reaction {
display: inline-flex;
align-items: end;
gap: 0.5ex;

font-size: 1.5rem;
}
.emoji-reaction-count {
font-size: 1.0rem;
}

/* EDIT HISTORY */

#edit-history {
Expand Down
15 changes: 10 additions & 5 deletions src/components/status.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2339,8 +2339,10 @@ function Status({
alt={name}
url={url}
staticUrl={staticUrl}
/>{' '}
{count}
/>
<span className={'emoji-reaction-count'}>
{count}
</span>
</span>
);
}
Expand All @@ -2362,8 +2364,10 @@ function Status({
alt={name}
url={emoji.url}
staticUrl={emoji.staticUrl}
/>{' '}
{count}
/>
<span className={'emoji-reaction-count'}>
{count}
</span>
</span>
);
}
Expand All @@ -2374,7 +2378,8 @@ function Status({
me ? '' : 'insignificant'
}`}
>
{name} {count}
<span className={'emoji-reaction-name'}>{name}</span>
<span className={'emoji-reaction-count'}>{count}</span>
</span>
);
})}
Expand Down
Loading
Loading