# HG changeset patch # User nanaya # Date 1689353254 -32400 # Node ID 961d362e42c7fce2bfeeef1f03dcde2088c38dae # Parent 49804331352327b7613f267209f54485d5070d8e The url in entity media isn't unique as they all point to the same thing diff -r 498043313523 -r 961d362e42c7 app/lib/legit_client.rb --- a/app/lib/legit_client.rb Sat Jul 15 01:40:31 2023 +0900 +++ b/app/lib/legit_client.rb Sat Jul 15 01:47:34 2023 +0900 @@ -62,9 +62,8 @@ val = {} if entity_media['type'] == 'photo' - val[:url] = entity_media['media_url_https'] + val[:image_url] = entity_media['media_url_https'] elsif entity_media['type'] == 'video' - val[:url] = entity_media['expanded_url'] val[:variants] = entity_media['video_info']['variants'] .filter { |variant| variant['bitrate'].present? } .map do |variant| @@ -76,11 +75,18 @@ end if !val.empty? + val[:url] = entity_media['expanded_url'] val[:type] = entity_media['type'] val[:id] = entity_media['media_key'] end - ret[entity_media['display_url']] = val + key = if ret[entity_media['display_url']].nil? + entity_media['display_url'] + else + entity_media['media_key'] + end + + ret[key] = val end ret diff -r 498043313523 -r 961d362e42c7 app/views/tweets/_tweet.html.erb --- a/app/views/tweets/_tweet.html.erb Sat Jul 15 01:40:31 2023 +0900 +++ b/app/views/tweets/_tweet.html.erb Sat Jul 15 01:47:34 2023 +0900 @@ -43,8 +43,8 @@

<% tweet[:entity_media].each do |_short_url, media| %> <% if media[:type] == 'photo' %> - <%= link_to "#{media[:url]}?name=orig" do %> - <%= image_tag "#{media[:url]}?name=small", :alt => "attachment #{media[:id]}" -%> + <%= link_to "#{media[:image_url]}?name=orig" do %> + <%= image_tag "#{media[:image_url]}?name=small", :alt => "attachment #{media[:id]}" -%> <% end %> <% elsif media[:type] == 'video' %> <%= video_tag media[:variants]