Merge branch 'main' into glitch-soc/merge-upstream

app/lib/entity_cache.rb

@@ -16,7 +16,9 @@ class EntityCache
   end
 
   def emoji(shortcodes, domain)
-    shortcodes   = Array(shortcodes)
+    shortcodes = Array(shortcodes)
+    return [] if shortcodes.empty?
+
     cached       = Rails.cache.read_multi(*shortcodes.map { |shortcode| to_key(:emoji, shortcode, domain) })
     uncached_ids = []
 

app/lib/exceptions.rb

@@ -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

app/lib/formatter.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'singleton'
-require_relative './sanitize_config'
 
 class HTMLRenderer < Redcarpet::Render::HTML
   def block_code(code, language)
@@ -223,9 +222,9 @@ class Formatter
           original_url, static_url = emoji
           replacement = begin
             if animate
-              "<img draggable=\"false\" class=\"emojione\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(original_url)}\" />"
+              image_tag(original_url, draggable: false, class: 'emojione', alt: ":#{shortcode}:", title: ":#{shortcode}:")
             else
-              "<img draggable=\"false\" class=\"emojione custom-emoji\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(static_url)}\" data-original=\"#{original_url}\" data-static=\"#{static_url}\" />"
+              image_tag(original_url, draggable: false, class: 'emojione custom-emoji', alt: ":#{shortcode}:", title: ":#{shortcode}:", data: { original: original_url, static: static_url })
             end
           end
           before_html = shortname_start_index.positive? ? html[0..shortname_start_index - 1] : ''

app/lib/sanitize_config.rb

@@ -1,139 +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
-
-    IMG_TAG_TRANSFORMER = lambda do |env|
-      node = env[:node]
-
-      return unless env[:node_name] == 'img'
-
-      node.name = 'a'
-
-      node['href'] = node['src']
-      if node['alt'].present?
-        node.content = "[🖼  #{node['alt']}]"
-      else
-        url = node['href']
-        prefix = url.match(/\Ahttps?:\/\/(www\.)?/).to_s
-        text   = url[prefix.length, 30]
-        text   = text + "…" if url[prefix.length..-1].length > 30
-        node.content = "[🖼  #{text}]"
-      end
-    end
-
-    LINK_REL_TRANSFORMER = lambda do |env|
-      return unless env[:node_name] == 'a' and env[:node]['href']
-
-      node = env[:node]
-
-      rel = (node['rel'] || '').split(' ') & ['tag']
-      unless env[:config][:outgoing] && TagManager.instance.local_url?(node['href'])
-        rel += ['nofollow', 'noopener', 'noreferrer']
-      end
-      node['rel'] = rel.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
-
-    MASTODON_STRICT ||= freeze_config(
-      elements: %w(p br span a abbr del pre blockquote code b strong u sub sup i em h1 h2 h3 h4 h5 ul ol li),
-
-      attributes: {
-        'a'          => %w(href rel class title),
-        'span'       => %w(class),
-        'abbr'       => %w(title),
-        'blockquote' => %w(cite),
-        'ol'         => %w(start reversed),
-        'li'         => %w(value),
-      },
-
-      add_attributes: {
-        'a' => {
-          'target' => '_blank',
-        },
-      },
-
-      protocols: {
-        'a'          => { 'href' => LINK_PROTOCOLS },
-        'blockquote' => { 'cite' => LINK_PROTOCOLS },
-      },
-
-      transformers: [
-        CLASS_WHITELIST_TRANSFORMER,
-        IMG_TAG_TRANSFORMER,
-        UNSUPPORTED_HREF_TRANSFORMER,
-        LINK_REL_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