mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 21:59:04 +09:00
Merge pull request #2151 from ClearlyClaire/glitch-soc/main
Merge upstream changes
This commit is contained in:
commit
cbdb25ab03
24
.eslintrc.js
24
.eslintrc.js
@ -32,10 +32,14 @@ module.exports = {
|
|||||||
parserOptions: {
|
parserOptions: {
|
||||||
sourceType: 'module',
|
sourceType: 'module',
|
||||||
ecmaFeatures: {
|
ecmaFeatures: {
|
||||||
experimentalObjectRestSpread: true,
|
|
||||||
jsx: true,
|
jsx: true,
|
||||||
},
|
},
|
||||||
ecmaVersion: 2021,
|
ecmaVersion: 2021,
|
||||||
|
requireConfigFile: false,
|
||||||
|
babelOptions: {
|
||||||
|
configFile: false,
|
||||||
|
presets: ['@babel/react', '@babel/env'],
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
settings: {
|
settings: {
|
||||||
@ -214,4 +218,22 @@ module.exports = {
|
|||||||
'promise/no-nesting': 'off',
|
'promise/no-nesting': 'off',
|
||||||
'promise/no-promise-in-callback': 'off',
|
'promise/no-promise-in-callback': 'off',
|
||||||
},
|
},
|
||||||
|
|
||||||
|
overrides: [
|
||||||
|
{
|
||||||
|
files: [
|
||||||
|
'*.config.js',
|
||||||
|
'.*rc.js',
|
||||||
|
'ide-helper.js',
|
||||||
|
],
|
||||||
|
|
||||||
|
env: {
|
||||||
|
commonjs: true,
|
||||||
|
},
|
||||||
|
|
||||||
|
parserOptions: {
|
||||||
|
sourceType: 'script',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
};
|
};
|
||||||
|
2
.github/workflows/test-ruby.yml
vendored
2
.github/workflows/test-ruby.yml
vendored
@ -40,7 +40,7 @@ jobs:
|
|||||||
ruby-version: .ruby-version
|
ruby-version: .ruby-version
|
||||||
bundler-cache: true
|
bundler-cache: true
|
||||||
|
|
||||||
- run: yarn install --frozen-lockfile
|
- run: yarn --frozen-lockfile --production
|
||||||
- name: Precompile assets
|
- name: Precompile assets
|
||||||
# Previously had set this, but it's not supported
|
# Previously had set this, but it's not supported
|
||||||
# export NODE_OPTIONS=--openssl-legacy-provider
|
# export NODE_OPTIONS=--openssl-legacy-provider
|
||||||
|
41
.rubocop.yml
41
.rubocop.yml
@ -59,10 +59,49 @@ Metrics/BlockNesting:
|
|||||||
Exclude:
|
Exclude:
|
||||||
- 'lib/mastodon/*_cli.rb'
|
- 'lib/mastodon/*_cli.rb'
|
||||||
|
|
||||||
|
# Reason: Some Excluded files would be candidates for refactoring but not currently addressed
|
||||||
|
# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsclasslength
|
||||||
Metrics/ClassLength:
|
Metrics/ClassLength:
|
||||||
CountAsOne: [array, heredoc]
|
CountAsOne: ['array', 'hash', 'heredoc', 'method_call']
|
||||||
Exclude:
|
Exclude:
|
||||||
- 'lib/mastodon/*_cli.rb'
|
- 'lib/mastodon/*_cli.rb'
|
||||||
|
- 'app/controllers/admin/accounts_controller.rb'
|
||||||
|
- 'app/controllers/api/base_controller.rb'
|
||||||
|
- 'app/controllers/api/v1/admin/accounts_controller.rb'
|
||||||
|
- 'app/controllers/application_controller.rb'
|
||||||
|
- 'app/controllers/auth/registrations_controller.rb'
|
||||||
|
- 'app/controllers/auth/sessions_controller.rb'
|
||||||
|
- 'app/lib/activitypub/activity.rb'
|
||||||
|
- 'app/lib/activitypub/activity/create.rb'
|
||||||
|
- 'app/lib/activitypub/tag_manager.rb'
|
||||||
|
- 'app/lib/feed_manager.rb'
|
||||||
|
- 'app/lib/link_details_extractor.rb'
|
||||||
|
- 'app/lib/request.rb'
|
||||||
|
- 'app/lib/text_formatter.rb'
|
||||||
|
- 'app/lib/user_settings_decorator.rb'
|
||||||
|
- 'app/mailers/user_mailer.rb'
|
||||||
|
- 'app/models/account.rb'
|
||||||
|
- 'app/models/admin/account_action.rb'
|
||||||
|
- 'app/models/form/account_batch.rb'
|
||||||
|
- 'app/models/media_attachment.rb'
|
||||||
|
- 'app/models/status.rb'
|
||||||
|
- 'app/models/tag.rb'
|
||||||
|
- 'app/models/user.rb'
|
||||||
|
- 'app/serializers/activitypub/actor_serializer.rb'
|
||||||
|
- 'app/serializers/activitypub/note_serializer.rb'
|
||||||
|
- 'app/serializers/rest/status_serializer.rb'
|
||||||
|
- 'app/services/account_search_service.rb'
|
||||||
|
- 'app/services/activitypub/process_account_service.rb'
|
||||||
|
- 'app/services/activitypub/process_status_update_service.rb'
|
||||||
|
- 'app/services/backup_service.rb'
|
||||||
|
- 'app/services/delete_account_service.rb'
|
||||||
|
- 'app/services/fan_out_on_write_service.rb'
|
||||||
|
- 'app/services/fetch_link_card_service.rb'
|
||||||
|
- 'app/services/import_service.rb'
|
||||||
|
- 'app/services/notify_service.rb'
|
||||||
|
- 'app/services/post_status_service.rb'
|
||||||
|
- 'app/services/update_status_service.rb'
|
||||||
|
- 'lib/paperclip/color_extractor.rb'
|
||||||
|
|
||||||
Metrics/CyclomaticComplexity:
|
Metrics/CyclomaticComplexity:
|
||||||
Exclude:
|
Exclude:
|
||||||
|
@ -243,10 +243,6 @@ Metrics/BlockNesting:
|
|||||||
Exclude:
|
Exclude:
|
||||||
- 'lib/tasks/mastodon.rake'
|
- 'lib/tasks/mastodon.rake'
|
||||||
|
|
||||||
# Configuration parameters: CountComments, CountAsOne.
|
|
||||||
Metrics/ClassLength:
|
|
||||||
Max: 375
|
|
||||||
|
|
||||||
# Configuration parameters: AllowedMethods, AllowedPatterns.
|
# Configuration parameters: AllowedMethods, AllowedPatterns.
|
||||||
Metrics/CyclomaticComplexity:
|
Metrics/CyclomaticComplexity:
|
||||||
Max: 25
|
Max: 25
|
||||||
|
@ -37,7 +37,7 @@ RUN apt-get update && \
|
|||||||
bundle config set --local without 'development test' && \
|
bundle config set --local without 'development test' && \
|
||||||
bundle config set silence_root_warning true && \
|
bundle config set silence_root_warning true && \
|
||||||
bundle install -j"$(nproc)" && \
|
bundle install -j"$(nproc)" && \
|
||||||
yarn install --pure-lockfile --network-timeout 600000 && \
|
yarn install --pure-lockfile --production --network-timeout 600000 && \
|
||||||
yarn cache clean
|
yarn cache clean
|
||||||
|
|
||||||
FROM node:${NODE_VERSION}
|
FROM node:${NODE_VERSION}
|
||||||
|
@ -4,7 +4,6 @@ import 'es6-symbol/implement';
|
|||||||
import includes from 'array-includes';
|
import includes from 'array-includes';
|
||||||
import assign from 'object-assign';
|
import assign from 'object-assign';
|
||||||
import values from 'object.values';
|
import values from 'object.values';
|
||||||
import isNaN from 'is-nan';
|
|
||||||
import { decode as decodeBase64 } from './utils/base64';
|
import { decode as decodeBase64 } from './utils/base64';
|
||||||
import promiseFinally from 'promise.prototype.finally';
|
import promiseFinally from 'promise.prototype.finally';
|
||||||
|
|
||||||
@ -20,10 +19,6 @@ if (!Object.values) {
|
|||||||
values.shim();
|
values.shim();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Number.isNaN) {
|
|
||||||
Number.isNaN = isNaN;
|
|
||||||
}
|
|
||||||
|
|
||||||
promiseFinally.shim();
|
promiseFinally.shim();
|
||||||
|
|
||||||
if (!HTMLCanvasElement.prototype.toBlob) {
|
if (!HTMLCanvasElement.prototype.toBlob) {
|
||||||
|
@ -23,7 +23,6 @@ const messages = defineMessages({
|
|||||||
block: { id: 'account.block', defaultMessage: 'Block @{name}' },
|
block: { id: 'account.block', defaultMessage: 'Block @{name}' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Account extends ImmutablePureComponent {
|
class Account extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -184,3 +183,5 @@ class Account extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Account);
|
||||||
|
@ -84,7 +84,6 @@ class Rule extends React.PureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ReportReasonSelector extends React.PureComponent {
|
class ReportReasonSelector extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -157,3 +156,5 @@ class ReportReasonSelector extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ReportReasonSelector);
|
||||||
|
@ -12,7 +12,6 @@ const messages = defineMessages({
|
|||||||
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
|
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ColumnHeader extends React.PureComponent {
|
class ColumnHeader extends React.PureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -218,3 +217,5 @@ class ColumnHeader extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ColumnHeader);
|
||||||
|
@ -8,7 +8,6 @@ const messages = defineMessages({
|
|||||||
dismiss: { id: 'dismissable_banner.dismiss', defaultMessage: 'Dismiss' },
|
dismiss: { id: 'dismissable_banner.dismiss', defaultMessage: 'Dismiss' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class DismissableBanner extends React.PureComponent {
|
class DismissableBanner extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -49,3 +48,5 @@ class DismissableBanner extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(DismissableBanner);
|
||||||
|
@ -8,7 +8,6 @@ const messages = defineMessages({
|
|||||||
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
|
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Account extends ImmutablePureComponent {
|
class Account extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -40,3 +39,5 @@ class Account extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Account);
|
||||||
|
@ -16,8 +16,6 @@ const mapDispatchToProps = (dispatch, { statusId }) => ({
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(null, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class EditedTimestamp extends React.PureComponent {
|
class EditedTimestamp extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -68,3 +66,5 @@ class EditedTimestamp extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(null, mapDispatchToProps)(injectIntl(EditedTimestamp));
|
||||||
|
@ -14,7 +14,6 @@ const makeMapStateToProps = () => {
|
|||||||
return mapStateToProps;
|
return mapStateToProps;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @connect(makeMapStateToProps)
|
|
||||||
class InlineAccount extends React.PureComponent {
|
class InlineAccount extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -32,3 +31,5 @@ class InlineAccount extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(makeMapStateToProps)(InlineAccount);
|
||||||
|
@ -7,7 +7,6 @@ const messages = defineMessages({
|
|||||||
load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
|
load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class LoadGap extends React.PureComponent {
|
class LoadGap extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -32,3 +31,5 @@ class LoadGap extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(LoadGap);
|
||||||
|
@ -244,7 +244,6 @@ class Item extends React.PureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class MediaGallery extends React.PureComponent {
|
class MediaGallery extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -406,3 +405,5 @@ class MediaGallery extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(MediaGallery);
|
||||||
|
@ -15,7 +15,6 @@ const DefaultNavigation = () => (
|
|||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
||||||
export default @withRouter
|
|
||||||
class NavigationPortal extends React.PureComponent {
|
class NavigationPortal extends React.PureComponent {
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
@ -33,3 +32,5 @@ class NavigationPortal extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default withRouter(NavigationPortal);
|
||||||
|
@ -19,7 +19,6 @@ const messages = defineMessages({
|
|||||||
btnApply : { id: 'notification_purge.btn_apply', defaultMessage: 'Clear\nselected' },
|
btnApply : { id: 'notification_purge.btn_apply', defaultMessage: 'Clear\nselected' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class NotificationPurgeButtons extends ImmutablePureComponent {
|
class NotificationPurgeButtons extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -57,3 +56,5 @@ class NotificationPurgeButtons extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(NotificationPurgeButtons);
|
||||||
|
@ -6,7 +6,6 @@ import { connect } from 'react-redux';
|
|||||||
import { debounce } from 'lodash';
|
import { debounce } from 'lodash';
|
||||||
import { FormattedMessage } from 'react-intl';
|
import { FormattedMessage } from 'react-intl';
|
||||||
|
|
||||||
export default @connect()
|
|
||||||
class PictureInPicturePlaceholder extends React.PureComponent {
|
class PictureInPicturePlaceholder extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -67,3 +66,5 @@ class PictureInPicturePlaceholder extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect()(PictureInPicturePlaceholder);
|
||||||
|
@ -31,7 +31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
|
|||||||
return obj;
|
return obj;
|
||||||
}, {});
|
}, {});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Poll extends ImmutablePureComponent {
|
class Poll extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -234,3 +233,5 @@ class Poll extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Poll);
|
||||||
|
@ -121,7 +121,6 @@ const timeRemainingString = (intl, date, now, timeGiven = true) => {
|
|||||||
return relativeTime;
|
return relativeTime;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class RelativeTimestamp extends React.Component {
|
class RelativeTimestamp extends React.Component {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -197,3 +196,5 @@ class RelativeTimestamp extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(RelativeTimestamp);
|
||||||
|
@ -20,7 +20,6 @@ const mapStateToProps = (state, { scrollKey }) => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @connect(mapStateToProps, null, null, { forwardRef: true })
|
|
||||||
class ScrollableList extends PureComponent {
|
class ScrollableList extends PureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -352,3 +351,5 @@ class ScrollableList extends PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, null, null, { forwardRef: true })(ScrollableList);
|
||||||
|
@ -18,8 +18,6 @@ const mapStateToProps = state => ({
|
|||||||
server: state.getIn(['server', 'server']),
|
server: state.getIn(['server', 'server']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class ServerBanner extends React.PureComponent {
|
class ServerBanner extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -91,3 +89,5 @@ class ServerBanner extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(ServerBanner));
|
||||||
|
@ -56,7 +56,6 @@ export const defaultMediaVisibility = (status, settings) => {
|
|||||||
return (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all');
|
return (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all');
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Status extends ImmutablePureComponent {
|
class Status extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -830,3 +829,5 @@ class Status extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Status);
|
||||||
|
@ -46,7 +46,6 @@ const messages = defineMessages({
|
|||||||
openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
|
openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class StatusActionBar extends ImmutablePureComponent {
|
class StatusActionBar extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -339,3 +338,5 @@ class StatusActionBar extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(StatusActionBar);
|
||||||
|
@ -104,8 +104,6 @@ const mapStateToProps = state => ({
|
|||||||
languages: state.getIn(['server', 'translationLanguages', 'items']),
|
languages: state.getIn(['server', 'translationLanguages', 'items']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class StatusContent extends React.PureComponent {
|
class StatusContent extends React.PureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -468,3 +466,5 @@ class StatusContent extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(StatusContent));
|
||||||
|
@ -40,7 +40,6 @@ LanguageIcon.propTypes = {
|
|||||||
language: PropTypes.string.isRequired,
|
language: PropTypes.string.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class StatusIcons extends React.PureComponent {
|
class StatusIcons extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -143,3 +142,5 @@ class StatusIcons extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(StatusIcons);
|
||||||
|
@ -12,7 +12,6 @@ const messages = defineMessages({
|
|||||||
direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
|
direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class VisibilityIcon extends ImmutablePureComponent {
|
class VisibilityIcon extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -49,3 +48,5 @@ class VisibilityIcon extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(VisibilityIcon);
|
||||||
|
@ -80,8 +80,6 @@ class Section extends React.PureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class About extends React.PureComponent {
|
class About extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -218,3 +216,5 @@ class About extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(About));
|
||||||
|
@ -10,7 +10,6 @@ const messages = defineMessages({
|
|||||||
placeholder: { id: 'account_note.glitch_placeholder', defaultMessage: 'No comment provided' },
|
placeholder: { id: 'account_note.glitch_placeholder', defaultMessage: 'No comment provided' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Header extends ImmutablePureComponent {
|
class Header extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -102,3 +101,5 @@ class Header extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Header);
|
||||||
|
@ -8,7 +8,6 @@ import { me, isStaff } from 'flavours/glitch/initial_state';
|
|||||||
import { profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links';
|
import { profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links';
|
||||||
import Icon from 'flavours/glitch/components/icon';
|
import Icon from 'flavours/glitch/components/icon';
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ActionBar extends React.PureComponent {
|
class ActionBar extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -83,3 +82,5 @@ class ActionBar extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ActionBar);
|
||||||
|
@ -10,7 +10,6 @@ const messages = defineMessages({
|
|||||||
empty: { id: 'account.featured_tags.last_status_never', defaultMessage: 'No posts' },
|
empty: { id: 'account.featured_tags.last_status_never', defaultMessage: 'No posts' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class FeaturedTags extends ImmutablePureComponent {
|
class FeaturedTags extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -51,3 +50,5 @@ class FeaturedTags extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(FeaturedTags);
|
||||||
|
@ -76,7 +76,6 @@ const dateFormatOptions = {
|
|||||||
minute: '2-digit',
|
minute: '2-digit',
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Header extends ImmutablePureComponent {
|
class Header extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -403,3 +402,5 @@ class Header extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Header);
|
||||||
|
@ -7,7 +7,6 @@ const messages = defineMessages({
|
|||||||
profile: { id: 'column_header.profile', defaultMessage: 'Profile' },
|
profile: { id: 'column_header.profile', defaultMessage: 'Profile' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ProfileColumnHeader extends React.PureComponent {
|
class ProfileColumnHeader extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -31,3 +30,5 @@ class ProfileColumnHeader extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ProfileColumnHeader);
|
||||||
|
@ -19,7 +19,6 @@ const mapStateToProps = (state, { match: { params: { acct } } }) => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class AccountNavigation extends React.PureComponent {
|
class AccountNavigation extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -50,3 +49,5 @@ class AccountNavigation extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(AccountNavigation);
|
||||||
|
@ -58,7 +58,6 @@ class LoadMoreMedia extends ImmutablePureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class AccountGallery extends ImmutablePureComponent {
|
class AccountGallery extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -223,3 +222,5 @@ class AccountGallery extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(AccountGallery);
|
||||||
|
@ -14,7 +14,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(() => {}, mapDispatchToProps)
|
|
||||||
class LimitedAccountHint extends React.PureComponent {
|
class LimitedAccountHint extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -34,3 +33,5 @@ class LimitedAccountHint extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);
|
||||||
|
@ -62,7 +62,6 @@ RemoteHint.propTypes = {
|
|||||||
url: PropTypes.string.isRequired,
|
url: PropTypes.string.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class AccountTimeline extends ImmutablePureComponent {
|
class AccountTimeline extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -207,3 +206,5 @@ class AccountTimeline extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(AccountTimeline);
|
||||||
|
@ -22,7 +22,6 @@ const messages = defineMessages({
|
|||||||
const TICK_SIZE = 10;
|
const TICK_SIZE = 10;
|
||||||
const PADDING = 180;
|
const PADDING = 180;
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Audio extends React.PureComponent {
|
class Audio extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -575,3 +574,5 @@ class Audio extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Audio);
|
||||||
|
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
|
|||||||
isLoading: state.getIn(['user_lists', 'blocks', 'isLoading'], true),
|
isLoading: state.getIn(['user_lists', 'blocks', 'isLoading'], true),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Blocks extends ImmutablePureComponent {
|
class Blocks extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -77,3 +75,5 @@ class Blocks extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Blocks));
|
||||||
|
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
|
|||||||
hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
|
hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Bookmarks extends ImmutablePureComponent {
|
class Bookmarks extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -106,3 +104,5 @@ class Bookmarks extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Bookmarks));
|
||||||
|
@ -9,7 +9,6 @@ const mapStateToProps = state => ({
|
|||||||
message: state.getIn(['server', 'server', 'registrations', 'message']),
|
message: state.getIn(['server', 'server', 'registrations', 'message']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class ClosedRegistrationsModal extends ImmutablePureComponent {
|
class ClosedRegistrationsModal extends ImmutablePureComponent {
|
||||||
|
|
||||||
componentDidMount () {
|
componentDidMount () {
|
||||||
@ -73,3 +72,5 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(ClosedRegistrationsModal);
|
||||||
|
@ -10,7 +10,6 @@ const messages = defineMessages({
|
|||||||
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
|
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ColumnSettings extends React.PureComponent {
|
class ColumnSettings extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -39,3 +38,5 @@ class ColumnSettings extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ColumnSettings);
|
||||||
|
@ -32,8 +32,6 @@ const mapStateToProps = (state, { columnId }) => {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class CommunityTimeline extends React.PureComponent {
|
class CommunityTimeline extends React.PureComponent {
|
||||||
|
|
||||||
static defaultProps = {
|
static defaultProps = {
|
||||||
@ -162,3 +160,5 @@ class CommunityTimeline extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
|
||||||
|
@ -21,7 +21,6 @@ const messages = defineMessages({
|
|||||||
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
|
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ActionBar extends React.PureComponent {
|
class ActionBar extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -66,3 +65,5 @@ class ActionBar extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ActionBar);
|
||||||
|
@ -32,7 +32,6 @@ const messages = defineMessages({
|
|||||||
spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
|
spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ComposeForm extends ImmutablePureComponent {
|
class ComposeForm extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -389,3 +388,5 @@ class ComposeForm extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ComposeForm);
|
||||||
|
@ -145,8 +145,7 @@ class ModifierPicker extends React.PureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@injectIntl
|
class EmojiPickerMenuImpl extends React.PureComponent {
|
||||||
class EmojiPickerMenu extends React.PureComponent {
|
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
custom_emojis: ImmutablePropTypes.list,
|
custom_emojis: ImmutablePropTypes.list,
|
||||||
@ -307,7 +306,8 @@ class EmojiPickerMenu extends React.PureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @injectIntl
|
const EmojiPickerMenu = injectIntl(EmojiPickerMenuImpl);
|
||||||
|
|
||||||
class EmojiPickerDropdown extends React.PureComponent {
|
class EmojiPickerDropdown extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -411,3 +411,5 @@ class EmojiPickerDropdown extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(EmojiPickerDropdown);
|
||||||
|
@ -45,7 +45,6 @@ const messages = defineMessages({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Header extends ImmutablePureComponent {
|
class Header extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -134,3 +133,5 @@ class Header extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Header);
|
||||||
|
@ -237,7 +237,6 @@ class LanguageDropdownMenu extends React.PureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class LanguageDropdown extends React.PureComponent {
|
class LanguageDropdown extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -325,3 +324,5 @@ class LanguageDropdown extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(LanguageDropdown);
|
||||||
|
@ -83,8 +83,11 @@ const messages = defineMessages({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@connect((state, { name }) => ({ checked: state.getIn(['compose', 'advanced_options', name]) }))
|
const mapStateToProps = (state, { name }) => ({
|
||||||
class ToggleOption extends ImmutablePureComponent {
|
checked: state.getIn(['compose', 'advanced_options', name]),
|
||||||
|
});
|
||||||
|
|
||||||
|
class ToggleOptionImpl extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
name: PropTypes.string.isRequired,
|
name: PropTypes.string.isRequired,
|
||||||
@ -113,7 +116,8 @@ class ToggleOption extends ImmutablePureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @injectIntl
|
const ToggleOption = connect(mapStateToProps)(ToggleOptionImpl);
|
||||||
|
|
||||||
class ComposerOptions extends ImmutablePureComponent {
|
class ComposerOptions extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -315,3 +319,5 @@ class ComposerOptions extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ComposerOptions);
|
||||||
|
@ -21,8 +21,7 @@ const messages = defineMessages({
|
|||||||
days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
|
days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
|
||||||
});
|
});
|
||||||
|
|
||||||
@injectIntl
|
class OptionIntl extends React.PureComponent {
|
||||||
class Option extends React.PureComponent {
|
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
title: PropTypes.string.isRequired,
|
title: PropTypes.string.isRequired,
|
||||||
@ -92,8 +91,8 @@ class Option extends React.PureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default
|
const Option = injectIntl(OptionIntl);
|
||||||
@injectIntl
|
|
||||||
class PollForm extends ImmutablePureComponent {
|
class PollForm extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -168,3 +167,5 @@ class PollForm extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(PollForm);
|
||||||
|
@ -16,7 +16,6 @@ const messages = defineMessages({
|
|||||||
change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
|
change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class PrivacyDropdown extends React.PureComponent {
|
class PrivacyDropdown extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -86,3 +85,5 @@ class PrivacyDropdown extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(PrivacyDropdown);
|
||||||
|
@ -26,7 +26,6 @@ const messages = defineMessages({
|
|||||||
saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
|
saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Publisher extends ImmutablePureComponent {
|
class Publisher extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -97,3 +96,5 @@ class Publisher extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Publisher);
|
||||||
|
@ -19,7 +19,6 @@ const messages = defineMessages({
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ReplyIndicator extends ImmutablePureComponent {
|
class ReplyIndicator extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -80,3 +79,5 @@ class ReplyIndicator extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ReplyIndicator);
|
||||||
|
@ -45,7 +45,6 @@ class SearchPopout extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The component.
|
// The component.
|
||||||
export default @injectIntl
|
|
||||||
class Search extends React.PureComponent {
|
class Search extends React.PureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -166,3 +165,5 @@ class Search extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Search);
|
||||||
|
@ -14,7 +14,6 @@ const messages = defineMessages({
|
|||||||
dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
|
dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class SearchResults extends ImmutablePureComponent {
|
class SearchResults extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -139,3 +138,5 @@ class SearchResults extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(SearchResults);
|
||||||
|
@ -27,7 +27,6 @@ const iconMap = [
|
|||||||
['threaded_mode', 'comments', messages.threadedMode],
|
['threaded_mode', 'comments', messages.threadedMode],
|
||||||
];
|
];
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class TextareaIcons extends ImmutablePureComponent {
|
class TextareaIcons extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -58,3 +57,5 @@ class TextareaIcons extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(TextareaIcons);
|
||||||
|
@ -39,8 +39,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Compose extends React.PureComponent {
|
class Compose extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -114,3 +112,5 @@ class Compose extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Compose));
|
||||||
|
@ -10,7 +10,6 @@ const messages = defineMessages({
|
|||||||
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
|
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ColumnSettings extends React.PureComponent {
|
class ColumnSettings extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -40,3 +39,5 @@ class ColumnSettings extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ColumnSettings);
|
||||||
|
@ -24,7 +24,6 @@ const messages = defineMessages({
|
|||||||
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
|
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Conversation extends ImmutablePureComponent {
|
class Conversation extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -230,3 +229,5 @@ class Conversation extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Conversation);
|
||||||
|
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
|
|||||||
conversationsMode: state.getIn(['settings', 'direct', 'conversations']),
|
conversationsMode: state.getIn(['settings', 'direct', 'conversations']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class DirectTimeline extends React.PureComponent {
|
class DirectTimeline extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -154,3 +152,5 @@ class DirectTimeline extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(DirectTimeline));
|
||||||
|
@ -93,9 +93,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
export default
|
|
||||||
@injectIntl
|
|
||||||
@connect(makeMapStateToProps, mapDispatchToProps)
|
|
||||||
class AccountCard extends ImmutablePureComponent {
|
class AccountCard extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -246,3 +243,5 @@ class AccountCard extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));
|
||||||
|
@ -29,8 +29,6 @@ const mapStateToProps = state => ({
|
|||||||
domain: state.getIn(['meta', 'domain']),
|
domain: state.getIn(['meta', 'domain']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Directory extends React.PureComponent {
|
class Directory extends React.PureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -176,3 +174,5 @@ class Directory extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Directory));
|
||||||
|
@ -23,8 +23,6 @@ const mapStateToProps = state => ({
|
|||||||
hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
|
hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Blocks extends ImmutablePureComponent {
|
class Blocks extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -81,3 +79,5 @@ class Blocks extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Blocks));
|
||||||
|
@ -24,8 +24,6 @@ const mapStateToProps = state => ({
|
|||||||
isSearching: state.getIn(['search', 'submitted']) || !showTrends,
|
isSearching: state.getIn(['search', 'submitted']) || !showTrends,
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Explore extends React.PureComponent {
|
class Explore extends React.PureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -105,3 +103,5 @@ class Explore extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Explore));
|
||||||
|
@ -13,7 +13,6 @@ const mapStateToProps = state => ({
|
|||||||
isLoading: state.getIn(['trends', 'links', 'isLoading']),
|
isLoading: state.getIn(['trends', 'links', 'isLoading']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class Links extends React.PureComponent {
|
class Links extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -68,3 +67,5 @@ class Links extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(Links);
|
||||||
|
@ -42,8 +42,6 @@ const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', resul
|
|||||||
<Status key={`status-${item}`} id={item} />
|
<Status key={`status-${item}`} id={item} />
|
||||||
)), onLoadMore);
|
)), onLoadMore);
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Results extends React.PureComponent {
|
class Results extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -124,3 +122,5 @@ class Results extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Results));
|
||||||
|
@ -14,7 +14,6 @@ const mapStateToProps = state => ({
|
|||||||
hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
|
hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class Statuses extends React.PureComponent {
|
class Statuses extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -62,3 +61,5 @@ class Statuses extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(Statuses);
|
||||||
|
@ -12,7 +12,6 @@ const mapStateToProps = state => ({
|
|||||||
isLoading: state.getIn(['suggestions', 'isLoading']),
|
isLoading: state.getIn(['suggestions', 'isLoading']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class Suggestions extends React.PureComponent {
|
class Suggestions extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -54,3 +53,5 @@ class Suggestions extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(Suggestions);
|
||||||
|
@ -13,7 +13,6 @@ const mapStateToProps = state => ({
|
|||||||
isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
|
isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class Tags extends React.PureComponent {
|
class Tags extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -60,3 +59,5 @@ class Tags extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(Tags);
|
||||||
|
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
|
|||||||
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
|
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Favourites extends ImmutablePureComponent {
|
class Favourites extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -106,3 +104,5 @@ class Favourites extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Favourites));
|
||||||
|
@ -22,8 +22,6 @@ const mapStateToProps = (state, props) => ({
|
|||||||
accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
|
accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Favourites extends ImmutablePureComponent {
|
class Favourites extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -101,3 +99,5 @@ class Favourites extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Favourites));
|
||||||
|
@ -10,7 +10,6 @@ const mapStateToProps = (state, { filterId }) => ({
|
|||||||
filter: state.getIn(['filters', filterId]),
|
filter: state.getIn(['filters', filterId]),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class AddedToFilter extends React.PureComponent {
|
class AddedToFilter extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -100,3 +99,5 @@ class AddedToFilter extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(AddedToFilter);
|
||||||
|
@ -22,8 +22,6 @@ const mapStateToProps = (state, { contextType }) => ({
|
|||||||
]),
|
]),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class SelectFilter extends React.PureComponent {
|
class SelectFilter extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -190,3 +188,5 @@ class SelectFilter extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(SelectFilter));
|
||||||
|
@ -32,8 +32,6 @@ const getFirstSentence = str => {
|
|||||||
return arr[0];
|
return arr[0];
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @connect(makeMapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Account extends ImmutablePureComponent {
|
class Account extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -83,3 +81,5 @@ class Account extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(makeMapStateToProps)(injectIntl(Account));
|
||||||
|
@ -19,7 +19,6 @@ const mapStateToProps = state => ({
|
|||||||
isLoading: state.getIn(['suggestions', 'isLoading']),
|
isLoading: state.getIn(['suggestions', 'isLoading']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class FollowRecommendations extends ImmutablePureComponent {
|
class FollowRecommendations extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -114,3 +113,5 @@ class FollowRecommendations extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(FollowRecommendations);
|
||||||
|
@ -13,7 +13,6 @@ const messages = defineMessages({
|
|||||||
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
|
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class AccountAuthorize extends ImmutablePureComponent {
|
class AccountAuthorize extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -47,3 +46,5 @@ class AccountAuthorize extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(AccountAuthorize);
|
||||||
|
@ -25,8 +25,6 @@ const mapStateToProps = state => ({
|
|||||||
domain: state.getIn(['meta', 'domain']),
|
domain: state.getIn(['meta', 'domain']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class FollowRequests extends ImmutablePureComponent {
|
class FollowRequests extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -90,3 +88,5 @@ class FollowRequests extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(FollowRequests));
|
||||||
|
@ -22,8 +22,6 @@ const mapStateToProps = state => ({
|
|||||||
hasMore: !!state.getIn(['followed_tags', 'next']),
|
hasMore: !!state.getIn(['followed_tags', 'next']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class FollowedTags extends ImmutablePureComponent {
|
class FollowedTags extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -87,3 +85,5 @@ class FollowedTags extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(FollowedTags));
|
||||||
|
@ -53,7 +53,6 @@ RemoteHint.propTypes = {
|
|||||||
url: PropTypes.string.isRequired,
|
url: PropTypes.string.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class Followers extends ImmutablePureComponent {
|
class Followers extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -172,3 +171,5 @@ class Followers extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(Followers);
|
||||||
|
@ -53,7 +53,6 @@ RemoteHint.propTypes = {
|
|||||||
url: PropTypes.string.isRequired,
|
url: PropTypes.string.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
class Following extends ImmutablePureComponent {
|
class Following extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -172,3 +171,5 @@ class Following extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(Following);
|
||||||
|
@ -355,7 +355,6 @@ class Announcement extends ImmutablePureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class Announcements extends ImmutablePureComponent {
|
class Announcements extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -447,3 +446,5 @@ class Announcements extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(Announcements);
|
||||||
|
@ -79,8 +79,6 @@ const badgeDisplay = (number, limit) => {
|
|||||||
|
|
||||||
const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
|
const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
|
||||||
|
|
||||||
export default @connect(makeMapStateToProps, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class GettingStarted extends ImmutablePureComponent {
|
class GettingStarted extends ImmutablePureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -202,3 +200,5 @@ class GettingStarted extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
|
||||||
|
@ -22,9 +22,7 @@ const messages = defineMessages({
|
|||||||
featured_users: { id: 'navigation_bar.featured_users', defaultMessage: 'Featured users' },
|
featured_users: { id: 'navigation_bar.featured_users', defaultMessage: 'Featured users' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect()
|
class GettingStartedMisc extends ImmutablePureComponent {
|
||||||
@injectIntl
|
|
||||||
class gettingStartedMisc extends ImmutablePureComponent {
|
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
router: PropTypes.object.isRequired,
|
router: PropTypes.object.isRequired,
|
||||||
@ -68,3 +66,5 @@ class gettingStartedMisc extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect()(injectIntl(GettingStartedMisc));
|
||||||
|
@ -12,7 +12,6 @@ const messages = defineMessages({
|
|||||||
noOptions: { id: 'hashtag.column_settings.select.no_options_message', defaultMessage: 'No suggestions found' },
|
noOptions: { id: 'hashtag.column_settings.select.no_options_message', defaultMessage: 'No suggestions found' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ColumnSettings extends React.PureComponent {
|
class ColumnSettings extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -131,3 +130,5 @@ class ColumnSettings extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ColumnSettings);
|
||||||
|
@ -26,8 +26,6 @@ const mapStateToProps = (state, props) => ({
|
|||||||
tag: state.getIn(['tags', props.params.id]),
|
tag: state.getIn(['tags', props.params.id]),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class HashtagTimeline extends React.PureComponent {
|
class HashtagTimeline extends React.PureComponent {
|
||||||
|
|
||||||
disconnects = [];
|
disconnects = [];
|
||||||
@ -235,3 +233,5 @@ class HashtagTimeline extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(HashtagTimeline));
|
||||||
|
@ -10,7 +10,6 @@ const messages = defineMessages({
|
|||||||
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
|
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class ColumnSettings extends React.PureComponent {
|
class ColumnSettings extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -48,3 +47,5 @@ class ColumnSettings extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(ColumnSettings);
|
||||||
|
@ -31,8 +31,6 @@ const mapStateToProps = state => ({
|
|||||||
regex: state.getIn(['settings', 'home', 'regex', 'body']),
|
regex: state.getIn(['settings', 'home', 'regex', 'body']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class HomeTimeline extends React.PureComponent {
|
class HomeTimeline extends React.PureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -176,3 +174,5 @@ class HomeTimeline extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(HomeTimeline));
|
||||||
|
@ -74,7 +74,6 @@ class Copypaste extends React.PureComponent {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default @connect(mapStateToProps, mapDispatchToProps)
|
|
||||||
class InteractionModal extends React.PureComponent {
|
class InteractionModal extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -159,3 +158,5 @@ class InteractionModal extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(InteractionModal);
|
||||||
|
@ -15,8 +15,6 @@ const mapStateToProps = state => ({
|
|||||||
collapseEnabled: state.getIn(['local_settings', 'collapsed', 'enabled']),
|
collapseEnabled: state.getIn(['local_settings', 'collapsed', 'enabled']),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class KeyboardShortcuts extends ImmutablePureComponent {
|
class KeyboardShortcuts extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -147,3 +145,5 @@ class KeyboardShortcuts extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(KeyboardShortcuts));
|
||||||
|
@ -18,8 +18,6 @@ const makeMapStateToProps = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
export default @connect(makeMapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Account extends ImmutablePureComponent {
|
class Account extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -41,3 +39,5 @@ class Account extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(makeMapStateToProps)(injectIntl(Account));
|
||||||
|
@ -13,7 +13,7 @@ const messages = defineMessages({
|
|||||||
add: { id: 'lists.account.add', defaultMessage: 'Add to list' },
|
add: { id: 'lists.account.add', defaultMessage: 'Add to list' },
|
||||||
});
|
});
|
||||||
|
|
||||||
const MapStateToProps = (state, { listId, added }) => ({
|
const mapStateToProps = (state, { listId, added }) => ({
|
||||||
list: state.get('lists').get(listId),
|
list: state.get('lists').get(listId),
|
||||||
added: typeof added === 'undefined' ? state.getIn(['listAdder', 'lists', 'items']).includes(listId) : added,
|
added: typeof added === 'undefined' ? state.getIn(['listAdder', 'lists', 'items']).includes(listId) : added,
|
||||||
});
|
});
|
||||||
@ -23,8 +23,6 @@ const mapDispatchToProps = (dispatch, { listId }) => ({
|
|||||||
onAdd: () => dispatch(addToListAdder(listId)),
|
onAdd: () => dispatch(addToListAdder(listId)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(MapStateToProps, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class List extends ImmutablePureComponent {
|
class List extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -67,3 +65,5 @@ class List extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(List));
|
||||||
|
@ -28,8 +28,6 @@ const mapDispatchToProps = dispatch => ({
|
|||||||
onReset: () => dispatch(resetListAdder()),
|
onReset: () => dispatch(resetListAdder()),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class ListAdder extends ImmutablePureComponent {
|
class ListAdder extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -71,3 +69,5 @@ class ListAdder extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListAdder));
|
||||||
|
@ -19,8 +19,6 @@ const mapDispatchToProps = dispatch => ({
|
|||||||
onSubmit: () => dispatch(submitListEditor(false)),
|
onSubmit: () => dispatch(submitListEditor(false)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class ListForm extends React.PureComponent {
|
class ListForm extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -68,3 +66,5 @@ class ListForm extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListForm));
|
||||||
|
@ -22,8 +22,6 @@ const mapDispatchToProps = dispatch => ({
|
|||||||
onReset: () => dispatch(resetListEditor()),
|
onReset: () => dispatch(resetListEditor()),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class ListEditor extends ImmutablePureComponent {
|
class ListEditor extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -77,3 +75,5 @@ class ListEditor extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListEditor));
|
||||||
|
@ -31,8 +31,6 @@ const mapStateToProps = (state, props) => ({
|
|||||||
hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
|
hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class ListTimeline extends React.PureComponent {
|
class ListTimeline extends React.PureComponent {
|
||||||
|
|
||||||
static contextTypes = {
|
static contextTypes = {
|
||||||
@ -222,3 +220,5 @@ class ListTimeline extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(ListTimeline));
|
||||||
|
@ -20,8 +20,6 @@ const mapDispatchToProps = dispatch => ({
|
|||||||
onSubmit: () => dispatch(submitListEditor(true)),
|
onSubmit: () => dispatch(submitListEditor(true)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps, mapDispatchToProps)
|
|
||||||
@injectIntl
|
|
||||||
class NewListForm extends React.PureComponent {
|
class NewListForm extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -76,3 +74,5 @@ class NewListForm extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewListForm));
|
||||||
|
@ -32,8 +32,6 @@ const mapStateToProps = state => ({
|
|||||||
lists: getOrderedLists(state),
|
lists: getOrderedLists(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Lists extends ImmutablePureComponent {
|
class Lists extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -87,3 +85,5 @@ class Lists extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Lists));
|
||||||
|
@ -19,7 +19,6 @@ const messages = defineMessages({
|
|||||||
close: { id: 'settings.close', defaultMessage: 'Close' },
|
close: { id: 'settings.close', defaultMessage: 'Close' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class LocalSettingsNavigation extends React.PureComponent {
|
class LocalSettingsNavigation extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -90,3 +89,5 @@ class LocalSettingsNavigation extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(LocalSettingsNavigation);
|
||||||
|
@ -31,7 +31,6 @@ const messages = defineMessages({
|
|||||||
pop_in_right: { id: 'settings.pop_in_right', defaultMessage: 'Right' },
|
pop_in_right: { id: 'settings.pop_in_right', defaultMessage: 'Right' },
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @injectIntl
|
|
||||||
class LocalSettingsPage extends React.PureComponent {
|
class LocalSettingsPage extends React.PureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -513,3 +512,5 @@ class LocalSettingsPage extends React.PureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default injectIntl(LocalSettingsPage);
|
||||||
|
@ -23,8 +23,6 @@ const mapStateToProps = state => ({
|
|||||||
isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
|
isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default @connect(mapStateToProps)
|
|
||||||
@injectIntl
|
|
||||||
class Mutes extends ImmutablePureComponent {
|
class Mutes extends ImmutablePureComponent {
|
||||||
|
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
@ -82,3 +80,5 @@ class Mutes extends ImmutablePureComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default connect(mapStateToProps)(injectIntl(Mutes));
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user