forked from treehouse/mastodon
Apply keyword mutes to reblogs.
parent
670e6a33f8
commit
ad86c86fa8
|
@ -138,7 +138,9 @@ class FeedManager
|
||||||
end
|
end
|
||||||
|
|
||||||
def filter_from_home?(status, receiver_id)
|
def filter_from_home?(status, receiver_id)
|
||||||
return true if Glitch::KeywordMute.matcher_for(receiver_id) =~ status.text
|
keyword_mute_matcher = Glitch::KeywordMute.matcher_for(receiver_id)
|
||||||
|
|
||||||
|
return true if keyword_mute_matcher =~ status.text
|
||||||
|
|
||||||
return false if receiver_id == status.account_id
|
return false if receiver_id == status.account_id
|
||||||
return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
|
return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
|
||||||
|
@ -161,6 +163,7 @@ class FeedManager
|
||||||
return should_filter
|
return should_filter
|
||||||
elsif status.reblog? # Filter out a reblog
|
elsif status.reblog? # Filter out a reblog
|
||||||
should_filter = Block.where(account_id: status.reblog.account_id, target_account_id: receiver_id).exists? # or if the author of the reblogged status is blocking me
|
should_filter = Block.where(account_id: status.reblog.account_id, target_account_id: receiver_id).exists? # or if the author of the reblogged status is blocking me
|
||||||
|
should_filter ||= keyword_mute_matcher.matches?(status.reblog.text)
|
||||||
should_filter ||= AccountDomainBlock.where(account_id: receiver_id, domain: status.reblog.account.domain).exists? # or the author's domain is blocked
|
should_filter ||= AccountDomainBlock.where(account_id: receiver_id, domain: status.reblog.account.domain).exists? # or the author's domain is blocked
|
||||||
return should_filter
|
return should_filter
|
||||||
end
|
end
|
||||||
|
|
|
@ -45,5 +45,9 @@ class Glitch::KeywordMute < ApplicationRecord
|
||||||
def =~(str)
|
def =~(str)
|
||||||
regex ? regex =~ str : false
|
regex ? regex =~ str : false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def matches?(str)
|
||||||
|
!!(regex =~ str)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
Fabricator(:glitch_keyword_mute) do
|
Fabricator('Glitch::KeywordMute') do
|
||||||
end
|
end
|
||||||
|
|
|
@ -119,6 +119,23 @@ RSpec.describe FeedManager do
|
||||||
reblog = Fabricate(:status, reblog: status, account: jeff)
|
reblog = Fabricate(:status, reblog: status, account: jeff)
|
||||||
expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
|
expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'returns true for a status containing a muted keyword' do
|
||||||
|
Fabricate('Glitch::KeywordMute', account: alice, keyword: 'take')
|
||||||
|
alice.follow!(bob)
|
||||||
|
status = Fabricate(:status, text: 'This is a hot take', account: bob)
|
||||||
|
|
||||||
|
expect(FeedManager.instance.filter?(:home, status, alice.id)).to be true
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns true for a reblog containing a muted keyword' do
|
||||||
|
Fabricate('Glitch::KeywordMute', account: alice, keyword: 'take')
|
||||||
|
alice.follow!(jeff)
|
||||||
|
status = Fabricate(:status, text: 'This is a hot take', account: bob)
|
||||||
|
reblog = Fabricate(:status, reblog: status, account: jeff)
|
||||||
|
|
||||||
|
expect(FeedManager.instance.filter?(:home, reblog, alice.id)).to be true
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'for mentions feed' do
|
context 'for mentions feed' do
|
||||||
|
|
Loading…
Reference in New Issue