jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

posts: eliminate pool_id, favgroup_id url params.

Browse Source 
Replace the `pool_id` and `favgroup_id` url params:

    https://danbooru.donmai.us/posts/123?pool_id=456
    https://danbooru.donmai.us/posts/123?favgroup_id=456

with the `q` param:

    https://danbooru.donmai.us/posts/123?q=pool:456
    https://danbooru.donmai.us/posts/123?q=favgroup:456
This commit is contained in:
evazion
2021-01-29 21:41:09 -06:00
parent 1e778dbbf6
commit 27cac98516
9 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/components/post_navbar_component.rb
View File

@@ -1,14 +1,10 @@
class PostNavbarComponent < ApplicationComponent
extend Memoist
attr_reader :post, :current_user, :search
attr_reader :post, :current_user, :search, :pool_id, :favgroup_id
def initialize(post:, current_user:, search: nil, pool_id: nil, favgroup_id: nil)
def initialize(post:, current_user:, search: nil)
@post = post
@current_user = current_user
@search = search.presence || "status:any"
@pool_id = pool_id&.to_i
@favgroup_id = favgroup_id&.to_i
end
def render?
@@ -16,24 +12,30 @@ class PostNavbarComponent < ApplicationComponent
end
def pools
post.pools.undeleted.sort_by do |pool|
@pools ||= post.pools.undeleted.sort_by do |pool|
[pool.id == pool_id ? 0 : 1, pool.is_series? ? 0 : 1, pool.name]
end
end
def favgroups
current_user.favorite_groups.for_post(post.id).sort_by do |favgroup|
@favgroups ||= current_user.favorite_groups.for_post(post.id).sort_by do |favgroup|
[favgroup.id == favgroup_id ? 0 : 1, favgroup.name]
end
end
def has_search_navbar?
!has_order_metatag? && pool_id.blank? && favgroup_id.blank?
!query.has_metatag?(:order, :ordfav, :ordpool) && pool_id.blank? && favgroup_id.blank?
end
def has_order_metatag?
PostQueryBuilder.new(search).has_metatag?(:order, :ordfav, :ordpool)
def pool_id
@pool_id ||= query.find_metatag(:pool, :ordpool)&.to_i
end
memoize :pools, :favgroups
def favgroup_id
@favgroup_id ||= query.find_metatag(:favgroup, :ordfavgroup)&.to_i
end
def query
@query ||= PostQueryBuilder.new(search)
end
end

16
app/components/post_navbar_component/post_navbar_component.html.erb
View File

