このコミットが含まれているのは:
@@ -1,5 +1,7 @@
|
||||
class DeerjikistsController < ApplicationController
|
||||
def show
|
||||
locale = resolve_locale!
|
||||
|
||||
platform = params[:platform].to_s.strip
|
||||
code = params[:code].to_s.strip
|
||||
return render_bad_request('platform は必須です.') if platform.blank?
|
||||
@@ -10,7 +12,7 @@ class DeerjikistsController < ApplicationController
|
||||
.includes(tag: :tag_names)
|
||||
.find_by(platform:, code:)
|
||||
if deerjikist
|
||||
render json: DeerjikistRepr.base(deerjikist)
|
||||
render json: DeerjikistRepr.base(deerjikist, language_code: locale.language_code)
|
||||
else
|
||||
head :not_found
|
||||
end
|
||||
@@ -20,6 +22,7 @@ class DeerjikistsController < ApplicationController
|
||||
return head :unauthorized unless current_user
|
||||
return head :forbidden unless current_user.gte_member?
|
||||
|
||||
locale = resolve_locale!
|
||||
platform = params[:platform].to_s.strip
|
||||
code = params[:code].to_s.strip
|
||||
tag_id = params[:tag_id].to_i
|
||||
@@ -32,7 +35,7 @@ class DeerjikistsController < ApplicationController
|
||||
d.save!
|
||||
end
|
||||
|
||||
render json: DeerjikistRepr.base(deerjikist)
|
||||
render json: DeerjikistRepr.base(deerjikist, language_code: locale.language_code)
|
||||
end
|
||||
|
||||
def destroy
|
||||
|
||||
@@ -7,6 +7,8 @@ class MaterialsController < ApplicationController
|
||||
rescue_from MaterialZipExporter::MissingFileError, with: :render_zip_missing_file
|
||||
|
||||
def index
|
||||
locale = resolve_locale!
|
||||
|
||||
page = (params[:page].presence || 1).to_i
|
||||
limit = (params[:limit].presence || 20).to_i
|
||||
|
||||
@@ -42,7 +44,10 @@ class MaterialsController < ApplicationController
|
||||
.offset(offset)
|
||||
.to_a
|
||||
|
||||
response = { materials: MaterialRepr.list_many(materials, host: request.base_url),
|
||||
response = { materials: MaterialRepr.list_many(
|
||||
materials,
|
||||
host: request.base_url,
|
||||
language_code: locale.language_code),
|
||||
count: }
|
||||
if filters[:tag_id]
|
||||
response[:tag_scope] = material_index_tag_scope(filters, tag_graph)
|
||||
@@ -55,6 +60,8 @@ class MaterialsController < ApplicationController
|
||||
end
|
||||
|
||||
def show
|
||||
locale = resolve_locale!
|
||||
|
||||
material =
|
||||
Material
|
||||
.includes(:tag, :material_export_items)
|
||||
@@ -65,7 +72,8 @@ class MaterialsController < ApplicationController
|
||||
|
||||
wiki_page_body = material.tag&.tag_name('ja')&.wiki_page&.current_revision&.body
|
||||
|
||||
render json: MaterialRepr.base(material, host: request.base_url).merge(wiki_page_body:)
|
||||
render json: MaterialRepr.base(material, host: request.base_url,
|
||||
language_code: locale.language_code).merge(wiki_page_body:)
|
||||
end
|
||||
|
||||
def create
|
||||
@@ -109,7 +117,8 @@ class MaterialsController < ApplicationController
|
||||
|
||||
if material
|
||||
log_thumbnail_generation(material, MaterialThumbnailGenerator.generate!(material))
|
||||
render json: MaterialRepr.base(material, host: request.base_url), status: :created
|
||||
render json: MaterialRepr.base(material, host: request.base_url,
|
||||
language_code: locale.language_code), status: :created
|
||||
else
|
||||
render_validation_error material
|
||||
end
|
||||
@@ -162,7 +171,8 @@ class MaterialsController < ApplicationController
|
||||
|
||||
log_thumbnail_generation(material, MaterialThumbnailGenerator.generate!(material))
|
||||
|
||||
render json: MaterialRepr.base(material, host: request.base_url)
|
||||
render json: MaterialRepr.base(material, host: request.base_url,
|
||||
language_code: locale.language_code)
|
||||
end
|
||||
|
||||
def destroy
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
class NicoTagsController < ApplicationController
|
||||
def index
|
||||
locale = resolve_locale!
|
||||
|
||||
name = params[:name].presence
|
||||
linked_tag = params[:linked_tag].presence
|
||||
link_status = params[:link_status].presence
|
||||
@@ -68,7 +70,9 @@ class NicoTagsController < ApplicationController
|
||||
render json: { tags: tags.map { |tag|
|
||||
external_tag_json(tag).merge(
|
||||
recent_post_tag_created_at: tag.recent_post_tag_created_at,
|
||||
linked_tags: tag.linked_tags.map { |lt| TagRepr.base(lt) })
|
||||
linked_tags: tag.linked_tags.map { |lt|
|
||||
TagRepr.base(lt, language_code: locale.language_code)
|
||||
})
|
||||
}, count: }
|
||||
end
|
||||
|
||||
@@ -109,7 +113,9 @@ class NicoTagsController < ApplicationController
|
||||
created_by_user: current_user)
|
||||
end
|
||||
|
||||
render json: tag.linked_tags.map { |t| TagRepr.base(t) }, status: :ok
|
||||
render json: tag.linked_tags.map { |t|
|
||||
TagRepr.base(t, language_code: locale.language_code)
|
||||
}, status: :ok
|
||||
rescue Tag::NicoTagNormalisationError
|
||||
render_validation_error fields: { tags: ['ニコニコ・タグ同士は連携できません.'] }
|
||||
rescue ActiveRecord::RecordInvalid => e
|
||||
|
||||
@@ -92,7 +92,8 @@ class PostsController < ApplicationController
|
||||
q = q.except(:select, :order)
|
||||
|
||||
render json: { posts: posts.map { |post|
|
||||
PostRepr.base(post).merge(updated_at: post.updated_at_all).tap do |json|
|
||||
PostRepr.base(post, language_code: locale.language_code)
|
||||
.merge(updated_at: post.updated_at_all).tap do |json|
|
||||
json['thumbnail'] =
|
||||
if post.thumbnail.attached?
|
||||
rails_storage_proxy_url(post.thumbnail, only_path: false)
|
||||
@@ -116,7 +117,7 @@ class PostsController < ApplicationController
|
||||
.first
|
||||
return head :not_found unless post
|
||||
|
||||
render json: PostRepr.base(post, current_user)
|
||||
render json: PostRepr.base(post, current_user, language_code: locale.language_code)
|
||||
end
|
||||
|
||||
def metadata
|
||||
@@ -191,6 +192,8 @@ class PostsController < ApplicationController
|
||||
end
|
||||
|
||||
def show
|
||||
locale = resolve_locale!
|
||||
|
||||
post =
|
||||
Post
|
||||
.includes(:uploaded_user, :parents, :children,
|
||||
@@ -209,8 +212,9 @@ class PostsController < ApplicationController
|
||||
parent_posts:,
|
||||
child_posts:,
|
||||
sibling_posts:,
|
||||
related:)
|
||||
.merge(tags: build_tag_tree_for(post))
|
||||
related:,
|
||||
language_code: locale.language_code)
|
||||
.merge(tags: build_tag_tree_for(post, locale.language_code))
|
||||
end
|
||||
|
||||
def create
|
||||
@@ -251,7 +255,7 @@ class PostsController < ApplicationController
|
||||
thumbnail: params[:thumbnail])).create!(locale)
|
||||
|
||||
post.reload
|
||||
render json: PostRepr.base(post), status: :created
|
||||
render json: PostRepr.base(post, language_code: locale.language_code), status: :created
|
||||
rescue PostCreatePreflight::ValidationFailed => e
|
||||
render_validation_error fields: e.fields, base: e.base_errors
|
||||
rescue Tag::NicoTagNormalisationError
|
||||
@@ -379,8 +383,8 @@ class PostsController < ApplicationController
|
||||
return render json: conflict_json, status: :conflict if conflict_json
|
||||
|
||||
post.reload
|
||||
json = PostRepr.base(post, current_user)
|
||||
json['tags'] = build_tag_tree_for(post)
|
||||
json = PostRepr.base(post, current_user, language_code: locale.language_code)
|
||||
json['tags'] = build_tag_tree_for(post, locale.language_code)
|
||||
render json:, status: :ok
|
||||
rescue Tag::NicoTagNormalisationError
|
||||
render_validation_error fields: { tags: ['ニコニコ・タグは直接指定できません.'] }
|
||||
@@ -487,7 +491,7 @@ class PostsController < ApplicationController
|
||||
end
|
||||
end
|
||||
|
||||
def build_tag_tree_for post
|
||||
def build_tag_tree_for post, language_code = 'ja'
|
||||
post_tags = post.post_tags.reject { |post_tag| post_tag.tag.deprecated? }
|
||||
tags = post_tags.map(&:tag)
|
||||
tag_ids = tags.map(&:id)
|
||||
@@ -517,7 +521,7 @@ class PostsController < ApplicationController
|
||||
sections = sections_by_tag_id.fetch(tag_id, [])
|
||||
|
||||
if path.include?(tag_id)
|
||||
return TagRepr.inline(tag).merge(children: [], sections:)
|
||||
return TagRepr.inline(tag, language_code:).merge(children: [], sections:)
|
||||
end
|
||||
|
||||
if memo.key?(tag_id)
|
||||
@@ -529,7 +533,7 @@ class PostsController < ApplicationController
|
||||
|
||||
children = child_ids.filter_map { |cid| build_node.(cid, new_path) }
|
||||
|
||||
memo[tag_id] = TagRepr.inline(tag).merge(children:, sections:)
|
||||
memo[tag_id] = TagRepr.inline(tag, language_code:).merge(children:, sections:)
|
||||
end
|
||||
|
||||
internal_tags = root_ids.filter_map { |id| build_node.call(id, []) }
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
class TagVersionsController < ApplicationController
|
||||
def index
|
||||
locale = resolve_locale!
|
||||
tag_id = params[:id].presence
|
||||
page = (params[:page].presence || 1).to_i
|
||||
limit = (params[:limit].presence || 20).to_i
|
||||
@@ -27,12 +28,12 @@ class TagVersionsController < ApplicationController
|
||||
.limit(limit)
|
||||
.offset(offset)
|
||||
|
||||
render json: { versions: serialise_versions(versions), count: }
|
||||
render json: { versions: serialise_versions(versions, locale.language_code), count: }
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def serialise_versions rows
|
||||
def serialise_versions rows, language_code
|
||||
user_ids = rows.map(&:created_by_user_id).compact.uniq
|
||||
users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
|
||||
|
||||
@@ -54,13 +55,14 @@ class TagVersionsController < ApplicationController
|
||||
parent_tags =
|
||||
build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
|
||||
.map do |h|
|
||||
{ tag: TagRepr.base(tags_by_id[h[:tag_id]]),
|
||||
{ tag: TagRepr.base(tags_by_id[h[:tag_id]], language_code:),
|
||||
type: h[:type] }
|
||||
end
|
||||
|
||||
{ tag_id: row.tag_id,
|
||||
version_no: row.version_no,
|
||||
event_type: row.event_type,
|
||||
names: row.names,
|
||||
name: { current: row.name, prev: row.attributes['prev_name'] },
|
||||
category: { current: row.category, prev: row.attributes['prev_category'] },
|
||||
deprecated_at: { current: row.deprecated_at&.iso8601,
|
||||
|
||||
@@ -198,7 +198,8 @@ class TagsController < ApplicationController
|
||||
parent_tag_id = nil if parent_tag_id <= 0
|
||||
material_filter = material_filter_param(default: 'any')
|
||||
|
||||
graph = build_with_depth_graph(material_filter)
|
||||
locale = resolve_locale!
|
||||
graph = build_with_depth_graph(material_filter, locale.language_code)
|
||||
|
||||
tag_ids =
|
||||
if parent_tag_id
|
||||
@@ -325,7 +326,9 @@ class TagsController < ApplicationController
|
||||
return head :not_found unless tag
|
||||
|
||||
render json: { tag: TagRepr.base(tag, language_code: locale.language_code),
|
||||
deerjikists: DeerjikistRepr.many(tag.deerjikists) }
|
||||
deerjikists: DeerjikistRepr.many(
|
||||
tag.deerjikists,
|
||||
language_code: locale.language_code) }
|
||||
end
|
||||
|
||||
def deerjikists_by_name
|
||||
@@ -342,7 +345,9 @@ class TagsController < ApplicationController
|
||||
return head :not_found unless tag
|
||||
|
||||
render json: { tag: TagRepr.base(tag, language_code: locale.language_code),
|
||||
deerjikists: DeerjikistRepr.many(tag.deerjikists) }
|
||||
deerjikists: DeerjikistRepr.many(
|
||||
tag.deerjikists,
|
||||
language_code: locale.language_code) }
|
||||
end
|
||||
|
||||
def update_deerjikists
|
||||
@@ -404,7 +409,8 @@ class TagsController < ApplicationController
|
||||
|
||||
return if performed?
|
||||
|
||||
render json: DeerjikistRepr.many(tag.reload.deerjikists)
|
||||
render json: DeerjikistRepr.many(tag.reload.deerjikists,
|
||||
language_code: locale.language_code)
|
||||
end
|
||||
|
||||
def materials_by_name
|
||||
@@ -422,7 +428,7 @@ class TagsController < ApplicationController
|
||||
.find_by(tag_names: { name:, language_code: locale.language_code, primary_flg: true })
|
||||
return head :not_found unless tag
|
||||
|
||||
graph = build_with_depth_graph(material_filter)
|
||||
graph = build_with_depth_graph(material_filter, locale.language_code)
|
||||
|
||||
render json: build_tag_children(tag, graph:, language_code: locale.language_code)
|
||||
end
|
||||
@@ -543,9 +549,7 @@ class TagsController < ApplicationController
|
||||
value
|
||||
end
|
||||
|
||||
def build_with_depth_graph material_filter
|
||||
locale = resolve_locale!
|
||||
|
||||
def build_with_depth_graph material_filter, language_code
|
||||
children_by_parent_id = Hash.new { |h, k| h[k] = [] }
|
||||
parent_ids_by_child_id = Hash.new { |h, k| h[k] = [] }
|
||||
|
||||
@@ -564,7 +568,7 @@ class TagsController < ApplicationController
|
||||
Tag
|
||||
.joins(:tag_names)
|
||||
.where(id: tag_ids,
|
||||
tag_names: { language_code: locale.language_code, primary_flg: true })
|
||||
tag_names: { language_code:, primary_flg: true })
|
||||
.pluck('tags.id', 'tag_names.name', 'tags.category', 'tags.deprecated_at')
|
||||
.each_with_object({ }) do |(id, name, category, deprecated_at), h|
|
||||
h[id] = { name:, category:, deprecated: deprecated_at.present?,
|
||||
@@ -712,7 +716,10 @@ class TagsController < ApplicationController
|
||||
TagRepr.base(tag, language_code:).merge(
|
||||
children: children.map { build_tag_children(_1, graph:, language_code:) },
|
||||
has_material: tag_graph ? tag_graph[:has_material] : material.present?,
|
||||
material: material && MaterialRepr.base(material, host: request.base_url))
|
||||
material: material && MaterialRepr.base(
|
||||
material,
|
||||
host: request.base_url,
|
||||
language_code:))
|
||||
end
|
||||
|
||||
def record_tag_version! tag, event_type:, created_by_user:, language_code: 'ja',
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする