From: unarist <m.unarist@gmail.com>
Date: Fri, 1 Sep 2017 10:33:02 +0000 (+0900)
Subject: Fallback from perform_via_activitypub on private posts (#4758)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=af2d22f88cf84313e11a5f0b1f3a1170f721967e;p=mastodon.git

Fallback from perform_via_activitypub on private posts (#4758)

Currently, private / direct posts via OStatus from AP compatible instance will be dropped due to failing to fetch AP version.

So this fallbacks to OStatus handling:

* when failed to fetch ActivityPub version
* when status is neither :public nor :unlisted
---

diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb
index 12488ab31..b28239a05 100644
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@@ -8,7 +8,11 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
     end
 
     return [nil, false] if @account.suspended?
-    return perform_via_activitypub if activitypub_uri?
+
+    if activitypub_uri? && [:public, :unlisted].include?(visibility_scope)
+      result = perform_via_activitypub
+      return result if result.first.present?
+    end
 
     Rails.logger.debug "Creating remote status #{id}"