Theming and such

.prettierignore

@@ -70,3 +70,23 @@ docker-compose.override.yml
 # Ignore locale files
 /app/javascript/mastodon/locales
 /config/locales
+<<<<<<< Updated upstream
+=======
+
+# Ignore vendored CSS reset
+app/javascript/styles/mastodon/reset.scss
+
+# Ignore Javascript pending https://github.com/mastodon/mastodon/pull/23631
+*.js
+*.jsx
+*.ts
+*.tsx
+
+# Ignore HTML till cleaned and included in CI
+*.html
+
+# Ignore the generated AUTHORS.md
+AUTHORS.md
+
+/Mastodon-Modern
+>>>>>>> Stashed changes

.stylelintignore

@@ -0,0 +1 @@
+app/javascript/styles/modern/style.scss

CHANGELOG.md

@@ -3,14 +3,6 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
-## [4.1.4] - 2023-07-07
-
-### Fixed
-
-- Fix branding:generate_app_icons failing because of disallowed ICO coder ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25794))
-- Fix crash in admin interface when viewing a remote user with verified links ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25796))
-- Fix processing of media files with unusual names ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25788))
-
 ## [4.1.3] - 2023-07-06
 
 ### Added
@@ -38,7 +30,7 @@ All notable changes to this project will be documented in this file.
 - Fix multiple inefficiencies in automatic post cleanup worker ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24607), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24785), [ClearlyClaire](https://github.com/mastodon/mastodon/pull/24840))
 - Fix performance of streaming by parsing message JSON once ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/25278), [ThisIsMissEm](https://github.com/mastodon/mastodon/pull/25361))
 - Fix CSP headers when `S3_ALIAS_HOST` includes a path component ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25273))
-- Fix `tootctl accounts approve --number N` not approving N earliest registrations ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24605))
+- Fix `tootctl accounts approve --number N` not aproving N earliest registrations ([danielmbrasil](https://github.com/mastodon/mastodon/pull/24605))
 - Fix reports not being closed when performing batch suspensions ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/24988))
 - Fix being able to vote on your own polls ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25015))
 - Fix race condition when reblogging a status ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25016))

Gemfile.lock

@@ -627,7 +627,7 @@ GEM
       fugit (~> 1.1, >= 1.1.6)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
-    sanitize (6.0.2)
+    sanitize (6.0.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     scenic (1.7.0)

app/helpers/statuses_helper.rb

@@ -53,7 +53,7 @@ module StatusesHelper
   def status_description(status)
     components = [[media_summary(status), status_text_summary(status)].reject(&:blank?).join(' · ')]
 
-    if (status.spoiler_text.blank? || Setting.preview_sensitive_media)
+    if status.spoiler_text.blank?
       components << status.text
       components << poll_summary(status)
     end

app/javascript/styles/modern-dark-wobbl-old.scss

@@ -1,8 +0,0 @@
-@import 'wobbl-old/variables';
-@import 'application';
-@import 'modern/modern';
-
-.layout-multiple-columns .column {
-	flex-grow: 1;
-	max-width: 500px;
-}

app/javascript/styles/modern-light-wobbl-old.scss

@@ -1,9 +0,0 @@
-@import 'wobbl-old-light/variables';
-@import 'application';
-@import 'modern/modern';
-@import 'mastodon-light/diff';
-
-.layout-multiple-columns .column {
-	flex-grow: 1;
-	max-width: 500px;
-}

app/javascript/styles/wobbl-old-light.scss

@@ -1,4 +0,0 @@
-@import 'wobbl-old-light/variables';
-@import 'application';
-@import 'mastodon-light/diff';
-

app/javascript/styles/wobbl-old-light/variables.scss

@@ -1,44 +0,0 @@
-// Dependent colors
-$black: #000000;
-$white: #ffffff;
-
-$classic-base-color: #191919;// Dark Gray
-$classic-primary-color: #E7E7E7;// Platinum
-$classic-secondary-color: #8c562a;    // Paler red
-$classic-highlight-color: #c45302;    // Red highlights
-
-// Differences
-$success-green: lighten(#3c754d, 8%);
-
-$base-overlay-background: $white !default;
-$valid-value-color: $success-green !default;
-
-$ui-base-color: $classic-primary-color !default;
-$ui-base-lighter-color: #b0c0cf;
-$ui-primary-color: #9bcbed;
-$ui-secondary-color: $classic-base-color !default;
-$ui-highlight-color: $classic-highlight-color !default;
-
-$primary-text-color: $black !default;
-$darker-text-color: $classic-base-color !default;
-$highlight-text-color: darken($ui-highlight-color, 8%) !default;
-$dark-text-color: #444b5d;
-$action-button-color: #606984;
-
-$inverted-text-color: $black !default;
-$lighter-text-color: $classic-base-color !default;
-$light-text-color: #444b5d;
-
-// Newly added colors
-$account-background-color: $white !default;
-
-// Invert darkened and lightened colors
-@function darken($color, $amount) {
-  @return hsl(hue($color), saturation($color), lightness($color) + $amount);
-}
-
-@function lighten($color, $amount) {
-  @return hsl(hue($color), saturation($color), lightness($color) - $amount);
-}
-
-$emojis-requiring-inversion: 'chains';

app/javascript/styles/wobbl-old.scss

@@ -1,2 +0,0 @@
-@import 'wobbl-old/variables';
-@import 'application';

app/javascript/styles/wobbl-old/variables.scss

@@ -1,60 +0,0 @@
-// Commonly used web colors
-$black: #000000;            // Black
-$white: #ffffff;            // White
-$success-green: #79bd9a !default;    // Padua
-$error-red: #df405a !default;        // Cerise
-$warning-red: #ff5050 !default;      // Sunset Orange
-$gold-star: #ca8f04 !default;        // Dark Goldenrod
-
-$red-bookmark: $warning-red;
-
-// Values from the classic Mastodon UI
-$classic-base-color: #37210f;// Dark Brown
-$classic-primary-color: #E7E7E7;// Platinum
-$classic-secondary-color: #E7E7E7;    // Paler red
-$classic-highlight-color: #c45302;    // Red highlights
-
-// Variables for defaults in UI
-$base-shadow-color: $black !default;
-$base-overlay-background: $black !default;
-$base-border-color: $white !default;
-$simple-background-color: $white !default;
-$valid-value-color: $success-green !default;
-$error-value-color: $error-red !default;
-
-// Tell UI to use selected colors
-$ui-base-color: $classic-base-color !default;                  // Darkest
-$ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkest
-$ui-primary-color: $classic-primary-color !default;            // Lighter
-$ui-secondary-color: $classic-secondary-color !default;        // Lightest
-$ui-highlight-color: $classic-highlight-color !default;
-
-// Variables for texts
-$primary-text-color: $white !default;
-$darker-text-color: $ui-primary-color !default;
-$dark-text-color: $ui-base-lighter-color !default;
-$secondary-text-color: $ui-secondary-color !default;
-$highlight-text-color: lighten($ui-highlight-color, 8%) !default;
-$action-button-color: $ui-base-lighter-color !default;
-$passive-text-color: $gold-star !default;
-$active-passive-text-color: $success-green !default;
-
-// For texts on inverted backgrounds
-$inverted-text-color: $ui-base-color !default;
-$lighter-text-color: $ui-base-lighter-color !default;
-$light-text-color: $ui-primary-color !default;
-
-// Language codes that uses CJK fonts
-$cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW;
-
-// Variables for components
-$media-modal-media-max-width: 100%;
-
-// put margins on top and bottom of image to avoid the screen covered by image.
-$media-modal-media-max-height: 80%;
-
-$no-gap-breakpoint: 1175px;
-
-$font-sans-serif: 'mastodon-font-sans-serif' !default;
-$font-display: 'mastodon-font-display' !default;
-$font-monospace: 'mastodon-font-monospace' !default;

app/lib/text_formatter.rb

@@ -60,7 +60,7 @@ class TextFormatter
       suffix      = url[prefix.length + 30..-1]
       cutoff      = url[prefix.length..-1].length > 30
 
-      <<~HTML.squish.html_safe # rubocop:disable Rails/OutputSafety
+      <<~HTML.squish
         <a href="#{h(url)}" target="_blank" rel="#{rel.join(' ')}"><span class="invisible">#{h(prefix)}</span><span class="#{cutoff ? 'ellipsis' : ''}">#{h(display_url)}</span><span class="invisible">#{h(suffix)}</span></a>
       HTML
     rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError

app/models/concerns/attachmentable.rb

@@ -24,7 +24,7 @@ module Attachmentable
     def self.has_attached_file(name, options = {}) # rubocop:disable Naming/PredicateName
       super(name, options)
 
-      send(:"before_#{name}_validate", prepend: true) do
+      send(:"before_#{name}_validate") do
         attachment = send(name)
         check_image_dimension(attachment)
         set_file_content_type(attachment)

app/serializers/rest/instance_serializer.rb

@@ -11,7 +11,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
 
   attributes :domain, :title, :version, :source_url, :description,
              :usage, :thumbnail, :languages, :configuration,
-             :registrations
+             :registrations, :max_toot_chars
 
   has_one :contact, serializer: ContactSerializer
   has_many :rules, serializer: REST::RuleSerializer
@@ -88,6 +88,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
     }
   end
 
+  def max_toot_chars
+    1500
+  end
+
   private
 
   def registrations_enabled?

config/locales/en.yml

@@ -1600,14 +1600,10 @@ en:
     mastodon-light: Mastodon (Light)
     wobbl: Mastodon (Dark - Wobbl theme)
     wobbl-light: Mastodon (Light - Wobbl theme)
-    wobbl-old: Mastodon (Dark - Original Wobbl Theme)
-    wobbl-old-light: Mastodon (Light - Original Wobbl Theme)
     modern-dark: Modern (Dark)
     modern-light: Modern (Light)
-    default: Modern (Dark - Wobbl theme) (Default)
     modern-light-wobbl: Modern (Light - Wobbl theme)
-    modern-dark-wobbl-old: Modern (Dark - Original Wobbl Theme)
+    default: Modern (Dark - Wobbl theme) (Default)
-    modern-light-wobbl-old: Modern (Light - Original Wobbl Theme)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/themes.yml

@@ -7,7 +7,3 @@ modern-dark: styles/modern-dark.scss
 modern-light: styles/modern-light.scss
 modern-light-wobbl: styles/modern-light-wobbl.scss
 default: styles/modern-dark-wobbl.scss
-wobbl-old: styles/wobbl-old.scss
-wobbl-old-light: styles/wobbl-old-light.scss
-modern-dark-wobbl-old: styles/modern-dark-wobbl-old.scss
-modern-light-wobbl-old: styles/modern-light-wobbl-old.scss

config/themes.yml.save

@@ -1,5 +0,0 @@
-<div class="fields-group">
-
-<div class="input with_label boolean optional form_admin_settings_trends field_with_hint"><div class="label_input"><label class="boolean optional" for="form_admin_settings_trends">Enable trends</label><div class="label_input__wrapper"><input value="0" autocomplete="off" type="hidden" name="form_admin_settings[trends]"><label class="checkbox"><input class="boolean optional" type="checkbox" value="1" checked="checked" name="form_admin_settings[trends]" id="form_admin_settings_trends"></label></div></div><span class="hint">Trends show which posts, hashtags and news stories are gaining traction on your server.</span></div>
-
-</div>

lib/mastodon/version.rb

@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      4
+      3
     end
 
     def flags

lib/tasks/branding.rake

@@ -40,7 +40,7 @@ namespace :branding do
     output_dest     = Rails.root.join('app', 'javascript', 'icons')
 
     rsvg_convert = Terrapin::CommandLine.new('rsvg-convert', '-w :size -h :size --keep-aspect-ratio :input -o :output')
-    convert = Terrapin::CommandLine.new('convert', ':input :output', environment: { 'MAGICK_CONFIGURE_PATH' => nil })
+    convert = Terrapin::CommandLine.new('convert', ':input :output')
 
     favicon_sizes      = [16, 32, 48]
     apple_icon_sizes   = [57, 60, 72, 76, 114, 120, 144, 152, 167, 180, 1024]

spec/requests/api/v2/media_spec.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe 'Media API', paperclip_processing: true do
-  let(:user)    { Fabricate(:user) }
-  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
-  let(:scopes)  { 'write' }
-  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
-
-  describe 'POST /api/v2/media' do
-    it 'returns http success' do
-      post '/api/v2/media', headers: headers, params: { file: fixture_file_upload('attachment-jpg.123456_abcd', 'image/jpeg') }
-      expect(File.exist?(user.account.media_attachments.first.file.path(:small))).to be true
-      expect(response).to have_http_status(200)
-    end
-  end
-end

yarn.lock

@@ -1461,6 +1461,17 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+<<<<<<< Updated upstream
+=======
+"@jridgewell/gen-mapping@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
+>>>>>>> Stashed changes
 "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"