diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2017-05-10 21:03:41 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2017-09-07 20:06:28 +0900 |
| commit | 21cb3d022091b35f1d6e88f3dc83c58bd22a0d88 (patch) | |
| tree | de03eacf38367601231356f5c45a741cc4aa1b93 | |
| parent | 3f55f0e35b803a3e1b271251f84fa8af6df5576d (diff) | |
| download | mikutter-21cb3d022091b35f1d6e88f3dc83c58bd22a0d88.tar.gz | |
display_url のかわりに expanded_url をそのまま表示する
| -rw-r--r-- | core/lib/diva_hacks/entity/basic_twitter_entity.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/lib/diva_hacks/entity/basic_twitter_entity.rb b/core/lib/diva_hacks/entity/basic_twitter_entity.rb index aad92aee..1a8a18df 100644 --- a/core/lib/diva_hacks/entity/basic_twitter_entity.rb +++ b/core/lib/diva_hacks/entity/basic_twitter_entity.rb @@ -52,8 +52,8 @@ module Diva::Entity }.merge(entity) case slug when :urls - entity[:face] = (entity[:display_url] or entity[:url]) entity[:url] = (entity[:expanded_url] or entity[:url]) + entity[:face] = entity[:url] entity[:open] = entity[:url] when :user_mentions entity[:face] = entity[:url] = "@#{entity[:screen_name]}".freeze @@ -76,17 +76,17 @@ module Diva::Entity .select{|v|v[:content_type] == "video/mp4"} .sort_by{|v|v[:bitrate]} .last - entity[:face] = "#{entity[:display_url]} (%.1fs)" % (entity[:video_info][:duration_millis]/1000.0) + entity[:face] = "#{variant[:url]} (%.1fs)" % (entity[:video_info][:duration_millis]/1000.0) entity[:open] = entity[:url] = variant[:url] when 'animated_gif' variant = Array(entity[:video_info][:variants]) .select{|v|v[:content_type] == "video/mp4"} .sort_by{|v|v[:bitrate]} .last - entity[:face] = "#{entity[:display_url]} (GIF)" + entity[:face] = "#{variant[:url]} (GIF)" entity[:open] = entity[:url] = variant[:url] else - entity[:face] = entity[:display_url] + entity[:face] = entity[:media_url] entity[:url] = entity[:media_url] photo = Diva::Model(:photo) if photo |