From a4dcaef53b97c58fd153de6f151b6fada40f3442 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Mar 2021 02:42:43 +0100
Subject: Prepare Mastodon for zeitwerk autoloader (#15917)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Prepare Mastodon for zeitwerk autoloader (Rails 6)

Add inflections and rename/move a few classes.

In particular, app/lib/exceptions.rb and app/lib/sanitize_config.rb
were manually loaded while still in autoload paths.

* Add inflection for Url → URL
---
 app/lib/exceptions.rb      |  23 ---------
 app/lib/formatter.rb       |   1 -
 app/lib/sanitize_config.rb | 119 ---------------------------------------------
 3 files changed, 143 deletions(-)
 delete mode 100644 app/lib/exceptions.rb
 delete mode 100644 app/lib/sanitize_config.rb

(limited to 'app/lib')

diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
deleted file mode 100644
index 7c8e77871..000000000
--- a/app/lib/exceptions.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Mastodon
-  class Error < StandardError; end
-  class NotPermittedError < Error; end
-  class ValidationError < Error; end
-  class HostValidationError < ValidationError; end
-  class LengthValidationError < ValidationError; end
-  class DimensionsValidationError < ValidationError; end
-  class StreamValidationError < ValidationError; end
-  class RaceConditionError < Error; end
-  class RateLimitExceededError < Error; end
-
-  class UnexpectedResponseError < Error
-    def initialize(response = nil)
-      if response.respond_to? :uri
-        super("#{response.uri} returned code #{response.code}")
-      else
-        super
-      end
-    end
-  end
-end
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 6fb5d5419..2611bcbae 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'singleton'
-require_relative './sanitize_config'
 
 class Formatter
   include Singleton
diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
deleted file mode 100644
index a2e1d9d01..000000000
--- a/app/lib/sanitize_config.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-# frozen_string_literal: true
-
-class Sanitize
-  module Config
-    HTTP_PROTOCOLS = %w(
-      http
-      https
-    ).freeze
-
-    LINK_PROTOCOLS = %w(
-      http
-      https
-      dat
-      dweb
-      ipfs
-      ipns
-      ssb
-      gopher
-      xmpp
-      magnet
-      gemini
-    ).freeze
-
-    CLASS_WHITELIST_TRANSFORMER = lambda do |env|
-      node = env[:node]
-      class_list = node['class']&.split(/[\t\n\f\r ]/)
-
-      return unless class_list
-
-      class_list.keep_if do |e|
-        next true if /^(h|p|u|dt|e)-/.match?(e) # microformats classes
-        next true if /^(mention|hashtag)$/.match?(e) # semantic classes
-        next true if /^(ellipsis|invisible)$/.match?(e) # link formatting classes
-      end
-
-      node['class'] = class_list.join(' ')
-    end
-
-    UNSUPPORTED_HREF_TRANSFORMER = lambda do |env|
-      return unless env[:node_name] == 'a'
-
-      current_node = env[:node]
-
-      scheme = begin
-        if current_node['href'] =~ Sanitize::REGEX_PROTOCOL
-          Regexp.last_match(1).downcase
-        else
-          :relative
-        end
-      end
-
-      current_node.replace(current_node.text) unless LINK_PROTOCOLS.include?(scheme)
-    end
-
-    UNSUPPORTED_ELEMENTS_TRANSFORMER = lambda do |env|
-      return unless %w(h1 h2 h3 h4 h5 h6 blockquote pre ul ol li).include?(env[:node_name])
-
-      current_node = env[:node]
-
-      case env[:node_name]
-      when 'li'
-        current_node.traverse do |node|
-          next unless %w(p ul ol li).include?(node.name)
-
-          node.add_next_sibling('<br>') if node.next_sibling
-          node.replace(node.children) unless node.text?
-        end
-      else
-        current_node.name = 'p'
-      end
-    end
-
-    MASTODON_STRICT ||= freeze_config(
-      elements: %w(p br span a),
-
-      attributes: {
-        'a'    => %w(href rel class),
-        'span' => %w(class),
-      },
-
-      add_attributes: {
-        'a' => {
-          'rel' => 'nofollow noopener noreferrer',
-          'target' => '_blank',
-        },
-      },
-
-      protocols: {},
-
-      transformers: [
-        CLASS_WHITELIST_TRANSFORMER,
-        UNSUPPORTED_ELEMENTS_TRANSFORMER,
-        UNSUPPORTED_HREF_TRANSFORMER,
-      ]
-    )
-
-    MASTODON_OEMBED ||= freeze_config merge(
-      RELAXED,
-      elements: RELAXED[:elements] + %w(audio embed iframe source video),
-
-      attributes: merge(
-        RELAXED[:attributes],
-        'audio'  => %w(controls),
-        'embed'  => %w(height src type width),
-        'iframe' => %w(allowfullscreen frameborder height scrolling src width),
-        'source' => %w(src type),
-        'video'  => %w(controls height loop width),
-        'div'    => [:data]
-      ),
-
-      protocols: merge(
-        RELAXED[:protocols],
-        'embed'  => { 'src' => HTTP_PROTOCOLS },
-        'iframe' => { 'src' => HTTP_PROTOCOLS },
-        'source' => { 'src' => HTTP_PROTOCOLS }
-      )
-    )
-  end
-end
-- 
cgit