diff --git a/app/javascript/mastodon/components/timeline_hint.tsx b/app/javascript/mastodon/components/timeline_hint.tsx index 6faad2fbb87..9e0d3676ec7 100644 --- a/app/javascript/mastodon/components/timeline_hint.tsx +++ b/app/javascript/mastodon/components/timeline_hint.tsx @@ -1,28 +1,23 @@ -import { FormattedMessage } from 'react-intl'; - import classNames from 'classnames'; interface Props { - resource: JSX.Element; + message: React.ReactNode; + label: React.ReactNode; url: string; className?: string; } -export const TimelineHint: React.FC = ({ className, resource, url }) => ( +export const TimelineHint: React.FC = ({ + className, + message, + label, + url, +}) => (
- - - -
+

{message}

+ - + {label}
); diff --git a/app/javascript/mastodon/features/account_timeline/index.jsx b/app/javascript/mastodon/features/account_timeline/index.jsx index dc69f83e77a..105c2e4e508 100644 --- a/app/javascript/mastodon/features/account_timeline/index.jsx +++ b/app/javascript/mastodon/features/account_timeline/index.jsx @@ -12,6 +12,7 @@ import BundleColumnError from 'mastodon/features/ui/components/bundle_column_err import { me } from 'mastodon/initial_state'; import { normalizeForLookup } from 'mastodon/reducers/accounts_map'; import { getAccountHidden } from 'mastodon/selectors'; +import { useAppSelector } from 'mastodon/store'; import { lookupAccount, fetchAccount } from '../../actions/accounts'; import { fetchFeaturedTags } from '../../actions/featured_tags'; @@ -59,12 +60,22 @@ const mapStateToProps = (state, { params: { acct, id, tagged }, withReplies = fa }; }; -const RemoteHint = ({ url }) => ( - } /> -); +const RemoteHint = ({ accountId, url }) => { + const acct = useAppSelector(state => state.accounts.get(accountId)?.acct); + const domain = acct ? acct.split('@')[1] : undefined; + + return ( + } + label={{domain} }} />} + /> + ); +}; RemoteHint.propTypes = { url: PropTypes.string.isRequired, + accountId: PropTypes.string.isRequired, }; class AccountTimeline extends ImmutablePureComponent { @@ -175,12 +186,12 @@ class AccountTimeline extends ImmutablePureComponent { } else if (blockedBy) { emptyMessage = ; } else if (remote && statusIds.isEmpty()) { - emptyMessage = ; + emptyMessage = ; } else { emptyMessage = ; } - const remoteMessage = remote ? : null; + const remoteMessage = remote ? : null; return ( diff --git a/app/javascript/mastodon/features/followers/index.jsx b/app/javascript/mastodon/features/followers/index.jsx index 4885f9ca994..92fce79c355 100644 --- a/app/javascript/mastodon/features/followers/index.jsx +++ b/app/javascript/mastodon/features/followers/index.jsx @@ -12,6 +12,7 @@ import { TimelineHint } from 'mastodon/components/timeline_hint'; import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error'; import { normalizeForLookup } from 'mastodon/reducers/accounts_map'; import { getAccountHidden } from 'mastodon/selectors'; +import { useAppSelector } from 'mastodon/store'; import { lookupAccount, @@ -51,12 +52,22 @@ const mapStateToProps = (state, { params: { acct, id } }) => { }; }; -const RemoteHint = ({ url }) => ( - } /> -); +const RemoteHint = ({ accountId, url }) => { + const acct = useAppSelector(state => state.accounts.get(accountId)?.acct); + const domain = acct ? acct.split('@')[1] : undefined; + + return ( + } + label={{domain} }} />} + /> + ); +}; RemoteHint.propTypes = { url: PropTypes.string.isRequired, + accountId: PropTypes.string.isRequired, }; class Followers extends ImmutablePureComponent { @@ -141,12 +152,12 @@ class Followers extends ImmutablePureComponent { } else if (hideCollections && accountIds.isEmpty()) { emptyMessage = ; } else if (remote && accountIds.isEmpty()) { - emptyMessage = ; + emptyMessage = ; } else { emptyMessage = ; } - const remoteMessage = remote ? : null; + const remoteMessage = remote ? : null; return ( diff --git a/app/javascript/mastodon/features/following/index.jsx b/app/javascript/mastodon/features/following/index.jsx index fb4a4d5c3a6..b53a016ff1d 100644 --- a/app/javascript/mastodon/features/following/index.jsx +++ b/app/javascript/mastodon/features/following/index.jsx @@ -12,6 +12,7 @@ import { TimelineHint } from 'mastodon/components/timeline_hint'; import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error'; import { normalizeForLookup } from 'mastodon/reducers/accounts_map'; import { getAccountHidden } from 'mastodon/selectors'; +import { useAppSelector } from 'mastodon/store'; import { lookupAccount, @@ -51,12 +52,22 @@ const mapStateToProps = (state, { params: { acct, id } }) => { }; }; -const RemoteHint = ({ url }) => ( - } /> -); +const RemoteHint = ({ accountId, url }) => { + const acct = useAppSelector(state => state.accounts.get(accountId)?.acct); + const domain = acct ? acct.split('@')[1] : undefined; + + return ( + } + label={{domain} }} />} + /> + ); +}; RemoteHint.propTypes = { url: PropTypes.string.isRequired, + accountId: PropTypes.string.isRequired, }; class Following extends ImmutablePureComponent { @@ -141,12 +152,12 @@ class Following extends ImmutablePureComponent { } else if (hideCollections && accountIds.isEmpty()) { emptyMessage = ; } else if (remote && accountIds.isEmpty()) { - emptyMessage = ; + emptyMessage = ; } else { emptyMessage = ; } - const remoteMessage = remote ? : null; + const remoteMessage = remote ? : null; return ( diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx index 1d15b13bd45..5f325fe7b87 100644 --- a/app/javascript/mastodon/features/status/index.jsx +++ b/app/javascript/mastodon/features/status/index.jsx @@ -629,7 +629,14 @@ class Status extends ImmutablePureComponent { const isIndexable = !status.getIn(['account', 'noindex']); if (!isLocal) { - remoteHint = } />; + remoteHint = ( + } + label={{status.getIn(['account', 'acct']).split('@')[1]} }} />} + /> + ); } const handlers = { diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 6d2b93be579..43ff015791f 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -19,7 +19,6 @@ "account.block_domain": "Block domain {domain}", "account.block_short": "Block", "account.blocked": "Blocked", - "account.browse_more_on_origin_server": "Browse more on the original profile", "account.cancel_follow_request": "Cancel follow", "account.copy": "Copy link to profile", "account.direct": "Privately mention @{name}", @@ -349,6 +348,14 @@ "hashtag.follow": "Follow hashtag", "hashtag.unfollow": "Unfollow hashtag", "hashtags.and_other": "…and {count, plural, other {# more}}", + "hints.profiles.followers_may_be_missing": "Followers for this profile may be missing.", + "hints.profiles.follows_may_be_missing": "Follows for this profile may be missing.", + "hints.profiles.posts_may_be_missing": "Some posts from this profile may be missing.", + "hints.profiles.see_more_followers": "See more followers on {domain}", + "hints.profiles.see_more_follows": "See more follows on {domain}", + "hints.profiles.see_more_posts": "See more posts on {domain}", + "hints.threads.replies_may_be_missing": "Replies from other servers may be missing.", + "hints.threads.see_more": "See more replies on {domain}", "home.column_settings.show_reblogs": "Show boosts", "home.column_settings.show_replies": "Show replies", "home.hide_announcements": "Hide announcements", @@ -826,11 +833,6 @@ "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left", "time_remaining.moments": "Moments remaining", "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left", - "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.", - "timeline_hint.resources.followers": "Followers", - "timeline_hint.resources.follows": "Follows", - "timeline_hint.resources.replies": "Some replies", - "timeline_hint.resources.statuses": "Older posts", "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}", "trends.trending_now": "Trending now", "ui.beforeunload": "Your draft will be lost if you leave Mastodon.", diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 4c47a8db6c9..b6e71cde41b 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4217,11 +4217,12 @@ a.status-card { .timeline-hint { text-align: center; - color: $darker-text-color; - padding: 15px; + color: $dark-text-color; + padding: 16px; box-sizing: border-box; width: 100%; - cursor: default; + font-size: 14px; + line-height: 21px; strong { font-weight: 500; @@ -4238,10 +4239,10 @@ a.status-card { color: lighten($highlight-text-color, 4%); } } -} -.timeline-hint--with-descendants { - border-top: 1px solid var(--background-border-color); + &--with-descendants { + border-top: 1px solid var(--background-border-color); + } } .regeneration-indicator {