From 895e1dcd55006748da268e4a284a81377a6633f7 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Wed, 10 May 2017 21:03:41 +0900 Subject: display_url のかわりに expanded_url をそのまま表示する MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/lib/diva_hacks/entity/basic_twitter_entity.rb | 8 ++++---- 1 file 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 -- cgit v1.2.3