mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-23 05:18:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also run the keyword matcher on a status' tags. #208.

Browse source
This commit is contained in:
David Yip 2017-11-06 16:48:36 -06:00
parent 04508868b0
commit 431503bae2
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/lib/feed_manager.rb
View file

@ -173,10 +173,14 @@ class FeedManager
def keyword_filter?(status, matcher)
should_filter = matcher =~ status.text
should_filter ||= matcher =~ status.spoiler_text
should_filter ||= status.tags.find_each.any? { |t| matcher =~ t.name }
if status.reblog?
should_filter ||= matcher =~ status.reblog.text
should_filter ||= matcher =~ status.reblog.spoiler_text
reblog = status.reblog
should_filter ||= matcher =~ reblog.text
should_filter ||= matcher =~ reblog.spoiler_text
should_filter ||= reblog.tags.find_each.any? { |t| matcher =~ t.name }
end
!!should_filter

16
spec/lib/feed_manager_spec.rb
View file

@ -164,6 +164,22 @@ RSpec.describe FeedManager do
expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
end
it 'returns true for a status with a tag that matches a muted keyword' do
Fabricate('Glitch::KeywordMute', account: alice, keyword: 'jorts')
status = Fabricate(:status, account: bob)
status.tags << Fabricate(:tag, name: 'jorts')
expect(FeedManager.instance.filter?(:home, status, alice.id)).to be true
end
it 'returns true for a status with a tag that matches an octothorpe-prefixed muted keyword' do
Fabricate('Glitch::KeywordMute', account: alice, keyword: '#jorts')
status = Fabricate(:status, account: bob)
status.tags << Fabricate(:tag, name: 'jorts')
expect(FeedManager.instance.filter?(:home, status, alice.id)).to be true
end
end
context 'for mentions feed' do