Browse Source

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

Conflicts:
- `CONTRIBUTING.md`:
  Not a real conflict, glitch-soc quotes the upstream file, which has been
  changed. Update the quote.
master
Claire 2 months ago
parent
commit
b81710c02c
26 changed files with 37 additions and 40 deletions
  1. +1
    -1
      Aptfile
  2. +1
    -1
      CONTRIBUTING.md
  3. +1
    -1
      Gemfile
  4. +2
    -2
      Gemfile.lock
  5. +1
    -1
      app/javascript/mastodon/components/poll.js
  6. +1
    -1
      app/javascript/mastodon/features/account/components/header.js
  7. +1
    -1
      app/javascript/mastodon/features/compose/components/reply_indicator.js
  8. +1
    -1
      app/javascript/mastodon/features/directory/components/account_card.js
  9. +1
    -1
      app/javascript/mastodon/features/follow_requests/components/account_authorize.js
  10. +4
    -4
      app/lib/extractor.rb
  11. +3
    -3
      app/lib/feed_manager.rb
  12. +1
    -1
      app/lib/formatter.rb
  13. +1
    -1
      app/lib/request.rb
  14. +3
    -3
      app/lib/sanitize_config.rb
  15. +2
    -2
      app/lib/spam_check.rb
  16. +1
    -1
      app/models/concerns/omniauthable.rb
  17. +1
    -1
      app/presenters/status_relationships_presenter.rb
  18. +1
    -1
      app/services/account_search_service.rb
  19. +2
    -5
      app/services/activitypub/fetch_featured_collection_service.rb
  20. +2
    -2
      app/services/fetch_link_card_service.rb
  21. +1
    -1
      app/services/search_service.rb
  22. +1
    -1
      app/validators/blacklisted_email_validator.rb
  23. +1
    -1
      app/validators/html_validator.rb
  24. +1
    -1
      config/initializers/open_uri_redirection.rb
  25. +1
    -1
      config/initializers/rack_attack.rb
  26. +1
    -1
      lib/mastodon/domains_cli.rb

+ 1
- 1
Aptfile View File

@@ -22,7 +22,7 @@ libpixman-1-0
librsvg2-2
libthai-data
libthai0
libvpx5
libvpx[5-9]
libxcb-render0
libxcb-shm0
libxrender1

+ 1
- 1
CONTRIBUTING.md View File

@@ -70,6 +70,6 @@ The smaller the set of changes in the pull request is, the quicker it can be rev

## Documentation

