Merge branch 'main' into feature/485

このコミットが含まれているのは:
2026-11-23 02:50:43 +09:00
コミット aa8841feb2
6個のファイルの変更、279行の追加、63行の削除
+4 -2
ファイルの表示
@@ -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)
+2 -2
ファイルの表示
@@ -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
+65 -58
ファイルの表示
@@ -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)