about summary refs log tree commit diff
path: root/app/lib/ostatus/activity
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-01-02 20:03:32 +0100
committerGitHub <noreply@github.com>2019-01-02 20:03:32 +0100
commit0acd51acdc1e670bf57f58671cb8e30743782c63 (patch)
treef5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /app/lib/ostatus/activity
parentb300948526d967aaf5608c93546ee0d54940c0ef (diff)
parente77ceb1b29547ed89b4110b3cc3edc9ac325b620 (diff)
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/ostatus/activity')
-rw-r--r--app/lib/ostatus/activity/creation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb
index 8f8c70052..3840c8fbf 100644
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@@ -57,7 +57,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
       save_emojis(status)
     end
 
-    if thread? && status.thread.nil?
+    if thread? && status.thread.nil? && Request.valid_url?(thread.second)
       Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}"
       ThreadResolveWorker.perform_async(status.id, thread.second)
     end