techhub/mastodon
2
0
Fork 0
Code Activity

Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)

Browse Source 
* Revert "Fix ignoring whole status because of one invalid hashtag (#11621)"

This reverts commit dff46b260b.

* Fix statuses being rejected because of invalid hashtag names

* Add spec for invalid hashtag names in statuses

* Add test for featured tags controller
This commit is contained in:
ThibG
2019-12-17 13:31:56 +01:00
committed by Eugen Rochko
parent 3830c0b741
commit da2143b308
4 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/create.rb
View File

@@ -157,7 +157,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return if tag['name'].blank?
Tag.find_or_create_by_names(tag['name']) do |hashtag|
@tags << hashtag unless @tags.include?(hashtag)
@tags << hashtag unless @tags.include?(hashtag) || !hashtag.valid?
end
rescue ActiveRecord::RecordInvalid
nil