D .editorconfig => .editorconfig +0 -13
@@ 1,13 0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
D .gitmodules => .gitmodules +0 -0
D .nanoignore => .nanoignore +0 -19
@@ 1,19 0,0 @@
-.DS_Store
-.git/
-.gitignore
-
-.bundle/
-.cache/
-config/deploy/*
-coverage
-docs/
-.env
-log/*.log
-neo4j/
-node_modules/
-public/assets/
-public/system/
-spec/
-tmp/
-.vagrant/
-vendor/bundle/
D .rubocop.yml => .rubocop.yml +0 -197
@@ 1,197 0,0 @@
-# Can be removed once all rules are addressed or moved to this file as documented overrides
-inherit_from: .rubocop_todo.yml
-
-# Used for merging with exclude lists with .rubocop_todo.yml
-inherit_mode:
- merge:
- - Exclude
-
-require:
- - rubocop-rails
- - rubocop-rspec
- - rubocop-performance
- - rubocop-capybara
- - ./lib/linter/rubocop_middle_dot
-
-AllCops:
- TargetRubyVersion: 3.0 # Set to minimum supported version of CI
- DisplayCopNames: true
- DisplayStyleGuide: true
- ExtraDetails: true
- UseCache: true
- CacheRootDirectory: tmp
- NewCops: enable # Opt-in to newly added rules
- Exclude:
- - db/schema.rb
- - 'bin/*'
- - 'node_modules/**/*'
- - 'Vagrantfile'
- - 'vendor/**/*'
- - 'lib/json_ld/*' # Generated files
- - 'lib/mastodon/migration_helpers.rb' # Vendored from GitLab
- - 'lib/templates/**/*'
-
-# Reason: Prefer Hashes without extreme indentation
-# https://docs.rubocop.org/rubocop/cops_layout.html#layoutfirsthashelementindentation
-Layout/FirstHashElementIndentation:
- EnforcedStyle: consistent
-
-# Reason: Currently disabled in .rubocop_todo.yml
-# https://docs.rubocop.org/rubocop/cops_layout.html#layoutlinelength
-Layout/LineLength:
- Max: 320 # Default of 120 causes a duplicate entry in generated todo file
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_lint.html#lintuselessaccessmodifier
-Lint/UselessAccessModifier:
- ContextCreatingMethods:
- - class_methods
-
-## Disable most Metrics/*Length cops
-# Reason: those are often triggered and force significant refactors when this happend
-# but the team feel they are not really improving the code quality.
-
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsblocklength
-Metrics/BlockLength:
- Enabled: false
-
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsclasslength
-Metrics/ClassLength:
- Enabled: false
-
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsmethodlength
-Metrics/MethodLength:
- Enabled: false
-
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsmodulelength
-Metrics/ModuleLength:
- Enabled: false
-
-## End Disable Metrics/*Length cops
-
-# Reason: Currently disabled in .rubocop_todo.yml
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsabcsize
-Metrics/AbcSize:
- Exclude:
- - 'lib/mastodon/cli/*.rb'
- - db/*migrate/**/*
-
-# Reason: Currently disabled in .rubocop_todo.yml
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricscyclomaticcomplexity
-Metrics/CyclomaticComplexity:
- Exclude:
- - lib/mastodon/cli/*.rb
- - db/*migrate/**/*
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_metrics.html#metricsparameterlists
-Metrics/ParameterLists:
- CountKeywordArgs: false
-
-# Reason: Prevailing style is argument file paths
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsfilepath
-Rails/FilePath:
- EnforcedStyle: arguments
-
-# Reason: Prevailing style uses numeric status codes, matches RSpec/Rails/HttpStatus
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railshttpstatus
-Rails/HttpStatus:
- EnforcedStyle: numeric
-
-# Reason: Allowed in `tootctl` CLI code and in boot ENV checker
-# https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsexit
-Rails/Exit:
- Exclude:
- - 'config/boot.rb'
- - 'lib/mastodon/cli/*.rb'
-
-# Reason: Some single letter camel case files shouldn't be split
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecfilepath
-RSpec/FilePath:
- CustomTransform:
- ActivityPub: activitypub # Ignore the snake_case due to the amount of files to rename
- DeepL: deepl
- FetchOEmbedService: fetch_oembed_service
- JsonLdHelper: jsonld_helper
- OEmbedController: oembed_controller
- OStatus: ostatus
- NodeInfoController: nodeinfo_controller # NodeInfo isn't snake_cased for any of the instances
- Exclude:
- - 'spec/config/initializers/rack_attack_spec.rb' # namespaces usually have separate folder
- - 'spec/lib/sanitize_config_spec.rb' # namespaces usually have separate folder
-
-# Reason:
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecnamedsubject
-RSpec/NamedSubject:
- EnforcedStyle: named_only
-
-# Reason: Prevailing style choice
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec.html#rspecnottonot
-RSpec/NotToNot:
- EnforcedStyle: to_not
-
-# Reason: Prevailing style uses numeric status codes, matches Rails/HttpStatus
-# https://docs.rubocop.org/rubocop-rspec/cops_rspec_rails.html#rspecrailshttpstatus
-RSpec/Rails/HttpStatus:
- EnforcedStyle: numeric
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#styleclassandmodulechildren
-Style/ClassAndModuleChildren:
- Enabled: false
-
-# Reason: Classes mostly self-document with their names
-# https://docs.rubocop.org/rubocop/cops_style.html#styledocumentation
-Style/Documentation:
- Enabled: false
-
-# Reason: Enforce modern Ruby style
-# https://docs.rubocop.org/rubocop/cops_style.html#stylehashsyntax
-Style/HashSyntax:
- EnforcedStyle: ruby19_no_mixed_keys
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#stylenumericliterals
-Style/NumericLiterals:
- AllowedPatterns:
- - \d{4}_\d{2}_\d{2}_\d{6} # For DB migration date version number readability
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#stylepercentliteraldelimiters
-Style/PercentLiteralDelimiters:
- PreferredDelimiters:
- '%i': '()'
- '%w': '()'
-
-# Reason: Prefer less indentation in conditional assignments
-# https://docs.rubocop.org/rubocop/cops_style.html#styleredundantbegin
-Style/RedundantBegin:
- Enabled: false
-
-# Reason: Overridden to reduce implicit StandardError rescues
-# https://docs.rubocop.org/rubocop/cops_style.html#stylerescuestandarderror
-Style/RescueStandardError:
- EnforcedStyle: implicit
-
-# Reason: Simplify some spec layouts
-# https://docs.rubocop.org/rubocop/cops_style.html#stylesemicolon
-Style/Semicolon:
- AllowAsExpressionSeparator: true
-
-# Reason: Originally disabled for CodeClimate, and no config consensus has been found
-# https://docs.rubocop.org/rubocop/cops_style.html#stylesymbolarray
-Style/SymbolArray:
- Enabled: false
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#styletrailingcommainarrayliteral
-Style/TrailingCommaInArrayLiteral:
- EnforcedStyleForMultiline: 'comma'
-
-# Reason:
-# https://docs.rubocop.org/rubocop/cops_style.html#styletrailingcommainhashliteral
-Style/TrailingCommaInHashLiteral:
- EnforcedStyleForMultiline: 'comma'
-
-Style/MiddleDot:
- Enabled: true
D .rubocop_todo.yml => .rubocop_todo.yml +0 -810
@@ 1,810 0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.56.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
- Exclude:
- - 'Gemfile'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
-# URISchemes: http, https
-Layout/LineLength:
- Exclude:
- - 'app/models/account.rb'
-
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
- Exclude:
- - 'spec/controllers/api/v2/search_controller_spec.rb'
- - 'spec/fabricators/access_token_fabricator.rb'
- - 'spec/fabricators/conversation_fabricator.rb'
- - 'spec/fabricators/system_key_fabricator.rb'
- - 'spec/lib/activitypub/adapter_spec.rb'
- - 'spec/models/user_role_spec.rb'
-
-Lint/NonLocalExitFromIterator:
- Exclude:
- - 'app/helpers/jsonld_helper.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Lint/OrAssignmentToConstant:
- Exclude:
- - 'lib/sanitize_ext/sanitize_config.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
- Exclude:
- - 'config/initializers/content_security_policy.rb'
- - 'config/initializers/doorkeeper.rb'
- - 'config/initializers/paperclip.rb'
- - 'config/initializers/simple_form.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Lint/UselessAssignment:
- Exclude:
- - 'app/services/activitypub/process_status_update_service.rb'
- - 'config/initializers/3_omniauth.rb'
- - 'db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb'
- - 'db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb'
- - 'spec/controllers/api/v1/favourites_controller_spec.rb'
- - 'spec/controllers/concerns/account_controller_concern_spec.rb'
- - 'spec/helpers/jsonld_helper_spec.rb'
- - 'spec/models/account_spec.rb'
- - 'spec/models/domain_block_spec.rb'
- - 'spec/models/status_spec.rb'
- - 'spec/models/user_spec.rb'
- - 'spec/models/webauthn_credentials_spec.rb'
- - 'spec/services/account_search_service_spec.rb'
- - 'spec/services/post_status_service_spec.rb'
- - 'spec/services/precompute_feed_service_spec.rb'
- - 'spec/services/resolve_url_service_spec.rb'
- - 'spec/views/statuses/show.html.haml_spec.rb'
-
-# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
-Metrics/AbcSize:
- Max: 144
- Exclude:
- - 'app/serializers/initial_state_serializer.rb'
-
-# Configuration parameters: CountBlocks, Max.
-Metrics/BlockNesting:
- Exclude:
- - 'lib/tasks/mastodon.rake'
-
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/CyclomaticComplexity:
- Max: 25
-
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/PerceivedComplexity:
- Max: 27
-
-# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
-# SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
-Naming/VariableNumber:
- Exclude:
- - 'db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb'
- - 'db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb'
- - 'db/migrate/20190820003045_update_statuses_index.rb'
- - 'db/migrate/20190823221802_add_local_index_to_statuses.rb'
- - 'db/migrate/20200119112504_add_public_index_to_statuses.rb'
- - 'spec/models/account_spec.rb'
- - 'spec/models/domain_block_spec.rb'
- - 'spec/models/user_spec.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SafeMultiline.
-Performance/DeletePrefix:
- Exclude:
- - 'app/models/featured_tag.rb'
-
-Performance/MapMethodChain:
- Exclude:
- - 'app/models/feed.rb'
- - 'lib/mastodon/cli/maintenance.rb'
- - 'spec/services/bulk_import_service_spec.rb'
- - 'spec/services/import_service_spec.rb'
-
-RSpec/AnyInstance:
- Exclude:
- - 'spec/controllers/activitypub/inboxes_controller_spec.rb'
- - 'spec/controllers/admin/accounts_controller_spec.rb'
- - 'spec/controllers/admin/resets_controller_spec.rb'
- - 'spec/controllers/admin/settings/branding_controller_spec.rb'
- - 'spec/controllers/api/v1/media_controller_spec.rb'
- - 'spec/controllers/auth/sessions_controller_spec.rb'
- - 'spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb'
- - 'spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb'
- - 'spec/lib/request_spec.rb'
- - 'spec/lib/status_filter_spec.rb'
- - 'spec/models/account_spec.rb'
- - 'spec/models/setting_spec.rb'
- - 'spec/services/activitypub/process_collection_service_spec.rb'
- - 'spec/validators/follow_limit_validator_spec.rb'
- - 'spec/workers/activitypub/delivery_worker_spec.rb'
- - 'spec/workers/web/push_notification_worker_spec.rb'
-
-# Configuration parameters: CountAsOne.
-RSpec/ExampleLength:
- Max: 22
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, each, example
-RSpec/HookArgument:
- Exclude:
- - 'spec/controllers/api/v1/streaming_controller_spec.rb'
- - 'spec/controllers/well_known/webfinger_controller_spec.rb'
- - 'spec/helpers/instance_helper_spec.rb'
- - 'spec/models/user_spec.rb'
- - 'spec/rails_helper.rb'
- - 'spec/serializers/activitypub/note_serializer_spec.rb'
- - 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
- - 'spec/services/import_service_spec.rb'
-
-# Configuration parameters: AssignmentOnly.
-RSpec/InstanceVariable:
- Exclude:
- - 'spec/controllers/api/v1/streaming_controller_spec.rb'
- - 'spec/controllers/auth/confirmations_controller_spec.rb'
- - 'spec/controllers/auth/passwords_controller_spec.rb'
- - 'spec/controllers/auth/sessions_controller_spec.rb'
- - 'spec/controllers/concerns/export_controller_concern_spec.rb'
- - 'spec/controllers/home_controller_spec.rb'
- - 'spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb'
- - 'spec/controllers/statuses_cleanup_controller_spec.rb'
- - 'spec/models/concerns/account_finder_concern_spec.rb'
- - 'spec/models/concerns/account_interactions_spec.rb'
- - 'spec/models/public_feed_spec.rb'
- - 'spec/serializers/activitypub/note_serializer_spec.rb'
- - 'spec/serializers/activitypub/update_poll_serializer_spec.rb'
- - 'spec/services/remove_status_service_spec.rb'
- - 'spec/services/search_service_spec.rb'
- - 'spec/services/unblock_domain_service_spec.rb'
-
-RSpec/LetSetup:
- Exclude:
- - 'spec/controllers/admin/accounts_controller_spec.rb'
- - 'spec/controllers/admin/action_logs_controller_spec.rb'
- - 'spec/controllers/admin/instances_controller_spec.rb'
- - 'spec/controllers/admin/reports/actions_controller_spec.rb'
- - 'spec/controllers/admin/statuses_controller_spec.rb'
- - 'spec/controllers/api/v1/accounts/statuses_controller_spec.rb'
- - 'spec/controllers/api/v1/admin/accounts_controller_spec.rb'
- - 'spec/controllers/api/v1/filters_controller_spec.rb'
- - 'spec/controllers/api/v1/followed_tags_controller_spec.rb'
- - 'spec/controllers/api/v2/admin/accounts_controller_spec.rb'
- - 'spec/controllers/api/v2/filters/keywords_controller_spec.rb'
- - 'spec/controllers/api/v2/filters/statuses_controller_spec.rb'
- - 'spec/controllers/auth/confirmations_controller_spec.rb'
- - 'spec/controllers/auth/passwords_controller_spec.rb'
- - 'spec/controllers/auth/sessions_controller_spec.rb'
- - 'spec/controllers/follower_accounts_controller_spec.rb'
- - 'spec/controllers/following_accounts_controller_spec.rb'
- - 'spec/controllers/oauth/authorized_applications_controller_spec.rb'
- - 'spec/controllers/oauth/tokens_controller_spec.rb'
- - 'spec/controllers/settings/imports_controller_spec.rb'
- - 'spec/lib/activitypub/activity/delete_spec.rb'
- - 'spec/lib/vacuum/applications_vacuum_spec.rb'
- - 'spec/lib/vacuum/preview_cards_vacuum_spec.rb'
- - 'spec/models/account_spec.rb'
- - 'spec/models/account_statuses_cleanup_policy_spec.rb'
- - 'spec/models/canonical_email_block_spec.rb'
- - 'spec/models/status_spec.rb'
- - 'spec/models/user_spec.rb'
- - 'spec/services/account_statuses_cleanup_service_spec.rb'
- - 'spec/services/activitypub/fetch_featured_collection_service_spec.rb'
- - 'spec/services/activitypub/fetch_remote_status_service_spec.rb'
- - 'spec/services/activitypub/process_account_service_spec.rb'
- - 'spec/services/activitypub/process_collection_service_spec.rb'
- - 'spec/services/batched_remove_status_service_spec.rb'
- - 'spec/services/block_domain_service_spec.rb'
- - 'spec/services/bulk_import_service_spec.rb'
- - 'spec/services/delete_account_service_spec.rb'
- - 'spec/services/import_service_spec.rb'
- - 'spec/services/notify_service_spec.rb'
- - 'spec/services/remove_status_service_spec.rb'
- - 'spec/services/report_service_spec.rb'
- - 'spec/services/resolve_account_service_spec.rb'
- - 'spec/services/suspend_account_service_spec.rb'
- - 'spec/services/unallow_domain_service_spec.rb'
- - 'spec/services/unsuspend_account_service_spec.rb'
- - 'spec/workers/scheduler/user_cleanup_scheduler_spec.rb'
-
-RSpec/MessageChain:
- Exclude:
- - 'spec/controllers/api/v1/media_controller_spec.rb'
- - 'spec/models/concerns/remotable_spec.rb'
- - 'spec/models/session_activation_spec.rb'
- - 'spec/models/setting_spec.rb'
-
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: have_received, receive
-RSpec/MessageSpies:
- Exclude:
- - 'spec/controllers/admin/accounts_controller_spec.rb'
- - 'spec/helpers/admin/account_moderation_notes_helper_spec.rb'
- - 'spec/lib/webfinger_resource_spec.rb'
- - 'spec/models/admin/account_action_spec.rb'
- - 'spec/models/concerns/remotable_spec.rb'
- - 'spec/models/follow_request_spec.rb'
- - 'spec/models/identity_spec.rb'
- - 'spec/models/session_activation_spec.rb'
- - 'spec/models/setting_spec.rb'
- - 'spec/services/activitypub/fetch_replies_service_spec.rb'
- - 'spec/services/activitypub/process_collection_service_spec.rb'
- - 'spec/spec_helper.rb'
- - 'spec/validators/status_length_validator_spec.rb'
-
-RSpec/MultipleExpectations:
- Max: 8
-
-# Configuration parameters: AllowSubject.
-RSpec/MultipleMemoizedHelpers:
- Max: 21
-
-# Configuration parameters: AllowedGroups.
-RSpec/NestedGroups:
- Max: 6
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/ApplicationController:
- Exclude:
- - 'app/controllers/health_controller.rb'
-
-# Configuration parameters: Include.
-# Include: db/**/*.rb
-Rails/CreateTableWithTimestamps:
- Exclude:
- - 'db/migrate/20170508230434_create_conversation_mutes.rb'
- - 'db/migrate/20170823162448_create_status_pins.rb'
- - 'db/migrate/20171116161857_create_list_accounts.rb'
- - 'db/migrate/20180929222014_create_account_conversations.rb'
- - 'db/migrate/20181007025445_create_pghero_space_stats.rb'
- - 'db/migrate/20190103124649_create_scheduled_statuses.rb'
- - 'db/migrate/20220824233535_create_status_trends.rb'
- - 'db/migrate/20221006061337_create_preview_card_trends.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Severity.
-Rails/DuplicateAssociation:
- Exclude:
- - 'app/serializers/activitypub/collection_serializer.rb'
- - 'app/serializers/activitypub/note_serializer.rb'
-
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/HasAndBelongsToMany:
- Exclude:
- - 'app/models/concerns/account_associations.rb'
- - 'app/models/preview_card.rb'
- - 'app/models/status.rb'
- - 'app/models/tag.rb'
-
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/HasManyOrHasOneDependent:
- Exclude:
- - 'app/models/concerns/account_counters.rb'
- - 'app/models/conversation.rb'
- - 'app/models/custom_emoji.rb'
- - 'app/models/custom_emoji_category.rb'
- - 'app/models/domain_block.rb'
- - 'app/models/invite.rb'
- - 'app/models/status.rb'
- - 'app/models/user.rb'
- - 'app/models/web/push_subscription.rb'
-
-Rails/I18nLocaleTexts:
- Exclude:
- - 'lib/tasks/mastodon.rake'
- - 'spec/helpers/flashes_helper_spec.rb'
-
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
-Rails/LexicallyScopedActionFilter:
- Exclude:
- - 'app/controllers/auth/passwords_controller.rb'
- - 'app/controllers/auth/registrations_controller.rb'
- - 'app/controllers/auth/sessions_controller.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Rails/NegateInclude:
- Exclude:
- - 'app/controllers/concerns/signature_verification.rb'
- - 'app/helpers/jsonld_helper.rb'
- - 'app/lib/activitypub/activity/create.rb'
- - 'app/lib/activitypub/activity/move.rb'
- - 'app/lib/feed_manager.rb'
- - 'app/lib/link_details_extractor.rb'
- - 'app/models/concerns/attachmentable.rb'
- - 'app/models/concerns/remotable.rb'
- - 'app/models/custom_filter.rb'
- - 'app/services/activitypub/process_status_update_service.rb'
- - 'app/services/fetch_link_card_service.rb'
- - 'app/services/search_service.rb'
- - 'app/workers/web/push_notification_worker.rb'
- - 'lib/paperclip/color_extractor.rb'
-
-Rails/OutputSafety:
- Exclude:
- - 'config/initializers/simple_form.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
-Rails/RakeEnvironment:
- Exclude:
- - 'lib/tasks/auto_annotate_models.rake'
- - 'lib/tasks/db.rake'
- - 'lib/tasks/emojis.rake'
- - 'lib/tasks/mastodon.rake'
- - 'lib/tasks/repo.rake'
- - 'lib/tasks/statistics.rake'
-
-# Configuration parameters: Include.
-# Include: db/**/*.rb
-Rails/ReversibleMigration:
- Exclude:
- - 'db/migrate/20160223164502_make_uris_nullable_in_statuses.rb'
- - 'db/migrate/20161122163057_remove_unneeded_indexes.rb'
- - 'db/migrate/20170205175257_remove_devices.rb'
- - 'db/migrate/20170322143850_change_primary_key_to_bigint_on_statuses.rb'
- - 'db/migrate/20170520145338_change_language_filter_to_opt_out.rb'
- - 'db/migrate/20170609145826_remove_default_language_from_statuses.rb'
- - 'db/migrate/20170711225116_fix_null_booleans.rb'
- - 'db/migrate/20171129172043_add_index_on_stream_entries.rb'
- - 'db/migrate/20171212195226_remove_duplicate_indexes_in_lists.rb'
- - 'db/migrate/20171226094803_more_faster_index_on_notifications.rb'
- - 'db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb'
- - 'db/migrate/20180617162849_remove_unused_indexes.rb'
- - 'db/migrate/20220827195229_change_canonical_email_blocks_nullable.rb'
-
-# Configuration parameters: ForbiddenMethods, AllowedMethods.
-# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
-Rails/SkipsModelValidations:
- Exclude:
- - 'app/controllers/admin/invites_controller.rb'
- - 'app/controllers/concerns/session_tracking_concern.rb'
- - 'app/models/concerns/account_merging.rb'
- - 'app/models/concerns/expireable.rb'
- - 'app/models/status.rb'
- - 'app/models/trends/links.rb'
- - 'app/models/trends/preview_card_batch.rb'
- - 'app/models/trends/preview_card_provider_batch.rb'
- - 'app/models/trends/status_batch.rb'
- - 'app/models/trends/statuses.rb'
- - 'app/models/trends/tag_batch.rb'
- - 'app/models/trends/tags.rb'
- - 'app/models/user.rb'
- - 'app/services/activitypub/process_status_update_service.rb'
- - 'app/services/approve_appeal_service.rb'
- - 'app/services/block_domain_service.rb'
- - 'app/services/delete_account_service.rb'
- - 'app/services/process_mentions_service.rb'
- - 'app/services/unallow_domain_service.rb'
- - 'app/services/unblock_domain_service.rb'
- - 'app/services/update_status_service.rb'
- - 'app/workers/activitypub/post_upgrade_worker.rb'
- - 'app/workers/move_worker.rb'
- - 'app/workers/scheduler/ip_cleanup_scheduler.rb'
- - 'app/workers/scheduler/scheduled_statuses_scheduler.rb'
- - 'db/migrate/20161203164520_add_from_account_id_to_notifications.rb'
- - 'db/migrate/20170105224407_add_shortcode_to_media_attachments.rb'
- - 'db/migrate/20170209184350_add_reply_to_statuses.rb'
- - 'db/migrate/20170304202101_add_type_to_media_attachments.rb'
- - 'db/migrate/20180528141303_fix_accounts_unique_index.rb'
- - 'db/migrate/20180609104432_migrate_web_push_subscriptions2.rb'
- - 'db/migrate/20181207011115_downcase_custom_emoji_domains.rb'
- - 'db/migrate/20190511134027_add_silenced_at_suspended_at_to_accounts.rb'
- - 'db/migrate/20191007013357_update_pt_locales.rb'
- - 'db/migrate/20220316233212_update_kurdish_locales.rb'
- - 'db/post_migrate/20190511152737_remove_suspended_silenced_account_fields.rb'
- - 'db/post_migrate/20200917193528_migrate_notifications_type.rb'
- - 'db/post_migrate/20201017234926_fill_account_suspension_origin.rb'
- - 'db/post_migrate/20220617202502_migrate_roles.rb'
- - 'db/post_migrate/20221101190723_backfill_admin_action_logs.rb'
- - 'db/post_migrate/20221206114142_backfill_admin_action_logs_again.rb'
- - 'lib/mastodon/cli/accounts.rb'
- - 'lib/mastodon/cli/main.rb'
- - 'lib/mastodon/cli/maintenance.rb'
- - 'spec/controllers/api/v1/admin/accounts_controller_spec.rb'
- - 'spec/lib/activitypub/activity/follow_spec.rb'
- - 'spec/services/follow_service_spec.rb'
- - 'spec/services/update_account_service_spec.rb'
-
-# Configuration parameters: Include.
-# Include: db/**/*.rb
-Rails/ThreeStateBooleanColumn:
- Exclude:
- - 'db/migrate/20160325130944_add_admin_to_users.rb'
- - 'db/migrate/20161123093447_add_sensitive_to_statuses.rb'
- - 'db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb'
- - 'db/migrate/20170127165745_add_devise_two_factor_to_users.rb'
- - 'db/migrate/20170209184350_add_reply_to_statuses.rb'
- - 'db/migrate/20170330163835_create_imports.rb'
- - 'db/migrate/20170905165803_add_local_to_statuses.rb'
- - 'db/migrate/20171210213213_add_local_only_flag_to_statuses.rb'
- - 'db/migrate/20181203021853_add_discoverable_to_accounts.rb'
- - 'db/migrate/20190509164208_add_by_moderator_to_tombstone.rb'
- - 'db/migrate/20190805123746_add_capabilities_to_tags.rb'
- - 'db/migrate/20191212163405_add_hide_collections_to_accounts.rb'
- - 'db/migrate/20200309150742_add_forwarded_to_reports.rb'
- - 'db/migrate/20210609202149_create_login_activities.rb'
- - 'db/migrate/20210621221010_add_skip_sign_in_token_to_users.rb'
- - 'db/migrate/20211031031021_create_preview_card_providers.rb'
- - 'db/migrate/20211115032527_add_trendable_to_preview_cards.rb'
- - 'db/migrate/20220202200743_add_trendable_to_accounts.rb'
- - 'db/migrate/20220202200926_add_trendable_to_statuses.rb'
- - 'db/migrate/20220303000827_add_ordered_media_attachment_ids_to_status_edits.rb'
-
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/UniqueValidationWithoutIndex:
- Exclude:
- - 'app/models/account_alias.rb'
- - 'app/models/custom_filter_status.rb'
- - 'app/models/identity.rb'
- - 'app/models/webauthn_credential.rb'
-
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
-Rails/UnusedIgnoredColumns:
- Exclude:
- - 'app/models/account.rb'
- - 'app/models/account_stat.rb'
- - 'app/models/admin/action_log.rb'
- - 'app/models/custom_filter.rb'
- - 'app/models/email_domain_block.rb'
- - 'app/models/report.rb'
- - 'app/models/status_edit.rb'
- - 'app/models/user.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: exists, where
-Rails/WhereExists:
- Exclude:
- - 'app/controllers/activitypub/inboxes_controller.rb'
- - 'app/controllers/admin/email_domain_blocks_controller.rb'
- - 'app/controllers/auth/registrations_controller.rb'
- - 'app/lib/activitypub/activity/create.rb'
- - 'app/lib/delivery_failure_tracker.rb'
- - 'app/lib/feed_manager.rb'
- - 'app/lib/status_cache_hydrator.rb'
- - 'app/lib/suspicious_sign_in_detector.rb'
- - 'app/models/concerns/account_interactions.rb'
- - 'app/models/featured_tag.rb'
- - 'app/models/poll.rb'
- - 'app/models/session_activation.rb'
- - 'app/models/status.rb'
- - 'app/models/user.rb'
- - 'app/policies/status_policy.rb'
- - 'app/serializers/rest/announcement_serializer.rb'
- - 'app/serializers/rest/tag_serializer.rb'
- - 'app/services/activitypub/fetch_remote_status_service.rb'
- - 'app/services/app_sign_up_service.rb'
- - 'app/services/vote_service.rb'
- - 'app/validators/reaction_validator.rb'
- - 'app/validators/vote_validator.rb'
- - 'app/workers/move_worker.rb'
- - 'db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb'
- - 'lib/tasks/tests.rake'
- - 'spec/models/account_spec.rb'
- - 'spec/services/activitypub/process_collection_service_spec.rb'
- - 'spec/services/purge_domain_service_spec.rb'
- - 'spec/services/unallow_domain_service_spec.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowOnConstant, AllowOnSelfClass.
-Style/CaseEquality:
- Exclude:
- - 'config/initializers/trusted_proxies.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-# AllowedMethods: ==, equal?, eql?
-Style/ClassEqualityComparison:
- Exclude:
- - 'app/helpers/jsonld_helper.rb'
- - 'app/serializers/activitypub/outbox_serializer.rb'
-
-Style/ClassVars:
- Exclude:
- - 'config/initializers/devise.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/CombinableLoops:
- Exclude:
- - 'app/models/form/custom_emoji_batch.rb'
- - 'app/models/form/ip_block_batch.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedVars.
-Style/FetchEnvVar:
- Exclude:
- - 'app/lib/redis_configuration.rb'
- - 'app/lib/translation_service.rb'
- - 'config/environments/development.rb'
- - 'config/environments/production.rb'
- - 'config/initializers/2_limited_federation_mode.rb'
- - 'config/initializers/3_omniauth.rb'
- - 'config/initializers/blacklists.rb'
- - 'config/initializers/cache_buster.rb'
- - 'config/initializers/content_security_policy.rb'
- - 'config/initializers/devise.rb'
- - 'config/initializers/paperclip.rb'
- - 'config/initializers/vapid.rb'
- - 'lib/mastodon/premailer_webpack_strategy.rb'
- - 'lib/mastodon/redis_config.rb'
- - 'lib/tasks/repo.rake'
- - 'spec/features/profile_spec.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
-# SupportedStyles: annotated, template, unannotated
-# AllowedMethods: redirect
-Style/FormatStringToken:
- Exclude:
- - 'app/models/privacy_policy.rb'
- - 'config/initializers/devise.rb'
- - 'lib/paperclip/color_extractor.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
- Exclude:
- - 'config/boot.rb'
- - 'config/environments/development.rb'
- - 'config/environments/production.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
- Exclude:
- - 'app/controllers/admin/confirmations_controller.rb'
- - 'app/controllers/auth/confirmations_controller.rb'
- - 'app/controllers/auth/passwords_controller.rb'
- - 'app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb'
- - 'app/lib/activitypub/activity/block.rb'
- - 'app/lib/request.rb'
- - 'app/lib/request_pool.rb'
- - 'app/lib/webfinger.rb'
- - 'app/lib/webfinger_resource.rb'
- - 'app/models/concerns/account_counters.rb'
- - 'app/models/concerns/ldap_authenticable.rb'
- - 'app/models/tag.rb'
- - 'app/models/user.rb'
- - 'app/services/fan_out_on_write_service.rb'
- - 'app/services/post_status_service.rb'
- - 'app/services/process_hashtags_service.rb'
- - 'app/workers/move_worker.rb'
- - 'app/workers/redownload_avatar_worker.rb'
- - 'app/workers/redownload_header_worker.rb'
- - 'app/workers/redownload_media_worker.rb'
- - 'app/workers/remote_account_refresh_worker.rb'
- - 'config/initializers/devise.rb'
- - 'db/migrate/20170901141119_truncate_preview_cards.rb'
- - 'db/post_migrate/20220704024901_migrate_settings_to_user_roles.rb'
- - 'lib/devise/two_factor_ldap_authenticatable.rb'
- - 'lib/devise/two_factor_pam_authenticatable.rb'
- - 'lib/mastodon/cli/accounts.rb'
- - 'lib/mastodon/cli/maintenance.rb'
- - 'lib/mastodon/cli/media.rb'
- - 'lib/paperclip/attachment_extensions.rb'
- - 'lib/tasks/repo.rake'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces
-Style/HashAsLastArrayItem:
- Exclude:
- - 'app/controllers/admin/statuses_controller.rb'
- - 'app/controllers/api/v1/statuses_controller.rb'
- - 'app/models/concerns/account_counters.rb'
- - 'app/models/concerns/status_threading_concern.rb'
- - 'app/models/status.rb'
- - 'app/services/batched_remove_status_service.rb'
- - 'app/services/notify_service.rb'
- - 'db/migrate/20181024224956_migrate_account_conversations.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/HashTransformValues:
- Exclude:
- - 'app/serializers/rest/web_push_subscription_serializer.rb'
- - 'app/services/import_service.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
- Exclude:
- - 'config/environments/production.rb'
- - 'config/initializers/devise.rb'
- - 'config/initializers/ffmpeg.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: InverseMethods, InverseBlocks.
-Style/InverseMethods:
- Exclude:
- - 'app/models/custom_filter.rb'
- - 'app/services/update_account_service.rb'
- - 'spec/controllers/activitypub/replies_controller_spec.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: line_count_dependent, lambda, literal
-Style/Lambda:
- Exclude:
- - 'config/initializers/simple_form.rb'
- - 'config/routes.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/MapToHash:
- Exclude:
- - 'app/models/status.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
- Exclude:
- - 'app/models/tag.rb'
- - 'app/services/delete_account_service.rb'
- - 'lib/mastodon/migration_warning.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-Style/NilLambda:
- Exclude:
- - 'config/initializers/paperclip.rb'
-
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: respond_to_missing?
-Style/OptionalBooleanParameter:
- Exclude:
- - 'app/helpers/admin/account_moderation_notes_helper.rb'
- - 'app/helpers/jsonld_helper.rb'
- - 'app/lib/admin/system_check/message.rb'
- - 'app/lib/request.rb'
- - 'app/lib/webfinger.rb'
- - 'app/services/block_domain_service.rb'
- - 'app/services/fetch_resource_service.rb'
- - 'app/workers/domain_block_worker.rb'
- - 'app/workers/unfollow_follow_worker.rb'
- - 'lib/mastodon/redis_config.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
- Exclude:
- - 'config/deploy.rb'
- - 'config/initializers/doorkeeper.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: short, verbose
-Style/PreferredHashMethods:
- Exclude:
- - 'config/initializers/paperclip.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantConstantBase:
- Exclude:
- - 'config/environments/production.rb'
- - 'config/initializers/sidekiq.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: SafeForConstants.
-Style/RedundantFetchBlock:
- Exclude:
- - 'config/initializers/1_hosts.rb'
- - 'config/initializers/chewy.rb'
- - 'config/initializers/devise.rb'
- - 'config/initializers/paperclip.rb'
- - 'config/puma.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
- Exclude:
- - 'app/controllers/api/v1/directories_controller.rb'
- - 'app/controllers/auth/confirmations_controller.rb'
- - 'app/lib/ostatus/tag_manager.rb'
- - 'app/models/form/import.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
- Exclude:
- - 'app/models/concerns/account_finder_concern.rb'
- - 'app/models/status.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: only_raise, only_fail, semantic
-Style/SignalException:
- Exclude:
- - 'lib/devise/two_factor_ldap_authenticatable.rb'
- - 'lib/devise/two_factor_pam_authenticatable.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/SingleArgumentDig:
- Exclude:
- - 'lib/webpacker/manifest_extensions.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: require_parentheses, require_no_parentheses
-Style/StabbyLambdaParentheses:
- Exclude:
- - 'config/environments/production.rb'
- - 'config/initializers/content_security_policy.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-Style/StderrPuts:
- Exclude:
- - 'config/boot.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
- Exclude:
- - 'config/initializers/paperclip.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
- Exclude:
- - 'config/environments/production.rb'
- - 'config/initializers/backtrace_silencers.rb'
- - 'config/initializers/http_client_proxy.rb'
- - 'config/initializers/rack_attack.rb'
- - 'config/initializers/webauthn.rb'
- - 'config/routes.rb'
-
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
-# AllowedMethods: define_method, mail, respond_to
-Style/SymbolProc:
- Exclude:
- - 'config/initializers/3_omniauth.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
-Style/TernaryParentheses:
- Exclude:
- - 'config/environments/development.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
- Exclude:
- - 'config/initializers/paperclip.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
- Exclude:
- - 'config/environments/production.rb'
- - 'config/environments/test.rb'
-
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, MinSize, WordRegex.
-# SupportedStyles: percent, brackets
-Style/WordArray:
- Exclude:
- - 'app/helpers/languages_helper.rb'
- - 'spec/controllers/settings/imports_controller_spec.rb'
- - 'spec/models/form/import_spec.rb'
D .ruby-gemset => .ruby-gemset +0 -1
D .ruby-version => .ruby-version +0 -1
D Aptfile => Aptfile +0 -5
@@ 1,5 0,0 @@
-ffmpeg
-libopenblas0-pthread
-libpq-dev
-libxdamage1
-libxfixes3
D Procfile.dev => Procfile.dev +0 -4
@@ 1,4 0,0 @@
-web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb
-sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq
-stream: env PORT=4000 yarn run start
-webpack: bin/webpack-dev-server
M app/javascript/flavours/glitch/features/compose/components/options.jsx => app/javascript/flavours/glitch/features/compose/components/options.jsx +0 -6
@@ 213,11 213,6 @@ class ComposerOptions extends ImmutablePureComponent {
name: 'text/plain',
text: formatMessage(messages.plain),
},
- html: {
- icon: 'code',
- name: 'text/html',
- text: formatMessage(messages.html),
- },
markdown: {
icon: 'arrow-circle-down',
name: 'text/markdown',
@@ 279,7 274,6 @@ class ComposerOptions extends ImmutablePureComponent {
icon={(contentTypeItems[contentType.split('/')[1]] || {}).icon}
items={[
contentTypeItems.plain,
- contentTypeItems.html,
contentTypeItems.markdown,
]}
onChange={onChangeContentType}
M app/javascript/flavours/glitch/features/compose/components/publisher.jsx => app/javascript/flavours/glitch/features/compose/components/publisher.jsx +1 -1
@@ 14,7 14,7 @@ import { maxChars } from 'flavours/glitch/initial_state';
const messages = defineMessages({
publish: {
- defaultMessage: 'Publish',
+ defaultMessage: 'Promulgate',
id: 'compose_form.publish',
},
publishLoud: {
M => +1 -1
@@ 56,7 56,7 @@ class LinkFooter extends PureComponent {
return (
<div className='link-footer'>
<p>
<strong>Masto-FE (GoToSocial flavour)</strong>
<strong>Masto-FE (sloth flavour)</strong>
{DividingCircle}
<a href={source_url} rel='noopener noreferrer' target='_blank'><FormattedMessage id='footer.source_code' defaultMessage='Source code' /></a>
{DividingCircle}
M app/javascript/flavours/glitch/reducers/local_settings.js => app/javascript/flavours/glitch/reducers/local_settings.js +5 -5
@@ 6,7 6,7 @@ import { LOCAL_SETTING_CHANGE, LOCAL_SETTING_DELETE } from 'flavours/glitch/acti
import { STORE_HYDRATE } from 'flavours/glitch/actions/store';
const initialState = ImmutableMap({
- layout : 'auto',
+ layout : 'mobile',
stretch : true,
side_arm : 'none',
side_arm_reply_mode : 'keep',
@@ 19,13 19,13 @@ const initialState = ImmutableMap({
preselect_on_reply: false,
inline_preview_cards: true,
hicolor_privacy_icons: false,
- show_content_type_choice: false,
+ show_content_type_choice: true,
tag_misleading_links: true,
rewrite_mentions: 'no',
content_warnings : ImmutableMap({
filter : null,
- media_outside: false,
- shared_state : false,
+ media_outside: true,
+ shared_state : true,
}),
collapsed : ImmutableMap({
enabled : true,
@@ 45,7 45,7 @@ const initialState = ImmutableMap({
show_action_bar : true,
}),
media : ImmutableMap({
- letterbox : true,
+ letterbox : false,
fullwidth : true,
reveal_behind_cw : false,
pop_in_player : true,
M app/javascript/mastodon/features/compose/components/compose_form.jsx => app/javascript/mastodon/features/compose/components/compose_form.jsx +1 -1
@@ 34,7 34,7 @@ const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u20
const messages = defineMessages({
placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
- publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
+ publish: { id: 'compose_form.publish', defaultMessage: 'Promulgate' },
publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
});
M app/javascript/mastodon/locales/en-GB.json => app/javascript/mastodon/locales/en-GB.json +2 -2
@@ 143,14 143,14 @@
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is not public. Only public posts can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked",
- "compose_form.placeholder": "What's on your mind?",
+ "compose_form.placeholder": "Bare thy soul unto the void.",
"compose_form.poll.add_option": "Add a choice",
"compose_form.poll.duration": "Poll duration",
"compose_form.poll.option_placeholder": "Choice {number}",
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
- "compose_form.publish": "Publish",
+ "compose_form.publish": "Promulgate",
"compose_form.publish_form": "New post",
"compose_form.publish_loud": "{publish}!",
"compose_form.save_changes": "Save changes",
M app/javascript/mastodon/locales/en.json => app/javascript/mastodon/locales/en.json +2 -2
@@ 143,14 143,14 @@
"compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is not public. Only public posts can be searched by hashtag.",
"compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
"compose_form.lock_disclaimer.lock": "locked",
- "compose_form.placeholder": "What's on your mind?",
+ "compose_form.placeholder": "Bare thy soul unto the void.",
"compose_form.poll.add_option": "Add a choice",
"compose_form.poll.duration": "Poll duration",
"compose_form.poll.option_placeholder": "Choice {number}",
"compose_form.poll.remove_option": "Remove this choice",
"compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
"compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
- "compose_form.publish": "Publish",
+ "compose_form.publish": "Promulgate",
"compose_form.publish_form": "New post",
"compose_form.publish_loud": "{publish}!",
"compose_form.save_changes": "Save changes",
D priv-config => priv-config +0 -4
@@ 1,4 0,0 @@
-listen-address 0.0.0.0:8118
-
-forward . .
-forward-socks5t .onion tor:9050 .>
\ No newline at end of file
M public/verify-state.js => public/verify-state.js +7 -3
@@ 1,6 1,8 @@
loadState().then(_ => null);
async function loadState() {
+ const protocol = localStorage.getItem('protocol') ?? 'https://';
+ const streamingProtocol = protocol.startsWith('https') ? 'wss://' : 'ws://'
const domain = localStorage.getItem('domain');
const access_token = localStorage.getItem('access_token');
const storedState = localStorage.getItem('initial_state');
@@ 14,7 16,7 @@ async function loadState() {
document.getElementById('initial-state').textContent = storedState;
}
- const apiUrl = `https://${domain}/api`;
+ const apiUrl = `${protocol}${domain}/api`;
const instance = await fetch(`${apiUrl}/v1/instance`).then(async p => await p.json());
const options = {headers: {Authorization: `Bearer ${access_token}`}};
const credentials = await fetch(`${apiUrl}/v1/accounts/verify_credentials`, options).then(async p => await p.json());
@@ 65,6 67,7 @@ async function loadState() {
"auto_play_gif": false,
"boost_modal": false,
"compact_reaction": false,
+ "default_content_type": credentials.source?.status_content_type ?? "text/plain",
"delete_modal": true,
"display_sensitive_media": false,
"domain": domain,
@@ 74,8 77,9 @@ async function loadState() {
"me": credentials.id,
"reduce_motion": false,
"show_quote_button": true,
- "base_url": `https://${domain}`,
- "streaming_api_base_url": `wss://${domain}`,
+ "base_url": `${protocol}${domain}`,
+ "search_enabled": true,
+ "streaming_api_base_url": `${streamingProtocol}${domain}`,
"title": `${instance.title}`,
"unfollow_modal": true,
"source_url": 'https://codeberg.org/superseriousbusiness/masto-fe-standalone',