logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: f937cad68f5343d114475cf870df2cd25895a7db
parent: be83d450eb2d109967f8e92bb3e01225517719d5
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Wed, 24 May 2017 21:32:53 +0900

Skip formatting for cashtag in status text (#3275)

Resolve #3270

Diffstat:

Mapp/lib/extractor.rb4++++
Mspec/lib/formatter_spec.rb8++++++++
2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/app/lib/extractor.rb b/app/lib/extractor.rb @@ -56,4 +56,8 @@ module Extractor tags.each { |tag| yield tag[:hashtag], tag[:indices].first, tag[:indices].last } if block_given? tags end + + def extract_cashtags_with_indices(_text) + [] # always returns empty array + end end diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb @@ -46,6 +46,14 @@ RSpec.describe Formatter do end end + context 'with cashtag' do + let(:local_text) { 'Hello world $AAPL' } + + it 'skip cashtag' do + expect(subject).to match '<p>Hello world $AAPL</p>' + end + end + context 'with reblog' do let(:local_status) { Fabricate(:status, account: account, reblog: Fabricate(:status, text: 'Hello world', account: account)) }