@@ -16,11 +16,11 @@
<%= tag.li class: "pool-navbar pool-category-#{pool.category}", "data-selected": selected do %>
<span class="first">
<%= link_to_unless first_post_id == post.id, "«", post_path(first_post_id, pool_id: pool.id), rel: "nofollow", title: "to page 1" %>
<%= link_to_unless first_post_id == post.id, "«", post_path(first_post_id, q: "pool:#{pool.id}"), rel: "nofollow", title: "to page 1" %>
</span>
<span class="prev">
<%= link_to_if previous_post_id, "‹ prev", post_path(previous_post_id.to_i, pool_id: pool.id), rel: ["nofollow", ("prev" if selected)], title: "to page #{pool.page_number(previous_post_id)}" %>
<%= link_to_if previous_post_id, "‹ prev", post_path(previous_post_id.to_i, q: "pool:#{pool.id}"), rel: ["nofollow", ("prev" if selected)], title: "to page #{pool.page_number(previous_post_id)}" %>
</span>
<span class="pool-name">
@@ -28,11 +28,11 @@
</span>
<span class="next">
<%= link_to_if next_post_id, "next ›", post_path(next_post_id.to_i, pool_id: pool.id), rel: ["nofollow", ("next" if selected)], title: "to page #{pool.page_number(next_post_id)}" %>
<%= link_to_if next_post_id, "next ›", post_path(next_post_id.to_i, q: "pool:#{pool.id}"), rel: ["nofollow", ("next" if selected)], title: "to page #{pool.page_number(next_post_id)}" %>
</span>
<span class="last">
<%= link_to_unless last_post_id == post.id, "»", post_path(last_post_id, pool_id: pool.id), rel: "nofollow", title: "to page #{pool.post_count}" %>
<%= link_to_unless last_post_id == post.id, "»", post_path(last_post_id, q: "pool:#{pool.id}"), rel: "nofollow", title: "to page #{pool.post_count}" %>
</span>
<% end %>
<% end %>
@@ -46,11 +46,11 @@
<%= tag.li class: "favgroup-navbar", "data-selected": selected do %>
<span class="first">
<%= link_to_unless first_post_id == post.id, "«", post_path(first_post_id, favgroup_id: favgroup.id), rel: "nofollow" %>
<%= link_to_unless first_post_id == post.id, "«", post_path(first_post_id, q: "favgroup:#{favgroup.id}"), rel: "nofollow" %>
</span>
<span class="prev">
<%= link_to_if previous_post_id, "‹ prev", post_path(previous_post_id.to_i, favgroup_id: favgroup.id), rel: ["nofollow", ("prev" if selected)] %>
<%= link_to_if previous_post_id, "‹ prev", post_path(previous_post_id.to_i, q: "favgroup:#{favgroup.id}"), rel: ["nofollow", ("prev" if selected)] %>
</span>
<span class="favgroup-name">
@@ -58,11 +58,11 @@
</span>
<span class="next">
<%= link_to_if next_post_id, "next ›", post_path(next_post_id.to_i, favgroup_id: favgroup.id), rel: ["nofollow", ("next" if selected)] %>
<%= link_to_if next_post_id, "next ›", post_path(next_post_id.to_i, q: "favgroup:#{favgroup.id}"), rel: ["nofollow", ("next" if selected)] %>
</span>
<span class="last">
<%= link_to_unless last_post_id == post.id, "»", post_path(last_post_id, favgroup_id: favgroup.id), rel: "nofollow" %>
<%= link_to_unless last_post_id == post.id, "»", post_path(last_post_id, q: "favgroup:#{favgroup.id}"), rel: "nofollow" %>
</span>
<% end %>
<% end %>

18
app/components/post_preview_component.rb
View File

@@ -3,18 +3,16 @@
class PostPreviewComponent < ApplicationComponent
with_collection_parameter :post
attr_reader :post, :tags, :show_deleted, :show_cropped, :link_target, :pool, :pool_id, :favgroup_id, :similarity, :recommended, :compact, :size, :current_user, :options
attr_reader :post, :tags, :show_deleted, :show_cropped, :link_target, :pool, :similarity, :recommended, :compact, :size, :current_user, :options
delegate :external_link_to, :time_ago_in_words_tagged, :empty_heart_icon, to: :helpers
def initialize(post:, tags: "", show_deleted: false, show_cropped: true, link_target: post, pool: nil, pool_id: nil, favgroup_id: nil, similarity: nil, recommended: nil, compact: nil, size: nil, current_user: CurrentUser.user, **options)
def initialize(post:, tags: "", show_deleted: false, show_cropped: true, link_target: post, pool: nil, similarity: nil, recommended: nil, compact: nil, size: nil, current_user: CurrentUser.user, **options)
@post = post
@tags = tags
@tags = tags.presence
@show_deleted = show_deleted
@show_cropped = show_cropped
@link_target = link_target
@pool = pool
@pool_id = pool_id
@favgroup_id = favgroup_id
@similarity = similarity.round(1) if similarity.present?
@recommended = recommended.round(1) if recommended.present?
@compact = compact
@@ -31,16 +29,6 @@ class PostPreviewComponent < ApplicationComponent
{ class: [classes, *preview_class].compact.join(" "), **data_attributes }
end
def link_params
link_params = {}
link_params["q"] = tags if tags.present?
link_params["pool_id"] = pool_id if pool_id
link_params["favgroup_id"] = favgroup_id if favgroup_id
link_params
end
def cropped_url
if show_cropped && post.has_cropped? && !current_user.disable_cropped_thumbnails?
post.crop_file_url

2
app/components/post_preview_component/post_preview_component.html.erb
View File

@@ -1,5 +1,5 @@
<%= tag.article id: "post_#{post.id}", **article_attrs do -%>
<%= link_to polymorphic_path(link_target, link_params) do -%>
<%= link_to polymorphic_path(link_target, q: tags) do -%>
<picture>
<%= tag.source media: "(max-width: 660px)", srcset: cropped_url -%>
<%= tag.source media: "(min-width: 660px)", srcset: post.preview_file_url -%>