gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 18

Add: #92 アカウントのおすすめタグを真ん中のカラムからも確認できるように (#678)

Browse source 
* Add: #92 アカウントのおすすめタグを真ん中のカラムからも確認できるように

* ハッシュタグを隠さないよう修正
This commit is contained in:
KMY（雪あすか） 2024-03-27 18:32:32 +09:00 • committed by GitHub
parent 227090147e
commit 808244f0cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 45 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/javascript/mastodon/features/account/components/header.jsx
View file

@ -20,6 +20,7 @@ import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
import { Button } from 'mastodon/components/button';
import { CopyIconButton } from 'mastodon/components/copy_icon_button';
import { FollowersCounter, FollowingCounter, StatusesCounter } from 'mastodon/components/counters';
import { getFeaturedHashtagBar } from 'mastodon/components/hashtag_bar';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from 'mastodon/components/icon_button';
import { LoadingIndicator } from 'mastodon/components/loading_indicator';
@ -115,6 +116,7 @@ class Header extends ImmutablePureComponent {
static propTypes = {
account: ImmutablePropTypes.record,
featuredTags: PropTypes.array,
identity_props: ImmutablePropTypes.list,
onFollow: PropTypes.func.isRequired,
onBlock: PropTypes.func.isRequired,
@ -215,6 +217,16 @@ class Header extends ImmutablePureComponent {
}
};
handleFeaturedHashtagClick = e => {
const { history, account } = this.props;
const value = e.currentTarget.textContent.replace(/^#/, '');
if (history && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
e.preventDefault();
history.push(`/@${account.get('acct')}/tagged/${value}`);
}
};
handleMentionClick = e => {
const { history, onOpenURL } = this.props;
@ -244,7 +256,11 @@ class Header extends ImmutablePureComponent {
link = links[i];
if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
link.addEventListener('click', this.handleHashtagClick, false);
if (link.href && link.href.includes('/tagged/')) {
link.addEventListener('click', this.handleFeaturedHashtagClick, false);
} else {
link.addEventListener('click', this.handleHashtagClick, false);
}
} else if (link.classList.contains('mention')) {
link.addEventListener('click', this.handleMentionClick, false);
}
@ -409,6 +425,8 @@ class Header extends ImmutablePureComponent {
const username = account.get('acct').split('@')[0];
const domain = isLocal ? localDomain : account.get('acct').split('@')[1];
const isIndexable = !account.get('noindex');
const featuredTagsArr = this.props.featuredTags?.map((tag) => tag.get('name')).toArray() || [];
const featuredTags = getFeaturedHashtagBar(account.get('acct'), featuredTagsArr);
const badges = [];
@ -472,6 +490,12 @@ class Header extends ImmutablePureComponent {
{account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content translate' dangerouslySetInnerHTML={content} />}
{featuredTagsArr.length > 0 && (
<div className='account__header__featured-tags'>
{featuredTags}
</div>
)}
<div className='account__header__fields'>
<dl>
<dt><FormattedMessage id='account.joined_short' defaultMessage='Joined' /></dt>