Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
		
	
			
		
			
				
	
	
		
			140 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			140 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # 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 e =~ /^(h|p|u|dt|e)-/ # microformats classes
 | |
|         next true if e =~ /^(mention|hashtag)$/ # semantic classes
 | |
|         next true if e =~ /^(ellipsis|invisible)$/ # 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
 |