-
-
Notifications
You must be signed in to change notification settings - Fork 6.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Change auto-following admin-selected accounts, show in recommendations #16078
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,28 @@ | ||
# frozen_string_literal: true | ||
|
||
class AccountSuggestions | ||
class Suggestion < ActiveModelSerializers::Model | ||
attributes :account, :source | ||
end | ||
SOURCES = [ | ||
AccountSuggestions::SettingSource, | ||
AccountSuggestions::PastInteractionsSource, | ||
AccountSuggestions::GlobalSource, | ||
].freeze | ||
|
||
def self.get(account, limit) | ||
suggestions = PotentialFriendshipTracker.get(account, limit).map { |target_account| Suggestion.new(account: target_account, source: :past_interaction) } | ||
suggestions.concat(FollowRecommendation.get(account, limit - suggestions.size, suggestions.map { |suggestion| suggestion.account.id }).map { |target_account| Suggestion.new(account: target_account, source: :global) }) if suggestions.size < limit | ||
suggestions | ||
SOURCES.each_with_object([]) do |source_class, suggestions| | ||
source_suggestions = source_class.new.get( | ||
account, | ||
skip_account_ids: suggestions.map(&:account_id), | ||
limit: limit - suggestions.size | ||
) | ||
|
||
suggestions.concat(source_suggestions) | ||
end | ||
end | ||
|
||
def self.remove(account, target_account_id) | ||
PotentialFriendshipTracker.remove(account.id, target_account_id) | ||
SOURCES.each do |source_class| | ||
source = source_class.new | ||
source.remove(account, target_account_id) | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# frozen_string_literal: true | ||
|
||
class AccountSuggestions::GlobalSource < AccountSuggestions::Source | ||
def key | ||
:global | ||
end | ||
|
||
def get(account, skip_account_ids: [], limit: 40) | ||
account_ids = account_ids_for_locale(account.user_locale) - [account.id] - skip_account_ids | ||
|
||
as_ordered_suggestions( | ||
scope(account).where(id: account_ids), | ||
account_ids | ||
).take(limit) | ||
end | ||
|
||
def remove(_account, _target_account_id) | ||
nil | ||
end | ||
|
||
private | ||
|
||
def scope(account) | ||
Account.searchable | ||
.followable_by(account) | ||
.not_excluded_by_account(account) | ||
.not_domain_blocked_by_account(account) | ||
end | ||
|
||
def account_ids_for_locale(locale) | ||
Redis.current.zrevrange("follow_recommendations:#{locale}", 0, -1).map(&:to_i) | ||
end | ||
|
||
def to_ordered_list_key(account) | ||
account.id | ||
end | ||
end |
36 changes: 36 additions & 0 deletions
36
app/models/account_suggestions/past_interactions_source.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
# frozen_string_literal: true | ||
|
||
class AccountSuggestions::PastInteractionsSource < AccountSuggestions::Source | ||
include Redisable | ||
|
||
def key | ||
:past_interactions | ||
end | ||
|
||
def get(account, skip_account_ids: [], limit: 40) | ||
account_ids = account_ids_for_account(account.id, limit + skip_account_ids.size) - skip_account_ids | ||
|
||
as_ordered_suggestions( | ||
scope.where(id: account_ids), | ||
account_ids | ||
).take(limit) | ||
end | ||
|
||
def remove(account, target_account_id) | ||
redis.zrem("interactions:#{account.id}", target_account_id) | ||
end | ||
|
||
private | ||
|
||
def scope | ||
Account.searchable | ||
end | ||
|
||
def account_ids_for_account(account_id, limit) | ||
redis.zrevrange("interactions:#{account_id}", 0, limit).map(&:to_i) | ||
end | ||
|
||
def to_ordered_list_key(account) | ||
account.id | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
# frozen_string_literal: true | ||
|
||
class AccountSuggestions::SettingSource < AccountSuggestions::Source | ||
def key | ||
:staff | ||
end | ||
|
||
def get(account, skip_account_ids: [], limit: 40) | ||
return [] unless setting_enabled? | ||
|
||
as_ordered_suggestions( | ||
scope(account).where(setting_to_where_condition).where.not(id: skip_account_ids), | ||
usernames_and_domains | ||
).take(limit) | ||
end | ||
|
||
def remove(_account, _target_account_id) | ||
nil | ||
end | ||
|
||
private | ||
|
||
def scope(account) | ||
Account.searchable | ||
.followable_by(account) | ||
.not_excluded_by_account(account) | ||
.not_domain_blocked_by_account(account) | ||
.where(locked: false) | ||
.where.not(id: account.id) | ||
end | ||
|
||
def usernames_and_domains | ||
@usernames_and_domains ||= setting_to_usernames_and_domains | ||
end | ||
|
||
def setting_enabled? | ||
setting.present? | ||
end | ||
|
||
def setting_to_where_condition | ||
usernames_and_domains.map do |(username, domain)| | ||
Arel::Nodes::Grouping.new( | ||
Account.arel_table[:username].lower.eq(username.downcase).and( | ||
Account.arel_table[:domain].lower.eq(domain&.downcase) | ||
) | ||
) | ||
end.reduce(:or) | ||
end | ||
|
||
def setting_to_usernames_and_domains | ||
setting.split(',').map do |str| | ||
username, domain = str.strip.gsub(/\A@/, '').split('@', 2) | ||
domain = nil if TagManager.instance.local_domain?(domain) | ||
|
||
next if username.blank? | ||
|
||
[username, domain] | ||
end.compact | ||
end | ||
|
||
def setting | ||
Setting.bootstrap_timeline_accounts | ||
end | ||
|
||
def to_ordered_list_key(account) | ||
[account.username, account.domain] | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# frozen_string_literal: true | ||
|
||
class AccountSuggestions::Source | ||
def key | ||
raise NotImplementedError | ||
end | ||
|
||
def get(_account, **kwargs) | ||
raise NotImplementedError | ||
end | ||
|
||
def remove(_account, target_account_id) | ||
raise NotImplementedError | ||
end | ||
|
||
protected | ||
|
||
def as_ordered_suggestions(scope, ordered_list) | ||
return [] if ordered_list.empty? | ||
|
||
map = scope.index_by(&method(:to_ordered_list_key)) | ||
|
||
ordered_list.map { |ordered_list_key| map[ordered_list_key] }.compact.map do |account| | ||
AccountSuggestions::Suggestion.new( | ||
account: account, | ||
source: key | ||
) | ||
end | ||
end | ||
|
||
def to_ordered_list_key(_account) | ||
raise NotImplementedError | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
# frozen_string_literal: true | ||
|
||
class AccountSuggestions::Suggestion < ActiveModelSerializers::Model | ||
attributes :account, :source | ||
|
||
delegate :id, to: :account, prefix: true | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This changes the scope of this validator from local accounts only to any known account, which kind of makes sense for recommendations but less so for
site_contact_username
which also uses this validator.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Counter-point: On mastodon.online, I might as well just point to my mastodon.social account in that field
Not sure if there's any true benefit to enforcing locality in this validator.