Skye 2 years ago
parent 73706b289e
commit 93a73ce9db
Signed by: me
GPG Key ID: 0104BC05F41B77B8

@ -238,7 +238,7 @@ SMTP_FROM_ADDRESS=notifications@example.com
# SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241" # SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241"
# SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42" # SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42"
# SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4" # SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4"
# SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1" # SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1"
# SAML_ATTRIBUTES_STATEMENTS_VERIFIED= # SAML_ATTRIBUTES_STATEMENTS_VERIFIED=
# SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL= # SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL=
@ -283,6 +283,12 @@ MAX_POLL_OPTION_CHARS=100
# Customize the number of hashtags shown in 'Explore' # Customize the number of hashtags shown in 'Explore'
# MAX_TRENDING_TAGS=10 # MAX_TRENDING_TAGS=10
# Scope of full-text searches:
# - public: search any status with public visibility
# - public_or_unlisted: search any status with public or unlisted visibility
# - classic: searches only a user's own statuses, favs, bookmarks, and mentions
# SEARCH_SCOPE=public
# Maximum custom emoji file sizes # Maximum custom emoji file sizes
# If undefined or smaller than MAX_EMOJI_SIZE, the value # If undefined or smaller than MAX_EMOJI_SIZE, the value
# of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE # of MAX_EMOJI_SIZE will be used for MAX_REMOTE_EMOJI_SIZE

@ -65,6 +65,7 @@ class StatusesIndex < Chewy::Index
root date_detection: false do root date_detection: false do
field :id, type: 'long' field :id, type: 'long'
field :account_id, type: 'long' field :account_id, type: 'long'
field :visibility, type: 'keyword'
field :text, type: 'text', value: ->(status) { status.searchable_text } do field :text, type: 'text', value: ->(status) { status.searchable_text } do
field :stemmed, type: 'text', analyzer: 'content' field :stemmed, type: 'text', analyzer: 'content'

@ -85,6 +85,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
attach_tags(@status) attach_tags(@status)
end end
StatusesIndex.import! @status
resolve_thread(@status) resolve_thread(@status)
fetch_replies(@status) fetch_replies(@status)
distribute distribute

@ -25,7 +25,9 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
# on the results of the filter, so this filtering happens here instead # on the results of the filter, so this filtering happens here instead
bulk.map! do |entry| bulk.map! do |entry|
new_entry = begin new_entry = begin
if entry[:index] && entry.dig(:index, :data, 'searchable_by').blank? if entry[:index] &&
entry.dig(:index, :data, 'searchable_by').blank? &&
Rails.configuration.x.search_scope == :classic
{ delete: entry[:index].except(:data) } { delete: entry[:index].except(:data) }
else else
entry entry
@ -58,13 +60,21 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
end end
def scopes def scopes
[ classic_scopes = [
local_statuses_scope, local_statuses_scope,
local_mentions_scope, local_mentions_scope,
local_favourites_scope, local_favourites_scope,
local_votes_scope, local_votes_scope,
local_bookmarks_scope, local_bookmarks_scope,
] ]
case Rails.configuration.x.search_scope
when :public
classic_scopes + [public_scope]
when :public_or_unlisted
classic_scopes + [public_or_unlisted_scope]
else
classic_scopes
end
end end
def local_mentions_scope def local_mentions_scope
@ -86,4 +96,12 @@ class Importer::StatusesIndexImporter < Importer::BaseImporter
def local_statuses_scope def local_statuses_scope
Status.local.select('"statuses"."id", COALESCE("statuses"."reblog_of_id", "statuses"."id") AS status_id') Status.local.select('"statuses"."id", COALESCE("statuses"."reblog_of_id", "statuses"."id") AS status_id')
end end
def public_scope
Status.with_public_visibility.select('"statuses"."id", "statuses"."id" AS status_id')
end
def public_or_unlisted_scope
Status.with_public_or_unlisted_visibility.select('"statuses"."id", "statuses"."id" AS status_id')
end
end end

@ -103,6 +103,7 @@ class Status < ApplicationRecord
scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') } scope :without_replies, -> { where('statuses.reply = FALSE OR statuses.in_reply_to_account_id = statuses.account_id') }
scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') } scope :without_reblogs, -> { where('statuses.reblog_of_id IS NULL') }
scope :with_public_visibility, -> { where(visibility: :public) } scope :with_public_visibility, -> { where(visibility: :public) }
scope :with_public_or_unlisted_visibility, -> { where(visibility: [:public, :unlisted]) }
scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) } scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced_at: nil }) } scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced_at: nil }) }
scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) } scope :including_silenced_accounts, -> { left_outer_joins(:account).where.not(accounts: { silenced_at: nil }) }

@ -90,6 +90,8 @@ class ActivityPub::ProcessAccountService < BaseService
set_fetchable_attributes! unless @options[:only_key] || @account.suspended? set_fetchable_attributes! unless @options[:only_key] || @account.suspended?
@account.save_with_optional_media! @account.save_with_optional_media!
AccountsIndex.import! @account
end end
def set_immediate_protocol_attributes! def set_immediate_protocol_attributes!

@ -54,6 +54,8 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
broadcast_updates! broadcast_updates!
end end
StatusesIndex.import! @status
forward_activity! if significant_changes? && @status_parser.edited_at > last_edit_date forward_activity! if significant_changes? && @status_parser.edited_at > last_edit_date
end end

@ -35,7 +35,14 @@ class SearchService < BaseService
end end
def perform_statuses_search! def perform_statuses_search!
definition = parsed_query.apply(StatusesIndex.filter(term: { searchable_by: @account.id })) statuses_index = StatusesIndex.filter(term: { searchable_by: @account.id })
case Rails.configuration.x.search_scope
when :public
statuses_index = statuses_index.filter.or(term: { visibility: 'public' })
when :public_or_unlisted
statuses_index = statuses_index.filter.or(terms: { visibility: ['public', 'unlisted'] })
end
definition = parsed_query.apply(statuses_index)
if @options[:account_id].present? if @options[:account_id].present?
definition = definition.filter(term: { account_id: @options[:account_id] }) definition = definition.filter(term: { account_id: @options[:account_id] })

@ -0,0 +1,12 @@
# frozen_string_literal: true
Rails.application.configure do
config.x.search_scope = case
when ENV['SEARCH_SCOPE'] == 'public'
:public
when ENV['SEARCH_SCOPE'] == 'public_or_unlisted'
:public_or_unlisted
else
:classic
end
end
Loading…
Cancel
Save