about summary refs log tree commit diff
path: root/app/lib/activitypub/activity
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-03-30 15:44:54 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-03-30 15:44:54 +0200
commite573bb0990ece4b1a521ccf8a4c7bec5972d3538 (patch)
treeb1c7c3b3d81aafb6bc256d74b02fbec1a54878f8 /app/lib/activitypub/activity
parenta6c129ddbdaaa84bc631d85eb248fb5a9fa7eb96 (diff)
Fix compatibility with PeerTube (#6968)
* Support fetching objects of convertible types by URL (fixes #6924)

* Ignore invalid hashtags
Diffstat (limited to 'app/lib/activitypub/activity')
-rw-r--r--app/lib/activitypub/activity/create.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index afee8a268..45c0e91cb 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -79,6 +79,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     hashtag = Tag.where(name: hashtag).first_or_initialize(name: hashtag)
 
     status.tags << hashtag
+  rescue ActiveRecord::RecordInvalid
+    nil
   end
 
   def process_mention(tag, status)