a27fcf5e30
Squashed commit of the following: commit 7b2ba61c4841e23081552fb79270e4e430dd1fe0 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 16:03:52 2020 +0900 Add the ability to change to a new circle by replying to a circle commit 7013a228c65c7bd147885de458b50095f3c24334 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 16:10:57 2020 +0900 fixup! add-limited-visibility-icon-to-status commit 679aa8a7f9bef42ee5d0b326d9ae4925a1999939 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 15:12:53 2020 +0900 Fix 14666 commit b3addd8220d8bb3512ff345b32ca83c714dadd2a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:44:12 2020 +0900 Add Japanese translation for circle commit b7f4b773a0cd554084d5ad6a5923adb06b3acfc4 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:40:12 2020 +0900 Squashed commit of the following: commit b85a4685b27c49462288aba5f38723b91e936c4a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 10:50:03 2020 +0900 Changed to remove restrictions on privacy options and allow users to switch circles when replying commit 0a8c0140c73d7c5333e4f8017964adb5061a7cf1 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:33:07 2020 +0900 Change limited visibility icon commit b64adf19788d828249408454ec6afa9beb3d4872 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Aug 31 06:50:56 2020 +0900 Fix a change to limited-visibility-bearcaps replies commit ed361405b5e38857a2f42b0515a599ddcdd412cf Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 27 15:53:18 2020 +0900 Fix composer text when change visibility commit 4da3adddb6ffde43070d743e34c5b56e06579b30 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Aug 22 22:34:23 2020 +0900 Fix wrong circle_id when changing visibility commit 752d7fc2a3c9e34fab9993d767f83c6eae7ba55a Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Aug 9 13:12:51 2020 +0900 Add circle reply and redraft commit 5978bc04a24695edce6717bda89dcf6f861ef2c4 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 27 01:07:52 2020 +0900 Fix remove unused props commit 7970f69676c24b4aa9385fee8b1635c46ba52fcd Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Jul 26 21:17:07 2020 +0900 Separate circle choice from privacy commit 36f6a684c0b0c895d4d0f1b9d09b05c91b104666 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 10:54:25 2020 +0900 Add UI for posting to circles commit 7ef48003c1407275663dd603b124d292db2aa93a Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 12:55:10 2020 +0900 Fix silent mention by circle commit 7a1caed49333c3d3241301afb77639cdf1cabdc0 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:38:10 2020 +0900 Squashed commit of the following: commit dca71fab86c830932ca760b7d8b3f89cc25c453e Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:31:26 2020 +0900 Revert "Add focus setting when opening the circle column" This reverts commit 3a93ac99312a13b68b7edc2b81313fb0ffb7bcdc. commit 0a1bc8307bb699c7eb3024072ce14a440df1fc87 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 09:31:11 2020 +0900 Change limited visibility icon commit 9784f8b562f6592e9d9190ca29d2b2e870006d10 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 13 21:52:07 2020 +0900 Add focus setting when opening the circle column commit a84f680c167fab9276550850c60f9108d251144e Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Aug 13 15:55:27 2020 +0900 Fix message commit e3f11c4adac57b6e6a15c981ed6f4721a1634212 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 27 01:01:23 2020 +0900 Fix light-theme commit d7d96eda5b86d3e3f654ce79888e7cf5aa535db5 Author: noellabo <noel.yoshiba@gmail.com> Date: Sun Jul 26 21:50:56 2020 +0900 Fix circles loading in share page and followers search commit 10b821f7b8c0a87cea3df51f09deeadc2cb40b32 Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 14:08:00 2020 +0900 Refactor list items commit e020072915572ce409039ccf799d08f8d8b5b393 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 20:15:38 2020 +0900 Fixed a bug that circle name change is not reflected in the list commit 735bc41161b4c09a8dafe2c0064096b3ca79f2a0 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 08:49:47 2020 +0900 Add UI for managing circle members commit d7c3145b8fa84be0631bf7f41bb229f3e6d03ff1 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 07:34:52 2020 +0900 Add the followers option to AccountSearchSercive commit 65e2b0c4299b72ede440b50089c1bd6afa6c9c05 Author: noellabo <noel.yoshiba@gmail.com> Date: Wed Jul 22 07:05:56 2020 +0900 Add CircleSerializer commit a639e1803abf5590068846dbe98bc5edfaa2ad82 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 11:37:30 2020 +0900 Squashed commit of the following: commit 9cb3fb9d980e3ee066083076f508c5ab1447176a Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 07:15:19 2020 +0900 Move the link to the mention list to the menu commit b32dd87b43f4e09b8e2c437f1fb5d3ebd6221215 Author: noellabo <noel.yoshiba@gmail.com> Date: Sat Sep 5 00:56:12 2020 +0900 Change limited visibility icon commit 8db0d024119d1c2cef8de849f2501496a166a2dd Author: noellabo <noel.yoshiba@gmail.com> Date: Tue Sep 1 01:42:13 2020 +0900 Fix to disallow getting the list of mentions in limited replies commit 490a9d65a59a3dd0d86e81f6780e879dc4313dff Author: noellabo <noel.yoshiba@gmail.com> Date: Fri Jul 24 11:36:24 2020 +0900 Add column to list mentioned accounts of limited status commit 62a423ac2729c16f26fafe111f257bc373218df2 Author: noellabo <noel.yoshiba@gmail.com> Date: Thu Jul 23 13:30:17 2020 +0900 Fix visibility compatibility more commit a5cfa54b259054f41e89037f299fa928a2361818 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 20 05:39:49 2020 +0900 Fix visibility compatibility commit 7900ca5650c77565b86ddc594a221dfa3b5321b4 Author: noellabo <noel.yoshiba@gmail.com> Date: Mon Jul 20 02:01:27 2020 +0900 Add limited visibility icon to status commit 66b83965ef068e9ee8c940249c68bcbde15731fe Author: Eugen Rochko <eugen@zeonfederated.com> Date: Wed Aug 26 03:16:47 2020 +0200 Add conversation-based forwarding for limited visibility statuses through bearcaps commit 561abc65e0ace89318b3952047025b8d98515fbb Author: Eugen Rochko <eugen@zeonfederated.com> Date: Sun Jul 19 02:05:16 2020 +0200 Add REST API for managing and posting to circles Circles are the conceptual opposite of lists. A list is a subdivision of your follows, a circle is a subdivision of your followers. Posting to a circle means making content available to only some of your followers. Circles have been internally supported in Mastodon for the purposes of federation since #8950, this adds the REST API necessary for making use of them in Mastodon itsef.
320 lines
6.8 KiB
Ruby
320 lines
6.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class ActivityPub::NoteSerializer < ActivityPub::Serializer
|
|
context_extensions :atom_uri, :conversation, :sensitive, :voters_count, :expiry
|
|
|
|
attributes :id, :type, :summary,
|
|
:in_reply_to, :published, :url,
|
|
:attributed_to, :to, :cc, :sensitive,
|
|
:atom_uri, :in_reply_to_atom_uri,
|
|
:conversation, :context
|
|
|
|
attribute :quote_url, if: -> { object.quote? }
|
|
attribute :misskey_quote, key: :_misskey_quote, if: -> { object.quote? }
|
|
attribute :misskey_content, key: :_misskey_content, if: -> { object.quote? }
|
|
attribute :content
|
|
attribute :content_map, if: :language?
|
|
|
|
attribute :expiry, if: -> { object.expires? }
|
|
|
|
has_many :media_attachments, key: :attachment
|
|
has_many :virtual_tags, key: :tag
|
|
|
|
has_one :replies, serializer: ActivityPub::CollectionSerializer, if: :local?
|
|
|
|
has_many :poll_options, key: :one_of, if: :poll_and_not_multiple?
|
|
has_many :poll_options, key: :any_of, if: :poll_and_multiple?
|
|
|
|
attribute :end_time, if: :poll_and_expires?
|
|
attribute :closed, if: :poll_and_expired?
|
|
|
|
attribute :voters_count, if: :poll_and_voters_count?
|
|
|
|
def id
|
|
ActivityPub::TagManager.instance.uri_for(object)
|
|
end
|
|
|
|
def type
|
|
object.preloadable_poll ? 'Question' : 'Note'
|
|
end
|
|
|
|
def summary
|
|
object.spoiler_text.presence
|
|
end
|
|
|
|
def content
|
|
Formatter.instance.format(object)
|
|
end
|
|
|
|
def content_map
|
|
{ object.language => Formatter.instance.format(object) }
|
|
end
|
|
|
|
def replies
|
|
replies = object.self_replies(5).pluck(:id, :uri)
|
|
last_id = replies.last&.first
|
|
|
|
ActivityPub::CollectionPresenter.new(
|
|
type: :unordered,
|
|
id: ActivityPub::TagManager.instance.replies_uri_for(object),
|
|
first: ActivityPub::CollectionPresenter.new(
|
|
type: :unordered,
|
|
part_of: ActivityPub::TagManager.instance.replies_uri_for(object),
|
|
items: replies.map(&:second),
|
|
next: last_id ? ActivityPub::TagManager.instance.replies_uri_for(object, page: true, min_id: last_id) : ActivityPub::TagManager.instance.replies_uri_for(object, page: true, only_other_accounts: true)
|
|
)
|
|
)
|
|
end
|
|
|
|
def language?
|
|
object.language.present?
|
|
end
|
|
|
|
def in_reply_to
|
|
return unless object.reply? && !object.thread.nil?
|
|
|
|
if object.thread.uri.nil? || object.thread.uri.start_with?('http')
|
|
ActivityPub::TagManager.instance.uri_for(object.thread)
|
|
else
|
|
object.thread.url
|
|
end
|
|
end
|
|
|
|
def published
|
|
object.created_at.iso8601
|
|
end
|
|
|
|
def expiry
|
|
object.expires_at.iso8601
|
|
end
|
|
|
|
def url
|
|
ActivityPub::TagManager.instance.url_for(object)
|
|
end
|
|
|
|
def attributed_to
|
|
ActivityPub::TagManager.instance.uri_for(object.account)
|
|
end
|
|
|
|
def to
|
|
ActivityPub::TagManager.instance.to(object)
|
|
end
|
|
|
|
def cc
|
|
ActivityPub::TagManager.instance.cc(object)
|
|
end
|
|
|
|
def sensitive
|
|
object.account.sensitized? || object.sensitive
|
|
end
|
|
|
|
def virtual_tags
|
|
object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis
|
|
end
|
|
|
|
def atom_uri
|
|
return unless object.local?
|
|
|
|
OStatus::TagManager.instance.uri_for(object)
|
|
end
|
|
|
|
def in_reply_to_atom_uri
|
|
return unless object.reply? && !object.thread.nil?
|
|
|
|
OStatus::TagManager.instance.uri_for(object.thread)
|
|
end
|
|
|
|
def conversation
|
|
return if object.conversation.nil?
|
|
|
|
if object.conversation.uri?
|
|
object.conversation.uri
|
|
else
|
|
OStatus::TagManager.instance.unique_tag(object.conversation.created_at, object.conversation.id, 'Conversation')
|
|
end
|
|
end
|
|
|
|
def quote_url
|
|
ActivityPub::TagManager.instance.uri_for(object.quote) if object.quote?
|
|
end
|
|
|
|
alias misskey_quote quote_url
|
|
|
|
def misskey_content
|
|
object.text if object.quote?
|
|
end
|
|
|
|
def context
|
|
return if object.conversation.nil?
|
|
|
|
ActivityPub::TagManager.instance.uri_for(object.conversation)
|
|
end
|
|
|
|
def local?
|
|
object.account.local?
|
|
end
|
|
|
|
def poll_options
|
|
object.preloadable_poll.loaded_options
|
|
end
|
|
|
|
def poll_and_multiple?
|
|
object.preloadable_poll&.multiple?
|
|
end
|
|
|
|
def poll_and_not_multiple?
|
|
object.preloadable_poll && !object.preloadable_poll.multiple?
|
|
end
|
|
|
|
def closed
|
|
object.preloadable_poll.expires_at.iso8601
|
|
end
|
|
|
|
alias end_time closed
|
|
|
|
def voters_count
|
|
object.preloadable_poll.voters_count
|
|
end
|
|
|
|
def poll_and_expires?
|
|
object.preloadable_poll&.expires_at&.present?
|
|
end
|
|
|
|
def poll_and_expired?
|
|
object.preloadable_poll&.expired?
|
|
end
|
|
|
|
def poll_and_voters_count?
|
|
object.preloadable_poll&.voters_count
|
|
end
|
|
|
|
class MediaAttachmentSerializer < ActivityPub::Serializer
|
|
context_extensions :blurhash, :focal_point
|
|
|
|
include RoutingHelper
|
|
|
|
attributes :type, :media_type, :url, :name, :blurhash
|
|
attribute :focal_point, if: :focal_point?
|
|
attribute :width, if: :width?
|
|
attribute :height, if: :height?
|
|
|
|
has_one :icon, serializer: ActivityPub::ImageSerializer, if: :thumbnail?
|
|
|
|
def type
|
|
'Document'
|
|
end
|
|
|
|
def name
|
|
object.description
|
|
end
|
|
|
|
def media_type
|
|
object.file_content_type
|
|
end
|
|
|
|
def url
|
|
object.local? ? full_asset_url(object.file.url(:original, false)) : object.remote_url
|
|
end
|
|
|
|
def focal_point?
|
|
object.file.meta.is_a?(Hash) && object.file.meta['focus'].is_a?(Hash)
|
|
end
|
|
|
|
def focal_point
|
|
[object.file.meta['focus']['x'], object.file.meta['focus']['y']]
|
|
end
|
|
|
|
def icon
|
|
object.thumbnail
|
|
end
|
|
|
|
def thumbnail?
|
|
object.thumbnail.present?
|
|
end
|
|
|
|
def width?
|
|
object.file.meta&.dig('original', 'width').present?
|
|
end
|
|
|
|
def height?
|
|
object.file.meta&.dig('original', 'height').present?
|
|
end
|
|
|
|
def width
|
|
object.file.meta.dig('original', 'width')
|
|
end
|
|
|
|
def height
|
|
object.file.meta.dig('original', 'height')
|
|
end
|
|
end
|
|
|
|
class MentionSerializer < ActivityPub::Serializer
|
|
attributes :type, :href, :name
|
|
|
|
def type
|
|
'Mention'
|
|
end
|
|
|
|
def href
|
|
ActivityPub::TagManager.instance.uri_for(object.account)
|
|
end
|
|
|
|
def name
|
|
"@#{object.account.acct}"
|
|
end
|
|
end
|
|
|
|
class TagSerializer < ActivityPub::Serializer
|
|
context_extensions :hashtag
|
|
|
|
include RoutingHelper
|
|
|
|
attributes :type, :href, :name
|
|
|
|
def type
|
|
'Hashtag'
|
|
end
|
|
|
|
def href
|
|
tag_url(object)
|
|
end
|
|
|
|
def name
|
|
"##{object.name}"
|
|
end
|
|
end
|
|
|
|
class CustomEmojiSerializer < ActivityPub::EmojiSerializer
|
|
end
|
|
|
|
class OptionSerializer < ActivityPub::Serializer
|
|
class RepliesSerializer < ActivityPub::Serializer
|
|
attributes :type, :total_items
|
|
|
|
def type
|
|
'Collection'
|
|
end
|
|
|
|
def total_items
|
|
object.votes_count
|
|
end
|
|
end
|
|
|
|
attributes :type, :name
|
|
|
|
has_one :replies, serializer: ActivityPub::NoteSerializer::OptionSerializer::RepliesSerializer
|
|
|
|
def type
|
|
'Note'
|
|
end
|
|
|
|
def name
|
|
object.title
|
|
end
|
|
|
|
def replies
|
|
object
|
|
end
|
|
end
|
|
end
|