about summary refs log tree commit diff
path: root/app/workers/activitypub
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-08-19 18:44:48 +0200
committerGitHub <noreply@github.com>2017-08-19 18:44:48 +0200
commit412ea873060da4dc73236fdd63a2931d27dbfa40 (patch)
treeeae2940a3179b76d0e1c92a224e469966e290b22 /app/workers/activitypub
parent774b8661bc578c2e7eae7fff2be24466774fe858 (diff)
Improve ActivityPub/OStatus compatibility (#4632)
*Note: OStatus URIs are invalid for ActivityPub. But we have them for
as long as we want to keep old OStatus-sourced content and as long as
we remain OStatus-compatible.*

- In Announce handling, if object URI is not a URL, fallback to object URL
- Do not use specialized ThreadResolveWorker, rely on generalized handling
- When serializing notes, if parent's URI is not a URL, use parent's URL
Diffstat (limited to 'app/workers/activitypub')
-rw-r--r--app/workers/activitypub/thread_resolve_worker.rb17
1 files changed, 0 insertions, 17 deletions
diff --git a/app/workers/activitypub/thread_resolve_worker.rb b/app/workers/activitypub/thread_resolve_worker.rb
deleted file mode 100644
index 4ef762d06..000000000
--- a/app/workers/activitypub/thread_resolve_worker.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class ActivityPub::ThreadResolveWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'pull', retry: false
-
-  def perform(child_status_id, parent_uri)
-    child_status  = Status.find(child_status_id)
-    parent_status = ActivityPub::FetchRemoteStatusService.new.call(parent_uri)
-
-    return if parent_status.nil?
-
-    child_status.thread = parent_status
-    child_status.save!
-  end
-end