+ {quoteId && (
+
+ )}
+
diff --git a/app/javascript/material-icons/400-24px/format_quote-fill.svg b/app/javascript/material-icons/400-24px/format_quote-fill.svg
new file mode 100644
index 0000000000..f4afa3ed17
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_quote-fill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/format_quote.svg b/app/javascript/material-icons/400-24px/format_quote.svg
new file mode 100644
index 0000000000..c354385ea9
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_quote.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index c384505232..f091f0d201 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -130,6 +130,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
media_attachment_ids: attachment_ids,
ordered_media_attachment_ids: attachment_ids,
poll: process_poll,
+ quote: process_quote,
}
end
@@ -430,4 +431,28 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
poll.reload
retry
end
+
+ def guess_quote_url
+ if @object["quoteUri"] && !@object["quoteUri"].empty?
+ @object["quoteUri"]
+ elsif @object["quoteUrl"] && !@object["quoteUrl"].empty?
+ @object["quoteUrl"]
+ elsif @object["quoteURL"] && !@object["quoteURL"].empty?
+ @object["quoteURL"]
+ elsif @object["_misskey_quote"] && !@object["_misskey_quote"].empty?
+ @object["_misskey_quote"]
+ else
+ nil
+ end
+ end
+
+ def process_quote
+ url = guess_quote_url
+ return nil if url.nil?
+
+ quote = ResolveURLService.new.call(url)
+ status_from_uri(quote.uri) if quote
+ rescue
+ nil
+ end
end
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 8643286317..e6d9d607d9 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -83,11 +83,15 @@ class ActivityPub::TagManager
# Unlisted and private statuses go out primarily to the followers collection
# Others go out only to the people they mention
def to(status)
+ to = []
+
+ to << uri_for(status.quote.account) if status.quote?
+
case status.visibility
when 'public'
- [COLLECTIONS[:public]]
+ to << COLLECTIONS[:public]
when 'unlisted', 'private'
- [account_followers_url(status.account)]
+ to << account_followers_url(status.account)
when 'direct', 'limited'
if status.account.silenced?
# Only notify followers if the account is locally silenced
diff --git a/app/models/status.rb b/app/models/status.rb
index 4f2ceb9ca9..882448663f 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -29,6 +29,7 @@
# edited_at :datetime
# trendable :boolean
# ordered_media_attachment_ids :bigint(8) is an Array
+# quote_id :bigint(8)
#
class Status < ApplicationRecord
@@ -66,6 +67,7 @@ class Status < ApplicationRecord
with_options class_name: 'Status', optional: true do
belongs_to :thread, foreign_key: 'in_reply_to_id', inverse_of: :replies
belongs_to :reblog, foreign_key: 'reblog_of_id', inverse_of: :reblogs
+ belongs_to :quote, foreign_key: 'quote_id', inverse_of: :quoted
end
has_many :favourites, inverse_of: :status, dependent: :destroy
@@ -76,6 +78,7 @@ class Status < ApplicationRecord
has_many :mentions, dependent: :destroy, inverse_of: :status
has_many :mentioned_accounts, through: :mentions, source: :account, class_name: 'Account'
has_many :media_attachments, dependent: :nullify
+ has_many :quoted, foreign_key: 'quote_id', class_name: 'Status', inverse_of: :quote, dependent: :nullify
# The `dependent` option is enabled by the initial `mentions` association declaration
has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status # rubocop:disable Rails/HasManyOrHasOneDependent
@@ -102,6 +105,7 @@ class Status < ApplicationRecord
validates :reblog, uniqueness: { scope: :account }, if: :reblog?
validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog?
validates :content_type, inclusion: { in: %w(text/plain text/markdown text/html) }, allow_nil: true
+ validates :quote_visibility, inclusion: { in: %w(public unlisted) }, if: :quote?
accepts_nested_attributes_for :poll
@@ -178,6 +182,17 @@ class Status < ApplicationRecord
account: [:account_stat, user: :role],
active_mentions: :account,
],
+ quote: [
+ :application,
+ :tags,
+ :media_attachments,
+ :conversation,
+ :status_stat,
+ :preloadable_poll,
+ preview_cards_status: [:preview_card],
+ account: [:account_stat, :user],
+ active_mentions: { account: :account_stat },
+ ],
thread: :account
delegate :domain, to: :account, prefix: true
@@ -212,6 +227,14 @@ class Status < ApplicationRecord
!reblog_of_id.nil?
end
+ def quote?
+ !quote_id.nil? && quote
+ end
+
+ def quote_visibility
+ quote&.visibility
+ end
+
def within_realtime_window?
created_at >= REAL_TIME_WINDOW.ago
end
@@ -284,7 +307,7 @@ class Status < ApplicationRecord
fields = [spoiler_text, text]
fields += preloadable_poll.options unless preloadable_poll.nil?
- @emojis = CustomEmoji.from_text(fields.join(' '), account.domain)
+ @emojis = CustomEmoji.from_text(fields.join(' '), account.domain) + (quote? ? CustomEmoji.from_text([quote.spoiler_text, quote.text].join(' '), quote.account.domain) : [])
end
def ordered_media_attachments
diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb
index 165b5403ec..5fca5cf89b 100644
--- a/app/models/status_edit.rb
+++ b/app/models/status_edit.rb
@@ -64,6 +64,10 @@ class StatusEdit < ApplicationRecord
end.take(Status::MEDIA_ATTACHMENTS_LIMIT)
end
+ def quote?
+ status.quote?
+ end
+
def proper
self
end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 52ffaf7170..28122393c2 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -3,7 +3,7 @@
class ActivityPub::NoteSerializer < ActivityPub::Serializer
include FormattingHelper
- context_extensions :atom_uri, :conversation, :sensitive, :voters_count, :direct_message
+ context_extensions :atom_uri, :conversation, :sensitive, :voters_count, :direct_message, :quote_uri
attributes :id, :type, :summary,
:in_reply_to, :published, :url,
@@ -11,6 +11,8 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
:atom_uri, :in_reply_to_atom_uri,
:conversation
+ attribute :quote_uri, if: -> { object.quote? }
+
attribute :content
attribute :content_map, if: :language?
attribute :updated, if: :edited?
@@ -150,6 +152,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
end
end
+ def quote_uri
+ ActivityPub::TagManager.instance.uri_for(object.quote) if object.quote?
+ end
+
def local?
object.account.local?
end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 96bdd600cf..3638e871b1 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -202,3 +202,13 @@ class REST::StatusSerializer < ActiveModel::Serializer
end
end
end
+
+class REST::QuoteStatusSerializer < REST::StatusSerializer
+ attribute :quote do
+ nil
+ end
+end
+
+class REST::StatusSerializer < ActiveModel::Serializer
+ belongs_to :quote, serializer: REST::QuoteStatusSerializer
+end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index adabb1096e..7e36462b6f 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -75,7 +75,7 @@ class FetchLinkCardService < BaseService
@status.text.scan(URL_PATTERN).map { |array| Addressable::URI.parse(array[1]).normalize }
else
document = Nokogiri::HTML(@status.text)
- links = document.css('a')
+ links = document.css(':not(.quote-inline) > a')
links.filter_map { |a| Addressable::URI.parse(a['href']) unless skip_link?(a) }.filter_map(&:normalize)
end
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index f67064c9a1..8c38f00ae3 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -31,6 +31,7 @@ class PostStatusService < BaseService
# @option [String] :idempotency Optional idempotency key
# @option [Boolean] :with_rate_limit
# @option [Enumerable] :allowed_mentions Optional array of expected mentioned account IDs, raises `UnexpectedMentionsError` if unexpected accounts end up in mentions
+ # @option [String] :quote_id
# @return [Status]
def call(account, options = {})
@account = account
@@ -210,6 +211,7 @@ class PostStatusService < BaseService
application: @options[:application],
content_type: @options[:content_type] || @account.user&.setting_default_content_type,
rate_limit: @options[:with_rate_limit],
+ quote_id: @options[:quote_id],
}.compact
end
diff --git a/app/views/statuses/_detailed_status.html.haml b/app/views/statuses/_detailed_status.html.haml
index c55dff5d96..39b6d4824b 100644
--- a/app/views/statuses/_detailed_status.html.haml
+++ b/app/views/statuses/_detailed_status.html.haml
@@ -15,7 +15,11 @@
= account_action_button(status.account)
+ - if status.quote?
+ = render partial: "statuses/quote_status", locals: {status: status.quote}
+
.status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
+
- if status.spoiler_text?
%p<
%span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}
diff --git a/app/views/statuses/_quote_status.html.haml b/app/views/statuses/_quote_status.html.haml
new file mode 100644
index 0000000000..514e04800c
--- /dev/null
+++ b/app/views/statuses/_quote_status.html.haml
@@ -0,0 +1,38 @@
+.status.quote-status{ dataurl: ActivityPub::TagManager.instance.url_for(status) }
+ = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener noreferrer' do
+ .status__avatar
+ %div
+ - if prefers_autoplay?
+ = image_tag status.account.avatar_original_url, alt: '', class: 'u-photo account__avatar'
+ - else
+ = image_tag status.account.avatar_static_url, alt: '', class: 'u-photo account__avatar'
+ %span.display-name
+ %bdi
+ %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: prefers_autoplay?)
+
+ %span.display-name__account
+ = acct(status.account)
+ = fa_icon('lock') if status.account.locked?
+
+ .status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
+
+ - if status.spoiler_text?
+ %p<
+ %span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}
+ %button.status__content__spoiler-link= t('statuses.show_more')
+ .e-content{ lang: status.language }<
+ = prerender_custom_emojis(status_content_format(status), status.emojis)
+
+ - if status.preloadable_poll
+ = render_poll_component(status)
+
+ - if !status.ordered_media_attachments.empty?
+ - if status.ordered_media_attachments.first.video?
+ = render_video_component(status, width: 610, height: 343)
+ - elsif status.ordered_media_attachments.first.audio?
+ = render_audio_component(status, width: 610, height: 343)
+ - else
+ = render_media_gallery_component(status, height: 343)
+ - elsif status.preview_card
+ = render_card_component(status)
+
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 6aa4d23dab..31ad335aa2 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -27,7 +27,12 @@
%span.display-name__account
= acct(status.account)
= fa_icon('lock') if status.account.locked?
+
+ - if status.quote?
+ = render partial: "statuses/quote_status", locals: {status: status.quote}
+
.status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
+
- if status.spoiler_text?
%p<
%span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}
diff --git a/db/migrate/20221224204906_add_quote_id_to_statuses.rb b/db/migrate/20221224204906_add_quote_id_to_statuses.rb
new file mode 100644
index 0000000000..b01f6520a2
--- /dev/null
+++ b/db/migrate/20221224204906_add_quote_id_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddQuoteIdToStatuses < ActiveRecord::Migration[6.1]
+ def change
+ add_column :statuses, :quote_id, :bigint, null: true, default: nil
+ end
+end
diff --git a/db/migrate/20221224220348_add_index_to_statuses_quote_id.rb b/db/migrate/20221224220348_add_index_to_statuses_quote_id.rb
new file mode 100644
index 0000000000..2a51daf883
--- /dev/null
+++ b/db/migrate/20221224220348_add_index_to_statuses_quote_id.rb
@@ -0,0 +1,7 @@
+class AddIndexToStatusesQuoteId < ActiveRecord::Migration[6.1]
+ disable_ddl_transaction!
+
+ def change
+ add_index :statuses, :quote_id, algorithm: :concurrently
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 762ef132e0..160d11adf7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1085,6 +1085,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_12_064044) do
t.datetime "edited_at", precision: nil
t.boolean "trendable"
t.bigint "ordered_media_attachment_ids", array: true
+ t.bigint "quote_id"
t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
t.index ["account_id"], name: "index_statuses_on_account_id"
t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"
@@ -1092,6 +1093,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_07_12_064044) do
t.index ["id", "account_id"], name: "index_statuses_public_20200119", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
t.index ["in_reply_to_account_id"], name: "index_statuses_on_in_reply_to_account_id", where: "(in_reply_to_account_id IS NOT NULL)"
t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", where: "(in_reply_to_id IS NOT NULL)"
+ t.index ["quote_id"], name: "index_statuses_on_quote_id"
t.index ["reblog_of_id", "account_id"], name: "index_statuses_on_reblog_of_id_and_account_id"
t.index ["uri"], name: "index_statuses_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
end
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index 5bc6da6ebe..bff81804be 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -31,6 +31,7 @@ class Sanitize
next true if /^(h|p|u|dt|e)-/.match?(e) # microformats classes
next true if /^(mention|hashtag)$/.match?(e) # semantic classes
next true if /^(ellipsis|invisible)$/.match?(e) # link formatting classes
+ next true if /^quote-inline$/.match?(e) # quote inline classes
end
node['class'] = class_list.join(' ')