logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: b16b69350eb4ded2e1011931433b51dac5e34b53
parent: da6fa029f66d50f38f2b6c85687994793f7766aa
Author: unarist <m.unarist@gmail.com>
Date:   Wed, 21 Jun 2017 01:45:09 +0900

Fix RTL detection on Ruby side (#3867)

This fixes below bugs:

* pipe characters being counted as RTL character
* only first word being checked

Diffstat:

Mapp/helpers/stream_entries_helper.rb10+++++-----
Mspec/helpers/stream_entries_helper_spec.rb2+-
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb @@ -53,11 +53,11 @@ module StreamEntriesHelper def rtl?(text) text = simplified_text(text) - rtl_characters = /[\p{Hebrew}|\p{Arabic}|\p{Syriac}|\p{Thaana}|\p{Nko}]+/m.match(text) + rtl_words = text.scan(/[\p{Hebrew}\p{Arabic}\p{Syriac}\p{Thaana}\p{Nko}]+/m) - if rtl_characters.present? + if rtl_words.present? total_size = text.size.to_f - rtl_size(rtl_characters.to_a) / total_size > 0.3 + rtl_size(rtl_words) / total_size > 0.3 else false end @@ -77,8 +77,8 @@ module StreamEntriesHelper end end - def rtl_size(characters) - characters.reduce(0) { |acc, elem| acc + elem.size }.to_f + def rtl_size(words) + words.reduce(0) { |acc, elem| acc + elem.size }.to_f end def embedded_view? diff --git a/spec/helpers/stream_entries_helper_spec.rb b/spec/helpers/stream_entries_helper_spec.rb @@ -217,7 +217,7 @@ RSpec.describe StreamEntriesHelper, type: :helper do end it 'is true if right to left characters are greater than 1/3 of total text' do - expect(helper).to be_rtl 'aaݟ' + expect(helper).to be_rtl 'aaݟaaݟ' end end end