diff options
23 files changed, 516 insertions, 447 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index a95aabf1d..37a1e540f 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -13,7 +13,7 @@ class AccountsController < ApplicationController format.atom do @entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id]) - render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a)) + render xml: Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, @entries.to_a)) end format.json do diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb index 54a435238..e3db77caa 100644 --- a/app/controllers/stream_entries_controller.rb +++ b/app/controllers/stream_entries_controller.rb @@ -19,7 +19,7 @@ class StreamEntriesController < ApplicationController end format.atom do - render xml: AtomSerializer.render(AtomSerializer.new.entry(@stream_entry, true)) + render xml: Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.entry(@stream_entry, true)) end end end diff --git a/app/lib/ostatus/activity/base.rb b/app/lib/ostatus/activity/base.rb new file mode 100644 index 000000000..f528815b3 --- /dev/null +++ b/app/lib/ostatus/activity/base.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +class Ostatus::Activity::Base + def initialize(xml, account = nil) + @xml = xml + @account = account + end + + def status? + [:activity, :note, :comment].include?(type) + end + + def verb + raw = @xml.at_xpath('./activity:verb', activity: TagManager::AS_XMLNS).content + TagManager::VERBS.key(raw) + rescue + :post + end + + def type + raw = @xml.at_xpath('./activity:object-type', activity: TagManager::AS_XMLNS).content + TagManager::TYPES.key(raw) + rescue + :activity + end + + def id + @xml.at_xpath('./xmlns:id', xmlns: TagManager::XMLNS).content + end + + def url + link = @xml.at_xpath('./xmlns:link[@rel="alternate"]', xmlns: TagManager::XMLNS) + link.nil? ? nil : link['href'] + end + + private + + def find_status(uri) + if TagManager.instance.local_id?(uri) + local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status') + return Status.find_by(id: local_id) + end + + Status.find_by(uri: uri) + end + + def redis + Redis.current + end +end diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb new file mode 100644 index 000000000..c54d64fd7 --- /dev/null +++ b/app/lib/ostatus/activity/creation.rb @@ -0,0 +1,149 @@ +# frozen_string_literal: true + +class Ostatus::Activity::Creation < Ostatus::Activity::Base + def perform + if redis.exists("delete_upon_arrival:#{@account.id}:#{id}") + Rails.logger.debug "Delete for status #{id} was queued, ignoring" + return [nil, false] + end + + return [nil, false] if @account.suspended? + + Rails.logger.debug "Creating remote status #{id}" + + # Return early if status already exists in db + status = find_status(id) + + return [status, false] unless status.nil? + + status = Status.create!( + uri: id, + url: url, + account: @account, + reblog: reblog, + text: content, + spoiler_text: content_warning, + created_at: published, + reply: thread?, + language: content_language, + visibility: visibility_scope, + conversation: find_or_create_conversation, + thread: thread? ? find_status(thread.first) : nil + ) + + save_mentions(status) + save_hashtags(status) + save_media(status) + + if thread? && status.thread.nil? + Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}" + ThreadResolveWorker.perform_async(status.id, thread.second) + end + + Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution" + + LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? + DistributionWorker.perform_async(status.id) + + [status, true] + end + + def content + @xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content + end + + def content_language + @xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['xml:lang']&.presence || 'en' + end + + def content_warning + @xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || '' + end + + def visibility_scope + @xml.at_xpath('./mastodon:scope', mastodon: TagManager::MTDN_XMLNS)&.content&.to_sym || :public + end + + def published + @xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content + end + + def thread? + !@xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS).nil? + end + + def thread + thr = @xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS) + [thr['ref'], thr['href']] + end + + private + + def find_or_create_conversation + uri = @xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content + return if uri.nil? + + if TagManager.instance.local_id?(uri) + local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Conversation') + return Conversation.find_by(id: local_id) + end + + Conversation.find_by(uri: uri) || Conversation.create!(uri: uri) + end + + def save_mentions(parent) + processed_account_ids = [] + + @xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: TagManager::XMLNS).each do |link| + next if [TagManager::TYPES[:group], TagManager::TYPES[:collection]].include? link['ostatus:object-type'] + + mentioned_account = account_from_href(link['href']) + + next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id) + + mentioned_account.mentions.where(status: parent).first_or_create(status: parent) + + # So we can skip duplicate mentions + processed_account_ids << mentioned_account.id + end + end + + def save_hashtags(parent) + tags = @xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?) + ProcessHashtagsService.new.call(parent, tags) + end + + def save_media(parent) + do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media? + + @xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link| + next unless link['href'] + + media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href']) + parsed_url = Addressable::URI.parse(link['href']).normalize + + next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? + + media.save + + next if do_not_download + + begin + media.file_remote_url = link['href'] + media.save! + rescue ActiveRecord::RecordInvalid + next + end + end + end + + def account_from_href(href) + url = Addressable::URI.parse(href).normalize + + if TagManager.instance.web_domain?(url.host) + Account.find_local(url.path.gsub('/users/', '')) + else + Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href) + end + end +end diff --git a/app/lib/ostatus/activity/deletion.rb b/app/lib/ostatus/activity/deletion.rb new file mode 100644 index 000000000..c4d05a467 --- /dev/null +++ b/app/lib/ostatus/activity/deletion.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class Ostatus::Activity::Deletion < Ostatus::Activity::Base + def perform + Rails.logger.debug "Deleting remote status #{id}" + status = Status.find_by(uri: id, account: @account) + + if status.nil? + redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id) + else + RemoveStatusService.new.call(status) + end + end +end diff --git a/app/lib/ostatus/activity/general.rb b/app/lib/ostatus/activity/general.rb new file mode 100644 index 000000000..3ff7a039a --- /dev/null +++ b/app/lib/ostatus/activity/general.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +class Ostatus::Activity::General < Ostatus::Activity::Base + def specialize + special_class&.new(@xml, @account) + end + + private + + def special_class + case verb + when :post + Ostatus::Activity::Post + when :share + Ostatus::Activity::Share + when :delete + Ostatus::Activity::Deletion + end + end +end diff --git a/app/lib/ostatus/activity/post.rb b/app/lib/ostatus/activity/post.rb new file mode 100644 index 000000000..8028db2f8 --- /dev/null +++ b/app/lib/ostatus/activity/post.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class Ostatus::Activity::Post < Ostatus::Activity::Creation + def perform + status, just_created = super + + if just_created + status.mentions.includes(:account).each do |mention| + mentioned_account = mention.account + next unless mentioned_account.local? + NotifyService.new.call(mentioned_account, mention) + end + end + + status + end + + private + + def reblog + nil + end +end diff --git a/app/lib/ostatus/activity/remote.rb b/app/lib/ostatus/activity/remote.rb new file mode 100644 index 000000000..755f885e6 --- /dev/null +++ b/app/lib/ostatus/activity/remote.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class Ostatus::Activity::Remote < Ostatus::Activity::Base + def perform + find_status(id) || FetchRemoteStatusService.new.call(url) + end +end diff --git a/app/lib/ostatus/activity/share.rb b/app/lib/ostatus/activity/share.rb new file mode 100644 index 000000000..73aac58ed --- /dev/null +++ b/app/lib/ostatus/activity/share.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +class Ostatus::Activity::Share < Ostatus::Activity::Creation + def perform + return if reblog.nil? + + status, just_created = super + NotifyService.new.call(reblog.account, status) if reblog.account.local? && just_created + status + end + + def object + @xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS) + end + + private + + def reblog + return @reblog if defined? @reblog + + original_status = Ostatus::Activity::Remote.new(object).perform + return if original_status.nil? + + @reblog = original_status.reblog? ? original_status.reblog : original_status + end +end diff --git a/app/lib/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb index b14d596dd..909d84df3 100644 --- a/app/lib/atom_serializer.rb +++ b/app/lib/ostatus/atom_serializer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -class AtomSerializer +class Ostatus::AtomSerializer include RoutingHelper include ActionView::Helpers::SanitizeHelper diff --git a/app/services/authorize_follow_service.rb b/app/services/authorize_follow_service.rb index 97c76bee1..a25d11dbd 100644 --- a/app/services/authorize_follow_service.rb +++ b/app/services/authorize_follow_service.rb @@ -10,6 +10,6 @@ class AuthorizeFollowService < BaseService private def build_xml(follow_request) - AtomSerializer.render(AtomSerializer.new.authorize_follow_request_salmon(follow_request)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)) end end diff --git a/app/services/block_service.rb b/app/services/block_service.rb index d59b47afb..15420e192 100644 --- a/app/services/block_service.rb +++ b/app/services/block_service.rb @@ -18,6 +18,6 @@ class BlockService < BaseService private def build_xml(block) - AtomSerializer.render(AtomSerializer.new.block_salmon(block)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.block_salmon(block)) end end diff --git a/app/services/concerns/stream_entry_renderer.rb b/app/services/concerns/stream_entry_renderer.rb index ef176d8a6..d9c30c53c 100644 --- a/app/services/concerns/stream_entry_renderer.rb +++ b/app/services/concerns/stream_entry_renderer.rb @@ -2,6 +2,6 @@ module StreamEntryRenderer def stream_entry_to_xml(stream_entry) - AtomSerializer.render(AtomSerializer.new.entry(stream_entry, true)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.entry(stream_entry, true)) end end diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb index 90267af33..a08aba638 100644 --- a/app/services/favourite_service.rb +++ b/app/services/favourite_service.rb @@ -28,6 +28,6 @@ class FavouriteService < BaseService private def build_xml(favourite) - AtomSerializer.render(AtomSerializer.new.favourite_salmon(favourite)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.favourite_salmon(favourite)) end end diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index e54ff7d0f..7a7275b6e 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -57,10 +57,10 @@ class FollowService < BaseService end def build_follow_request_xml(follow_request) - AtomSerializer.render(AtomSerializer.new.follow_request_salmon(follow_request)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.follow_request_salmon(follow_request)) end def build_follow_xml(follow) - AtomSerializer.render(AtomSerializer.new.follow_salmon(follow)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.follow_salmon(follow)) end end diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index c335d2159..b99048a06 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -16,274 +16,14 @@ class ProcessFeedService < BaseService end def process_entries(xml, account) - xml.xpath('//xmlns:entry', xmlns: TagManager::XMLNS).reverse_each.map { |entry| ProcessEntry.new.call(entry, account) }.compact + xml.xpath('//xmlns:entry', xmlns: TagManager::XMLNS).reverse_each.map { |entry| process_entry(entry, account) }.compact end - class ProcessEntry - def call(xml, account) - @account = account - @xml = xml - - return if skip_unsupported_type? - - case verb - when :post, :share - return create_status - when :delete - return delete_status - end - rescue ActiveRecord::RecordInvalid => e - Rails.logger.debug "Nothing was saved for #{id} because: #{e}" - nil - end - - private - - def create_status - if redis.exists("delete_upon_arrival:#{@account.id}:#{id}") - Rails.logger.debug "Delete for status #{id} was queued, ignoring" - return - end - - status, just_created = nil - - Rails.logger.debug "Creating remote status #{id}" - - if verb == :share - original_status = shared_status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS)) - return nil if original_status.nil? - end - - ApplicationRecord.transaction do - status, just_created = status_from_xml(@xml) - - return if status.nil? - return status unless just_created - - if verb == :share - status.reblog = original_status.reblog? ? original_status.reblog : original_status - end - - status.save! - end - - if thread?(@xml) && status.thread.nil? - Rails.logger.debug "Trying to attach #{status.id} (#{id(@xml)}) to #{thread(@xml).first}" - ThreadResolveWorker.perform_async(status.id, thread(@xml).second) - end - - notify_about_mentions!(status) unless status.reblog? - notify_about_reblog!(status) if status.reblog? && status.reblog.account.local? - - Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution" - - LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text? - DistributionWorker.perform_async(status.id) - - status - end - - def notify_about_mentions!(status) - status.mentions.includes(:account).each do |mention| - mentioned_account = mention.account - next unless mentioned_account.local? - NotifyService.new.call(mentioned_account, mention) - end - end - - def notify_about_reblog!(status) - NotifyService.new.call(status.reblog.account, status) - end - - def delete_status - Rails.logger.debug "Deleting remote status #{id}" - status = Status.find_by(uri: id, account: @account) - - if status.nil? - redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id) - else - RemoveStatusService.new.call(status) - end - end - - def skip_unsupported_type? - !([:post, :share, :delete].include?(verb) && [:activity, :note, :comment].include?(type)) - end - - def shared_status_from_xml(entry) - status = find_status(id(entry)) - - return status unless status.nil? - - FetchRemoteStatusService.new.call(url(entry)) - end - - def status_from_xml(entry) - # Return early if status already exists in db - status = find_status(id(entry)) - - return [status, false] unless status.nil? - - account = @account - - return [nil, false] if account.suspended? - - status = Status.create!( - uri: id(entry), - url: url(entry), - account: account, - text: content(entry), - spoiler_text: content_warning(entry), - created_at: published(entry), - reply: thread?(entry), - language: content_language(entry), - visibility: visibility_scope(entry), - conversation: find_or_create_conversation(entry), - thread: thread?(entry) ? find_status(thread(entry).first) : nil - ) - - mentions_from_xml(status, entry) - hashtags_from_xml(status, entry) - media_from_xml(status, entry) - - [status, true] - end - - def find_or_create_conversation(xml) - uri = xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content - return if uri.nil? - - if TagManager.instance.local_id?(uri) - local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Conversation') - return Conversation.find_by(id: local_id) - end - - Conversation.find_by(uri: uri) || Conversation.create!(uri: uri) - end - - def find_status(uri) - if TagManager.instance.local_id?(uri) - local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status') - return Status.find_by(id: local_id) - end - - Status.find_by(uri: uri) - end - - def mentions_from_xml(parent, xml) - processed_account_ids = [] - - xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: TagManager::XMLNS).each do |link| - next if [TagManager::TYPES[:group], TagManager::TYPES[:collection]].include? link['ostatus:object-type'] - - mentioned_account = account_from_href(link['href']) - - next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id) - - mentioned_account.mentions.where(status: parent).first_or_create(status: parent) - - # So we can skip duplicate mentions - processed_account_ids << mentioned_account.id - end - end - - def account_from_href(href) - url = Addressable::URI.parse(href).normalize - - if TagManager.instance.web_domain?(url.host) - Account.find_local(url.path.gsub('/users/', '')) - else - Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href) - end - end - - def hashtags_from_xml(parent, xml) - tags = xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?) - ProcessHashtagsService.new.call(parent, tags) - end - - def media_from_xml(parent, xml) - do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media? - - xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link| - next unless link['href'] - - media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href']) - parsed_url = Addressable::URI.parse(link['href']).normalize - - next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? - - media.save - - next if do_not_download - - begin - media.file_remote_url = link['href'] - media.save! - rescue ActiveRecord::RecordInvalid - next - end - end - end - - def id(xml = @xml) - xml.at_xpath('./xmlns:id', xmlns: TagManager::XMLNS).content - end - - def verb(xml = @xml) - raw = xml.at_xpath('./activity:verb', activity: TagManager::AS_XMLNS).content - TagManager::VERBS.key(raw) - rescue - :post - end - - def type(xml = @xml) - raw = xml.at_xpath('./activity:object-type', activity: TagManager::AS_XMLNS).content - TagManager::TYPES.key(raw) - rescue - :activity - end - - def url(xml = @xml) - link = xml.at_xpath('./xmlns:link[@rel="alternate"]', xmlns: TagManager::XMLNS) - link.nil? ? nil : link['href'] - end - - def content(xml = @xml) - xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content - end - - def content_language(xml = @xml) - xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['xml:lang']&.presence || 'en' - end - - def content_warning(xml = @xml) - xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || '' - end - - def visibility_scope(xml = @xml) - xml.at_xpath('./mastodon:scope', mastodon: TagManager::MTDN_XMLNS)&.content&.to_sym || :public - end - - def published(xml = @xml) - xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content - end - - def thread?(xml = @xml) - !xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS).nil? - end - - def thread(xml = @xml) - thr = xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS) - [thr['ref'], thr['href']] - end - - def account?(xml = @xml) - !xml.at_xpath('./xmlns:author', xmlns: TagManager::XMLNS).nil? - end - - def redis - Redis.current - end + def process_entry(xml, account) + activity = Ostatus::Activity::General.new(xml, account) + activity.specialize&.perform if activity.status? + rescue ActiveRecord::RecordInvalid => e + Rails.logger.debug "Nothing was saved for #{id} because: #{e}" + nil end end diff --git a/app/services/reject_follow_service.rb b/app/services/reject_follow_service.rb index 675007938..87fc49b34 100644 --- a/app/services/reject_follow_service.rb +++ b/app/services/reject_follow_service.rb @@ -10,6 +10,6 @@ class RejectFollowService < BaseService private def build_xml(follow_request) - AtomSerializer.render(AtomSerializer.new.reject_follow_request_salmon(follow_request)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)) end end diff --git a/app/services/unblock_service.rb b/app/services/unblock_service.rb index 3a3fd2d8c..50c2dc2f0 100644 --- a/app/services/unblock_service.rb +++ b/app/services/unblock_service.rb @@ -11,6 +11,6 @@ class UnblockService < BaseService private def build_xml(block) - AtomSerializer.render(AtomSerializer.new.unblock_salmon(block)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unblock_salmon(block)) end end diff --git a/app/services/unfavourite_service.rb b/app/services/unfavourite_service.rb index a32e87bff..ede3caad1 100644 --- a/app/services/unfavourite_service.rb +++ b/app/services/unfavourite_service.rb @@ -13,6 +13,6 @@ class UnfavouriteService < BaseService private def build_xml(favourite) - AtomSerializer.render(AtomSerializer.new.unfavourite_salmon(favourite)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)) end end diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb index 9b39f4945..0c9a5f657 100644 --- a/app/services/unfollow_service.rb +++ b/app/services/unfollow_service.rb @@ -14,6 +14,6 @@ class UnfollowService < BaseService private def build_xml(follow) - AtomSerializer.render(AtomSerializer.new.unfollow_salmon(follow)) + Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unfollow_salmon(follow)) end end diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb index 7592354cc..9c1fa76cb 100644 --- a/app/workers/pubsubhubbub/distribution_worker.rb +++ b/app/workers/pubsubhubbub/distribution_worker.rb @@ -22,7 +22,7 @@ class Pubsubhubbub::DistributionWorker def distribute_public!(stream_entries) return if stream_entries.empty? - @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries)) + @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries)) Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions) do |subscription| [subscription.id, @payload] @@ -32,7 +32,7 @@ class Pubsubhubbub::DistributionWorker def distribute_hidden!(stream_entries) return if stream_entries.empty? - @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries)) + @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries)) @domains = @account.followers.domains Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url, s.domain) }) do |subscription| diff --git a/spec/lib/atom_serializer_spec.rb b/spec/lib/ostatus/atom_serializer_spec.rb index d14fc5b40..8caef9355 100644 --- a/spec/lib/atom_serializer_spec.rb +++ b/spec/lib/ostatus/atom_serializer_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -RSpec.describe AtomSerializer do +RSpec.describe Ostatus::AtomSerializer do shared_examples 'follow request salmon' do it 'appends author element with account' do account = Fabricate(:account, domain: nil, username: 'username') @@ -108,7 +108,7 @@ RSpec.describe AtomSerializer do it 'returns XML with emojis' do element = Ox::Element.new('tag') element << '💩' - xml = AtomSerializer.render(element) + xml = Ostatus::AtomSerializer.render(element) expect(xml).to eq "<?xml version=\"1.0\"?>\n<tag>💩</tag>\n" end @@ -116,7 +116,7 @@ RSpec.describe AtomSerializer do it 'returns XML, stripping invalid characters like \b and \v' do element = Ox::Element.new('tag') element << "im l33t\b haxo\b\vr" - xml = AtomSerializer.render(element) + xml = Ostatus::AtomSerializer.render(element) expect(xml).to eq "<?xml version=\"1.0\"?>\n<tag>im l33t haxor</tag>\n" end @@ -127,7 +127,7 @@ RSpec.describe AtomSerializer do it 'appends poco:note element with note for local account' do account = Fabricate(:account, domain: nil, note: '<p>note</p>') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) note = author.nodes.find { |node| node.name == 'poco:note' } expect(note.text).to eq '<p>note</p>' @@ -136,7 +136,7 @@ RSpec.describe AtomSerializer do it 'appends poco:note element with tags-stripped note for remote account' do account = Fabricate(:account, domain: 'remote', note: '<p>note</p>') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) note = author.nodes.find { |node| node.name == 'poco:note' } expect(note.text).to eq 'note' @@ -144,7 +144,7 @@ RSpec.describe AtomSerializer do it 'appends summary element with type attribute and simplified note if present' do account = Fabricate(:account, note: 'note') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) expect(author.summary.text).to eq '<p>note</p>' expect(author.summary[:type]).to eq 'html' end @@ -153,27 +153,27 @@ RSpec.describe AtomSerializer do context 'when note is not present' do it 'does not append poco:note element' do account = Fabricate(:account, note: '') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) author.nodes.each { |node| expect(node.name).not_to eq 'poco:note' } end it 'does not append summary element' do account = Fabricate(:account, note: '') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) author.nodes.each { |node| expect(node.name).not_to eq 'summary' } end end it 'returns author element' do account = Fabricate(:account) - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) expect(author.name).to eq 'author' end it 'appends activity:object-type element with person type' do account = Fabricate(:account, domain: nil, username: 'username') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) object_type = author.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:person] @@ -181,20 +181,20 @@ RSpec.describe AtomSerializer do it 'appends email element with username and domain for local account' do account = Fabricate(:account, username: 'username') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) expect(author.email.text).to eq 'username@cb6e6126.ngrok.io' end it 'appends email element with username and domain for remote user' do account = Fabricate(:account, domain: 'domain', username: 'username') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) expect(author.email.text).to eq 'username@domain' end it 'appends link element for an alternative' do account = Fabricate(:account, domain: nil, username: 'username') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' } expect(link[:type]).to eq 'text/html' @@ -205,7 +205,7 @@ RSpec.describe AtomSerializer do it 'has link element for avatar if present' do account = Fabricate(:account, avatar: attachment_fixture('avatar.gif')) - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'avatar' } expect(link[:type]).to eq 'image/gif' @@ -217,7 +217,7 @@ RSpec.describe AtomSerializer do it 'does not have link element for avatar if not present' do account = Fabricate(:account, avatar: nil) - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) author.nodes.each do |node| expect(node[:rel]).not_to eq 'avatar' if node.name == 'link' @@ -227,7 +227,7 @@ RSpec.describe AtomSerializer do it 'appends link element for header if present' do account = Fabricate(:account, header: attachment_fixture('avatar.gif')) - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'header' } expect(link[:type]).to eq 'image/gif' @@ -239,7 +239,7 @@ RSpec.describe AtomSerializer do it 'does not append link element for header if not present' do account = Fabricate(:account, header: nil) - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) author.nodes.each do |node| expect(node[:rel]).not_to eq 'header' if node.name == 'link' @@ -249,7 +249,7 @@ RSpec.describe AtomSerializer do it 'appends poco:displayName element with display name if present' do account = Fabricate(:account, display_name: 'display name') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) display_name = author.nodes.find { |node| node.name == 'poco:displayName' } expect(display_name.text).to eq 'display name' @@ -257,14 +257,14 @@ RSpec.describe AtomSerializer do it 'does not append poco:displayName element with display name if not present' do account = Fabricate(:account, display_name: '') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) author.nodes.each { |node| expect(node.name).not_to eq 'poco:displayName' } end it "appends mastodon:scope element with 'private' if locked" do account = Fabricate(:account, locked: true) - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) scope = author.nodes.find { |node| node.name == 'mastodon:scope' } expect(scope.text).to eq 'private' @@ -273,7 +273,7 @@ RSpec.describe AtomSerializer do it "appends mastodon:scope element with 'public' if unlocked" do account = Fabricate(:account, locked: false) - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) scope = author.nodes.find { |node| node.name == 'mastodon:scope' } expect(scope.text).to eq 'public' @@ -282,7 +282,7 @@ RSpec.describe AtomSerializer do it 'includes URI' do account = Fabricate(:account, domain: nil, username: 'username') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) expect(author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' expect(author.uri.text).to eq 'https://cb6e6126.ngrok.io/users/username' @@ -291,7 +291,7 @@ RSpec.describe AtomSerializer do it 'includes username' do account = Fabricate(:account, username: 'username') - author = AtomSerializer.new.author(account) + author = Ostatus::AtomSerializer.new.author(account) name = author.nodes.find { |node| node.name == 'name' } username = author.nodes.find { |node| node.name == 'poco:preferredUsername' } @@ -317,7 +317,7 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize stream_entry = Fabricate(:stream_entry) - AtomSerializer.new.entry(stream_entry, true) + Ostatus::AtomSerializer.new.entry(stream_entry, true) end end @@ -325,7 +325,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, username: 'username') status = Fabricate(:status, account: account) - entry = AtomSerializer.new.entry(status.stream_entry, true) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry, true) expect(entry.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' end @@ -334,14 +334,14 @@ RSpec.describe AtomSerializer do context 'if status is present' do include_examples 'status attributes' do def serialize(status) - AtomSerializer.new.entry(status.stream_entry, true) + Ostatus::AtomSerializer.new.entry(status.stream_entry, true) end end it 'appends link element for the public collection if status is publicly visible' do status = Fabricate(:status, visibility: :public) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) mentioned_person = entry.nodes.find do |node| node.name == 'link' && @@ -354,7 +354,7 @@ RSpec.describe AtomSerializer do it 'does not append link element for the public collection if status is not publicly visible' do status = Fabricate(:status, visibility: :private) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) entry.nodes.each do |node| if node.name == 'link' && @@ -369,14 +369,14 @@ RSpec.describe AtomSerializer do tag = Fabricate(:tag, name: 'tag') status = Fabricate(:status, tags: [ tag ]) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) expect(entry.category[:term]).to eq 'tag' end it 'appends category element for NSFW if status is sensitive' do status = Fabricate(:status, sensitive: true) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) expect(entry.category[:term]).to eq 'nsfw' end @@ -385,7 +385,7 @@ RSpec.describe AtomSerializer do media_attachment = Fabricate(:media_attachment, file: file) status = Fabricate(:status, media_attachments: [ media_attachment ]) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) enclosure = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'enclosure' } expect(enclosure[:type]).to eq 'image/jpeg' @@ -395,7 +395,7 @@ RSpec.describe AtomSerializer do it 'appends mastodon:scope element with visibility' do status = Fabricate(:status, visibility: :public) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) scope = entry.nodes.find { |node| node.name == 'mastodon:scope' } expect(scope.text).to eq 'public' @@ -406,8 +406,8 @@ RSpec.describe AtomSerializer do remote_status = Fabricate(:status, account: remote_account) remote_status.stream_entry.update!(created_at: '2000-01-01T00:00:00Z') - entry = AtomSerializer.new.entry(remote_status.stream_entry, true) - xml = AtomSerializer.render(entry).gsub('cb6e6126.ngrok.io', 'remote') + entry = Ostatus::AtomSerializer.new.entry(remote_status.stream_entry, true) + xml = Ostatus::AtomSerializer.render(entry).gsub('cb6e6126.ngrok.io', 'remote') remote_status.destroy! remote_account.destroy! @@ -429,7 +429,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status) status.destroy! - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) expect(entry.content.text).to eq 'Deleted status' end @@ -439,7 +439,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status, account: account) status.destroy! - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) expect(entry.title.text).to eq 'username deleted status' end @@ -447,19 +447,19 @@ RSpec.describe AtomSerializer do context 'it is not root' do let(:stream_entry) { Fabricate(:stream_entry) } - subject { AtomSerializer.new.entry(stream_entry, false) } + subject { Ostatus::AtomSerializer.new.entry(stream_entry, false) } include_examples 'not root' end context 'without root parameter' do let(:stream_entry) { Fabricate(:stream_entry) } - subject { AtomSerializer.new.entry(stream_entry) } + subject { Ostatus::AtomSerializer.new.entry(stream_entry) } include_examples 'not root' end it 'returns entry element' do stream_entry = Fabricate(:stream_entry) - entry = AtomSerializer.new.entry(stream_entry) + entry = Ostatus::AtomSerializer.new.entry(stream_entry) expect(entry.name).to eq 'entry' end @@ -467,33 +467,33 @@ RSpec.describe AtomSerializer do status = Fabricate(:status, reblog_of_id: nil) status.stream_entry.update!(created_at: '2000-01-01T00:00:00Z') - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) expect(entry.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status" end it 'appends published element with created date' do stream_entry = Fabricate(:stream_entry, created_at: '2000-01-01T00:00:00Z') - entry = AtomSerializer.new.entry(stream_entry) + entry = Ostatus::AtomSerializer.new.entry(stream_entry) expect(entry.published.text).to eq '2000-01-01T00:00:00Z' end it 'appends updated element with updated date' do stream_entry = Fabricate(:stream_entry, updated_at: '2000-01-01T00:00:00Z') - entry = AtomSerializer.new.entry(stream_entry) + entry = Ostatus::AtomSerializer.new.entry(stream_entry) expect(entry.updated.text).to eq '2000-01-01T00:00:00Z' end it 'appends title element with status title' do account = Fabricate(:account, username: 'username') status = Fabricate(:status, account: account, reblog_of_id: nil) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) expect(entry.title.text).to eq 'New status by username' end it 'appends activity:object-type element with object type' do status = Fabricate(:status) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) object_type = entry.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:note] end @@ -501,7 +501,7 @@ RSpec.describe AtomSerializer do it 'appends activity:verb element with object type' do status = Fabricate(:status) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) object_type = entry.nodes.find { |node| node.name == 'activity:verb' } expect(object_type.text).to eq TagManager::VERBS[:post] @@ -511,7 +511,7 @@ RSpec.describe AtomSerializer do reblogged = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') reblog = Fabricate(:status, reblog: reblogged) - entry = AtomSerializer.new.entry(reblog.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(reblog.stream_entry) object = entry.nodes.find { |node| node.name == 'activity:object' } expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{reblogged.id}:objectType=Status" @@ -519,7 +519,7 @@ RSpec.describe AtomSerializer do it 'does not append activity:object element if target is not present' do status = Fabricate(:status, reblog_of_id: nil) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) entry.nodes.each { |node| expect(node.name).not_to eq 'activity:object' } end @@ -527,7 +527,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, username: 'username') status = Fabricate(:status, account: account) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' } expect(link[:type]).to eq 'text/html' @@ -538,7 +538,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, username: 'username') status = Fabricate(:status, account: account) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'self' } expect(link[:type]).to eq 'application/atom+xml' @@ -549,7 +549,7 @@ RSpec.describe AtomSerializer do in_reply_to_status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reblog_of_id: nil) reply_status = Fabricate(:status, in_reply_to_id: in_reply_to_status.id) - entry = AtomSerializer.new.entry(reply_status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(reply_status.stream_entry) in_reply_to = entry.nodes.find { |node| node.name == 'thr:in-reply-to' } expect(in_reply_to[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{in_reply_to_status.id}:objectType=Status" @@ -557,7 +557,7 @@ RSpec.describe AtomSerializer do it 'does not append thr:in-reply-to element if not threaded' do status = Fabricate(:status) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) entry.nodes.each { |node| expect(node.name).not_to eq 'thr:in-reply-to' } end @@ -565,7 +565,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status) status.conversation.update!(created_at: '2000-01-01T00:00:00Z') - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) conversation = entry.nodes.find { |node| node.name == 'ostatus:conversation' } expect(conversation[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.conversation_id}:objectType=Conversation" @@ -575,7 +575,7 @@ RSpec.describe AtomSerializer do status = Fabricate.build(:status, conversation_id: nil) status.save!(validate: false) - entry = AtomSerializer.new.entry(status.stream_entry) + entry = Ostatus::AtomSerializer.new.entry(status.stream_entry) entry.nodes.each { |node| expect(node.name).not_to eq 'ostatus:conversation' } end @@ -585,62 +585,62 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize account = Fabricate(:account) - AtomSerializer.new.feed(account, []) + Ostatus::AtomSerializer.new.feed(account, []) end end it 'returns feed element' do account = Fabricate(:account) - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) expect(feed.name).to eq 'feed' end it 'appends id element with account Atom URL' do account = Fabricate(:account, username: 'username') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) expect(feed.id.text).to eq 'https://cb6e6126.ngrok.io/users/username.atom' end it 'appends title element with account display name if present' do account = Fabricate(:account, display_name: 'display name') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) expect(feed.title.text).to eq 'display name' end it 'does not append title element with account username if account display name is not present' do account = Fabricate(:account, display_name: '', username: 'username') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) expect(feed.title.text).to eq 'username' end it 'appends subtitle element with account note' do account = Fabricate(:account, note: 'note') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) expect(feed.subtitle.text).to eq 'note' end it 'appends updated element with date account got updated' do account = Fabricate(:account, updated_at: '2000-01-01T00:00:00Z') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) expect(feed.updated.text).to eq '2000-01-01T00:00:00Z' end it 'appends logo element with full asset URL for original account avatar' do account = Fabricate(:account, avatar: attachment_fixture('avatar.gif')) - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) expect(feed.logo.text).to match /^https:\/\/cb6e6126.ngrok.io\/system\/accounts\/avatars\/.+\/original\/avatar.gif/ end it 'appends author element' do account = Fabricate(:account, username: 'username') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) expect(feed.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' end it 'appends link element for an alternative' do account = Fabricate(:account, username: 'username') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' } expect(link[:type]).to eq 'text/html' @@ -650,7 +650,7 @@ RSpec.describe AtomSerializer do it 'appends link element for itself' do account = Fabricate(:account, username: 'username') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'self' } expect(link[:type]).to eq 'application/atom+xml' @@ -661,7 +661,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, username: 'username') stream_entry = Fabricate(:stream_entry) - feed = AtomSerializer.new.feed(account, Array.new(20, stream_entry)) + feed = Ostatus::AtomSerializer.new.feed(account, Array.new(20, stream_entry)) link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'next' } expect(link[:type]).to eq 'application/atom+xml' @@ -671,7 +671,7 @@ RSpec.describe AtomSerializer do it 'does not append link element for the next if it does not have 20 stream entries' do account = Fabricate(:account, username: 'username') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) feed.nodes.each do |node| expect(node[:rel]).not_to eq 'next' if node.name == 'link' @@ -681,7 +681,7 @@ RSpec.describe AtomSerializer do it 'appends link element for hub' do account = Fabricate(:account, username: 'username') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'hub' } expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/api/push' @@ -690,7 +690,7 @@ RSpec.describe AtomSerializer do it 'appends link element for Salmon' do account = Fabricate(:account, username: 'username') - feed = AtomSerializer.new.feed(account, []) + feed = Ostatus::AtomSerializer.new.feed(account, []) link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'salmon' } expect(link[:href]).to start_with 'https://cb6e6126.ngrok.io/api/salmon/' @@ -700,7 +700,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, username: 'username') status = Fabricate(:status, account: account) - feed = AtomSerializer.new.feed(account, [status.stream_entry]) + feed = Ostatus::AtomSerializer.new.feed(account, [status.stream_entry]) expect(feed.entry.title.text).to eq 'New status by username' end @@ -710,13 +710,13 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize block = Fabricate(:block) - AtomSerializer.new.block_salmon(block) + Ostatus::AtomSerializer.new.block_salmon(block) end end it 'returns entry element' do block = Fabricate(:block) - block_salmon = AtomSerializer.new.block_salmon(block) + block_salmon = Ostatus::AtomSerializer.new.block_salmon(block) expect(block_salmon.name).to eq 'entry' end @@ -724,7 +724,7 @@ RSpec.describe AtomSerializer do block = Fabricate(:block) time_before = Time.now - block_salmon = AtomSerializer.new.block_salmon(block) + block_salmon = Ostatus::AtomSerializer.new.block_salmon(block) time_after = Time.now expect(block_salmon.id.text).to( @@ -738,7 +738,7 @@ RSpec.describe AtomSerializer do target_account = Fabricate(:account, domain: 'remote', username: 'target_account') block = Fabricate(:block, account: account, target_account: target_account) - block_salmon = AtomSerializer.new.block_salmon(block) + block_salmon = Ostatus::AtomSerializer.new.block_salmon(block) expect(block_salmon.title.text).to eq 'account no longer wishes to interact with target_account@remote' end @@ -747,7 +747,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, domain: nil, username: 'account') block = Fabricate(:block, account: account) - block_salmon = AtomSerializer.new.block_salmon(block) + block_salmon = Ostatus::AtomSerializer.new.block_salmon(block) expect(block_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/account' end @@ -755,7 +755,7 @@ RSpec.describe AtomSerializer do it 'appends activity:object-type element with activity type' do block = Fabricate(:block) - block_salmon = AtomSerializer.new.block_salmon(block) + block_salmon = Ostatus::AtomSerializer.new.block_salmon(block) object_type = block_salmon.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:activity] @@ -764,7 +764,7 @@ RSpec.describe AtomSerializer do it 'appends activity:verb element with block' do block = Fabricate(:block) - block_salmon = AtomSerializer.new.block_salmon(block) + block_salmon = Ostatus::AtomSerializer.new.block_salmon(block) verb = block_salmon.nodes.find { |node| node.name == 'activity:verb' } expect(verb.text).to eq TagManager::VERBS[:block] @@ -774,7 +774,7 @@ RSpec.describe AtomSerializer do target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id') block = Fabricate(:block, target_account: target_account) - block_salmon = AtomSerializer.new.block_salmon(block) + block_salmon = Ostatus::AtomSerializer.new.block_salmon(block) object = block_salmon.nodes.find { |node| node.name == 'activity:object' } expect(object.id.text).to eq 'https://domain/id' @@ -782,8 +782,8 @@ RSpec.describe AtomSerializer do it 'returns element whose rendered view triggers block when processed' do block = Fabricate(:block) - block_salmon = AtomSerializer.new.block_salmon(block) - xml = AtomSerializer.render(block_salmon) + block_salmon = Ostatus::AtomSerializer.new.block_salmon(block) + xml = Ostatus::AtomSerializer.render(block_salmon) envelope = OStatus2::Salmon.new.pack(xml, block.account.keypair) block.destroy! @@ -797,13 +797,13 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize block = Fabricate(:block) - AtomSerializer.new.unblock_salmon(block) + Ostatus::AtomSerializer.new.unblock_salmon(block) end end it 'returns entry element' do block = Fabricate(:block) - unblock_salmon = AtomSerializer.new.unblock_salmon(block) + unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block) expect(unblock_salmon.name).to eq 'entry' end @@ -811,7 +811,7 @@ RSpec.describe AtomSerializer do block = Fabricate(:block) time_before = Time.now - unblock_salmon = AtomSerializer.new.unblock_salmon(block) + unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block) time_after = Time.now expect(unblock_salmon.id.text).to( @@ -825,7 +825,7 @@ RSpec.describe AtomSerializer do target_account = Fabricate(:account, domain: 'remote', username: 'target_account') block = Fabricate(:block, account: account, target_account: target_account) - unblock_salmon = AtomSerializer.new.unblock_salmon(block) + unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block) expect(unblock_salmon.title.text).to eq 'account no longer blocks target_account@remote' end @@ -834,7 +834,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, domain: nil, username: 'account') block = Fabricate(:block, account: account) - unblock_salmon = AtomSerializer.new.unblock_salmon(block) + unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block) expect(unblock_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/account' end @@ -842,7 +842,7 @@ RSpec.describe AtomSerializer do it 'appends activity:object-type element with activity type' do block = Fabricate(:block) - unblock_salmon = AtomSerializer.new.unblock_salmon(block) + unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block) object_type = unblock_salmon.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:activity] @@ -851,7 +851,7 @@ RSpec.describe AtomSerializer do it 'appends activity:verb element with block' do block = Fabricate(:block) - unblock_salmon = AtomSerializer.new.unblock_salmon(block) + unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block) verb = unblock_salmon.nodes.find { |node| node.name == 'activity:verb' } expect(verb.text).to eq TagManager::VERBS[:unblock] @@ -861,7 +861,7 @@ RSpec.describe AtomSerializer do target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id') block = Fabricate(:block, target_account: target_account) - unblock_salmon = AtomSerializer.new.unblock_salmon(block) + unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block) object = unblock_salmon.nodes.find { |node| node.name == 'activity:object' } expect(object.id.text).to eq 'https://domain/id' @@ -869,8 +869,8 @@ RSpec.describe AtomSerializer do it 'returns element whose rendered view triggers block when processed' do block = Fabricate(:block) - unblock_salmon = AtomSerializer.new.unblock_salmon(block) - xml = AtomSerializer.render(unblock_salmon) + unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block) + xml = Ostatus::AtomSerializer.render(unblock_salmon) envelope = OStatus2::Salmon.new.pack(xml, block.account.keypair) ProcessInteractionService.new.call(envelope, block.target_account) @@ -883,19 +883,19 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize favourite = Fabricate(:favourite) - AtomSerializer.new.favourite_salmon(favourite) + Ostatus::AtomSerializer.new.favourite_salmon(favourite) end end it 'returns entry element' do favourite = Fabricate(:favourite) - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) expect(favourite_salmon.name).to eq 'entry' end it 'appends id element with unique tag' do favourite = Fabricate(:favourite, created_at: '2000-01-01T00:00:00Z') - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) expect(favourite_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{favourite.id}:objectType=Favourite" end @@ -903,7 +903,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, domain: nil, username: 'username') favourite = Fabricate(:favourite, account: account) - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) expect(favourite_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' end @@ -911,7 +911,7 @@ RSpec.describe AtomSerializer do it 'appends activity:object-type element with activity type' do favourite = Fabricate(:favourite) - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) object_type = favourite_salmon.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq 'http://activitystrea.ms/schema/1.0/activity' @@ -920,7 +920,7 @@ RSpec.describe AtomSerializer do it 'appends activity:verb element with favorite' do favourite = Fabricate(:favourite) - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) verb = favourite_salmon.nodes.find { |node| node.name == 'activity:verb' } expect(verb.text).to eq TagManager::VERBS[:favorite] @@ -930,7 +930,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') favourite = Fabricate(:favourite, status: status) - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) object = favourite_salmon.nodes.find { |node| node.name == 'activity:object' } expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status" @@ -941,7 +941,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status, account: status_account, created_at: '2000-01-01T00:00:00Z') favourite = Fabricate(:favourite, status: status) - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) in_reply_to = favourite_salmon.nodes.find { |node| node.name == 'thr:in-reply-to' } expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status" @@ -954,7 +954,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status, account: status_account) favourite = Fabricate(:favourite, account: account, status: status) - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) expect(favourite_salmon.title.text).to eq 'account favourited a status by status_account@remote' expect(favourite_salmon.content.text).to eq 'account favourited a status by status_account@remote' @@ -962,8 +962,8 @@ RSpec.describe AtomSerializer do it 'returns element whose rendered view triggers favourite when processed' do favourite = Fabricate(:favourite) - favourite_salmon = AtomSerializer.new.favourite_salmon(favourite) - xml = AtomSerializer.render(favourite_salmon) + favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite) + xml = Ostatus::AtomSerializer.render(favourite_salmon) envelope = OStatus2::Salmon.new.pack(xml, favourite.account.keypair) favourite.destroy! @@ -976,13 +976,13 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize favourite = Fabricate(:favourite) - AtomSerializer.new.favourite_salmon(favourite) + Ostatus::AtomSerializer.new.favourite_salmon(favourite) end end it 'returns entry element' do favourite = Fabricate(:favourite) - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) expect(unfavourite_salmon.name).to eq 'entry' end @@ -990,7 +990,7 @@ RSpec.describe AtomSerializer do favourite = Fabricate(:favourite) time_before = Time.now - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) time_after = Time.now expect(unfavourite_salmon.id.text).to( @@ -1003,7 +1003,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, domain: nil, username: 'username') favourite = Fabricate(:favourite, account: account) - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) expect(unfavourite_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' end @@ -1011,7 +1011,7 @@ RSpec.describe AtomSerializer do it 'appends activity:object-type element with activity type' do favourite = Fabricate(:favourite) - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) object_type = unfavourite_salmon.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq 'http://activitystrea.ms/schema/1.0/activity' @@ -1020,7 +1020,7 @@ RSpec.describe AtomSerializer do it 'appends activity:verb element with favorite' do favourite = Fabricate(:favourite) - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) verb = unfavourite_salmon.nodes.find { |node| node.name == 'activity:verb' } expect(verb.text).to eq TagManager::VERBS[:unfavorite] @@ -1030,7 +1030,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') favourite = Fabricate(:favourite, status: status) - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) object = unfavourite_salmon.nodes.find { |node| node.name == 'activity:object' } expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status" @@ -1041,7 +1041,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status, account: status_account, created_at: '2000-01-01T00:00:00Z') favourite = Fabricate(:favourite, status: status) - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) in_reply_to = unfavourite_salmon.nodes.find { |node| node.name == 'thr:in-reply-to' } expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status" @@ -1054,7 +1054,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status, account: status_account) favourite = Fabricate(:favourite, account: account, status: status) - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) expect(unfavourite_salmon.title.text).to eq 'account no longer favourites a status by status_account@remote' expect(unfavourite_salmon.content.text).to eq 'account no longer favourites a status by status_account@remote' @@ -1062,8 +1062,8 @@ RSpec.describe AtomSerializer do it 'returns element whose rendered view triggers unfavourite when processed' do favourite = Fabricate(:favourite) - unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite) - xml = AtomSerializer.render(unfavourite_salmon) + unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite) + xml = Ostatus::AtomSerializer.render(unfavourite_salmon) envelope = OStatus2::Salmon.new.pack(xml, favourite.account.keypair) ProcessInteractionService.new.call(envelope, favourite.status.account) @@ -1075,19 +1075,19 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize follow = Fabricate(:follow) - AtomSerializer.new.follow_salmon(follow) + Ostatus::AtomSerializer.new.follow_salmon(follow) end end it 'returns entry element' do follow = Fabricate(:follow) - follow_salmon = AtomSerializer.new.follow_salmon(follow) + follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow) expect(follow_salmon.name).to eq 'entry' end it 'appends id element with unique tag' do follow = Fabricate(:follow, created_at: '2000-01-01T00:00:00Z') - follow_salmon = AtomSerializer.new.follow_salmon(follow) + follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow) expect(follow_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{follow.id}:objectType=Follow" end @@ -1095,7 +1095,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, domain: nil, username: 'username') follow = Fabricate(:follow, account: account) - follow_salmon = AtomSerializer.new.follow_salmon(follow) + follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow) expect(follow_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' end @@ -1103,7 +1103,7 @@ RSpec.describe AtomSerializer do it 'appends activity:object-type element with activity type' do follow = Fabricate(:follow) - follow_salmon = AtomSerializer.new.follow_salmon(follow) + follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow) object_type = follow_salmon.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:activity] @@ -1112,7 +1112,7 @@ RSpec.describe AtomSerializer do it 'appends activity:verb element with follow' do follow = Fabricate(:follow) - follow_salmon = AtomSerializer.new.follow_salmon(follow) + follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow) verb = follow_salmon.nodes.find { |node| node.name == 'activity:verb' } expect(verb.text).to eq TagManager::VERBS[:follow] @@ -1122,7 +1122,7 @@ RSpec.describe AtomSerializer do target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id') follow = Fabricate(:follow, target_account: target_account) - follow_salmon = AtomSerializer.new.follow_salmon(follow) + follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow) object = follow_salmon.nodes.find { |node| node.name == 'activity:object' } expect(object.id.text).to eq 'https://domain/id' @@ -1133,7 +1133,7 @@ RSpec.describe AtomSerializer do target_account = Fabricate(:account, domain: 'remote', username: 'target_account') follow = Fabricate(:follow, account: account, target_account: target_account) - follow_salmon = AtomSerializer.new.follow_salmon(follow) + follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow) expect(follow_salmon.title.text).to eq 'account started following target_account@remote' expect(follow_salmon.content.text).to eq 'account started following target_account@remote' @@ -1141,8 +1141,8 @@ RSpec.describe AtomSerializer do it 'returns element whose rendered view triggers follow when processed' do follow = Fabricate(:follow) - follow_salmon = AtomSerializer.new.follow_salmon(follow) - xml = AtomSerializer.render(follow_salmon) + follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow) + xml = Ostatus::AtomSerializer.render(follow_salmon) follow.destroy! envelope = OStatus2::Salmon.new.pack(xml, follow.account.keypair) @@ -1157,7 +1157,7 @@ RSpec.describe AtomSerializer do def serialize follow = Fabricate(:follow) follow.destroy! - AtomSerializer.new.unfollow_salmon(follow) + Ostatus::AtomSerializer.new.unfollow_salmon(follow) end end @@ -1165,7 +1165,7 @@ RSpec.describe AtomSerializer do follow = Fabricate(:follow) follow.destroy! - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) expect(unfollow_salmon.name).to eq 'entry' end @@ -1175,7 +1175,7 @@ RSpec.describe AtomSerializer do follow.destroy! time_before = Time.now - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) time_after = Time.now expect(unfollow_salmon.id.text).to( @@ -1190,7 +1190,7 @@ RSpec.describe AtomSerializer do follow = Fabricate(:follow, account: account, target_account: target_account) follow.destroy! - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) expect(unfollow_salmon.title.text).to eq 'account is no longer following target_account@remote' end @@ -1201,7 +1201,7 @@ RSpec.describe AtomSerializer do follow = Fabricate(:follow, account: account, target_account: target_account) follow.destroy! - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) expect(unfollow_salmon.content.text).to eq 'account is no longer following target_account@remote' end @@ -1211,7 +1211,7 @@ RSpec.describe AtomSerializer do follow = Fabricate(:follow, account: account) follow.destroy! - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) expect(unfollow_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' end @@ -1220,7 +1220,7 @@ RSpec.describe AtomSerializer do follow = Fabricate(:follow) follow.destroy! - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) object_type = unfollow_salmon.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:activity] @@ -1230,7 +1230,7 @@ RSpec.describe AtomSerializer do follow = Fabricate(:follow) follow.destroy! - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) verb = unfollow_salmon.nodes.find { |node| node.name == 'activity:verb' } expect(verb.text).to eq TagManager::VERBS[:unfollow] @@ -1241,7 +1241,7 @@ RSpec.describe AtomSerializer do follow = Fabricate(:follow, target_account: target_account) follow.destroy! - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) object = unfollow_salmon.nodes.find { |node| node.name == 'activity:object' } expect(object.id.text).to eq 'https://domain/id' @@ -1250,8 +1250,8 @@ RSpec.describe AtomSerializer do it 'returns element whose rendered view triggers unfollow when processed' do follow = Fabricate(:follow) follow.destroy! - unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow) - xml = AtomSerializer.render(unfollow_salmon) + unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow) + xml = Ostatus::AtomSerializer.render(unfollow_salmon) follow.account.follow!(follow.target_account) envelope = OStatus2::Salmon.new.pack(xml, follow.account.keypair) @@ -1265,13 +1265,13 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize follow_request = Fabricate(:follow_request) - AtomSerializer.new.follow_request_salmon(follow_request) + Ostatus::AtomSerializer.new.follow_request_salmon(follow_request) end end context do def serialize(follow_request) - AtomSerializer.new.follow_request_salmon(follow_request) + Ostatus::AtomSerializer.new.follow_request_salmon(follow_request) end it_behaves_like 'follow request salmon' @@ -1293,7 +1293,7 @@ RSpec.describe AtomSerializer do it 'returns element whose rendered view triggers follow request when processed' do follow_request = Fabricate(:follow_request) follow_request_salmon = serialize(follow_request) - xml = AtomSerializer.render(follow_request_salmon) + xml = Ostatus::AtomSerializer.render(follow_request_salmon) envelope = OStatus2::Salmon.new.pack(xml, follow_request.account.keypair) follow_request.destroy! @@ -1308,13 +1308,13 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize follow_request = Fabricate(:follow_request) - AtomSerializer.new.authorize_follow_request_salmon(follow_request) + Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) end end it_behaves_like 'follow request salmon' do def serialize(follow_request) - authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request) + authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object' } end end @@ -1323,7 +1323,7 @@ RSpec.describe AtomSerializer do follow_request = Fabricate(:follow_request) time_before = Time.now - authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request) + authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) time_after = Time.now expect(authorize_follow_request_salmon.id.text).to( @@ -1337,7 +1337,7 @@ RSpec.describe AtomSerializer do target_account = Fabricate(:account, domain: nil, username: 'target_account') follow_request = Fabricate(:follow_request, account: account, target_account: target_account) - authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request) + authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) expect(authorize_follow_request_salmon.title.text).to eq 'target_account authorizes follow request by account@remote' end @@ -1345,7 +1345,7 @@ RSpec.describe AtomSerializer do it 'appends activity:object-type element with activity type' do follow_request = Fabricate(:follow_request) - authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request) + authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) object_type = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:activity] @@ -1354,7 +1354,7 @@ RSpec.describe AtomSerializer do it 'appends activity:verb element with authorize' do follow_request = Fabricate(:follow_request) - authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request) + authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) verb = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' } expect(verb.text).to eq TagManager::VERBS[:authorize] @@ -1362,8 +1362,8 @@ RSpec.describe AtomSerializer do it 'returns element whose rendered view creates follow from follow request when processed' do follow_request = Fabricate(:follow_request) - authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request) - xml = AtomSerializer.render(authorize_follow_request_salmon) + authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request) + xml = Ostatus::AtomSerializer.render(authorize_follow_request_salmon) envelope = OStatus2::Salmon.new.pack(xml, follow_request.target_account.keypair) ProcessInteractionService.new.call(envelope, follow_request.account) @@ -1377,13 +1377,13 @@ RSpec.describe AtomSerializer do include_examples 'namespaces' do def serialize follow_request = Fabricate(:follow_request) - AtomSerializer.new.reject_follow_request_salmon(follow_request) + Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) end end it_behaves_like 'follow request salmon' do def serialize(follow_request) - reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request) + reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object' } end end @@ -1392,7 +1392,7 @@ RSpec.describe AtomSerializer do follow_request = Fabricate(:follow_request) time_before = Time.now - reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request) + reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) time_after = Time.now expect(reject_follow_request_salmon.id.text).to( @@ -1405,28 +1405,28 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, domain: 'remote', username: 'account') target_account = Fabricate(:account, domain: nil, username: 'target_account') follow_request = Fabricate(:follow_request, account: account, target_account: target_account) - reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request) + reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) expect(reject_follow_request_salmon.title.text).to eq 'target_account rejects follow request by account@remote' end it 'appends activity:object-type element with activity type' do follow_request = Fabricate(:follow_request) - reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request) + reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) object_type = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:activity] end it 'appends activity:verb element with authorize' do follow_request = Fabricate(:follow_request) - reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request) + reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) verb = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' } expect(verb.text).to eq TagManager::VERBS[:reject] end it 'returns element whose rendered view deletes follow request when processed' do follow_request = Fabricate(:follow_request) - reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request) - xml = AtomSerializer.render(reject_follow_request_salmon) + reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request) + xml = Ostatus::AtomSerializer.render(reject_follow_request_salmon) envelope = OStatus2::Salmon.new.pack(xml, follow_request.target_account.keypair) ProcessInteractionService.new.call(envelope, follow_request.account) @@ -1439,31 +1439,31 @@ RSpec.describe AtomSerializer do describe '#object' do include_examples 'status attributes' do def serialize(status) - AtomSerializer.new.object(status) + Ostatus::AtomSerializer.new.object(status) end end it 'returns activity:object element' do status = Fabricate(:status) - object = AtomSerializer.new.object(status) + object = Ostatus::AtomSerializer.new.object(status) expect(object.name).to eq 'activity:object' end it 'appends id element with URL for status' do status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') - object = AtomSerializer.new.object(status) + object = Ostatus::AtomSerializer.new.object(status) expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status" end it 'appends published element with created date' do status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z') - object = AtomSerializer.new.object(status) + object = Ostatus::AtomSerializer.new.object(status) expect(object.published.text).to eq '2000-01-01T00:00:00Z' end it 'appends updated element with updated date' do status = Fabricate(:status, updated_at: '2000-01-01T00:00:00Z') - object = AtomSerializer.new.object(status) + object = Ostatus::AtomSerializer.new.object(status) expect(object.updated.text).to eq '2000-01-01T00:00:00Z' end @@ -1471,7 +1471,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, username: 'username') status = Fabricate(:status, account: account) - object = AtomSerializer.new.object(status) + object = Ostatus::AtomSerializer.new.object(status) expect(object.title.text).to eq 'New status by username' end @@ -1480,7 +1480,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, username: 'username') status = Fabricate(:status, account: account) - entry = AtomSerializer.new.object(status) + entry = Ostatus::AtomSerializer.new.object(status) expect(entry.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username' end @@ -1488,7 +1488,7 @@ RSpec.describe AtomSerializer do it 'appends activity:object-type element with object type' do status = Fabricate(:status) - entry = AtomSerializer.new.object(status) + entry = Ostatus::AtomSerializer.new.object(status) object_type = entry.nodes.find { |node| node.name == 'activity:object-type' } expect(object_type.text).to eq TagManager::TYPES[:note] @@ -1497,7 +1497,7 @@ RSpec.describe AtomSerializer do it 'appends activity:verb element with verb' do status = Fabricate(:status) - entry = AtomSerializer.new.object(status) + entry = Ostatus::AtomSerializer.new.object(status) object_type = entry.nodes.find { |node| node.name == 'activity:verb' } expect(object_type.text).to eq TagManager::VERBS[:post] @@ -1507,7 +1507,7 @@ RSpec.describe AtomSerializer do account = Fabricate(:account, username: 'username') status = Fabricate(:status, account: account) - entry = AtomSerializer.new.object(status) + entry = Ostatus::AtomSerializer.new.object(status) link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' } expect(link[:type]).to eq 'text/html' @@ -1519,7 +1519,7 @@ RSpec.describe AtomSerializer do thread = Fabricate(:status, account: account, created_at: '2000-01-01T00:00:00Z') reply = Fabricate(:status, thread: thread) - entry = AtomSerializer.new.object(reply) + entry = Ostatus::AtomSerializer.new.object(reply) in_reply_to = entry.nodes.find { |node| node.name == 'thr:in-reply-to' } expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{thread.id}:objectType=Status" @@ -1528,7 +1528,7 @@ RSpec.describe AtomSerializer do it 'does not append thr:in-reply-to element if thread is nil' do status = Fabricate(:status, thread: nil) - entry = AtomSerializer.new.object(status) + entry = Ostatus::AtomSerializer.new.object(status) entry.nodes.each { |node| expect(node.name).not_to eq 'thr:in-reply-to' } end @@ -1536,7 +1536,7 @@ RSpec.describe AtomSerializer do status = Fabricate.build(:status, conversation_id: nil) status.save!(validate: false) - entry = AtomSerializer.new.object(status) + entry = Ostatus::AtomSerializer.new.object(status) entry.nodes.each { |node| expect(node.name).not_to eq 'ostatus:conversation' } end @@ -1545,7 +1545,7 @@ RSpec.describe AtomSerializer do status = Fabricate(:status) status.conversation.update!(created_at: '2000-01-01T00:00:00Z') - entry = AtomSerializer.new.object(status) + entry = Ostatus::AtomSerializer.new.object(status) conversation = entry.nodes.find { |node| node.name == 'ostatus:conversation' } expect(conversation[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.conversation.id}:objectType=Conversation" diff --git a/spec/services/process_feed_service_spec.rb b/spec/services/process_feed_service_spec.rb index d85ee3b56..5e34370ee 100644 --- a/spec/services/process_feed_service_spec.rb +++ b/spec/services/process_feed_service_spec.rb @@ -167,6 +167,46 @@ XML expect(created_statuses.first.reblog.text).to eq 'Overwatch rocks' end + it 'ignores reblogs if it failed to retreive reblogged statuses' do + stub_request(:head, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 404) + + actor = Fabricate(:account, username: 'tracer', domain: 'overwatch.com') + + body = <<XML +<?xml version="1.0"?> +<entry xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:mastodon="http://mastodon.social/schema/1.0"> + <id>tag:overwatch.com,2017-04-27:objectId=4467137:objectType=Status</id> + <published>2017-04-27T13:49:25Z</published> + <updated>2017-04-27T13:49:25Z</updated> + <author> + <id>https://overwatch.com/users/tracer</id> + <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type> + <uri>https://overwatch.com/users/tracer</uri> + <name>tracer</name> + </author> + <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type> + <activity:verb>http://activitystrea.ms/schema/1.0/share</activity:verb> + <content type="html">Overwatch rocks</content> + <activity:object> + <id>tag:overwatch.com,2017-04-27:objectId=4467137:objectType=Status</id> + <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type> + <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb> + <author> + <id>https://overwatch.com/users/tracer</id> + <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type> + <uri>https://overwatch.com/users/tracer</uri> + <name>tracer</name> + </author> + <content type="html">Overwatch rocks</content> + <link rel="alternate" type="text/html" href="https://overwatch.com/users/tracer/updates/1" /> + </activity:object> +XML + + created_statuses = subject.call(body, actor) + + expect(created_statuses).to eq [] + end + it 'ignores statuses with an out-of-order delete' do sender = Fabricate(:account, username: 'tracer', domain: 'overwatch.com') |