diff --git a/core/plugin/followingcontrol/followingcontrol.rb b/core/plugin/followingcontrol/followingcontrol.rb index 80572bd0..7372ff24 100644 --- a/core/plugin/followingcontrol/followingcontrol.rb +++ b/core/plugin/followingcontrol/followingcontrol.rb @@ -75,7 +75,11 @@ Plugin.create :followingcontrol do container.ssc_atonce :expose_event do loading_image = Gtk::Image.new(Skin['loading.png'].pixbuf(width: 128, height: 128)) container.add(loading_image.show_all) - Service.primary.followings(cache: true, user_id: model[:id]).next{ |users| + Enumerator.new{|y| + Plugin.filtering(:worlds, y) + }.select{|world| + world.class.slug == :twitter + }.first.followings(cache: true, user_id: model[:id]).next{ |users| container.remove(loading_image) loading_image = nil container.add(userlist.show_all) @@ -111,7 +115,11 @@ Plugin.create :followingcontrol do container.ssc_atonce :expose_event do loading_image = Gtk::Image.new(Skin['loading.png'].pixbuf(width: 128, height: 128)) container.add(loading_image.show_all) - Service.primary.followers(cache: true, user_id: model[:id]).next{ |users| + Enumerator.new{|y| + Plugin.filtering(:worlds, y) + }.select{|world| + world.class.slug == :twitter + }.first.followers(cache: true, user_id: model[:id]).next{ |users| container.remove(loading_image) loading_image = nil container.add(userlist.show_all) diff --git a/core/plugin/list_for_profile/profiletab.rb b/core/plugin/list_for_profile/profiletab.rb index 42863f56..713fb8c9 100644 --- a/core/plugin/list_for_profile/profiletab.rb +++ b/core/plugin/list_for_profile/profiletab.rb @@ -25,7 +25,11 @@ module Plugin::ListForProfile iter[SERVICE] = service end toggled = get_column(0).cell_renderers[0] toggled.activatable = false - Service.primary.list_user_followers(user_id: @dest_user[:id], filter_to_owned_lists: 1).next{ |res| + Enumerator.new{|y| + Plugin.filtering(:worlds, y) + }.select{|world| + world.class.slug == :twitter + }.first.list_user_followers(user_id: @dest_user[:id], filter_to_owned_lists: 1).next{ |res| if res and not destroyed? followed_list_ids = res.map{|list| list['id'].to_i} model.each{ |m, path, iter| diff --git a/core/plugin/user_detail_view/user_detail_view.rb b/core/plugin/user_detail_view/user_detail_view.rb index fc6379cb..3b198560 100644 --- a/core/plugin/user_detail_view/user_detail_view.rb +++ b/core/plugin/user_detail_view/user_detail_view.rb @@ -73,7 +73,11 @@ Plugin.create :user_detail_view do order do |message| retweet = message.retweeted_statuses.find{ |r| user_id == r.user.id } (retweet || message)[:created].to_i end end - Service.primary.user_timeline(user_id: user_id, include_rts: 1, count: [UserConfig[:profile_show_tweet_once], 200].min).next{ |tl| + Enumerator.new{|y| + Plugin.filtering(:worlds, y) + }.select{|world| + world.class.slug == :twitter + }.first.user_timeline(user_id: user_id, include_rts: 1, count: [UserConfig[:profile_show_tweet_once], 200].min).next{ |tl| i_timeline << tl }.terminate(_("@%{user} の最近のつぶやきが取得できませんでした。見るなってことですかね") % {user: model[:idname]}) timeline_storage[i_timeline.slug] = model end