nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Bump twitter-text"

Browse source 
This adds a new dependency (`libidn11-dev` on debian, I'm not sure about
other distros).

This reverts commit 070e4caa57.
This commit is contained in:
Benjamin Neff 2018-04-12 03:59:05 +02:00
parent 9a661177f1
commit 15ff67499b
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -144,7 +144,7 @@ gem "nokogiri", "1.8.2"
gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
gem "redcarpet", "3.4.0" gem "redcarpet", "3.4.0"
gem "ruby-oembed", "0.12.0" gem "ruby-oembed", "0.12.0"
gem "twitter-text", "2.1.0" gem "twitter-text", "1.14.7"
# RTL support # RTL support

6
Gemfile.lock
View file

@ -313,7 +313,6 @@ GEM
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
i18n-inflector (~> 2.6) i18n-inflector (~> 2.6)
railties (>= 3.0.0) railties (>= 3.0.0)
idn-ruby (0.1.0)
ipaddress (0.8.3) ipaddress (0.8.3)
jasmine (3.1.0) jasmine (3.1.0)
jasmine-core (= 3.1.0) jasmine-core (= 3.1.0)
@ -710,8 +709,7 @@ GEM
multipart-post (~> 2.0) multipart-post (~> 2.0)
naught (~> 1.0) naught (~> 1.0)
simple_oauth (~> 0.3.0) simple_oauth (~> 0.3.0)
twitter-text (2.1.0) twitter-text (1.14.7)
idn-ruby
unf (~> 0.1.0) unf (~> 0.1.0)
typhoeus (1.3.0) typhoeus (1.3.0)
ethon (>= 0.9.0) ethon (>= 0.9.0)
@ -897,7 +895,7 @@ DEPENDENCIES
timecop (= 0.9.1) timecop (= 0.9.1)
turbo_dev_assets (= 0.0.2) turbo_dev_assets (= 0.0.2)
twitter (= 6.2.0) twitter (= 6.2.0)
twitter-text (= 2.1.0) twitter-text (= 1.14.7)
typhoeus (= 1.3.0) typhoeus (= 1.3.0)
uglifier (= 4.1.8) uglifier (= 4.1.8)
unicorn (= 5.4.0) unicorn (= 5.4.0)

2
lib/diaspora/markdownify/html.rb
View file

@ -6,7 +6,7 @@ module Diaspora
include ActionView::Helpers::TextHelper include ActionView::Helpers::TextHelper
def autolink link, type def autolink link, type
Twitter::TwitterText::Autolink.auto_link_urls( Twitter::Autolink.auto_link_urls(
link, link,
url_target: "_blank", url_target: "_blank",
link_attribute_block: lambda {|_, attr| attr[:rel] += " noopener noreferrer" } link_attribute_block: lambda {|_, attr| attr[:rel] += " noopener noreferrer" }

2
lib/diaspora/message_renderer.rb
View file

@ -244,7 +244,7 @@ module Diaspora
# Extracts all the urls from the raw message and return them in the form of a string # Extracts all the urls from the raw message and return them in the form of a string
# Different URLs are seperated with a space # Different URLs are seperated with a space
def urls def urls
@urls ||= Twitter::TwitterText::Extractor.extract_urls(plain_text_without_markdown).map {|url| @urls ||= Twitter::Extractor.extract_urls(plain_text_without_markdown).map {|url|
Addressable::URI.parse(url).normalize.to_s Addressable::URI.parse(url).normalize.to_s
} }
end end