From 6323c7d70e64a8defa6ccaa268ff1bf4f47d57f2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 10 Jan 2022 16:25:06 -0600 Subject: [PATCH] eslint: enforce gaps between groups with import/order --- .eslintrc.js | 2 +- app/soapbox/actions/__tests__/about-test.js | 2 ++ app/soapbox/actions/__tests__/preload-test.js | 2 ++ app/soapbox/actions/accounts.js | 2 ++ app/soapbox/actions/admin.js | 1 + app/soapbox/actions/aliases.js | 3 +++ app/soapbox/actions/auth.js | 3 +++ app/soapbox/actions/blocks.js | 2 ++ app/soapbox/actions/bookmarks.js | 1 + app/soapbox/actions/chats.js | 2 ++ app/soapbox/actions/compose.js | 3 +++ app/soapbox/actions/conversations.js | 2 ++ app/soapbox/actions/directory.js | 1 + app/soapbox/actions/domain_blocks.js | 1 + app/soapbox/actions/emoji_reacts.js | 3 +++ app/soapbox/actions/export_data.js | 2 ++ app/soapbox/actions/external_auth.js | 2 ++ app/soapbox/actions/favourites.js | 2 ++ app/soapbox/actions/filters.js | 2 ++ app/soapbox/actions/group_editor.js | 1 + app/soapbox/actions/groups.js | 2 ++ app/soapbox/actions/import_data.js | 2 ++ app/soapbox/actions/importer/index.js | 1 + app/soapbox/actions/importer/normalizer.js | 1 + app/soapbox/actions/instance.js | 2 ++ app/soapbox/actions/interactions.js | 3 +++ app/soapbox/actions/lists.js | 2 ++ app/soapbox/actions/me.js | 2 ++ app/soapbox/actions/media.js | 1 + app/soapbox/actions/moderation.js | 1 + app/soapbox/actions/mrf.js | 2 ++ app/soapbox/actions/mutes.js | 2 ++ app/soapbox/actions/notifications.js | 3 +++ app/soapbox/actions/pin_statuses.js | 2 ++ app/soapbox/actions/polls.js | 1 + app/soapbox/actions/preload.js | 1 + app/soapbox/actions/push_notifications/registerer.js | 2 ++ app/soapbox/actions/reports.js | 1 + app/soapbox/actions/search.js | 1 + app/soapbox/actions/security.js | 2 ++ app/soapbox/actions/settings.js | 3 +++ app/soapbox/actions/soapbox.js | 2 ++ app/soapbox/actions/statuses.js | 2 ++ app/soapbox/actions/streaming.js | 2 ++ app/soapbox/actions/suggestions.js | 2 ++ app/soapbox/actions/timelines.js | 3 +++ app/soapbox/api.js | 1 + app/soapbox/base_polyfills.js | 1 + app/soapbox/components/__tests__/autosuggest_emoji-test.js | 1 + app/soapbox/components/__tests__/avatar-test.js | 2 ++ app/soapbox/components/__tests__/avatar_overlay-test.js | 2 ++ app/soapbox/components/__tests__/badge-test.js | 1 + app/soapbox/components/__tests__/button-test.js | 1 + app/soapbox/components/__tests__/column-test.js | 1 + app/soapbox/components/__tests__/column_back_button-test.js | 2 ++ app/soapbox/components/__tests__/display_name-test.js | 2 ++ app/soapbox/components/__tests__/emoji_selector-test.js | 2 ++ .../components/__tests__/timeline_queue_button_header-test.js | 2 ++ app/soapbox/components/account.js | 2 ++ app/soapbox/components/account_search.js | 1 + app/soapbox/components/attachment_list.js | 1 + app/soapbox/components/attachment_thumbs.js | 1 + app/soapbox/components/autosuggest_account_input.js | 2 ++ app/soapbox/components/autosuggest_emoji.js | 2 ++ app/soapbox/components/autosuggest_input.js | 3 +++ app/soapbox/components/autosuggest_textarea.js | 2 ++ app/soapbox/components/avatar.js | 1 + app/soapbox/components/avatar_composite.js | 1 + app/soapbox/components/avatar_overlay.js | 1 + app/soapbox/components/button.js | 1 + app/soapbox/components/column_back_button.js | 1 + app/soapbox/components/column_header.js | 1 + app/soapbox/components/display_name.js | 3 +++ app/soapbox/components/domain.js | 1 + app/soapbox/components/dropdown_menu.js | 3 +++ app/soapbox/components/emoji_selector.js | 1 + app/soapbox/components/error_boundary.js | 1 + app/soapbox/components/extended_video_player.js | 1 + app/soapbox/components/hashtag.js | 2 ++ app/soapbox/components/helmet.js | 1 + app/soapbox/components/hover_ref_wrapper.js | 1 + app/soapbox/components/icon.js | 1 + app/soapbox/components/icon_button.js | 2 ++ app/soapbox/components/icon_with_counter.js | 1 + app/soapbox/components/intersection_observer_article.js | 1 + app/soapbox/components/load_gap.js | 1 + app/soapbox/components/material_status.js | 1 + app/soapbox/components/media_gallery.js | 3 +++ app/soapbox/components/modal_root.js | 1 + app/soapbox/components/more_follows.js | 1 + app/soapbox/components/poll.js | 2 ++ app/soapbox/components/primary_navigation.js | 1 + app/soapbox/components/profile_hover_card.js | 1 + app/soapbox/components/pullable.js | 1 + app/soapbox/components/scrollable_list.js | 3 +++ app/soapbox/components/settings_checkbox.js | 1 + app/soapbox/components/showable_password.js | 1 + app/soapbox/components/sidebar_menu.js | 3 +++ app/soapbox/components/status.js | 3 +++ app/soapbox/components/status_action_bar.js | 3 +++ app/soapbox/components/status_content.js | 3 +++ app/soapbox/components/status_list.js | 2 ++ app/soapbox/components/status_reply_mentions.js | 1 + app/soapbox/components/still_image.js | 1 + app/soapbox/components/sub_navigation.js | 1 + app/soapbox/components/thumb_navigation.js | 1 + app/soapbox/components/timeline_queue_button_header.js | 1 + app/soapbox/containers/account_container.js | 1 + app/soapbox/containers/domain_container.js | 1 + app/soapbox/containers/dropdown_menu_container.js | 1 + .../containers/intersection_observer_article_container.js | 1 + app/soapbox/containers/poll_container.js | 1 + app/soapbox/containers/soapbox.js | 2 ++ app/soapbox/containers/status_container.js | 2 ++ app/soapbox/features/about/index.js | 2 ++ app/soapbox/features/account/components/header.js | 1 + app/soapbox/features/account_gallery/components/media_item.js | 1 + app/soapbox/features/account_gallery/index.js | 3 +++ .../features/account_timeline/components/column_settings.js | 2 ++ app/soapbox/features/account_timeline/components/header.js | 2 ++ app/soapbox/features/account_timeline/components/moved_note.js | 2 ++ .../account_timeline/containers/column_settings_container.js | 1 + .../features/account_timeline/containers/header_container.js | 2 ++ app/soapbox/features/account_timeline/index.js | 2 ++ app/soapbox/features/admin/awaiting_approval.js | 3 +++ app/soapbox/features/admin/components/admin_nav.js | 1 + app/soapbox/features/admin/components/latest_accounts_panel.js | 1 + .../features/admin/components/registration_mode_picker.js | 1 + app/soapbox/features/admin/components/report.js | 2 ++ app/soapbox/features/admin/components/report_status.js | 1 + app/soapbox/features/admin/components/unapproved_account.js | 2 ++ app/soapbox/features/admin/index.js | 3 +++ app/soapbox/features/admin/moderation_log.js | 2 ++ app/soapbox/features/admin/reports.js | 3 +++ app/soapbox/features/admin/user_index.js | 1 + app/soapbox/features/aliases/components/account.js | 1 + app/soapbox/features/aliases/components/search.js | 2 ++ app/soapbox/features/aliases/index.js | 3 +++ app/soapbox/features/audio/index.js | 2 ++ .../features/auth_login/components/__tests__/captcha-test.js | 2 ++ .../auth_login/components/__tests__/login_form-test.js | 2 ++ .../auth_login/components/__tests__/login_page-test.js | 2 ++ .../auth_login/components/__tests__/otp_auth_form-test.js | 2 ++ app/soapbox/features/auth_login/components/captcha.js | 1 + app/soapbox/features/auth_login/components/login_form.js | 1 + app/soapbox/features/auth_login/components/login_page.js | 2 ++ app/soapbox/features/auth_login/components/otp_auth_form.js | 1 + app/soapbox/features/auth_login/components/password_reset.js | 1 + .../features/auth_login/components/registration_form.js | 1 + app/soapbox/features/backups/index.js | 2 ++ app/soapbox/features/blocks/index.js | 1 + app/soapbox/features/bookmarks/index.js | 2 ++ app/soapbox/features/chats/chat_room.js | 2 ++ app/soapbox/features/chats/components/audio_toggle.js | 1 + app/soapbox/features/chats/components/chat.js | 2 ++ app/soapbox/features/chats/components/chat_box.js | 2 ++ app/soapbox/features/chats/components/chat_list.js | 2 ++ app/soapbox/features/chats/components/chat_message_list.js | 1 + app/soapbox/features/chats/components/chat_panes.js | 2 ++ app/soapbox/features/chats/components/chat_window.js | 2 ++ app/soapbox/features/chats/index.js | 3 +++ .../features/community_timeline/components/column_settings.js | 2 ++ .../community_timeline/containers/column_settings_container.js | 1 + app/soapbox/features/community_timeline/index.js | 3 +++ app/soapbox/features/compose/components/autosuggest_account.js | 1 + app/soapbox/features/compose/components/compose_form.js | 3 +++ .../features/compose/components/emoji_picker_dropdown.js | 2 ++ app/soapbox/features/compose/components/markdown_button.js | 1 + app/soapbox/features/compose/components/poll_button.js | 1 + app/soapbox/features/compose/components/poll_form.js | 1 + app/soapbox/features/compose/components/privacy_dropdown.js | 2 ++ app/soapbox/features/compose/components/reply_indicator.js | 2 ++ app/soapbox/features/compose/components/schedule_button.js | 1 + app/soapbox/features/compose/components/schedule_form.js | 2 ++ app/soapbox/features/compose/components/search.js | 1 + app/soapbox/features/compose/components/search_results.js | 2 ++ app/soapbox/features/compose/components/spoiler_button.js | 1 + app/soapbox/features/compose/components/upload.js | 2 ++ app/soapbox/features/compose/components/upload_button.js | 1 + app/soapbox/features/compose/components/upload_form.js | 1 + app/soapbox/features/compose/components/upload_progress.js | 2 ++ .../features/compose/components/visual_character_counter.js | 1 + app/soapbox/features/compose/components/warning.js | 1 + .../compose/containers/autosuggest_account_container.js | 1 + .../features/compose/containers/compose_form_container.js | 1 + .../compose/containers/emoji_picker_dropdown_container.js | 1 + .../features/compose/containers/markdown_button_container.js | 2 ++ .../features/compose/containers/poll_button_container.js | 1 + app/soapbox/features/compose/containers/poll_form_container.js | 1 + .../features/compose/containers/privacy_dropdown_container.js | 1 + .../features/compose/containers/reply_indicator_container.js | 1 + .../features/compose/containers/reply_mentions_container.js | 2 ++ .../features/compose/containers/schedule_button_container.js | 1 + .../features/compose/containers/schedule_form_container.js | 1 + app/soapbox/features/compose/containers/search_container.js | 1 + .../features/compose/containers/search_results_container.js | 2 ++ .../features/compose/containers/sensitive_button_container.js | 1 + .../features/compose/containers/spoiler_button_container.js | 1 + .../features/compose/containers/upload_button_container.js | 1 + app/soapbox/features/compose/containers/upload_container.js | 1 + .../features/compose/containers/upload_form_container.js | 1 + .../features/compose/containers/upload_progress_container.js | 1 + app/soapbox/features/compose/containers/warning_container.js | 1 + app/soapbox/features/conversations/components/conversation.js | 1 + .../features/conversations/components/conversations_list.js | 1 + .../conversations/containers/conversation_container.js | 1 + .../conversations/containers/conversations_list_container.js | 1 + app/soapbox/features/conversations/index.js | 3 +++ .../features/crypto_donate/components/crypto_address.js | 3 +++ .../features/crypto_donate/components/crypto_donate_panel.js | 2 ++ .../crypto_donate/components/detailed_crypto_address.js | 3 +++ app/soapbox/features/crypto_donate/components/site_wallet.js | 1 + app/soapbox/features/crypto_donate/index.js | 3 +++ app/soapbox/features/crypto_donate/utils/coin_db.js | 1 + app/soapbox/features/developers/apps/create.js | 1 + app/soapbox/features/developers/developers_challenge.js | 2 ++ app/soapbox/features/developers/developers_menu.js | 2 ++ app/soapbox/features/developers/index.js | 2 ++ app/soapbox/features/developers/settings_store.js | 1 + app/soapbox/features/direct_timeline/index.js | 2 ++ app/soapbox/features/directory/components/account_card.js | 1 + app/soapbox/features/directory/index.js | 2 ++ app/soapbox/features/domain_blocks/index.js | 1 + .../features/edit_profile/components/profile_preview.js | 1 + app/soapbox/features/edit_profile/index.js | 3 +++ app/soapbox/features/emoji/__tests__/emoji_index-test.js | 1 + app/soapbox/features/emoji/emoji.js | 2 ++ app/soapbox/features/emoji/emoji_compressed.js | 1 + app/soapbox/features/export_data/components/csv_exporter.js | 1 + app/soapbox/features/export_data/index.js | 3 +++ .../features/external_login/components/external_login_form.js | 1 + app/soapbox/features/external_login/index.js | 1 + app/soapbox/features/favourited_statuses/index.js | 2 ++ .../components/instance_restrictions.js | 1 + .../federation_restrictions/components/restricted_instance.js | 2 ++ app/soapbox/features/federation_restrictions/index.js | 3 +++ app/soapbox/features/filters/index.js | 2 ++ .../features/follow_recommendations/components/account.js | 1 + .../components/follow_recommendations_container.js | 2 ++ .../components/follow_recommendations_list.js | 2 ++ app/soapbox/features/follow_recommendations/index.js | 2 ++ .../features/follow_requests/components/account_authorize.js | 1 + .../follow_requests/containers/account_authorize_container.js | 1 + app/soapbox/features/follow_requests/index.js | 2 ++ app/soapbox/features/followers/index.js | 2 ++ app/soapbox/features/following/index.js | 2 ++ app/soapbox/features/forms/__tests__/forms-test.js | 1 + app/soapbox/features/generic_not_found/index.js | 1 + app/soapbox/features/groups/create/index.js | 1 + app/soapbox/features/groups/edit/index.js | 2 ++ app/soapbox/features/groups/index/card.js | 1 + app/soapbox/features/groups/index/index.js | 2 ++ app/soapbox/features/groups/members/index.js | 1 + app/soapbox/features/groups/removed_accounts/index.js | 1 + app/soapbox/features/groups/sidebar_panel/index.js | 2 ++ app/soapbox/features/groups/sidebar_panel/item.js | 1 + app/soapbox/features/groups/timeline/components/header.js | 2 ++ app/soapbox/features/groups/timeline/components/panel.js | 1 + .../features/groups/timeline/containers/header_container.js | 1 + app/soapbox/features/groups/timeline/index.js | 1 + app/soapbox/features/hashtag_timeline/index.js | 1 + .../features/home_timeline/components/column_settings.js | 2 ++ .../home_timeline/containers/column_settings_container.js | 1 + app/soapbox/features/home_timeline/index.js | 2 ++ app/soapbox/features/import_data/components/csv_importer.js | 1 + app/soapbox/features/import_data/index.js | 3 +++ app/soapbox/features/introduction/index.js | 1 + app/soapbox/features/landing_page/index.js | 1 + app/soapbox/features/list_adder/components/account.js | 1 + app/soapbox/features/list_adder/components/list.js | 2 ++ app/soapbox/features/list_adder/index.js | 3 +++ app/soapbox/features/list_editor/components/account.js | 1 + app/soapbox/features/list_editor/components/edit_list_form.js | 1 + app/soapbox/features/list_editor/components/search.js | 2 ++ app/soapbox/features/list_editor/index.js | 3 +++ app/soapbox/features/list_timeline/index.js | 2 ++ app/soapbox/features/lists/components/new_list_form.js | 1 + app/soapbox/features/lists/index.js | 2 ++ app/soapbox/features/mutes/index.js | 1 + app/soapbox/features/new_status/index.js | 1 + .../features/notifications/components/clear_column_button.js | 1 + .../features/notifications/components/column_settings.js | 2 ++ app/soapbox/features/notifications/components/filter_bar.js | 1 + .../features/notifications/components/follow_request.js | 1 + app/soapbox/features/notifications/components/notification.js | 2 ++ .../notifications/containers/column_settings_container.js | 2 ++ .../features/notifications/containers/filter_bar_container.js | 2 ++ .../notifications/containers/follow_request_container.js | 2 ++ .../notifications/containers/notification_container.js | 2 ++ app/soapbox/features/notifications/index.js | 3 +++ app/soapbox/features/pinned_statuses/index.js | 2 ++ .../features/placeholder/components/placeholder_account.js | 1 + .../features/placeholder/components/placeholder_card.js | 1 + .../features/placeholder/components/placeholder_chat.js | 2 ++ .../placeholder/components/placeholder_display_name.js | 1 + .../features/placeholder/components/placeholder_hashtag.js | 1 + .../placeholder/components/placeholder_material_status.js | 1 + .../placeholder/components/placeholder_notification.js | 2 ++ .../features/placeholder/components/placeholder_status.js | 1 + .../placeholder/components/placeholder_status_content.js | 1 + app/soapbox/features/preferences/index.js | 2 ++ app/soapbox/features/public_layout/components/footer.js | 1 + app/soapbox/features/public_layout/components/header.js | 2 ++ app/soapbox/features/public_layout/components/site_banner.js | 1 + app/soapbox/features/public_layout/components/site_logo.js | 1 + app/soapbox/features/public_layout/index.js | 3 +++ .../features/public_timeline/components/column_settings.js | 2 ++ .../public_timeline/containers/column_settings_container.js | 1 + app/soapbox/features/public_timeline/index.js | 3 +++ app/soapbox/features/register_invite/index.js | 1 + .../features/remote_timeline/components/pinned_hosts_picker.js | 1 + app/soapbox/features/remote_timeline/index.js | 3 +++ app/soapbox/features/reply_mentions/account.js | 1 + app/soapbox/features/report/components/status_check_box.js | 1 + .../features/report/containers/status_check_box_container.js | 1 + app/soapbox/features/scheduled_statuses/builder.js | 1 + .../features/scheduled_statuses/components/scheduled_status.js | 3 +++ .../components/scheduled_status_action_bar.js | 1 + app/soapbox/features/scheduled_statuses/index.js | 3 +++ app/soapbox/features/search/index.js | 1 + app/soapbox/features/security/index.js | 2 ++ app/soapbox/features/security/mfa_form.js | 2 ++ app/soapbox/features/server_info/index.js | 1 + app/soapbox/features/share/index.js | 1 + .../features/soapbox_config/components/icon_picker_dropdown.js | 1 + app/soapbox/features/soapbox_config/components/site_preview.js | 1 + app/soapbox/features/soapbox_config/index.js | 3 +++ app/soapbox/features/status/components/action_bar.js | 2 ++ app/soapbox/features/status/components/card.js | 2 ++ app/soapbox/features/status/components/detailed_status.js | 3 +++ .../features/status/components/status_interaction_bar.js | 1 + app/soapbox/features/status/components/thread_status.js | 1 + .../features/status/containers/detailed_status_container.js | 2 ++ app/soapbox/features/status/index.js | 3 +++ app/soapbox/features/ui/components/accordion.js | 1 + app/soapbox/features/ui/components/account_list_panel.js | 2 ++ app/soapbox/features/ui/components/action_button.js | 1 + app/soapbox/features/ui/components/actions_modal.js | 1 + app/soapbox/features/ui/components/better_column.js | 2 ++ app/soapbox/features/ui/components/boost_modal.js | 2 ++ app/soapbox/features/ui/components/bundle_column_error.js | 1 + app/soapbox/features/ui/components/column.js | 2 ++ app/soapbox/features/ui/components/column_header.js | 1 + app/soapbox/features/ui/components/column_link.js | 1 + app/soapbox/features/ui/components/column_loading.js | 2 ++ app/soapbox/features/ui/components/compose_modal.js | 2 ++ app/soapbox/features/ui/components/confirmation_modal.js | 2 ++ app/soapbox/features/ui/components/crypto_donate_modal.js | 1 + app/soapbox/features/ui/components/edit_federation_modal.js | 1 + app/soapbox/features/ui/components/favourites_modal.js | 1 + app/soapbox/features/ui/components/features_panel.js | 1 + app/soapbox/features/ui/components/focal_point_modal.js | 2 ++ app/soapbox/features/ui/components/funding_panel.js | 2 ++ app/soapbox/features/ui/components/hotkeys_modal.js | 1 + app/soapbox/features/ui/components/image_loader.js | 1 + app/soapbox/features/ui/components/instance_info_panel.js | 1 + .../features/ui/components/instance_moderation_panel.js | 1 + app/soapbox/features/ui/components/link_footer.js | 2 ++ app/soapbox/features/ui/components/list_panel.js | 1 + app/soapbox/features/ui/components/media_modal.js | 2 ++ app/soapbox/features/ui/components/mentions_modal.js | 1 + .../features/ui/components/missing_description_modal.js | 1 + app/soapbox/features/ui/components/modal_root.js | 2 ++ app/soapbox/features/ui/components/mute_modal.js | 1 + app/soapbox/features/ui/components/pending_status.js | 3 +++ app/soapbox/features/ui/components/profile_dropdown.js | 2 ++ app/soapbox/features/ui/components/profile_info_panel.js | 2 ++ app/soapbox/features/ui/components/profile_media_panel.js | 2 ++ app/soapbox/features/ui/components/profile_stats.js | 1 + app/soapbox/features/ui/components/promo_panel.js | 1 + app/soapbox/features/ui/components/reactions_modal.js | 1 + app/soapbox/features/ui/components/reblogs_modal.js | 1 + app/soapbox/features/ui/components/reply_mentions_modal.js | 2 ++ app/soapbox/features/ui/components/report_modal.js | 2 ++ app/soapbox/features/ui/components/sign_up_panel.js | 1 + app/soapbox/features/ui/components/subscription_button.js | 1 + app/soapbox/features/ui/components/tabs_bar.js | 3 +++ app/soapbox/features/ui/components/theme_toggle.js | 1 + app/soapbox/features/ui/components/theme_toggle_container.js | 2 ++ app/soapbox/features/ui/components/trends_panel.js | 2 ++ app/soapbox/features/ui/components/unauthorized_modal.js | 1 + app/soapbox/features/ui/components/upload_area.js | 1 + app/soapbox/features/ui/components/user_panel.js | 2 ++ app/soapbox/features/ui/components/video_modal.js | 1 + app/soapbox/features/ui/components/who_to_follow_panel.js | 2 ++ app/soapbox/features/ui/containers/columns_area_container.js | 2 ++ app/soapbox/features/ui/containers/modal_container.js | 1 + app/soapbox/features/ui/containers/notifications_container.js | 1 + app/soapbox/features/ui/containers/status_list_container.js | 2 ++ app/soapbox/features/ui/index.js | 3 +++ app/soapbox/features/ui/util/optional_motion.js | 2 ++ app/soapbox/features/ui/util/pending_status_builder.js | 1 + app/soapbox/features/ui/util/react_router_helpers.js | 2 ++ app/soapbox/features/video/index.js | 2 ++ app/soapbox/main.js | 2 ++ app/soapbox/pages/admin_page.js | 2 ++ app/soapbox/pages/default_page.js | 1 + app/soapbox/pages/group_page.js | 1 + app/soapbox/pages/groups_page.js | 1 + app/soapbox/pages/home_page.js | 2 ++ app/soapbox/pages/profile_page.js | 2 ++ app/soapbox/pages/remote_instance_page.js | 1 + app/soapbox/pages/status_page.js | 2 ++ app/soapbox/reducers/__tests__/accounts-test.js | 1 + app/soapbox/reducers/__tests__/accounts_counters-test.js | 1 + app/soapbox/reducers/__tests__/admin-test.js | 1 + app/soapbox/reducers/__tests__/alerts-test.js | 2 ++ app/soapbox/reducers/__tests__/auth-test.js | 2 ++ app/soapbox/reducers/__tests__/compose-test.js | 2 ++ app/soapbox/reducers/__tests__/contexts-test.js | 2 ++ app/soapbox/reducers/__tests__/conversations-test.js | 2 ++ app/soapbox/reducers/__tests__/custom_emojis-test.js | 1 + app/soapbox/reducers/__tests__/domain_lists-test.js | 1 + app/soapbox/reducers/__tests__/dropdown_menu-test.js | 1 + app/soapbox/reducers/__tests__/filters-test.js | 1 + app/soapbox/reducers/__tests__/group_editor-test.js | 1 + app/soapbox/reducers/__tests__/group_lists-test.js | 1 + app/soapbox/reducers/__tests__/group_relationships-test.js | 1 + app/soapbox/reducers/__tests__/groups-test.js | 1 + app/soapbox/reducers/__tests__/height_cache-test.js | 1 + app/soapbox/reducers/__tests__/identity_proofs-test.js | 2 ++ app/soapbox/reducers/__tests__/instance-test.js | 1 + app/soapbox/reducers/__tests__/list_adder-test.js | 2 ++ app/soapbox/reducers/__tests__/list_editor-test.js | 2 ++ app/soapbox/reducers/__tests__/lists-test.js | 1 + app/soapbox/reducers/__tests__/meta-test.js | 1 + app/soapbox/reducers/__tests__/modal-test.js | 1 + app/soapbox/reducers/__tests__/mutes-test.js | 2 ++ app/soapbox/reducers/__tests__/notifications-test.js | 2 ++ app/soapbox/reducers/__tests__/patron-test.js | 1 + app/soapbox/reducers/__tests__/polls-test.js | 1 + app/soapbox/reducers/__tests__/push_notifications-test.js | 1 + app/soapbox/reducers/__tests__/relationships-test.js | 2 ++ app/soapbox/reducers/__tests__/reports-test.js | 1 + app/soapbox/reducers/__tests__/search-test.js | 2 ++ app/soapbox/reducers/__tests__/settings-test.js | 1 + app/soapbox/reducers/__tests__/soapbox-test.js | 2 ++ app/soapbox/reducers/__tests__/status_lists-test.js | 1 + app/soapbox/reducers/__tests__/statuses-test.js | 2 ++ app/soapbox/reducers/__tests__/suggestions-test.js | 2 ++ app/soapbox/reducers/__tests__/timelines-test.js | 2 ++ app/soapbox/reducers/__tests__/trends-test.js | 1 + app/soapbox/reducers/__tests__/user_lists-test.js | 1 + app/soapbox/reducers/accounts.js | 2 ++ app/soapbox/reducers/accounts_counters.js | 2 ++ app/soapbox/reducers/accounts_meta.js | 1 + app/soapbox/reducers/admin.js | 1 + app/soapbox/reducers/admin_log.js | 1 + app/soapbox/reducers/alerts.js | 1 + app/soapbox/reducers/aliases.js | 1 + app/soapbox/reducers/auth.js | 2 ++ app/soapbox/reducers/backups.js | 1 + app/soapbox/reducers/chat_message_lists.js | 1 + app/soapbox/reducers/chat_messages.js | 1 + app/soapbox/reducers/chats.js | 1 + app/soapbox/reducers/compose.js | 2 ++ app/soapbox/reducers/contexts.js | 2 ++ app/soapbox/reducers/conversations.js | 1 + app/soapbox/reducers/custom_emojis.js | 2 ++ app/soapbox/reducers/domain_lists.js | 1 + app/soapbox/reducers/dropdown_menu.js | 1 + app/soapbox/reducers/filters.js | 1 + app/soapbox/reducers/group_editor.js | 1 + app/soapbox/reducers/group_lists.js | 1 + app/soapbox/reducers/group_relationships.js | 1 + app/soapbox/reducers/groups.js | 1 + app/soapbox/reducers/height_cache.js | 1 + app/soapbox/reducers/identity_proofs.js | 1 + app/soapbox/reducers/index.js | 2 ++ app/soapbox/reducers/instance.js | 2 ++ app/soapbox/reducers/list_adder.js | 1 + app/soapbox/reducers/list_editor.js | 1 + app/soapbox/reducers/lists.js | 1 + app/soapbox/reducers/meta.js | 1 + app/soapbox/reducers/notifications.js | 2 ++ app/soapbox/reducers/patron.js | 1 + app/soapbox/reducers/pending_statuses.js | 1 + app/soapbox/reducers/polls.js | 1 + app/soapbox/reducers/profile_hover_card.js | 1 + app/soapbox/reducers/push_notifications.js | 1 + app/soapbox/reducers/relationships.js | 2 ++ app/soapbox/reducers/reports.js | 1 + app/soapbox/reducers/scheduled_statuses.js | 2 ++ app/soapbox/reducers/search.js | 1 + app/soapbox/reducers/security.js | 1 + app/soapbox/reducers/settings.js | 2 ++ app/soapbox/reducers/soapbox.js | 2 ++ app/soapbox/reducers/status_lists.js | 1 + app/soapbox/reducers/statuses.js | 2 ++ app/soapbox/reducers/suggestions.js | 2 ++ app/soapbox/reducers/timelines.js | 1 + app/soapbox/reducers/trends.js | 1 + app/soapbox/reducers/user_lists.js | 1 + app/soapbox/selectors/index.js | 1 + app/soapbox/service_worker/web_push_notifications.js | 1 + app/soapbox/store/configureStore.js | 1 + app/soapbox/stream.js | 1 + app/soapbox/test_helpers.js | 1 + app/soapbox/test_setup.js | 1 + app/soapbox/utils/__tests__/accounts-test.js | 1 + app/soapbox/utils/__tests__/config_db-test.js | 2 ++ app/soapbox/utils/__tests__/emoji_reacts-test.js | 1 + app/soapbox/utils/__tests__/features-test.js | 1 + app/soapbox/utils/__tests__/timelines-test.js | 1 + app/soapbox/utils/code.js | 1 + app/soapbox/utils/static.js | 1 + webpack/development.js | 2 ++ webpack/production.js | 2 ++ webpack/rules/babel-build-config.js | 1 + webpack/rules/babel-git.js | 1 + webpack/rules/babel.js | 1 + webpack/rules/node_modules.js | 1 + webpack/shared.js | 2 ++ webpack/test.js | 1 + webpack/translationRunner.js | 3 ++- 515 files changed, 794 insertions(+), 2 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 101e91527..c12341232 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -236,7 +236,7 @@ module.exports = { 'object', 'type', ], - 'newlines-between': 'ignore', + 'newlines-between': 'always', alphabetize: { order: 'asc' }, }, ], diff --git a/app/soapbox/actions/__tests__/about-test.js b/app/soapbox/actions/__tests__/about-test.js index 1c04c9b9e..49840e357 100644 --- a/app/soapbox/actions/__tests__/about-test.js +++ b/app/soapbox/actions/__tests__/about-test.js @@ -1,7 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import { Map as ImmutableMap } from 'immutable'; + import { staticClient } from 'soapbox/api'; import { mockStore } from 'soapbox/test_helpers'; + import { FETCH_ABOUT_PAGE_REQUEST, FETCH_ABOUT_PAGE_SUCCESS, diff --git a/app/soapbox/actions/__tests__/preload-test.js b/app/soapbox/actions/__tests__/preload-test.js index 7512f4c5e..5290802d2 100644 --- a/app/soapbox/actions/__tests__/preload-test.js +++ b/app/soapbox/actions/__tests__/preload-test.js @@ -1,6 +1,8 @@ import { Map as ImmutableMap } from 'immutable'; + import { __stub } from 'soapbox/api'; import { mockStore } from 'soapbox/test_helpers'; + import { VERIFY_CREDENTIALS_REQUEST } from '../auth'; import { ACCOUNTS_IMPORT } from '../importer'; import { diff --git a/app/soapbox/actions/accounts.js b/app/soapbox/actions/accounts.js index 8ee830ec4..ec010cf7b 100644 --- a/app/soapbox/actions/accounts.js +++ b/app/soapbox/actions/accounts.js @@ -1,6 +1,8 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures } from 'soapbox/utils/features'; + import api, { getLinks } from '../api'; + import { importFetchedAccount, importFetchedAccounts, diff --git a/app/soapbox/actions/admin.js b/app/soapbox/actions/admin.js index 2b29e7479..414cb07d6 100644 --- a/app/soapbox/actions/admin.js +++ b/app/soapbox/actions/admin.js @@ -1,5 +1,6 @@ import { fetchRelationships } from 'soapbox/actions/accounts'; import { importFetchedAccount, importFetchedStatuses } from 'soapbox/actions/importer'; + import api from '../api'; export const ADMIN_CONFIG_FETCH_REQUEST = 'ADMIN_CONFIG_FETCH_REQUEST'; diff --git a/app/soapbox/actions/aliases.js b/app/soapbox/actions/aliases.js index b525f22c7..cdeb7208c 100644 --- a/app/soapbox/actions/aliases.js +++ b/app/soapbox/actions/aliases.js @@ -1,6 +1,9 @@ import { defineMessages } from 'react-intl'; + import { isLoggedIn } from 'soapbox/utils/auth'; + import api from '../api'; + import { showAlertForError } from './alerts'; import { importFetchedAccount, importFetchedAccounts } from './importer'; import { ME_PATCH_SUCCESS } from './me'; diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 8b8f02b64..82c4e0969 100644 --- a/app/soapbox/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -8,6 +8,7 @@ */ import { defineMessages } from 'react-intl'; + import { createAccount } from 'soapbox/actions/accounts'; import { createApp } from 'soapbox/actions/apps'; import { fetchMeSuccess, fetchMeFail } from 'soapbox/actions/me'; @@ -18,7 +19,9 @@ import { getLoggedInAccount, parseBaseURL } from 'soapbox/utils/auth'; import sourceCode from 'soapbox/utils/code'; import { getFeatures } from 'soapbox/utils/features'; import { isStandalone } from 'soapbox/utils/state'; + import api, { baseClient } from '../api'; + import { importFetchedAccount } from './importer'; export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT'; diff --git a/app/soapbox/actions/blocks.js b/app/soapbox/actions/blocks.js index 9f28d6d22..554446f2f 100644 --- a/app/soapbox/actions/blocks.js +++ b/app/soapbox/actions/blocks.js @@ -1,6 +1,8 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import { getNextLinkName } from 'soapbox/utils/quirks'; + import api, { getLinks } from '../api'; + import { fetchRelationships } from './accounts'; import { importFetchedAccounts } from './importer'; diff --git a/app/soapbox/actions/bookmarks.js b/app/soapbox/actions/bookmarks.js index cf1ca8113..a0400ff38 100644 --- a/app/soapbox/actions/bookmarks.js +++ b/app/soapbox/actions/bookmarks.js @@ -1,4 +1,5 @@ import api, { getLinks } from '../api'; + import { importFetchedStatuses } from './importer'; export const BOOKMARKED_STATUSES_FETCH_REQUEST = 'BOOKMARKED_STATUSES_FETCH_REQUEST'; diff --git a/app/soapbox/actions/chats.js b/app/soapbox/actions/chats.js index eb9222750..8003bb8cb 100644 --- a/app/soapbox/actions/chats.js +++ b/app/soapbox/actions/chats.js @@ -1,7 +1,9 @@ import { Map as ImmutableMap } from 'immutable'; import { v4 as uuidv4 } from 'uuid'; + import { getSettings, changeSetting } from 'soapbox/actions/settings'; import { getFeatures } from 'soapbox/utils/features'; + import api, { getLinks } from '../api'; export const CHATS_FETCH_REQUEST = 'CHATS_FETCH_REQUEST'; diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index 82415eb0b..9801b40b2 100644 --- a/app/soapbox/actions/compose.js +++ b/app/soapbox/actions/compose.js @@ -1,13 +1,16 @@ import { CancelToken, isCancel } from 'axios'; import { throttle } from 'lodash'; import { defineMessages } from 'react-intl'; + import snackbar from 'soapbox/actions/snackbar'; import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures } from 'soapbox/utils/features'; + import api from '../api'; import { search as emojiSearch } from '../features/emoji/emoji_mart_search_light'; import { tagHistory } from '../settings'; import resizeImage from '../utils/resize_image'; + import { showAlert, showAlertForError } from './alerts'; import { useEmoji } from './emojis'; import { importFetchedAccounts } from './importer'; diff --git a/app/soapbox/actions/conversations.js b/app/soapbox/actions/conversations.js index ea88dd070..4e7eb214f 100644 --- a/app/soapbox/actions/conversations.js +++ b/app/soapbox/actions/conversations.js @@ -1,5 +1,7 @@ import { isLoggedIn } from 'soapbox/utils/auth'; + import api, { getLinks } from '../api'; + import { importFetchedAccounts, importFetchedStatuses, diff --git a/app/soapbox/actions/directory.js b/app/soapbox/actions/directory.js index bf93a5f22..0ee15386b 100644 --- a/app/soapbox/actions/directory.js +++ b/app/soapbox/actions/directory.js @@ -1,4 +1,5 @@ import api from '../api'; + import { fetchRelationships } from './accounts'; import { importFetchedAccounts } from './importer'; diff --git a/app/soapbox/actions/domain_blocks.js b/app/soapbox/actions/domain_blocks.js index 37ee475e5..92824a55c 100644 --- a/app/soapbox/actions/domain_blocks.js +++ b/app/soapbox/actions/domain_blocks.js @@ -1,4 +1,5 @@ import { isLoggedIn } from 'soapbox/utils/auth'; + import api, { getLinks } from '../api'; export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST'; diff --git a/app/soapbox/actions/emoji_reacts.js b/app/soapbox/actions/emoji_reacts.js index 48958bacb..a057dd35e 100644 --- a/app/soapbox/actions/emoji_reacts.js +++ b/app/soapbox/actions/emoji_reacts.js @@ -1,6 +1,9 @@ import { List as ImmutableList } from 'immutable'; + import { isLoggedIn } from 'soapbox/utils/auth'; + import api from '../api'; + import { importFetchedAccounts, importFetchedStatus } from './importer'; import { favourite, unfavourite } from './interactions'; diff --git a/app/soapbox/actions/export_data.js b/app/soapbox/actions/export_data.js index 479b44b0a..12e0bd58b 100644 --- a/app/soapbox/actions/export_data.js +++ b/app/soapbox/actions/export_data.js @@ -1,5 +1,7 @@ import { defineMessages } from 'react-intl'; + import snackbar from 'soapbox/actions/snackbar'; + import api, { getLinks } from '../api'; export const EXPORT_FOLLOWS_REQUEST = 'EXPORT_FOLLOWS_REQUEST'; diff --git a/app/soapbox/actions/external_auth.js b/app/soapbox/actions/external_auth.js index f95c08be6..b3258ab70 100644 --- a/app/soapbox/actions/external_auth.js +++ b/app/soapbox/actions/external_auth.js @@ -7,12 +7,14 @@ */ import { Map as ImmutableMap, fromJS } from 'immutable'; + import { createApp } from 'soapbox/actions/apps'; import { authLoggedIn, verifyCredentials, switchAccount } from 'soapbox/actions/auth'; import { obtainOAuthToken } from 'soapbox/actions/oauth'; import { parseBaseURL } from 'soapbox/utils/auth'; import sourceCode from 'soapbox/utils/code'; import { getFeatures } from 'soapbox/utils/features'; + import { baseClient } from '../api'; const fetchExternalInstance = baseURL => { diff --git a/app/soapbox/actions/favourites.js b/app/soapbox/actions/favourites.js index 090df55bc..c4bce15e9 100644 --- a/app/soapbox/actions/favourites.js +++ b/app/soapbox/actions/favourites.js @@ -1,5 +1,7 @@ import { isLoggedIn } from 'soapbox/utils/auth'; + import api, { getLinks } from '../api'; + import { importFetchedStatuses } from './importer'; export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST'; diff --git a/app/soapbox/actions/filters.js b/app/soapbox/actions/filters.js index d0f18dd3e..e6af25f9c 100644 --- a/app/soapbox/actions/filters.js +++ b/app/soapbox/actions/filters.js @@ -1,6 +1,8 @@ import { defineMessages } from 'react-intl'; + import snackbar from 'soapbox/actions/snackbar'; import { isLoggedIn } from 'soapbox/utils/auth'; + import api from '../api'; export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST'; diff --git a/app/soapbox/actions/group_editor.js b/app/soapbox/actions/group_editor.js index 6710b21f2..f504a743a 100644 --- a/app/soapbox/actions/group_editor.js +++ b/app/soapbox/actions/group_editor.js @@ -1,4 +1,5 @@ import { isLoggedIn } from 'soapbox/utils/auth'; + import api from '../api'; export const GROUP_CREATE_REQUEST = 'GROUP_CREATE_REQUEST'; diff --git a/app/soapbox/actions/groups.js b/app/soapbox/actions/groups.js index 7bff19076..3c6255216 100644 --- a/app/soapbox/actions/groups.js +++ b/app/soapbox/actions/groups.js @@ -1,5 +1,7 @@ import { isLoggedIn } from 'soapbox/utils/auth'; + import api, { getLinks } from '../api'; + import { fetchRelationships } from './accounts'; import { importFetchedAccounts } from './importer'; diff --git a/app/soapbox/actions/import_data.js b/app/soapbox/actions/import_data.js index b316df8bb..7bde21a4a 100644 --- a/app/soapbox/actions/import_data.js +++ b/app/soapbox/actions/import_data.js @@ -1,5 +1,7 @@ import { defineMessages } from 'react-intl'; + import snackbar from 'soapbox/actions/snackbar'; + import api from '../api'; export const IMPORT_FOLLOWS_REQUEST = 'IMPORT_FOLLOWS_REQUEST'; diff --git a/app/soapbox/actions/importer/index.js b/app/soapbox/actions/importer/index.js index ee4f1cfa7..407bb7c30 100644 --- a/app/soapbox/actions/importer/index.js +++ b/app/soapbox/actions/importer/index.js @@ -1,4 +1,5 @@ import { getSettings } from '../settings'; + import { normalizeAccount, normalizeStatus, diff --git a/app/soapbox/actions/importer/normalizer.js b/app/soapbox/actions/importer/normalizer.js index 922e57986..240abddcc 100644 --- a/app/soapbox/actions/importer/normalizer.js +++ b/app/soapbox/actions/importer/normalizer.js @@ -1,4 +1,5 @@ import escapeTextContentForBrowser from 'escape-html'; + import emojify from '../../features/emoji/emoji'; import { unescapeHTML } from '../../utils/html'; diff --git a/app/soapbox/actions/instance.js b/app/soapbox/actions/instance.js index e6cf6897d..85d8b2a3f 100644 --- a/app/soapbox/actions/instance.js +++ b/app/soapbox/actions/instance.js @@ -1,7 +1,9 @@ import { get } from 'lodash'; + import KVStore from 'soapbox/storage/kv_store'; import { getAuthUserUrl } from 'soapbox/utils/auth'; import { parseVersion } from 'soapbox/utils/features'; + import api from '../api'; export const INSTANCE_FETCH_REQUEST = 'INSTANCE_FETCH_REQUEST'; diff --git a/app/soapbox/actions/interactions.js b/app/soapbox/actions/interactions.js index 700166bc6..d7f27a96c 100644 --- a/app/soapbox/actions/interactions.js +++ b/app/soapbox/actions/interactions.js @@ -1,7 +1,10 @@ import { defineMessages } from 'react-intl'; + import snackbar from 'soapbox/actions/snackbar'; import { isLoggedIn } from 'soapbox/utils/auth'; + import api from '../api'; + import { importFetchedAccounts, importFetchedStatus } from './importer'; export const REBLOG_REQUEST = 'REBLOG_REQUEST'; diff --git a/app/soapbox/actions/lists.js b/app/soapbox/actions/lists.js index b01888884..6b39978d2 100644 --- a/app/soapbox/actions/lists.js +++ b/app/soapbox/actions/lists.js @@ -1,5 +1,7 @@ import { isLoggedIn } from 'soapbox/utils/auth'; + import api from '../api'; + import { showAlertForError } from './alerts'; import { importFetchedAccounts } from './importer'; diff --git a/app/soapbox/actions/me.js b/app/soapbox/actions/me.js index 0b92ae3be..e04001e4c 100644 --- a/app/soapbox/actions/me.js +++ b/app/soapbox/actions/me.js @@ -1,5 +1,7 @@ import { getAuthUserId, getAuthUserUrl } from 'soapbox/utils/auth'; + import api from '../api'; + import { loadCredentials } from './auth'; import { importFetchedAccount } from './importer'; diff --git a/app/soapbox/actions/media.js b/app/soapbox/actions/media.js index 87f2b0347..460c2f079 100644 --- a/app/soapbox/actions/media.js +++ b/app/soapbox/actions/media.js @@ -1,4 +1,5 @@ import { getFeatures } from 'soapbox/utils/features'; + import api from '../api'; const noOp = () => {}; diff --git a/app/soapbox/actions/moderation.js b/app/soapbox/actions/moderation.js index d27b5665c..7bad7e82d 100644 --- a/app/soapbox/actions/moderation.js +++ b/app/soapbox/actions/moderation.js @@ -1,5 +1,6 @@ import React from 'react'; import { defineMessages } from 'react-intl'; + import { fetchAccountByUsername } from 'soapbox/actions/accounts'; import { deactivateUsers, deleteUsers, deleteStatus, toggleStatusSensitivity } from 'soapbox/actions/admin'; import { openModal } from 'soapbox/actions/modal'; diff --git a/app/soapbox/actions/mrf.js b/app/soapbox/actions/mrf.js index d893ce6bd..39359e965 100644 --- a/app/soapbox/actions/mrf.js +++ b/app/soapbox/actions/mrf.js @@ -1,5 +1,7 @@ import { Set as ImmutableSet } from 'immutable'; + import ConfigDB from 'soapbox/utils/config_db'; + import { fetchConfig, updateConfig } from './admin'; const simplePolicyMerge = (simplePolicy, host, restrictions) => { diff --git a/app/soapbox/actions/mutes.js b/app/soapbox/actions/mutes.js index 23afba4f3..f7c2b6a11 100644 --- a/app/soapbox/actions/mutes.js +++ b/app/soapbox/actions/mutes.js @@ -1,6 +1,8 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import { getNextLinkName } from 'soapbox/utils/quirks'; + import api, { getLinks } from '../api'; + import { fetchRelationships } from './accounts'; import { importFetchedAccounts } from './importer'; import { openModal } from './modal'; diff --git a/app/soapbox/actions/notifications.js b/app/soapbox/actions/notifications.js index 85e3c96ce..08f9bb718 100644 --- a/app/soapbox/actions/notifications.js +++ b/app/soapbox/actions/notifications.js @@ -6,12 +6,15 @@ import { import IntlMessageFormat from 'intl-messageformat'; import 'intl-pluralrules'; import { defineMessages } from 'react-intl'; + import { isLoggedIn } from 'soapbox/utils/auth'; import { parseVersion, PLEROMA } from 'soapbox/utils/features'; import { joinPublicPath } from 'soapbox/utils/static'; + import api, { getLinks } from '../api'; import { getFilters, regexFromFilters } from '../selectors'; import { unescapeHTML } from '../utils/html'; + import { fetchRelationships } from './accounts'; import { importFetchedAccount, diff --git a/app/soapbox/actions/pin_statuses.js b/app/soapbox/actions/pin_statuses.js index d2a1c96ec..26194f553 100644 --- a/app/soapbox/actions/pin_statuses.js +++ b/app/soapbox/actions/pin_statuses.js @@ -1,5 +1,7 @@ import { isLoggedIn } from 'soapbox/utils/auth'; + import api from '../api'; + import { importFetchedStatuses } from './importer'; export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST'; diff --git a/app/soapbox/actions/polls.js b/app/soapbox/actions/polls.js index 8e8b82df5..a37410dc9 100644 --- a/app/soapbox/actions/polls.js +++ b/app/soapbox/actions/polls.js @@ -1,4 +1,5 @@ import api from '../api'; + import { importFetchedPoll } from './importer'; export const POLL_VOTE_REQUEST = 'POLL_VOTE_REQUEST'; diff --git a/app/soapbox/actions/preload.js b/app/soapbox/actions/preload.js index 9a3c8e9c6..d14c6f9fe 100644 --- a/app/soapbox/actions/preload.js +++ b/app/soapbox/actions/preload.js @@ -1,4 +1,5 @@ import { mapValues } from 'lodash'; + import { verifyCredentials } from './auth'; import { importFetchedAccounts } from './importer'; diff --git a/app/soapbox/actions/push_notifications/registerer.js b/app/soapbox/actions/push_notifications/registerer.js index af798e416..b4d86631e 100644 --- a/app/soapbox/actions/push_notifications/registerer.js +++ b/app/soapbox/actions/push_notifications/registerer.js @@ -1,7 +1,9 @@ import { createPushSubsription, updatePushSubscription } from 'soapbox/actions/push_subscriptions'; import { getVapidKey } from 'soapbox/utils/auth'; + import { pushNotificationsSetting } from '../../settings'; import { decode as decodeBase64 } from '../../utils/base64'; + import { setBrowserSupport, setSubscription, clearSubscription } from './setter'; // Taken from https://www.npmjs.com/package/web-push diff --git a/app/soapbox/actions/reports.js b/app/soapbox/actions/reports.js index 9d0d4e581..2db3bce31 100644 --- a/app/soapbox/actions/reports.js +++ b/app/soapbox/actions/reports.js @@ -1,4 +1,5 @@ import api from '../api'; + import { openModal, closeModal } from './modal'; export const REPORT_INIT = 'REPORT_INIT'; diff --git a/app/soapbox/actions/search.js b/app/soapbox/actions/search.js index 6764dc534..27cb4bdbd 100644 --- a/app/soapbox/actions/search.js +++ b/app/soapbox/actions/search.js @@ -1,4 +1,5 @@ import api from '../api'; + import { fetchRelationships } from './accounts'; import { importFetchedAccounts, importFetchedStatuses } from './importer'; diff --git a/app/soapbox/actions/security.js b/app/soapbox/actions/security.js index cb6833543..4cc957992 100644 --- a/app/soapbox/actions/security.js +++ b/app/soapbox/actions/security.js @@ -6,7 +6,9 @@ import snackbar from 'soapbox/actions/snackbar'; import { getLoggedInAccount } from 'soapbox/utils/auth'; + import api from '../api'; + import { AUTH_LOGGED_OUT, messages } from './auth'; export const FETCH_TOKENS_REQUEST = 'FETCH_TOKENS_REQUEST'; diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js index 3651d48e6..f7508807c 100644 --- a/app/soapbox/actions/settings.js +++ b/app/soapbox/actions/settings.js @@ -1,9 +1,12 @@ import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immutable'; import { debounce } from 'lodash'; import { createSelector } from 'reselect'; + import { patchMe } from 'soapbox/actions/me'; import { isLoggedIn } from 'soapbox/utils/auth'; + import uuid from '../uuid'; + import { showAlertForError } from './alerts'; export const SETTING_CHANGE = 'SETTING_CHANGE'; diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js index 225e8c280..d85bd0f0f 100644 --- a/app/soapbox/actions/soapbox.js +++ b/app/soapbox/actions/soapbox.js @@ -1,8 +1,10 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; import { createSelector } from 'reselect'; + import { getHost } from 'soapbox/actions/instance'; import KVStore from 'soapbox/storage/kv_store'; import { getFeatures } from 'soapbox/utils/features'; + import api, { staticClient } from '../api'; export const SOAPBOX_CONFIG_REQUEST_SUCCESS = 'SOAPBOX_CONFIG_REQUEST_SUCCESS'; diff --git a/app/soapbox/actions/statuses.js b/app/soapbox/actions/statuses.js index 25b65ec25..150b6d8c7 100644 --- a/app/soapbox/actions/statuses.js +++ b/app/soapbox/actions/statuses.js @@ -1,7 +1,9 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures } from 'soapbox/utils/features'; import { shouldHaveCard } from 'soapbox/utils/status'; + import api from '../api'; + import { importFetchedStatus, importFetchedStatuses } from './importer'; import { openModal } from './modal'; import { deleteFromTimelines } from './timelines'; diff --git a/app/soapbox/actions/streaming.js b/app/soapbox/actions/streaming.js index 2dd6d45e5..bd1ed00da 100644 --- a/app/soapbox/actions/streaming.js +++ b/app/soapbox/actions/streaming.js @@ -1,6 +1,8 @@ import { getSettings } from 'soapbox/actions/settings'; import messages from 'soapbox/locales/messages'; + import { connectStream } from '../stream'; + import { updateConversations } from './conversations'; import { fetchFilters } from './filters'; import { updateNotificationsQueue, expandNotifications } from './notifications'; diff --git a/app/soapbox/actions/suggestions.js b/app/soapbox/actions/suggestions.js index e2ca4df7b..d896e6e07 100644 --- a/app/soapbox/actions/suggestions.js +++ b/app/soapbox/actions/suggestions.js @@ -1,6 +1,8 @@ import { isLoggedIn } from 'soapbox/utils/auth'; import { getFeatures } from 'soapbox/utils/features'; + import api from '../api'; + import { fetchRelationships } from './accounts'; import { importFetchedAccounts } from './importer'; diff --git a/app/soapbox/actions/timelines.js b/app/soapbox/actions/timelines.js index 345e4783d..bef27b287 100644 --- a/app/soapbox/actions/timelines.js +++ b/app/soapbox/actions/timelines.js @@ -1,7 +1,10 @@ import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable'; + import { getSettings } from 'soapbox/actions/settings'; import { shouldFilter } from 'soapbox/utils/timelines'; + import api, { getLinks } from '../api'; + import { importFetchedStatus, importFetchedStatuses } from './importer'; export const TIMELINE_UPDATE = 'TIMELINE_UPDATE'; diff --git a/app/soapbox/api.js b/app/soapbox/api.js index 58e6f6657..13ee07186 100644 --- a/app/soapbox/api.js +++ b/app/soapbox/api.js @@ -8,6 +8,7 @@ import axios from 'axios'; import LinkHeader from 'http-link-header'; import { createSelector } from 'reselect'; + import { BACKEND_URL, FE_SUBDIRECTORY } from 'soapbox/build_config'; import { getAccessToken, getAppToken, parseBaseURL } from 'soapbox/utils/auth'; import { isURL } from 'soapbox/utils/auth'; diff --git a/app/soapbox/base_polyfills.js b/app/soapbox/base_polyfills.js index 60c546bf4..e4744fee3 100644 --- a/app/soapbox/base_polyfills.js +++ b/app/soapbox/base_polyfills.js @@ -7,6 +7,7 @@ import includes from 'array-includes'; import isNaN from 'is-nan'; import assign from 'object-assign'; import values from 'object.values'; + import { decode as decodeBase64 } from './utils/base64'; if (!Array.prototype.includes) { diff --git a/app/soapbox/components/__tests__/autosuggest_emoji-test.js b/app/soapbox/components/__tests__/autosuggest_emoji-test.js index 05616e444..9a2fb58e8 100644 --- a/app/soapbox/components/__tests__/autosuggest_emoji-test.js +++ b/app/soapbox/components/__tests__/autosuggest_emoji-test.js @@ -1,5 +1,6 @@ import React from 'react'; import renderer from 'react-test-renderer'; + import AutosuggestEmoji from '../autosuggest_emoji'; describe('', () => { diff --git a/app/soapbox/components/__tests__/avatar-test.js b/app/soapbox/components/__tests__/avatar-test.js index 6e43f30c7..3834dfbb5 100644 --- a/app/soapbox/components/__tests__/avatar-test.js +++ b/app/soapbox/components/__tests__/avatar-test.js @@ -1,6 +1,8 @@ import { fromJS } from 'immutable'; import React from 'react'; + import { createComponent } from 'soapbox/test_helpers'; + import Avatar from '../avatar'; describe('', () => { diff --git a/app/soapbox/components/__tests__/avatar_overlay-test.js b/app/soapbox/components/__tests__/avatar_overlay-test.js index 0e0d2039a..db4250c59 100644 --- a/app/soapbox/components/__tests__/avatar_overlay-test.js +++ b/app/soapbox/components/__tests__/avatar_overlay-test.js @@ -1,6 +1,8 @@ import { fromJS } from 'immutable'; import React from 'react'; + import { createComponent } from 'soapbox/test_helpers'; + import AvatarOverlay from '../avatar_overlay'; describe(' { diff --git a/app/soapbox/components/__tests__/badge-test.js b/app/soapbox/components/__tests__/badge-test.js index 5a42f0531..0b577dc18 100644 --- a/app/soapbox/components/__tests__/badge-test.js +++ b/app/soapbox/components/__tests__/badge-test.js @@ -1,5 +1,6 @@ import React from 'react'; import renderer from 'react-test-renderer'; + import Badge from '../badge'; describe('', () => { diff --git a/app/soapbox/components/__tests__/button-test.js b/app/soapbox/components/__tests__/button-test.js index 160cd3cbc..e1480fe6f 100644 --- a/app/soapbox/components/__tests__/button-test.js +++ b/app/soapbox/components/__tests__/button-test.js @@ -1,6 +1,7 @@ import { shallow } from 'enzyme'; import React from 'react'; import renderer from 'react-test-renderer'; + import Button from '../button'; describe('