about summary refs log tree commit diff
path: root/app/lib/activitypub/activity/create.rb
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-12-11 22:00:22 -0600
committermultiple creatures <dev@multiple-creature.party>2019-12-11 22:00:22 -0600
commitdae7cda4abe135b3bb5fe9cfb3380721a2feb03e (patch)
tree4eda3ccfee17cb36a461d31cf74d266d80f6ebae /app/lib/activitypub/activity/create.rb
parent9a435494c2efdd2ca8fc7f5fa3dbb81bf88633a1 (diff)
move sharekeys & import metadata to own tables
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
-rw-r--r--app/lib/activitypub/activity/create.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 4e7f922e9..1839a649e 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -92,7 +92,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def find_imported_status
-    status   = Status.find_by(origin: @origin_hash)
+    status = Status.joins(:imported_status).select('statuses.*').find_by(origin: @origin_hash)
   end
 
   def obfuscate_origin(key)
@@ -138,7 +138,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       if @options[:imported]
         @params.except!(:uri, :url)
         @params[:content_type] = 'text/html'
-        @params[:imported] = true
         @params[:origin] = @origin_hash unless @origin_hash.nil?
       end