diff --git a/app/controllers/explore/posts_controller.rb b/app/controllers/explore/posts_controller.rb index ab378d48b..1d838c4cf 100644 --- a/app/controllers/explore/posts_controller.rb +++ b/app/controllers/explore/posts_controller.rb @@ -10,8 +10,7 @@ module Explore end def viewed - @post_set = PostSets::MostViewed.new(@date.to_s) - @posts = @post_set.posts + @posts = PostViewCountService.new.popular_posts(@date) respond_with(@posts) end diff --git a/app/logical/post_sets/most_viewed.rb b/app/logical/post_sets/most_viewed.rb deleted file mode 100644 index 2ec604375..000000000 --- a/app/logical/post_sets/most_viewed.rb +++ /dev/null @@ -1,17 +0,0 @@ -module PostSets - class MostViewed < PostSets::Base - attr_reader :date - - def initialize(date) - @date = date.blank? ? Date.today : Date.parse(date) - end - - def posts - @posts ||= PostViewCountService.new.popular_posts(date) - end - - def presenter - ::PostSetPresenters::MostViewed.new(self) - end - end -end diff --git a/app/logical/post_view_count_service.rb b/app/logical/post_view_count_service.rb index 95f23eecc..8564a027f 100644 --- a/app/logical/post_view_count_service.rb +++ b/app/logical/post_view_count_service.rb @@ -5,7 +5,7 @@ class PostViewCountService def initialize if !PostViewCountService.enabled? - raise NotImplementedError.new("the Reportbooru service isn't configured. Missed searches are not available.") + raise NotImplementedError.new("the Reportbooru service isn't configured. Post views are not available.") end end diff --git a/app/presenters/post_set_presenters/most_viewed.rb b/app/presenters/post_set_presenters/most_viewed.rb deleted file mode 100644 index ac83f7b37..000000000 --- a/app/presenters/post_set_presenters/most_viewed.rb +++ /dev/null @@ -1,54 +0,0 @@ -module PostSetPresenters - class MostViewed < Base - attr_accessor :post_set, :tag_set_presenter - delegate :posts, :date, :to => :post_set - - def initialize(post_set) - @post_set = post_set - end - - def prev_day - date - 1.day - end - - def next_day - date + 1.day - end - - def nav_links_for_scale(template) - html = [] - html << '' - html << template.link_to( - "< Back".html_safe, - template.viewed_explore_posts_path( - :date => prev_day - ), - :rel => "prev" - ) - html << template.link_to( - date.to_s, - template.viewed_explore_posts_path( - :date => date - ), - :class => "desc" - ) - html << template.link_to( - "Next >".html_safe, - template.viewed_explore_posts_path( - :date => next_day - ), - :rel => "next" - ) - html << '' - html.join("\n").html_safe - end - - def nav_links(template) - html = [] - html << '' - html.join("\n").html_safe - end - end -end diff --git a/app/views/explore/posts/viewed.html.erb b/app/views/explore/posts/viewed.html.erb index 8af3d783f..a67dd1190 100644 --- a/app/views/explore/posts/viewed.html.erb +++ b/app/views/explore/posts/viewed.html.erb @@ -1,10 +1,10 @@
-

Most Viewed - <%= @post_set.presenter.date %>

+

Most Viewed - <%= @date %>

<%= render "posts/partials/common/inline_blacklist" %> - <%= @post_set.presenter.post_previews_html(self) %> + <%= post_previews_html(@posts) %>