Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2026-03-09 12:41:12 +01:00
parent 44f4f73ad2 e235c446c9
commit 4bcd0caa79
70 changed files with 1060 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/connection_pool/shared_connection_pool.rb
View File

@@ -4,7 +4,7 @@ require 'connection_pool'
require_relative 'shared_timed_stack'
class ConnectionPool::SharedConnectionPool < ConnectionPool
def initialize(options = {}, &block)
def initialize(**, &block)
super
@available = ConnectionPool::SharedTimedStack.new(@size, &block)

2
app/lib/emoji_formatter.rb
View File

@@ -71,7 +71,7 @@ class EmojiFormatter
private
def emoji_map
@emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.shortcode] = [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))] }
@emoji_map ||= custom_emojis.to_h { |e| [e.shortcode, [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))]] }
end
def tag_for_emoji(shortcode, emoji)

2
app/lib/importer/base_importer.rb
View File

@@ -51,7 +51,7 @@ class Importer::BaseImporter
raise ActiveRecord::UnknownPrimaryKey, index.adapter.target if primary_key.nil?
ids = documents.pluck('_id')
existence_map = index.adapter.target.where(primary_key => ids).pluck(primary_key).each_with_object({}) { |id, map| map[id.to_s] = true }
existence_map = index.adapter.target.where(primary_key => ids).pluck(primary_key).to_h { |id| [id.to_s, true] }
tmp = ids.reject { |id| existence_map[id] }
next if tmp.empty?

2
app/lib/request.rb
View File

@@ -295,7 +295,7 @@ class Request
Resolv::DNS.open do |dns|
dns.timeouts = 5
addresses = dns.getaddresses(host)
addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2)
addresses = addresses.grep(Resolv::IPv6).take(2) + addresses.grep_v(Resolv::IPv6).take(2)
end
end