Merge branch 'main' into feature/479
このコミットが含まれているのは:
@@ -28,17 +28,19 @@ class NicoTagsController < ApplicationController
|
||||
'ON post_tag_max.external_tag_id = external_tags.id')
|
||||
.includes(linked_tags: [:tag_names, :tag_descriptions])
|
||||
if name
|
||||
name_pattern = ExternalTag.sanitize_sql_like(name).tr('*?', '%_')
|
||||
q = q.where(('external_tags.name LIKE ? ' +
|
||||
"OR CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?"),
|
||||
"%#{ name }%", "%#{ name }")
|
||||
"%#{ name_pattern }%", "%#{ name_pattern }")
|
||||
end
|
||||
|
||||
if linked_tag
|
||||
linked_tag_pattern = "%#{ Tag.sanitize_sql_like(linked_tag).tr('*?', '%_') }%"
|
||||
linked_tag_ids =
|
||||
Tag
|
||||
.joins(:tag_names)
|
||||
.where(tag_names: { language_code: locale.language_code, primary_flg: true })
|
||||
.where('tag_names.name LIKE ?', "%#{ linked_tag }%")
|
||||
.where('tag_names.name LIKE ?', linked_tag_pattern)
|
||||
.pluck(:id)
|
||||
linked_nico_tag_ids = NicoTagRelation.where(tag_id: linked_tag_ids).pluck(:nico_tag_id)
|
||||
q = q.where(id: linked_nico_tag_ids)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@ class TagDescriptionsController < ApplicationController
|
||||
private
|
||||
|
||||
def representation description
|
||||
HistoryAccess.require_current!(description, TagDescriptionVersion)
|
||||
description.as_json(only: [
|
||||
:tag_id,
|
||||
:language_code,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
class TagGroupsController < ApplicationController
|
||||
def index
|
||||
locale = resolve_locale!
|
||||
groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).includes(:created_by_user, :updated_by_user).order(:id)
|
||||
groups = TagGroup.includes(:created_by_user, :updated_by_user).order(:id)
|
||||
render json: TagGroupRepr.many(locale, groups.to_a)
|
||||
end
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ class TagsController < ApplicationController
|
||||
|
||||
post_id = params[:post]
|
||||
|
||||
name = params[:name].presence
|
||||
category = params[:category].presence
|
||||
name = params[:name].to_s.strip.presence
|
||||
category = params[:category].to_s.strip.presence
|
||||
post_count_between = (params[:post_count_gte].presence || -1).to_i,
|
||||
(params[:post_count_lte].presence || -1).to_i
|
||||
post_count_between[0] = nil if post_count_between[0] < 0
|
||||
@@ -56,10 +56,11 @@ class TagsController < ApplicationController
|
||||
end
|
||||
|
||||
if name
|
||||
tags = tags.where('tag_names.name LIKE ?', "%#{ name }%")
|
||||
name_pattern = "%#{ Tag.sanitize_sql_like(name).tr('*?', '%_') }%"
|
||||
tags = tags.where('tag_names.name LIKE ?', name_pattern)
|
||||
external_tags =
|
||||
external_tags.where("CONCAT(external_tags.platform, ':', external_tags.name) LIKE ?",
|
||||
"%#{ name }%")
|
||||
name_pattern)
|
||||
end
|
||||
|
||||
if category == 'nico'
|
||||
@@ -218,63 +219,16 @@ class TagsController < ApplicationController
|
||||
locale = resolve_locale!
|
||||
|
||||
q = params[:q].to_s.strip.sub(/\Anot:/i, '')
|
||||
prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q) }%"
|
||||
literal = ActiveRecord::Base.sanitize_sql_like(q).tr('*?', '%_')
|
||||
nico = bool?(:nico, default: true)
|
||||
present = bool?(:present, default: true)
|
||||
|
||||
with_nico = bool?(:nico, default: true)
|
||||
present_only = bool?(:present, default: true)
|
||||
|
||||
alias_rows =
|
||||
TagName
|
||||
.where(language_code: locale.language_code, primary_flg: false)
|
||||
.where('name LIKE ?', prefix)
|
||||
.pluck(:tag_id, :name)
|
||||
|
||||
matched_alias_by_tag_id = { }
|
||||
tag_ids = []
|
||||
alias_rows.each do |tag_id, alias_name|
|
||||
tag_ids << tag_id
|
||||
matched_alias_by_tag_id[tag_id] ||= alias_name
|
||||
rows = autocomplete_rows(locale:, pattern: "#{ literal }%", nico:, present:)
|
||||
if rows.length < 20 && q.present?
|
||||
partial_rows = autocomplete_rows(locale:, pattern: "%#{ literal }%", nico:, present:)
|
||||
rows = (rows + partial_rows).uniq { [_1['category'], _1['id']] }.first(20)
|
||||
end
|
||||
|
||||
base =
|
||||
Tag
|
||||
.joins(:tag_names)
|
||||
.preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
|
||||
parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
|
||||
.where(tag_names: { language_code: locale.language_code, primary_flg: true },
|
||||
deprecated_at: nil)
|
||||
base = base.where('tags.post_count > 0') if present_only
|
||||
|
||||
canonical_hit = base.where('tag_names.name LIKE ?', prefix)
|
||||
|
||||
internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
|
||||
|
||||
internal_rows =
|
||||
internal_tags
|
||||
.order(Arel.sql('tags.post_count DESC, tag_names.name'))
|
||||
.limit(20)
|
||||
.map { |tag|
|
||||
TagRepr.base(tag, language_code: locale.language_code)
|
||||
.merge(matched_alias: matched_alias_by_tag_id[tag.id])
|
||||
}
|
||||
|
||||
return render json: internal_rows unless with_nico
|
||||
|
||||
external_base = ExternalTag.all
|
||||
external_base = external_base.where('post_count > 0') if present_only
|
||||
|
||||
external_rows =
|
||||
external_base
|
||||
.where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", prefix, prefix)
|
||||
.order(post_count: :desc, name: :asc)
|
||||
.limit(20)
|
||||
.map { external_tag_json(_1) }
|
||||
|
||||
rows =
|
||||
(internal_rows + external_rows)
|
||||
.sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
|
||||
.first(20)
|
||||
|
||||
render json: rows
|
||||
end
|
||||
|
||||
@@ -545,6 +499,59 @@ class TagsController < ApplicationController
|
||||
|
||||
private
|
||||
|
||||
def autocomplete_rows locale:, pattern:, nico:, present:
|
||||
alias_rows =
|
||||
TagName
|
||||
.where(language_code: locale.language_code, primary_flg: false)
|
||||
.where('name LIKE ?', pattern)
|
||||
.pluck(:tag_id, :name)
|
||||
|
||||
matched_alias_by_tag_id = { }
|
||||
tag_ids = []
|
||||
alias_rows.each do |tag_id, alias_name|
|
||||
tag_ids << tag_id
|
||||
matched_alias_by_tag_id[tag_id] ||= alias_name
|
||||
end
|
||||
|
||||
base =
|
||||
Tag
|
||||
.joins(:tag_names)
|
||||
.preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
|
||||
parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
|
||||
.where(tag_names: { language_code: locale.language_code, primary_flg: true },
|
||||
deprecated_at: nil)
|
||||
base = base.where('tags.post_count > 0') if present
|
||||
|
||||
canonical_hit = base.where('tag_names.name LIKE ?', pattern)
|
||||
|
||||
internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
|
||||
|
||||
internal_rows =
|
||||
internal_tags
|
||||
.order(Arel.sql('tags.post_count DESC, tag_names.name'))
|
||||
.limit(20)
|
||||
.map { |tag|
|
||||
TagRepr.base(tag, language_code: locale.language_code)
|
||||
.merge(matched_alias: matched_alias_by_tag_id[tag.id])
|
||||
}
|
||||
|
||||
return internal_rows unless nico
|
||||
|
||||
external_base = ExternalTag.all
|
||||
external_base = external_base.where('post_count > 0') if present
|
||||
|
||||
external_rows =
|
||||
external_base
|
||||
.where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", pattern, pattern)
|
||||
.order(post_count: :desc, name: :asc)
|
||||
.limit(20)
|
||||
.map { external_tag_json(_1) }
|
||||
|
||||
(internal_rows + external_rows)
|
||||
.sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
|
||||
.first(20)
|
||||
end
|
||||
|
||||
def material_filter_param default:
|
||||
value = params[:material_filter].to_s.presence
|
||||
return default unless ['present', 'missing', 'any'].include?(value)
|
||||
|
||||
@@ -8,12 +8,11 @@ class WikiPagesController < ApplicationController
|
||||
|
||||
title = params[:title].to_s.strip
|
||||
descriptions =
|
||||
HistoryAccess.current(TagDescription.all, TagDescriptionVersion)
|
||||
.where(language_code: locale.language_code)
|
||||
TagDescription.where(language_code: locale.language_code)
|
||||
.includes(tag: :tag_names)
|
||||
|
||||
descriptions = descriptions.order(updated_at: :desc, id: :asc)
|
||||
tag_groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).order(updated_at: :desc, id: :asc)
|
||||
tag_groups = TagGroup.order(updated_at: :desc, id: :asc)
|
||||
if title.present?
|
||||
pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
|
||||
descriptions =
|
||||
@@ -41,13 +40,13 @@ class WikiPagesController < ApplicationController
|
||||
return head :not_found unless language.is_a?(String)
|
||||
return head :not_found unless Language.exists?(code: language)
|
||||
|
||||
names = HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
|
||||
names = TagDescription.joins(tag: :tag_names)
|
||||
.where(language_code: locale.language_code, tag_names: { language_code: language })
|
||||
.pluck('tag_descriptions.tag_id', 'tag_descriptions.id', 'tag_names.name')
|
||||
candidates = names.map do |tag_id, description_id, name|
|
||||
WikiPageRepr.autolink_tag(locale, tag_id:, description_id:, name:, language:)
|
||||
end
|
||||
candidates.concat(HistoryAccess.current(TagGroup.all, TagGroupVersion).order(:id).pluck(:id, :name).map do |id, name|
|
||||
candidates.concat(TagGroup.order(:id).pluck(:id, :name).map do |id, name|
|
||||
WikiPageRepr.autolink_group(locale, id:, name:, language:)
|
||||
end)
|
||||
render json: candidates
|
||||
@@ -309,7 +308,7 @@ class WikiPagesController < ApplicationController
|
||||
else
|
||||
current_group_version(group)
|
||||
end
|
||||
return head :not_found unless version
|
||||
return head :not_found if params[:version].present? && !version
|
||||
|
||||
representation =
|
||||
if params[:version].present?
|
||||
@@ -327,20 +326,22 @@ class WikiPagesController < ApplicationController
|
||||
|
||||
def render_group_representation representation, version, body: nil, status: :ok
|
||||
body ||= TagGroupMarkdownRenderer.render(representation)
|
||||
versions = HistoryAccess.visible(TagGroupVersion.all).where(tag_group_id: version.tag_group_id)
|
||||
pred = versions.find_by(version_no: version.version_no - 1)&.id
|
||||
succ = versions.find_by(version_no: version.version_no + 1)&.id
|
||||
updated_at = version.created_at
|
||||
if version
|
||||
versions = HistoryAccess.visible(TagGroupVersion.all)
|
||||
.where(tag_group_id: version.tag_group_id)
|
||||
pred = versions.find_by(version_no: version.version_no - 1)&.id
|
||||
succ = versions.find_by(version_no: version.version_no + 1)&.id
|
||||
end
|
||||
render json: {
|
||||
'id' => version.tag_group_id,
|
||||
'id' => representation.fetch('id'),
|
||||
'resource_type' => 'tag_group',
|
||||
'title' => "#{ TagGroupRepr::PREFIX }#{ representation.fetch('name') }",
|
||||
'deprecated_at' => nil,
|
||||
'body' => body,
|
||||
'revision_id' => version.id,
|
||||
'revision_id' => version&.id,
|
||||
'pred' => pred,
|
||||
'succ' => succ,
|
||||
'updated_at' => updated_at }, status:
|
||||
'updated_at' => representation.fetch('updated_at') }, status:
|
||||
rescue TagGroupMarkdownRenderer::UnsupportedStructure => error
|
||||
render_unprocessable_entity(error.message)
|
||||
end
|
||||
@@ -395,14 +396,16 @@ class WikiPagesController < ApplicationController
|
||||
historical = params[:version].present?
|
||||
rev = historical ? versions.find_by(id: params[:version]) :
|
||||
versions.find_by(version_no: description.version_no)
|
||||
return head :not_found unless rev
|
||||
return head :not_found if historical && !rev
|
||||
|
||||
pred = versions.find_by(version_no: rev.version_no - 1)&.id
|
||||
succ = versions.find_by(version_no: rev.version_no + 1)&.id
|
||||
if rev
|
||||
pred = versions.find_by(version_no: rev.version_no - 1)&.id
|
||||
succ = versions.find_by(version_no: rev.version_no + 1)&.id
|
||||
end
|
||||
body = historical ? rev.body : description.body
|
||||
updated_at = historical ? rev.created_at : description.updated_at
|
||||
render json: WikiPageRepr.tag_description(locale, description).merge(
|
||||
body:, revision_id: rev.id, pred:, succ:, updated_at:)
|
||||
body:, revision_id: rev&.id, pred:, succ:, updated_at:)
|
||||
end
|
||||
|
||||
def description_versions description
|
||||
@@ -411,7 +414,7 @@ class WikiPagesController < ApplicationController
|
||||
end
|
||||
|
||||
def tag_description_by_title locale, title
|
||||
HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
|
||||
TagDescription.joins(tag: :tag_names)
|
||||
.find_by(language_code: locale.language_code,
|
||||
tag_names: { language_code: locale.language_code, name: title })
|
||||
end
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする