tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] fix: More "Followers you know" polish & bug fixes

Browse Source 
Port 3f965d83b01c29eadf4e7060a84f10851f6ba5a5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
diondiondion 2025-05-15 13:33:16 +02:00 committed by Claire
parent ea9f451184
commit 9ad3f4ffa8
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx
View File

@ -916,6 +916,8 @@ export const AccountHeader: React.FC<{
<div className='account__header__badges'>{badges}</div> <div className='account__header__badges'>{badges}</div>
)} )}
{signedIn && <FamiliarFollowers accountId={accountId} />}
{!(suspended || hidden) && ( {!(suspended || hidden) && (
<div className='account__header__extra'> <div className='account__header__extra'>
<div <div
@ -993,7 +995,6 @@ export const AccountHeader: React.FC<{
))} ))}
</div> </div>
</div> </div>
{signedIn && <FamiliarFollowers accountId={accountId} />}
</div> </div>
)} )}
</div> </div>

18
app/javascript/flavours/glitch/features/account_timeline/components/familiar_followers.tsx
View File

@ -12,12 +12,16 @@ import { getAccountFamiliarFollowers } from '@/flavours/glitch/selectors/account
import { useAppDispatch, useAppSelector } from '@/flavours/glitch/store'; import { useAppDispatch, useAppSelector } from '@/flavours/glitch/store';
const AccountLink: React.FC<{ account?: Account }> = ({ account }) => { const AccountLink: React.FC<{ account?: Account }> = ({ account }) => {
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing if (!account) {
const name = account?.display_name || `@${account?.acct}`; return null;
}
return ( return (
<Link to={`/@${account?.acct}`} data-hover-card-account={account?.id}> <Link
{name} to={`/@${account.acct}`}
</Link> data-hover-card-account={account.id}
dangerouslySetInnerHTML={{ __html: account.display_name_html }}
/>
); );
}; };
@ -50,7 +54,7 @@ const FamiliarFollowersReadout: React.FC<{ familiarFollowers: Account[] }> = ({
return ( return (
<FormattedMessage <FormattedMessage
id='account.familiar_followers_many' id='account.familiar_followers_many'
defaultMessage='Followed by {name1}, {name2}, and {othersCount, plural, one {# other} other {# others}}' defaultMessage='Followed by {name1}, {name2}, and {othersCount, plural, one {one other you know} other {# others you know}}'
values={messageData} values={messageData}
/> />
); );
@ -80,7 +84,7 @@ export const FamiliarFollowers: React.FC<{ accountId: string }> = ({
return ( return (
<div className='account__header__familiar-followers'> <div className='account__header__familiar-followers'>
<AvatarGroup compact> <AvatarGroup compact>
{familiarFollowers.map((account) => ( {familiarFollowers.slice(0, 3).map((account) => (
<Avatar withLink key={account.id} account={account} size={28} /> <Avatar withLink key={account.id} account={account} size={28} />
))} ))}
</AvatarGroup> </AvatarGroup>

10
app/javascript/flavours/glitch/styles/components.scss
View File

@ -2157,6 +2157,7 @@ body > [data-popper-placement] {
display: block; display: block;
position: relative; position: relative;
border-radius: var(--avatar-border-radius); border-radius: var(--avatar-border-radius);
background: var(--surface-background-color);
img { img {
width: 100%; width: 100%;
@ -8454,16 +8455,13 @@ noscript {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 10px; gap: 10px;
margin-block-end: 16px; margin-block: 16px;
color: $darker-text-color; color: $darker-text-color;
a:any-link { a:any-link {
color: inherit; font-weight: 500;
text-decoration: underline;
}
a:hover {
text-decoration: none; text-decoration: none;
color: $primary-text-color;
} }
} }
} }