diff options
| author | ThibG <thib@sitedethib.com> | 2018-03-30 15:44:54 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-30 15:44:54 +0200 |
| commit | e573bb0990ece4b1a521ccf8a4c7bec5972d3538 (patch) | |
| tree | b1c7c3b3d81aafb6bc256d74b02fbec1a54878f8 /app/lib/activitypub/activity | |
| parent | a6c129ddbdaaa84bc631d85eb248fb5a9fa7eb96 (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.rb | 2 |
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) |