Merge branch 'main' into feature/479

このコミットが含まれているのは:
2026-11-23 03:58:34 +09:00
コミット 570846db67
19個のファイルの変更、455行の追加、139行の削除
+11 -9
ファイルの表示
@@ -37,7 +37,7 @@ class PostsController < ApplicationController
offset = (page - 1) * limit
needs_history_join = order[0] == 'updated_at' || updated_between.any?(&:present?)
history_join_required = order[0] == 'updated_at' || updated_between.any?(&:present?)
q =
filtered_posts(locale)
@@ -46,8 +46,8 @@ class PostsController < ApplicationController
:tag_names, :tag_descriptions] }])
.with_attached_thumbnail
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
q = q.where('posts.title LIKE ?', "%#{ title }%") if title
q = q.where('posts.url LIKE ?', "%#{ Post.sanitize_sql_like(url).tr('*?', '%_') }%") if url
q = q.where('posts.title LIKE ?', "%#{ Post.sanitize_sql_like(title).tr('*?', '%_') }%") if title
if original_created_from
q = q.where('posts.original_created_before > ?', original_created_from)
end
@@ -57,8 +57,8 @@ class PostsController < ApplicationController
q = q.where('posts.created_at >= ?', created_between[0]) if created_between[0]
q = q.where('posts.created_at <= ?', created_between[1]) if created_between[1]
count_scope = q
if needs_history_join
history_times = HistoryAccess.visible(PostVersion.all)
if history_join_required
history_times = PostVersion.all
.select('post_id, MAX(created_at) AS latest_at').group(:post_id)
q = q.joins("LEFT JOIN (#{ history_times.to_sql }) history_times " +
'ON history_times.post_id = posts.id')
@@ -72,7 +72,7 @@ class PostsController < ApplicationController
q = q.where("#{ updated_at_all_sql } <= ?", updated_between[1])
end
count_scope = q if updated_between.any?(&:present?)
if needs_history_join
if history_join_required
q = q.select('posts.*', "#{ updated_at_all_sql } AS updated_at")
end
@@ -92,10 +92,10 @@ class PostsController < ApplicationController
.offset(offset)
.to_a
latest_version_times =
if needs_history_join
if history_join_required
{ }
else
HistoryAccess.visible(PostVersion.where(post_id: posts.map(&:id)))
PostVersion.where(post_id: posts.map(&:id))
.group(:post_id).maximum(:created_at)
end
@@ -314,7 +314,9 @@ class PostsController < ApplicationController
def viewed
return head :unauthorized unless current_user
current_user.viewed_posts << Post.find(params[:id])
UserPostView.create_or_find_by!(
user: current_user,
post: Post.find(params[:id]))
head :no_content
end