teh/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 12

Presumably fixes from a busted merge

Browse source
This commit is contained in:
Erik Stambaugh 2025-10-25 16:21:07 -07:00
parent bfeb12b867
commit 0df896d854
3 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/concerns/account/avatar.rb
View file

@ -8,9 +8,6 @@ module Account::Avatar
AVATAR_DIMENSIONS = [400, 400].freeze AVATAR_DIMENSIONS = [400, 400].freeze
AVATAR_GEOMETRY = [AVATAR_DIMENSIONS.first, AVATAR_DIMENSIONS.last].join('x') 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 class_methods do
def avatar_styles(file) def avatar_styles(file)
styles = { original: { geometry: "#{AVATAR_GEOMETRY}#", file_geometry_parser: FastGeometryParser } } styles = { original: { geometry: "#{AVATAR_GEOMETRY}#", file_geometry_parser: FastGeometryParser } }

1
app/models/notification.rb
View file

@ -107,7 +107,6 @@ class Notification < ApplicationRecord
validates :type, inclusion: { in: TYPES } validates :type, inclusion: { in: TYPES }
scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) } 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 def type
@type ||= (super || LEGACY_TYPE_CLASS_MAP[activity_type]).to_sym @type ||= (super || LEGACY_TYPE_CLASS_MAP[activity_type]).to_sym

4
app/services/suspend_account_service.rb
View file

@ -71,10 +71,6 @@ class SuspendAccountService < BaseService
StatusTrend.where(account: @account).delete_all StatusTrend.where(account: @account).delete_all
end end
def remove_from_trends!
StatusTrend.where(account: @account).delete_all
end
def signed_activity_json def signed_activity_json
@signed_activity_json ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account)) @signed_activity_json ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account))
end end