gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into upstream-20240628

Browse source
This commit is contained in:
KMY 2024-06-28 08:57:12 +09:00
commit 6955843321
178 changed files with 1924 additions and 1178 deletions
Download patch file Download diff file Expand all files Collapse all files

61
app/services/account_search_service.rb
View file

@ -28,9 +28,7 @@ class AccountSearchService < BaseService
},
functions: [
reputation_score_function,
followers_score_function,
time_distance_function,
],
},
},
@ -91,45 +89,12 @@ class AccountSearchService < BaseService
}
end
def boost_follower_query
{
terms: {
id: follower_ids,
boost: 100,
},
}
end
# This function deranks accounts that follow more people than follow them
def reputation_score_function
{
script_score: {
script: {
source: "(Math.max(doc['followers_count'].value, 0) + 0.0) / (Math.max(doc['followers_count'].value, 0) + Math.max(doc['following_count'].value, 0) + 1)",
},
},
}
end
# This function promotes accounts that have more followers
def followers_score_function
{
script_score: {
script: {
source: "(Math.max(doc['followers_count'].value, 0) / (Math.max(doc['followers_count'].value, 0) + 1))",
},
},
}
end
# This function deranks accounts that haven't posted in a long time
def time_distance_function
{
gauss: {
last_status_at: {
scale: '30d',
offset: '30d',
decay: 0.3,
source: "Math.log10((Math.max(doc['followers_count'].value, 0) + 1))",
},
},
}
@ -149,10 +114,24 @@ class AccountSearchService < BaseService
def core_query
{
multi_match: {
query: @query,
type: 'bool_prefix',
fields: %w(username^2 username.*^2 display_name display_name.*),
dis_max: {
queries: [
{
multi_match: {
query: @query,
type: 'most_fields',
fields: %w(username username.*),
},
},
{
multi_match: {
query: @query,
type: 'most_fields',
fields: %w(display_name display_name.*),
},
},
],
},
}
end
@ -165,7 +144,7 @@ class AccountSearchService < BaseService
{
multi_match: {
query: @query,
type: 'most_fields',
type: 'best_fields',
fields: %w(username^2 display_name^2 text text.*),
operator: 'and',
},

7
app/services/fetch_link_card_service.rb
View file

@ -16,6 +16,9 @@ class FetchLinkCardService < BaseService
)
}iox
# URL size limit to safely store in PosgreSQL's unique indexes
BYTESIZE_LIMIT = 2692
def call(status)
@status = status
@original_url = parse_urls
@ -30,7 +33,7 @@ class FetchLinkCardService < BaseService
end
attach_card if @card&.persisted?
rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
rescue HTTP::Error, OpenSSL::SSL::SSLError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Encoding::UndefinedConversionError => e
Rails.logger.debug { "Error fetching link #{@original_url}: #{e}" }
nil
end
@ -106,7 +109,7 @@ class FetchLinkCardService < BaseService
def bad_url?(uri)
# Avoid local instance URLs and invalid URLs
uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme) ||
uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme) || uri.to_s.bytesize > BYTESIZE_LIMIT ||
referenced_urls.include?(uri.to_s) || Setting.stop_link_preview_domains&.include?(uri.host)
end