diff --git a/app/models/concerns/account/avatar.rb b/app/models/concerns/account/avatar.rb index 152af08a2..a60a289d5 100644 --- a/app/models/concerns/account/avatar.rb +++ b/app/models/concerns/account/avatar.rb @@ -8,9 +8,6 @@ module Account::Avatar AVATAR_DIMENSIONS = [400, 400].freeze AVATAR_GEOMETRY = [AVATAR_DIMENSIONS.first, AVATAR_DIMENSIONS.last].join('x') - AVATAR_DIMENSIONS = [400, 400].freeze - AVATAR_GEOMETRY = [AVATAR_DIMENSIONS.first, AVATAR_DIMENSIONS.last].join('x') - class_methods do def avatar_styles(file) styles = { original: { geometry: "#{AVATAR_GEOMETRY}#", file_geometry_parser: FastGeometryParser } } diff --git a/app/models/notification.rb b/app/models/notification.rb index ddce04030..e7ada3399 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -107,7 +107,6 @@ class Notification < ApplicationRecord validates :type, inclusion: { in: TYPES } scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) } - scope :by_group_key, ->(group_key) { group_key&.start_with?('ungrouped-') ? where(id: group_key.delete_prefix('ungrouped-')) : where(group_key: group_key) } def type @type ||= (super || LEGACY_TYPE_CLASS_MAP[activity_type]).to_sym diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 1bcccfc5c..7ddf1a553 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -71,10 +71,6 @@ class SuspendAccountService < BaseService StatusTrend.where(account: @account).delete_all end - def remove_from_trends! - StatusTrend.where(account: @account).delete_all - end - def signed_activity_json @signed_activity_json ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account)) end