diff options
author | pluralcafe-docker <git@plural.cafe> | 2018-12-11 19:07:38 +0000 |
---|---|---|
committer | pluralcafe-docker <git@plural.cafe> | 2018-12-11 19:07:38 +0000 |
commit | 1c0b2479045015b96907eaa7567bfd14e4593424 (patch) | |
tree | a054dda635ffd019bf2fdc10ed4f3341264f1490 /app/models/account.rb | |
parent | ee5213093a084c2eb5fa97fb4bdea6019dda5cf5 (diff) |
Revert "Add profile directory (#9427)"
This reverts commit ee5213093a084c2eb5fa97fb4bdea6019dda5cf5.
Diffstat (limited to 'app/models/account.rb')
-rw-r--r-- | app/models/account.rb | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index f993b0765..e6b5bd69f 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -43,13 +43,11 @@ # featured_collection_url :string # fields :jsonb # actor_type :string -# discoverable :boolean # class Account < ApplicationRecord USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i - MIN_FOLLOWERS_DISCOVERY = 10 include AccountAssociations include AccountAvatar @@ -95,10 +93,6 @@ class Account < ApplicationRecord scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) } scope :matches_domain, ->(value) { where(arel_table[:domain].matches("%#{value}%")) } scope :searchable, -> { where(suspended: false).where(moved_to_account_id: nil) } - scope :discoverable, -> { where(silenced: false).where(discoverable: true).joins(:account_stat).where(AccountStat.arel_table[:followers_count].gteq(MIN_FOLLOWERS_DISCOVERY)) } - scope :tagged_with, ->(tag) { joins(:accounts_tags).where(accounts_tags: { tag_id: tag }) } - scope :popular, -> { order('account_stats.followers_count desc') } - scope :by_recent_status, -> { order('(case when account_stats.last_status_at is null then 1 else 0 end) asc, account_stats.last_status_at desc') } delegate :email, :unconfirmed_email, @@ -184,40 +178,6 @@ class Account < ApplicationRecord @keypair ||= OpenSSL::PKey::RSA.new(private_key || public_key) end - def tags_as_strings=(tag_names) - tag_names.map! { |name| name.mb_chars.downcase } - tag_names.uniq!(&:to_s) - - # Existing hashtags - hashtags_map = Tag.where(name: tag_names).each_with_object({}) { |tag, h| h[tag.name] = tag } - - # Initialize not yet existing hashtags - tag_names.each do |name| - next if hashtags_map.key?(name) - hashtags_map[name.downcase] = Tag.new(name: name) - end - - # Remove hashtags that are to be deleted - tags.each do |tag| - if hashtags_map.key?(tag.name) - hashtags_map.delete(tag.name) - else - transaction do - tags.delete(tag) - tag.decrement_count!(:accounts_count) - end - end - end - - # Add hashtags that were so far missing - hashtags_map.each_value do |tag| - transaction do - tags << tag - tag.increment_count!(:accounts_count) - end - end - end - def fields (self[:fields] || []).map { |f| Field.new(self, f) } end |