aaa9ec340b
Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.
110 lines
2.5 KiB
Ruby
110 lines
2.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class REST::AccountSerializer < ActiveModel::Serializer
|
|
include RoutingHelper
|
|
include FormattingHelper
|
|
|
|
attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :group, :created_at,
|
|
:note, :url, :avatar, :avatar_static, :header, :header_static,
|
|
:followers_count, :following_count, :statuses_count, :last_status_at
|
|
|
|
has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?
|
|
|
|
has_many :emojis, serializer: REST::CustomEmojiSerializer
|
|
|
|
attribute :suspended, if: :suspended?
|
|
|
|
class FieldSerializer < ActiveModel::Serializer
|
|
include FormattingHelper
|
|
|
|
attributes :name, :value, :verified_at
|
|
|
|
def value
|
|
html_aware_format(object.value, object.account.local?, with_rel_me: true, with_domains: true, multiline: false)
|
|
end
|
|
end
|
|
|
|
has_many :fields
|
|
|
|
def id
|
|
object.id.to_s
|
|
end
|
|
|
|
def acct
|
|
object.pretty_acct
|
|
end
|
|
|
|
def note
|
|
object.suspended? ? '' : html_aware_format(object.note, object.local?)
|
|
end
|
|
|
|
def url
|
|
ActivityPub::TagManager.instance.url_for(object)
|
|
end
|
|
|
|
def avatar
|
|
full_asset_url(object.suspended? ? object.avatar.default_url : object.avatar_original_url)
|
|
end
|
|
|
|
def avatar_static
|
|
full_asset_url(object.suspended? ? object.avatar.default_url : object.avatar_static_url)
|
|
end
|
|
|
|
def header
|
|
full_asset_url(object.suspended? ? object.header.default_url : object.header_original_url)
|
|
end
|
|
|
|
def header_static
|
|
full_asset_url(object.suspended? ? object.header.default_url : object.header_static_url)
|
|
end
|
|
|
|
def created_at
|
|
object.created_at.midnight.as_json
|
|
end
|
|
|
|
def last_status_at
|
|
object.last_status_at&.to_date&.iso8601
|
|
end
|
|
|
|
def followers_count
|
|
(Setting.hide_followers_count || object.user&.setting_hide_followers_count) ? -1 : object.followers_count
|
|
end
|
|
|
|
def display_name
|
|
object.suspended? ? '' : object.display_name
|
|
end
|
|
|
|
def locked
|
|
object.suspended? ? false : object.locked
|
|
end
|
|
|
|
def bot
|
|
object.suspended? ? false : object.bot
|
|
end
|
|
|
|
def discoverable
|
|
object.suspended? ? false : object.discoverable
|
|
end
|
|
|
|
def moved_to_account
|
|
object.suspended? ? nil : object.moved_to_account
|
|
end
|
|
|
|
def emojis
|
|
object.suspended? ? [] : object.emojis
|
|
end
|
|
|
|
def fields
|
|
object.suspended? ? [] : object.fields
|
|
end
|
|
|
|
def suspended
|
|
object.suspended?
|
|
end
|
|
|
|
delegate :suspended?, to: :object
|
|
|
|
def moved_and_not_nested?
|
|
object.moved? && object.moved_to_account.moved_to_account_id.nil?
|
|
end
|
|
end
|