The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/docs](https://source.joinmastodon.org/mastodon/docs).
The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to tootsuite/documentation](https://github.com/tootsuite/documentation).

</blockquote>

+ 1
- 1
Gemfile View File

@@ -13,7 +13,7 @@ gem 'rack', '~> 2.2.3'

gem 'hamlit-rails', '~> 0.2'
gem 'pg', '~> 1.2'
gem 'makara', '~> 0.4'
gem 'makara', '~> 0.5'
gem 'pghero', '~> 2.7'
gem 'dotenv-rails', '~> 2.7'



+ 2
- 2
Gemfile.lock View File

@@ -333,7 +333,7 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
makara (0.4.1)
makara (0.5.0)
activerecord (>= 3.0.0)
marcel (0.3.3)
mimemagic (~> 0.3.2)
@@ -741,7 +741,7 @@ DEPENDENCIES
letter_opener_web (~> 1.4)
link_header (~> 0.0)
lograge (~> 0.11)
makara (~> 0.4)
makara (~> 0.5)
mario-redis-lock (~> 1.2)
memory_profiler
microformats (~> 4.2)


+ 1
- 1
app/javascript/mastodon/components/poll.js View File

@@ -153,7 +153,7 @@ class Poll extends ImmutablePureComponent {
</span>}

<span
className='poll__option__text'
className='poll__option__text translate'
dangerouslySetInnerHTML={{ __html: titleEmojified }}
/>



+ 1
- 1
app/javascript/mastodon/features/account/components/header.js View File

@@ -340,7 +340,7 @@ class Header extends ImmutablePureComponent {

{account.get('id') !== me && !suspended && <AccountNoteContainer account={account} />}

{account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content' dangerouslySetInnerHTML={content} className='translate' />}
{account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content translate' dangerouslySetInnerHTML={content} />}
</div>

{!suspended && (


+ 1
- 1
app/javascript/mastodon/features/compose/components/reply_indicator.js View File

@@ -56,7 +56,7 @@ class ReplyIndicator extends ImmutablePureComponent {
</a>
</div>

<div className='reply-indicator__content' dangerouslySetInnerHTML={content} />
<div className='reply-indicator__content translate' dangerouslySetInnerHTML={content} />

{status.get('media_attachments').size > 0 && (
<AttachmentList


+ 1
- 1
app/javascript/mastodon/features/directory/components/account_card.js View File

@@ -241,7 +241,7 @@ class AccountCard extends ImmutablePureComponent {

<div className='directory__card__extra' ref={this.setRef}>
<div
className='account__header__content'
className='account__header__content translate'
dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
/>
</div>


+ 1
- 1
app/javascript/mastodon/features/follow_requests/components/account_authorize.js View File

@@ -35,7 +35,7 @@ class AccountAuthorize extends ImmutablePureComponent {
<DisplayName account={account} />
</Permalink>

<div className='account__header__content' dangerouslySetInnerHTML={content} />
<div className='account__header__content translate' dangerouslySetInnerHTML={content} />
</div>

<div className='account--panel'>


+ 4
- 4
app/lib/extractor.rb View File

@@ -7,14 +7,14 @@ module Extractor

# :yields: username, list_slug, start, end
def extract_mentions_or_lists_with_indices(text)
return [] unless text =~ Twitter::Regex[:at_signs]
return [] unless Twitter::Regex[:at_signs].match?(text)

possible_entries = []

text.to_s.scan(Account::MENTION_RE) do |screen_name, _|
match_data = $LAST_MATCH_INFO
after = $'
unless after =~ Twitter::Regex[:end_mention_match]
unless Twitter::Regex[:end_mention_match].match?(after)
start_position = match_data.char_begin(1) - 1
end_position = match_data.char_end(1)
possible_entries << {
@@ -33,7 +33,7 @@ module Extractor
end

def extract_hashtags_with_indices(text, **)
return [] unless text =~ /#/
return [] unless /#/.match?(text)

tags = []
text.scan(Tag::HASHTAG_RE) do |hash_text, _|
@@ -41,7 +41,7 @@ module Extractor
start_position = match_data.char_begin(1) - 1
end_position = match_data.char_end(1)
after = $'
if after =~ %r{\A://}
if %r{\A://}.match?(after)
hash_text.match(/(.+)(https?\Z)/) do |matched|
hash_text = matched[1]
end_position -= matched[2].char_length


+ 3
- 3
app/lib/feed_manager.rb View File

@@ -454,8 +454,8 @@ class FeedManager

active_filters.map! do |filter|
if filter.whole_word
sb = filter.phrase =~ /\A[[:word:]]/ ? '\b' : ''
eb = filter.phrase =~ /[[:word:]]\z/ ? '\b' : ''
sb = /\A[[:word:]]/.match?(filter.phrase) ? '\b' : ''
eb = /[[:word:]]\z/.match?(filter.phrase) ? '\b' : ''

/(?mix:#{sb}#{Regexp.escape(filter.phrase)}#{eb})/
else
@@ -475,7 +475,7 @@ class FeedManager
status.media_attachments.map(&:description).join("\n\n"),
].compact.join("\n\n")

!combined_regex.match(combined_text).nil?
combined_regex.match?(combined_text)
end

# Adds a status to an account's feed, returning true if a status was


+ 1
- 1
app/lib/formatter.rb View File

@@ -287,7 +287,7 @@ class Formatter

escaped = text.chars.map do |c|
output = begin
if c.ord.to_s(16).length > 2 && UNICODE_ESCAPE_BLACKLIST_RE.match(c).nil?
if c.ord.to_s(16).length > 2 && !UNICODE_ESCAPE_BLACKLIST_RE.match?(c)
CGI.escape(c)
else
c


+ 1
- 1
app/lib/request.rb View File

@@ -145,7 +145,7 @@ class Request
end

def block_hidden_service?
!Rails.configuration.x.access_to_hidden_service && /\.(onion|i2p)$/.match(@url.host)
!Rails.configuration.x.access_to_hidden_service && /\.(onion|i2p)$/.match?(@url.host)
end

module ClientLimit


+ 3
- 3
app/lib/sanitize_config.rb View File

@@ -28,9 +28,9 @@ class Sanitize
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
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(' ')


+ 2
- 2
app/lib/spam_check.rb View File

@@ -186,9 +186,9 @@ class SpamCheck

def matching_status_ids
if nilsimsa?
other_digests.select { |record| record.start_with?('nilsimsa') && nilsimsa_compare_value(digest, record.split(':')[1]) >= NILSIMSA_COMPARE_THRESHOLD }.filter_map { |record| record.split(':')[2] }
other_digests.filter_map { |record| record.split(':')[2] if record.start_with?('nilsimsa') && nilsimsa_compare_value(digest, record.split(':')[1]) >= NILSIMSA_COMPARE_THRESHOLD }
else
other_digests.select { |record| record.start_with?('md5') && record.split(':')[1] == digest }.filter_map { |record| record.split(':')[2] }
other_digests.filter_map { |record| record.split(':')[2] if record.start_with?('md5') && record.split(':')[1] == digest }
end
end



+ 1
- 1
app/models/concerns/omniauthable.rb View File

@@ -57,7 +57,7 @@ module Omniauthable

user = User.new(user_params_from_auth(email, auth))

user.account.avatar_remote_url = auth.info.image if auth.info.image =~ /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/
user.account.avatar_remote_url = auth.info.image if /\A#{URI::DEFAULT_PARSER.make_regexp(%w(http https))}\z/.match?(auth.info.image)
user.skip_confirmation!
user.save!
user


+ 1
- 1
app/presenters/status_relationships_presenter.rb View File

@@ -15,7 +15,7 @@ class StatusRelationshipsPresenter
statuses = statuses.compact
status_ids = statuses.flat_map { |s| [s.id, s.reblog_of_id] }.uniq.compact
conversation_ids = statuses.filter_map(&:conversation_id).uniq
pinnable_status_ids = statuses.map(&:proper).select { |s| s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) }.map(&:id)
pinnable_status_ids = statuses.map(&:proper).filter_map { |s| s.id if s.account_id == current_account_id && %w(public unlisted).include?(s.visibility) }

@reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(options[:reblogs_map] || {})
@favourites_map = Status.favourites_map(status_ids, current_account_id).merge(options[:favourites_map] || {})


+ 1
- 1
app/services/account_search_service.rb View File

@@ -175,7 +175,7 @@ class AccountSearchService < BaseService
end

def username_complete?
query.include?('@') && "@#{query}" =~ /\A#{Account::MENTION_RE}\Z/
query.include?('@') && "@#{query}".match?(/\A#{Account::MENTION_RE}\Z/)
end

def likely_acct?


+ 2
- 5
app/services/activitypub/fetch_featured_collection_service.rb View File

@@ -23,11 +23,8 @@ class ActivityPub::FetchFeaturedCollectionService < BaseService

def process_items(items)
status_ids = items.map { |item| value_or_id(item) }
.reject { |uri| ActivityPub::TagManager.instance.local_uri?(uri) }
.filter_map { |uri| ActivityPub::FetchRemoteStatusService.new.call(uri) }
.select { |status| status.account_id == @account.id }
.map(&:id)

.filter_map { |uri| ActivityPub::FetchRemoteStatusService.new.call(uri) unless ActivityPub::TagManager.instance.local_uri?(uri) }
.filter_map { |status| status.id if status.account_id == @account.id }
to_remove = []
to_add = status_ids



+ 2
- 2
app/services/fetch_link_card_service.rb View File

@@ -47,11 +47,11 @@ class FetchLinkCardService < BaseService

Request.new(:get, @url).add_headers('Accept' => 'text/html', 'User-Agent' => Mastodon::Version.user_agent + ' Bot').perform do |res|
if res.code == 200 && res.mime_type == 'text/html'
@html = res.body_with_limit
@html_charset = res.charset
@html = res.body_with_limit
else
@html = nil
@html_charset = nil
@html = nil
end
end
end


+ 1
- 1
app/services/search_service.rb View File

@@ -72,7 +72,7 @@ class SearchService < BaseService
end

def url_query?
@resolve && @query =~ /\Ahttps?:\/\//
@resolve && /\Ahttps?:\/\//.match?(@query)
end

def url_resource_results


+ 1
- 1
app/validators/blacklisted_email_validator.rb View File

@@ -22,7 +22,7 @@ class BlacklistedEmailValidator < ActiveModel::Validator
domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
regexp = Regexp.new("@(.+\\.)?(#{domains})", true)

@email =~ regexp
regexp.match?(@email)
end

def not_on_whitelist?


+ 1
- 1
app/validators/html_validator.rb View File

@@ -15,6 +15,6 @@ class HtmlValidator < ActiveModel::EachValidator

def html_errors(str)
fragment = Nokogiri::HTML.fragment(options[:wrap_with] ? "<#{options[:wrap_with]}>#{str}</#{options[:wrap_with]}>" : str)
fragment.errors.select { |error| ERROR_RE =~ error.message }
fragment.errors.select { |error| ERROR_RE.match?(error.message) }
end
end

+ 1
- 1
config/initializers/open_uri_redirection.rb View File

@@ -3,6 +3,6 @@ require 'open-uri'
module OpenURI
def self.redirectable?(uri1, uri2) # :nodoc:
uri1.scheme.casecmp(uri2.scheme).zero? ||
(/\A(?:http|https|ftp)\z/i =~ uri1.scheme && /\A(?:http|https|ftp)\z/i =~ uri2.scheme)
(/\A(?:http|https|ftp)\z/i.match?(uri1.scheme) && /\A(?:http|https|ftp)\z/i.match?(uri2.scheme))
end
end

+ 1
- 1
config/initializers/rack_attack.rb View File

@@ -78,7 +78,7 @@ class Rack::Attack
API_DELETE_STATUS_REGEX = /\A\/api\/v1\/statuses\/[\d]+/.freeze

throttle('throttle_api_delete', limit: 30, period: 30.minutes) do |req|
req.authenticated_user_id if (req.post? && req.path =~ API_DELETE_REBLOG_REGEX) || (req.delete? && req.path =~ API_DELETE_STATUS_REGEX)
req.authenticated_user_id if (req.post? && req.path.match?(API_DELETE_REBLOG_REGEX)) || (req.delete? && req.path.match?(API_DELETE_STATUS_REGEX))
end

throttle('throttle_sign_up_attempts/ip', limit: 25, period: 5.minutes) do |req|


+ 1
- 1
lib/mastodon/domains_cli.rb View File

@@ -93,7 +93,7 @@ module Mastodon

work_unit = ->(domain) do
next if stats.key?(domain)
next if options[:exclude_suspended] && domain.match(blocked_domains)
next if options[:exclude_suspended] && domain.match?(blocked_domains)

stats[domain] = nil



Loading…
Cancel
Save