mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 16:35:48 +00:00
fe89554a54
Conflicts: - `app/lib/activitypub/activity/create.rb`: Upstream refactored how `Create` activities are handled and how values are extracted from `Create`d objects. This conflicted with how glitch-soc supported the `directMessage` flag to explicitly distinguish between limited and direct messages. Ported glitch-soc's changes to latest upstream changes. - `app/services/fan_out_on_write_service.rb`: Upstream largely refactored that file and changed some of the logic. This conflicted with glitch-soc's handling of the direct timeline and the options to allow replies and boosts in public feeds. Ported those glitch-soc changes on top of latest upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored to move mention-related ActivityPub deliveries to `ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check to not send local-only toots to remote mentioned users. Took upstream's version, as the check is not needed anymore, since it is performed at the `ActivityPub::DeliveryWorker` call site already. - `app/workers/feed_insert_worker.rb`: Upstream added support for `update` toot events, while glitch-soc had support for an extra timeline support, `direct`. Ported upstream changes and extended them to the `direct` timeline. Additional changes: - `app/lib/activitypub/parser/status_parser.rb`: Added code to handle the `directMessage` flag and take it into account to compute visibility. - `app/lib/feed_manager.rb`: Extended upstream's support of `update` toot events to glitch-soc's `direct` timeline.
172 lines
4.1 KiB
Ruby
172 lines
4.1 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class REST::StatusSerializer < ActiveModel::Serializer
|
|
attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
|
|
:sensitive, :spoiler_text, :visibility, :language,
|
|
:uri, :url, :replies_count, :reblogs_count,
|
|
:favourites_count, :edited_at
|
|
|
|
attribute :favourited, if: :current_user?
|
|
attribute :reblogged, if: :current_user?
|
|
attribute :muted, if: :current_user?
|
|
attribute :bookmarked, if: :current_user?
|
|
attribute :pinned, if: :pinnable?
|
|
attribute :local_only if :local?
|
|
|
|
attribute :content, unless: :source_requested?
|
|
attribute :text, if: :source_requested?
|
|
attribute :content_type, if: :source_requested?
|
|
|
|
belongs_to :reblog, serializer: REST::StatusSerializer
|
|
belongs_to :application, if: :show_application?
|
|
belongs_to :account, serializer: REST::AccountSerializer
|
|
|
|
has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
|
|
has_many :ordered_mentions, key: :mentions
|
|
has_many :tags
|
|
has_many :emojis, serializer: REST::CustomEmojiSerializer
|
|
|
|
has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
|
|
has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
|
|
|
|
def id
|
|
object.id.to_s
|
|
end
|
|
|
|
def in_reply_to_id
|
|
object.in_reply_to_id&.to_s
|
|
end
|
|
|
|
def in_reply_to_account_id
|
|
object.in_reply_to_account_id&.to_s
|
|
end
|
|
|
|
def current_user?
|
|
!current_user.nil?
|
|
end
|
|
|
|
def show_application?
|
|
object.account.user_shows_application? || (current_user? && current_user.account_id == object.account_id)
|
|
end
|
|
|
|
def visibility
|
|
# This visibility is masked behind "private"
|
|
# to avoid API changes because there are no
|
|
# UX differences
|
|
if object.limited_visibility?
|
|
'private'
|
|
else
|
|
object.visibility
|
|
end
|
|
end
|
|
|
|
def sensitive
|
|
if current_user? && current_user.account_id == object.account_id
|
|
object.sensitive
|
|
else
|
|
object.account.sensitized? || object.sensitive
|
|
end
|
|
end
|
|
|
|
def uri
|
|
ActivityPub::TagManager.instance.uri_for(object)
|
|
end
|
|
|
|
def content
|
|
Formatter.instance.format(object)
|
|
end
|
|
|
|
def url
|
|
ActivityPub::TagManager.instance.url_for(object)
|
|
end
|
|
|
|
def favourited
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].favourites_map[object.id] || false
|
|
else
|
|
current_user.account.favourited?(object)
|
|
end
|
|
end
|
|
|
|
def reblogged
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].reblogs_map[object.id] || false
|
|
else
|
|
current_user.account.reblogged?(object)
|
|
end
|
|
end
|
|
|
|
def muted
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].mutes_map[object.conversation_id] || false
|
|
else
|
|
current_user.account.muting_conversation?(object.conversation)
|
|
end
|
|
end
|
|
|
|
def bookmarked
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].bookmarks_map[object.id] || false
|
|
else
|
|
current_user.account.bookmarked?(object)
|
|
end
|
|
end
|
|
|
|
def pinned
|
|
if instance_options && instance_options[:relationships]
|
|
instance_options[:relationships].pins_map[object.id] || false
|
|
else
|
|
current_user.account.pinned?(object)
|
|
end
|
|
end
|
|
|
|
def pinnable?
|
|
current_user? &&
|
|
current_user.account_id == object.account_id &&
|
|
!object.reblog? &&
|
|
%w(public unlisted private).include?(object.visibility)
|
|
end
|
|
|
|
def source_requested?
|
|
instance_options[:source_requested]
|
|
end
|
|
|
|
def ordered_mentions
|
|
object.active_mentions.to_a.sort_by(&:id)
|
|
end
|
|
|
|
class ApplicationSerializer < ActiveModel::Serializer
|
|
attributes :name, :website
|
|
end
|
|
|
|
class MentionSerializer < ActiveModel::Serializer
|
|
attributes :id, :username, :url, :acct
|
|
|
|
def id
|
|
object.account_id.to_s
|
|
end
|
|
|
|
def username
|
|
object.account_username
|
|
end
|
|
|
|
def url
|
|
ActivityPub::TagManager.instance.url_for(object.account)
|
|
end
|
|
|
|
def acct
|
|
object.account.pretty_acct
|
|
end
|
|
end
|
|
|
|
class TagSerializer < ActiveModel::Serializer
|
|
include RoutingHelper
|
|
|
|
attributes :name, :url
|
|
|
|
def url
|
|
tag_url(object)
|
|
end
|
|
end
|
|
end
|