Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Separate ESLint CI from Superlinter (#23029)

Browse source 
* Separate ESLint CI from Superlinter

* Correct JS indenting level

* Remove extra semicolons with ESLint autofix
This commit is contained in:
Nick Schonning 2023-01-29 17:44:03 -05:00 • committed by GitHub
parent 9cdd643564
commit d9088ef327
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 52 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/javascript/mastodon/actions/tags.js
View file

@ -60,7 +60,7 @@ export function fetchFollowedHashtagsRequest() {
return {
type: FOLLOWED_HASHTAGS_FETCH_REQUEST,
};
};
}
export function fetchFollowedHashtagsSuccess(followed_tags, next) {
return {
@ -68,14 +68,14 @@ export function fetchFollowedHashtagsSuccess(followed_tags, next) {
followed_tags,
next,
};
};
}
export function fetchFollowedHashtagsFail(error) {
return {
type: FOLLOWED_HASHTAGS_FETCH_FAIL,
error,
};
};
}
export function expandFollowedHashtags() {
return (dispatch, getState) => {
@ -94,13 +94,13 @@ export function expandFollowedHashtags() {
dispatch(expandFollowedHashtagsFail(error));
});
};
};
}
export function expandFollowedHashtagsRequest() {
return {
type: FOLLOWED_HASHTAGS_EXPAND_REQUEST,
};
};
}
export function expandFollowedHashtagsSuccess(followed_tags, next) {
return {
@ -108,14 +108,14 @@ export function expandFollowedHashtagsSuccess(followed_tags, next) {
followed_tags,
next,
};
};
}
export function expandFollowedHashtagsFail(error) {
return {
type: FOLLOWED_HASHTAGS_EXPAND_FAIL,
error,
};
};
}
export const followHashtag = name => (dispatch, getState) => {
dispatch(followHashtagRequest(name));

6
app/javascript/mastodon/features/account/components/header.js
View file

@ -296,9 +296,9 @@ class Header extends ImmutablePureComponent {
if ((permissions & PERMISSION_MANAGE_USERS) === PERMISSION_MANAGE_USERS) {
menu.push({ text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), href: `/admin/accounts/${account.get('id')}` });
}
if (isRemote && (permissions & PERMISSION_MANAGE_FEDERATION) === PERMISSION_MANAGE_FEDERATION) {
menu.push({ text: intl.formatMessage(messages.admin_domain, { domain: remoteDomain }), href: `/admin/instances/${remoteDomain}` });
}
if (isRemote && (permissions & PERMISSION_MANAGE_FEDERATION) === PERMISSION_MANAGE_FEDERATION) {
menu.push({ text: intl.formatMessage(messages.admin_domain, { domain: remoteDomain }), href: `/admin/instances/${remoteDomain}` });
}
}
const content = { __html: account.get('note_emojified') };

2
app/javascript/mastodon/features/followed_tags/index.js
View file

@ -38,7 +38,7 @@ class FollowedTags extends ImmutablePureComponent {
componentDidMount() {
this.props.dispatch(fetchFollowedHashtags());
};
}
handleLoadMore = debounce(() => {
this.props.dispatch(expandFollowedHashtags());

2
app/javascript/mastodon/reducers/followed_tags.js
View file

@ -39,4 +39,4 @@ export default function followed_tags(state = initialState, action) {
default:
return state;
}
};
}