diff --git a/core/lib/diva_hacks.rb b/core/lib/diva_hacks.rb index ebf35b1..579038f 100644 --- a/core/lib/diva_hacks.rb +++ b/core/lib/diva_hacks.rb @@ -56,6 +56,22 @@ module Mikutter module DivaHacks; end end +class Diva::URI + alias_method :__generate_uri_by_string__, :generate_uri_by_string + private + def generate_uri_by_string + if @uri_string.match(%r<\A\w+://>) + uri = Addressable::URI.parse(@uri_string) + else + uri, = Plugin.filtering(:uri_filter, @uri_string) + end + uri + end + + private :__generate_uri_by_string__ +end + + require_relative 'diva_hacks/model' require_relative 'diva_hacks/mixin' require_relative 'diva_hacks/entity' diff --git a/core/mui/gtk_photo_pixbuf.rb b/core/mui/gtk_photo_pixbuf.rb index ced2d43..133ac33 100644 --- a/core/mui/gtk_photo_pixbuf.rb +++ b/core/mui/gtk_photo_pixbuf.rb @@ -54,6 +54,7 @@ module Diva::Model::PhotoMixin # [nil] 画像がローカルにキャッシュされていない場合 def pixbuf(width:, height:) result = pixbuf_cache[[width, height].hash] + p uri.path if result result.read_count += 1 result.reserver.cancel if result.reserver