0
0
Fork 0

Change interaction modal in web UI (#26075)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
This commit is contained in:
Claire 2023-07-27 16:11:17 +02:00 committed by GitHub
parent 1e4ccc655a
commit b4e739ff0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
111 changed files with 682 additions and 1091 deletions

View file

@ -0,0 +1,26 @@
# frozen_string_literal: true
class Importer::InstancesIndexImporter < Importer::BaseImporter
def import!
index.adapter.default_scope.find_in_batches(batch_size: @batch_size) do |tmp|
in_work_unit(tmp) do |instances|
bulk = Chewy::Index::Import::BulkBuilder.new(index, to_index: instances).bulk_body
indexed = bulk.count { |entry| entry[:index] }
deleted = bulk.count { |entry| entry[:delete] }
Chewy::Index::Import::BulkRequest.new(index).perform(bulk)
[indexed, deleted]
end
end
wait!
end
private
def index
InstancesIndex
end
end

View file

@ -11,6 +11,8 @@ class WebfingerResource
def username
case resource
when %r{\A(https?://)?#{instance_actor_regexp}/?\Z}
Rails.configuration.x.local_domain
when /\Ahttps?/i
username_from_url
when /@/
@ -22,6 +24,13 @@ class WebfingerResource
private
def instance_actor_regexp
hosts = [Rails.configuration.x.local_domain, Rails.configuration.x.web_domain]
hosts.concat(Rails.configuration.x.alternate_domains) if Rails.configuration.x.alternate_domains.present?
Regexp.union(hosts)
end
def username_from_url
if account_show_page?
path_params[:username]