fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 03:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Html2Text to generate plaintext for keyword mutes. #236.

Browse source 
This allows us to match URLs inside link hrefs.
This commit is contained in:
David Yip 2018-02-10 10:32:14 -06:00
parent 9105b0c954
commit f1f67c46c5
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/glitch/keyword_mute_helper.rb
View file

@ -1,16 +1,12 @@
require 'htmlentities'
require 'html2text'
class Glitch::KeywordMuteHelper
include ActionView::Helpers::SanitizeHelper
attr_reader :text_matcher
attr_reader :tag_matcher
attr_reader :entity_decoder
def initialize(receiver_id)
@text_matcher = Glitch::KeywordMute.text_matcher_for(receiver_id)
@tag_matcher = Glitch::KeywordMute.tag_matcher_for(receiver_id)
@entity_decoder = HTMLEntities.new
end
def matches?(status)
@ -26,6 +22,6 @@ class Glitch::KeywordMuteHelper
end
def prepare_text(text)
entity_decoder.decode(strip_tags(text)).tap { |x| puts x }
Html2Text.convert(text)
end
end

7
spec/models/glitch/keyword_mute_helper_spec.rb
View file

@ -39,5 +39,12 @@ RSpec.describe Glitch::KeywordMuteHelper do
expect(helper.matches?(status)).to be true
end
it 'matches link hrefs in HTML text' do
status = Fabricate(:status, text: '<p><a href="https://example.com/it-was-milk">yep</a></p>')
Glitch::KeywordMute.create!(account: alice, keyword: 'milk')
expect(helper.matches?(status)).to be true
end
end
end