Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6ac60f5bd1 | |||
| 5002859fc8 | |||
| bebfe02348 | |||
| 674ac32817 | |||
| 9b1df20ab5 | |||
| fa8eb66535 | |||
| a7020fb129 | |||
| 1d1787312f | |||
| fcd3b87b2a | |||
| 0ff7fdf78a | |||
| b2c3e02ccc | |||
| c112576b11 | |||
| 6235b293f0 | |||
| 43cd38a216 | |||
| 8ff1819d5a | |||
| bde7d33949 | |||
| 5c7580d571 | |||
| 48f823a7c8 | |||
| bd11e37fd3 | |||
| e72ec608f4 | |||
| a3914fb22a |
@@ -30,14 +30,21 @@ class NicoTagsController < ApplicationController
|
|||||||
id = params[:id].to_i
|
id = params[:id].to_i
|
||||||
|
|
||||||
tag = Tag.find(id)
|
tag = Tag.find(id)
|
||||||
return head :bad_request if tag.category != 'nico'
|
return head :bad_request unless tag.nico?
|
||||||
|
|
||||||
linked_tag_names = params[:tags].to_s.split(' ')
|
linked_tag_names = params[:tags].to_s.split
|
||||||
linked_tags = Tag.normalise_tags(linked_tag_names, with_tagme: false)
|
linked_tags = Tag.normalise_tags!(linked_tag_names, with_tagme: false,
|
||||||
return head :bad_request if linked_tags.any? { |t| t.category == 'nico' }
|
with_no_deerjikist: false)
|
||||||
|
return head :bad_request if linked_tags.any? { |t| t.nico? }
|
||||||
|
|
||||||
tag.linked_tags = linked_tags
|
ApplicationRecord.transaction do
|
||||||
tag.save!
|
TagVersioning.record_tag_snapshots!(linked_tags, created_by_user: current_user)
|
||||||
|
|
||||||
|
tag.linked_tags = linked_tags
|
||||||
|
tag.save!
|
||||||
|
|
||||||
|
NicoTagVersionRecorder.record!(tag:, event_type: :update, 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) }, status: :ok
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,119 @@
|
|||||||
|
class PostVersionsController < ApplicationController
|
||||||
|
def index
|
||||||
|
post_id = params[:post].presence
|
||||||
|
tag_id = params[:tag].presence
|
||||||
|
page = (params[:page].presence || 1).to_i
|
||||||
|
limit = (params[:limit].presence || 20).to_i
|
||||||
|
|
||||||
|
page = 1 if page < 1
|
||||||
|
limit = 1 if limit < 1
|
||||||
|
|
||||||
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
tag_name =
|
||||||
|
if tag_id
|
||||||
|
TagName.joins(:tag).find_by(tag: { id: tag_id })
|
||||||
|
end
|
||||||
|
return render json: { versions: [], count: 0 } if tag_id && tag_name.blank?
|
||||||
|
|
||||||
|
q = PostVersion.joins(<<~SQL.squish)
|
||||||
|
LEFT JOIN
|
||||||
|
post_versions prev
|
||||||
|
ON
|
||||||
|
prev.post_id = post_versions.post_id
|
||||||
|
AND prev.version_no = post_versions.version_no - 1
|
||||||
|
SQL
|
||||||
|
.select('post_versions.*', 'prev.title AS prev_title', 'prev.url AS prev_url',
|
||||||
|
'prev.thumbnail_base AS prev_thumbnail_base', 'prev.tags AS prev_tags',
|
||||||
|
'prev.original_created_from AS prev_original_created_from',
|
||||||
|
'prev.original_created_before AS prev_original_created_before')
|
||||||
|
q = q.where('post_versions.post_id = ?', post_id) if post_id
|
||||||
|
if tag_name
|
||||||
|
escaped = ActiveRecord::Base.sanitize_sql_like(tag_name.name)
|
||||||
|
q = q.where(("CONCAT(' ', post_versions.tags, ' ') LIKE :kw " +
|
||||||
|
"OR CONCAT(' ', prev.tags, ' ') LIKE :kw"),
|
||||||
|
kw: "% #{ escaped } %")
|
||||||
|
end
|
||||||
|
|
||||||
|
count = q.except(:select, :order, :limit, :offset).count
|
||||||
|
|
||||||
|
versions = q.order(Arel.sql('post_versions.created_at DESC, post_versions.id DESC'))
|
||||||
|
.limit(limit)
|
||||||
|
.offset(offset)
|
||||||
|
|
||||||
|
render json: { versions: serialise_versions(versions), count: }
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def serialise_versions rows
|
||||||
|
user_ids = rows.map(&:created_by_user_id).compact.uniq
|
||||||
|
users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
|
||||||
|
|
||||||
|
rows.map do |row|
|
||||||
|
cur_tags = split_tags(row.tags)
|
||||||
|
prev_tags = split_tags(row.attributes['prev_tags'])
|
||||||
|
|
||||||
|
{
|
||||||
|
post_id: row.post_id,
|
||||||
|
version_no: row.version_no,
|
||||||
|
event_type: row.event_type,
|
||||||
|
title: {
|
||||||
|
current: row.title,
|
||||||
|
prev: row.attributes['prev_title']
|
||||||
|
},
|
||||||
|
url: {
|
||||||
|
current: row.url,
|
||||||
|
prev: row.attributes['prev_url']
|
||||||
|
},
|
||||||
|
thumbnail: {
|
||||||
|
current: nil,
|
||||||
|
prev: nil
|
||||||
|
},
|
||||||
|
thumbnail_base: {
|
||||||
|
current: row.thumbnail_base,
|
||||||
|
prev: row.attributes['prev_thumbnail_base']
|
||||||
|
},
|
||||||
|
tags: build_version_tags(cur_tags, prev_tags),
|
||||||
|
original_created_from: {
|
||||||
|
current: row.original_created_from&.iso8601,
|
||||||
|
prev: row.attributes['prev_original_created_from']&.iso8601
|
||||||
|
},
|
||||||
|
original_created_before: {
|
||||||
|
current: row.original_created_before&.iso8601,
|
||||||
|
prev: row.attributes['prev_original_created_before']&.iso8601
|
||||||
|
},
|
||||||
|
created_at: row.created_at.iso8601,
|
||||||
|
created_by_user:
|
||||||
|
if row.created_by_user_id
|
||||||
|
{
|
||||||
|
id: row.created_by_user_id,
|
||||||
|
name: users_by_id[row.created_by_user_id]
|
||||||
|
}
|
||||||
|
end
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def build_version_tags(cur_tags, prev_tags)
|
||||||
|
(cur_tags | prev_tags).map do |name|
|
||||||
|
type =
|
||||||
|
if cur_tags.include?(name) && prev_tags.include?(name)
|
||||||
|
'context'
|
||||||
|
elsif cur_tags.include?(name)
|
||||||
|
'added'
|
||||||
|
else
|
||||||
|
'removed'
|
||||||
|
end
|
||||||
|
|
||||||
|
{
|
||||||
|
name:,
|
||||||
|
type:
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def split_tags(tags)
|
||||||
|
tags.to_s.split(/\s+/).reject(&:blank?)
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -44,7 +44,7 @@ class PostsController < ApplicationController
|
|||||||
filtered_posts
|
filtered_posts
|
||||||
.joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
|
.joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
|
||||||
.reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
|
.reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
|
||||||
.preload(tags: { tag_name: :wiki_page })
|
.preload(tags: [:materials, { tag_name: :wiki_page }])
|
||||||
.with_attached_thumbnail
|
.with_attached_thumbnail
|
||||||
|
|
||||||
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
||||||
@@ -95,7 +95,7 @@ class PostsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def random
|
def random
|
||||||
post = filtered_posts.preload(tags: { tag_name: :wiki_page })
|
post = filtered_posts.preload(tags: [:materials, { tag_name: :wiki_page }])
|
||||||
.order('RAND()')
|
.order('RAND()')
|
||||||
.first
|
.first
|
||||||
return head :not_found unless post
|
return head :not_found unless post
|
||||||
@@ -104,12 +104,12 @@ class PostsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
post = Post.includes(tags: { tag_name: :wiki_page }).find_by(id: params[:id])
|
post = Post.includes(tags: [:materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
|
||||||
return head :not_found unless post
|
return head :not_found unless post
|
||||||
|
|
||||||
render json: PostRepr.base(post, current_user)
|
render json: PostRepr.base(post, current_user)
|
||||||
.merge(tags: build_tag_tree_for(post.tags),
|
.merge(tags: build_tag_tree_for(post.tags),
|
||||||
related: post.related(limit: 20))
|
related: PostRepr.many(post.related(limit: 20)))
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@@ -123,26 +123,36 @@ class PostsController < ApplicationController
|
|||||||
tag_names = params[:tags].to_s.split
|
tag_names = params[:tags].to_s.split
|
||||||
original_created_from = params[:original_created_from]
|
original_created_from = params[:original_created_from]
|
||||||
original_created_before = params[:original_created_before]
|
original_created_before = params[:original_created_before]
|
||||||
|
parent_post_ids = parse_parent_post_ids
|
||||||
|
|
||||||
post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
|
post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
|
||||||
original_created_from:, original_created_before:)
|
original_created_from:, original_created_before:)
|
||||||
post.thumbnail.attach(thumbnail)
|
post.thumbnail.attach(thumbnail) if thumbnail.present?
|
||||||
|
|
||||||
ActiveRecord::Base.transaction do
|
ApplicationRecord.transaction do
|
||||||
post.save!
|
post.save!
|
||||||
tags = Tag.normalise_tags(tag_names)
|
|
||||||
|
tags = Tag.normalise_tags!(tag_names)
|
||||||
|
TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
|
||||||
|
|
||||||
tags = Tag.expand_parent_tags(tags)
|
tags = Tag.expand_parent_tags(tags)
|
||||||
sync_post_tags!(post, tags)
|
sync_post_tags!(post, tags)
|
||||||
|
|
||||||
|
sync_parent_posts!(post, parent_post_ids)
|
||||||
|
|
||||||
post.resized_thumbnail!
|
post.resized_thumbnail!
|
||||||
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
|
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
post.reload
|
post.reload
|
||||||
render json: PostRepr.base(post), status: :created
|
render json: PostRepr.base(post), status: :created
|
||||||
rescue ActiveRecord::RecordInvalid
|
|
||||||
render json: { errors: post.errors.full_messages }, status: :unprocessable_entity
|
|
||||||
rescue Tag::NicoTagNormalisationError
|
rescue Tag::NicoTagNormalisationError
|
||||||
head :bad_request
|
head :bad_request
|
||||||
|
rescue ArgumentError => e
|
||||||
|
render json: { errors: [e.message] }, status: :unprocessable_entity
|
||||||
|
rescue ActiveRecord::RecordInvalid => e
|
||||||
|
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
def viewed
|
def viewed
|
||||||
@@ -167,15 +177,24 @@ class PostsController < ApplicationController
|
|||||||
tag_names = params[:tags].to_s.split
|
tag_names = params[:tags].to_s.split
|
||||||
original_created_from = params[:original_created_from]
|
original_created_from = params[:original_created_from]
|
||||||
original_created_before = params[:original_created_before]
|
original_created_before = params[:original_created_before]
|
||||||
|
parent_post_ids = parse_parent_post_ids
|
||||||
|
|
||||||
post = Post.find(params[:id].to_i)
|
post = Post.find(params[:id].to_i)
|
||||||
|
|
||||||
ActiveRecord::Base.transaction do
|
ApplicationRecord.transaction do
|
||||||
|
PostVersionRecorder.ensure_snapshot!(post, created_by_user: current_user)
|
||||||
|
|
||||||
post.update!(title:, original_created_from:, original_created_before:)
|
post.update!(title:, original_created_from:, original_created_before:)
|
||||||
tags = post.tags.where(category: 'nico').to_a +
|
|
||||||
Tag.normalise_tags(tag_names, with_tagme: false)
|
normalised_tags = Tag.normalise_tags!(tag_names, with_tagme: false)
|
||||||
|
TagVersioning.record_tag_snapshots!(normalised_tags, created_by_user: current_user)
|
||||||
|
|
||||||
|
tags = post.tags.nico.to_a + normalised_tags
|
||||||
tags = Tag.expand_parent_tags(tags)
|
tags = Tag.expand_parent_tags(tags)
|
||||||
sync_post_tags!(post, tags)
|
sync_post_tags!(post, tags)
|
||||||
|
|
||||||
|
sync_parent_posts!(post, parent_post_ids)
|
||||||
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -183,10 +202,12 @@ class PostsController < ApplicationController
|
|||||||
json = post.as_json
|
json = post.as_json
|
||||||
json['tags'] = build_tag_tree_for(post.tags)
|
json['tags'] = build_tag_tree_for(post.tags)
|
||||||
render json:, status: :ok
|
render json:, status: :ok
|
||||||
rescue ActiveRecord::RecordInvalid
|
|
||||||
render json: post.errors, status: :unprocessable_entity
|
|
||||||
rescue Tag::NicoTagNormalisationError
|
rescue Tag::NicoTagNormalisationError
|
||||||
head :bad_request
|
head :bad_request
|
||||||
|
rescue ArgumentError => e
|
||||||
|
render json: { errors: [e.message] }, status: :unprocessable_entity
|
||||||
|
rescue ActiveRecord::RecordInvalid => e
|
||||||
|
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
def changes
|
def changes
|
||||||
@@ -204,7 +225,7 @@ class PostsController < ApplicationController
|
|||||||
pts = pts.where(post_id: id) if id.present?
|
pts = pts.where(post_id: id) if id.present?
|
||||||
pts = pts.where(tag_id:) if tag_id.present?
|
pts = pts.where(tag_id:) if tag_id.present?
|
||||||
pts = pts.includes(:post, :created_user, :deleted_user,
|
pts = pts.includes(:post, :created_user, :deleted_user,
|
||||||
tag: { tag_name: :wiki_page })
|
tag: [:materials, { tag_name: :wiki_page }])
|
||||||
|
|
||||||
events = []
|
events = []
|
||||||
pts.each do |pt|
|
pts.each do |pt|
|
||||||
@@ -346,4 +367,41 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
root_ids.filter_map { |id| build_node.call(id, []) }
|
root_ids.filter_map { |id| build_node.call(id, []) }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def parse_parent_post_ids
|
||||||
|
raise ArgumentError, 'parent_post_ids は必須です.' unless params.key?(:parent_post_ids)
|
||||||
|
|
||||||
|
params[:parent_post_ids].to_s.split.map { |token|
|
||||||
|
id = Integer(token, exception: false)
|
||||||
|
raise ArgumentError, "親投稿 Id. が不正です: #{ token }" if id.nil? || id <= 0
|
||||||
|
|
||||||
|
id
|
||||||
|
}.uniq
|
||||||
|
end
|
||||||
|
|
||||||
|
def sync_parent_posts! post, parent_post_ids
|
||||||
|
if parent_post_ids.include?(post.id)
|
||||||
|
post.errors.add(:base, '自分自身を親投稿にはできません.')
|
||||||
|
raise ActiveRecord::RecordInvalid, post
|
||||||
|
end
|
||||||
|
|
||||||
|
existing_ids = Post.where(id: parent_post_ids).pluck(:id)
|
||||||
|
missing_ids = parent_post_ids - existing_ids
|
||||||
|
|
||||||
|
if missing_ids.present?
|
||||||
|
post.errors.add(:base, "存在しない親投稿 ID があります: #{ missing_ids.join(' ') }")
|
||||||
|
raise ActiveRecord::RecordInvalid, post
|
||||||
|
end
|
||||||
|
|
||||||
|
current_ids = post.parent_posts.pluck(:id)
|
||||||
|
|
||||||
|
ids_to_add = parent_post_ids - current_ids
|
||||||
|
ids_to_remove = current_ids - parent_post_ids
|
||||||
|
|
||||||
|
PostImplication.where(post_id: post.id, parent_post_id: ids_to_remove).delete_all
|
||||||
|
|
||||||
|
ids_to_add.each do |parent_post_id|
|
||||||
|
PostImplication.create_or_find_by!(post_id: post.id, parent_post_id:)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -7,7 +7,16 @@ class TagChildrenController < ApplicationController
|
|||||||
child_id = params[:child_id]
|
child_id = params[:child_id]
|
||||||
return head :bad_request if parent_id.blank? || child_id.blank?
|
return head :bad_request if parent_id.blank? || child_id.blank?
|
||||||
|
|
||||||
Tag.find(parent_id).children << Tag.find(child_id) rescue nil
|
parent = Tag.find(parent_id)
|
||||||
|
child = Tag.find(child_id)
|
||||||
|
return head :bad_request if parent.nico? || child.nico?
|
||||||
|
|
||||||
|
ApplicationRecord.transaction do
|
||||||
|
TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
|
||||||
|
|
||||||
|
TagImplication.find_or_create_by!(parent_tag: parent, tag: child)
|
||||||
|
TagVersionRecorder.record!(tag: child, event_type: :update, created_by_user: current_user)
|
||||||
|
end
|
||||||
|
|
||||||
head :no_content
|
head :no_content
|
||||||
end
|
end
|
||||||
@@ -20,7 +29,16 @@ class TagChildrenController < ApplicationController
|
|||||||
child_id = params[:child_id]
|
child_id = params[:child_id]
|
||||||
return head :bad_request if parent_id.blank? || child_id.blank?
|
return head :bad_request if parent_id.blank? || child_id.blank?
|
||||||
|
|
||||||
Tag.find(parent_id).children.delete(Tag.find(child_id)) rescue nil
|
parent = Tag.find(parent_id)
|
||||||
|
child = Tag.find(child_id)
|
||||||
|
return head :bad_request if parent.nico? || child.nico?
|
||||||
|
|
||||||
|
ApplicationRecord.transaction do
|
||||||
|
TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
|
||||||
|
|
||||||
|
TagImplication.find_by(parent_tag: parent, tag: child)&.destroy!
|
||||||
|
TagVersionRecorder.record!(tag: child, event_type: :update, created_by_user: current_user)
|
||||||
|
end
|
||||||
|
|
||||||
head :no_content
|
head :no_content
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
class TagVersionsController < ApplicationController
|
||||||
|
def index
|
||||||
|
tag_id = params[:id].presence
|
||||||
|
page = (params[:page].presence || 1).to_i
|
||||||
|
limit = (params[:limit].presence || 20).to_i
|
||||||
|
|
||||||
|
page = 1 if page < 1
|
||||||
|
limit = 1 if limit < 1
|
||||||
|
|
||||||
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
|
q = TagVersion.joins(<<~SQL.squish)
|
||||||
|
LEFT JOIN
|
||||||
|
tag_versions prev
|
||||||
|
ON
|
||||||
|
prev.tag_id = tag_versions.tag_id
|
||||||
|
AND prev.version_no = tag_versions.version_no - 1
|
||||||
|
SQL
|
||||||
|
.select('tag_versions.*', 'prev.name AS prev_name', 'prev.category AS prev_category',
|
||||||
|
'prev.aliases AS prev_aliases', 'prev.parent_tag_ids AS prev_parent_tag_ids')
|
||||||
|
q = q.where('tag_versions.tag_id = ?', tag_id) if tag_id
|
||||||
|
|
||||||
|
count = q.except(:select, :order, :limit, :offset).count
|
||||||
|
|
||||||
|
versions = q.order(Arel.sql('tag_versions.created_at DESC, tag_versions.id DESC'))
|
||||||
|
.limit(limit)
|
||||||
|
.offset(offset)
|
||||||
|
|
||||||
|
render json: { versions: serialise_versions(versions), count: }
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def serialise_versions rows
|
||||||
|
user_ids = rows.map(&:created_by_user_id).compact.uniq
|
||||||
|
users_by_id = User.where(id: user_ids).pluck(:id, :name).to_h
|
||||||
|
|
||||||
|
rows.map do |row|
|
||||||
|
cur_aliases = split_values(row.aliases)
|
||||||
|
prev_aliases = split_values(row.attributes['prev_aliases'])
|
||||||
|
|
||||||
|
cur_parent_tag_ids = split_parent_tag_ids(row.parent_tag_ids)
|
||||||
|
prev_parent_tag_ids = split_parent_tag_ids(row.attributes['prev_parent_tag_ids'])
|
||||||
|
|
||||||
|
all_parent_tag_ids = (cur_parent_tag_ids | prev_parent_tag_ids)
|
||||||
|
|
||||||
|
tags_by_id =
|
||||||
|
Tag
|
||||||
|
.includes(:tag_name, :materials, { tag_name: :wiki_page })
|
||||||
|
.where(id: all_parent_tag_ids)
|
||||||
|
.index_by(&:id)
|
||||||
|
|
||||||
|
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]]),
|
||||||
|
type: h[:type] }
|
||||||
|
end
|
||||||
|
|
||||||
|
{ tag_id: row.tag_id,
|
||||||
|
version_no: row.version_no,
|
||||||
|
event_type: row.event_type,
|
||||||
|
name: { current: row.name, prev: row.attributes['prev_name'] },
|
||||||
|
category: { current: row.category, prev: row.attributes['prev_category'] },
|
||||||
|
aliases: build_version_values(cur_aliases, prev_aliases, key: :name),
|
||||||
|
parent_tags:,
|
||||||
|
created_at: row.created_at.iso8601,
|
||||||
|
created_by_user: row.created_by_user_id &&
|
||||||
|
{ id: row.created_by_user_id,
|
||||||
|
name: users_by_id[row.created_by_user_id] } }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def build_version_values cur_values, prev_values, key:
|
||||||
|
(cur_values | prev_values).map do |value|
|
||||||
|
type =
|
||||||
|
if cur_values.include?(value) && prev_values.include?(value)
|
||||||
|
'context'
|
||||||
|
elsif cur_values.include?(value)
|
||||||
|
'added'
|
||||||
|
else
|
||||||
|
'removed'
|
||||||
|
end
|
||||||
|
|
||||||
|
{ key => value, type: }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def split_values(values) = values.to_s.split(/\s+/).reject(&:blank?)
|
||||||
|
|
||||||
|
def split_parent_tag_ids(values) = split_values(values).map(&:to_i)
|
||||||
|
end
|
||||||
@@ -66,7 +66,7 @@ class TagsController < ApplicationController
|
|||||||
.offset(offset)
|
.offset(offset)
|
||||||
.to_a
|
.to_a
|
||||||
|
|
||||||
render json: { tags: TagRepr.base(tags), count: q.size }
|
render json: { tags: TagRepr.many(tags), count: q.size }
|
||||||
end
|
end
|
||||||
|
|
||||||
def with_depth
|
def with_depth
|
||||||
@@ -209,6 +209,60 @@ class TagsController < ApplicationController
|
|||||||
render json: build_tag_children(tag)
|
render json: build_tag_children(tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def update_all
|
||||||
|
return head :unauthorized unless current_user
|
||||||
|
return head :forbidden unless current_user.gte_member?
|
||||||
|
|
||||||
|
tag = Tag.find_by(id: params[:id])
|
||||||
|
return head :not_found unless tag
|
||||||
|
|
||||||
|
name = params[:name].to_s.strip
|
||||||
|
category = params[:category].to_s.strip
|
||||||
|
return head :unprocessable_entity if name.blank? || category.blank?
|
||||||
|
|
||||||
|
if name != tag.name &&
|
||||||
|
tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico])
|
||||||
|
return render json: { error: 'システム・タグの名称は変更できません.' },
|
||||||
|
status: :unprocessable_entity
|
||||||
|
end
|
||||||
|
|
||||||
|
if tag.nico? || category == 'nico'
|
||||||
|
return render json: { error: 'ニコタグは変更できません.' },
|
||||||
|
status: :unprocessable_entity
|
||||||
|
end
|
||||||
|
|
||||||
|
alias_names = params[:aliases].to_s.split.uniq
|
||||||
|
parent_names = params[:parent_tags].to_s.split.uniq
|
||||||
|
|
||||||
|
ApplicationRecord.transaction do
|
||||||
|
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user)
|
||||||
|
|
||||||
|
old_name = tag.name
|
||||||
|
name_changed = name != old_name
|
||||||
|
wiki_page = tag.tag_name.wiki_page if name_changed
|
||||||
|
|
||||||
|
tag.update!(category:)
|
||||||
|
tag.tag_name.update!(name:)
|
||||||
|
|
||||||
|
alias_names << old_name if name_changed
|
||||||
|
alias_names.delete(name)
|
||||||
|
|
||||||
|
update_aliases!(tag, alias_names)
|
||||||
|
update_parent_tags!(tag, parent_names)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
|
||||||
|
record_tag_version!(
|
||||||
|
tag,
|
||||||
|
event_type: :update,
|
||||||
|
created_by_user: current_user,
|
||||||
|
name_changed:,
|
||||||
|
wiki_page:)
|
||||||
|
end
|
||||||
|
|
||||||
|
render json: TagRepr.base(tag.reload)
|
||||||
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return head :forbidden unless current_user.gte_member?
|
return head :forbidden unless current_user.gte_member?
|
||||||
@@ -218,20 +272,37 @@ class TagsController < ApplicationController
|
|||||||
|
|
||||||
tag = Tag.find(params[:id])
|
tag = Tag.find(params[:id])
|
||||||
|
|
||||||
if name.present?
|
if tag.nico? || (category.present? && category == 'nico')
|
||||||
tag.tag_name.update!(name:)
|
return render json: { error: 'ニコタグは変更できません.' },
|
||||||
|
status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
if category.present?
|
ApplicationRecord.transaction do
|
||||||
tag.update!(category:)
|
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user)
|
||||||
|
|
||||||
|
old_name = tag.name
|
||||||
|
name_changed = name.present? && name != old_name
|
||||||
|
wiki_page = tag.tag_name.wiki_page if name_changed
|
||||||
|
|
||||||
|
tag.tag_name.update!(name:) if name.present?
|
||||||
|
tag.update!(category:) if category.present?
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
|
||||||
|
record_tag_version!(
|
||||||
|
tag,
|
||||||
|
event_type: :update,
|
||||||
|
created_by_user: current_user,
|
||||||
|
name_changed:,
|
||||||
|
wiki_page:)
|
||||||
end
|
end
|
||||||
|
|
||||||
render json: TagRepr.base(tag)
|
render json: TagRepr.base(tag.reload)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def build_tag_children(tag)
|
def build_tag_children tag
|
||||||
material = tag.materials.first
|
material = tag.materials.first
|
||||||
file = nil
|
file = nil
|
||||||
content_type = nil
|
content_type = nil
|
||||||
@@ -244,4 +315,80 @@ class TagsController < ApplicationController
|
|||||||
children: tag.children.sort_by { _1.name }.map { build_tag_children(_1) },
|
children: tag.children.sort_by { _1.name }.map { build_tag_children(_1) },
|
||||||
material: material.as_json&.merge(file:, content_type:))
|
material: material.as_json&.merge(file:, content_type:))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def record_tag_version! tag, event_type:, created_by_user:, name_changed: false, wiki_page: nil
|
||||||
|
if tag.nico?
|
||||||
|
NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
TagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
||||||
|
|
||||||
|
return unless name_changed
|
||||||
|
|
||||||
|
wiki_page ||= tag.tag_name.wiki_page
|
||||||
|
return unless wiki_page&.wiki_versions&.exists?
|
||||||
|
|
||||||
|
WikiVersionRecorder.record!(
|
||||||
|
page: wiki_page,
|
||||||
|
event_type: :update,
|
||||||
|
created_by_user:)
|
||||||
|
end
|
||||||
|
|
||||||
|
def update_aliases! tag, alias_names
|
||||||
|
alias_names = alias_names.uniq
|
||||||
|
|
||||||
|
affected_tags = [tag]
|
||||||
|
|
||||||
|
current_aliases = tag.tag_name.aliases.to_a
|
||||||
|
|
||||||
|
current_aliases.each do |alias_tag_name|
|
||||||
|
next if alias_names.include?(alias_tag_name.name)
|
||||||
|
|
||||||
|
affected_tags << alias_tag_name.canonical&.tag
|
||||||
|
end
|
||||||
|
|
||||||
|
alias_names.each do |alias_name|
|
||||||
|
alias_tag_name = TagName.find_undiscard_or_create_by!(name: alias_name)
|
||||||
|
affected_tags << alias_tag_name.canonical&.tag
|
||||||
|
end
|
||||||
|
|
||||||
|
affected_tags.compact.uniq.each do |affected_tag|
|
||||||
|
TagVersioning.ensure_snapshot!(affected_tag, created_by_user: current_user)
|
||||||
|
end
|
||||||
|
|
||||||
|
current_aliases.each do |alias_tag_name|
|
||||||
|
next if alias_names.include?(alias_tag_name.name)
|
||||||
|
|
||||||
|
alias_tag_name.update!(canonical: nil)
|
||||||
|
end
|
||||||
|
|
||||||
|
alias_names.each do |alias_name|
|
||||||
|
alias_tag_name = TagName.find_undiscard_or_create_by!(name: alias_name)
|
||||||
|
alias_tag_name.update!(canonical: tag.tag_name)
|
||||||
|
end
|
||||||
|
|
||||||
|
affected_tags.compact.uniq.each do |affected_tag|
|
||||||
|
record_tag_version!(affected_tag, event_type: :update, created_by_user: current_user)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def update_parent_tags! tag, parent_names
|
||||||
|
parent_tags = Tag.normalise_tags!(parent_names, with_tagme: false,
|
||||||
|
with_no_deerjikist: false,
|
||||||
|
deny_nico: true)
|
||||||
|
|
||||||
|
old_parent_tags = tag.parents.to_a
|
||||||
|
|
||||||
|
TagVersioning.record_tag_snapshots!((old_parent_tags + parent_tags).uniq,
|
||||||
|
created_by_user: current_user)
|
||||||
|
|
||||||
|
tag.reversed_tag_implications.destroy_all
|
||||||
|
|
||||||
|
parent_tags.each do |parent_tag|
|
||||||
|
next if parent_tag == tag
|
||||||
|
|
||||||
|
TagImplication.create!(tag:, parent_tag:)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,18 +1,26 @@
|
|||||||
class UsersController < ApplicationController
|
class UsersController < ApplicationController
|
||||||
def create
|
def create
|
||||||
user = User.create!(inheritance_code: SecureRandom.uuid, role: 'guest')
|
return head :unprocessable_entity if request.remote_ip.blank?
|
||||||
|
|
||||||
|
user = nil
|
||||||
|
|
||||||
|
User.transaction do
|
||||||
|
user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
|
||||||
|
attach_ip_address!(user)
|
||||||
|
end
|
||||||
|
|
||||||
render json: { code: user.inheritance_code,
|
render json: { code: user.inheritance_code,
|
||||||
user: user.slice(:id, :name, :inheritance_code, :role) }
|
user: user.slice(:id, :name, :inheritance_code, :role) },
|
||||||
|
status: :created
|
||||||
end
|
end
|
||||||
|
|
||||||
def verify
|
def verify
|
||||||
ip_bin = IPAddr.new(request.remote_ip).hton
|
|
||||||
ip_address = IpAddress.find_or_create_by!(ip_address: ip_bin)
|
|
||||||
|
|
||||||
user = User.find_by(inheritance_code: params[:code])
|
user = User.find_by(inheritance_code: params[:code])
|
||||||
return render json: { valid: false } unless user
|
return render json: { valid: false } unless user
|
||||||
|
|
||||||
UserIp.find_or_create_by!(user:, ip_address:)
|
return head :unprocessable_entity if request.remote_ip.blank?
|
||||||
|
|
||||||
|
attach_ip_address!(user)
|
||||||
|
|
||||||
render json: { valid: true, user: user.slice(:id, :name, :inheritance_code, :role) }
|
render json: { valid: true, user: user.slice(:id, :name, :inheritance_code, :role) }
|
||||||
end
|
end
|
||||||
@@ -41,9 +49,18 @@ class UsersController < ApplicationController
|
|||||||
return head :bad_request if name.blank?
|
return head :bad_request if name.blank?
|
||||||
|
|
||||||
if user.update(name:)
|
if user.update(name:)
|
||||||
render json: user.slice(:id, :name, :inheritance_code, :role), status: :created
|
render json: user.slice(:id, :name, :inheritance_code, :role), status: :ok
|
||||||
else
|
else
|
||||||
render json: user.errors, status: :unprocessable_entity
|
render json: user.errors, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def attach_ip_address! user
|
||||||
|
ip_bin = IPAddr.new(request.remote_ip).hton
|
||||||
|
ip_address = IpAddress.create_or_find_by!(ip_address: ip_bin)
|
||||||
|
|
||||||
|
UserIp.create_or_find_by!(user:, ip_address:)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -85,22 +85,24 @@ class WikiPagesController < ApplicationController
|
|||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return head :forbidden unless current_user.gte_member?
|
return head :forbidden unless current_user.gte_member?
|
||||||
|
|
||||||
name = params[:title]&.strip
|
title = params[:title].to_s.strip
|
||||||
body = params[:body].to_s
|
body = params[:body].to_s
|
||||||
|
message = params[:message].presence
|
||||||
|
|
||||||
return head :unprocessable_entity if name.blank? || body.blank?
|
return head :unprocessable_entity if title.blank? || body.blank?
|
||||||
|
|
||||||
tag_name = TagName.find_undiscard_or_create_by!(name:)
|
tag_name = TagName.find_undiscard_or_create_by!(name: title)
|
||||||
page = WikiPage.new(tag_name:, created_user: current_user, updated_user: current_user)
|
|
||||||
if page.save
|
|
||||||
message = params[:message].presence
|
|
||||||
Wiki::Commit.content!(page:, body:, created_user: current_user, message:)
|
|
||||||
|
|
||||||
render json: WikiPageRepr.base(page), status: :created
|
page =
|
||||||
else
|
Wiki::Commit.create_content!(
|
||||||
render json: { errors: page.errors.full_messages },
|
tag_name:,
|
||||||
status: :unprocessable_entity
|
body:,
|
||||||
end
|
created_by_user: current_user,
|
||||||
|
message:)
|
||||||
|
|
||||||
|
render json: WikiPageRepr.base(page), status: :created
|
||||||
|
rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
|
||||||
|
head :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
@@ -113,19 +115,34 @@ class WikiPagesController < ApplicationController
|
|||||||
return head :unprocessable_entity if title.blank? || body.blank?
|
return head :unprocessable_entity if title.blank? || body.blank?
|
||||||
|
|
||||||
page = WikiPage.find(params[:id])
|
page = WikiPage.find(params[:id])
|
||||||
base_revision_id = page.current_revision.id
|
base_revision_id = params[:base_revision_id].presence
|
||||||
|
|
||||||
if params[:title].present? && params[:title].strip != page.title
|
ApplicationRecord.transaction do
|
||||||
return head :unprocessable_entity
|
page.lock!
|
||||||
|
|
||||||
|
old_title = page.title
|
||||||
|
|
||||||
|
tag = Tag.find_by(tag_name_id: page.tag_name_id)
|
||||||
|
|
||||||
|
if tag && title != old_title
|
||||||
|
TagVersioning.ensure_snapshot!(tag, created_by_user: current_user)
|
||||||
|
end
|
||||||
|
|
||||||
|
page.tag_name.update!(name: title) if title != old_title
|
||||||
|
|
||||||
|
message = params[:message].presence
|
||||||
|
Wiki::Commit.content!(page:,
|
||||||
|
body:,
|
||||||
|
created_user: current_user,
|
||||||
|
message:,
|
||||||
|
base_revision_id:)
|
||||||
|
|
||||||
|
if tag && title != old_title
|
||||||
|
tag.reload
|
||||||
|
TagVersionRecorder.record!(tag:, event_type: :update, created_by_user: current_user)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
message = params[:message].presence
|
|
||||||
Wiki::Commit.content!(page:,
|
|
||||||
body:,
|
|
||||||
created_user: current_user,
|
|
||||||
message:,
|
|
||||||
base_revision_id:)
|
|
||||||
|
|
||||||
head :ok
|
head :ok
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -2,5 +2,6 @@ class IpAddress < ApplicationRecord
|
|||||||
validates :ip_address, presence: true, length: { maximum: 16 }
|
validates :ip_address, presence: true, length: { maximum: 16 }
|
||||||
validates :banned, inclusion: { in: [true, false] }
|
validates :banned, inclusion: { in: [true, false] }
|
||||||
|
|
||||||
has_many :users
|
has_many :user_ips, dependent: :destroy
|
||||||
|
has_many :users, through: :user_ips
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,7 +1,11 @@
|
|||||||
module MyDiscard
|
module MyDiscard
|
||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
included { include Discard::Model }
|
included do
|
||||||
|
include Discard::Model
|
||||||
|
|
||||||
|
default_scope -> { kept }
|
||||||
|
end
|
||||||
|
|
||||||
class_methods do
|
class_methods do
|
||||||
def find_undiscard_or_create_by! attrs, &block
|
def find_undiscard_or_create_by! attrs, &block
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
class NicoTagVersion < ApplicationRecord
|
||||||
|
include VersionRecord
|
||||||
|
|
||||||
|
belongs_to :tag
|
||||||
|
|
||||||
|
validates :name, presence: true
|
||||||
|
end
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
class Post < ApplicationRecord
|
class Post < ApplicationRecord
|
||||||
require 'mini_magick'
|
require 'mini_magick'
|
||||||
|
|
||||||
belongs_to :parent, class_name: 'Post', optional: true, foreign_key: 'parent_id'
|
|
||||||
belongs_to :uploaded_user, class_name: 'User', optional: true
|
belongs_to :uploaded_user, class_name: 'User', optional: true
|
||||||
|
|
||||||
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
||||||
@@ -13,6 +12,20 @@ class Post < ApplicationRecord
|
|||||||
has_many :post_similarities, dependent: :delete_all
|
has_many :post_similarities, dependent: :delete_all
|
||||||
has_many :post_versions
|
has_many :post_versions
|
||||||
|
|
||||||
|
has_many :parent_post_implications,
|
||||||
|
class_name: 'PostImplication',
|
||||||
|
foreign_key: :post_id,
|
||||||
|
dependent: :destroy,
|
||||||
|
inverse_of: :post
|
||||||
|
has_many :parents, through: :parent_post_implications, source: :parent_post
|
||||||
|
|
||||||
|
has_many :child_post_implications,
|
||||||
|
class_name: 'PostImplication',
|
||||||
|
foreign_key: :parent_post_id,
|
||||||
|
dependent: :destroy,
|
||||||
|
inverse_of: :parent_post
|
||||||
|
has_many :children, through: :child_post_implications, source: :post
|
||||||
|
|
||||||
has_one_attached :thumbnail
|
has_one_attached :thumbnail
|
||||||
|
|
||||||
before_validation :normalise_url
|
before_validation :normalise_url
|
||||||
@@ -22,17 +35,29 @@ class Post < ApplicationRecord
|
|||||||
validate :validate_original_created_range
|
validate :validate_original_created_range
|
||||||
validate :url_must_be_http_url
|
validate :url_must_be_http_url
|
||||||
|
|
||||||
|
def parent_posts = parents
|
||||||
|
|
||||||
|
def child_posts = children
|
||||||
|
|
||||||
|
def sibling_posts
|
||||||
|
parent_post_ids = parent_posts.order(:id).pluck(:id)
|
||||||
|
|
||||||
|
parent_post_ids.to_h { [_1, PostImplication.where(parent_post: _1).map(&:post)] }
|
||||||
|
end
|
||||||
|
|
||||||
def as_json options = { }
|
def as_json options = { }
|
||||||
super(options).merge({ thumbnail: thumbnail.attached? ?
|
super(options).merge(thumbnail: thumbnail.attached? ?
|
||||||
Rails.application.routes.url_helpers.rails_blob_url(
|
Rails.application.routes.url_helpers.rails_blob_url(
|
||||||
thumbnail, only_path: false) :
|
thumbnail, only_path: false) :
|
||||||
nil })
|
nil)
|
||||||
rescue
|
rescue
|
||||||
super(options).merge(thumbnail: nil)
|
super(options).merge(thumbnail: nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
def snapshot_tag_names = tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
def snapshot_tag_names = tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
||||||
|
|
||||||
|
def snapshot_parent_post_ids = parents.order(:id).pluck(:id)
|
||||||
|
|
||||||
def related limit: nil
|
def related limit: nil
|
||||||
ids = post_similarities.order(cos: :desc)
|
ids = post_similarities.order(cos: :desc)
|
||||||
ids = ids.limit(limit) if limit
|
ids = ids.limit(limit) if limit
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
class PostImplication < ApplicationRecord
|
||||||
|
self.primary_key = :post_id, :parent_post_id
|
||||||
|
|
||||||
|
belongs_to :post, inverse_of: :parent_post_implications
|
||||||
|
belongs_to :parent_post, class_name: 'Post', inverse_of: :child_post_implications
|
||||||
|
|
||||||
|
validates :post_id, presence: true, uniqueness: { scope: :parent_post_id }
|
||||||
|
validates :parent_post_id, presence: true
|
||||||
|
|
||||||
|
validate :parent_post_mustnt_be_itself
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def parent_post_mustnt_be_itself
|
||||||
|
if parent_post_id == post_id
|
||||||
|
errors.add :parent_post_id, '親投稿に同じ投稿を設定することはできません.'
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,29 +1,13 @@
|
|||||||
class PostVersion < ApplicationRecord
|
class PostVersion < ApplicationRecord
|
||||||
before_update do
|
include VersionRecord
|
||||||
raise ActiveRecord::ReadOnlyRecord, '版は更新できません.'
|
|
||||||
end
|
|
||||||
|
|
||||||
before_destroy do
|
|
||||||
raise ActiveRecord::ReadOnlyRecord, '版は削除できません.'
|
|
||||||
end
|
|
||||||
|
|
||||||
belongs_to :post
|
belongs_to :post
|
||||||
belongs_to :parent, class_name: 'Post', optional: true
|
belongs_to :parent, class_name: 'Post', optional: true
|
||||||
belongs_to :created_by_user, class_name: 'User', optional: true
|
|
||||||
|
|
||||||
enum :event_type, { create: 'create',
|
|
||||||
update: 'update',
|
|
||||||
discard: 'discard',
|
|
||||||
restore: 'restore' }, prefix: true, validate: true
|
|
||||||
|
|
||||||
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
|
|
||||||
validates :event_type, presence: true, inclusion: { in: event_types.keys }
|
|
||||||
validates :url, presence: true
|
validates :url, presence: true
|
||||||
|
|
||||||
validate :validate_original_created_range
|
validate :validate_original_created_range
|
||||||
|
|
||||||
scope :chronological, -> { order(:version_no, :id) }
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def validate_original_created_range
|
def validate_original_created_range
|
||||||
|
|||||||
+32
-26
@@ -8,8 +8,6 @@ class Tag < ApplicationRecord
|
|||||||
;
|
;
|
||||||
end
|
end
|
||||||
|
|
||||||
default_scope -> { kept }
|
|
||||||
|
|
||||||
has_many :post_tags, inverse_of: :tag
|
has_many :post_tags, inverse_of: :tag
|
||||||
has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :tag
|
has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :tag
|
||||||
has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
|
has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
|
||||||
@@ -36,6 +34,9 @@ class Tag < ApplicationRecord
|
|||||||
has_many :deerjikists, dependent: :delete_all
|
has_many :deerjikists, dependent: :delete_all
|
||||||
has_many :materials
|
has_many :materials
|
||||||
|
|
||||||
|
has_many :tag_versions
|
||||||
|
has_many :nico_tag_versions
|
||||||
|
|
||||||
belongs_to :tag_name
|
belongs_to :tag_name
|
||||||
delegate :wiki_page, to: :tag_name
|
delegate :wiki_page, to: :tag_name
|
||||||
|
|
||||||
@@ -78,27 +79,16 @@ class Tag < ApplicationRecord
|
|||||||
|
|
||||||
def material_id = materials.first&.id
|
def material_id = materials.first&.id
|
||||||
|
|
||||||
def self.tagme
|
def self.tagme = find_or_create_by_tag_name!('タグ希望', category: :meta)
|
||||||
@tagme ||= find_or_create_by_tag_name!('タグ希望', category: :meta)
|
def self.bot = find_or_create_by_tag_name!('bot操作', category: :meta)
|
||||||
end
|
def self.no_deerjikist = find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
||||||
|
def self.video = find_or_create_by_tag_name!('動画', category: :meta)
|
||||||
|
def self.niconico = find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
||||||
|
def self.youtube = find_or_create_by_tag_name!('YouTube', category: :meta)
|
||||||
|
|
||||||
def self.bot
|
def self.normalise_tags! tag_names, with_tagme: true,
|
||||||
@bot ||= find_or_create_by_tag_name!('bot操作', category: :meta)
|
with_no_deerjikist: true,
|
||||||
end
|
deny_nico: true
|
||||||
|
|
||||||
def self.no_deerjikist
|
|
||||||
@no_deerjikist ||= find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.video
|
|
||||||
@video ||= find_or_create_by_tag_name!('動画', category: :meta)
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.niconico
|
|
||||||
@niconico ||= find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.normalise_tags tag_names, with_tagme: true, deny_nico: true
|
|
||||||
if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
|
if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
|
||||||
raise NicoTagNormalisationError
|
raise NicoTagNormalisationError
|
||||||
end
|
end
|
||||||
@@ -112,7 +102,7 @@ class Tag < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme)
|
tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme)
|
||||||
tags << Tag.no_deerjikist if tags.all? { |t| !(t.deerjikist?) }
|
tags << Tag.no_deerjikist if with_no_deerjikist && tags.all? { |t| !(t.deerjikist?) }
|
||||||
tags.uniq(&:id)
|
tags.uniq(&:id)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -150,21 +140,25 @@ class Tag < ApplicationRecord
|
|||||||
retry
|
retry
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.merge_tags! target_tag, source_tags
|
def self.merge_tags! target_tag, source_tags, created_by_user: nil
|
||||||
target_tag => Tag
|
target_tag => Tag
|
||||||
|
|
||||||
affected_post_ids = Set.new
|
affected_post_ids = Set.new
|
||||||
|
|
||||||
Tag.transaction do
|
Tag.transaction do
|
||||||
|
TagVersioning.ensure_snapshot!(target_tag, created_by_user:)
|
||||||
|
|
||||||
Array(source_tags).compact.uniq.each do |source_tag|
|
Array(source_tags).compact.uniq.each do |source_tag|
|
||||||
source_tag => Tag
|
source_tag => Tag
|
||||||
|
|
||||||
next if source_tag == target_tag
|
next if source_tag == target_tag
|
||||||
|
|
||||||
|
TagVersioning.ensure_snapshot!(source_tag, created_by_user:)
|
||||||
|
|
||||||
source_tag.post_tags.kept.find_each do |source_pt|
|
source_tag.post_tags.kept.find_each do |source_pt|
|
||||||
post_id = source_pt.post_id
|
post_id = source_pt.post_id
|
||||||
affected_post_ids << post_id
|
affected_post_ids << post_id
|
||||||
source_pt.discard_by!(nil)
|
source_pt.discard_by!(created_by_user)
|
||||||
unless PostTag.kept.exists?(post_id:, tag: target_tag)
|
unless PostTag.kept.exists?(post_id:, tag: target_tag)
|
||||||
PostTag.create!(post_id:, tag: target_tag)
|
PostTag.create!(post_id:, tag: target_tag)
|
||||||
end
|
end
|
||||||
@@ -176,6 +170,7 @@ class Tag < ApplicationRecord
|
|||||||
raise ActiveRecord::RecordInvalid.new(source_tag_name)
|
raise ActiveRecord::RecordInvalid.new(source_tag_name)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
TagVersioning.record!(source_tag, event_type: :discard, created_by_user:)
|
||||||
source_tag.discard!
|
source_tag.discard!
|
||||||
|
|
||||||
if source_tag.nico?
|
if source_tag.nico?
|
||||||
@@ -184,10 +179,13 @@ class Tag < ApplicationRecord
|
|||||||
source_tag_name.update_columns(canonical_id: target_tag.tag_name_id,
|
source_tag_name.update_columns(canonical_id: target_tag.tag_name_id,
|
||||||
updated_at: Time.current)
|
updated_at: Time.current)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
TagVersioning.record!(target_tag, event_type: :update, created_by_user:)
|
||||||
end
|
end
|
||||||
|
|
||||||
Post.where(id: affected_post_ids.to_a).find_each do |post|
|
Post.where(id: affected_post_ids.to_a).find_each do |post|
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
PostVersionRecorder.ensure_snapshot!(post, created_by_user:)
|
||||||
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user:)
|
||||||
end
|
end
|
||||||
|
|
||||||
# 投稿件数を再集計
|
# 投稿件数を再集計
|
||||||
@@ -197,6 +195,14 @@ class Tag < ApplicationRecord
|
|||||||
target_tag.reload
|
target_tag.reload
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def snapshot_aliases = tag_name.aliases.kept.order(:name).pluck(:name)
|
||||||
|
|
||||||
|
def snapshot_parent_tag_ids = parents.order(:id).pluck(:id)
|
||||||
|
|
||||||
|
def snapshot_linked_tag_names
|
||||||
|
linked_tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def nico_tag_name_must_start_with_nico
|
def nico_tag_name_must_start_with_nico
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
class TagName < ApplicationRecord
|
class TagName < ApplicationRecord
|
||||||
include MyDiscard
|
include MyDiscard
|
||||||
|
|
||||||
default_scope -> { kept }
|
|
||||||
|
|
||||||
has_one :tag
|
has_one :tag
|
||||||
has_one :wiki_page
|
has_one :wiki_page
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
class TagVersion < ApplicationRecord
|
||||||
|
include VersionRecord
|
||||||
|
|
||||||
|
belongs_to :tag
|
||||||
|
|
||||||
|
enum :category, { deerjikist: 'deerjikist',
|
||||||
|
meme: 'meme',
|
||||||
|
character: 'character',
|
||||||
|
general: 'general',
|
||||||
|
material: 'material',
|
||||||
|
meta: 'meta' }, validate: true
|
||||||
|
|
||||||
|
validates :name, presence: true
|
||||||
|
validates :category, presence: true
|
||||||
|
end
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
module VersionRecord
|
||||||
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
|
def readonly? = persisted?
|
||||||
|
|
||||||
|
included do
|
||||||
|
belongs_to :created_by_user, class_name: 'User', optional: true
|
||||||
|
|
||||||
|
enum :event_type, { create: 'create',
|
||||||
|
update: 'update',
|
||||||
|
discard: 'discard',
|
||||||
|
restore: 'restore' }, prefix: true, validate: true
|
||||||
|
|
||||||
|
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
|
||||||
|
validates :event_type, presence: true
|
||||||
|
|
||||||
|
scope :chronological, -> { order(:version_no, :id) }
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -4,8 +4,6 @@ require 'set'
|
|||||||
class WikiPage < ApplicationRecord
|
class WikiPage < ApplicationRecord
|
||||||
include MyDiscard
|
include MyDiscard
|
||||||
|
|
||||||
default_scope -> { kept }
|
|
||||||
|
|
||||||
has_many :wiki_revisions, dependent: :destroy
|
has_many :wiki_revisions, dependent: :destroy
|
||||||
belongs_to :created_user, class_name: 'User'
|
belongs_to :created_user, class_name: 'User'
|
||||||
belongs_to :updated_user, class_name: 'User'
|
belongs_to :updated_user, class_name: 'User'
|
||||||
@@ -15,8 +13,11 @@ class WikiPage < ApplicationRecord
|
|||||||
foreign_key: :redirect_page_id,
|
foreign_key: :redirect_page_id,
|
||||||
dependent: :nullify
|
dependent: :nullify
|
||||||
|
|
||||||
|
has_many :wiki_versions
|
||||||
|
|
||||||
belongs_to :tag_name
|
belongs_to :tag_name
|
||||||
validates :tag_name, presence: true
|
validates :tag_name, presence: true
|
||||||
|
validates :body, presence: true
|
||||||
|
|
||||||
def title = tag_name.name
|
def title = tag_name.name
|
||||||
|
|
||||||
@@ -26,11 +27,6 @@ class WikiPage < ApplicationRecord
|
|||||||
|
|
||||||
def current_revision = wiki_revisions.order(id: :desc).first
|
def current_revision = wiki_revisions.order(id: :desc).first
|
||||||
|
|
||||||
def body
|
|
||||||
rev = current_revision
|
|
||||||
rev.body if rev&.content?
|
|
||||||
end
|
|
||||||
|
|
||||||
def resolve_redirect limit: 10
|
def resolve_redirect limit: 10
|
||||||
page = self
|
page = self
|
||||||
visited = Set.new
|
visited = Set.new
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
class WikiVersion < ApplicationRecord
|
||||||
|
include VersionRecord
|
||||||
|
|
||||||
|
belongs_to :wiki_page
|
||||||
|
|
||||||
|
validates :title, presence: true
|
||||||
|
validates :body, presence: true
|
||||||
|
end
|
||||||
@@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
|
|
||||||
module PostRepr
|
module PostRepr
|
||||||
BASE = { include: { tags: TagRepr::BASE, uploaded_user: UserRepr::BASE } }.freeze
|
BASE = { include: { tags: TagRepr::BASE, uploaded_user: UserRepr::BASE },
|
||||||
|
methods: [:parent_posts, :child_posts, :sibling_posts] }.freeze
|
||||||
|
|
||||||
module_function
|
module_function
|
||||||
|
|
||||||
|
|||||||
@@ -8,10 +8,9 @@ module TagRepr
|
|||||||
module_function
|
module_function
|
||||||
|
|
||||||
def base tag
|
def base tag
|
||||||
tag.as_json(BASE)
|
tag.as_json(BASE).merge(aliases: tag.snapshot_aliases,
|
||||||
|
parents: tag.parents.map { _1.as_json(BASE) })
|
||||||
end
|
end
|
||||||
|
|
||||||
def many tags
|
def many(tags) = tags.map { |t| base(t) }
|
||||||
tags.map { |t| base(t) }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
class NicoTagVersionRecorder < VersionRecorder
|
||||||
|
def self.record! tag:, event_type:, created_by_user:
|
||||||
|
new(tag:, event_type:, created_by_user:).record!
|
||||||
|
end
|
||||||
|
|
||||||
|
def initialize tag:, event_type:, created_by_user:
|
||||||
|
super(record: tag, event_type:, created_by_user:)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def version_class = NicoTagVersion
|
||||||
|
def version_association = :nico_tag_versions
|
||||||
|
def record_key = :tag
|
||||||
|
|
||||||
|
def snapshot_attributes
|
||||||
|
{ name: @record.name, linked_tags: @record.snapshot_linked_tag_names.join(' ') }
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,57 +1,31 @@
|
|||||||
class PostVersionRecorder
|
class PostVersionRecorder < VersionRecorder
|
||||||
def self.record! post:, event_type:, created_by_user:
|
def self.record! post:, event_type:, created_by_user:
|
||||||
new(post:, event_type:, created_by_user:).record!
|
new(post:, event_type:, created_by_user:).record!
|
||||||
end
|
end
|
||||||
|
|
||||||
def initialize post:, event_type:, created_by_user:
|
def initialize post:, event_type:, created_by_user:
|
||||||
@post = post
|
super(record: post, event_type:, created_by_user:)
|
||||||
@event_type = event_type
|
|
||||||
@created_by_user = created_by_user
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def record!
|
def self.ensure_snapshot! post, created_by_user:
|
||||||
@post.with_lock do
|
return if post.post_versions.exists?
|
||||||
latest = @post.post_versions.order(version_no: :desc).first
|
|
||||||
attrs = snapshot_attributes
|
|
||||||
|
|
||||||
return latest if @event_type == :update && latest && same_snapshot?(latest, attrs)
|
record!(post:, event_type: :create, created_by_user:)
|
||||||
|
|
||||||
PostVersion.create!(
|
|
||||||
post: @post,
|
|
||||||
version_no: (latest&.version_no || 0) + 1,
|
|
||||||
event_type: @event_type,
|
|
||||||
title: attrs[:title],
|
|
||||||
url: attrs[:url],
|
|
||||||
thumbnail_base: attrs[:thumbnail_base],
|
|
||||||
tags: attrs[:tags],
|
|
||||||
parent: attrs[:parent],
|
|
||||||
original_created_from: attrs[:original_created_from],
|
|
||||||
original_created_before: attrs[:original_created_before],
|
|
||||||
created_at: Time.current,
|
|
||||||
created_by_user: @created_by_user)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def snapshot_attributes
|
def version_class = PostVersion
|
||||||
{ title: @post.title,
|
def version_association = :post_versions
|
||||||
url: @post.url,
|
def record_key = :post
|
||||||
thumbnail_base: @post.thumbnail_base,
|
|
||||||
tags: @post.snapshot_tag_names.join(' '),
|
|
||||||
parent: @post.parent,
|
|
||||||
original_created_from: @post.original_created_from,
|
|
||||||
original_created_before: @post.original_created_before }
|
|
||||||
end
|
|
||||||
|
|
||||||
def same_snapshot? version, attrs
|
def snapshot_attributes
|
||||||
true &&
|
{ title: @record.title,
|
||||||
version.title == attrs[:title] &&
|
url: @record.url,
|
||||||
version.url == attrs[:url] &&
|
thumbnail_base: @record.thumbnail_base,
|
||||||
version.thumbnail_base == attrs[:thumbnail_base] &&
|
tags: @record.snapshot_tag_names.join(' '),
|
||||||
version.tags == attrs[:tags] &&
|
parent_post_ids: @record.snapshot_parent_post_ids.join(' '),
|
||||||
version.parent_id == attrs[:parent]&.id &&
|
original_created_from: @record.original_created_from,
|
||||||
version.original_created_from == attrs[:original_created_from] &&
|
original_created_before: @record.original_created_before }
|
||||||
version.original_created_before == attrs[:original_created_before]
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
class TagVersionRecorder < VersionRecorder
|
||||||
|
def self.record! tag:, event_type:, created_by_user:
|
||||||
|
new(tag:, event_type:, created_by_user:).record!
|
||||||
|
end
|
||||||
|
|
||||||
|
def initialize tag:, event_type:, created_by_user:
|
||||||
|
super(record: tag, event_type:, created_by_user:)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def version_class = TagVersion
|
||||||
|
def version_association = :tag_versions
|
||||||
|
def record_key = :tag
|
||||||
|
|
||||||
|
def snapshot_attributes
|
||||||
|
{ name: @record.name,
|
||||||
|
category: @record.category,
|
||||||
|
aliases: @record.snapshot_aliases.join(' '),
|
||||||
|
parent_tag_ids: @record.snapshot_parent_tag_ids.join(' ') }
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
class TagVersioning
|
||||||
|
def self.record! tag, event_type:, created_by_user:
|
||||||
|
if tag.nico?
|
||||||
|
NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
||||||
|
else
|
||||||
|
TagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.ensure_snapshot! tag, created_by_user:
|
||||||
|
if tag.nico?
|
||||||
|
return if tag.nico_tag_versions.exists?
|
||||||
|
|
||||||
|
NicoTagVersionRecorder.record!(tag:, event_type: :create, created_by_user:)
|
||||||
|
else
|
||||||
|
return if tag.tag_versions.exists?
|
||||||
|
|
||||||
|
TagVersionRecorder.record!(tag:, event_type: :create, created_by_user:)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.record_tag_snapshot! tag, created_by_user:
|
||||||
|
event_type =
|
||||||
|
if tag.nico?
|
||||||
|
tag.nico_tag_versions.exists? ? :update : :create
|
||||||
|
else
|
||||||
|
tag.tag_versions.exists? ? :update : :create
|
||||||
|
end
|
||||||
|
|
||||||
|
record!(tag, event_type:, created_by_user:)
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.record_tag_snapshots! tags, created_by_user:
|
||||||
|
tags.each do |tag|
|
||||||
|
record_tag_snapshot!(tag, created_by_user:)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
class VersionRecorder
|
||||||
|
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
|
||||||
|
|
||||||
|
def initialize record:, event_type:, created_by_user:
|
||||||
|
@record = record
|
||||||
|
@event_type = event_type.to_s
|
||||||
|
@created_by_user = created_by_user
|
||||||
|
|
||||||
|
validate_event_type!
|
||||||
|
end
|
||||||
|
|
||||||
|
def record!
|
||||||
|
raise "#{ record_class.name } must be persisted" unless @record.persisted?
|
||||||
|
|
||||||
|
ApplicationRecord.transaction do
|
||||||
|
@record = record_class.unscoped.lock.find(@record.id)
|
||||||
|
latest = latest_version
|
||||||
|
|
||||||
|
if !(latest) && @event_type != 'create'
|
||||||
|
raise "#{ version_class.name } first event must be create"
|
||||||
|
end
|
||||||
|
|
||||||
|
if @event_type == 'create' && latest
|
||||||
|
raise "#{ version_class.name } create event already exists"
|
||||||
|
end
|
||||||
|
|
||||||
|
attrs = snapshot_attributes
|
||||||
|
|
||||||
|
return latest if @event_type == 'update' && latest && same_snapshot?(latest, attrs)
|
||||||
|
|
||||||
|
version_class.create!(base_attributes(latest).merge(record_key => @record).merge(attrs))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def latest_version = versions.order(version_no: :desc).first
|
||||||
|
|
||||||
|
def versions = @record.public_send(version_association)
|
||||||
|
|
||||||
|
def base_attributes latest
|
||||||
|
{ version_no: (latest&.version_no || 0) + 1,
|
||||||
|
event_type: @event_type,
|
||||||
|
created_at: Time.current,
|
||||||
|
created_by_user: @created_by_user }
|
||||||
|
end
|
||||||
|
|
||||||
|
def same_snapshot?(version, attrs) = attrs.all? { |k, v| version.public_send(k) == v }
|
||||||
|
|
||||||
|
def validate_event_type!
|
||||||
|
return if EVENT_TYPES.include?(@event_type)
|
||||||
|
|
||||||
|
raise ArgumentError, "Invalid event_type: #{ @event_type }"
|
||||||
|
end
|
||||||
|
|
||||||
|
def version_class = raise NotImplementedError
|
||||||
|
def version_association = raise NotImplementedError
|
||||||
|
def record_key = raise NotImplementedError
|
||||||
|
def snapshot_attributes = raise NotImplementedError
|
||||||
|
|
||||||
|
def record_class = @record.class
|
||||||
|
end
|
||||||
@@ -7,6 +7,31 @@ module Wiki
|
|||||||
;
|
;
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.create_content! tag_name:, body:, created_by_user:, message: nil
|
||||||
|
normalised = normalise_body(body)
|
||||||
|
|
||||||
|
page = WikiPage.new(tag_name:,
|
||||||
|
body: normalised,
|
||||||
|
created_user: created_by_user,
|
||||||
|
updated_user: created_by_user)
|
||||||
|
|
||||||
|
if normalised.blank?
|
||||||
|
page.errors.add(:body, :blank)
|
||||||
|
raise ActiveRecord::RecordInvalid, page
|
||||||
|
end
|
||||||
|
|
||||||
|
ActiveRecord::Base.transaction do
|
||||||
|
page.save!
|
||||||
|
|
||||||
|
new(page:, created_user: created_by_user).content!(
|
||||||
|
body: normalised,
|
||||||
|
message:,
|
||||||
|
base_revision_id: nil)
|
||||||
|
|
||||||
|
page
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def self.content! page:, body:, created_user:, message: nil, base_revision_id: nil
|
def self.content! page:, body:, created_user:, message: nil, base_revision_id: nil
|
||||||
new(page:, created_user:).content!(body:, message:, base_revision_id:)
|
new(page:, created_user:).content!(body:, message:, base_revision_id:)
|
||||||
end
|
end
|
||||||
@@ -21,7 +46,12 @@ module Wiki
|
|||||||
end
|
end
|
||||||
|
|
||||||
def content! body:, message:, base_revision_id:
|
def content! body:, message:, base_revision_id:
|
||||||
normalised = normalise_body(body)
|
normalised = self.class.normalise_body(body)
|
||||||
|
if normalised.blank?
|
||||||
|
@page.errors.add(:body, :blank)
|
||||||
|
raise ActiveRecord::RecordInvalid, @page
|
||||||
|
end
|
||||||
|
|
||||||
lines = split_lines(normalised)
|
lines = split_lines(normalised)
|
||||||
|
|
||||||
line_shas = lines.map { |line| Digest::SHA256.hexdigest(line) }
|
line_shas = lines.map { |line| Digest::SHA256.hexdigest(line) }
|
||||||
@@ -37,10 +67,19 @@ module Wiki
|
|||||||
current_id = @page.wiki_revisions.maximum(:id)
|
current_id = @page.wiki_revisions.maximum(:id)
|
||||||
if current_id && current_id != base_revision_id.to_i
|
if current_id && current_id != base_revision_id.to_i
|
||||||
raise Conflict,
|
raise Conflict,
|
||||||
"競合が発生してゐます(現在の Id.:#{ current_id },ベース Id.:#{ base_revision_id })."
|
"競合が発生してゐます" +
|
||||||
|
"(現在の Id.:#{ current_id },ベース Id.:#{ base_revision_id })."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@page.update!(body: normalised)
|
||||||
|
|
||||||
|
WikiVersionRecorder.record!(
|
||||||
|
page: @page,
|
||||||
|
event_type: @page.wiki_versions.exists? ? :update : :create,
|
||||||
|
reason: message,
|
||||||
|
created_by_user: @created_user)
|
||||||
|
|
||||||
rev = WikiRevision.create!(
|
rev = WikiRevision.create!(
|
||||||
wiki_page: @page,
|
wiki_page: @page,
|
||||||
base_revision_id:,
|
base_revision_id:,
|
||||||
@@ -54,65 +93,45 @@ module Wiki
|
|||||||
rows = line_ids.each_with_index.map do |line_id, pos|
|
rows = line_ids.each_with_index.map do |line_id, pos|
|
||||||
{ wiki_revision_id: rev.id, wiki_line_id: line_id, position: pos }
|
{ wiki_revision_id: rev.id, wiki_line_id: line_id, position: pos }
|
||||||
end
|
end
|
||||||
WikiRevisionLine.insert_all!(rows)
|
WikiRevisionLine.insert_all!(rows) if rows.any?
|
||||||
|
|
||||||
rev
|
rev
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def redirect! redirect_page:, message:, base_revision_id:
|
def redirect!(redirect_page:, message:, base_revision_id:) = raise '廃止しました.'
|
||||||
ActiveRecord::Base.transaction do
|
|
||||||
@page.lock!
|
|
||||||
|
|
||||||
if base_revision_id.present?
|
def self.normalise_body body
|
||||||
current_id = @page.wiki_revisions.maximum(:id)
|
s = body.to_s
|
||||||
if current_id && current_id != base_revision_id.to_i
|
s.gsub!(/\r\n?/, "\n")
|
||||||
raise Conflict,
|
s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '🖕')
|
||||||
"競合が発生してゐます(現在の Id.:#{ current_id },ベース Id.:#{ base_revision_id })."
|
s.gsub(/\n+$/, '')
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
WikiRevision.create!(
|
|
||||||
wiki_page: @page,
|
|
||||||
base_revision_id:,
|
|
||||||
created_user: @created_user,
|
|
||||||
kind: :redirect,
|
|
||||||
redirect_page:,
|
|
||||||
message:,
|
|
||||||
lines_count: 0,
|
|
||||||
tree_sha256: nil)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def normalise_body body
|
def split_lines(body) = body.split("\n")
|
||||||
s = body.to_s
|
|
||||||
s.gsub!("\r\n", "\n")
|
|
||||||
s.encode('UTF-8', invalid: :replace, undef: :replace, replace: '🖕')
|
|
||||||
end
|
|
||||||
|
|
||||||
def split_lines body
|
|
||||||
body.split("\n")
|
|
||||||
end
|
|
||||||
|
|
||||||
def upsert_lines! lines, line_shas
|
def upsert_lines! lines, line_shas
|
||||||
now = Time.current
|
now = Time.current
|
||||||
|
|
||||||
id_by_sha = WikiLine.where(sha256: line_shas).pluck(:sha256, :id).to_h
|
id_by_sha = WikiLine.where(sha256: line_shas).pluck(:sha256, :id).to_h
|
||||||
|
|
||||||
missing_rows = []
|
missing_by_sha = { }
|
||||||
|
|
||||||
line_shas.each_with_index do |sha, i|
|
line_shas.each_with_index do |sha, i|
|
||||||
next if id_by_sha.key?(sha)
|
next if id_by_sha.key?(sha)
|
||||||
|
next if missing_by_sha.key?(sha)
|
||||||
|
|
||||||
missing_rows << { sha256: sha,
|
missing_by_sha[sha] = {
|
||||||
body: lines[i],
|
sha256: sha,
|
||||||
created_at: now,
|
body: lines[i],
|
||||||
updated_at: now }
|
created_at: now,
|
||||||
|
updated_at: now }
|
||||||
end
|
end
|
||||||
|
|
||||||
if missing_rows.any?
|
if missing_by_sha.any?
|
||||||
WikiLine.upsert_all(missing_rows)
|
WikiLine.upsert_all(missing_by_sha.values)
|
||||||
id_by_sha = WikiLine.where(sha256: line_shas).pluck(:sha256, :id).to_h
|
id_by_sha = WikiLine.where(sha256: line_shas).pluck(:sha256, :id).to_h
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
class WikiVersionRecorder < VersionRecorder
|
||||||
|
def self.record! page:, event_type:, reason: nil, created_by_user:
|
||||||
|
new(page:, event_type:, reason:, created_by_user:).record!
|
||||||
|
end
|
||||||
|
|
||||||
|
def initialize page:, event_type:, reason: nil, created_by_user:
|
||||||
|
@reason = reason
|
||||||
|
super(record: page, event_type:, created_by_user:)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def version_class = WikiVersion
|
||||||
|
def version_association = :wiki_versions
|
||||||
|
def record_key = :wiki_page
|
||||||
|
|
||||||
|
def snapshot_attributes = {
|
||||||
|
title: @record.title,
|
||||||
|
body: @record.body,
|
||||||
|
reason: @reason }
|
||||||
|
end
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
require 'json'
|
||||||
|
require 'net/http'
|
||||||
|
require 'uri'
|
||||||
|
|
||||||
|
|
||||||
|
module Youtube
|
||||||
|
class ApiClient
|
||||||
|
ENDPOINT = 'https://www.googleapis.com/youtube/v3'
|
||||||
|
|
||||||
|
def initialize api_key: ENV.fetch('YOUTUBE_API_KEY')
|
||||||
|
@api_key = api_key
|
||||||
|
end
|
||||||
|
|
||||||
|
def search_videos q:, published_after: nil, published_before: nil, page_token: nil
|
||||||
|
get_json('/search', {
|
||||||
|
part: 'snippet',
|
||||||
|
type: 'video',
|
||||||
|
q:,
|
||||||
|
order: 'date',
|
||||||
|
maxResults: 50,
|
||||||
|
regionCode: 'JP',
|
||||||
|
relevanceLanguage: 'ja',
|
||||||
|
publishedAfter: published_after&.iso8601,
|
||||||
|
publishedBefore: published_before&.iso8601,
|
||||||
|
pageToken: page_token }.compact)
|
||||||
|
end
|
||||||
|
|
||||||
|
def videos ids
|
||||||
|
return { 'items' => [] } if ids.empty?
|
||||||
|
|
||||||
|
get_json('/videos', part: 'snippet,status,contentDetails', id: ids.join(','))
|
||||||
|
end
|
||||||
|
|
||||||
|
def playlist_items playlist_id:, page_token: nil
|
||||||
|
get_json('/playlistItems', {
|
||||||
|
part: 'snippet,contentDetails,status',
|
||||||
|
playlistId: playlist_id,
|
||||||
|
maxResults: 50,
|
||||||
|
pageToken: page_token }.compact)
|
||||||
|
end
|
||||||
|
|
||||||
|
def channel id: nil, handle: nil
|
||||||
|
raise ArgumentError, 'id or handle is required' if id.present? == handle.present?
|
||||||
|
|
||||||
|
params = { part: 'snippet,contentDetails' }
|
||||||
|
params[:id] = id if id.present?
|
||||||
|
params[:forHandle] = handle if handle.present?
|
||||||
|
|
||||||
|
get_json('/channels', params)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def get_json path, params
|
||||||
|
uri = URI(ENDPOINT + path)
|
||||||
|
uri.query = URI.encode_www_form(params.merge(key: @api_key))
|
||||||
|
|
||||||
|
response = Net::HTTP.start(uri.host,
|
||||||
|
uri.port,
|
||||||
|
use_ssl: true,
|
||||||
|
open_timeout: 10,
|
||||||
|
read_timeout: 30) do |http|
|
||||||
|
http.get(uri)
|
||||||
|
end
|
||||||
|
|
||||||
|
unless response.is_a?(Net::HTTPSuccess)
|
||||||
|
raise "YouTube API error: #{ response.code } #{ response.body }"
|
||||||
|
end
|
||||||
|
|
||||||
|
JSON.parse(response.body)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
require 'open-uri'
|
||||||
|
require 'set'
|
||||||
|
require 'time'
|
||||||
|
|
||||||
|
|
||||||
|
module Youtube
|
||||||
|
class Sync
|
||||||
|
def initialize client: ApiClient.new
|
||||||
|
@client = client
|
||||||
|
end
|
||||||
|
|
||||||
|
def sync!
|
||||||
|
video_ids = discover_video_ids
|
||||||
|
return if video_ids.empty?
|
||||||
|
|
||||||
|
video_ids.each_slice(50) do |ids|
|
||||||
|
@client.videos(ids).fetch('items', []).each do |item|
|
||||||
|
sync_video!(VideoItem.new(item))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def discover_video_ids
|
||||||
|
ids = Set.new
|
||||||
|
|
||||||
|
query_terms.each do |q|
|
||||||
|
response = @client.search_videos(q:, published_after: sync_since)
|
||||||
|
|
||||||
|
response.fetch('items', []).each do |item|
|
||||||
|
video_id = item.dig('id', 'videoId')
|
||||||
|
ids << video_id if video_id.present?
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
playlist_ids.each do |playlist_id|
|
||||||
|
each_playlist_item(playlist_id) do |item|
|
||||||
|
video_id = item.dig('contentDetails', 'videoId')
|
||||||
|
video_id ||= item.dig('snippet', 'resourceId', 'videoId')
|
||||||
|
|
||||||
|
ids << video_id if video_id.present?
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
ids.to_a
|
||||||
|
end
|
||||||
|
|
||||||
|
def sync_video! video
|
||||||
|
post = Post.where('url REGEXP ?', youtube_url_regexp(video.id)).first
|
||||||
|
|
||||||
|
original_created_from = video.published_at.change(sec: 0)
|
||||||
|
original_created_before = original_created_from + 1.minute
|
||||||
|
|
||||||
|
post_created = false
|
||||||
|
post_changed = false
|
||||||
|
|
||||||
|
if post
|
||||||
|
post.assign_attributes(title: video.title,
|
||||||
|
original_created_from:,
|
||||||
|
original_created_before:,
|
||||||
|
thumbnail_base: video.thumbnail_url)
|
||||||
|
|
||||||
|
post_changed = post.changed?
|
||||||
|
post.save! if post_changed
|
||||||
|
|
||||||
|
attach_thumbnail_if_needed!(post, video.thumbnail_url)
|
||||||
|
else
|
||||||
|
post_created = true
|
||||||
|
post = Post.create!(
|
||||||
|
title: video.title,
|
||||||
|
url: video.url,
|
||||||
|
thumbnail_base: video.thumbnail_url,
|
||||||
|
uploaded_user_id: nil,
|
||||||
|
original_created_from:,
|
||||||
|
original_created_before:)
|
||||||
|
|
||||||
|
attach_thumbnail_if_needed!(post, video.thumbnail_url)
|
||||||
|
|
||||||
|
sync_post_tags!(post, [Tag.tagme.id, Tag.bot.id, Tag.youtube.id, Tag.video.id])
|
||||||
|
end
|
||||||
|
|
||||||
|
kept_tag_ids = post.tags.pluck(:id).to_set
|
||||||
|
desired_tag_ids = kept_tag_ids.to_a
|
||||||
|
|
||||||
|
deerjikist = Deerjikist.find_by(platform: :youtube, code: video.channel_id)
|
||||||
|
if deerjikist
|
||||||
|
desired_tag_ids.delete(Tag.no_deerjikist.id)
|
||||||
|
desired_tag_ids << deerjikist.tag_id
|
||||||
|
elsif post.tags.where(category: :deerjikist).none?
|
||||||
|
desired_tag_ids << Tag.no_deerjikist.id
|
||||||
|
end
|
||||||
|
|
||||||
|
desired_tag_ids.uniq!
|
||||||
|
|
||||||
|
sync_post_tags!(post, desired_tag_ids, current_tag_ids: kept_tag_ids)
|
||||||
|
|
||||||
|
if post_created
|
||||||
|
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
||||||
|
elsif post_changed || kept_tag_ids != desired_tag_ids.to_set
|
||||||
|
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
|
||||||
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def sync_post_tags! post, desired_tag_ids, current_tag_ids: nil
|
||||||
|
current_tag_ids ||= PostTag.kept.where(post_id: post.id).pluck(:tag_id).to_set
|
||||||
|
desired_tag_ids = desired_tag_ids.compact.to_set
|
||||||
|
|
||||||
|
to_add = desired_tag_ids - current_tag_ids
|
||||||
|
to_remove = current_tag_ids - desired_tag_ids
|
||||||
|
|
||||||
|
Tag.where(id: to_add.to_a).find_each do |tag|
|
||||||
|
begin
|
||||||
|
PostTag.create!(post:, tag:)
|
||||||
|
rescue ActiveRecord::RecordNotUnique
|
||||||
|
;
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
|
||||||
|
pt.discard_by!(nil)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def attach_thumbnail_if_needed! post, thumbnail_url
|
||||||
|
return if post.thumbnail.attached?
|
||||||
|
return if thumbnail_url.blank?
|
||||||
|
|
||||||
|
post.thumbnail.attach(
|
||||||
|
io: URI.open(thumbnail_url),
|
||||||
|
filename: File.basename(URI.parse(thumbnail_url).path),
|
||||||
|
content_type: 'image/jpeg')
|
||||||
|
|
||||||
|
post.resized_thumbnail!
|
||||||
|
end
|
||||||
|
|
||||||
|
def youtube_url_regexp id
|
||||||
|
escaped = Regexp.escape(id)
|
||||||
|
"(youtube\\.com/watch\\?v=#{ escaped }|youtu\\.be/#{ escaped })([^A-Za-z0-9_-]|$)"
|
||||||
|
end
|
||||||
|
|
||||||
|
def query_terms = ['ぼざろクリーチャーシリーズ', '伊地知ニジカ', '伊地知虹鹿']
|
||||||
|
|
||||||
|
def playlist_ids
|
||||||
|
['PLrOch4zHkI5vu29b-f9umUQQ4tQkuWLPX',
|
||||||
|
'PLrOch4zHkI5vOK0RaytQq6PbucxQkkL0K',
|
||||||
|
'PLrOch4zHkI5tdwm9vSegiDQJOM-hgpcOC']
|
||||||
|
end
|
||||||
|
|
||||||
|
def sync_since = 14.days.ago
|
||||||
|
|
||||||
|
def each_playlist_item playlist_id
|
||||||
|
page_token = nil
|
||||||
|
|
||||||
|
loop do
|
||||||
|
response = @client.playlist_items(playlist_id:, page_token:)
|
||||||
|
|
||||||
|
response.fetch('items', []).each do |item|
|
||||||
|
yield item
|
||||||
|
end
|
||||||
|
|
||||||
|
page_token = response['nextPageToken']
|
||||||
|
break if page_token.blank?
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
require 'time'
|
||||||
|
|
||||||
|
|
||||||
|
module Youtube
|
||||||
|
class VideoItem
|
||||||
|
attr_reader :id, :title, :channel_id, :published_at, :thumbnail_url, :raw_tags
|
||||||
|
|
||||||
|
def initialize item
|
||||||
|
snippet = item.fetch('snippet')
|
||||||
|
|
||||||
|
@id = item.fetch('id')
|
||||||
|
@title = snippet['title']
|
||||||
|
@channel_id = snippet['channelId']
|
||||||
|
@published_at = Time.iso8601(snippet['publishedAt'])
|
||||||
|
@thumbnail_url = pick_thumbnail(snippet['thumbnails'] || { })
|
||||||
|
@raw_tags = snippet['tags'] || []
|
||||||
|
end
|
||||||
|
|
||||||
|
def url = "https://www.youtube.com/watch?v=#{ @id }"
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def pick_thumbnail thumbnails
|
||||||
|
['maxres', 'standard', 'high', 'medium', 'default'].each do |key|
|
||||||
|
url = thumbnails.dig(key, 'url')
|
||||||
|
return url if url.present?
|
||||||
|
end
|
||||||
|
|
||||||
|
nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -6,10 +6,11 @@ Rails.application.routes.draw do
|
|||||||
delete ':child_id', action: :destroy
|
delete ':child_id', action: :destroy
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :tags, only: [:index, :show, :update] do
|
resources :tags, only: [:index, :show] do
|
||||||
collection do
|
collection do
|
||||||
get :autocomplete
|
get :autocomplete
|
||||||
get :'with-depth', action: :with_depth
|
get :'with-depth', action: :with_depth
|
||||||
|
get :versions, to: 'tag_versions#index'
|
||||||
|
|
||||||
scope :name do
|
scope :name do
|
||||||
get ':name/deerjikists', action: :deerjikists_by_name
|
get ':name/deerjikists', action: :deerjikists_by_name
|
||||||
@@ -19,6 +20,9 @@ Rails.application.routes.draw do
|
|||||||
end
|
end
|
||||||
|
|
||||||
member do
|
member do
|
||||||
|
put '', action: :update_all
|
||||||
|
patch '', action: :update
|
||||||
|
|
||||||
get :deerjikists
|
get :deerjikists
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -49,6 +53,7 @@ Rails.application.routes.draw do
|
|||||||
collection do
|
collection do
|
||||||
get :random
|
get :random
|
||||||
get :changes
|
get :changes
|
||||||
|
get :versions, to: 'post_versions#index'
|
||||||
end
|
end
|
||||||
|
|
||||||
member do
|
member do
|
||||||
|
|||||||
@@ -1,12 +1,27 @@
|
|||||||
env :PATH, '/root/.rbenv/shims:/root/.rbenv/bin:/usr/local/bin:/usr/bin:/bin'
|
env :PATH, '/root/.rbenv/shims:/root/.rbenv/bin:/usr/local/bin:/usr/bin:/bin'
|
||||||
|
|
||||||
|
set :path, '/var/www/btrc-hub/backend'
|
||||||
|
set :environment, 'production'
|
||||||
set :output, standard: '/var/log/btrc_hub_nico_sync.log',
|
set :output, standard: '/var/log/btrc_hub_nico_sync.log',
|
||||||
error: '/var/log/btrc_hub_nico_sync_err.log'
|
error: '/var/log/btrc_hub_nico_sync_err.log'
|
||||||
|
|
||||||
every 1.day, at: '3:00 pm' do
|
job_type :rake,
|
||||||
|
'cd :path && set -a && . /etc/btrc-hub/backend.env && set +a && ' \
|
||||||
|
':environment_variable=:environment bundle exec rake :task --silent :output'
|
||||||
|
|
||||||
|
every 1.day, at: '11:00 am' do
|
||||||
rake 'nico:sync', environment: 'production'
|
rake 'nico:sync', environment: 'production'
|
||||||
end
|
end
|
||||||
|
|
||||||
every 1.day, at: '0:00 am' do
|
every 1.day, at: '0:00 am' do
|
||||||
rake 'post_similarity:calc', environment: 'production'
|
rake 'post_similarity:calc', environment: 'production'
|
||||||
|
rake 'tag_similarity:calc', environment: 'production'
|
||||||
|
end
|
||||||
|
|
||||||
|
every 1.day, at: '7:50 am' do
|
||||||
|
rake 'nico:export', environment: 'production'
|
||||||
|
end
|
||||||
|
|
||||||
|
every :hour do
|
||||||
|
rake 'post:sync', environment: 'production'
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -13,3 +13,4 @@ r2:
|
|||||||
secret_access_key: <%= ENV['R2_SECRET_ACCESS_KEY'] %>
|
secret_access_key: <%= ENV['R2_SECRET_ACCESS_KEY'] %>
|
||||||
bucket: <%= ENV['R2_BUCKET'] %>
|
bucket: <%= ENV['R2_BUCKET'] %>
|
||||||
region: auto
|
region: auto
|
||||||
|
request_checksum_calculation: when_required
|
||||||
|
|||||||
@@ -2,15 +2,15 @@ require 'set'
|
|||||||
|
|
||||||
|
|
||||||
class CreatePostVersions < ActiveRecord::Migration[8.0]
|
class CreatePostVersions < ActiveRecord::Migration[8.0]
|
||||||
class Post < ApplicationRecord
|
class Post < ActiveRecord::Base
|
||||||
self.table_name = 'posts'
|
self.table_name = 'posts'
|
||||||
end
|
end
|
||||||
|
|
||||||
class PostTag < ApplicationRecord
|
class PostTag < ActiveRecord::Base
|
||||||
self.table_name = 'post_tags'
|
self.table_name = 'post_tags'
|
||||||
end
|
end
|
||||||
|
|
||||||
class PostVersion < ApplicationRecord
|
class PostVersion < ActiveRecord::Base
|
||||||
self.table_name = 'post_versions'
|
self.table_name = 'post_versions'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,156 @@
|
|||||||
|
class CreateTagVersions < ActiveRecord::Migration[8.0]
|
||||||
|
class Tag < ActiveRecord::Base
|
||||||
|
self.table_name = 'tags'
|
||||||
|
end
|
||||||
|
|
||||||
|
class TagName < ActiveRecord::Base
|
||||||
|
self.table_name = 'tag_names'
|
||||||
|
end
|
||||||
|
|
||||||
|
class TagImplication < ActiveRecord::Base
|
||||||
|
self.table_name = 'tag_implications'
|
||||||
|
end
|
||||||
|
|
||||||
|
class TagVersion < ActiveRecord::Base
|
||||||
|
self.table_name = 'tag_versions'
|
||||||
|
end
|
||||||
|
|
||||||
|
class NicoTagVersion < ActiveRecord::Base
|
||||||
|
self.table_name = 'nico_tag_versions'
|
||||||
|
end
|
||||||
|
|
||||||
|
class NicoTagRelation < ActiveRecord::Base
|
||||||
|
self.table_name = 'nico_tag_relations'
|
||||||
|
end
|
||||||
|
|
||||||
|
def up
|
||||||
|
create_table :tag_versions do |t|
|
||||||
|
t.references :tag, null: false, foreign_key: true, index: false
|
||||||
|
t.integer :version_no, null: false
|
||||||
|
t.string :event_type, null: false
|
||||||
|
t.string :name, null: false
|
||||||
|
t.string :category, null: false
|
||||||
|
t.text :aliases, null: false
|
||||||
|
t.text :parent_tag_ids, null: false
|
||||||
|
t.datetime :created_at, null: false
|
||||||
|
t.references :created_by_user, foreign_key: { to_table: :users }, index: false
|
||||||
|
|
||||||
|
t.index [:tag_id, :version_no], unique: true
|
||||||
|
t.index :created_at
|
||||||
|
t.index [:tag_id, :created_at], order: { created_at: :desc }
|
||||||
|
t.index [:created_by_user_id, :created_at], order: { created_at: :desc }
|
||||||
|
t.check_constraint 'version_no > 0',
|
||||||
|
name: 'tag_versions_version_no_positive'
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table :nico_tag_versions do |t|
|
||||||
|
t.references :tag, null: false, foreign_key: true, index: false
|
||||||
|
t.integer :version_no, null: false
|
||||||
|
t.string :event_type, null: false
|
||||||
|
t.string :name, null: false
|
||||||
|
t.text :linked_tags, null: false
|
||||||
|
t.datetime :created_at, null: false
|
||||||
|
t.references :created_by_user, foreign_key: { to_table: :users }, index: false
|
||||||
|
|
||||||
|
t.index [:tag_id, :version_no], unique: true
|
||||||
|
t.index :created_at
|
||||||
|
t.index [:tag_id, :created_at], order: { created_at: :desc }
|
||||||
|
t.index [:created_by_user_id, :created_at], order: { created_at: :desc }
|
||||||
|
t.check_constraint 'version_no > 0',
|
||||||
|
name: 'nico_tag_versions_version_no_positive'
|
||||||
|
end
|
||||||
|
|
||||||
|
TagVersion.reset_column_information
|
||||||
|
say_with_time 'Backfilling tag_versions' do
|
||||||
|
Tag.where(discarded_at: nil)
|
||||||
|
.where.not(category: 'nico')
|
||||||
|
.find_in_batches(batch_size: 500) do |tags|
|
||||||
|
tag_ids = tags.map(&:id)
|
||||||
|
|
||||||
|
tag_implication_rows_by_tag_id =
|
||||||
|
TagImplication
|
||||||
|
.where(tag_id: tag_ids)
|
||||||
|
.pluck(:tag_id, :parent_tag_id)
|
||||||
|
.each_with_object(Hash.new { |h, k| h[k] = [] }) do |row, h|
|
||||||
|
h[row[0]] << row[1]
|
||||||
|
end
|
||||||
|
|
||||||
|
tag_name_rows_by_tag_id =
|
||||||
|
TagName
|
||||||
|
.joins('INNER JOIN tags ON tags.tag_name_id = tag_names.id')
|
||||||
|
.where(tags: { id: tag_ids })
|
||||||
|
.pluck('tags.id', 'tag_names.name')
|
||||||
|
.each_with_object({ }) do |row, h|
|
||||||
|
h[row[0]] = row[1]
|
||||||
|
end
|
||||||
|
|
||||||
|
tag_alias_rows_by_tag_id =
|
||||||
|
TagName
|
||||||
|
.joins('INNER JOIN tags ON tags.tag_name_id = tag_names.canonical_id')
|
||||||
|
.where(tags: { id: tag_ids })
|
||||||
|
.where(tag_names: { discarded_at: nil })
|
||||||
|
.pluck('tags.id', 'tag_names.name')
|
||||||
|
.each_with_object(Hash.new { |h, k| h[k] = [] }) do |row, h|
|
||||||
|
h[row[0]] << row[1]
|
||||||
|
end
|
||||||
|
|
||||||
|
TagVersion.insert_all(tags.map { |tag|
|
||||||
|
{ tag_id: tag.id,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
name: tag_name_rows_by_tag_id[tag.id],
|
||||||
|
category: tag.category,
|
||||||
|
aliases: tag_alias_rows_by_tag_id[tag.id].sort.join(' '),
|
||||||
|
parent_tag_ids: tag_implication_rows_by_tag_id[tag.id].sort.join(' '),
|
||||||
|
created_at: tag.created_at,
|
||||||
|
created_by_user_id: nil }
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
NicoTagVersion.reset_column_information
|
||||||
|
say_with_time 'Backfilling nico_tag_versions' do
|
||||||
|
Tag.where(discarded_at: nil, category: 'nico')
|
||||||
|
.find_in_batches(batch_size: 500) do |tags|
|
||||||
|
tag_ids = tags.map(&:id)
|
||||||
|
|
||||||
|
tag_name_rows_by_tag_id =
|
||||||
|
TagName
|
||||||
|
.joins('INNER JOIN tags ON tags.tag_name_id = tag_names.id')
|
||||||
|
.where(tags: { id: tag_ids })
|
||||||
|
.pluck('tags.id', 'tag_names.name')
|
||||||
|
.each_with_object({ }) do |row, h|
|
||||||
|
h[row[0]] = row[1]
|
||||||
|
end
|
||||||
|
|
||||||
|
nico_tag_relation_rows_by_tag_id =
|
||||||
|
NicoTagRelation
|
||||||
|
.joins('INNER JOIN tags nico_tags ON nico_tags.id = nico_tag_relations.nico_tag_id')
|
||||||
|
.joins('INNER JOIN tags linked_tags ON linked_tags.id = nico_tag_relations.tag_id')
|
||||||
|
.joins('INNER JOIN tag_names ON tag_names.id = linked_tags.tag_name_id')
|
||||||
|
.where(nico_tags: { id: tag_ids })
|
||||||
|
.where(linked_tags: { discarded_at: nil })
|
||||||
|
.where(tag_names: { discarded_at: nil })
|
||||||
|
.pluck('nico_tags.id', 'tag_names.name')
|
||||||
|
.each_with_object(Hash.new { |h, k| h[k] = [] }) do |row, h|
|
||||||
|
h[row[0]] << row[1]
|
||||||
|
end
|
||||||
|
|
||||||
|
NicoTagVersion.insert_all(tags.map { |tag|
|
||||||
|
{ tag_id: tag.id,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
name: tag_name_rows_by_tag_id[tag.id],
|
||||||
|
linked_tags: nico_tag_relation_rows_by_tag_id[tag.id].sort.join(' '),
|
||||||
|
created_at: tag.created_at,
|
||||||
|
created_by_user_id: nil }
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
drop_table :nico_tag_versions
|
||||||
|
drop_table :tag_versions
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
class CreateWikiVersions < ActiveRecord::Migration[8.0]
|
||||||
|
class WikiPage < ActiveRecord::Base
|
||||||
|
self.table_name = 'wiki_pages'
|
||||||
|
end
|
||||||
|
|
||||||
|
class WikiRevision < ActiveRecord::Base
|
||||||
|
self.table_name = 'wiki_revisions'
|
||||||
|
end
|
||||||
|
|
||||||
|
class WikiRevisionLine < ActiveRecord::Base
|
||||||
|
self.table_name = 'wiki_revision_lines'
|
||||||
|
end
|
||||||
|
|
||||||
|
class WikiLine < ActiveRecord::Base
|
||||||
|
self.table_name = 'wiki_lines'
|
||||||
|
end
|
||||||
|
|
||||||
|
class WikiVersion < ActiveRecord::Base
|
||||||
|
self.table_name = 'wiki_versions'
|
||||||
|
end
|
||||||
|
|
||||||
|
class TagName < ActiveRecord::Base
|
||||||
|
self.table_name = 'tag_names'
|
||||||
|
end
|
||||||
|
|
||||||
|
def up
|
||||||
|
add_column :wiki_pages, :body, :text, after: :tag_name_id
|
||||||
|
|
||||||
|
create_table :wiki_versions do |t|
|
||||||
|
t.references :wiki_page, null: false, foreign_key: true
|
||||||
|
t.integer :version_no, null: false
|
||||||
|
t.string :event_type, null: false
|
||||||
|
t.string :title, null: false
|
||||||
|
t.text :body, null: false
|
||||||
|
t.text :reason
|
||||||
|
t.datetime :created_at, null: false
|
||||||
|
t.references :created_by_user, foreign_key: { to_table: :users }
|
||||||
|
|
||||||
|
t.index [:wiki_page_id, :version_no], unique: true
|
||||||
|
t.check_constraint 'version_no > 0',
|
||||||
|
name: 'wiki_versions_version_no_positive'
|
||||||
|
t.check_constraint "event_type IN ('create', 'update', 'discard', 'restore')",
|
||||||
|
name: 'wiki_versions_event_type_valid'
|
||||||
|
end
|
||||||
|
|
||||||
|
WikiPage.reset_column_information
|
||||||
|
WikiVersion.reset_column_information
|
||||||
|
|
||||||
|
say_with_time 'Backfilling wiki_versions' do
|
||||||
|
WikiPage.find_each do |page|
|
||||||
|
base_revision_id = nil
|
||||||
|
version_no = 1
|
||||||
|
title = TagName.find(page.tag_name_id).name
|
||||||
|
body = nil
|
||||||
|
loop do
|
||||||
|
rev = WikiRevision.where(wiki_page_id: page.id).find_by(base_revision_id:)
|
||||||
|
break unless rev
|
||||||
|
|
||||||
|
body = WikiRevisionLine.where(wiki_revision_id: rev.id).order(:position).map { |wrl|
|
||||||
|
WikiLine.find(wrl.wiki_line_id).body
|
||||||
|
}.join("\n")
|
||||||
|
|
||||||
|
WikiVersion.create!(
|
||||||
|
wiki_page_id: page.id,
|
||||||
|
version_no:,
|
||||||
|
event_type: version_no == 1 ? 'create' : 'update',
|
||||||
|
title:,
|
||||||
|
body:,
|
||||||
|
reason: rev.message,
|
||||||
|
created_at: rev.created_at,
|
||||||
|
created_by_user_id: rev.created_user_id)
|
||||||
|
|
||||||
|
version_no += 1
|
||||||
|
base_revision_id = rev.id
|
||||||
|
end
|
||||||
|
if body
|
||||||
|
page.update!(body:)
|
||||||
|
else
|
||||||
|
page.destroy!
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
change_column_null :wiki_pages, :body, false
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
drop_table :wiki_versions
|
||||||
|
remove_column :wiki_pages, :body
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
class CreatePostImplications < ActiveRecord::Migration[8.0]
|
||||||
|
def up
|
||||||
|
create_table :post_implications, primary_key: [:post_id, :parent_post_id] do |t|
|
||||||
|
t.references :post, null: false, foreign_key: true, index: false
|
||||||
|
t.references :parent_post, null: false, foreign_key: { to_table: :posts }
|
||||||
|
t.timestamps
|
||||||
|
|
||||||
|
t.check_constraint 'post_id <> parent_post_id',
|
||||||
|
name: 'chk_post_implications_no_self'
|
||||||
|
end
|
||||||
|
|
||||||
|
add_column :post_versions, :parent_post_ids, :text, null: false, after: :parent_id
|
||||||
|
remove_column :post_versions, :parent_id, :bigint
|
||||||
|
remove_reference :posts, :parent, foreign_key: { to_table: :posts }
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
add_reference :posts, :parent, foreign_key: { to_table: :posts }, after: :thumbnail_base
|
||||||
|
add_column :post_versions, :parent_id, :bigint, after: :post_id
|
||||||
|
remove_column :post_versions, :parent_post_ids, :text
|
||||||
|
|
||||||
|
drop_table :post_implications
|
||||||
|
end
|
||||||
|
end
|
||||||
Generated
+68
-7
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
ActiveRecord::Schema[8.0].define(version: 2026_04_27_214800) do
|
||||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.string "record_type", null: false
|
t.string "record_type", null: false
|
||||||
@@ -104,6 +104,30 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
t.index ["tag_id"], name: "index_nico_tag_relations_on_tag_id"
|
t.index ["tag_id"], name: "index_nico_tag_relations_on_tag_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "nico_tag_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
|
t.bigint "tag_id", null: false
|
||||||
|
t.integer "version_no", null: false
|
||||||
|
t.string "event_type", null: false
|
||||||
|
t.string "name", null: false
|
||||||
|
t.text "linked_tags", null: false
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.bigint "created_by_user_id"
|
||||||
|
t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
|
||||||
|
t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
|
||||||
|
t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
|
||||||
|
t.index ["tag_id", "version_no"], name: "index_nico_tag_versions_on_tag_id_and_version_no", unique: true
|
||||||
|
t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive"
|
||||||
|
end
|
||||||
|
|
||||||
|
create_table "post_implications", primary_key: ["post_id", "parent_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
|
t.bigint "post_id", null: false
|
||||||
|
t.bigint "parent_post_id", null: false
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
t.index ["parent_post_id"], name: "index_post_implications_on_parent_post_id"
|
||||||
|
t.check_constraint "`post_id` <> `parent_post_id`", name: "chk_post_implications_no_self"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "post_id", null: false
|
t.bigint "post_id", null: false
|
||||||
t.bigint "target_post_id", null: false
|
t.bigint "target_post_id", null: false
|
||||||
@@ -140,13 +164,12 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
t.string "url", limit: 768, null: false
|
t.string "url", limit: 768, null: false
|
||||||
t.string "thumbnail_base", limit: 2000
|
t.string "thumbnail_base", limit: 2000
|
||||||
t.text "tags", null: false
|
t.text "tags", null: false
|
||||||
t.bigint "parent_id"
|
t.text "parent_post_ids", null: false
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
|
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
|
||||||
t.index ["parent_id"], name: "index_post_versions_on_parent_id"
|
|
||||||
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
|
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
|
||||||
t.index ["post_id"], name: "index_post_versions_on_post_id"
|
t.index ["post_id"], name: "index_post_versions_on_post_id"
|
||||||
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
|
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
|
||||||
@@ -157,13 +180,11 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
t.string "title"
|
t.string "title"
|
||||||
t.string "url", limit: 768, null: false
|
t.string "url", limit: 768, null: false
|
||||||
t.string "thumbnail_base", limit: 2000
|
t.string "thumbnail_base", limit: 2000
|
||||||
t.bigint "parent_id"
|
|
||||||
t.bigint "uploaded_user_id"
|
t.bigint "uploaded_user_id"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.index ["parent_id"], name: "index_posts_on_parent_id"
|
|
||||||
t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
|
t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
|
||||||
t.index ["url"], name: "index_posts_on_url", unique: true
|
t.index ["url"], name: "index_posts_on_url", unique: true
|
||||||
end
|
end
|
||||||
@@ -216,6 +237,23 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
t.index ["target_tag_id"], name: "index_tag_similarities_on_target_tag_id"
|
t.index ["target_tag_id"], name: "index_tag_similarities_on_target_tag_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "tag_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
|
t.bigint "tag_id", null: false
|
||||||
|
t.integer "version_no", null: false
|
||||||
|
t.string "event_type", null: false
|
||||||
|
t.string "name", null: false
|
||||||
|
t.string "category", null: false
|
||||||
|
t.text "aliases", null: false
|
||||||
|
t.text "parent_tag_ids", null: false
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.bigint "created_by_user_id"
|
||||||
|
t.index ["created_at"], name: "index_tag_versions_on_created_at"
|
||||||
|
t.index ["created_by_user_id", "created_at"], name: "index_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
|
||||||
|
t.index ["tag_id", "created_at"], name: "index_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
|
||||||
|
t.index ["tag_id", "version_no"], name: "index_tag_versions_on_tag_id_and_version_no", unique: true
|
||||||
|
t.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive"
|
||||||
|
end
|
||||||
|
|
||||||
create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "tag_name_id", null: false
|
t.bigint "tag_name_id", null: false
|
||||||
t.string "category", default: "general", null: false
|
t.string "category", default: "general", null: false
|
||||||
@@ -322,6 +360,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
|
|
||||||
create_table "wiki_pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "tag_name_id", null: false
|
t.bigint "tag_name_id", null: false
|
||||||
|
t.text "body", null: false
|
||||||
t.bigint "created_user_id", null: false
|
t.bigint "created_user_id", null: false
|
||||||
t.bigint "updated_user_id", null: false
|
t.bigint "updated_user_id", null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
@@ -364,6 +403,22 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
t.index ["wiki_page_id"], name: "index_wiki_revisions_on_wiki_page_id"
|
t.index ["wiki_page_id"], name: "index_wiki_revisions_on_wiki_page_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "wiki_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
|
t.bigint "wiki_page_id", null: false
|
||||||
|
t.integer "version_no", null: false
|
||||||
|
t.string "event_type", null: false
|
||||||
|
t.string "title", null: false
|
||||||
|
t.text "body", null: false
|
||||||
|
t.text "reason"
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.bigint "created_by_user_id"
|
||||||
|
t.index ["created_by_user_id"], name: "index_wiki_versions_on_created_by_user_id"
|
||||||
|
t.index ["wiki_page_id", "version_no"], name: "index_wiki_versions_on_wiki_page_id_and_version_no", unique: true
|
||||||
|
t.index ["wiki_page_id"], name: "index_wiki_versions_on_wiki_page_id"
|
||||||
|
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "wiki_versions_event_type_valid"
|
||||||
|
t.check_constraint "`version_no` > 0", name: "wiki_versions_version_no_positive"
|
||||||
|
end
|
||||||
|
|
||||||
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
|
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
|
||||||
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
|
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
|
||||||
add_foreign_key "material_versions", "materials"
|
add_foreign_key "material_versions", "materials"
|
||||||
@@ -377,6 +432,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
add_foreign_key "materials", "users", column: "updated_by_user_id"
|
add_foreign_key "materials", "users", column: "updated_by_user_id"
|
||||||
add_foreign_key "nico_tag_relations", "tags"
|
add_foreign_key "nico_tag_relations", "tags"
|
||||||
add_foreign_key "nico_tag_relations", "tags", column: "nico_tag_id"
|
add_foreign_key "nico_tag_relations", "tags", column: "nico_tag_id"
|
||||||
|
add_foreign_key "nico_tag_versions", "tags"
|
||||||
|
add_foreign_key "nico_tag_versions", "users", column: "created_by_user_id"
|
||||||
|
add_foreign_key "post_implications", "posts"
|
||||||
|
add_foreign_key "post_implications", "posts", column: "parent_post_id"
|
||||||
add_foreign_key "post_similarities", "posts"
|
add_foreign_key "post_similarities", "posts"
|
||||||
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
||||||
add_foreign_key "post_tags", "posts"
|
add_foreign_key "post_tags", "posts"
|
||||||
@@ -384,9 +443,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
add_foreign_key "post_tags", "users", column: "created_user_id"
|
add_foreign_key "post_tags", "users", column: "created_user_id"
|
||||||
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
||||||
add_foreign_key "post_versions", "posts"
|
add_foreign_key "post_versions", "posts"
|
||||||
add_foreign_key "post_versions", "posts", column: "parent_id"
|
|
||||||
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "posts", "posts", column: "parent_id"
|
|
||||||
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
||||||
add_foreign_key "settings", "users"
|
add_foreign_key "settings", "users"
|
||||||
add_foreign_key "tag_implications", "tags"
|
add_foreign_key "tag_implications", "tags"
|
||||||
@@ -394,6 +451,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
add_foreign_key "tag_names", "tag_names", column: "canonical_id"
|
add_foreign_key "tag_names", "tag_names", column: "canonical_id"
|
||||||
add_foreign_key "tag_similarities", "tags"
|
add_foreign_key "tag_similarities", "tags"
|
||||||
add_foreign_key "tag_similarities", "tags", column: "target_tag_id"
|
add_foreign_key "tag_similarities", "tags", column: "target_tag_id"
|
||||||
|
add_foreign_key "tag_versions", "tags"
|
||||||
|
add_foreign_key "tag_versions", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "tags", "tag_names"
|
add_foreign_key "tags", "tag_names"
|
||||||
add_foreign_key "theatre_comments", "theatres"
|
add_foreign_key "theatre_comments", "theatres"
|
||||||
add_foreign_key "theatre_comments", "users"
|
add_foreign_key "theatre_comments", "users"
|
||||||
@@ -417,4 +476,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_04_09_123700) do
|
|||||||
add_foreign_key "wiki_revisions", "wiki_pages"
|
add_foreign_key "wiki_revisions", "wiki_pages"
|
||||||
add_foreign_key "wiki_revisions", "wiki_pages", column: "redirect_page_id"
|
add_foreign_key "wiki_revisions", "wiki_pages", column: "redirect_page_id"
|
||||||
add_foreign_key "wiki_revisions", "wiki_revisions", column: "base_revision_id"
|
add_foreign_key "wiki_revisions", "wiki_revisions", column: "base_revision_id"
|
||||||
|
add_foreign_key "wiki_versions", "users", column: "created_by_user_id"
|
||||||
|
add_foreign_key "wiki_versions", "wiki_pages"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
namespace :nico do
|
||||||
|
desc 'ニコニコ DB 逆連携'
|
||||||
|
task export: :environment do
|
||||||
|
require 'open3'
|
||||||
|
|
||||||
|
mysql_user = ENV.fetch('MYSQL_USER')
|
||||||
|
mysql_pass = ENV.fetch('MYSQL_PASS')
|
||||||
|
nizika_nico_path = ENV.fetch('NIZIKA_NICO_PATH')
|
||||||
|
|
||||||
|
videos = Post.where('url LIKE ?', '%nicovideo.jp/watch/%').pluck(:url).filter_map {
|
||||||
|
_1[%r{nicovideo\.jp/watch/([^/?#]+)}, 1]
|
||||||
|
}.uniq
|
||||||
|
|
||||||
|
next if videos.empty?
|
||||||
|
|
||||||
|
_, stderr, status = Open3.capture3(
|
||||||
|
{ 'MYSQL_USER' => mysql_user, 'MYSQL_PASS' => mysql_pass },
|
||||||
|
'python3', '-m', 'tracked_videos.put_bulk_upsert', *videos,
|
||||||
|
chdir: nizika_nico_path)
|
||||||
|
|
||||||
|
raise stderr unless status.success?
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -115,6 +115,10 @@ namespace :nico do
|
|||||||
datum['tags'].each do |raw|
|
datum['tags'].each do |raw|
|
||||||
name = TagNameSanitisationRule.sanitise("nico:#{ raw }")
|
name = TagNameSanitisationRule.sanitise("nico:#{ raw }")
|
||||||
tag = Tag.find_or_create_by_tag_name!(name, category: :nico)
|
tag = Tag.find_or_create_by_tag_name!(name, category: :nico)
|
||||||
|
|
||||||
|
event_type = tag.nico_tag_versions.exists? ? :update : :create
|
||||||
|
NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user: nil)
|
||||||
|
|
||||||
desired_nico_tag_based_ids << tag.id
|
desired_nico_tag_based_ids << tag.id
|
||||||
|
|
||||||
# 新たに記載される外部タグと連携される内部タグを記載
|
# 新たに記載される外部タグと連携される内部タグを記載
|
||||||
@@ -149,6 +153,7 @@ namespace :nico do
|
|||||||
if post_created
|
if post_created
|
||||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
||||||
elsif post_changed || kept_tag_ids != desired_all_tag_ids.to_set
|
elsif post_changed || kept_tag_ids != desired_all_tag_ids.to_set
|
||||||
|
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace :post do
|
||||||
|
desc '投稿同期(ニコニコ以外)'
|
||||||
|
task sync: :environment do
|
||||||
|
Youtube::Sync.new.sync!
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -3,5 +3,7 @@ FactoryBot.define do
|
|||||||
title { "TestPage" }
|
title { "TestPage" }
|
||||||
association :created_user, factory: :user
|
association :created_user, factory: :user
|
||||||
association :updated_user, factory: :user
|
association :updated_user, factory: :user
|
||||||
|
|
||||||
|
body { ' ' }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe PostImplication, type: :model do
|
||||||
|
let!(:post_record) do
|
||||||
|
Post.create!(
|
||||||
|
title: 'post',
|
||||||
|
url: 'https://example.com/post-implication-post'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:parent_post) do
|
||||||
|
Post.create!(
|
||||||
|
title: 'parent post',
|
||||||
|
url: 'https://example.com/post-implication-parent'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'is valid with post and parent_post' do
|
||||||
|
implication = described_class.new(
|
||||||
|
post: post_record,
|
||||||
|
parent_post:
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(implication).to be_valid
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not allow same post as parent_post' do
|
||||||
|
implication = described_class.new(
|
||||||
|
post: post_record,
|
||||||
|
parent_post: post_record
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(implication).not_to be_valid
|
||||||
|
expect(implication.errors[:parent_post_id]).to be_present
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not allow duplicate pair' do
|
||||||
|
described_class.create!(
|
||||||
|
post: post_record,
|
||||||
|
parent_post:
|
||||||
|
)
|
||||||
|
|
||||||
|
duplicate = described_class.new(
|
||||||
|
post: post_record,
|
||||||
|
parent_post:
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(duplicate).not_to be_valid
|
||||||
|
expect(duplicate.errors[:post_id]).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -19,7 +19,7 @@ RSpec.describe PostVersion, type: :model do
|
|||||||
url: post_record.url,
|
url: post_record.url,
|
||||||
thumbnail_base: post_record.thumbnail_base,
|
thumbnail_base: post_record.thumbnail_base,
|
||||||
tags: post_record.snapshot_tag_names.join(' '),
|
tags: post_record.snapshot_tag_names.join(' '),
|
||||||
parent: post_record.parent,
|
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
|
||||||
original_created_from: post_record.original_created_from,
|
original_created_from: post_record.original_created_from,
|
||||||
original_created_before: post_record.original_created_before,
|
original_created_before: post_record.original_created_before,
|
||||||
created_at: Time.current,
|
created_at: Time.current,
|
||||||
|
|||||||
@@ -107,11 +107,13 @@ RSpec.describe Tag, type: :model do
|
|||||||
context 'when the source tag_name has a wiki_page' do
|
context 'when the source tag_name has a wiki_page' do
|
||||||
let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
|
let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
|
||||||
let!(:wiki_page) do
|
let!(:wiki_page) do
|
||||||
WikiPage.create!(
|
admin = create_admin_user!
|
||||||
tag_name: source_tag_name,
|
|
||||||
created_user: create_admin_user!,
|
Wiki::Commit.create_content!(
|
||||||
updated_user: create_admin_user!
|
tag_name: source_tag_name,
|
||||||
)
|
body: 'source wiki body',
|
||||||
|
created_by_user: admin,
|
||||||
|
message: 'init')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'rolls back the transaction' do
|
it 'rolls back the transaction' do
|
||||||
@@ -145,5 +147,70 @@ RSpec.describe Tag, type: :model do
|
|||||||
expect(target_tag.reload.post_count).to eq(0)
|
expect(target_tag.reload.post_count).to eq(0)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def snapshot_tags(post)
|
||||||
|
post.snapshot_tag_names.join(' ')
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
|
||||||
|
PostVersion.create!(
|
||||||
|
post: post,
|
||||||
|
version_no: version_no,
|
||||||
|
event_type: event_type,
|
||||||
|
title: post.title,
|
||||||
|
url: post.url,
|
||||||
|
thumbnail_base: post.thumbnail_base,
|
||||||
|
tags: snapshot_tags(post),
|
||||||
|
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||||
|
original_created_from: post.original_created_from,
|
||||||
|
original_created_before: post.original_created_before,
|
||||||
|
created_at: Time.current,
|
||||||
|
created_by_user: created_by_user
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when post versions are enabled' do
|
||||||
|
let!(:source_post_tag) { PostTag.create!(post: post_record, tag: source_tag) }
|
||||||
|
let!(:unaffected_post) do
|
||||||
|
Post.create!(url: 'https://example.com/posts/2', title: 'unaffected post')
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
create_post_version_for!(post_record)
|
||||||
|
create_post_version_for!(unaffected_post)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates an update post_version only for affected posts' do
|
||||||
|
expect {
|
||||||
|
described_class.merge_tags!(target_tag, [source_tag])
|
||||||
|
}.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
|
affected_versions = post_record.reload.post_versions.order(:version_no)
|
||||||
|
expect(affected_versions.pluck(:version_no)).to eq([1, 2])
|
||||||
|
|
||||||
|
latest = affected_versions.last
|
||||||
|
expect(latest.event_type).to eq('update')
|
||||||
|
expect(latest.created_by_user).to be_nil
|
||||||
|
expect(latest.tags).to eq(snapshot_tags(post_record.reload))
|
||||||
|
|
||||||
|
expect(unaffected_post.reload.post_versions.count).to eq(1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when the source tag has no active post_tags' do
|
||||||
|
let!(:another_post) do
|
||||||
|
Post.create!(url: 'https://example.com/posts/3', title: 'another post')
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
create_post_version_for!(another_post)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not create any post_version' do
|
||||||
|
expect {
|
||||||
|
described_class.merge_tags!(target_tag, [source_tag])
|
||||||
|
}.not_to change(PostVersion, :count)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe VersionRecord, type: :model do
|
||||||
|
let!(:tag) { create(:tag, name: 'version_record_tag') }
|
||||||
|
let!(:nico_tag) { create(:tag, :nico, name: 'nico:version_record_tag') }
|
||||||
|
|
||||||
|
it 'makes TagVersion read only after create' do
|
||||||
|
version = TagVersion.create!(
|
||||||
|
tag: tag,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
name: tag.name,
|
||||||
|
category: tag.category,
|
||||||
|
aliases: '',
|
||||||
|
parent_tag_ids: '',
|
||||||
|
created_at: Time.current,
|
||||||
|
created_by_user: nil
|
||||||
|
)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
version.update!(name: 'changed')
|
||||||
|
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'prevents TagVersion destroy' do
|
||||||
|
version = TagVersion.create!(
|
||||||
|
tag: tag,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
name: tag.name,
|
||||||
|
category: tag.category,
|
||||||
|
aliases: '',
|
||||||
|
parent_tag_ids: '',
|
||||||
|
created_at: Time.current,
|
||||||
|
created_by_user: nil
|
||||||
|
)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
version.destroy!
|
||||||
|
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'makes NicoTagVersion read only after create' do
|
||||||
|
version = NicoTagVersion.create!(
|
||||||
|
tag: nico_tag,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
name: nico_tag.name,
|
||||||
|
linked_tags: '',
|
||||||
|
created_at: Time.current,
|
||||||
|
created_by_user: nil
|
||||||
|
)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
version.update!(name: 'nico:changed')
|
||||||
|
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'prevents NicoTagVersion destroy' do
|
||||||
|
version = NicoTagVersion.create!(
|
||||||
|
tag: nico_tag,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
name: nico_tag.name,
|
||||||
|
linked_tags: '',
|
||||||
|
created_at: Time.current,
|
||||||
|
created_by_user: nil
|
||||||
|
)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
version.destroy!
|
||||||
|
}.to raise_error(ActiveRecord::ReadOnlyRecord)
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -14,6 +14,7 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
|
|
||||||
describe 'PATCH /tags/nico/:id' do
|
describe 'PATCH /tags/nico/:id' do
|
||||||
let(:member) { create(:user, :member) }
|
let(:member) { create(:user, :member) }
|
||||||
|
let(:admin) { create(:user, :admin) }
|
||||||
let(:nico_tag) { create(:tag, :nico) }
|
let(:nico_tag) { create(:tag, :nico) }
|
||||||
|
|
||||||
it '401 when not logged in' do
|
it '401 when not logged in' do
|
||||||
@@ -34,5 +35,59 @@ RSpec.describe 'NicoTags', type: :request do
|
|||||||
patch "/tags/nico/#{non_nico.id}", params: { tags: 'a b' }
|
patch "/tags/nico/#{non_nico.id}", params: { tags: 'a b' }
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it '200 and updates linked tags while recording tag versions' do
|
||||||
|
sign_in_as(admin)
|
||||||
|
|
||||||
|
nico_tag_name = TagName.create!(name: 'nico:nico_tags_spec_source')
|
||||||
|
nico_tag = Tag.create!(tag_name: nico_tag_name, category: :nico)
|
||||||
|
|
||||||
|
linked_a_name = TagName.create!(name: 'nico_linked_a')
|
||||||
|
linked_a = Tag.create!(tag_name: linked_a_name, category: :general)
|
||||||
|
|
||||||
|
linked_b_name = TagName.create!(name: 'nico_linked_b')
|
||||||
|
linked_b = Tag.create!(tag_name: linked_b_name, category: :general)
|
||||||
|
|
||||||
|
TagVersioning.ensure_snapshot!(nico_tag, created_by_user: admin)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
patch "/tags/nico/#{nico_tag.id}", params: {
|
||||||
|
tags: " #{linked_a.name}\n#{linked_b.name} "
|
||||||
|
}
|
||||||
|
}.to change(TagVersion, :count).by(2)
|
||||||
|
.and change(NicoTagVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
names = json.map { |t| t['name'] }
|
||||||
|
expect(names).to match_array(['nico_linked_a', 'nico_linked_b'])
|
||||||
|
|
||||||
|
linked_versions = TagVersion.where(tag: [linked_a, linked_b]).order(:tag_id)
|
||||||
|
expect(linked_versions.map(&:event_type)).to eq(['create', 'create'])
|
||||||
|
expect(linked_versions.map(&:created_by_user_id)).to all(eq(admin.id))
|
||||||
|
|
||||||
|
versions = nico_tag.reload.nico_tag_versions.order(:version_no)
|
||||||
|
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
||||||
|
expect(versions.last.linked_tags.split).to match_array([
|
||||||
|
'nico_linked_a',
|
||||||
|
'nico_linked_b'
|
||||||
|
])
|
||||||
|
expect(versions.last.created_by_user_id).to eq(admin.id)
|
||||||
|
end
|
||||||
|
|
||||||
|
it '400 when linked tag normalises to nico tag' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
other_nico = create(:tag, :nico, name: 'nico:linked_ng')
|
||||||
|
TagName.create!(name: 'linked_ng_alias', canonical: other_nico.tag_name)
|
||||||
|
|
||||||
|
TagVersioning.ensure_snapshot!(nico_tag, created_by_user: member)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
patch "/tags/nico/#{nico_tag.id}", params: { tags: 'linked_ng_alias' }
|
||||||
|
}.not_to change(NicoTagVersion, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:bad_request)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
include ActiveSupport::Testing::TimeHelpers
|
|
||||||
|
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
require 'set'
|
require 'set'
|
||||||
|
|
||||||
|
include ActiveSupport::Testing::TimeHelpers
|
||||||
|
|
||||||
RSpec.describe 'Posts API', type: :request do
|
RSpec.describe 'Posts API', type: :request do
|
||||||
# create / update で thumbnail.attach は走るが、
|
# create / update で thumbnail.attach は走るが、
|
||||||
# resized_thumbnail! が MiniMagick 依存でコケやすいので request spec ではスタブしとくのが無難。
|
# resized_thumbnail! が MiniMagick 依存でコケやすいので request spec ではスタブしとくのが無難。
|
||||||
@@ -15,6 +15,31 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
Rack::Test::UploadedFile.new(StringIO.new('dummy'), 'image/jpeg', original_filename: 'dummy.jpg')
|
Rack::Test::UploadedFile.new(StringIO.new('dummy'), 'image/jpeg', original_filename: 'dummy.jpg')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def post_write_params params = { }
|
||||||
|
{ parent_post_ids: '' }.merge(params)
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_parent_post! title:, url:
|
||||||
|
Post.create!(title:, url:)
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_post_version_for! post
|
||||||
|
PostVersion.create!(
|
||||||
|
post:,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
title: post.title,
|
||||||
|
url: post.url,
|
||||||
|
thumbnail_base: post.thumbnail_base,
|
||||||
|
tags: post.snapshot_tag_names.join(' '),
|
||||||
|
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||||
|
original_created_from: post.original_created_from,
|
||||||
|
original_created_before: post.original_created_before,
|
||||||
|
created_at: post.created_at,
|
||||||
|
created_by_user: post.uploaded_user
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
let!(:tag_name) { TagName.create!(name: 'spec_tag') }
|
let!(:tag_name) { TagName.create!(name: 'spec_tag') }
|
||||||
let!(:tag) { Tag.create!(tag_name: tag_name, category: :general) }
|
let!(:tag) { Tag.create!(tag_name: tag_name, category: :general) }
|
||||||
|
|
||||||
@@ -457,6 +482,65 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
expect(json).to have_key('viewed')
|
expect(json).to have_key('viewed')
|
||||||
expect([true, false]).to include(json['viewed'])
|
expect([true, false]).to include(json['viewed'])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when post has parent, child, and sibling posts' do
|
||||||
|
let!(:parent_post) do
|
||||||
|
create_parent_post!(
|
||||||
|
title: 'shared parent post',
|
||||||
|
url: 'https://example.com/shared-parent-post'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:child_post) do
|
||||||
|
Post.create!(
|
||||||
|
title: 'child post',
|
||||||
|
url: 'https://example.com/show-child-post'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:sibling_post) do
|
||||||
|
Post.create!(
|
||||||
|
title: 'sibling post',
|
||||||
|
url: 'https://example.com/show-sibling-post'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
PostImplication.create!(
|
||||||
|
post: post_record,
|
||||||
|
parent_post:
|
||||||
|
)
|
||||||
|
|
||||||
|
PostImplication.create!(
|
||||||
|
post: child_post,
|
||||||
|
parent_post: post_record
|
||||||
|
)
|
||||||
|
|
||||||
|
PostImplication.create!(
|
||||||
|
post: sibling_post,
|
||||||
|
parent_post:
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns parent_posts, child_posts, and sibling_posts' do
|
||||||
|
get "/posts/#{post_record.id}"
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
parent_ids = json.fetch('parent_posts').map { |p| p.fetch('id') }
|
||||||
|
child_ids = json.fetch('child_posts').map { |p| p.fetch('id') }
|
||||||
|
|
||||||
|
expect(parent_ids).to include(parent_post.id)
|
||||||
|
expect(child_ids).to include(child_post.id)
|
||||||
|
|
||||||
|
sibling_posts_by_parent = json.fetch('sibling_posts')
|
||||||
|
siblings = sibling_posts_by_parent.fetch(parent_post.id.to_s)
|
||||||
|
|
||||||
|
sibling_ids = siblings.map { |p| p.fetch('id') }
|
||||||
|
expect(sibling_ids).to include(post_record.id)
|
||||||
|
expect(sibling_ids).to include(sibling_post.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when post does not exist' do
|
context 'when post does not exist' do
|
||||||
@@ -475,25 +559,28 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it '401 when not logged in' do
|
it '401 when not logged in' do
|
||||||
sign_out
|
sign_out
|
||||||
post '/posts', params: { title: 't', url: 'https://example.com/x', tags: 'a', thumbnail: dummy_upload }
|
post '/posts', params: post_write_params(title: 't', url: 'https://example.com/x', tags: 'a',
|
||||||
|
thumbnail: dummy_upload)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '403 when not member' do
|
it '403 when not member' do
|
||||||
sign_in_as(create(:user, role: 'guest'))
|
sign_in_as(create(:user, role: 'guest'))
|
||||||
post '/posts', params: { title: 't', url: 'https://example.com/x', tags: 'a', thumbnail: dummy_upload }
|
post '/posts', params: post_write_params(title: 't', url: 'https://example.com/x', tags: 'a',
|
||||||
|
thumbnail: dummy_upload)
|
||||||
expect(response).to have_http_status(:forbidden)
|
expect(response).to have_http_status(:forbidden)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '201 and creates post + tags when member' do
|
it '201 and creates post + tags when member' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: {
|
post '/posts', params: post_write_params(
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/new',
|
url: 'https://example.com/new',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload
|
||||||
}
|
)
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json).to include('id', 'title', 'url')
|
expect(json).to include('id', 'title', 'url')
|
||||||
@@ -507,12 +594,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it '201 and creates post + tags when member and tags have aliases' do
|
it '201 and creates post + tags when member and tags have aliases' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: {
|
post '/posts', params: post_write_params(
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/new',
|
url: 'https://example.com/new',
|
||||||
tags: 'manko', # 既存タグ名を投げる
|
tags: 'manko', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload
|
||||||
}
|
)
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json).to include('id', 'title', 'url')
|
expect(json).to include('id', 'title', 'url')
|
||||||
@@ -533,13 +620,14 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'return 400' do
|
it 'return 400' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: {
|
post '/posts', params: post_write_params(
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/nico_tag',
|
url: 'https://example.com/nico-tag-post',
|
||||||
tags: 'nico:nico_tag',
|
tags: 'nico:nico_tag',
|
||||||
thumbnail: dummy_upload }
|
thumbnail: dummy_upload
|
||||||
|
)
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request), response.body
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -547,11 +635,11 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'returns 422' do
|
it 'returns 422' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: {
|
post '/posts', params: post_write_params(
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: ' ',
|
url: ' ',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload }
|
thumbnail: dummy_upload)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
@@ -561,16 +649,156 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'returns 422' do
|
it 'returns 422' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: {
|
post '/posts', params: post_write_params(
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'ぼざクリタグ広場',
|
url: 'ぼざクリタグ広場',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload)
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids is provided' do
|
||||||
|
let!(:parent_post_1) do
|
||||||
|
create_parent_post!(
|
||||||
|
title: 'parent post 1',
|
||||||
|
url: 'https://example.com/parent-post-1'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:parent_post_2) do
|
||||||
|
create_parent_post!(
|
||||||
|
title: 'parent post 2',
|
||||||
|
url: 'https://example.com/parent-post-2'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates post implications for parent posts' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post '/posts', params: {
|
||||||
|
title: 'child post',
|
||||||
|
url: 'https://example.com/child-post',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: "#{parent_post_1.id} #{parent_post_2.id}",
|
||||||
|
thumbnail: dummy_upload }
|
||||||
|
}.to change(PostImplication, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
|
created_post = Post.find(json.fetch('id'))
|
||||||
|
expect(created_post.parent_posts.order(:id).pluck(:id)).to eq(
|
||||||
|
[parent_post_1.id, parent_post_2.id].sort
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(PostImplication.exists?(
|
||||||
|
post_id: created_post.id,
|
||||||
|
parent_post_id: parent_post_1.id
|
||||||
|
)).to be(true)
|
||||||
|
|
||||||
|
expect(PostImplication.exists?(
|
||||||
|
post_id: created_post.id,
|
||||||
|
parent_post_id: parent_post_2.id
|
||||||
|
)).to be(true)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'deduplicates parent_post_ids' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post '/posts', params: post_write_params(
|
||||||
|
title: 'dedup child post',
|
||||||
|
url: 'https://example.com/dedup-child-post',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: "#{parent_post_1.id} #{parent_post_1.id}",
|
||||||
|
thumbnail: dummy_upload
|
||||||
|
)
|
||||||
|
}.to change(PostImplication, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
|
created_post = Post.find(json.fetch('id'))
|
||||||
|
expect(created_post.parent_posts.pluck(:id)).to eq([parent_post_1.id])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'records parent_post_ids in post version' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
post '/posts', params: post_write_params(
|
||||||
|
title: 'versioned child post',
|
||||||
|
url: 'https://example.com/versioned-child-post',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: "#{parent_post_1.id} #{parent_post_2.id}",
|
||||||
|
thumbnail: dummy_upload
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
|
created_post = Post.find(json.fetch('id'))
|
||||||
|
version = PostVersion.find_by!(post: created_post, version_no: 1)
|
||||||
|
|
||||||
|
expect(version.parent_post_ids.split.map(&:to_i)).to eq(
|
||||||
|
[parent_post_1.id, parent_post_2.id].sort
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids is missing' do
|
||||||
|
it 'returns 422' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post '/posts', params: {
|
||||||
|
title: 'missing parent_post_ids',
|
||||||
|
url: 'https://example.com/missing-parent-post-ids',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
thumbnail: dummy_upload }
|
||||||
|
}.not_to change(Post, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json.fetch('errors')).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids includes invalid token' do
|
||||||
|
it 'returns 422 and does not create post' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post '/posts', params: post_write_params(
|
||||||
|
title: 'invalid parent ids',
|
||||||
|
url: 'https://example.com/invalid-parent-ids',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: 'abc',
|
||||||
|
thumbnail: dummy_upload
|
||||||
|
)
|
||||||
|
}.not_to change(Post, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json.fetch('errors')).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids includes nonexistent post id' do
|
||||||
|
it 'returns 422 and does not create post implication' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post '/posts', params: post_write_params(
|
||||||
|
title: 'missing parent post',
|
||||||
|
url: 'https://example.com/missing-parent-post',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: '999999999',
|
||||||
|
thumbnail: dummy_upload
|
||||||
|
)
|
||||||
|
}.not_to change(PostImplication, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json.fetch('errors')).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'PUT /posts/:id' do
|
describe 'PUT /posts/:id' do
|
||||||
@@ -578,13 +806,13 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it '401 when not logged in' do
|
it '401 when not logged in' do
|
||||||
sign_out
|
sign_out
|
||||||
put "/posts/#{post_record.id}", params: { title: 'updated', tags: 'spec_tag' }
|
put "/posts/#{post_record.id}", params: post_write_params(title: 'updated', tags: 'spec_tag')
|
||||||
expect(response).to have_http_status(:unauthorized)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '403 when not member' do
|
it '403 when not member' do
|
||||||
sign_in_as(create(:user, role: 'guest'))
|
sign_in_as(create(:user, role: 'guest'))
|
||||||
put "/posts/#{post_record.id}", params: { title: 'updated', tags: 'spec_tag' }
|
put "/posts/#{post_record.id}", params: post_write_params(title: 'updated', tags: 'spec_tag')
|
||||||
expect(response).to have_http_status(:forbidden)
|
expect(response).to have_http_status(:forbidden)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -595,10 +823,9 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
tn2 = TagName.create!(name: 'spec_tag_2')
|
tn2 = TagName.create!(name: 'spec_tag_2')
|
||||||
Tag.create!(tag_name: tn2, category: :general)
|
Tag.create!(tag_name: tn2, category: :general)
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: {
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2'
|
tags: 'spec_tag_2')
|
||||||
}
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json).to have_key('tags')
|
expect(json).to have_key('tags')
|
||||||
@@ -619,11 +846,178 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'return 400' do
|
it 'return 400' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
put "/posts/#{ post_record.id }", params: {
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'nico:nico_tag' }
|
tags: 'nico:nico_tag'
|
||||||
|
)
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request), response.body
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids is provided' do
|
||||||
|
let!(:old_parent_post) do
|
||||||
|
create_parent_post!(
|
||||||
|
title: 'old parent post',
|
||||||
|
url: 'https://example.com/old-parent-post'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:new_parent_post_1) do
|
||||||
|
create_parent_post!(
|
||||||
|
title: 'new parent post 1',
|
||||||
|
url: 'https://example.com/new-parent-post-1'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:new_parent_post_2) do
|
||||||
|
create_parent_post!(
|
||||||
|
title: 'new parent post 2',
|
||||||
|
url: 'https://example.com/new-parent-post-2'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
PostImplication.create!(
|
||||||
|
post: post_record,
|
||||||
|
parent_post: old_parent_post
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'replaces parent posts' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
|
title: 'updated title',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: "#{new_parent_post_1.id} #{new_parent_post_2.id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
expect(post_record.reload.parent_posts.order(:id).pluck(:id)).to eq(
|
||||||
|
[new_parent_post_1.id, new_parent_post_2.id].sort
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(PostImplication.exists?(
|
||||||
|
post_id: post_record.id,
|
||||||
|
parent_post_id: old_parent_post.id
|
||||||
|
)).to be(false)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'clears parent posts when parent_post_ids is blank' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
|
title: 'updated title',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: ''
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(post_record.reload.parent_posts).to be_empty
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'records changed parent_post_ids in post version' do
|
||||||
|
sign_in_as(member)
|
||||||
|
create_post_version_for!(post_record.reload)
|
||||||
|
|
||||||
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
|
title: 'updated title',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: "#{new_parent_post_1.id} #{new_parent_post_2.id}"
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
version = post_record.reload.post_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version.version_no).to eq(2)
|
||||||
|
expect(version.parent_post_ids.split.map(&:to_i)).to eq(
|
||||||
|
[new_parent_post_1.id, new_parent_post_2.id].sort
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids is missing' do
|
||||||
|
it 'returns 422' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
put "/posts/#{post_record.id}", params: {
|
||||||
|
title: 'updated title',
|
||||||
|
tags: 'spec_tag' }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json.fetch('errors')).to be_present
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids includes invalid token' do
|
||||||
|
it 'returns 422 and does not change parent posts' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
parent_post = create_parent_post!(
|
||||||
|
title: 'valid parent post',
|
||||||
|
url: 'https://example.com/valid-parent-post'
|
||||||
|
)
|
||||||
|
|
||||||
|
PostImplication.create!(
|
||||||
|
post: post_record,
|
||||||
|
parent_post:
|
||||||
|
)
|
||||||
|
|
||||||
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
|
title: 'updated title',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: 'abc'
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(post_record.reload.parent_posts.pluck(:id)).to eq([parent_post.id])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids includes nonexistent post id' do
|
||||||
|
it 'returns 422 and does not change parent posts' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
parent_post = create_parent_post!(
|
||||||
|
title: 'existing parent post',
|
||||||
|
url: 'https://example.com/existing-parent-post'
|
||||||
|
)
|
||||||
|
|
||||||
|
PostImplication.create!(
|
||||||
|
post: post_record,
|
||||||
|
parent_post:
|
||||||
|
)
|
||||||
|
|
||||||
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
|
title: 'updated title',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: '999999999'
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(post_record.reload.parent_posts.pluck(:id)).to eq([parent_post.id])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent_post_ids includes self id' do
|
||||||
|
it 'returns 422 and does not create self implication' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
|
title: 'updated title',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
parent_post_ids: post_record.id.to_s
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
|
||||||
|
expect(PostImplication.exists?(
|
||||||
|
post_id: post_record.id,
|
||||||
|
parent_post_id: post_record.id
|
||||||
|
)).to be(false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -756,6 +1150,218 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'GET /posts/versions' do
|
||||||
|
let(:member) { create(:user, :member, name: 'version member') }
|
||||||
|
|
||||||
|
let(:t_v1) { Time.zone.local(2020, 1, 1, 12, 0, 0) }
|
||||||
|
let(:t_v2) { Time.zone.local(2020, 1, 2, 12, 0, 0) }
|
||||||
|
let(:t_other) { Time.zone.local(2020, 1, 3, 12, 0, 0) }
|
||||||
|
|
||||||
|
let(:oc_from) { Time.zone.local(2019, 12, 31, 0, 0, 0) }
|
||||||
|
let(:oc_before) { Time.zone.local(2020, 1, 1, 0, 0, 0) }
|
||||||
|
|
||||||
|
let!(:tag_name2) { TagName.create!(name: 'spec_tag_2') }
|
||||||
|
let!(:tag2) { Tag.create!(tag_name: tag_name2, category: :general) }
|
||||||
|
|
||||||
|
def snapshot_tags(post)
|
||||||
|
post.snapshot_tag_names.join(' ')
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_post_version! post, version_no:, event_type:, created_by_user:, created_at:
|
||||||
|
PostVersion.create!(
|
||||||
|
post:,
|
||||||
|
version_no:,
|
||||||
|
event_type:,
|
||||||
|
title: post.title,
|
||||||
|
url: post.url,
|
||||||
|
thumbnail_base: post.thumbnail_base,
|
||||||
|
tags: snapshot_tags(post),
|
||||||
|
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||||
|
original_created_from: post.original_created_from,
|
||||||
|
original_created_before: post.original_created_before,
|
||||||
|
created_at:,
|
||||||
|
created_by_user:
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:v1) do
|
||||||
|
travel_to(t_v1) do
|
||||||
|
create_post_version!(
|
||||||
|
post_record,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
created_by_user: member,
|
||||||
|
created_at: t_v1
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:v2) do
|
||||||
|
post_record.post_tags.kept.find_by!(tag: tag).discard_by!(member)
|
||||||
|
PostTag.create!(post: post_record, tag: tag2, created_user: member)
|
||||||
|
post_record.update!(
|
||||||
|
title: 'updated spec post',
|
||||||
|
original_created_from: oc_from,
|
||||||
|
original_created_before: oc_before
|
||||||
|
)
|
||||||
|
|
||||||
|
travel_to(t_v2) do
|
||||||
|
create_post_version!(
|
||||||
|
post_record.reload,
|
||||||
|
version_no: 2,
|
||||||
|
event_type: 'update',
|
||||||
|
created_by_user: member,
|
||||||
|
created_at: t_v2
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:other_post_version) do
|
||||||
|
other_post = Post.create!(
|
||||||
|
title: 'other versioned post',
|
||||||
|
url: 'https://example.com/other-versioned'
|
||||||
|
)
|
||||||
|
PostTag.create!(post: other_post, tag: tag)
|
||||||
|
|
||||||
|
travel_to(t_other) do
|
||||||
|
create_post_version!(
|
||||||
|
other_post,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
created_by_user: member,
|
||||||
|
created_at: t_other
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns versions for the specified post in reverse chronological order' do
|
||||||
|
get '/posts/versions', params: { post: post_record.id }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json).to include('versions', 'count')
|
||||||
|
expect(json.fetch('count')).to eq(2)
|
||||||
|
|
||||||
|
versions = json.fetch('versions')
|
||||||
|
expect(versions.map { |v| v['post_id'] }.uniq).to eq([post_record.id])
|
||||||
|
expect(versions.map { |v| v['version_no'] }).to eq([2, 1])
|
||||||
|
|
||||||
|
latest = versions.first
|
||||||
|
expect(latest).to include(
|
||||||
|
'post_id' => post_record.id,
|
||||||
|
'version_no' => 2,
|
||||||
|
'event_type' => 'update',
|
||||||
|
'created_by_user' => {
|
||||||
|
'id' => member.id,
|
||||||
|
'name' => member.name
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(latest.fetch('title')).to eq(
|
||||||
|
'current' => 'updated spec post',
|
||||||
|
'prev' => 'spec post'
|
||||||
|
)
|
||||||
|
expect(latest.fetch('url')).to eq(
|
||||||
|
'current' => 'https://example.com/spec',
|
||||||
|
'prev' => 'https://example.com/spec'
|
||||||
|
)
|
||||||
|
expect(latest.fetch('thumbnail')).to eq(
|
||||||
|
'current' => nil,
|
||||||
|
'prev' => nil
|
||||||
|
)
|
||||||
|
expect(latest.fetch('thumbnail_base')).to eq(
|
||||||
|
'current' => nil,
|
||||||
|
'prev' => nil
|
||||||
|
)
|
||||||
|
expect(latest.fetch('tags')).to include(
|
||||||
|
{ 'name' => 'spec_tag_2', 'type' => 'added' },
|
||||||
|
{ 'name' => 'spec_tag', 'type' => 'removed' }
|
||||||
|
)
|
||||||
|
expect(latest.fetch('original_created_from')).to eq(
|
||||||
|
'current' => oc_from.iso8601,
|
||||||
|
'prev' => nil
|
||||||
|
)
|
||||||
|
expect(latest.fetch('original_created_before')).to eq(
|
||||||
|
'current' => oc_before.iso8601,
|
||||||
|
'prev' => nil
|
||||||
|
)
|
||||||
|
expect(latest.fetch('created_at')).to eq(t_v2.iso8601)
|
||||||
|
|
||||||
|
first = versions.second
|
||||||
|
expect(first).to include(
|
||||||
|
'post_id' => post_record.id,
|
||||||
|
'version_no' => 1,
|
||||||
|
'event_type' => 'create',
|
||||||
|
'created_by_user' => {
|
||||||
|
'id' => member.id,
|
||||||
|
'name' => member.name
|
||||||
|
}
|
||||||
|
)
|
||||||
|
expect(first.fetch('title')).to eq(
|
||||||
|
'current' => 'spec post',
|
||||||
|
'prev' => nil
|
||||||
|
)
|
||||||
|
expect(first.fetch('tags')).to include(
|
||||||
|
{ 'name' => 'spec_tag', 'type' => 'added' }
|
||||||
|
)
|
||||||
|
expect(first.fetch('created_at')).to eq(t_v1.iso8601)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'filters versions by tag when the current snapshot includes the tag' do
|
||||||
|
get '/posts/versions', params: { post: post_record.id, tag: tag2.id }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.fetch('count')).to eq(1)
|
||||||
|
|
||||||
|
versions = json.fetch('versions')
|
||||||
|
expect(versions.size).to eq(1)
|
||||||
|
expect(versions[0]['post_id']).to eq(post_record.id)
|
||||||
|
expect(versions[0]['version_no']).to eq(2)
|
||||||
|
expect(versions[0]['tags']).to include(
|
||||||
|
{ 'name' => 'spec_tag_2', 'type' => 'added' }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'filters versions by tag when the tag exists in either current or previous snapshot' do
|
||||||
|
get '/posts/versions', params: { post: post_record.id, tag: tag.id }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.fetch('count')).to eq(2)
|
||||||
|
|
||||||
|
versions = json.fetch('versions')
|
||||||
|
expect(versions.map { |v| v['post_id'] }).to all(eq(post_record.id))
|
||||||
|
expect(versions.map { |v| v['version_no'] }).to eq([2, 1])
|
||||||
|
|
||||||
|
latest = versions[0]
|
||||||
|
first = versions[1]
|
||||||
|
|
||||||
|
expect(latest['tags']).to include(
|
||||||
|
{ 'name' => 'spec_tag', 'type' => 'removed' }
|
||||||
|
)
|
||||||
|
expect(first['tags']).to include(
|
||||||
|
{ 'name' => 'spec_tag', 'type' => 'added' }
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns empty when tag does not exist' do
|
||||||
|
get '/posts/versions', params: { tag: 999_999_999 }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.fetch('versions')).to eq([])
|
||||||
|
expect(json.fetch('count')).to eq(0)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'clamps page and limit to at least 1' do
|
||||||
|
get '/posts/versions', params: { post: post_record.id, page: 0, limit: 0 }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.fetch('count')).to eq(2)
|
||||||
|
|
||||||
|
versions = json.fetch('versions')
|
||||||
|
expect(versions.size).to eq(1)
|
||||||
|
expect(versions[0]['version_no']).to eq(2)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'POST /posts/:id/viewed' do
|
describe 'POST /posts/:id/viewed' do
|
||||||
let(:user) { create(:user) }
|
let(:user) { create(:user) }
|
||||||
|
|
||||||
@@ -803,33 +1409,15 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
post.snapshot_tag_names.join(' ')
|
post.snapshot_tag_names.join(' ')
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_post_version_for!(post)
|
|
||||||
PostVersion.create!(
|
|
||||||
post: post,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
title: post.title,
|
|
||||||
url: post.url,
|
|
||||||
thumbnail_base: post.thumbnail_base,
|
|
||||||
tags: snapshot_tags(post),
|
|
||||||
parent: post.parent,
|
|
||||||
original_created_from: post.original_created_from,
|
|
||||||
original_created_before: post.original_created_before,
|
|
||||||
created_at: post.created_at,
|
|
||||||
created_by_user: post.uploaded_user
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates version 1 on POST /posts' do
|
it 'creates version 1 on POST /posts' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
post '/posts', params: {
|
post '/posts', params: post_write_params(
|
||||||
title: 'versioned post',
|
title: 'versioned post',
|
||||||
url: 'https://example.com/versioned-post',
|
url: 'https://example.com/versioned-post',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload)
|
||||||
}
|
|
||||||
end.to change(PostVersion, :count).by(1)
|
end.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
@@ -852,10 +1440,9 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
Tag.create!(tag_name: tag_name2, category: :general)
|
Tag.create!(tag_name: tag_name2, category: :general)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/posts/#{post_record.id}", params: {
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2'
|
tags: 'spec_tag_2')
|
||||||
}
|
|
||||||
end.to change(PostVersion, :count).by(1)
|
end.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
@@ -870,15 +1457,15 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do
|
it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
create_post_version_for!(post_record)
|
|
||||||
|
|
||||||
expect do
|
PostTag.create!(post: post_record, tag: Tag.no_deerjikist)
|
||||||
put "/posts/#{post_record.id}", params: {
|
create_post_version_for!(post_record.reload)
|
||||||
title: post_record.title,
|
|
||||||
tags: 'spec_tag'
|
|
||||||
}
|
|
||||||
end.not_to change(PostVersion, :count)
|
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
|
title: post_record.title,
|
||||||
|
tags: 'spec_tag')
|
||||||
|
}.not_to change(PostVersion, :count)
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
version = post_record.reload.post_versions.order(:version_no).last
|
version = post_record.reload.post_versions.order(:version_no).last
|
||||||
@@ -891,12 +1478,11 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
post '/posts', params: {
|
post '/posts', params: post_write_params(
|
||||||
title: 'invalid post',
|
title: 'invalid post',
|
||||||
url: 'ぼざクリタグ広場',
|
url: 'ぼざクリタグ広場',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload)
|
||||||
}
|
|
||||||
end.not_to change(PostVersion, :count)
|
end.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
@@ -907,15 +1493,60 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
create_post_version_for!(post_record)
|
create_post_version_for!(post_record)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/posts/#{post_record.id}", params: {
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
original_created_from: Time.zone.local(2020, 1, 2, 0, 0, 0).iso8601,
|
original_created_from: Time.zone.local(2020, 1, 2, 0, 0, 0).iso8601,
|
||||||
original_created_before: Time.zone.local(2020, 1, 1, 0, 0, 0).iso8601
|
original_created_before: Time.zone.local(2020, 1, 1, 0, 0, 0).iso8601)
|
||||||
}
|
|
||||||
end.not_to change(PostVersion, :count)
|
end.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'tag versioning from post write actions' do
|
||||||
|
let(:member) { create(:user, :member) }
|
||||||
|
|
||||||
|
it 'creates tag snapshot for normalised tags on POST /posts' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post '/posts', params: post_write_params(
|
||||||
|
title: 'tag versioned post',
|
||||||
|
url: 'https://example.com/tag-versioned-post',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
thumbnail: dummy_upload)
|
||||||
|
}.to change { tag.reload.tag_versions.count }.by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
|
version = tag.reload.tag_versions.order(:version_no).last
|
||||||
|
expect(version.version_no).to eq(1)
|
||||||
|
expect(version.event_type).to eq('create')
|
||||||
|
expect(version.name).to eq('spec_tag')
|
||||||
|
expect(version.category).to eq('general')
|
||||||
|
expect(version.created_by_user_id).to eq(member.id)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates tag snapshot for normalised tags on PUT /posts/:id' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
|
tag_name2 = TagName.create!(name: 'spec_tag_2')
|
||||||
|
tag2 = Tag.create!(tag_name: tag_name2, category: :general)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/posts/#{post_record.id}", params: post_write_params(
|
||||||
|
title: 'updated title',
|
||||||
|
tags: 'spec_tag_2')
|
||||||
|
}.to change { tag2.reload.tag_versions.count }.by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
version = tag2.reload.tag_versions.order(:version_no).last
|
||||||
|
expect(version.version_no).to eq(1)
|
||||||
|
expect(version.event_type).to eq('create')
|
||||||
|
expect(version.name).to eq('spec_tag_2')
|
||||||
|
expect(version.created_by_user_id).to eq(member.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -58,15 +58,47 @@ RSpec.describe "TagChildren", type: :request do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when Tag.find raises (invalid ids) it still returns 204" do
|
context "when Tag.find raises (invalid ids)" do
|
||||||
before { stub_current_user(admin) }
|
before { stub_current_user(admin) }
|
||||||
|
|
||||||
let(:parent_id) { -1 }
|
let(:parent_id) { -1 }
|
||||||
let(:child_id) { -1 }
|
let(:child_id) { -1 }
|
||||||
|
|
||||||
it "returns 204 (rescue nil)" do
|
it "returns 404" do
|
||||||
do_request
|
do_request
|
||||||
expect(response).to have_http_status(:no_content)
|
expect(response).to have_http_status(:not_found)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent is nico' do
|
||||||
|
before { stub_current_user(admin) }
|
||||||
|
|
||||||
|
let!(:parent) { create(:tag, :nico, name: 'nico:parent_ng') }
|
||||||
|
let(:parent_id) { parent.id }
|
||||||
|
let(:child_id) { child.id }
|
||||||
|
|
||||||
|
it 'returns 400 and does not create relation' do
|
||||||
|
expect {
|
||||||
|
do_request
|
||||||
|
}.not_to change(TagImplication, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:bad_request)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when child is nico' do
|
||||||
|
before { stub_current_user(admin) }
|
||||||
|
|
||||||
|
let!(:child) { create(:tag, :nico, name: 'nico:child_ng') }
|
||||||
|
let(:parent_id) { parent.id }
|
||||||
|
let(:child_id) { child.id }
|
||||||
|
|
||||||
|
it 'returns 400 and does not create relation' do
|
||||||
|
expect {
|
||||||
|
do_request
|
||||||
|
}.not_to change(TagImplication, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -116,17 +148,57 @@ RSpec.describe "TagChildren", type: :request do
|
|||||||
|
|
||||||
expect(response).to have_http_status(:no_content)
|
expect(response).to have_http_status(:no_content)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'records create and update versions for child tag' do
|
||||||
|
expect {
|
||||||
|
do_request
|
||||||
|
}.to change(TagVersion, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:no_content)
|
||||||
|
|
||||||
|
versions = child.reload.tag_versions.order(:version_no)
|
||||||
|
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
||||||
|
expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s)
|
||||||
|
expect(versions.second.parent_tag_ids).to eq('')
|
||||||
|
expect(versions.second.created_by_user_id).to eq(admin.id)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "when Tag.find raises (invalid ids) it still returns 204" do
|
context "when Tag.find raises (invalid ids)" do
|
||||||
before { stub_current_user(admin) }
|
before { stub_current_user(admin) }
|
||||||
|
|
||||||
let(:parent_id) { -1 }
|
let(:parent_id) { -1 }
|
||||||
let(:child_id) { -1 }
|
let(:child_id) { -1 }
|
||||||
|
|
||||||
it "returns 204 (rescue nil)" do
|
it "returns 404" do
|
||||||
do_request
|
do_request
|
||||||
expect(response).to have_http_status(:no_content)
|
expect(response).to have_http_status(:not_found)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when parent is nico' do
|
||||||
|
before { stub_current_user(admin) }
|
||||||
|
|
||||||
|
let!(:parent) { create(:tag, :nico, name: 'nico:parent_ng_delete') }
|
||||||
|
let(:parent_id) { parent.id }
|
||||||
|
let(:child_id) { child.id }
|
||||||
|
|
||||||
|
it 'returns 400' do
|
||||||
|
do_request
|
||||||
|
expect(response).to have_http_status(:bad_request)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when child is nico' do
|
||||||
|
before { stub_current_user(admin) }
|
||||||
|
|
||||||
|
let!(:child) { create(:tag, :nico, name: 'nico:child_ng_delete') }
|
||||||
|
let(:parent_id) { parent.id }
|
||||||
|
let(:child_id) { child.id }
|
||||||
|
|
||||||
|
it 'returns 400' do
|
||||||
|
do_request
|
||||||
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,243 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'TagVersions API', type: :request do
|
||||||
|
let(:member) { create(:user, :member, name: 'version member') }
|
||||||
|
|
||||||
|
let!(:tag) { create(:tag, name: 'tag_versions_target', category: :general) }
|
||||||
|
let!(:other_tag) { create(:tag, name: 'tag_versions_other', category: :general) }
|
||||||
|
|
||||||
|
let!(:parent_shared) { create(:tag, name: 'parent_shared', category: :general) }
|
||||||
|
let!(:parent_old) { create(:tag, name: 'parent_old', category: :general) }
|
||||||
|
let!(:parent_new) { create(:tag, name: 'parent_new', category: :general) }
|
||||||
|
let!(:other_parent) { create(:tag, name: 'other_parent', category: :general) }
|
||||||
|
|
||||||
|
let(:t_v1) { Time.zone.local(2020, 1, 1, 12, 0, 0) }
|
||||||
|
let(:t_v2) { Time.zone.local(2020, 1, 2, 12, 0, 0) }
|
||||||
|
let(:t_other) { Time.zone.local(2020, 1, 3, 12, 0, 0) }
|
||||||
|
|
||||||
|
def create_tag_version!(
|
||||||
|
tag:,
|
||||||
|
version_no:,
|
||||||
|
event_type:,
|
||||||
|
name:,
|
||||||
|
category:,
|
||||||
|
aliases: [],
|
||||||
|
parent_tags: [],
|
||||||
|
created_by_user:,
|
||||||
|
created_at:
|
||||||
|
)
|
||||||
|
TagVersion.create!(
|
||||||
|
tag: tag,
|
||||||
|
version_no: version_no,
|
||||||
|
event_type: event_type,
|
||||||
|
name: name,
|
||||||
|
category: category,
|
||||||
|
aliases: Array(aliases).join(' '),
|
||||||
|
parent_tag_ids: Array(parent_tags).map(&:id).join(' '),
|
||||||
|
created_by_user: created_by_user,
|
||||||
|
created_at: created_at
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:v1) do
|
||||||
|
create_tag_version!(
|
||||||
|
tag: tag,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
name: 'old_tag_name',
|
||||||
|
category: 'general',
|
||||||
|
aliases: ['alias_shared', 'alias_old'],
|
||||||
|
parent_tags: [parent_shared, parent_old],
|
||||||
|
created_by_user: member,
|
||||||
|
created_at: t_v1
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:v2) do
|
||||||
|
create_tag_version!(
|
||||||
|
tag: tag,
|
||||||
|
version_no: 2,
|
||||||
|
event_type: 'update',
|
||||||
|
name: 'new_tag_name',
|
||||||
|
category: 'meme',
|
||||||
|
aliases: ['alias_shared', 'alias_new'],
|
||||||
|
parent_tags: [parent_shared, parent_new],
|
||||||
|
created_by_user: member,
|
||||||
|
created_at: t_v2
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:other_v1) do
|
||||||
|
create_tag_version!(
|
||||||
|
tag: other_tag,
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
name: 'other_tag_name',
|
||||||
|
category: 'general',
|
||||||
|
aliases: ['other_alias'],
|
||||||
|
parent_tags: [other_parent],
|
||||||
|
created_by_user: member,
|
||||||
|
created_at: t_other
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'GET /tags/versions' do
|
||||||
|
it 'returns all versions in reverse chronological order when id is omitted' do
|
||||||
|
get '/tags/versions'
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json).to include('versions', 'count')
|
||||||
|
expect(json.fetch('count')).to eq(3)
|
||||||
|
|
||||||
|
versions = json.fetch('versions')
|
||||||
|
|
||||||
|
expect(versions.map { |v| [v['tag_id'], v['version_no']] }).to eq([
|
||||||
|
[other_tag.id, 1],
|
||||||
|
[tag.id, 2],
|
||||||
|
[tag.id, 1]
|
||||||
|
])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns versions for the specified tag with diffs' do
|
||||||
|
get '/tags/versions', params: { id: tag.id }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json).to include('versions', 'count')
|
||||||
|
expect(json.fetch('count')).to eq(2)
|
||||||
|
|
||||||
|
versions = json.fetch('versions')
|
||||||
|
expect(versions.map { |v| v['tag_id'] }.uniq).to eq([tag.id])
|
||||||
|
expect(versions.map { |v| v['version_no'] }).to eq([2, 1])
|
||||||
|
|
||||||
|
latest = versions.first
|
||||||
|
expect(latest).to include(
|
||||||
|
'tag_id' => tag.id,
|
||||||
|
'version_no' => 2,
|
||||||
|
'event_type' => 'update',
|
||||||
|
'created_by_user' => {
|
||||||
|
'id' => member.id,
|
||||||
|
'name' => member.name
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(latest.fetch('name')).to eq(
|
||||||
|
'current' => 'new_tag_name',
|
||||||
|
'prev' => 'old_tag_name'
|
||||||
|
)
|
||||||
|
expect(latest.fetch('category')).to eq(
|
||||||
|
'current' => 'meme',
|
||||||
|
'prev' => 'general'
|
||||||
|
)
|
||||||
|
expect(latest.fetch('aliases')).to include(
|
||||||
|
{ 'name' => 'alias_shared', 'type' => 'context' },
|
||||||
|
{ 'name' => 'alias_new', 'type' => 'added' },
|
||||||
|
{ 'name' => 'alias_old', 'type' => 'removed' }
|
||||||
|
)
|
||||||
|
expect(latest.fetch('parent_tags')).to include(
|
||||||
|
a_hash_including(
|
||||||
|
'type' => 'context',
|
||||||
|
'tag' => a_hash_including(
|
||||||
|
'id' => parent_shared.id
|
||||||
|
)
|
||||||
|
),
|
||||||
|
a_hash_including(
|
||||||
|
'type' => 'added',
|
||||||
|
'tag' => a_hash_including(
|
||||||
|
'id' => parent_new.id
|
||||||
|
)
|
||||||
|
),
|
||||||
|
a_hash_including(
|
||||||
|
'type' => 'removed',
|
||||||
|
'tag' => a_hash_including(
|
||||||
|
'id' => parent_old.id
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
expect(latest.fetch('created_at')).to eq(t_v2.iso8601)
|
||||||
|
|
||||||
|
first = versions.second
|
||||||
|
expect(first).to include(
|
||||||
|
'tag_id' => tag.id,
|
||||||
|
'version_no' => 1,
|
||||||
|
'event_type' => 'create',
|
||||||
|
'created_by_user' => {
|
||||||
|
'id' => member.id,
|
||||||
|
'name' => member.name
|
||||||
|
}
|
||||||
|
)
|
||||||
|
expect(first.fetch('name')).to eq(
|
||||||
|
'current' => 'old_tag_name',
|
||||||
|
'prev' => nil
|
||||||
|
)
|
||||||
|
expect(first.fetch('category')).to eq(
|
||||||
|
'current' => 'general',
|
||||||
|
'prev' => nil
|
||||||
|
)
|
||||||
|
expect(first.fetch('aliases')).to include(
|
||||||
|
{ 'name' => 'alias_shared', 'type' => 'added' },
|
||||||
|
{ 'name' => 'alias_old', 'type' => 'added' }
|
||||||
|
)
|
||||||
|
expect(first.fetch('parent_tags')).to include(
|
||||||
|
a_hash_including(
|
||||||
|
'type' => 'added',
|
||||||
|
'tag' => a_hash_including(
|
||||||
|
'id' => parent_shared.id
|
||||||
|
)
|
||||||
|
),
|
||||||
|
a_hash_including(
|
||||||
|
'type' => 'added',
|
||||||
|
'tag' => a_hash_including(
|
||||||
|
'id' => parent_old.id
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
expect(first.fetch('created_at')).to eq(t_v1.iso8601)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns empty when the specified tag has no versions' do
|
||||||
|
fresh_tag = create(:tag, name: 'no_versions_tag', category: :general)
|
||||||
|
|
||||||
|
get '/tags/versions', params: { id: fresh_tag.id }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.fetch('versions')).to eq([])
|
||||||
|
expect(json.fetch('count')).to eq(0)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'clamps page and limit to at least 1' do
|
||||||
|
get '/tags/versions', params: { id: tag.id, page: 0, limit: 0 }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.fetch('count')).to eq(2)
|
||||||
|
|
||||||
|
versions = json.fetch('versions')
|
||||||
|
expect(versions.size).to eq(1)
|
||||||
|
expect(versions.first['version_no']).to eq(2)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not create tag versions by wiki updates when tag has no versions yet' do
|
||||||
|
wiki_tag_name = TagName.create!(name: 'tag_versions_from_wiki')
|
||||||
|
wiki_tag = Tag.create!(tag_name: wiki_tag_name, category: :general)
|
||||||
|
|
||||||
|
wiki_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: wiki_tag_name,
|
||||||
|
body: 'before',
|
||||||
|
created_by_user: member,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
Wiki::Commit.content!(
|
||||||
|
page: wiki_page,
|
||||||
|
body: 'after',
|
||||||
|
created_user: member,
|
||||||
|
message: 'edit',
|
||||||
|
base_revision_id: wiki_page.current_revision.id)
|
||||||
|
|
||||||
|
get '/tags/versions', params: { id: wiki_tag.id }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.fetch('versions')).to eq([])
|
||||||
|
expect(json.fetch('count')).to eq(0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,160 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'Tag and wiki history integrity', type: :request do
|
||||||
|
let(:member_user) { create(:user, role: 'member') }
|
||||||
|
|
||||||
|
def stub_current_user user
|
||||||
|
allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_tag! name:, category: :general
|
||||||
|
tag_name = TagName.create!(name:)
|
||||||
|
Tag.create!(tag_name:, category:)
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_wiki_for_tag! tag:, body: 'wiki body', user: member_user
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: tag.tag_name,
|
||||||
|
body:,
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
stub_current_user(member_user)
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'PATCH /tags/:id' do
|
||||||
|
it 'records wiki_version when tag name changes and tag has wiki' do
|
||||||
|
tag = create_tag!(name: 'patch_tag_wiki_before')
|
||||||
|
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
patch "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'patch_tag_wiki_after',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(2)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
wiki_page.reload
|
||||||
|
version = wiki_page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(tag.name).to eq('patch_tag_wiki_after')
|
||||||
|
expect(wiki_page.title).to eq('patch_tag_wiki_after')
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'patch_tag_wiki_after',
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user_id: member_user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not record wiki_version when only category changes' do
|
||||||
|
tag = create_tag!(name: 'patch_tag_category_only')
|
||||||
|
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
||||||
|
|
||||||
|
before_wiki_versions = wiki_page.wiki_versions.count
|
||||||
|
|
||||||
|
expect {
|
||||||
|
patch "/tags/#{ tag.id }", params: {
|
||||||
|
category: 'meme',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
wiki_page.reload
|
||||||
|
|
||||||
|
expect(tag.name).to eq('patch_tag_category_only')
|
||||||
|
expect(tag.category).to eq('meme')
|
||||||
|
expect(wiki_page.wiki_versions.count).to eq(before_wiki_versions)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'PUT /tags/:id' do
|
||||||
|
it 'records wiki_version when tag name changes and tag has wiki' do
|
||||||
|
tag = create_tag!(name: 'put_tag_wiki_before')
|
||||||
|
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_tag_wiki_after',
|
||||||
|
category: 'general',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(2)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
wiki_page.reload
|
||||||
|
version = wiki_page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(tag.name).to eq('put_tag_wiki_after')
|
||||||
|
expect(wiki_page.title).to eq('put_tag_wiki_after')
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'put_tag_wiki_after',
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user_id: member_user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not record wiki_version when only category changes' do
|
||||||
|
tag = create_tag!(name: 'put_tag_category_only')
|
||||||
|
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
||||||
|
|
||||||
|
before_wiki_versions = wiki_page.wiki_versions.count
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_tag_category_only',
|
||||||
|
category: 'meme',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
wiki_page.reload
|
||||||
|
|
||||||
|
expect(tag.name).to eq('put_tag_category_only')
|
||||||
|
expect(tag.category).to eq('meme')
|
||||||
|
expect(wiki_page.wiki_versions.count).to eq(before_wiki_versions)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not record wiki_version when only aliases change' do
|
||||||
|
tag = create_tag!(name: 'put_tag_alias_only')
|
||||||
|
wiki_page = create_wiki_for_tag!(tag:, body: 'wiki body before')
|
||||||
|
|
||||||
|
before_wiki_versions = wiki_page.wiki_versions.count
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_tag_alias_only',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'put_tag_alias_only_alias',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_versions)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
require 'cgi'
|
require 'cgi'
|
||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
|
|
||||||
RSpec.describe 'Tags API', type: :request do
|
RSpec.describe 'Tags API', type: :request do
|
||||||
let!(:tn) { TagName.create!(name: 'spec_tag') }
|
let!(:tn) { TagName.create!(name: 'spec_tag') }
|
||||||
let!(:tag) { Tag.create!(tag_name: tn, category: :general) }
|
let!(:tag) { Tag.create!(tag_name: tn, category: :general) }
|
||||||
@@ -197,6 +196,30 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(response_tags.size).to eq(1)
|
expect(response_tags.size).to eq(1)
|
||||||
expect(response_names).to eq(['norm_a'])
|
expect(response_names).to eq(['norm_a'])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'returns aliases and parent tags' do
|
||||||
|
parent_tag = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'index_parent_tag'),
|
||||||
|
category: :meme
|
||||||
|
)
|
||||||
|
TagImplication.create!(tag:, parent_tag:)
|
||||||
|
|
||||||
|
get '/tags', params: { name: 'spec_tag' }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
row = response_tags.find { |t| t['name'] == 'spec_tag' }
|
||||||
|
|
||||||
|
expect(row['aliases']).to include('unko')
|
||||||
|
expect(row['parents'].map { |t| t['name'] }).to include('index_parent_tag')
|
||||||
|
|
||||||
|
parent = row['parents'].find { |t| t['name'] == 'index_parent_tag' }
|
||||||
|
expect(parent).to include(
|
||||||
|
'id' => parent_tag.id,
|
||||||
|
'name' => 'index_parent_tag',
|
||||||
|
'category' => 'meme'
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /tags/:id' do
|
describe 'GET /tags/:id' do
|
||||||
@@ -220,6 +243,28 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(json).to have_key('created_at')
|
expect(json).to have_key('created_at')
|
||||||
expect(json).to have_key('updated_at')
|
expect(json).to have_key('updated_at')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'returns aliases and parent tags' do
|
||||||
|
parent_tag = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'show_parent_tag'),
|
||||||
|
category: :character
|
||||||
|
)
|
||||||
|
TagImplication.create!(tag:, parent_tag:)
|
||||||
|
|
||||||
|
request
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
expect(json['aliases']).to include('unko')
|
||||||
|
expect(json['parents'].map { |t| t['name'] }).to include('show_parent_tag')
|
||||||
|
|
||||||
|
parent = json['parents'].find { |t| t['name'] == 'show_parent_tag' }
|
||||||
|
expect(parent).to include(
|
||||||
|
'id' => parent_tag.id,
|
||||||
|
'name' => 'show_parent_tag',
|
||||||
|
'category' => 'character'
|
||||||
|
)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when tag does not exist' do
|
context 'when tag does not exist' do
|
||||||
@@ -359,14 +404,120 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(tag.category).to eq('meta')
|
expect(tag.category).to eq('meta')
|
||||||
end
|
end
|
||||||
|
|
||||||
it '存在しない id だと RecordNotFound になる(通常は 404)' do
|
it '存在しない id なら 404 を返す' do
|
||||||
patch '/tags/999999999', params: { name: 'x' }
|
patch '/tags/999999999', params: { name: 'x' }
|
||||||
expect(response.status).to be_in([404, 500])
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'バリデーションで update! が失敗したら(通常は 422 か 500)' do
|
it 'nico category への変更は 422 を返す' do
|
||||||
patch "/tags/#{ tag.id }", params: { name: 'new', category: 'nico' }
|
patch "/tags/#{tag.id}", params: { name: 'new', category: 'nico' }
|
||||||
expect(response.status).to be_in([422, 500])
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(tag.reload.name).to eq('spec_tag')
|
||||||
|
expect(tag.category).to eq('general')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates initial and update tag versions when name and category change' do
|
||||||
|
expect {
|
||||||
|
patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' }
|
||||||
|
}.to change(TagVersion, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
versions = tag.reload.tag_versions.order(:version_no)
|
||||||
|
|
||||||
|
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
||||||
|
|
||||||
|
expect(versions.first.name).to eq('spec_tag')
|
||||||
|
expect(versions.first.category).to eq('general')
|
||||||
|
expect(versions.first.aliases.split).to include('unko')
|
||||||
|
|
||||||
|
expect(versions.second.name).to eq('new_tag_name')
|
||||||
|
expect(versions.second.category).to eq('meme')
|
||||||
|
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns 422 when changing normal tag category to nico' do
|
||||||
|
expect {
|
||||||
|
patch "/tags/#{tag.id}", params: { category: 'nico' }
|
||||||
|
}.not_to change(TagVersion, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(tag.reload.category).to eq('general')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns 422 when updating nico tag name' do
|
||||||
|
nico_tag_name = TagName.create!(name: 'nico:tags_spec_source')
|
||||||
|
nico_tag = Tag.create!(tag_name: nico_tag_name, category: :nico)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
patch "/tags/#{ nico_tag.id }", params: { name: 'nico:tags_spec_renamed' }
|
||||||
|
}.not_to change(NicoTagVersion, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
|
||||||
|
expect(nico_tag.reload.name).to eq('nico:tags_spec_source')
|
||||||
|
expect(nico_tag.category).to eq('nico')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns 422 when changing nico tag category to normal category' do
|
||||||
|
nico_tag_name = TagName.create!(name: 'nico:category_change_ng')
|
||||||
|
nico_tag = Tag.create!(tag_name: nico_tag_name, category: :nico)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
patch "/tags/#{nico_tag.id}", params: { category: 'general' }
|
||||||
|
}.not_to change(NicoTagVersion, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(nico_tag.reload.category).to eq('nico')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'PATCH で tag の name を変更すると対応する wiki version を作成する' do
|
||||||
|
wiki_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: tag.tag_name,
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user: member_user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
patch "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'patch_wiki_renamed_tag',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(2)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
version = wiki_page.reload.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'patch_wiki_renamed_tag',
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user_id: member_user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'tag の category だけを変更しても wiki version は作成しない' do
|
||||||
|
wiki_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: tag.tag_name,
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user: member_user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
before_wiki_version_count = wiki_page.reload.wiki_versions.count
|
||||||
|
|
||||||
|
expect {
|
||||||
|
patch "/tags/#{ tag.id }", params: {
|
||||||
|
category: 'meme',
|
||||||
|
}
|
||||||
|
}.to change(TagVersion, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_version_count)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -510,4 +661,397 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'PUT /tags/:id' do
|
||||||
|
context '未ログイン' do
|
||||||
|
before { stub_current_user(nil) }
|
||||||
|
|
||||||
|
it '401 を返す' do
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'new',
|
||||||
|
category: 'general',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unauthorized)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'ログインしてゐるが member でない' do
|
||||||
|
before { stub_current_user(non_member_user) }
|
||||||
|
|
||||||
|
it '403 を返す' do
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'new',
|
||||||
|
category: 'general',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:forbidden)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'member' do
|
||||||
|
before { stub_current_user(member_user) }
|
||||||
|
|
||||||
|
it '存在しない id なら 404 を返す' do
|
||||||
|
put '/tags/999999999', params: {
|
||||||
|
name: 'new',
|
||||||
|
category: 'general',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:not_found)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'name が空なら 422 を返す' do
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: '',
|
||||||
|
category: 'general',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(tag.reload.name).to eq('spec_tag')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'category が空なら 422 を返す' do
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'new',
|
||||||
|
category: '',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(tag.reload.name).to eq('spec_tag')
|
||||||
|
expect(tag.category).to eq('general')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'name, category, aliases, parent tags をまとめて更新できる' do
|
||||||
|
old_parent = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'put_old_parent'),
|
||||||
|
category: :general
|
||||||
|
)
|
||||||
|
kept_parent = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'put_kept_parent'),
|
||||||
|
category: :general
|
||||||
|
)
|
||||||
|
TagImplication.create!(tag:, parent_tag: old_parent)
|
||||||
|
TagImplication.create!(tag:, parent_tag: kept_parent)
|
||||||
|
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_renamed_tag',
|
||||||
|
category: 'meme',
|
||||||
|
aliases: 'put_alias_a put_alias_b put_alias_a',
|
||||||
|
parent_tags: 'put_kept_parent put_new_parent',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
|
||||||
|
expect(tag.name).to eq('put_renamed_tag')
|
||||||
|
expect(tag.category).to eq('meme')
|
||||||
|
|
||||||
|
expect(TagName.find_by(name: 'put_alias_a').canonical).to eq(tag.tag_name)
|
||||||
|
expect(TagName.find_by(name: 'put_alias_b').canonical).to eq(tag.tag_name)
|
||||||
|
|
||||||
|
old_name_alias = TagName.find_by(name: 'spec_tag')
|
||||||
|
expect(old_name_alias).to be_present
|
||||||
|
expect(old_name_alias.canonical).to eq(tag.tag_name)
|
||||||
|
|
||||||
|
expect(alias_tn.reload.canonical).to be_nil
|
||||||
|
|
||||||
|
expect(tag.parents.map(&:name)).to contain_exactly(
|
||||||
|
'put_kept_parent',
|
||||||
|
'put_new_parent'
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(TagImplication.where(tag:, parent_tag: old_parent)).not_to exist
|
||||||
|
|
||||||
|
expect(json['name']).to eq('put_renamed_tag')
|
||||||
|
expect(json['category']).to eq('meme')
|
||||||
|
expect(json['aliases']).to contain_exactly(
|
||||||
|
'put_alias_a',
|
||||||
|
'put_alias_b',
|
||||||
|
'spec_tag'
|
||||||
|
)
|
||||||
|
expect(json['parents'].map { |t| t['name'] }).to contain_exactly(
|
||||||
|
'put_kept_parent',
|
||||||
|
'put_new_parent'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'aliases に現在名を指定しても alias には残さない' do
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'spec_tag',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'spec_tag put_alias_self_test',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
|
||||||
|
expect(TagName.find_by(name: 'put_alias_self_test').canonical).to eq(tag.tag_name)
|
||||||
|
expect(json['aliases']).to include('put_alias_self_test')
|
||||||
|
expect(json['aliases']).not_to include('spec_tag')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'parent_tags に自分自身を指定しても自己参照は作らない' do
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'spec_tag',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: 'spec_tag',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
expect(TagImplication.where(tag:, parent_tag: tag)).not_to exist
|
||||||
|
expect(tag.reload.parents).to eq([])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'initial and update tag versions を作成する' do
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_versioned_tag',
|
||||||
|
category: 'meta',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}.to change(TagVersion, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
versions = tag.reload.tag_versions.order(:version_no)
|
||||||
|
|
||||||
|
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
||||||
|
|
||||||
|
expect(versions.first.name).to eq('spec_tag')
|
||||||
|
expect(versions.first.category).to eq('general')
|
||||||
|
expect(versions.first.aliases.split).to include('unko')
|
||||||
|
|
||||||
|
expect(versions.second.name).to eq('put_versioned_tag')
|
||||||
|
expect(versions.second.category).to eq('meta')
|
||||||
|
expect(versions.second.aliases.split).to include('spec_tag')
|
||||||
|
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'parent tag の snapshot も作成する' do
|
||||||
|
old_parent = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'put_snapshot_old_parent'),
|
||||||
|
category: :general
|
||||||
|
)
|
||||||
|
new_parent = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'put_snapshot_new_parent'),
|
||||||
|
category: :general
|
||||||
|
)
|
||||||
|
TagImplication.create!(tag:, parent_tag: old_parent)
|
||||||
|
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'spec_tag',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: new_parent.name,
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
expect(old_parent.reload.tag_versions.map(&:event_type)).to include('create')
|
||||||
|
expect(new_parent.reload.tag_versions.map(&:event_type)).to include('create')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'normal tag を nico category には変更できない' do
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'spec_tag',
|
||||||
|
category: 'nico',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}.not_to change(TagVersion, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
|
||||||
|
expect(tag.reload.name).to eq('spec_tag')
|
||||||
|
expect(tag.category).to eq('general')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'nico tag は更新できない' do
|
||||||
|
nico_tag = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'nico:put_update_all_ng'),
|
||||||
|
category: :nico
|
||||||
|
)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ nico_tag.id }", params: {
|
||||||
|
name: 'nico:put_update_all_renamed',
|
||||||
|
category: 'nico',
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}.not_to change(NicoTagVersion, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
|
||||||
|
expect(nico_tag.reload.name).to eq('nico:put_update_all_ng')
|
||||||
|
expect(nico_tag.category).to eq('nico')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'system tag の name は変更できない' do
|
||||||
|
system_tag = Tag.tagme
|
||||||
|
old_name = system_tag.name
|
||||||
|
old_category = system_tag.category
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ system_tag.id }", params: {
|
||||||
|
name: 'put_system_tag_renamed',
|
||||||
|
category: old_category,
|
||||||
|
aliases: '',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}.not_to change(TagVersion, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
|
||||||
|
expect(system_tag.reload.name).to eq(old_name)
|
||||||
|
expect(system_tag.category).to eq(old_category)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'wiki を持つ tag を更新すると wiki version も作成する' do
|
||||||
|
wiki_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: tag.tag_name,
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user: member_user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
Wiki::Commit.content!(
|
||||||
|
page: wiki_page,
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_user: member_user,
|
||||||
|
message: 'init'
|
||||||
|
)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_wiki_version_tag',
|
||||||
|
category: 'meme',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(2)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
version = wiki_page.reload.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'put_wiki_version_tag',
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user_id: member_user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it '別名を他 tag から奪った場合、奪はれた側の tag version も作成する' do
|
||||||
|
old_owner = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'put_alias_old_owner'),
|
||||||
|
category: :general
|
||||||
|
)
|
||||||
|
stolen_alias = TagName.create!(
|
||||||
|
name: 'put_stolen_alias',
|
||||||
|
canonical: old_owner.tag_name
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(old_owner.tag_name.aliases.map(&:name)).to include('put_stolen_alias')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'spec_tag',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko put_stolen_alias',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change { tag.reload.tag_versions.count }.by(2)
|
||||||
|
.and change { old_owner.reload.tag_versions.count }.by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
expect(stolen_alias.reload.canonical).to eq(tag.tag_name)
|
||||||
|
expect(old_owner.reload.tag_name.aliases.map(&:name)).not_to include('put_stolen_alias')
|
||||||
|
|
||||||
|
old_owner_versions = old_owner.tag_versions.order(:version_no)
|
||||||
|
|
||||||
|
expect(old_owner_versions.first.event_type).to eq('create')
|
||||||
|
expect(old_owner_versions.first.aliases.split).to include('put_stolen_alias')
|
||||||
|
|
||||||
|
expect(old_owner_versions.second.event_type).to eq('update')
|
||||||
|
expect(old_owner_versions.second.aliases.split).not_to include('put_stolen_alias')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'parent_tags に指定すると循環する tag は 422 にする' do
|
||||||
|
pending '#332 で対応予定'
|
||||||
|
|
||||||
|
child = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'put_cycle_child'),
|
||||||
|
category: :general
|
||||||
|
)
|
||||||
|
|
||||||
|
TagImplication.create!(tag: child, parent_tag: tag)
|
||||||
|
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'spec_tag',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: child.name,
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
|
||||||
|
expect(TagImplication.where(tag:, parent_tag: child)).not_to exist
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'tag の name を変更すると対応する wiki version を作成する' do
|
||||||
|
wiki_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: tag.tag_name,
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user: member_user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_wiki_renamed_tag',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: '',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(2)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
version = wiki_page.reload.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'put_wiki_renamed_tag',
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user_id: member_user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
require "rails_helper"
|
require "rails_helper"
|
||||||
|
|
||||||
|
|
||||||
RSpec.describe "Users", type: :request do
|
RSpec.describe "Users", type: :request do
|
||||||
describe "POST /users" do
|
describe "POST /users" do
|
||||||
it "creates guest user and returns code" do
|
it "creates guest user and returns code" do
|
||||||
post "/users"
|
post "/users"
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json["code"]).to be_present
|
expect(json["code"]).to be_present
|
||||||
expect(json["user"]["role"]).to eq("guest")
|
expect(json["user"]["role"]).to eq("guest")
|
||||||
end
|
end
|
||||||
@@ -38,7 +37,7 @@ RSpec.describe "Users", type: :request do
|
|||||||
sign_in_as(user)
|
sign_in_as(user)
|
||||||
put "/users/#{user.id}", params: { name: "new-name" }
|
put "/users/#{user.id}", params: { name: "new-name" }
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json["id"]).to eq(user.id)
|
expect(json["id"]).to eq(user.id)
|
||||||
expect(json["name"]).to eq("new-name")
|
expect(json["name"]).to eq("new-name")
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'Wiki body search', type: :request do
|
||||||
|
let!(:user) { create_member_user! }
|
||||||
|
|
||||||
|
it 'searches wiki pages by body text' do
|
||||||
|
pending '#336 で対応予定'
|
||||||
|
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: TagName.create!(name: 'wiki_body_search_hit'),
|
||||||
|
body: 'unique body keyword for wiki search',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: TagName.create!(name: 'wiki_body_search_miss'),
|
||||||
|
body: 'ordinary body',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
get '/wiki/search', params: { body: 'unique body keyword' }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json.map { |page| page['title'] }).to include('wiki_body_search_hit')
|
||||||
|
expect(json.map { |page| page['title'] }).not_to include('wiki_body_search_miss')
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'Wiki conflict handling', type: :request do
|
||||||
|
let!(:user) { create_member_user! }
|
||||||
|
|
||||||
|
def auth_headers user
|
||||||
|
{ 'X-Transfer-Code' => user.inheritance_code }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns 409 when base_revision_id is stale' do
|
||||||
|
page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: TagName.create!(name: 'wiki_conflict_request'),
|
||||||
|
body: 'first',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
stale_id = page.current_revision.id
|
||||||
|
|
||||||
|
Wiki::Commit.content!(
|
||||||
|
page:,
|
||||||
|
body: 'second',
|
||||||
|
created_user: user,
|
||||||
|
message: 'other edit',
|
||||||
|
base_revision_id: stale_id)
|
||||||
|
|
||||||
|
put "/wiki/#{ page.id }",
|
||||||
|
params: {
|
||||||
|
title: 'wiki_conflict_request',
|
||||||
|
body: 'third',
|
||||||
|
message: 'stale',
|
||||||
|
base_revision_id: stale_id,
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:conflict)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
expect(page.body).to eq('second')
|
||||||
|
expect(page.current_revision.message).to eq('other edit')
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,196 @@
|
|||||||
|
require 'cgi'
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'Wiki history integrity', type: :request do
|
||||||
|
let!(:user) { create_member_user! }
|
||||||
|
|
||||||
|
def auth_headers user
|
||||||
|
{ 'X-Transfer-Code' => user.inheritance_code }
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_wiki_page title:, body: 'body', message: 'init', user: self.user
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: TagName.create!(name: title),
|
||||||
|
body:,
|
||||||
|
created_by_user: user,
|
||||||
|
message:)
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'POST /wiki' do
|
||||||
|
it 'creates wiki_page, wiki_revision, and wiki_version atomically' do
|
||||||
|
expect {
|
||||||
|
post '/wiki',
|
||||||
|
params: {
|
||||||
|
title: 'wiki_history_create_atomic',
|
||||||
|
body: "a\nb\nc",
|
||||||
|
message: 'initial commit',
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
}
|
||||||
|
.to change(WikiPage, :count).by(1)
|
||||||
|
.and change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
|
page = WikiPage.find(json.fetch('id'))
|
||||||
|
revision = page.current_revision
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(page.title).to eq('wiki_history_create_atomic')
|
||||||
|
expect(page.body).to eq("a\nb\nc")
|
||||||
|
|
||||||
|
expect(revision).to be_content
|
||||||
|
expect(revision.message).to eq('initial commit')
|
||||||
|
expect(revision.lines_count).to eq(3)
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
title: 'wiki_history_create_atomic',
|
||||||
|
body: "a\nb\nc",
|
||||||
|
reason: 'initial commit',
|
||||||
|
created_by_user_id: user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns 422 and creates nothing when normalised body is blank' do
|
||||||
|
expect {
|
||||||
|
post '/wiki',
|
||||||
|
params: {
|
||||||
|
title: 'wiki_history_blank_body',
|
||||||
|
body: "\r\n\r\n",
|
||||||
|
message: 'blank',
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
}
|
||||||
|
.not_to change(WikiPage, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(WikiPage.joins(:tag_name).where(tag_names: { name: 'wiki_history_blank_body' })).not_to exist
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns 422 and creates no partial page when title already exists' do
|
||||||
|
create_wiki_page(title: 'wiki_history_duplicate_title', body: 'first')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post '/wiki',
|
||||||
|
params: {
|
||||||
|
title: 'wiki_history_duplicate_title',
|
||||||
|
body: 'second',
|
||||||
|
message: 'duplicate',
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
}
|
||||||
|
.not_to change(WikiPage, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(WikiPage.joins(:tag_name).where(tag_names: { name: 'wiki_history_duplicate_title' }).count).to eq(1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'PUT /wiki/:id' do
|
||||||
|
it 'updates body and records wiki_revision and wiki_version' do
|
||||||
|
page = create_wiki_page(title: 'wiki_history_update_body', body: 'before')
|
||||||
|
current_id = page.current_revision.id
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/wiki/#{ page.id }",
|
||||||
|
params: {
|
||||||
|
title: 'wiki_history_update_body',
|
||||||
|
body: 'after',
|
||||||
|
message: 'edit body',
|
||||||
|
base_revision_id: current_id,
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
}
|
||||||
|
.to change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(page.title).to eq('wiki_history_update_body')
|
||||||
|
expect(page.body).to eq('after')
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'wiki_history_update_body',
|
||||||
|
body: 'after',
|
||||||
|
reason: 'edit body',
|
||||||
|
created_by_user_id: user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'renames title and records wiki_version with new title' do
|
||||||
|
page = create_wiki_page(title: 'wiki_history_rename_before', body: 'before')
|
||||||
|
current_id = page.current_revision.id
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/wiki/#{ page.id }",
|
||||||
|
params: {
|
||||||
|
title: 'wiki_history_rename_after',
|
||||||
|
body: 'after',
|
||||||
|
message: 'rename',
|
||||||
|
base_revision_id: current_id,
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
}
|
||||||
|
.to change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(page.title).to eq('wiki_history_rename_after')
|
||||||
|
expect(page.body).to eq('after')
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'wiki_history_rename_after',
|
||||||
|
body: 'after',
|
||||||
|
reason: 'rename',
|
||||||
|
created_by_user_id: user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not change title, body, revision, or version on stale base_revision_id' do
|
||||||
|
page = create_wiki_page(title: 'wiki_history_conflict_page', body: 'first')
|
||||||
|
stale_id = page.current_revision.id
|
||||||
|
|
||||||
|
Wiki::Commit.content!(
|
||||||
|
page:,
|
||||||
|
body: 'second',
|
||||||
|
created_user: user,
|
||||||
|
message: 'other edit',
|
||||||
|
base_revision_id: stale_id)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
current_title = page.title
|
||||||
|
current_body = page.body
|
||||||
|
revision_count = page.wiki_revisions.count
|
||||||
|
version_count = page.wiki_versions.count
|
||||||
|
|
||||||
|
put "/wiki/#{ page.id }",
|
||||||
|
params: {
|
||||||
|
title: 'wiki_history_conflict_renamed',
|
||||||
|
body: 'third',
|
||||||
|
message: 'stale edit',
|
||||||
|
base_revision_id: stale_id,
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:conflict)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
expect(page.title).to eq(current_title)
|
||||||
|
expect(page.body).to eq(current_body)
|
||||||
|
expect(page.wiki_revisions.count).to eq(revision_count)
|
||||||
|
expect(page.wiki_versions.count).to eq(version_count)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'Wiki restore', type: :request do
|
||||||
|
let!(:user) { create_member_user! }
|
||||||
|
|
||||||
|
def auth_headers user
|
||||||
|
{ 'X-Transfer-Code' => user.inheritance_code }
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'restores wiki page to previous version' do
|
||||||
|
pending '#337 で対応予定'
|
||||||
|
|
||||||
|
page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: TagName.create!(name: 'wiki_restore_page'),
|
||||||
|
body: 'v1',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
v1 = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
Wiki::Commit.content!(
|
||||||
|
page:,
|
||||||
|
body: 'v2',
|
||||||
|
created_user: user,
|
||||||
|
message: 'edit',
|
||||||
|
base_revision_id: page.current_revision.id)
|
||||||
|
|
||||||
|
post "/wiki/#{ page.id }/restore",
|
||||||
|
params: { version_no: v1.version_no },
|
||||||
|
headers: auth_headers(user)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(page.reload.body).to eq('v1')
|
||||||
|
expect(page.wiki_versions.order(:version_no).last.event_type).to eq('restore')
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -4,13 +4,19 @@ require 'securerandom'
|
|||||||
|
|
||||||
|
|
||||||
RSpec.describe 'Wiki API', type: :request do
|
RSpec.describe 'Wiki API', type: :request do
|
||||||
|
def auth_headers(user)
|
||||||
|
{ 'X-Transfer-Code' => user.inheritance_code }
|
||||||
|
end
|
||||||
|
|
||||||
let!(:user) { create_member_user! }
|
let!(:user) { create_member_user! }
|
||||||
|
|
||||||
let!(:tn) { TagName.create!(name: 'spec_wiki_title') }
|
let!(:tn) { TagName.create!(name: 'spec_wiki_title') }
|
||||||
let!(:page) do
|
let!(:page) do
|
||||||
WikiPage.create!(tag_name: tn, created_user: user, updated_user: user).tap do |p|
|
Wiki::Commit.create_content!(
|
||||||
Wiki::Commit.content!(page: p, body: 'init', created_user: user, message: 'init')
|
tag_name: tn,
|
||||||
end
|
body: 'init',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /wiki' do
|
describe 'GET /wiki' do
|
||||||
@@ -37,11 +43,12 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
context 'when wiki page exists' do
|
context 'when wiki page exists' do
|
||||||
it 'returns wiki page with title' do
|
it 'returns wiki page with title' do
|
||||||
request
|
request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
expect(json).to include(
|
expect(json).to include(
|
||||||
'id' => page.id,
|
'id' => page.id,
|
||||||
'title' => 'spec_wiki_title')
|
'title' => 'spec_wiki_title')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -50,6 +57,7 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
|
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
request
|
request
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -99,25 +107,34 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
end
|
end
|
||||||
.to change(WikiPage, :count).by(1)
|
.to change(WikiPage, :count).by(1)
|
||||||
.and change(WikiRevision, :count).by(1)
|
.and change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
page_id = json.fetch('id')
|
page_id = json.fetch('id')
|
||||||
expect(json.fetch('title')).to eq('TestPage')
|
expect(json.fetch('title')).to eq('TestPage')
|
||||||
|
|
||||||
page = WikiPage.find(page_id)
|
created_page = WikiPage.find(page_id)
|
||||||
rev = page.current_revision
|
version = created_page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
version_no: 1,
|
||||||
|
event_type: 'create',
|
||||||
|
title: 'TestPage',
|
||||||
|
body: "a\nb\nc",
|
||||||
|
created_by_user_id: member.id
|
||||||
|
)
|
||||||
|
|
||||||
|
rev = created_page.current_revision
|
||||||
expect(rev).to be_present
|
expect(rev).to be_present
|
||||||
expect(rev).to be_content
|
expect(rev).to be_content
|
||||||
expect(rev.message).to eq('init')
|
expect(rev.message).to eq('init')
|
||||||
|
|
||||||
# body が復元できること
|
expect(created_page.body).to eq("a\nb\nc")
|
||||||
expect(page.body).to eq("a\nb\nc")
|
|
||||||
|
|
||||||
# 行数とリレーションの整合
|
|
||||||
expect(rev.lines_count).to eq(3)
|
expect(rev.lines_count).to eq(3)
|
||||||
expect(rev.wiki_revision_lines.order(:position).pluck(:position)).to eq([0, 1, 2])
|
expect(rev.wiki_revision_lines.order(:position).pluck(:position)).to eq([0, 1, 2])
|
||||||
expect(rev.wiki_lines.pluck(:body)).to match_array(%w[a b c])
|
expect(rev.wiki_lines.pluck(:body)).to match_array(['a', 'b', 'c'])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'reuses existing WikiLine rows by sha256' do
|
it 'reuses existing WikiLine rows by sha256' do
|
||||||
@@ -135,6 +152,41 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
# "a" の WikiLine が増殖しない(1行のはず)
|
# "a" の WikiLine が増殖しない(1行のはず)
|
||||||
expect(WikiLine.where(body: 'a').count).to eq(1)
|
expect(WikiLine.where(body: 'a').count).to eq(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'deduplicates duplicated new lines before upsert' do
|
||||||
|
duplicated = 'duplicated_line_for_wiki_line_upsert_spec'
|
||||||
|
|
||||||
|
post endpoint,
|
||||||
|
params: { title: 'DuplicateNewLine', body: "#{ duplicated }\n#{ duplicated }" },
|
||||||
|
headers: auth_headers(member)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
|
page = WikiPage.find(json.fetch('id'))
|
||||||
|
rev = page.current_revision
|
||||||
|
|
||||||
|
expect(rev.lines_count).to eq(2)
|
||||||
|
expect(WikiLine.where(body: duplicated).count).to eq(1)
|
||||||
|
expect(rev.wiki_revision_lines.count).to eq(2)
|
||||||
|
expect(rev.wiki_revision_lines.pluck(:wiki_line_id).uniq.size).to eq(1)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'normalises CRLF and strips trailing newlines' do
|
||||||
|
post endpoint,
|
||||||
|
params: { title: 'NormalisedBody', body: "a\r\nb\r\n\r\n", message: 'normalise' },
|
||||||
|
headers: auth_headers(member)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
|
page = WikiPage.find(json.fetch('id'))
|
||||||
|
rev = page.current_revision
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(page.body).to eq("a\nb")
|
||||||
|
expect(version.body).to eq("a\nb")
|
||||||
|
expect(rev.lines_count).to eq(2)
|
||||||
|
expect(rev.wiki_lines.order('wiki_revision_lines.position').map(&:body)).to eq(['a', 'b'])
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -146,17 +198,14 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
{ 'X-Transfer-Code' => user.inheritance_code }
|
||||||
end
|
end
|
||||||
|
|
||||||
#let!(:page) { create(:wiki_page, title: 'TestPage') }
|
let!(:test_tag_name) { TagName.create!(name: 'TestPage') }
|
||||||
let!(:page) do
|
|
||||||
build(:wiki_page, title: 'TestPage').tap do |p|
|
|
||||||
puts p.errors.full_messages unless p.valid?
|
|
||||||
p.save!
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
let!(:page) do
|
||||||
# 初期版を 1 つ作っておく(更新が“2版目”になるように)
|
Wiki::Commit.create_content!(
|
||||||
Wiki::Commit.content!(page: page, body: "a\nb", created_user: member, message: 'init')
|
tag_name: test_tag_name,
|
||||||
|
body: "a\nb",
|
||||||
|
created_by_user: member,
|
||||||
|
message: 'init')
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when not logged in' do
|
context 'when not logged in' do
|
||||||
@@ -182,14 +231,6 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
headers: auth_headers(member)
|
headers: auth_headers(member)
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 422 when title mismatched (if you forbid rename here)' do
|
|
||||||
put "/wiki/#{page.id}",
|
|
||||||
params: { title: 'OtherTitle', body: 'x' },
|
|
||||||
headers: auth_headers(member)
|
|
||||||
# 君の controller 例だと title 変更は 422 にしてた
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when success' do
|
context 'when success' do
|
||||||
@@ -200,7 +241,18 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
put "/wiki/#{page.id}",
|
put "/wiki/#{page.id}",
|
||||||
params: { title: 'TestPage', body: "x\ny", message: 'edit', base_revision_id: current_id },
|
params: { title: 'TestPage', body: "x\ny", message: 'edit', base_revision_id: current_id },
|
||||||
headers: auth_headers(member)
|
headers: auth_headers(member)
|
||||||
end.to change(WikiRevision, :count).by(1)
|
end
|
||||||
|
.to change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'TestPage',
|
||||||
|
body: "x\ny",
|
||||||
|
created_by_user_id: member.id
|
||||||
|
)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
@@ -211,25 +263,60 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
expect(page.body).to eq("x\ny")
|
expect(page.body).to eq("x\ny")
|
||||||
expect(rev.base_revision_id).to eq(current_id)
|
expect(rev.base_revision_id).to eq(current_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'wiki body だけを変更しても tag version は作成しない' do
|
||||||
|
linked_tag_name = TagName.create!(name: 'wiki_body_only_tag')
|
||||||
|
linked_tag = Tag.create!(tag_name: linked_tag_name, category: :general)
|
||||||
|
|
||||||
|
TagVersionRecorder.record!(
|
||||||
|
tag: linked_tag,
|
||||||
|
event_type: :create,
|
||||||
|
created_by_user: member)
|
||||||
|
|
||||||
|
linked_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: linked_tag_name,
|
||||||
|
body: 'before',
|
||||||
|
created_by_user: member,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
current_id = linked_page.current_revision.id
|
||||||
|
before_count = linked_tag.reload.tag_versions.count
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/wiki/#{ linked_page.id }",
|
||||||
|
params: {
|
||||||
|
title: 'wiki_body_only_tag',
|
||||||
|
body: 'after',
|
||||||
|
message: 'edit',
|
||||||
|
base_revision_id: current_id,
|
||||||
|
},
|
||||||
|
headers: auth_headers(member)
|
||||||
|
}
|
||||||
|
.to change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(linked_tag.reload.tag_versions.count).to eq(before_count)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# TODO: コンフリクト未実装のため,実装したらコメント外す.
|
context 'when conflict' do
|
||||||
# context 'when conflict' do
|
it 'returns 409 when base_revision_id mismatches' do
|
||||||
# it 'returns 409 when base_revision_id mismatches' do
|
# 先に別ユーザ(同じ member でもOK)が 1 回更新して先頭を進める
|
||||||
# # 先に別ユーザ(同じ member でもOK)が 1 回更新して先頭を進める
|
Wiki::Commit.content!(page: page, body: "zzz", created_user: member, message: 'other edit')
|
||||||
# Wiki::Commit.content!(page: page, body: "zzz", created_user: member, message: 'other edit')
|
page.reload
|
||||||
# page.reload
|
|
||||||
|
|
||||||
# stale_id = page.wiki_revisions.order(:id).first.id # わざと古い id
|
stale_id = page.wiki_revisions.order(:id).first.id # わざと古い id
|
||||||
# put "/wiki/#{page.id}",
|
put "/wiki/#{page.id}",
|
||||||
# params: { title: 'TestPage', body: 'x', base_revision_id: stale_id },
|
params: { title: 'TestPage', body: 'x', base_revision_id: stale_id },
|
||||||
# headers: auth_headers(member)
|
headers: auth_headers(member)
|
||||||
|
|
||||||
# expect(response).to have_http_status(:conflict)
|
expect(response).to have_http_status(:conflict)
|
||||||
# json = JSON.parse(response.body)
|
json = JSON.parse(response.body)
|
||||||
# expect(json['error']).to eq('conflict')
|
expect(json['error']).to eq('conflict')
|
||||||
# end
|
end
|
||||||
# end
|
end
|
||||||
|
|
||||||
context 'when page not found' do
|
context 'when page not found' do
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
@@ -261,14 +348,17 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
|
|
||||||
describe 'GET /wiki/search' do
|
describe 'GET /wiki/search' do
|
||||||
before do
|
before do
|
||||||
# 追加で検索ヒット用
|
Wiki::Commit.create_content!(
|
||||||
TagName.create!(name: 'spec_wiki_title_2')
|
tag_name: TagName.create!(name: 'spec_wiki_title_2'),
|
||||||
WikiPage.create!(tag_name: TagName.find_by!(name: 'spec_wiki_title_2'),
|
body: 'search body 2',
|
||||||
created_user: user, updated_user: user)
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
TagName.create!(name: 'unrelated_title')
|
Wiki::Commit.create_content!(
|
||||||
WikiPage.create!(tag_name: TagName.find_by!(name: 'unrelated_title'),
|
tag_name: TagName.create!(name: 'unrelated_title'),
|
||||||
created_user: user, updated_user: user)
|
body: 'unrelated body',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns up to 20 pages filtered by title like' do
|
it 'returns up to 20 pages filtered by title like' do
|
||||||
@@ -278,7 +368,9 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
expect(json).to be_an(Array)
|
expect(json).to be_an(Array)
|
||||||
|
|
||||||
titles = json.map { |p| p['title'] }
|
titles = json.map { |p| p['title'] }
|
||||||
expect(titles).to include('spec_wiki_title', 'spec_wiki_title_2')
|
|
||||||
|
expect(titles).to include('spec_wiki_title')
|
||||||
|
expect(titles).to include('spec_wiki_title_2')
|
||||||
expect(titles).not_to include('unrelated_title')
|
expect(titles).not_to include('unrelated_title')
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -329,7 +421,12 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
it 'returns empty array when page has no revisions and filtered by id' do
|
it 'returns empty array when page has no revisions and filtered by id' do
|
||||||
# 別ページを作って revision 無し
|
# 別ページを作って revision 無し
|
||||||
tn2 = TagName.create!(name: 'spec_no_rev')
|
tn2 = TagName.create!(name: 'spec_no_rev')
|
||||||
p2 = WikiPage.create!(tag_name: tn2, created_user: user, updated_user: user)
|
# 異常データ: revision 無し WikiPage を直接作る
|
||||||
|
p2 = WikiPage.create!(
|
||||||
|
tag_name: tn2,
|
||||||
|
body: 'init',
|
||||||
|
created_user: user,
|
||||||
|
updated_user: user)
|
||||||
|
|
||||||
get "/wiki/changes?id=#{p2.id}"
|
get "/wiki/changes?id=#{p2.id}"
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
@@ -398,29 +495,68 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
expect(json['older_revision_id']).to eq(rev_a.id)
|
expect(json['older_revision_id']).to eq(rev_a.id)
|
||||||
expect(json['newer_revision_id']).to eq(page.current_revision.id)
|
expect(json['newer_revision_id']).to eq(page.current_revision.id)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
it 'returns 422 when "to" is redirect revision' do
|
describe 'Wiki::Commit.redirect!' do
|
||||||
# redirect revision を作る
|
it 'raises because redirect revisions are deprecated' do
|
||||||
tn2 = TagName.create!(name: 'redirect_target')
|
target_tag_name = TagName.create!(name: 'redirect_deprecated_target')
|
||||||
target = WikiPage.create!(tag_name: tn2, created_user: user, updated_user: user)
|
target =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: target_tag_name,
|
||||||
|
body: 'target',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
Wiki::Commit.redirect!(page: page, redirect_page: target, created_user: user, message: 'redir')
|
expect {
|
||||||
redirect_rev = page.current_revision
|
Wiki::Commit.redirect!(
|
||||||
expect(redirect_rev).to be_redirect
|
page: page,
|
||||||
|
redirect_page: target,
|
||||||
get "/wiki/#{page.id}/diff?from=#{rev_a.id}&to=#{redirect_rev.id}"
|
created_user: user,
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
message: 'redirect',
|
||||||
end
|
base_revision_id: page.current_revision.id
|
||||||
|
)
|
||||||
it 'returns 422 when "from" is redirect revision' do
|
}.to raise_error(RuntimeError, '廃止しました.')
|
||||||
tn2 = TagName.create!(name: 'redirect_target2')
|
|
||||||
target = WikiPage.create!(tag_name: tn2, created_user: user, updated_user: user)
|
|
||||||
|
|
||||||
Wiki::Commit.redirect!(page: page, redirect_page: target, created_user: user, message: 'redir2')
|
|
||||||
redirect_rev = page.current_revision
|
|
||||||
|
|
||||||
get "/wiki/#{page.id}/diff?from=#{redirect_rev.id}&to=#{rev_b.id}"
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'wiki title を変更すると対応する tag の version を作成する' do
|
||||||
|
linked_tag_name = TagName.create!(name: 'wiki_linked_tag_for_version')
|
||||||
|
linked_tag = Tag.create!(tag_name: linked_tag_name, category: :general)
|
||||||
|
|
||||||
|
linked_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: linked_tag_name,
|
||||||
|
body: 'before',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
current_id = linked_page.current_revision.id
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/wiki/#{ linked_page.id }",
|
||||||
|
params: {
|
||||||
|
title: 'wiki_linked_tag_for_version_renamed',
|
||||||
|
body: 'after',
|
||||||
|
message: 'rename',
|
||||||
|
base_revision_id: current_id,
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
}
|
||||||
|
.to change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
.and change { linked_tag.reload.tag_versions.count }.by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
linked_tag.reload
|
||||||
|
expect(linked_tag.name).to eq('wiki_linked_tag_for_version_renamed')
|
||||||
|
|
||||||
|
versions = linked_tag.tag_versions.order(:version_no)
|
||||||
|
|
||||||
|
expect(versions.first.event_type).to eq('create')
|
||||||
|
expect(versions.first.name).to eq('wiki_linked_tag_for_version')
|
||||||
|
|
||||||
|
expect(versions.second.event_type).to eq('update')
|
||||||
|
expect(versions.second.name).to eq('wiki_linked_tag_for_version_renamed')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'Wiki title collision', type: :request do
|
||||||
|
let!(:user) { create_member_user! }
|
||||||
|
|
||||||
|
def auth_headers user
|
||||||
|
{ 'X-Transfer-Code' => user.inheritance_code }
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_wiki_page title:, body:
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: TagName.create!(name: title),
|
||||||
|
body:,
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns 422 when renaming wiki title to existing title' do
|
||||||
|
source = create_wiki_page(title: 'wiki_collision_source', body: 'source body')
|
||||||
|
create_wiki_page(title: 'wiki_collision_target', body: 'target body')
|
||||||
|
|
||||||
|
source_revision_count = source.wiki_revisions.count
|
||||||
|
source_version_count = source.wiki_versions.count
|
||||||
|
old_title = source.title
|
||||||
|
old_body = source.body
|
||||||
|
|
||||||
|
put "/wiki/#{ source.id }",
|
||||||
|
params: {
|
||||||
|
title: 'wiki_collision_target',
|
||||||
|
body: 'new body',
|
||||||
|
message: 'rename collision',
|
||||||
|
base_revision_id: source.current_revision.id,
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
|
||||||
|
source.reload
|
||||||
|
|
||||||
|
expect(source.title).to eq(old_title)
|
||||||
|
expect(source.body).to eq(old_body)
|
||||||
|
expect(source.wiki_revisions.count).to eq(source_revision_count)
|
||||||
|
expect(source.wiki_versions.count).to eq(source_version_count)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns 422 when creating wiki with existing title' do
|
||||||
|
create_wiki_page(title: 'wiki_collision_create', body: 'already exists')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post '/wiki',
|
||||||
|
params: {
|
||||||
|
title: 'wiki_collision_create',
|
||||||
|
body: 'new body',
|
||||||
|
message: 'duplicate create',
|
||||||
|
},
|
||||||
|
headers: auth_headers(user)
|
||||||
|
}
|
||||||
|
.not_to change(WikiPage, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,173 @@
|
|||||||
|
require 'digest'
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Wiki::Commit do
|
||||||
|
let(:user) { create_member_user! }
|
||||||
|
|
||||||
|
def create_page title:, body: 'initial body'
|
||||||
|
described_class.create_content!(
|
||||||
|
tag_name: TagName.create!(name: title),
|
||||||
|
body:,
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '.create_content!' do
|
||||||
|
it 'creates page, revision, and version with normalised body' do
|
||||||
|
expect {
|
||||||
|
described_class.create_content!(
|
||||||
|
tag_name: TagName.create!(name: 'commit_integrity_create'),
|
||||||
|
body: "a\r\nb\r\n\r\n",
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
}
|
||||||
|
.to change(WikiPage, :count).by(1)
|
||||||
|
.and change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
page = WikiPage.joins(:tag_name).find_by!(tag_names: { name: 'commit_integrity_create' })
|
||||||
|
revision = page.current_revision
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(page.body).to eq("a\nb")
|
||||||
|
expect(revision.lines_count).to eq(2)
|
||||||
|
expect(version.body).to eq("a\nb")
|
||||||
|
expect(version.reason).to eq('init')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'rejects body that becomes blank after normalisation' do
|
||||||
|
tag_name = TagName.create!(name: 'commit_integrity_blank')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.create_content!(
|
||||||
|
tag_name:,
|
||||||
|
body: "\r\n\r\n",
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'blank')
|
||||||
|
}
|
||||||
|
.to raise_error(ActiveRecord::RecordInvalid)
|
||||||
|
|
||||||
|
expect(WikiPage.where(tag_name:)).not_to exist
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '.content!' do
|
||||||
|
it 'updates page body, revision, and version' do
|
||||||
|
page = create_page(title: 'commit_integrity_update', body: 'before')
|
||||||
|
current_id = page.current_revision.id
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'after',
|
||||||
|
created_user: user,
|
||||||
|
message: 'edit',
|
||||||
|
base_revision_id: current_id)
|
||||||
|
}
|
||||||
|
.to change(WikiRevision, :count).by(1)
|
||||||
|
.and change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(page.body).to eq('after')
|
||||||
|
expect(version.body).to eq('after')
|
||||||
|
expect(version.reason).to eq('edit')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not record tag_version on body-only wiki update' do
|
||||||
|
tag_name = TagName.create!(name: 'commit_integrity_linked_tag')
|
||||||
|
tag = Tag.create!(tag_name:, category: :general)
|
||||||
|
|
||||||
|
page =
|
||||||
|
described_class.create_content!(
|
||||||
|
tag_name:,
|
||||||
|
body: 'before',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
TagVersionRecorder.record!(
|
||||||
|
tag:,
|
||||||
|
event_type: :create,
|
||||||
|
created_by_user: user)
|
||||||
|
|
||||||
|
before_count = tag.reload.tag_versions.count
|
||||||
|
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'after',
|
||||||
|
created_user: user,
|
||||||
|
message: 'edit',
|
||||||
|
base_revision_id: page.current_revision.id)
|
||||||
|
|
||||||
|
expect(tag.reload.tag_versions.count).to eq(before_count)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'raises conflict and leaves page, revision, and version unchanged' do
|
||||||
|
page = create_page(title: 'commit_integrity_conflict', body: 'first')
|
||||||
|
stale_id = page.current_revision.id
|
||||||
|
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'second',
|
||||||
|
created_user: user,
|
||||||
|
message: 'second',
|
||||||
|
base_revision_id: stale_id)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
before_body = page.body
|
||||||
|
before_revision_count = page.wiki_revisions.count
|
||||||
|
before_version_count = page.wiki_versions.count
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'third',
|
||||||
|
created_user: user,
|
||||||
|
message: 'stale',
|
||||||
|
base_revision_id: stale_id)
|
||||||
|
}
|
||||||
|
.to raise_error(Wiki::Commit::Conflict)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
expect(page.body).to eq(before_body)
|
||||||
|
expect(page.wiki_revisions.count).to eq(before_revision_count)
|
||||||
|
expect(page.wiki_versions.count).to eq(before_version_count)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'deduplicates duplicated missing wiki lines' do
|
||||||
|
page = create_page(title: 'commit_integrity_dedup', body: 'before')
|
||||||
|
duplicated = 'commit_integrity_duplicate_line'
|
||||||
|
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: "#{ duplicated }\n#{ duplicated }",
|
||||||
|
created_user: user,
|
||||||
|
message: 'dedup',
|
||||||
|
base_revision_id: page.current_revision.id)
|
||||||
|
|
||||||
|
revision = page.reload.current_revision
|
||||||
|
|
||||||
|
expect(WikiLine.where(body: duplicated).count).to eq(1)
|
||||||
|
expect(revision.wiki_revision_lines.count).to eq(2)
|
||||||
|
expect(revision.wiki_revision_lines.pluck(:wiki_line_id).uniq.size).to eq(1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '.redirect!' do
|
||||||
|
it 'raises because redirect revisions are deprecated' do
|
||||||
|
page = create_page(title: 'commit_integrity_redirect_source', body: 'source')
|
||||||
|
target = create_page(title: 'commit_integrity_redirect_target', body: 'target')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.redirect!(
|
||||||
|
page:,
|
||||||
|
redirect_page: target,
|
||||||
|
created_user: user,
|
||||||
|
message: 'redirect',
|
||||||
|
base_revision_id: page.current_revision.id)
|
||||||
|
}
|
||||||
|
.to raise_error(RuntimeError, '廃止しました.')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Wiki::Commit do
|
||||||
|
let(:user) { create_member_user! }
|
||||||
|
|
||||||
|
def create_page(title: 'commit_spec_page', body: 'initial body')
|
||||||
|
tag_name = TagName.create!(name: title)
|
||||||
|
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name:,
|
||||||
|
body:,
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '.content!' do
|
||||||
|
it 'stores normalised body in wiki_pages and wiki_versions' do
|
||||||
|
page = create_page(title: 'commit_normalised_page')
|
||||||
|
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: "a\r\nb\r\n\r\n",
|
||||||
|
created_user: user,
|
||||||
|
message: 'init'
|
||||||
|
)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(page.body).to eq("a\nb")
|
||||||
|
expect(version.body).to eq("a\nb")
|
||||||
|
expect(page.current_revision.lines_count).to eq(2)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'deduplicates duplicated missing wiki lines before upsert' do
|
||||||
|
page = create_page(title: 'commit_duplicate_line_page')
|
||||||
|
duplicated = 'commit_duplicate_line'
|
||||||
|
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: "#{ duplicated }\n#{ duplicated }",
|
||||||
|
created_user: user,
|
||||||
|
message: 'init'
|
||||||
|
)
|
||||||
|
|
||||||
|
page.reload
|
||||||
|
|
||||||
|
expect(WikiLine.where(body: duplicated).count).to eq(1)
|
||||||
|
expect(page.current_revision.lines_count).to eq(2)
|
||||||
|
expect(page.current_revision.wiki_revision_lines.count).to eq(2)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'raises conflict when base_revision_id is stale' do
|
||||||
|
page = create_page(title: 'commit_conflict_page')
|
||||||
|
|
||||||
|
first = described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'first',
|
||||||
|
created_user: user,
|
||||||
|
message: 'first'
|
||||||
|
)
|
||||||
|
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'second',
|
||||||
|
created_user: user,
|
||||||
|
message: 'second',
|
||||||
|
base_revision_id: first.id
|
||||||
|
)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'third',
|
||||||
|
created_user: user,
|
||||||
|
message: 'third',
|
||||||
|
base_revision_id: first.id
|
||||||
|
)
|
||||||
|
}.to raise_error(Wiki::Commit::Conflict)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not record tag version when corresponding tag has no versions' do
|
||||||
|
tag_name = TagName.create!(name: 'commit_linked_tag_without_versions')
|
||||||
|
tag = Tag.create!(tag_name:, category: :general)
|
||||||
|
|
||||||
|
page =
|
||||||
|
described_class.create_content!(
|
||||||
|
tag_name:,
|
||||||
|
body: 'before',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
expect(tag.reload.tag_versions.count).to eq(0)
|
||||||
|
|
||||||
|
current_revision_id = page.current_revision.id
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'after',
|
||||||
|
created_user: user,
|
||||||
|
message: 'edit',
|
||||||
|
base_revision_id: current_revision_id)
|
||||||
|
}.to change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(tag.reload.tag_versions.count).to eq(0)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not record tag version when corresponding tag has no versions' do
|
||||||
|
tag_name = TagName.create!(name: 'commit_linked_tag_without_versions')
|
||||||
|
tag = Tag.create!(tag_name:, category: :general)
|
||||||
|
|
||||||
|
page =
|
||||||
|
described_class.create_content!(
|
||||||
|
tag_name:,
|
||||||
|
body: 'before',
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
current_revision_id = page.current_revision.id
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.content!(
|
||||||
|
page:,
|
||||||
|
body: 'after',
|
||||||
|
created_user: user,
|
||||||
|
message: 'edit',
|
||||||
|
base_revision_id: current_revision_id)
|
||||||
|
}.to change(WikiVersion, :count).by(1)
|
||||||
|
|
||||||
|
expect(tag.reload.tag_versions.count).to eq(0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '.redirect!' do
|
||||||
|
it 'raises because redirect revisions are deprecated' do
|
||||||
|
page = create_page(title: 'commit_redirect_source')
|
||||||
|
target = create_page(title: 'commit_redirect_target')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.redirect!(
|
||||||
|
page:,
|
||||||
|
redirect_page: target,
|
||||||
|
created_user: user,
|
||||||
|
message: 'redirect'
|
||||||
|
)
|
||||||
|
}.to raise_error(RuntimeError, '廃止しました.')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe WikiVersionRecorder do
|
||||||
|
let(:user) { create_member_user! }
|
||||||
|
|
||||||
|
def create_page title:, body: 'body'
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: TagName.create!(name: title),
|
||||||
|
body:,
|
||||||
|
created_by_user: user,
|
||||||
|
message: 'init')
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '.record!' do
|
||||||
|
it 'records title, body, reason, user, and version number' do
|
||||||
|
page = create_page(title: 'wiki_version_recorder_basic', body: 'body')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.record!(
|
||||||
|
page:,
|
||||||
|
event_type: :update,
|
||||||
|
reason: 'manual reason',
|
||||||
|
created_by_user: user)
|
||||||
|
}
|
||||||
|
.to change { page.reload.wiki_versions.count }.by(1)
|
||||||
|
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version).to have_attributes(
|
||||||
|
version_no: 2,
|
||||||
|
event_type: 'update',
|
||||||
|
title: 'wiki_version_recorder_basic',
|
||||||
|
body: 'body',
|
||||||
|
reason: 'manual reason',
|
||||||
|
created_by_user_id: user.id
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not create duplicated update version for identical snapshot' do
|
||||||
|
page = create_page(title: 'wiki_version_recorder_duplicate', body: 'body')
|
||||||
|
|
||||||
|
described_class.record!(
|
||||||
|
page:,
|
||||||
|
event_type: :update,
|
||||||
|
reason: nil,
|
||||||
|
created_by_user: user)
|
||||||
|
|
||||||
|
before_count = page.reload.wiki_versions.count
|
||||||
|
|
||||||
|
described_class.record!(
|
||||||
|
page:,
|
||||||
|
event_type: :update,
|
||||||
|
reason: nil,
|
||||||
|
created_by_user: user)
|
||||||
|
|
||||||
|
expect(page.reload.wiki_versions.count).to eq(before_count)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates update version when title changes' do
|
||||||
|
page = create_page(title: 'wiki_version_recorder_title_before', body: 'body')
|
||||||
|
page.tag_name.update!(name: 'wiki_version_recorder_title_after')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.record!(
|
||||||
|
page:,
|
||||||
|
event_type: :update,
|
||||||
|
reason: 'rename',
|
||||||
|
created_by_user: user)
|
||||||
|
}
|
||||||
|
.to change { page.reload.wiki_versions.count }.by(1)
|
||||||
|
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version.title).to eq('wiki_version_recorder_title_after')
|
||||||
|
expect(version.body).to eq('body')
|
||||||
|
expect(version.reason).to eq('rename')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates update version when body changes' do
|
||||||
|
page = create_page(title: 'wiki_version_recorder_body', body: 'before')
|
||||||
|
page.update!(body: 'after')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
described_class.record!(
|
||||||
|
page:,
|
||||||
|
event_type: :update,
|
||||||
|
reason: 'body',
|
||||||
|
created_by_user: user)
|
||||||
|
}
|
||||||
|
.to change { page.reload.wiki_versions.count }.by(1)
|
||||||
|
|
||||||
|
version = page.wiki_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version.title).to eq('wiki_version_recorder_body')
|
||||||
|
expect(version.body).to eq('after')
|
||||||
|
expect(version.reason).to eq('body')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Youtube::ApiClient do
|
||||||
|
let(:api_key) { 'test-api-key' }
|
||||||
|
let(:client) { described_class.new(api_key:) }
|
||||||
|
|
||||||
|
describe '#search_videos' do
|
||||||
|
it 'calls YouTube search API with expected params' do
|
||||||
|
published_after = Time.zone.parse('2026-05-01 00:00:00')
|
||||||
|
published_before = Time.zone.parse('2026-05-02 00:00:00')
|
||||||
|
|
||||||
|
expect(client).to receive(:get_json).with(
|
||||||
|
'/search',
|
||||||
|
{
|
||||||
|
part: 'snippet',
|
||||||
|
type: 'video',
|
||||||
|
q: 'ぼざろクリーチャー',
|
||||||
|
order: 'date',
|
||||||
|
maxResults: 50,
|
||||||
|
regionCode: 'JP',
|
||||||
|
relevanceLanguage: 'ja',
|
||||||
|
publishedAfter: published_after.iso8601,
|
||||||
|
publishedBefore: published_before.iso8601,
|
||||||
|
pageToken: 'NEXT'
|
||||||
|
}
|
||||||
|
).and_return({ 'items' => [] })
|
||||||
|
|
||||||
|
client.search_videos(
|
||||||
|
q: 'ぼざろクリーチャー',
|
||||||
|
published_after:,
|
||||||
|
published_before:,
|
||||||
|
page_token: 'NEXT'
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'omits nil optional params' do
|
||||||
|
expect(client).to receive(:get_json).with(
|
||||||
|
'/search',
|
||||||
|
hash_excluding(:publishedAfter, :publishedBefore, :pageToken)
|
||||||
|
).and_return({ 'items' => [] })
|
||||||
|
|
||||||
|
client.search_videos(q: 'ぼざろクリーチャー')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#videos' do
|
||||||
|
it 'returns empty items when ids are empty' do
|
||||||
|
expect(client).not_to receive(:get_json)
|
||||||
|
|
||||||
|
expect(client.videos([])).to eq({ 'items' => [] })
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'calls videos API with comma separated ids' do
|
||||||
|
expect(client).to receive(:get_json).with(
|
||||||
|
'/videos',
|
||||||
|
{
|
||||||
|
part: 'snippet,status,contentDetails',
|
||||||
|
id: 'video-1,video-2'
|
||||||
|
}
|
||||||
|
).and_return({ 'items' => [] })
|
||||||
|
|
||||||
|
client.videos(['video-1', 'video-2'])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#playlist_items' do
|
||||||
|
it 'calls playlistItems API with page token' do
|
||||||
|
expect(client).to receive(:get_json).with(
|
||||||
|
'/playlistItems',
|
||||||
|
{
|
||||||
|
part: 'snippet,contentDetails,status',
|
||||||
|
playlistId: 'PL123',
|
||||||
|
maxResults: 50,
|
||||||
|
pageToken: 'NEXT'
|
||||||
|
}
|
||||||
|
).and_return({ 'items' => [] })
|
||||||
|
|
||||||
|
client.playlist_items(playlist_id: 'PL123', page_token: 'NEXT')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'omits page token when nil' do
|
||||||
|
expect(client).to receive(:get_json).with(
|
||||||
|
'/playlistItems',
|
||||||
|
{
|
||||||
|
part: 'snippet,contentDetails,status',
|
||||||
|
playlistId: 'PL123',
|
||||||
|
maxResults: 50
|
||||||
|
}
|
||||||
|
).and_return({ 'items' => [] })
|
||||||
|
|
||||||
|
client.playlist_items(playlist_id: 'PL123')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#channel' do
|
||||||
|
it 'calls channels API by id' do
|
||||||
|
expect(client).to receive(:get_json).with(
|
||||||
|
'/channels',
|
||||||
|
{
|
||||||
|
part: 'snippet,contentDetails',
|
||||||
|
id: 'UC123'
|
||||||
|
}
|
||||||
|
).and_return({ 'items' => [] })
|
||||||
|
|
||||||
|
client.channel(id: 'UC123')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'calls channels API by handle' do
|
||||||
|
expect(client).to receive(:get_json).with(
|
||||||
|
'/channels',
|
||||||
|
{
|
||||||
|
part: 'snippet,contentDetails',
|
||||||
|
forHandle: '@some_handle'
|
||||||
|
}
|
||||||
|
).and_return({ 'items' => [] })
|
||||||
|
|
||||||
|
client.channel(handle: '@some_handle')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'raises when neither id nor handle is given' do
|
||||||
|
expect { client.channel }.to raise_error(ArgumentError, 'id or handle is required')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'raises when both id and handle are given' do
|
||||||
|
expect do
|
||||||
|
client.channel(id: 'UC123', handle: '@some_handle')
|
||||||
|
end.to raise_error(ArgumentError, 'id or handle is required')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,310 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Youtube::Sync do
|
||||||
|
let(:client) { instance_double(Youtube::ApiClient) }
|
||||||
|
let(:sync) { described_class.new(client:) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
allow(PostVersionRecorder).to receive(:record!)
|
||||||
|
allow(PostVersionRecorder).to receive(:ensure_snapshot!)
|
||||||
|
allow(sync).to receive(:attach_thumbnail_if_needed!)
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#sync!' do
|
||||||
|
it 'returns without fetching video details when no video ids are discovered' do
|
||||||
|
allow(sync).to receive(:query_terms).and_return([])
|
||||||
|
allow(sync).to receive(:playlist_ids).and_return([])
|
||||||
|
|
||||||
|
expect(client).not_to receive(:videos)
|
||||||
|
|
||||||
|
sync.sync!
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'discovers ids from search and all playlist pages' do
|
||||||
|
allow(sync).to receive(:query_terms).and_return(['ぼざろクリーチャー'])
|
||||||
|
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||||
|
allow(sync).to receive(:sync_since).and_return(Time.zone.parse('2026-05-01 00:00:00'))
|
||||||
|
|
||||||
|
allow(client).to receive(:search_videos).with(
|
||||||
|
q: 'ぼざろクリーチャー',
|
||||||
|
published_after: Time.zone.parse('2026-05-01 00:00:00')
|
||||||
|
).and_return({
|
||||||
|
'items' => [
|
||||||
|
{
|
||||||
|
'id' => {
|
||||||
|
'videoId' => 'search-video-1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
allow(client).to receive(:playlist_items).with(
|
||||||
|
playlist_id: 'PL123',
|
||||||
|
page_token: nil
|
||||||
|
).and_return({
|
||||||
|
'items' => [
|
||||||
|
{
|
||||||
|
'contentDetails' => {
|
||||||
|
'videoId' => 'playlist-video-1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
'nextPageToken' => 'NEXT'
|
||||||
|
})
|
||||||
|
|
||||||
|
allow(client).to receive(:playlist_items).with(
|
||||||
|
playlist_id: 'PL123',
|
||||||
|
page_token: 'NEXT'
|
||||||
|
).and_return({
|
||||||
|
'items' => [
|
||||||
|
{
|
||||||
|
'snippet' => {
|
||||||
|
'resourceId' => {
|
||||||
|
'videoId' => 'playlist-video-2'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(client).to receive(:videos).with(
|
||||||
|
satisfy do |ids|
|
||||||
|
ids.sort == ['playlist-video-1', 'playlist-video-2', 'search-video-1']
|
||||||
|
end
|
||||||
|
).and_return({ 'items' => [] })
|
||||||
|
|
||||||
|
sync.sync!
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates a YouTube post with default tags and no_deerjikist when no deerjikist mapping exists' do
|
||||||
|
Tag.tagme
|
||||||
|
Tag.bot
|
||||||
|
Tag.youtube
|
||||||
|
Tag.video
|
||||||
|
Tag.no_deerjikist
|
||||||
|
|
||||||
|
allow(sync).to receive(:query_terms).and_return([])
|
||||||
|
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||||
|
|
||||||
|
allow(client).to receive(:playlist_items).with(
|
||||||
|
playlist_id: 'PL123',
|
||||||
|
page_token: nil
|
||||||
|
).and_return({
|
||||||
|
'items' => [
|
||||||
|
{
|
||||||
|
'contentDetails' => {
|
||||||
|
'videoId' => 'video-1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
allow(client).to receive(:videos).with(['video-1']).and_return({
|
||||||
|
'items' => [
|
||||||
|
youtube_video_item(
|
||||||
|
id: 'video-1',
|
||||||
|
title: 'YouTube テスト動画',
|
||||||
|
channel_id: 'UC_NO_MAPPING'
|
||||||
|
)
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
expect do
|
||||||
|
sync.sync!
|
||||||
|
end.to change(Post, :count).by(1)
|
||||||
|
|
||||||
|
post = Post.find_by!(url: 'https://www.youtube.com/watch?v=video-1')
|
||||||
|
tag_ids = post.tags.pluck(:id)
|
||||||
|
|
||||||
|
expect(post.title).to eq('YouTube テスト動画')
|
||||||
|
expect(post.uploaded_user_id).to be_nil
|
||||||
|
expect(post.original_created_from).to eq(Time.zone.parse('2026-05-01 12:34:00'))
|
||||||
|
expect(post.original_created_before).to eq(Time.zone.parse('2026-05-01 12:35:00'))
|
||||||
|
|
||||||
|
expect(tag_ids).to include(Tag.tagme.id)
|
||||||
|
expect(tag_ids).to include(Tag.bot.id)
|
||||||
|
expect(tag_ids).to include(Tag.youtube.id)
|
||||||
|
expect(tag_ids).to include(Tag.video.id)
|
||||||
|
expect(tag_ids).to include(Tag.no_deerjikist.id)
|
||||||
|
|
||||||
|
expect(PostVersionRecorder).to have_received(:record!).with(
|
||||||
|
post:,
|
||||||
|
event_type: :create,
|
||||||
|
created_by_user: nil
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'uses deerjikist tag when channel id is mapped' do
|
||||||
|
Tag.tagme
|
||||||
|
Tag.bot
|
||||||
|
Tag.youtube
|
||||||
|
Tag.video
|
||||||
|
Tag.no_deerjikist
|
||||||
|
|
||||||
|
deerjikist_tag = Tag.find_or_create_by_tag_name!('テスト投稿者', category: :deerjikist)
|
||||||
|
Deerjikist.create!(
|
||||||
|
platform: 'youtube',
|
||||||
|
code: 'UC_MAPPED',
|
||||||
|
tag: deerjikist_tag
|
||||||
|
)
|
||||||
|
|
||||||
|
allow(sync).to receive(:query_terms).and_return([])
|
||||||
|
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||||
|
|
||||||
|
allow(client).to receive(:playlist_items).with(
|
||||||
|
playlist_id: 'PL123',
|
||||||
|
page_token: nil
|
||||||
|
).and_return({
|
||||||
|
'items' => [
|
||||||
|
{
|
||||||
|
'contentDetails' => {
|
||||||
|
'videoId' => 'video-1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
allow(client).to receive(:videos).with(['video-1']).and_return({
|
||||||
|
'items' => [
|
||||||
|
youtube_video_item(
|
||||||
|
id: 'video-1',
|
||||||
|
title: 'YouTube テスト動画',
|
||||||
|
channel_id: 'UC_MAPPED'
|
||||||
|
)
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
sync.sync!
|
||||||
|
|
||||||
|
post = Post.find_by!(url: 'https://www.youtube.com/watch?v=video-1')
|
||||||
|
tag_ids = post.tags.pluck(:id)
|
||||||
|
|
||||||
|
expect(tag_ids).to include(deerjikist_tag.id)
|
||||||
|
expect(tag_ids).not_to include(Tag.no_deerjikist.id)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'removes no_deerjikist when deerjikist mapping is added later' do
|
||||||
|
Tag.no_deerjikist
|
||||||
|
|
||||||
|
post = Post.create!(
|
||||||
|
title: '旧タイトル',
|
||||||
|
url: 'https://www.youtube.com/watch?v=video-1',
|
||||||
|
uploaded_user_id: nil,
|
||||||
|
original_created_from: Time.zone.parse('2026-05-01 00:00:00'),
|
||||||
|
original_created_before: Time.zone.parse('2026-05-01 00:01:00')
|
||||||
|
)
|
||||||
|
PostTag.create!(post:, tag: Tag.no_deerjikist)
|
||||||
|
|
||||||
|
deerjikist_tag = Tag.find_or_create_by_tag_name!('後から判明した投稿者', category: :deerjikist)
|
||||||
|
Deerjikist.create!(
|
||||||
|
platform: 'youtube',
|
||||||
|
code: 'UC_MAPPED_LATER',
|
||||||
|
tag: deerjikist_tag
|
||||||
|
)
|
||||||
|
|
||||||
|
allow(sync).to receive(:query_terms).and_return([])
|
||||||
|
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||||
|
|
||||||
|
allow(client).to receive(:playlist_items).with(
|
||||||
|
playlist_id: 'PL123',
|
||||||
|
page_token: nil
|
||||||
|
).and_return({
|
||||||
|
'items' => [
|
||||||
|
{
|
||||||
|
'contentDetails' => {
|
||||||
|
'videoId' => 'video-1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
allow(client).to receive(:videos).with(['video-1']).and_return({
|
||||||
|
'items' => [
|
||||||
|
youtube_video_item(
|
||||||
|
id: 'video-1',
|
||||||
|
title: '新タイトル',
|
||||||
|
channel_id: 'UC_MAPPED_LATER'
|
||||||
|
)
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
sync.sync!
|
||||||
|
|
||||||
|
post.reload
|
||||||
|
tag_ids = post.tags.pluck(:id)
|
||||||
|
|
||||||
|
expect(post.title).to eq('新タイトル')
|
||||||
|
expect(tag_ids).to include(deerjikist_tag.id)
|
||||||
|
expect(tag_ids).not_to include(Tag.no_deerjikist.id)
|
||||||
|
|
||||||
|
expect(PostVersionRecorder).to have_received(:ensure_snapshot!).with(
|
||||||
|
post,
|
||||||
|
created_by_user: nil
|
||||||
|
)
|
||||||
|
expect(PostVersionRecorder).to have_received(:record!).with(
|
||||||
|
post:,
|
||||||
|
event_type: :update,
|
||||||
|
created_by_user: nil
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'matches existing youtu.be URL and does not create duplicate post' do
|
||||||
|
post = Post.create!(
|
||||||
|
title: '旧タイトル',
|
||||||
|
url: 'https://youtu.be/video-1',
|
||||||
|
uploaded_user_id: nil,
|
||||||
|
original_created_from: Time.zone.parse('2026-05-01 00:00:00'),
|
||||||
|
original_created_before: Time.zone.parse('2026-05-01 00:01:00')
|
||||||
|
)
|
||||||
|
|
||||||
|
allow(sync).to receive(:query_terms).and_return([])
|
||||||
|
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||||
|
|
||||||
|
allow(client).to receive(:playlist_items).with(
|
||||||
|
playlist_id: 'PL123',
|
||||||
|
page_token: nil
|
||||||
|
).and_return({
|
||||||
|
'items' => [
|
||||||
|
{
|
||||||
|
'contentDetails' => {
|
||||||
|
'videoId' => 'video-1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
allow(client).to receive(:videos).with(['video-1']).and_return({
|
||||||
|
'items' => [
|
||||||
|
youtube_video_item(
|
||||||
|
id: 'video-1',
|
||||||
|
title: '新タイトル',
|
||||||
|
channel_id: 'UC_NO_MAPPING'
|
||||||
|
)
|
||||||
|
]
|
||||||
|
})
|
||||||
|
|
||||||
|
expect do
|
||||||
|
sync.sync!
|
||||||
|
end.not_to change(Post, :count)
|
||||||
|
|
||||||
|
expect(post.reload.title).to eq('新タイトル')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def youtube_video_item(id:, title:, channel_id:)
|
||||||
|
{
|
||||||
|
'id' => id,
|
||||||
|
'snippet' => {
|
||||||
|
'title' => title,
|
||||||
|
'channelId' => channel_id,
|
||||||
|
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||||
|
'thumbnails' => {
|
||||||
|
'high' => {
|
||||||
|
'url' => "https://img.youtube.com/#{id}.jpg"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
'tags' => ['tag-a', 'tag-b']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Youtube::VideoItem do
|
||||||
|
describe '#initialize' do
|
||||||
|
it 'extracts fields from YouTube video API item' do
|
||||||
|
item = {
|
||||||
|
'id' => 'video-1',
|
||||||
|
'snippet' => {
|
||||||
|
'title' => 'テスト動画',
|
||||||
|
'channelId' => 'UC123',
|
||||||
|
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||||
|
'tags' => ['tag-a', 'tag-b'],
|
||||||
|
'thumbnails' => {
|
||||||
|
'high' => {
|
||||||
|
'url' => 'https://img.youtube.com/high.jpg'
|
||||||
|
},
|
||||||
|
'medium' => {
|
||||||
|
'url' => 'https://img.youtube.com/medium.jpg'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
video = described_class.new(item)
|
||||||
|
|
||||||
|
expect(video.id).to eq('video-1')
|
||||||
|
expect(video.title).to eq('テスト動画')
|
||||||
|
expect(video.channel_id).to eq('UC123')
|
||||||
|
expect(video.published_at).to eq(Time.iso8601('2026-05-01T12:34:56Z'))
|
||||||
|
expect(video.thumbnail_url).to eq('https://img.youtube.com/high.jpg')
|
||||||
|
expect(video.raw_tags).to eq(['tag-a', 'tag-b'])
|
||||||
|
expect(video.url).to eq('https://www.youtube.com/watch?v=video-1')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'uses highest priority thumbnail' do
|
||||||
|
item = {
|
||||||
|
'id' => 'video-1',
|
||||||
|
'snippet' => {
|
||||||
|
'title' => 'テスト動画',
|
||||||
|
'channelId' => 'UC123',
|
||||||
|
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||||
|
'thumbnails' => {
|
||||||
|
'default' => {
|
||||||
|
'url' => 'https://img.youtube.com/default.jpg'
|
||||||
|
},
|
||||||
|
'standard' => {
|
||||||
|
'url' => 'https://img.youtube.com/standard.jpg'
|
||||||
|
},
|
||||||
|
'maxres' => {
|
||||||
|
'url' => 'https://img.youtube.com/maxres.jpg'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
video = described_class.new(item)
|
||||||
|
|
||||||
|
expect(video.thumbnail_url).to eq('https://img.youtube.com/maxres.jpg')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'falls back to empty raw tags' do
|
||||||
|
item = {
|
||||||
|
'id' => 'video-1',
|
||||||
|
'snippet' => {
|
||||||
|
'title' => 'テスト動画',
|
||||||
|
'channelId' => 'UC123',
|
||||||
|
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||||
|
'thumbnails' => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
video = described_class.new(item)
|
||||||
|
|
||||||
|
expect(video.raw_tags).to eq([])
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'returns nil thumbnail when no thumbnail exists' do
|
||||||
|
item = {
|
||||||
|
'id' => 'video-1',
|
||||||
|
'snippet' => {
|
||||||
|
'title' => 'テスト動画',
|
||||||
|
'channelId' => 'UC123',
|
||||||
|
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||||
|
'thumbnails' => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
video = described_class.new(item)
|
||||||
|
|
||||||
|
expect(video.thumbnail_url).to be_nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
require 'rake'
|
||||||
|
require 'open3'
|
||||||
|
|
||||||
|
RSpec.describe 'nico:export' do
|
||||||
|
let(:task) { Rake::Task['nico:export'] }
|
||||||
|
let(:success_status) { instance_double(Process::Status, success?: true) }
|
||||||
|
let(:failure_status) { instance_double(Process::Status, success?: false) }
|
||||||
|
|
||||||
|
def create_post(url)
|
||||||
|
Post.create!(url:)
|
||||||
|
end
|
||||||
|
|
||||||
|
before(:all) do
|
||||||
|
Rails.application.load_tasks unless Rake::Task.task_defined?('nico:export')
|
||||||
|
end
|
||||||
|
|
||||||
|
before do
|
||||||
|
task.reenable
|
||||||
|
|
||||||
|
allow(ENV).to receive(:fetch).with('MYSQL_USER').and_return('mysql-user')
|
||||||
|
allow(ENV).to receive(:fetch).with('MYSQL_PASS').and_return('mysql-pass')
|
||||||
|
allow(ENV).to receive(:fetch).with('NIZIKA_NICO_PATH').and_return('/srv/nizika-nico')
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'export' do
|
||||||
|
it 'exports nicovideo ids to shared nico DB' do
|
||||||
|
create_post('https://www.nicovideo.jp/watch/sm12345?ref=foo')
|
||||||
|
create_post('https://www.nicovideo.jp/watch/so67890#comments')
|
||||||
|
create_post('https://www.nicovideo.jp/watch/nm24680')
|
||||||
|
create_post('https://example.com/watch/sm99999')
|
||||||
|
|
||||||
|
expect(Open3).to receive(:capture3) do |env, *args, **kwargs|
|
||||||
|
expect(env).to eq(
|
||||||
|
{
|
||||||
|
'MYSQL_USER' => 'mysql-user',
|
||||||
|
'MYSQL_PASS' => 'mysql-pass',
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(args.take(3)).to eq(
|
||||||
|
[
|
||||||
|
'python3',
|
||||||
|
'-m',
|
||||||
|
'tracked_videos.put_bulk_upsert',
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(args.drop(3)).to contain_exactly(
|
||||||
|
'sm12345',
|
||||||
|
'so67890',
|
||||||
|
'nm24680',
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(kwargs).to eq(chdir: '/srv/nizika-nico')
|
||||||
|
|
||||||
|
['', '', success_status]
|
||||||
|
end
|
||||||
|
|
||||||
|
task.invoke
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'deduplicates video ids' do
|
||||||
|
create_post('https://www.nicovideo.jp/watch/sm12345')
|
||||||
|
create_post('https://www.nicovideo.jp/watch/sm12345?from=1')
|
||||||
|
|
||||||
|
expect(Open3).to receive(:capture3) do |_env, *args, **_kwargs|
|
||||||
|
expect(args.drop(3)).to eq(['sm12345'])
|
||||||
|
|
||||||
|
['', '', success_status]
|
||||||
|
end
|
||||||
|
|
||||||
|
task.invoke
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not call python when there are no nicovideo posts' do
|
||||||
|
create_post('https://example.com/watch/sm12345')
|
||||||
|
|
||||||
|
expect(Open3).not_to receive(:capture3)
|
||||||
|
|
||||||
|
task.invoke
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'raises stderr when python command fails' do
|
||||||
|
create_post('https://www.nicovideo.jp/watch/sm12345')
|
||||||
|
|
||||||
|
allow(Open3).to receive(:capture3).and_return(
|
||||||
|
[
|
||||||
|
'',
|
||||||
|
'bulk upsert failed',
|
||||||
|
failure_status,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
task.invoke
|
||||||
|
}.to raise_error(RuntimeError, 'bulk upsert failed')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -90,4 +90,232 @@ RSpec.describe "nico:sync" do
|
|||||||
expect(active_names).to include("nico:NEW")
|
expect(active_names).to include("nico:NEW")
|
||||||
expect(active_names).not_to include("nico:OLD")
|
expect(active_names).not_to include("nico:OLD")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def snapshot_tags(post)
|
||||||
|
post.snapshot_tag_names.join(' ')
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
|
||||||
|
PostVersion.create!(
|
||||||
|
post: post,
|
||||||
|
version_no: version_no,
|
||||||
|
event_type: event_type,
|
||||||
|
title: post.title,
|
||||||
|
url: post.url,
|
||||||
|
thumbnail_base: post.thumbnail_base,
|
||||||
|
tags: snapshot_tags(post),
|
||||||
|
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
||||||
|
original_created_from: post.original_created_from,
|
||||||
|
original_created_before: post.original_created_before,
|
||||||
|
created_at: Time.current,
|
||||||
|
created_by_user: created_by_user
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
|
it '新規 post 作成時に version 1 を作る' do
|
||||||
|
Tag.bot
|
||||||
|
Tag.tagme
|
||||||
|
Tag.niconico
|
||||||
|
Tag.video
|
||||||
|
Tag.no_deerjikist
|
||||||
|
|
||||||
|
stub_python([{
|
||||||
|
'code' => 'sm9',
|
||||||
|
'title' => 't',
|
||||||
|
'tags' => ['AAA'],
|
||||||
|
'uploaded_at' => '2026-01-01 12:34:56'
|
||||||
|
}])
|
||||||
|
|
||||||
|
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
||||||
|
|
||||||
|
expect {
|
||||||
|
run_rake_task('nico:sync')
|
||||||
|
}.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
|
post = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm9')
|
||||||
|
version = post.post_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version.version_no).to eq(1)
|
||||||
|
expect(version.event_type).to eq('create')
|
||||||
|
expect(version.created_by_user).to be_nil
|
||||||
|
expect(version.tags).to eq(snapshot_tags(post.reload))
|
||||||
|
end
|
||||||
|
|
||||||
|
it '既存 post の内容または tags が変わったとき update version を作る' do
|
||||||
|
post = Post.create!(
|
||||||
|
title: 'old',
|
||||||
|
url: 'https://www.nicovideo.jp/watch/sm9',
|
||||||
|
uploaded_user: nil
|
||||||
|
)
|
||||||
|
|
||||||
|
kept_general = create_tag!('spec_kept', category: 'general')
|
||||||
|
PostTag.create!(post: post, tag: kept_general)
|
||||||
|
create_post_version_for!(post)
|
||||||
|
|
||||||
|
linked = create_tag!('spec_linked', category: 'general')
|
||||||
|
nico = create_tag!('nico:AAA', category: 'nico')
|
||||||
|
link_nico_to_tag!(nico, linked)
|
||||||
|
|
||||||
|
Tag.bot
|
||||||
|
Tag.tagme
|
||||||
|
Tag.no_deerjikist
|
||||||
|
|
||||||
|
stub_python([{
|
||||||
|
'code' => 'sm9',
|
||||||
|
'title' => 't',
|
||||||
|
'tags' => ['AAA'],
|
||||||
|
'uploaded_at' => '2026-01-01 12:34:56'
|
||||||
|
}])
|
||||||
|
|
||||||
|
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
||||||
|
|
||||||
|
expect {
|
||||||
|
run_rake_task('nico:sync')
|
||||||
|
}.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
|
version = post.reload.post_versions.order(:version_no).last
|
||||||
|
expect(version.version_no).to eq(2)
|
||||||
|
expect(version.event_type).to eq('update')
|
||||||
|
expect(version.created_by_user).to be_nil
|
||||||
|
expect(version.tags).to eq(snapshot_tags(post.reload))
|
||||||
|
end
|
||||||
|
|
||||||
|
it '既存 post に差分が無いときは新しい version を作らない' do
|
||||||
|
nico = create_tag!('nico:AAA', category: 'nico')
|
||||||
|
no_deerjikist = create_tag!('ニジラー情報不詳', category: 'meta')
|
||||||
|
|
||||||
|
post = Post.create!(
|
||||||
|
title: 't',
|
||||||
|
url: 'https://www.nicovideo.jp/watch/sm9',
|
||||||
|
uploaded_user: nil,
|
||||||
|
original_created_from: Time.iso8601('2026-01-01T03:34:00Z'),
|
||||||
|
original_created_before: Time.iso8601('2026-01-01T03:35:00Z')
|
||||||
|
)
|
||||||
|
|
||||||
|
PostTag.create!(post: post, tag: nico)
|
||||||
|
PostTag.create!(post: post, tag: no_deerjikist)
|
||||||
|
create_post_version_for!(post)
|
||||||
|
|
||||||
|
stub_python([{
|
||||||
|
'code' => 'sm9',
|
||||||
|
'title' => 't',
|
||||||
|
'tags' => ['AAA'],
|
||||||
|
'uploaded_at' => '2026-01-01 12:34:56'
|
||||||
|
}])
|
||||||
|
|
||||||
|
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
||||||
|
|
||||||
|
expect {
|
||||||
|
run_rake_task('nico:sync')
|
||||||
|
}.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
|
version = post.reload.post_versions.order(:version_no).last
|
||||||
|
expect(version.version_no).to eq(1)
|
||||||
|
expect(version.event_type).to eq('create')
|
||||||
|
expect(version.tags).to eq(snapshot_tags(post.reload))
|
||||||
|
end
|
||||||
|
|
||||||
|
it '新規 nico tag に nico tag version を作る' do
|
||||||
|
Tag.bot
|
||||||
|
Tag.tagme
|
||||||
|
Tag.niconico
|
||||||
|
Tag.video
|
||||||
|
Tag.no_deerjikist
|
||||||
|
|
||||||
|
stub_python([{
|
||||||
|
'code' => 'sm9',
|
||||||
|
'title' => 't',
|
||||||
|
'tags' => ['AAA'],
|
||||||
|
'uploaded_at' => '2026-01-01 12:34:56'
|
||||||
|
}])
|
||||||
|
|
||||||
|
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
||||||
|
|
||||||
|
expect {
|
||||||
|
run_rake_task('nico:sync')
|
||||||
|
}.to change(NicoTagVersion, :count).by(1)
|
||||||
|
|
||||||
|
nico_tag = Tag.joins(:tag_name).find_by!(tag_names: { name: 'nico:AAA' })
|
||||||
|
version = nico_tag.nico_tag_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version.version_no).to eq(1)
|
||||||
|
expect(version.event_type).to eq('create')
|
||||||
|
expect(version.name).to eq('nico:AAA')
|
||||||
|
expect(version.created_by_user).to be_nil
|
||||||
|
end
|
||||||
|
|
||||||
|
it '既存 post に version が無い場合は create snapshot を補う' do
|
||||||
|
post = Post.create!(
|
||||||
|
title: 'old',
|
||||||
|
url: 'https://www.nicovideo.jp/watch/sm9',
|
||||||
|
uploaded_user: nil
|
||||||
|
)
|
||||||
|
|
||||||
|
kept_general = create_tag!('spec_kept_without_version', category: 'general')
|
||||||
|
PostTag.create!(post: post, tag: kept_general)
|
||||||
|
|
||||||
|
Tag.bot
|
||||||
|
Tag.tagme
|
||||||
|
Tag.no_deerjikist
|
||||||
|
|
||||||
|
stub_python([{
|
||||||
|
'code' => 'sm9',
|
||||||
|
'title' => 'changed title',
|
||||||
|
'tags' => ['AAA'],
|
||||||
|
'uploaded_at' => '2026-01-01 12:34:56'
|
||||||
|
}])
|
||||||
|
|
||||||
|
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
||||||
|
|
||||||
|
expect {
|
||||||
|
run_rake_task('nico:sync')
|
||||||
|
}.to change { post.reload.post_versions.count }.by(1)
|
||||||
|
|
||||||
|
versions = post.reload.post_versions.order(:version_no)
|
||||||
|
|
||||||
|
expect(versions.map(&:event_type)).to eq(['create'])
|
||||||
|
expect(versions.first.title).to eq('changed title')
|
||||||
|
expect(versions.first.tags).to eq(snapshot_tags(post.reload))
|
||||||
|
end
|
||||||
|
|
||||||
|
it '既存 version がある post には update version を作る' do
|
||||||
|
post = Post.create!(
|
||||||
|
title: 'old',
|
||||||
|
url: 'https://www.nicovideo.jp/watch/sm9',
|
||||||
|
uploaded_user: nil
|
||||||
|
)
|
||||||
|
|
||||||
|
kept_general = create_tag!('spec_kept_with_version', category: 'general')
|
||||||
|
PostTag.create!(post: post, tag: kept_general)
|
||||||
|
|
||||||
|
PostVersionRecorder.record!(
|
||||||
|
post: post,
|
||||||
|
event_type: :create,
|
||||||
|
created_by_user: nil
|
||||||
|
)
|
||||||
|
|
||||||
|
Tag.bot
|
||||||
|
Tag.tagme
|
||||||
|
Tag.no_deerjikist
|
||||||
|
|
||||||
|
stub_python([{
|
||||||
|
'code' => 'sm9',
|
||||||
|
'title' => 'changed title',
|
||||||
|
'tags' => ['AAA'],
|
||||||
|
'uploaded_at' => '2026-01-01 12:34:56'
|
||||||
|
}])
|
||||||
|
|
||||||
|
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
|
||||||
|
|
||||||
|
expect {
|
||||||
|
run_rake_task('nico:sync')
|
||||||
|
}.to change { post.reload.post_versions.count }.by(1)
|
||||||
|
|
||||||
|
versions = post.reload.post_versions.order(:version_no)
|
||||||
|
|
||||||
|
expect(versions.map(&:event_type)).to eq(['create', 'update'])
|
||||||
|
expect(versions.first.title).to eq('old')
|
||||||
|
expect(versions.second.title).to eq('changed title')
|
||||||
|
expect(versions.second.tags).to eq(snapshot_tags(post.reload))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
require 'rake'
|
||||||
|
|
||||||
|
RSpec.describe 'post:sync' do
|
||||||
|
around do |example|
|
||||||
|
original_application = Rake.application
|
||||||
|
Rake.application = Rake::Application.new
|
||||||
|
|
||||||
|
Rake::Task.define_task(:environment)
|
||||||
|
load Rails.root.join('lib/tasks/sync_posts.rake')
|
||||||
|
|
||||||
|
example.run
|
||||||
|
ensure
|
||||||
|
Rake.application = original_application
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'runs Youtube::Sync' do
|
||||||
|
sync = instance_double(Youtube::Sync)
|
||||||
|
|
||||||
|
expect(Youtube::Sync).to receive(:new).once.and_return(sync)
|
||||||
|
expect(sync).to receive(:sync!).once
|
||||||
|
|
||||||
|
Rake::Task['post:sync'].invoke
|
||||||
|
end
|
||||||
|
end
|
||||||
Generated
+925
-181
File diff suppressed because it is too large
Load Diff
@@ -15,6 +15,8 @@
|
|||||||
"@dnd-kit/modifiers": "^9.0.0",
|
"@dnd-kit/modifiers": "^9.0.0",
|
||||||
"@dnd-kit/utilities": "^3.2.2",
|
"@dnd-kit/utilities": "^3.2.2",
|
||||||
"@fontsource-variable/noto-sans-jp": "^5.2.9",
|
"@fontsource-variable/noto-sans-jp": "^5.2.9",
|
||||||
|
"@mdx-js/react": "^3.1.1",
|
||||||
|
"@mdx-js/rollup": "^3.1.1",
|
||||||
"@radix-ui/react-dialog": "^1.1.14",
|
"@radix-ui/react-dialog": "^1.1.14",
|
||||||
"@radix-ui/react-switch": "^1.2.5",
|
"@radix-ui/react-switch": "^1.2.5",
|
||||||
"@radix-ui/react-toast": "^1.2.14",
|
"@radix-ui/react-toast": "^1.2.14",
|
||||||
@@ -37,13 +39,15 @@
|
|||||||
"react-youtube": "^10.1.0",
|
"react-youtube": "^10.1.0",
|
||||||
"remark-gfm": "^4.0.1",
|
"remark-gfm": "^4.0.1",
|
||||||
"tailwind-merge": "^3.3.0",
|
"tailwind-merge": "^3.3.0",
|
||||||
"zustand": "^5.0.8",
|
"unist-util-visit-parents": "^6.0.1",
|
||||||
"unist-util-visit-parents": "^6.0.1"
|
"zustand": "^5.0.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.25.0",
|
"@eslint/js": "^9.25.0",
|
||||||
|
"@tailwindcss/typography": "^0.5.19",
|
||||||
"@types/axios": "^0.14.4",
|
"@types/axios": "^0.14.4",
|
||||||
"@types/markdown-it": "^14.1.2",
|
"@types/markdown-it": "^14.1.2",
|
||||||
|
"@types/mdx": "^2.0.13",
|
||||||
"@types/node": "^24.0.13",
|
"@types/node": "^24.0.13",
|
||||||
"@types/react": "^19.1.2",
|
"@types/react": "^19.1.2",
|
||||||
"@types/react-dom": "^19.1.2",
|
"@types/react-dom": "^19.1.2",
|
||||||
|
|||||||
+46
-35
@@ -1,4 +1,4 @@
|
|||||||
import { AnimatePresence, LayoutGroup } from 'framer-motion'
|
import { AnimatePresence, LayoutGroup, motion } from 'framer-motion'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { BrowserRouter,
|
import { BrowserRouter,
|
||||||
Navigate,
|
Navigate,
|
||||||
@@ -15,8 +15,10 @@ import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
|
|||||||
import MaterialListPage from '@/pages/materials/MaterialListPage'
|
import MaterialListPage from '@/pages/materials/MaterialListPage'
|
||||||
import MaterialNewPage from '@/pages/materials/MaterialNewPage'
|
import MaterialNewPage from '@/pages/materials/MaterialNewPage'
|
||||||
// import MaterialSearchPage from '@/pages/materials/MaterialSearchPage'
|
// import MaterialSearchPage from '@/pages/materials/MaterialSearchPage'
|
||||||
|
import MorePage from '@/pages/MorePage'
|
||||||
import NicoTagListPage from '@/pages/tags/NicoTagListPage'
|
import NicoTagListPage from '@/pages/tags/NicoTagListPage'
|
||||||
import NotFound from '@/pages/NotFound'
|
import NotFound from '@/pages/NotFound'
|
||||||
|
import TOSPage from '@/pages/TOSPage.mdx'
|
||||||
import PostDetailPage from '@/pages/posts/PostDetailPage'
|
import PostDetailPage from '@/pages/posts/PostDetailPage'
|
||||||
import PostHistoryPage from '@/pages/posts/PostHistoryPage'
|
import PostHistoryPage from '@/pages/posts/PostHistoryPage'
|
||||||
import PostListPage from '@/pages/posts/PostListPage'
|
import PostListPage from '@/pages/posts/PostListPage'
|
||||||
@@ -24,6 +26,8 @@ import PostNewPage from '@/pages/posts/PostNewPage'
|
|||||||
import PostSearchPage from '@/pages/posts/PostSearchPage'
|
import PostSearchPage from '@/pages/posts/PostSearchPage'
|
||||||
import ServiceUnavailable from '@/pages/ServiceUnavailable'
|
import ServiceUnavailable from '@/pages/ServiceUnavailable'
|
||||||
import SettingPage from '@/pages/users/SettingPage'
|
import SettingPage from '@/pages/users/SettingPage'
|
||||||
|
import TagDetailPage from '@/pages/tags/TagDetailPage'
|
||||||
|
import TagHistoryPage from '@/pages/tags/TagHistoryPage'
|
||||||
import TagListPage from '@/pages/tags/TagListPage'
|
import TagListPage from '@/pages/tags/TagListPage'
|
||||||
import TheatreDetailPage from '@/pages/theatres/TheatreDetailPage'
|
import TheatreDetailPage from '@/pages/theatres/TheatreDetailPage'
|
||||||
import WikiDetailPage from '@/pages/wiki/WikiDetailPage'
|
import WikiDetailPage from '@/pages/wiki/WikiDetailPage'
|
||||||
@@ -44,36 +48,38 @@ const RouteTransitionWrapper = ({ user, setUser }: {
|
|||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<LayoutGroup id="gallery-shared">
|
<AnimatePresence mode="wait">
|
||||||
<AnimatePresence mode="wait">
|
<Routes location={location}>
|
||||||
<Routes location={location}>
|
<Route path="/" element={<Navigate to="/posts" replace/>}/>
|
||||||
<Route path="/" element={<Navigate to="/posts" replace/>}/>
|
<Route path="/posts" element={<PostListPage/>}/>
|
||||||
<Route path="/posts" element={<PostListPage/>}/>
|
<Route path="/posts/new" element={<PostNewPage user={user}/>}/>
|
||||||
<Route path="/posts/new" element={<PostNewPage user={user}/>}/>
|
<Route path="/posts/search" element={<PostSearchPage/>}/>
|
||||||
<Route path="/posts/search" element={<PostSearchPage/>}/>
|
<Route path="/posts/:id" element={<PostDetailRoute user={user}/>}/>
|
||||||
<Route path="/posts/:id" element={<PostDetailRoute user={user}/>}/>
|
<Route path="/posts/changes" element={<PostHistoryPage/>}/>
|
||||||
<Route path="/posts/changes" element={<PostHistoryPage/>}/>
|
<Route path="/tags" element={<TagListPage/>}/>
|
||||||
<Route path="/tags" element={<TagListPage/>}/>
|
<Route path="/tags/:id" element={<TagDetailPage/>}/>
|
||||||
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
|
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
|
||||||
<Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
|
<Route path="/tags/changes" element={<TagHistoryPage/>}/>
|
||||||
<Route path="/materials" element={<MaterialBasePage/>}>
|
<Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
|
||||||
<Route index element={<MaterialListPage/>}/>
|
<Route path="/materials" element={<MaterialBasePage/>}>
|
||||||
<Route path="new" element={<MaterialNewPage/>}/>
|
<Route index element={<MaterialListPage/>}/>
|
||||||
<Route path=":id" element ={<MaterialDetailPage/>}/>
|
<Route path="new" element={<MaterialNewPage/>}/>
|
||||||
</Route>
|
<Route path=":id" element ={<MaterialDetailPage/>}/>
|
||||||
{/* <Route path="/materials/search" element={<MaterialSearchPage/>}/> */}
|
</Route>
|
||||||
<Route path="/wiki" element={<WikiSearchPage/>}/>
|
{/* <Route path="/materials/search" element={<MaterialSearchPage/>}/> */}
|
||||||
<Route path="/wiki/:title" element={<WikiDetailPage/>}/>
|
<Route path="/wiki" element={<WikiSearchPage/>}/>
|
||||||
<Route path="/wiki/new" element={<WikiNewPage user={user}/>}/>
|
<Route path="/wiki/:title" element={<WikiDetailPage/>}/>
|
||||||
<Route path="/wiki/:id/edit" element={<WikiEditPage user={user}/>}/>
|
<Route path="/wiki/new" element={<WikiNewPage user={user}/>}/>
|
||||||
<Route path="/wiki/:id/diff" element={<WikiDiffPage/>}/>
|
<Route path="/wiki/:id/edit" element={<WikiEditPage user={user}/>}/>
|
||||||
<Route path="/wiki/changes" element={<WikiHistoryPage/>}/>
|
<Route path="/wiki/:id/diff" element={<WikiDiffPage/>}/>
|
||||||
<Route path="/users/settings" element={<SettingPage user={user} setUser={setUser}/>}/>
|
<Route path="/wiki/changes" element={<WikiHistoryPage/>}/>
|
||||||
<Route path="/settings" element={<Navigate to="/users/settings" replace/>}/>
|
<Route path="/users/settings" element={<SettingPage user={user} setUser={setUser}/>}/>
|
||||||
<Route path="*" element={<NotFound/>}/>
|
<Route path="/settings" element={<Navigate to="/users/settings" replace/>}/>
|
||||||
</Routes>
|
<Route path="/tos" element={<TOSPage/>}/>
|
||||||
</AnimatePresence>
|
<Route path="/more" element={<MorePage/>}/>
|
||||||
</LayoutGroup>)
|
<Route path="*" element={<NotFound/>}/>
|
||||||
|
</Routes>
|
||||||
|
</AnimatePresence>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -131,10 +137,15 @@ export default (() => {
|
|||||||
<>
|
<>
|
||||||
<RouteBlockerOverlay/>
|
<RouteBlockerOverlay/>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<div className="flex flex-col h-dvh w-full">
|
<LayoutGroup>
|
||||||
<TopNav user={user}/>
|
<motion.div
|
||||||
<RouteTransitionWrapper user={user} setUser={setUser}/>
|
layout="position"
|
||||||
</div>
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
|
className="flex flex-col h-dvh w-full overflow-y-hidden">
|
||||||
|
<TopNav user={user}/>
|
||||||
|
<RouteTransitionWrapper user={user} setUser={setUser}/>
|
||||||
|
</motion.div>
|
||||||
|
</LayoutGroup>
|
||||||
<Toaster/>
|
<Toaster/>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</>)
|
</>)
|
||||||
|
|||||||
@@ -90,7 +90,9 @@ export default (({ tag, nestLevel, pathKey, parentTagId, suppressClickRef, sp }:
|
|||||||
className={cn ('rounded select-none', over && 'ring-2 ring-offset-2')}
|
className={cn ('rounded select-none', over && 'ring-2 ring-offset-2')}
|
||||||
{...attributes}
|
{...attributes}
|
||||||
{...listeners}>
|
{...listeners}>
|
||||||
<motion.div layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
|
<motion.div
|
||||||
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
|
layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
|
||||||
<TagLink tag={tag} nestLevel={nestLevel}/>
|
<TagLink tag={tag} nestLevel={nestLevel}/>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</div>)
|
</div>)
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import PostFormTagsArea from '@/components/PostFormTagsArea'
|
|||||||
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
||||||
import Label from '@/components/common/Label'
|
import Label from '@/components/common/Label'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { apiPut } from '@/lib/api'
|
import { apiPut } from '@/lib/api'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
@@ -35,20 +36,34 @@ export default (({ post, onSave }: Props) => {
|
|||||||
useState<string | null> (post.originalCreatedBefore)
|
useState<string | null> (post.originalCreatedBefore)
|
||||||
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
||||||
useState<string | null> (post.originalCreatedFrom)
|
useState<string | null> (post.originalCreatedFrom)
|
||||||
const [title, setTitle] = useState (post.title)
|
const [parentPostIds, setParentPostIds] =
|
||||||
|
useState ((post.parentPosts ?? []).map (p => p.id).join (' '))
|
||||||
const [tags, setTags] = useState<string> ('')
|
const [tags, setTags] = useState<string> ('')
|
||||||
|
const [title, setTitle] = useState (post.title)
|
||||||
|
|
||||||
const handleSubmit = async () => {
|
const handleSubmit = async () => {
|
||||||
const data = await apiPut<Post> (
|
try
|
||||||
`/posts/${ post.id }`,
|
{
|
||||||
{ title, tags, original_created_from: originalCreatedFrom,
|
const data = await apiPut<Post> (
|
||||||
original_created_before: originalCreatedBefore },
|
`/posts/${ post.id }`,
|
||||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
{ title, tags, parent_post_ids: parentPostIds,
|
||||||
onSave ({ ...post,
|
original_created_from: originalCreatedFrom,
|
||||||
title: data.title,
|
original_created_before: originalCreatedBefore },
|
||||||
tags: data.tags,
|
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||||
originalCreatedFrom: data.originalCreatedFrom,
|
onSave ({ ...post,
|
||||||
originalCreatedBefore: data.originalCreatedBefore } as Post)
|
title: data.title,
|
||||||
|
tags: data.tags,
|
||||||
|
parentPosts: data.parentPosts,
|
||||||
|
childPosts: data.childPosts,
|
||||||
|
siblingPosts: data.siblingPosts,
|
||||||
|
originalCreatedFrom: data.originalCreatedFrom,
|
||||||
|
originalCreatedBefore: data.originalCreatedBefore } as Post)
|
||||||
|
toast ({ description: '更新しました.' })
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
toast ({ description: '更新はできなかったよ……' })
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
@@ -62,10 +77,20 @@ export default (({ post, onSave }: Props) => {
|
|||||||
<Label>タイトル</Label>
|
<Label>タイトル</Label>
|
||||||
<input type="text"
|
<input type="text"
|
||||||
className="w-full border rounded p-2"
|
className="w-full border rounded p-2"
|
||||||
value={title}
|
value={title ?? ''}
|
||||||
onChange={ev => setTitle (ev.target.value)}/>
|
onChange={ev => setTitle (ev.target.value)}/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* 親投稿 */}
|
||||||
|
<div>
|
||||||
|
<Label>親投稿</Label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={parentPostIds}
|
||||||
|
onChange={e => setParentPostIds (e.target.value)}
|
||||||
|
className="w-full border p-2 rounded"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { useRef } from 'react'
|
|||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
|
import { cn } from '@/lib/utils'
|
||||||
import { useSharedTransitionStore } from '@/stores/sharedTransitionStore'
|
import { useSharedTransitionStore } from '@/stores/sharedTransitionStore'
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC, MouseEvent } from 'react'
|
||||||
@@ -39,8 +40,10 @@ export default (({ posts, onClick }: Props) => {
|
|||||||
<motion.div
|
<motion.div
|
||||||
ref={cardRef}
|
ref={cardRef}
|
||||||
layoutId={layoutId}
|
layoutId={layoutId}
|
||||||
className="w-full h-full overflow-hidden rounded-xl shadow
|
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
||||||
transform-gpu will-change-transform"
|
'transform-gpu will-change-transform',
|
||||||
|
(post.childPosts ?? []).length > 0 && 'outline-4 outline-green-500',
|
||||||
|
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
|
||||||
whileHover={{ scale: 1.02 }}
|
whileHover={{ scale: 1.02 }}
|
||||||
onLayoutAnimationStart={() => {
|
onLayoutAnimationStart={() => {
|
||||||
if (!(cardRef.current))
|
if (!(cardRef.current))
|
||||||
@@ -56,7 +59,7 @@ export default (({ posts, onClick }: Props) => {
|
|||||||
cardRef.current.style.zIndex = ''
|
cardRef.current.style.zIndex = ''
|
||||||
cardRef.current.style.position = ''
|
cardRef.current.style.position = ''
|
||||||
}}
|
}}
|
||||||
transition={{ type: 'spring', stiffness: 500, damping: 40, mass: .5 }}>
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
<img src={post.thumbnail || post.thumbnailBase || undefined}
|
<img src={post.thumbnail || post.thumbnailBase || undefined}
|
||||||
alt={post.title || post.url}
|
alt={post.title || post.url}
|
||||||
title={post.title || post.url || undefined}
|
title={post.title || post.url || undefined}
|
||||||
|
|||||||
@@ -313,7 +313,9 @@ export default (({ post, sp }: Props) => {
|
|||||||
{CATEGORIES.map ((cat: Category) => ((tags[cat] ?? []).length > 0 || dragging) && (
|
{CATEGORIES.map ((cat: Category) => ((tags[cat] ?? []).length > 0 || dragging) && (
|
||||||
<div className="my-3" key={cat}>
|
<div className="my-3" key={cat}>
|
||||||
<SubsectionTitle>
|
<SubsectionTitle>
|
||||||
<motion.div layoutId={`tag-${ sp ? 'sp-' : '' }${ cat }`}>
|
<motion.div
|
||||||
|
layoutId={`tag-${ sp ? 'sp-' : '' }${ cat }`}
|
||||||
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
{CATEGORY_NAMES[cat]}
|
{CATEGORY_NAMES[cat]}
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</SubsectionTitle>
|
</SubsectionTitle>
|
||||||
@@ -325,7 +327,9 @@ export default (({ post, sp }: Props) => {
|
|||||||
</ul>
|
</ul>
|
||||||
</div>))}
|
</div>))}
|
||||||
{post && (
|
{post && (
|
||||||
<motion.div layoutId={`post-info-${ sp }`}>
|
<motion.div
|
||||||
|
layoutId={`post-info-${ sp }`}
|
||||||
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
<SectionTitle>情報</SectionTitle>
|
<SectionTitle>情報</SectionTitle>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Id.: {post.id}</li>
|
<li>Id.: {post.id}</li>
|
||||||
|
|||||||
@@ -65,7 +65,9 @@ export default (({ posts, onClick }: Props) => {
|
|||||||
{CATEGORIES.flatMap (cat => cat in tags ? (
|
{CATEGORIES.flatMap (cat => cat in tags ? (
|
||||||
tags[cat].map (tag => (
|
tags[cat].map (tag => (
|
||||||
<li key={tag.id} className="mb-1">
|
<li key={tag.id} className="mb-1">
|
||||||
<motion.div layoutId={`tag-${ tag.id }`}>
|
<motion.div
|
||||||
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
|
layoutId={`tag-${ tag.id }`}>
|
||||||
<TagLink tag={tag} onClick={onClick}/>
|
<TagLink tag={tag} onClick={onClick}/>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</li>))) : [])}
|
</li>))) : [])}
|
||||||
|
|||||||
+247
-113
@@ -8,65 +8,30 @@ import PrefetchLink from '@/components/PrefetchLink'
|
|||||||
import TopNavUser from '@/components/TopNavUser'
|
import TopNavUser from '@/components/TopNavUser'
|
||||||
import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
|
import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
|
||||||
import { tagsKeys, wikiKeys } from '@/lib/queryKeys'
|
import { tagsKeys, wikiKeys } from '@/lib/queryKeys'
|
||||||
import { fetchTagByName } from '@/lib/tags'
|
import { fetchTag, fetchTagByName } from '@/lib/tags'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import { fetchWikiPage } from '@/lib/wiki'
|
import { fetchWikiPage } from '@/lib/wiki'
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC, MouseEvent } from 'react'
|
||||||
|
|
||||||
import type { Menu, User } from '@/types'
|
import type { Menu, MenuVisibleItem, Tag, User } from '@/types'
|
||||||
|
|
||||||
type Props = { user: User | null }
|
type Props = { user: User | null }
|
||||||
|
|
||||||
|
|
||||||
export default (({ user }: Props) => {
|
export const menuOutline = ({ tag, wikiId, user, pathName }: {
|
||||||
const location = useLocation ()
|
tag?: Tag | null
|
||||||
|
wikiId: number | null
|
||||||
const dirRef = useRef<(-1) | 1> (1)
|
user: User | null,
|
||||||
const itemsRef = useRef<(HTMLAnchorElement | null)[]> ([])
|
pathName: string }): Menu => {
|
||||||
const navRef = useRef<HTMLDivElement | null> (null)
|
|
||||||
|
|
||||||
const measure = () => {
|
|
||||||
const nav = navRef.current
|
|
||||||
const el = itemsRef.current[activeIdx]
|
|
||||||
if (!(nav) || !(el) || activeIdx < 0)
|
|
||||||
return
|
|
||||||
|
|
||||||
const navRect = nav.getBoundingClientRect ()
|
|
||||||
const elRect = el.getBoundingClientRect ()
|
|
||||||
|
|
||||||
setHl ({ left: elRect.left - navRect.left,
|
|
||||||
width: elRect.width,
|
|
||||||
visible: true })
|
|
||||||
}
|
|
||||||
|
|
||||||
const [hl, setHl] = useState<{ left: number; width: number; visible: boolean }> ({
|
|
||||||
left: 0,
|
|
||||||
width: 0,
|
|
||||||
visible: false })
|
|
||||||
const [menuOpen, setMenuOpen] = useState (false)
|
|
||||||
const [openItemIdx, setOpenItemIdx] = useState (-1)
|
|
||||||
const [wikiId, setWikiId] = useState<number | null> (WikiIdBus.get ())
|
|
||||||
|
|
||||||
const wikiIdStr = String (wikiId ?? '')
|
|
||||||
|
|
||||||
const { data: wikiPage } = useQuery ({
|
|
||||||
enabled: Boolean (wikiIdStr),
|
|
||||||
queryKey: wikiKeys.show (wikiIdStr, { }),
|
|
||||||
queryFn: () => fetchWikiPage (wikiIdStr, { }) })
|
|
||||||
|
|
||||||
const effectiveTitle = wikiPage?.title ?? ''
|
|
||||||
|
|
||||||
const { data: tag } = useQuery ({
|
|
||||||
enabled: Boolean (effectiveTitle),
|
|
||||||
queryKey: tagsKeys.show (effectiveTitle),
|
|
||||||
queryFn: () => fetchTagByName (effectiveTitle) })
|
|
||||||
|
|
||||||
const postCount = tag?.postCount ?? 0
|
const postCount = tag?.postCount ?? 0
|
||||||
|
|
||||||
const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (location.pathname) && wikiId)
|
const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (pathName) && wikiId)
|
||||||
const wikiTitle = location.pathname.split ('/')[2] ?? ''
|
const wikiTitle = pathName.split ('/')[2] ?? ''
|
||||||
const menu: Menu = [
|
|
||||||
|
const tagFlg = /^\/tags\/\d+/.test (pathName)
|
||||||
|
|
||||||
|
return [
|
||||||
{ name: '広場', to: '/posts', subMenu: [
|
{ name: '広場', to: '/posts', subMenu: [
|
||||||
{ name: '一覧', to: '/posts' },
|
{ name: '一覧', to: '/posts' },
|
||||||
{ name: '検索', to: '/posts/search' },
|
{ name: '検索', to: '/posts/search' },
|
||||||
@@ -75,19 +40,24 @@ export default (({ user }: Props) => {
|
|||||||
{ name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] },
|
{ name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] },
|
||||||
{ name: 'タグ', to: '/tags', subMenu: [
|
{ name: 'タグ', to: '/tags', subMenu: [
|
||||||
{ name: 'マスタ', to: '/tags' },
|
{ name: 'マスタ', to: '/tags' },
|
||||||
{ name: '別名タグ', to: '/tags/aliases', visible: false },
|
|
||||||
{ name: '上位タグ', to: '/tags/implications', visible: false },
|
|
||||||
{ name: 'ニコニコ連携', to: '/tags/nico' },
|
{ name: 'ニコニコ連携', to: '/tags/nico' },
|
||||||
{ name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' }] },
|
{ name: '履歴', to: '/tags/changes' },
|
||||||
// { name: '素材', to: '/materials', subMenu: [
|
{ name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' },
|
||||||
// { name: '一覧', to: '/materials' },
|
{ component: <Separator/>, visible: tagFlg },
|
||||||
// { name: '検索', to: '/materials/search', visible: false },
|
{ name: `広場 (${ postCount || 0 })`,
|
||||||
// { name: '追加', to: '/materials/new' },
|
to: `/posts?tags=${ encodeURIComponent (tag?.name ?? '') }`,
|
||||||
// { name: '履歴', to: '/materials/changes', visible: false },
|
visible: tagFlg },
|
||||||
// { name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
|
{ name: '履歴', to: `/tags/changes?id=${ tag?.id }`,
|
||||||
|
visible: tagFlg && tag?.category !== 'nico' }] },
|
||||||
|
{ name: '素材', to: '/materials', visible: false, subMenu: [
|
||||||
|
{ name: '一覧', to: '/materials' },
|
||||||
|
{ name: '検索', to: '/materials/search', visible: false },
|
||||||
|
{ name: '追加', to: '/materials/new' },
|
||||||
|
{ name: '履歴', to: '/materials/changes', visible: false },
|
||||||
|
{ name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
|
||||||
{ name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
|
{ name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
|
||||||
{ name: <>第 1 会場</>, to: '/theatres/1' },
|
{ name: <>第 1 会場</>, to: '/theatres/1' },
|
||||||
{ name: 'CyTube', to: '//cytube.mm428.net/r/deernijika' },
|
{ name: 'CyTube', to: '//cytube.mm428.net/r/deernijika' },
|
||||||
{ name: <>ニジカ放送局第 1 チャンネル</>,
|
{ name: <>ニジカ放送局第 1 チャンネル</>,
|
||||||
to: '//www.youtube.com/watch?v=DCU3hL4Uu6A' },
|
to: '//www.youtube.com/watch?v=DCU3hL4Uu6A' },
|
||||||
{ name: 'ヘルプ', to: '/wiki/ヘルプ:上映会' }] },
|
{ name: 'ヘルプ', to: '/wiki/ヘルプ:上映会' }] },
|
||||||
@@ -101,12 +71,69 @@ export default (({ user }: Props) => {
|
|||||||
visible: wikiPageFlg },
|
visible: wikiPageFlg },
|
||||||
{ name: '履歴', to: `/wiki/changes?id=${ wikiId }`, visible: wikiPageFlg },
|
{ name: '履歴', to: `/wiki/changes?id=${ wikiId }`, visible: wikiPageFlg },
|
||||||
{ name: '編輯', to: `/wiki/${ wikiId || wikiTitle }/edit`, visible: wikiPageFlg }] },
|
{ name: '編輯', to: `/wiki/${ wikiId || wikiTitle }/edit`, visible: wikiPageFlg }] },
|
||||||
{ name: 'ユーザ', to: '/users/settings', subMenu: [
|
{ name: 'ユーザ', to: '/users/settings', visible: false, subMenu: [
|
||||||
{ name: '一覧', to: '/users', visible: false },
|
{ name: '一覧', to: '/users', visible: false },
|
||||||
{ name: 'お前', to: `/users/${ user?.id }`, visible: false },
|
{ name: 'お前', to: `/users/${ user?.id }`, visible: false },
|
||||||
{ name: '設定', to: '/users/settings', visible: Boolean (user) }] }]
|
{ name: '設定', to: '/users/settings', visible: Boolean (user) }] },
|
||||||
|
{ name: '法規', visible: false, subMenu: [
|
||||||
|
{ name: '利用規約', to: '/tos' }] }]
|
||||||
|
}
|
||||||
|
|
||||||
const activeIdx = menu.findIndex (item => location.pathname.startsWith (item.base || item.to))
|
|
||||||
|
export default (({ user }: Props) => {
|
||||||
|
const location = useLocation ()
|
||||||
|
|
||||||
|
const dirRef = useRef<(-1) | 1> (1)
|
||||||
|
const itemsRef = useRef<(HTMLAnchorElement | null)[]> ([])
|
||||||
|
const navRef = useRef<HTMLDivElement | null> (null)
|
||||||
|
|
||||||
|
const measure = (idx: number) => {
|
||||||
|
const nav = navRef.current
|
||||||
|
const el = itemsRef.current[idx < 0 ? visibleMenu.length : idx]
|
||||||
|
|
||||||
|
if (!(nav) || !(el))
|
||||||
|
{
|
||||||
|
setHL ({ left: 0, width: 0, visible: true })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const navRect = nav.getBoundingClientRect ()
|
||||||
|
const elRect = el.getBoundingClientRect ()
|
||||||
|
|
||||||
|
setHL ({ left: elRect.left - navRect.left,
|
||||||
|
width: elRect.width,
|
||||||
|
visible: true })
|
||||||
|
}
|
||||||
|
|
||||||
|
const [hl, setHL] = useState<{ left: number; width: number; visible: boolean }> ({
|
||||||
|
left: 0,
|
||||||
|
width: 0,
|
||||||
|
visible: false })
|
||||||
|
const [menuOpen, setMenuOpen] = useState (false)
|
||||||
|
const [moreVsbl, setMoreVsbl] = useState (false)
|
||||||
|
const [openItemIdx, setOpenItemIdx] = useState (-1)
|
||||||
|
const [wikiId, setWikiId] = useState<number | null> (WikiIdBus.get ())
|
||||||
|
|
||||||
|
const wikiIdStr = String (wikiId ?? '')
|
||||||
|
|
||||||
|
const { data: wikiPage } = useQuery ({
|
||||||
|
enabled: Boolean (wikiIdStr),
|
||||||
|
queryKey: wikiKeys.show (wikiIdStr, { }),
|
||||||
|
queryFn: () => fetchWikiPage (wikiIdStr, { }) })
|
||||||
|
|
||||||
|
const tagFlg = /^\/tags\/\d+/.test (location.pathname)
|
||||||
|
const effectiveTitle = (tagFlg ? location.pathname.split ('/')[2] : wikiPage?.title) ?? ''
|
||||||
|
|
||||||
|
const { data: tag } = useQuery ({
|
||||||
|
enabled: Boolean (effectiveTitle),
|
||||||
|
queryKey: tagsKeys.show (effectiveTitle),
|
||||||
|
queryFn: () => (tagFlg ? fetchTag : fetchTagByName) (effectiveTitle) })
|
||||||
|
|
||||||
|
|
||||||
|
const menu = menuOutline ({ tag, wikiId, user, pathName: location.pathname })
|
||||||
|
const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
|
||||||
|
const activeIdx =
|
||||||
|
visibleMenu.findIndex (item => location.pathname.startsWith (item.base || item.to))
|
||||||
|
|
||||||
const prevActiveIdxRef = useRef<number> (activeIdx)
|
const prevActiveIdxRef = useRef<number> (activeIdx)
|
||||||
|
|
||||||
@@ -119,28 +146,24 @@ export default (({ user }: Props) => {
|
|||||||
const dir = dirRef.current
|
const dir = dirRef.current
|
||||||
|
|
||||||
useLayoutEffect (() => {
|
useLayoutEffect (() => {
|
||||||
if (activeIdx < 0)
|
const raf = requestAnimationFrame (() => measure (moreVsbl ? -1 : activeIdx))
|
||||||
return
|
const onResize = () => requestAnimationFrame (() => measure (moreVsbl ? -1 : activeIdx))
|
||||||
|
|
||||||
const raf = requestAnimationFrame (measure)
|
|
||||||
const onResize = () => requestAnimationFrame (measure)
|
|
||||||
|
|
||||||
addEventListener ('resize', onResize)
|
addEventListener ('resize', onResize)
|
||||||
return () => {
|
return () => {
|
||||||
cancelAnimationFrame (raf)
|
cancelAnimationFrame (raf)
|
||||||
removeEventListener ('resize', onResize)
|
removeEventListener ('resize', onResize)
|
||||||
}
|
}
|
||||||
}, [activeIdx])
|
})
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
const unsubscribe = WikiIdBus.subscribe (setWikiId)
|
const unsubscribe = WikiIdBus.subscribe (setWikiId)
|
||||||
return () => unsubscribe ()
|
return () => unsubscribe ()
|
||||||
}, [])
|
}, [activeIdx])
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
setMenuOpen (false)
|
setMenuOpen (false)
|
||||||
setOpenItemIdx (menu.findIndex (item => (
|
setOpenItemIdx (activeIdx)
|
||||||
location.pathname.startsWith (item.base || item.to))))
|
|
||||||
}, [location])
|
}, [location])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -167,17 +190,39 @@ export default (({ user }: Props) => {
|
|||||||
transform: `translateX(${ hl.left }px)`,
|
transform: `translateX(${ hl.left }px)`,
|
||||||
opacity: hl.visible ? 1 : 0 }}/>
|
opacity: hl.visible ? 1 : 0 }}/>
|
||||||
|
|
||||||
{menu.map ((item, i) => (
|
{visibleMenu.map ((item, i) => (
|
||||||
<PrefetchLink
|
<motion.div
|
||||||
key={i}
|
key={item.to}
|
||||||
to={item.to}
|
layoutId={`menu-${ item.name }`}
|
||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
animate={{ opacity: moreVsbl ? 0 : 1 }}
|
||||||
itemsRef.current[i] = el
|
transition={{ opacity: { duration: .12 },
|
||||||
}}
|
layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
className={cn ('relative z-10 flex h-full items-center px-5',
|
style={{ pointerEvents: moreVsbl ? 'none' : 'auto' }}
|
||||||
(i === openItemIdx) && 'font-bold')}>
|
onMouseEnter={() => setMoreVsbl (false)}>
|
||||||
{item.name}
|
<PrefetchLink
|
||||||
</PrefetchLink>))}
|
to={item.to}
|
||||||
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
|
itemsRef.current[i] = el
|
||||||
|
}}
|
||||||
|
className={cn ('relative z-10 flex h-full items-center px-5',
|
||||||
|
(i === openItemIdx) && 'font-bold')}>
|
||||||
|
{item.name}
|
||||||
|
</PrefetchLink>
|
||||||
|
</motion.div>))}
|
||||||
|
<PrefetchLink
|
||||||
|
to="/more"
|
||||||
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
|
itemsRef.current[visibleMenu.length] = el
|
||||||
|
}}
|
||||||
|
onClick={() => setMoreVsbl (false)}
|
||||||
|
onMouseEnter={() => {
|
||||||
|
setMoreVsbl (true)
|
||||||
|
measure (-1)
|
||||||
|
}}
|
||||||
|
className={cn ('relative z-10 flex h-full items-center px-5',
|
||||||
|
(openItemIdx < 0 || moreVsbl) && 'font-bold')}>
|
||||||
|
その他 »
|
||||||
|
</PrefetchLink>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -195,36 +240,115 @@ export default (({ user }: Props) => {
|
|||||||
</a>
|
</a>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<div className="relative hidden md:flex bg-yellow-200 dark:bg-red-950
|
<AnimatePresence initial={false}>
|
||||||
items-center w-full min-h-[40px] overflow-hidden">
|
<motion.div
|
||||||
<AnimatePresence initial={false} custom={dir}>
|
key="submenu-shell"
|
||||||
<motion.div
|
layout
|
||||||
key={activeIdx}
|
className="relative hidden md:block overflow-hidden
|
||||||
custom={dir}
|
bg-yellow-200 dark:bg-red-950"
|
||||||
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }),
|
style={{ height: moreVsbl ? 40 * menu.length : (activeIdx < 0 ? 0 : 40) }}
|
||||||
centre: { y: 0, opacity: 1 },
|
onMouseLeave={() => {
|
||||||
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }}
|
if (moreVsbl)
|
||||||
className="absolute inset-0 flex items-center px-3"
|
setMoreVsbl (false)
|
||||||
initial="enter"
|
}}
|
||||||
animate="centre"
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
exit="exit"
|
onAnimationComplete={() => {
|
||||||
transition={{ duration: .2, ease: 'easeOut' }}>
|
measure (moreVsbl ? -1 : activeIdx)
|
||||||
{(menu[activeIdx]?.subMenu ?? [])
|
}}>
|
||||||
.filter (item => item.visible ?? true)
|
{moreVsbl
|
||||||
.map ((item, i) => (
|
? (
|
||||||
'component' in item
|
menu.map ((item, i) => (
|
||||||
? <Fragment key={`c-${ i }`}>{item.component}</Fragment>
|
<div key={i} className="relative h-[40px]">
|
||||||
: (
|
<div className="absolute inset-0 flex items-center px-3">
|
||||||
<PrefetchLink
|
<motion.div
|
||||||
key={`l-${ i }`}
|
transition={{ duration: .2, ease: 'easeOut' }}
|
||||||
to={item.to}
|
{...((item.visible ?? true)
|
||||||
target={item.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
? { layoutId: `menu-${ item.name }` }
|
||||||
className="h-full flex items-center px-3">
|
: { initial: { x: 40, y: -40, opacity: 0 },
|
||||||
{item.name}
|
animate: { x: 0, y: 0, opacity: 1 },
|
||||||
</PrefetchLink>)))}
|
exit: { x: 40, y: -40, opacity: 0 } })}
|
||||||
</motion.div>
|
className="z-10 h-full flex items-center px-3 font-bold w-24">
|
||||||
</AnimatePresence>
|
<h2>{item.name}</h2>
|
||||||
</div>
|
</motion.div>
|
||||||
|
{item.subMenu
|
||||||
|
.filter (subItem => subItem.visible ?? true)
|
||||||
|
.map ((subItem, j) => (
|
||||||
|
'component' in subItem
|
||||||
|
? (
|
||||||
|
<motion.div
|
||||||
|
key={`c-${ i }-${ j }`}
|
||||||
|
transition={{ duration: .2, ease: 'easeOut' }}
|
||||||
|
{...((visibleMenu[activeIdx]?.name
|
||||||
|
=== item.name)
|
||||||
|
? { layoutId: `submenu-${ item.name }-${ j }` }
|
||||||
|
: { initial: { y: -40, opacity: 0 },
|
||||||
|
animate: { y: 0, opacity: 1 },
|
||||||
|
exit: { y: -40, opacity: 0 } })}>
|
||||||
|
{subItem.component}
|
||||||
|
</motion.div>)
|
||||||
|
: (
|
||||||
|
<motion.div
|
||||||
|
key={`l-${ i }-${ j }`}
|
||||||
|
transition={{ duration: .2, ease: 'easeOut' }}
|
||||||
|
{...((visibleMenu[activeIdx]?.name
|
||||||
|
=== item.name)
|
||||||
|
? { layoutId: `submenu-${ item.name }-${ j }` }
|
||||||
|
: { initial: { y: -40, opacity: 0 },
|
||||||
|
animate: { y: 0, opacity: 1 },
|
||||||
|
exit: { y: -40, opacity: 0 } })}>
|
||||||
|
<PrefetchLink
|
||||||
|
to={subItem.to}
|
||||||
|
target={subItem.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
||||||
|
onClick={() => setMoreVsbl (false)}
|
||||||
|
className="h-full flex items-center px-3">
|
||||||
|
{subItem.name}
|
||||||
|
</PrefetchLink>
|
||||||
|
</motion.div>)))}
|
||||||
|
</div>
|
||||||
|
</div>)))
|
||||||
|
: ((visibleMenu[activeIdx]?.subMenu ?? []).length > 0
|
||||||
|
&& (
|
||||||
|
<div className="relative h-[40px]">
|
||||||
|
<AnimatePresence initial={false} custom={dir}>
|
||||||
|
<motion.div
|
||||||
|
key={activeIdx}
|
||||||
|
custom={dir}
|
||||||
|
variants={{ enter: (d: -1 | 1) => ({ y: d * 24, opacity: 0 }),
|
||||||
|
centre: { y: 0, opacity: 1 },
|
||||||
|
exit: (d: -1 | 1) => ({ y: (-d) * 24, opacity: 0 }) }}
|
||||||
|
className="absolute inset-0 flex items-center px-3"
|
||||||
|
initial="enter"
|
||||||
|
animate="centre"
|
||||||
|
exit="exit"
|
||||||
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
|
{(visibleMenu[activeIdx]?.subMenu ?? [])
|
||||||
|
.filter (item => item.visible ?? true)
|
||||||
|
.map ((item, i) => (
|
||||||
|
'component' in item
|
||||||
|
? (
|
||||||
|
<motion.div
|
||||||
|
key={`c-${ i }`}
|
||||||
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
|
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
|
||||||
|
{item.component}
|
||||||
|
</motion.div>)
|
||||||
|
: (
|
||||||
|
<motion.div
|
||||||
|
key={`l-${ i }`}
|
||||||
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
|
layoutId={`submenu-${ visibleMenu[activeIdx].name }-${ i }`}>
|
||||||
|
<PrefetchLink
|
||||||
|
to={item.to}
|
||||||
|
target={item.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
||||||
|
className="h-full flex items-center px-3">
|
||||||
|
{item.name}
|
||||||
|
</PrefetchLink>
|
||||||
|
</motion.div>)))}
|
||||||
|
</motion.div>
|
||||||
|
</AnimatePresence>
|
||||||
|
</div>))}
|
||||||
|
</motion.div>
|
||||||
|
</AnimatePresence>
|
||||||
|
|
||||||
<AnimatePresence initial={false}>
|
<AnimatePresence initial={false}>
|
||||||
{menuOpen && (
|
{menuOpen && (
|
||||||
@@ -241,7 +365,7 @@ export default (({ user }: Props) => {
|
|||||||
exit="closed"
|
exit="closed"
|
||||||
transition={{ duration: .2, ease: 'easeOut' }}>
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
{menu.map ((item, i) => (
|
{visibleMenu.map ((item, i) => (
|
||||||
<Fragment key={i}>
|
<Fragment key={i}>
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={i === openItemIdx ? item.to : '#'}
|
to={i === openItemIdx ? item.to : '#'}
|
||||||
@@ -294,6 +418,16 @@ export default (({ user }: Props) => {
|
|||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
</AnimatePresence>
|
</AnimatePresence>
|
||||||
</Fragment>))}
|
</Fragment>))}
|
||||||
|
<PrefetchLink
|
||||||
|
to="/more"
|
||||||
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
|
itemsRef.current[visibleMenu.length] = el
|
||||||
|
}}
|
||||||
|
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
||||||
|
((openItemIdx < 0)
|
||||||
|
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}>
|
||||||
|
その他 »
|
||||||
|
</PrefetchLink>
|
||||||
<TopNavUser user={user} sp/>
|
<TopNavUser user={user} sp/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ import ReactMarkdown from 'react-markdown'
|
|||||||
import remarkGFM from 'remark-gfm'
|
import remarkGFM from 'remark-gfm'
|
||||||
|
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
import SectionTitle from '@/components/common/SectionTitle'
|
|
||||||
import SubsectionTitle from '@/components/common/SubsectionTitle'
|
|
||||||
import { wikiKeys } from '@/lib/queryKeys'
|
import { wikiKeys } from '@/lib/queryKeys'
|
||||||
import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
|
import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
|
||||||
import { fetchWikiPages } from '@/lib/wiki'
|
import { fetchWikiPages } from '@/lib/wiki'
|
||||||
@@ -16,19 +14,15 @@ import type { Components } from 'react-markdown'
|
|||||||
type Props = { title: string
|
type Props = { title: string
|
||||||
body?: string }
|
body?: string }
|
||||||
|
|
||||||
const mdComponents = { h1: ({ children }) => <SectionTitle>{children}</SectionTitle>,
|
const mdComponents = { a: (({ href, children }) => (
|
||||||
h2: ({ children }) => <SubsectionTitle>{children}</SubsectionTitle>,
|
['/', '.'].some (e => href?.startsWith (e))
|
||||||
ol: ({ children }) => <ol className="list-decimal pl-6">{children}</ol>,
|
? <PrefetchLink to={href!}>{children}</PrefetchLink>
|
||||||
ul: ({ children }) => <ul className="list-disc pl-6">{children}</ul>,
|
: (
|
||||||
a: (({ href, children }) => (
|
<a href={href}
|
||||||
['/', '.'].some (e => href?.startsWith (e))
|
target="_blank"
|
||||||
? <PrefetchLink to={href!}>{children}</PrefetchLink>
|
rel="noopener noreferrer">
|
||||||
: (
|
{children}
|
||||||
<a href={href}
|
</a>))) } as const satisfies Components
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer">
|
|
||||||
{children}
|
|
||||||
</a>))) } as const satisfies Components
|
|
||||||
|
|
||||||
|
|
||||||
export default (({ title, body }: Props) => {
|
export default (({ title, body }: Props) => {
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import React from 'react'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
type Props = { children: React.ReactNode }
|
import type { ComponentPropsWithoutRef, FC } from 'react'
|
||||||
|
|
||||||
|
type Props = ComponentPropsWithoutRef<'h2'>
|
||||||
|
|
||||||
|
|
||||||
export default ({ children }: Props) => (
|
export default (({ children, className, ...rest }: Props) => (
|
||||||
<h2 className="text-xl my-4">
|
<h2 {...rest} className={cn ('text-xl my-4', className)}>
|
||||||
{children}
|
{children}
|
||||||
</h2>)
|
</h2>)) satisfies FC<Props>
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { motion } from 'framer-motion'
|
||||||
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, ReactNode } from 'react'
|
import type { FC, ReactNode } from 'react'
|
||||||
@@ -8,7 +10,9 @@ type Props = {
|
|||||||
|
|
||||||
|
|
||||||
export default (({ children, className }: Props) => (
|
export default (({ children, className }: Props) => (
|
||||||
<main className={cn ('flex-1 overflow-y-auto p-4 md:h-[calc(100dvh-88px)]',
|
<motion.main
|
||||||
className)}>
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
|
className={cn ('flex-1 overflow-y-auto p-4', className)}
|
||||||
|
layout="position">
|
||||||
{children}
|
{children}
|
||||||
</main>)) satisfies FC<Props>
|
</motion.main>)) satisfies FC<Props>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { motion } from 'framer-motion'
|
||||||
import { Helmet } from 'react-helmet-async'
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
|
||||||
import type { FC, ReactNode } from 'react'
|
import type { FC, ReactNode } from 'react'
|
||||||
@@ -6,10 +7,10 @@ type Props = { children: ReactNode }
|
|||||||
|
|
||||||
|
|
||||||
export default (({ children }: Props) => (
|
export default (({ children }: Props) => (
|
||||||
<div
|
<motion.div
|
||||||
className="p-4 w-full md:w-64 md:h-full
|
layout="position"
|
||||||
md:h-[calc(100dvh-88px)] md:overflow-y-auto
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
sidebar">
|
className="p-4 w-full md:w-64 md:h-full md:overflow-y-auto sidebar">
|
||||||
<Helmet>
|
<Helmet>
|
||||||
<style>
|
<style>
|
||||||
{`
|
{`
|
||||||
@@ -26,4 +27,4 @@ export default (({ children }: Props) => (
|
|||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
{children}
|
{children}
|
||||||
</div>)) satisfies FC<Props>
|
</motion.div>)) satisfies FC<Props>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { apiDelete, apiGet, apiPost } from '@/lib/api'
|
import { apiDelete, apiGet, apiPost } from '@/lib/api'
|
||||||
|
|
||||||
import type { FetchPostsParams, Post, PostTagChange } from '@/types'
|
import type { FetchPostsParams, Post, PostVersion } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
export const fetchPosts = async (
|
export const fetchPosts = async (
|
||||||
@@ -29,17 +29,17 @@ export const fetchPost = async (id: string): Promise<Post> => await apiGet (`/po
|
|||||||
|
|
||||||
|
|
||||||
export const fetchPostChanges = async (
|
export const fetchPostChanges = async (
|
||||||
{ id, tag, page, limit }: {
|
{ post, tag, page, limit }: {
|
||||||
id?: string
|
post?: string
|
||||||
tag?: string
|
tag?: string
|
||||||
page: number
|
page: number
|
||||||
limit: number },
|
limit: number },
|
||||||
): Promise<{
|
): Promise<{
|
||||||
changes: PostTagChange[]
|
versions: PostVersion[]
|
||||||
count: number }> =>
|
count: number }> =>
|
||||||
await apiGet ('/posts/changes', { params: { ...(id && { id }),
|
await apiGet ('/posts/versions', { params: { ...(post && { post }),
|
||||||
...(tag && { tag }),
|
...(tag && { tag }),
|
||||||
page, limit } })
|
page, limit } })
|
||||||
|
|
||||||
|
|
||||||
export const toggleViewedFlg = async (id: string, viewed: boolean): Promise<void> => {
|
export const toggleViewedFlg = async (id: string, viewed: boolean): Promise<void> => {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { match } from 'path-to-regexp'
|
|||||||
|
|
||||||
import { fetchPost, fetchPosts, fetchPostChanges } from '@/lib/posts'
|
import { fetchPost, fetchPosts, fetchPostChanges } from '@/lib/posts'
|
||||||
import { postsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
|
||||||
import { fetchTagByName, fetchTag, fetchTags } from '@/lib/tags'
|
import { fetchTagByName, fetchTag, fetchTagChanges, fetchTags } from '@/lib/tags'
|
||||||
import { fetchWikiPage,
|
import { fetchWikiPage,
|
||||||
fetchWikiPageByTitle,
|
fetchWikiPageByTitle,
|
||||||
fetchWikiPages } from '@/lib/wiki'
|
fetchWikiPages } from '@/lib/wiki'
|
||||||
@@ -14,6 +14,7 @@ type Prefetcher = (qc: QueryClient, url: URL) => Promise<void>
|
|||||||
|
|
||||||
const mPost = match<{ id: string }> ('/posts/:id')
|
const mPost = match<{ id: string }> ('/posts/:id')
|
||||||
const mWiki = match<{ title: string }> ('/wiki/:title')
|
const mWiki = match<{ title: string }> ('/wiki/:title')
|
||||||
|
const mTag = match<{ id: string }> ('/tags/:id')
|
||||||
|
|
||||||
|
|
||||||
const prefetchWikiPagesIndex: Prefetcher = async (qc, url) => {
|
const prefetchWikiPagesIndex: Prefetcher = async (qc, url) => {
|
||||||
@@ -169,6 +170,30 @@ const prefetchTagsIndex: Prefetcher = async (qc, url) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const prefetchTagShow: Prefetcher = async (qc, url) => {
|
||||||
|
const m = mTag (url.pathname)
|
||||||
|
if (!(m))
|
||||||
|
return
|
||||||
|
|
||||||
|
const { id } = m.params
|
||||||
|
|
||||||
|
await qc.prefetchQuery ({
|
||||||
|
queryKey: tagsKeys.show (id),
|
||||||
|
queryFn: () => fetchTag (id) })
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const prefetchTagChanges: Prefetcher = async (qc, url) => {
|
||||||
|
const id = url.searchParams.get ('id')
|
||||||
|
const page = Number (url.searchParams.get ('page') || 1)
|
||||||
|
const limit = Number (url.searchParams.get ('limit') || 20)
|
||||||
|
|
||||||
|
await qc.prefetchQuery ({
|
||||||
|
queryKey: tagsKeys.changes ({ ...(id && { id }), page, limit }),
|
||||||
|
queryFn: () => fetchTagChanges ({ ...(id && { id }), page, limit }) })
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
export const routePrefetchers: { test: (u: URL) => boolean; run: Prefetcher }[] = [
|
export const routePrefetchers: { test: (u: URL) => boolean; run: Prefetcher }[] = [
|
||||||
{ test: u => ['/', '/posts', '/posts/search'].includes (u.pathname),
|
{ test: u => ['/', '/posts', '/posts/search'].includes (u.pathname),
|
||||||
run: prefetchPostsIndex },
|
run: prefetchPostsIndex },
|
||||||
@@ -180,7 +205,11 @@ export const routePrefetchers: { test: (u: URL) => boolean; run: Prefetcher }[]
|
|||||||
{ test: u => (!(['/wiki/new', '/wiki/changes'].includes (u.pathname))
|
{ test: u => (!(['/wiki/new', '/wiki/changes'].includes (u.pathname))
|
||||||
&& Boolean (mWiki (u.pathname))),
|
&& Boolean (mWiki (u.pathname))),
|
||||||
run: prefetchWikiPageShow },
|
run: prefetchWikiPageShow },
|
||||||
{ test: u => u.pathname === '/tags', run: prefetchTagsIndex }]
|
{ test: u => u.pathname === '/tags', run: prefetchTagsIndex },
|
||||||
|
{ test: u => (!(['/tags/nico', '/tags/changes'].includes (u.pathname))
|
||||||
|
&& Boolean (mTag (u.pathname))),
|
||||||
|
run: prefetchTagShow },
|
||||||
|
{ test: u => u.pathname === '/tags/changes', run: prefetchTagChanges }]
|
||||||
|
|
||||||
|
|
||||||
export const prefetchForURL = async (qc: QueryClient, urlLike: string): Promise<void> => {
|
export const prefetchForURL = async (qc: QueryClient, urlLike: string): Promise<void> => {
|
||||||
|
|||||||
@@ -5,13 +5,15 @@ export const postsKeys = {
|
|||||||
index: (p: FetchPostsParams) => ['posts', 'index', p] as const,
|
index: (p: FetchPostsParams) => ['posts', 'index', p] as const,
|
||||||
show: (id: string) => ['posts', id] as const,
|
show: (id: string) => ['posts', id] as const,
|
||||||
related: (id: string) => ['related', id] as const,
|
related: (id: string) => ['related', id] as const,
|
||||||
changes: (p: { id?: string; tag?: string; page: number; limit: number }) =>
|
changes: (p: { post?: string; tag?: string; page: number; limit: number }) =>
|
||||||
['posts', 'changes', p] as const }
|
['posts', 'changes', p] as const }
|
||||||
|
|
||||||
export const tagsKeys = {
|
export const tagsKeys = {
|
||||||
root: ['tags'] as const,
|
root: ['tags'] as const,
|
||||||
index: (p: FetchTagsParams) => ['tags', 'index', p] as const,
|
index: (p: FetchTagsParams) => ['tags', 'index', p] as const,
|
||||||
show: (name: string) => ['tags', name] as const }
|
show: (name: string) => ['tags', name] as const,
|
||||||
|
changes: (p: { id?: string; page: number; limit: number }) =>
|
||||||
|
['tags', 'changes', p] as const }
|
||||||
|
|
||||||
export const wikiKeys = {
|
export const wikiKeys = {
|
||||||
root: ['wiki'] as const,
|
root: ['wiki'] as const,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { apiGet } from '@/lib/api'
|
import { apiGet } from '@/lib/api'
|
||||||
|
|
||||||
import type { FetchTagsParams, Tag } from '@/types'
|
import type { FetchTagsParams, Tag, TagVersion } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
export const fetchTags = async (
|
export const fetchTags = async (
|
||||||
@@ -45,3 +45,14 @@ export const fetchTagByName = async (name: string): Promise<Tag | null> => {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const fetchTagChanges = async (
|
||||||
|
{ id, page, limit }: {
|
||||||
|
id?: string
|
||||||
|
page: number
|
||||||
|
limit: number },
|
||||||
|
): Promise<{
|
||||||
|
versions: TagVersion[]
|
||||||
|
count: number }> =>
|
||||||
|
await apiGet ('/tags/versions', { params: { ...(id && { id }), page, limit } })
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
import type { MDXComponents } from 'mdx/types'
|
||||||
|
|
||||||
|
|
||||||
|
export const useMDXComponents = (): MDXComponents => ({ })
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
|
||||||
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
|
import { menuOutline } from '@/components/TopNav'
|
||||||
|
import SectionTitle from '@/components/common/SectionTitle'
|
||||||
|
import MainArea from '@/components/layout/MainArea'
|
||||||
|
import { SITE_TITLE } from '@/config'
|
||||||
|
|
||||||
|
import type { FC } from 'react'
|
||||||
|
|
||||||
|
import type { User } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
|
export default (() => {
|
||||||
|
const menu = menuOutline (
|
||||||
|
{ tag: null, wikiId: null, user: { } as User, pathName: location.pathname })
|
||||||
|
|
||||||
|
return (
|
||||||
|
<MainArea className="md:flex">
|
||||||
|
<Helmet>
|
||||||
|
<title>{`メニュー | ${ SITE_TITLE }`}</title>
|
||||||
|
</Helmet>
|
||||||
|
|
||||||
|
{[...Array (Math.ceil (menu.length / 4)).keys ()].map (i => (
|
||||||
|
<div key={i} className="flex-1 mx-16">
|
||||||
|
{menu.slice (4 * i, 4 * (i + 1)).map ((item, j) => (
|
||||||
|
<section key={j}>
|
||||||
|
<SectionTitle className="font-bold">{item.name}</SectionTitle>
|
||||||
|
<ul>
|
||||||
|
{item.subMenu
|
||||||
|
.filter (subItem => (subItem.visible ?? true))
|
||||||
|
.map ((subItem, k) => ('name' in subItem && (
|
||||||
|
<li key={k}>
|
||||||
|
<PrefetchLink
|
||||||
|
to={subItem.to}
|
||||||
|
target={subItem.to.slice (0, 2) === '//'
|
||||||
|
? '_blank'
|
||||||
|
: undefined}>
|
||||||
|
{subItem.name}
|
||||||
|
</PrefetchLink>
|
||||||
|
</li>)))}
|
||||||
|
</ul>
|
||||||
|
</section>))}
|
||||||
|
</div>))}
|
||||||
|
</MainArea>)
|
||||||
|
}) satisfies FC
|
||||||
@@ -0,0 +1,134 @@
|
|||||||
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
import MainArea from '@/components/layout/MainArea'
|
||||||
|
import { SITE_TITLE } from '@/config'
|
||||||
|
import { dateString } from '@/lib/utils'
|
||||||
|
|
||||||
|
export const lastUpdatedAt = dateString ('2026-04-12', 'hour')
|
||||||
|
|
||||||
|
|
||||||
|
<MainArea>
|
||||||
|
<Helmet>
|
||||||
|
<title>{`利用規約 | ${ SITE_TITLE }`}</title>
|
||||||
|
</Helmet>
|
||||||
|
|
||||||
|
<article className="prose dark:prose-invert mx-auto p-4">
|
||||||
|
# 利用規約
|
||||||
|
|
||||||
|
最終更新日: {lastUpdatedAt}
|
||||||
|
|
||||||
|
この利用規約(以下「本規約」)は、ぼざクリ タグ広場(以下「本サービス」)の利用条件を定めるものです。利用者は、本サービスを利用した時点で、本規約に同意したものとみなされます。
|
||||||
|
|
||||||
|
## 第 1 条 本サービスの位置づけ
|
||||||
|
|
||||||
|
1. 本サービスは、タグ・Wiki・外部リンクの整理を中心とする知識共有基盤です。
|
||||||
|
2. 本サービスの中心価値は、コンテンツそのものの再配布ではなく、タグを軸にした整理、検索、再発見、および周辺知識の蓄積にあります。
|
||||||
|
3. 本サービスは、運営上の必要に応じて、機能、公開範囲、名称、URL、表示内容その他の仕様を変更することがあります。
|
||||||
|
|
||||||
|
## 第 2 条 公開方針と利用者区分
|
||||||
|
|
||||||
|
1. 本サービスは、初回一般公開時点では、**誰でも閲覧できる一方で、投稿・編輯は申請制** とします。
|
||||||
|
2. 初回一般公開時点では、通常の農奴は閲覧のみを行えます。
|
||||||
|
3. 投稿、タグ編輯、Wiki 編輯その他の耕作行為は、運営が承認した利用者(以下「耕作員」)に限って認めます。
|
||||||
|
4. 独裁者は、耕作員に加えて、差戻、削除、利用制限、その他の管理操作を行えます。
|
||||||
|
5. 運営は、履歴管理、差戻、BAN 運用、監査導線その他の運営装備がじゅうぶんに整ったと判断した場合、農奴に一部の編輯権限を開放することがあります。
|
||||||
|
6. 利用者区分、権限範囲、申請条件、承認基準、承認後の取扱いは、運営が必要に応じて定め、変更できます。
|
||||||
|
|
||||||
|
## 第 3 条 利用開始と引継ぎコード
|
||||||
|
|
||||||
|
1. 本サービスでは、一般的な Id. / パスワード方式ではなく、運営が別途定める認証情報または引継ぎコードを用いる場合があります。
|
||||||
|
2. 利用者は、自身に割り当てられた引継ぎコード、認証情報、端末上の保存情報を自己の責任で管理するものとします。
|
||||||
|
3. 利用者は、自己の引継ぎコードまたは認証情報を第 3 者に譲渡、貸与、共有、漏洩してはなりません。
|
||||||
|
4. 引継ぎコードの漏洩、第 3 者利用、紛失、盗用その他の事故によって利用者または第 3 者に生じた損害について、運営は責任を負いません。
|
||||||
|
5. 運営は、本人確認、濫用対策、監査対応または保守のため、利用情報とアクセス元情報を関聯づけて扱うことがあります。
|
||||||
|
|
||||||
|
## 第 4 条 申請制編輯の基本ルール
|
||||||
|
|
||||||
|
1. 耕作員は、タグ整理基盤の品質維持を最優先し、個人的な所有主張ではなく、検索性、再利用性、可読性、整合性を重視して編輯しなければなりません。
|
||||||
|
2. 耕作員は、主観的な好悪、内輪ネタ、報復、私怨、対立誘導のためにタグや Wiki を操作してはなりません。
|
||||||
|
3. 耕作員は、誤りの修正、体系の整理、リンクの保守、知識の補足を目的として編輯を行うものとします。
|
||||||
|
4. 運営は、申請内容、過去の行動、編輯品質、聯絡可能性、運営負荷その他の事情を考慮して、承認、保留、拒否、取消を行えます。
|
||||||
|
5. 耕作員資格は権利ではなく、運営が本サービスの維持のために付与する可撤回の権限です。
|
||||||
|
|
||||||
|
## 第 5 条 禁止事項
|
||||||
|
|
||||||
|
利用者は、以下の行為をしてはなりません。
|
||||||
|
|
||||||
|
1. 法令または公序良俗に違反する行為。
|
||||||
|
2. 犯罪を助長し、またはこれに結びつく行為。
|
||||||
|
3. 著作権、著作者人格権、商標権、肖像権、パブリシティ権、プライバシー権その他第 3 者の権利を侵害する行為。
|
||||||
|
4. 無断転載、違法アップロード、違法複製物、海賊版、権限のない転載先への誘導、またはそれらを正当化、拡散、補助する行為。
|
||||||
|
5. 実在人物に関する名誉毀損、侮辱、差別、脅迫、晒し、つきまとい、嫌がらせ、私刑の扇動その他の加害行為。
|
||||||
|
6. 個人情報、非公開情報、秘匿されるべき情報を本人の承諾なく掲載、送信、共有、推測可能な形で開示する行為。
|
||||||
|
7. 虚偽の情報、誤解を招く情報、出典を偽装した情報、意図的なミスリード、荒らし目的のタグづけ、関係のないタグの大量付与、分類妨碍、検索妨碍その他の品質破壊行為。
|
||||||
|
8. マルウェア、フィッシング、詐欺、誘導広告、悪質なリダイレクト、危険な外部リンクその他利用者または運営に危害を与える行為。
|
||||||
|
9. 本サービスの趣旨に照らして不相当な政治的扇動、宗教勧誘、商業宣伝、連鎖的勧誘、スパム、同一内容の反復送信。
|
||||||
|
10. 未成年の安全に反する行為、児童性的搾取、違法または著しく不適切な性的表現、過度に露骨な性表現や残虐表現を、一般公開導線に無警告で流し込む行為。
|
||||||
|
11. 運営、他の利用者、外部サービスまたは第 3 者に著しい負担、不利益、混乱を生じさせる行為。
|
||||||
|
12. 前各号のいずれかを試みる行為、教唆する行為、容易にする行為。
|
||||||
|
13. その他、運営が本サービスの目的または安全な運営に照らして不適切と判断する行為。
|
||||||
|
|
||||||
|
## 第 6 条 投稿、タグ、Wiki 等の取扱い
|
||||||
|
|
||||||
|
1. 利用者は、自らが投稿、編輯、登録、送信または変更する情報について、必要な権利を有し、または適法に利用できる状態でなければなりません。
|
||||||
|
2. 利用者は、自らが行った投稿、タグづけ、Wiki 編輯、説明文、コメント、関聯づけその他の行為について責任を負います。
|
||||||
|
3. 利用者は、運営に対し、本サービスの運営、表示、複製、保存、配信、整形、引用、履歴表示、差戻、バックアップ、障碍対応および弘報のために必要な範囲で、当該利用者生成情報を無償で利用する非独占的な権利を許諾するものとします。
|
||||||
|
4. 前項の許諾は、本サービスの運営上必要な範囲に限られ、利用者の権利帰属自体を運営へ移転するものではありません。
|
||||||
|
5. 運営は、分類整合性、表記統一、誤記修正、別名統合、差戻その他の理由により、投稿、タグ、Wiki その他の内容を編輯、非表示化、削除、統合、分割または凍結できます。
|
||||||
|
|
||||||
|
## 第 7 条 外部リンクと埋め込み
|
||||||
|
|
||||||
|
1. 本サービスは、外部サイトへのリンク、外部コンテンツの埋め込みまたはそれらに関するメタデータを表示する場合があります。
|
||||||
|
2. 外部リンク先または埋め込み先の権利、利用条件、公開範囲、削除方針、広告、追跡、Cookie その他の取扱いは、当該外部サービスの定めに従います。
|
||||||
|
3. 運営は、外部リンク先の適法性、安全性、継続性、正確性、品質、可用性、または内容の完全性を保証しません。
|
||||||
|
4. 外部権利者からの申立て、運営判断、法令対応または安全性確保のため、運営は外部リンク、埋め込み、サムネイル、説明文その他の表示を制限、差替え、非表示または削除できます。
|
||||||
|
|
||||||
|
## 第 8 条 履歴、差戻、削除
|
||||||
|
|
||||||
|
1. 本サービスでは、保守、監査、荒らし対策、説明責任その他の目的で、投稿、タグ、Wiki その他の変更履歴を保持し、表示し、または内部的に参照することがあります。
|
||||||
|
2. 利用者は、一度行った編輯が、後に差戻、修正、非表示化または削除されることがあることをあらかじめ承諾するものとします。
|
||||||
|
3. 利用者が削除を希望した場合でも、法令上、保守上、監査上、紛争対応上またはバックアップ上の必要により、直ちに完全消去できないことがあります。
|
||||||
|
4. 運営は、本サービス全体の健全性を維持するため、説明の有無を問わず、履歴の表示範囲、保存期間、差戻方針、削除方針を定め、変更できます。
|
||||||
|
|
||||||
|
## 第 9 条 利用制限、資格取消、BAN
|
||||||
|
|
||||||
|
1. 運営は、利用者が次のいずれかに該当すると判断した場合、事前の通知なく、または通知後に、投稿・編輯の制限、耕作員資格の取消、コンテンツの非表示または削除、引継ぎコードの失効、ユーザ BAN、IP BAN その他必要な措置を行えます。
|
||||||
|
- 本規約に違反した場合
|
||||||
|
- 本サービスの趣旨に反する運用妨碍、荒らし、品質破壊行為を行った場合
|
||||||
|
- 運営からの確認、修正要請、停止要請に合理的理由なく応じない場合
|
||||||
|
- 登録情報、申請内容または説明に虚偽がある場合
|
||||||
|
- 安全性、法令順守、運営継続の観点から措置が必要と判断された場合
|
||||||
|
2. 運営は、前項の措置について、その理由、基準、証拠または内部判断過程を常に開示する義務を負いません。
|
||||||
|
3. 利用制限または資格取消後も、運営は、必要に応じて履歴、ログ、申請記録、通報記録その他のデータを保持できます。
|
||||||
|
|
||||||
|
## 第 10 条 未成年の利用
|
||||||
|
|
||||||
|
1. 運営は、未成年の安全確保の観点から、年齢に応じた表示制限、導線制御、非表示化、削除、申請拒否その他の措置を行えます。
|
||||||
|
2. 利用者は、未成年が閲覧しうる一般公開面において、未成年に不適切な内容を無警告で流し込まないものとします。
|
||||||
|
|
||||||
|
## 第 11 条 お問い合わせ、通報、御意見番
|
||||||
|
|
||||||
|
1. 利用者は、本サービスが別途案内する問い合わせ、通報または御意見板の導線を通じて、バグ報告、問題報告、削除要請その他の聯絡を行えます。
|
||||||
|
2. 運営は、すべての問い合わせに回答する義務を負わず、回答期限、対応結果または対応方法を保証しません。
|
||||||
|
|
||||||
|
## 第 12 条 免責
|
||||||
|
|
||||||
|
1. 運営は、本サービスについて、特定目的適合性、完全性、正確性、継続性、安全性、無瑕疵性、または利用者の期待への適合を保証しません。
|
||||||
|
2. 運営は、外部リンク先、外部埋め込み先、第 3 者投稿、利用者同士の紛争、通信障碍、データ消失、誤分類、誤リンク、誤記、差戻、機能停止または仕様変更によって生じた損害について、責任を負いません。
|
||||||
|
3. 本サービスは、予告なく停止、終了、変更または縮小されることがあります。
|
||||||
|
|
||||||
|
## 第 13 条 規約の変更
|
||||||
|
|
||||||
|
1. 運営は、法令改正、機能追加、運用方針の変更、安全対策、表現調整その他の理由により、本規約を変更できます。
|
||||||
|
2. 変更後の本規約は、本サービス上に掲載された時点または運営が別途定める時点から効力を生じます。
|
||||||
|
3. 変更後に利用を継続した利用者は、変更後の本規約に同意したものとみなされます。
|
||||||
|
|
||||||
|
## 第 14 条 準拠法および管轄
|
||||||
|
|
||||||
|
1. 本規約および本サービスの利用には、日本法を準拠法とします。
|
||||||
|
2. 本規約または本サービスに関して生じた一切の紛争については、運営の所在地を管轄する裁判所を第 1 審の専属的合意管轄裁判所とします。ただし、法令に別段の定めがある場合はこの限りではありません。
|
||||||
|
|
||||||
|
## 附則
|
||||||
|
|
||||||
|
本規約は、{lastUpdatedAt} から適用します。
|
||||||
|
</article>
|
||||||
|
</MainArea>
|
||||||
@@ -6,8 +6,7 @@ import type { FC } from 'react'
|
|||||||
|
|
||||||
|
|
||||||
export default (() => (
|
export default (() => (
|
||||||
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden
|
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
||||||
md:h-[calc(100dvh-88px)]">
|
|
||||||
<MaterialSidebar/>
|
<MaterialSidebar/>
|
||||||
<Outlet/>
|
<Outlet/>
|
||||||
</div>)) satisfies FC
|
</div>)) satisfies FC
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import ServiceUnavailable from '@/pages/ServiceUnavailable'
|
|||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
import type { NiconicoViewerHandle, User } from '@/types'
|
import type { NiconicoViewerHandle, Post, User } from '@/types'
|
||||||
|
|
||||||
type Props = { user: User | null }
|
type Props = { user: User | null }
|
||||||
|
|
||||||
@@ -93,11 +93,10 @@ export default (({ user }: Props) => {
|
|||||||
: 'bg-gray-500 hover:bg-gray-600')
|
: 'bg-gray-500 hover:bg-gray-600')
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden
|
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
||||||
md:h-[calc(100dvh-88px)]">
|
|
||||||
<Helmet>
|
<Helmet>
|
||||||
{(post?.thumbnail || post?.thumbnailBase) && (
|
{(post?.thumbnail || post?.thumbnailBase) && (
|
||||||
<meta name="thumbnail" content={post.thumbnail || post.thumbnailBase}/>)}
|
<meta name="thumbnail" content={post.thumbnail! || post.thumbnailBase!}/>)}
|
||||||
{post && <title>{`${ post.title || post.url } | ${ SITE_TITLE }`}</title>}
|
{post && <title>{`${ post.title || post.url } | ${ SITE_TITLE }`}</title>}
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
@@ -109,6 +108,34 @@ export default (({ user }: Props) => {
|
|||||||
{post
|
{post
|
||||||
? (
|
? (
|
||||||
<>
|
<>
|
||||||
|
{(post.childPosts ?? []).length > 0 && (
|
||||||
|
<div className="mb-4 bg-green-200 dark:bg-green-800 text-sm p-2 rounded-md">
|
||||||
|
<p>この投稿には {post.childPosts!.length} 件の子投稿があります.</p>
|
||||||
|
<PostList posts={[{ ...post, childPosts: [{ } as Post] },
|
||||||
|
...post.childPosts!.map (p => ({
|
||||||
|
...p, parentPosts: [{ } as Post] }))]}/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{(post.parentPosts ?? []).map (pp => {
|
||||||
|
const siblings = post.siblingPosts?.[String (pp.id) as `${ number }`]
|
||||||
|
if (!(siblings))
|
||||||
|
return
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
key={pp.id}
|
||||||
|
className="mb-4 bg-yellow-200 dark:bg-yellow-800 text-sm p-2 rounded-md">
|
||||||
|
<p>
|
||||||
|
この投稿には 1 件の親投稿{
|
||||||
|
siblings.length > 1
|
||||||
|
&& `と ${ siblings.length - 1 } 件の姉妹投稿`}があります.
|
||||||
|
</p>
|
||||||
|
<PostList posts={[{ ...pp, childPosts: [{ } as Post] },
|
||||||
|
...siblings.map (p => ({
|
||||||
|
...p, parentPosts: [{ } as Post] }))]}/>
|
||||||
|
</div>)
|
||||||
|
})}
|
||||||
|
|
||||||
{(post.thumbnail || post.thumbnailBase) && (
|
{(post.thumbnail || post.thumbnailBase) && (
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={`page-${ id }`}
|
layoutId={`page-${ id }`}
|
||||||
@@ -117,7 +144,7 @@ export default (({ user }: Props) => {
|
|||||||
initial={{ opacity: 1 }}
|
initial={{ opacity: 1 }}
|
||||||
animate={{ opacity: 0 }}
|
animate={{ opacity: 0 }}
|
||||||
transition={{ duration: .2, ease: 'easeOut' }}>
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
<img src={post.thumbnail || post.thumbnailBase}
|
<img src={post.thumbnail || post.thumbnailBase || undefined}
|
||||||
alt={post.title || post.url}
|
alt={post.title || post.url}
|
||||||
title={post.title || post.url || undefined}
|
title={post.title || post.url || undefined}
|
||||||
className="object-cover w-full h-full"/>
|
className="object-cover w-full h-full"/>
|
||||||
@@ -147,7 +174,6 @@ export default (({ user }: Props) => {
|
|||||||
(prev: any) => newPost ?? prev)
|
(prev: any) => newPost ?? prev)
|
||||||
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
||||||
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
||||||
toast ({ description: '更新しました.' })
|
|
||||||
}}/>
|
}}/>
|
||||||
</Tab>)}
|
</Tab>)}
|
||||||
</TabGroup>
|
</TabGroup>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useQuery } from '@tanstack/react-query'
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
import { motion } from 'framer-motion'
|
import { motion } from 'framer-motion'
|
||||||
import { useEffect } from 'react'
|
import { useEffect } from 'react'
|
||||||
import { Helmet } from 'react-helmet-async'
|
import { Helmet } from 'react-helmet-async'
|
||||||
@@ -9,15 +9,30 @@ import PrefetchLink from '@/components/PrefetchLink'
|
|||||||
import PageTitle from '@/components/common/PageTitle'
|
import PageTitle from '@/components/common/PageTitle'
|
||||||
import Pagination from '@/components/common/Pagination'
|
import Pagination from '@/components/common/Pagination'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
|
import { apiPut } from '@/lib/api'
|
||||||
import { fetchPostChanges } from '@/lib/posts'
|
import { fetchPostChanges } from '@/lib/posts'
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchTag } from '@/lib/tags'
|
import { fetchTag } from '@/lib/tags'
|
||||||
import { cn, dateString } from '@/lib/utils'
|
import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
|
|
||||||
|
const renderDiff = (diff: { current: string | null; prev: string | null }) => (
|
||||||
|
<>
|
||||||
|
{(diff.prev && diff.prev !== diff.current) && (
|
||||||
|
<>
|
||||||
|
<del className="text-red-600 dark:text-red-400">
|
||||||
|
{diff.prev}
|
||||||
|
</del>
|
||||||
|
{diff.current && <br/>}
|
||||||
|
</>)}
|
||||||
|
{diff.current}
|
||||||
|
</>)
|
||||||
|
|
||||||
|
|
||||||
export default (() => {
|
export default (() => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
@@ -36,15 +51,17 @@ export default (() => {
|
|||||||
: { data: null }
|
: { data: null }
|
||||||
|
|
||||||
const { data, isLoading: loading } = useQuery ({
|
const { data, isLoading: loading } = useQuery ({
|
||||||
queryKey: postsKeys.changes ({ ...(id && { id }),
|
queryKey: postsKeys.changes ({ ...(id && { post: id }),
|
||||||
...(tagId && { tag: tagId }),
|
...(tagId && { tag: tagId }),
|
||||||
page, limit }),
|
page, limit }),
|
||||||
queryFn: () => fetchPostChanges ({ ...(id && { id }),
|
queryFn: () => fetchPostChanges ({ ...(id && { post: id }),
|
||||||
...(tagId && { tag: tagId }),
|
...(tagId && { tag: tagId }),
|
||||||
page, limit }) })
|
page, limit }) })
|
||||||
const changes = data?.changes ?? []
|
const changes = data?.versions ?? []
|
||||||
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
||||||
|
|
||||||
|
const qc = useQueryClient ()
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
}, [location.search])
|
}, [location.search])
|
||||||
@@ -65,76 +82,203 @@ export default (() => {
|
|||||||
|
|
||||||
{loading ? 'Loading...' : (
|
{loading ? 'Loading...' : (
|
||||||
<>
|
<>
|
||||||
<table className="table-auto w-full border-collapse">
|
<div className="overflow-x-auto">
|
||||||
<thead className="border-b-2 border-black dark:border-white">
|
<table className="w-full min-w-[1200px] table-fixed border-collapse">
|
||||||
<tr>
|
<colgroup>
|
||||||
<th className="p-2 text-left">投稿</th>
|
{/* 投稿 */}
|
||||||
<th className="p-2 text-left">変更</th>
|
<col className="w-64"/>
|
||||||
<th className="p-2 text-left">日時</th>
|
{/* 版 */}
|
||||||
</tr>
|
<col className="w-40"/>
|
||||||
</thead>
|
{/* タイトル */}
|
||||||
<tbody>
|
<col className="w-96"/>
|
||||||
{changes.map ((change, i) => {
|
{/* URL */}
|
||||||
const withPost = i === 0 || change.post.id !== changes[i - 1].post.id
|
<col className="w-96"/>
|
||||||
if (withPost)
|
{/* タグ */}
|
||||||
{
|
<col className="w-[48rem]"/>
|
||||||
rowsCnt = 1
|
{/* TODO: 親投稿 */}
|
||||||
for (let j = i + 1;
|
{/* <col className="w-[48rem]"/> */}
|
||||||
(j < changes.length
|
{/* オリジナルの投稿日時 */}
|
||||||
&& change.post.id === changes[j].post.id);
|
<col className="w-96"/>
|
||||||
++j)
|
{/* 更新日時 */}
|
||||||
++rowsCnt
|
<col className="w-64"/>
|
||||||
}
|
{/* (差戻ボタン) */}
|
||||||
|
<col className="w-20"/>
|
||||||
|
</colgroup>
|
||||||
|
|
||||||
let layoutId: string | undefined = `page-${ change.post.id }`
|
<thead className="border-b-2 border-black dark:border-white">
|
||||||
if (layoutIds.includes (layoutId))
|
<tr>
|
||||||
layoutId = undefined
|
<th className="p-2 text-left">投稿</th>
|
||||||
else
|
<th className="p-2 text-left">版</th>
|
||||||
layoutIds.push (layoutId)
|
<th className="p-2 text-left">タイトル</th>
|
||||||
|
<th className="p-2 text-left">URL</th>
|
||||||
|
<th className="p-2 text-left">タグ</th>
|
||||||
|
{/* TODO: 親投稿の履歴 */}
|
||||||
|
{/* <th className="p-2 text-left">親投稿</th> */}
|
||||||
|
<th className="p-2 text-left">オリジナルの投稿日時</th>
|
||||||
|
<th className="p-2 text-left">更新日時</th>
|
||||||
|
<th className="p-2"/>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
return (
|
<tbody>
|
||||||
<tr key={`${ change.timestamp }-${ change.post.id }-${ change.tag?.id }`}
|
{changes.map ((change, i) => {
|
||||||
className={cn ('even:bg-gray-100 dark:even:bg-gray-700',
|
const withPost = i === 0 || change.postId !== changes[i - 1].postId
|
||||||
withPost && 'border-t')}>
|
if (withPost)
|
||||||
{withPost && (
|
{
|
||||||
<td className="align-top p-2 bg-white dark:bg-[#242424] border-r"
|
rowsCnt = 1
|
||||||
rowSpan={rowsCnt}>
|
for (let j = i + 1;
|
||||||
<PrefetchLink to={`/posts/${ change.post.id }`}>
|
(j < changes.length
|
||||||
<motion.div
|
&& change.postId === changes[j].postId);
|
||||||
layoutId={layoutId}
|
++j)
|
||||||
transition={{ type: 'spring',
|
++rowsCnt
|
||||||
stiffness: 500,
|
}
|
||||||
damping: 40,
|
|
||||||
mass: .5 }}>
|
let layoutId: string | undefined = `page-${ change.postId }`
|
||||||
<img src={change.post.thumbnail
|
if (layoutIds.includes (layoutId))
|
||||||
|| change.post.thumbnailBase
|
layoutId = undefined
|
||||||
|| undefined}
|
else
|
||||||
alt={change.post.title || change.post.url}
|
layoutIds.push (layoutId)
|
||||||
title={change.post.title || change.post.url || undefined}
|
|
||||||
className="w-40"/>
|
return (
|
||||||
</motion.div>
|
<tr key={`${ change.postId }.${ change.versionNo }`}
|
||||||
</PrefetchLink>
|
className={cn ('even:bg-gray-100 dark:even:bg-gray-700',
|
||||||
</td>)}
|
withPost && 'border-t')}>
|
||||||
<td className="p-2">
|
{withPost && (
|
||||||
{change.tag
|
<td className="align-top p-2 bg-white dark:bg-[#242424] border-r"
|
||||||
? <TagLink tag={change.tag} withWiki={false} withCount={false}/>
|
rowSpan={rowsCnt}>
|
||||||
: '(マスタ削除済のタグ) '}
|
<PrefetchLink to={`/posts/${ change.postId }`}>
|
||||||
{`を${ change.changeType === 'add' ? '記載' : '消除' }`}
|
<motion.div
|
||||||
</td>
|
layoutId={layoutId}
|
||||||
<td className="p-2">
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
{change.user
|
<img src={change.thumbnail.current
|
||||||
? (
|
|| change.thumbnailBase.current
|
||||||
<PrefetchLink to={`/users/${ change.user.id }`}>
|
|| undefined}
|
||||||
{change.user.name}
|
alt={change.title.current || change.url.current}
|
||||||
</PrefetchLink>)
|
title={change.title.current || change.url.current || undefined}
|
||||||
: 'bot 操作'}
|
className="w-40"/>
|
||||||
<br/>
|
</motion.div>
|
||||||
{dateString (change.timestamp)}
|
</PrefetchLink>
|
||||||
</td>
|
</td>)}
|
||||||
</tr>)
|
<td className="p-2">{change.postId}.{change.versionNo}</td>
|
||||||
})}
|
<td className="p-2 break-all">{renderDiff (change.title)}</td>
|
||||||
</tbody>
|
<td className="p-2 break-all">{renderDiff (change.url)}</td>
|
||||||
</table>
|
<td className="p-2">
|
||||||
|
{change.tags.map ((tag, i) => (
|
||||||
|
tag.type === 'added'
|
||||||
|
? (
|
||||||
|
<ins
|
||||||
|
key={i}
|
||||||
|
className="mr-2 text-green-600 dark:text-green-400">
|
||||||
|
{tag.name}
|
||||||
|
</ins>)
|
||||||
|
: (
|
||||||
|
tag.type === 'removed'
|
||||||
|
? (
|
||||||
|
<del
|
||||||
|
key={i}
|
||||||
|
className="mr-2 text-red-600 dark:text-red-400">
|
||||||
|
{tag.name}
|
||||||
|
</del>)
|
||||||
|
: (
|
||||||
|
<span key={i} className="mr-2">
|
||||||
|
{tag.name}
|
||||||
|
</span>))))}
|
||||||
|
</td>
|
||||||
|
{/* TODO: 親投稿の履歴 */}
|
||||||
|
{/* <td className="p-2">
|
||||||
|
{change.parentPosts.map ((pp, i) => (
|
||||||
|
pp.type === 'added'
|
||||||
|
? (
|
||||||
|
<ins
|
||||||
|
key={i}
|
||||||
|
className="mr-2 text-green-600 dark:text-green-400">
|
||||||
|
{pp.title}
|
||||||
|
</ins>)
|
||||||
|
: (
|
||||||
|
pp.type === 'removed'
|
||||||
|
? (
|
||||||
|
<del
|
||||||
|
key={i}
|
||||||
|
className="mr-2 text-red-600 dark:text-red-400">
|
||||||
|
{pp.title}
|
||||||
|
</del>)
|
||||||
|
: (
|
||||||
|
<span key={i} className="mr-2">
|
||||||
|
{pp.title}
|
||||||
|
</span>))))}
|
||||||
|
</td> */}
|
||||||
|
<td className="p-2">
|
||||||
|
{change.versionNo === 1
|
||||||
|
? originalCreatedAtString (change.originalCreatedFrom.current,
|
||||||
|
change.originalCreatedBefore.current)
|
||||||
|
: renderDiff ({
|
||||||
|
current: originalCreatedAtString (
|
||||||
|
change.originalCreatedFrom.current,
|
||||||
|
change.originalCreatedBefore.current),
|
||||||
|
prev: originalCreatedAtString (
|
||||||
|
change.originalCreatedFrom.prev,
|
||||||
|
change.originalCreatedBefore.prev) })}
|
||||||
|
</td>
|
||||||
|
<td className="p-2">
|
||||||
|
{change.createdByUser
|
||||||
|
? (
|
||||||
|
<PrefetchLink to={`/users/${ change.createdByUser.id }`}>
|
||||||
|
{change.createdByUser.name
|
||||||
|
|| `名もなきニジラー(#${ change.createdByUser.id })`}
|
||||||
|
</PrefetchLink>)
|
||||||
|
: 'bot 操作'}
|
||||||
|
<br/>
|
||||||
|
{dateString (change.createdAt)}
|
||||||
|
</td>
|
||||||
|
<td className="p-2">
|
||||||
|
<a
|
||||||
|
href="#"
|
||||||
|
onClick={async e => {
|
||||||
|
e.preventDefault ()
|
||||||
|
|
||||||
|
if (!(confirm (
|
||||||
|
`『${ change.title.current
|
||||||
|
|| change.url.current }』を版 ${
|
||||||
|
change.versionNo } に差戻します.\nよろしいですか?`)))
|
||||||
|
return
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await apiPut (
|
||||||
|
`/posts/${ change.postId }`,
|
||||||
|
{ title: change.title.current,
|
||||||
|
tags: change.tags
|
||||||
|
.filter (t => t.type !== 'removed')
|
||||||
|
.map (t => t.name)
|
||||||
|
.filter (t => t.slice (0, 5) !== 'nico:')
|
||||||
|
.join (' '),
|
||||||
|
parent_post_ids:
|
||||||
|
(change.parentPosts ?? [])
|
||||||
|
.filter (p => p.type !== 'removed')
|
||||||
|
.map (p => p.id)
|
||||||
|
.join (' '),
|
||||||
|
original_created_from:
|
||||||
|
change.originalCreatedFrom.current,
|
||||||
|
original_created_before:
|
||||||
|
change.originalCreatedBefore.current })
|
||||||
|
|
||||||
|
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
||||||
|
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
||||||
|
toast ({ description: '差戻しました.' })
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
toast ({ description: '差戻に失敗……' })
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
復元
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>)
|
||||||
|
})}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
<Pagination page={page} totalPages={totalPages}/>
|
<Pagination page={page} totalPages={totalPages}/>
|
||||||
</>)}
|
</>)}
|
||||||
|
|||||||
@@ -70,8 +70,7 @@ export default (() => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden
|
className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden"
|
||||||
md:h-[calc(100dvh-88px)]"
|
|
||||||
ref={containerRef}>
|
ref={containerRef}>
|
||||||
<Helmet>
|
<Helmet>
|
||||||
<title>
|
<title>
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ export default (({ user }: Props) => {
|
|||||||
|
|
||||||
const [originalCreatedBefore, setOriginalCreatedBefore] = useState<string | null> (null)
|
const [originalCreatedBefore, setOriginalCreatedBefore] = useState<string | null> (null)
|
||||||
const [originalCreatedFrom, setOriginalCreatedFrom] = useState<string | null> (null)
|
const [originalCreatedFrom, setOriginalCreatedFrom] = useState<string | null> (null)
|
||||||
|
const [parentPostIds, setParentPostIds] = useState ('')
|
||||||
const [tags, setTags] = useState ('')
|
const [tags, setTags] = useState ('')
|
||||||
const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
|
const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
|
||||||
const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
|
const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
|
||||||
@@ -46,6 +47,7 @@ export default (({ user }: Props) => {
|
|||||||
formData.append ('title', title)
|
formData.append ('title', title)
|
||||||
formData.append ('url', url)
|
formData.append ('url', url)
|
||||||
formData.append ('tags', tags)
|
formData.append ('tags', tags)
|
||||||
|
formData.append ('parent_post_ids', parentPostIds)
|
||||||
if (thumbnailFile)
|
if (thumbnailFile)
|
||||||
formData.append ('thumbnail', thumbnailFile)
|
formData.append ('thumbnail', thumbnailFile)
|
||||||
if (originalCreatedFrom)
|
if (originalCreatedFrom)
|
||||||
@@ -177,6 +179,16 @@ export default (({ user }: Props) => {
|
|||||||
className="mt-2 max-h-48 rounded border"/>)}
|
className="mt-2 max-h-48 rounded border"/>)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* 親投稿 */}
|
||||||
|
<div>
|
||||||
|
<Label>親投稿</Label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
value={parentPostIds}
|
||||||
|
onChange={e => setParentPostIds (e.target.value)}
|
||||||
|
className="w-full border p-2 rounded"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
||||||
|
|
||||||
|
|||||||
@@ -289,7 +289,7 @@ export default (() => {
|
|||||||
{results.map (row => (
|
{results.map (row => (
|
||||||
<tr key={row.id} className="even:bg-gray-100 dark:even:bg-gray-700">
|
<tr key={row.id} className="even:bg-gray-100 dark:even:bg-gray-700">
|
||||||
<td className="p-2">
|
<td className="p-2">
|
||||||
<PrefetchLink to={`/posts/${ row.id }`} title={row.title}>
|
<PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={`page-${ row.id }`}
|
layoutId={`page-${ row.id }`}
|
||||||
transition={{ type: 'spring',
|
transition={{ type: 'spring',
|
||||||
@@ -304,7 +304,7 @@ export default (() => {
|
|||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
</td>
|
</td>
|
||||||
<td className="p-2 truncate">
|
<td className="p-2 truncate">
|
||||||
<PrefetchLink to={`/posts/${ row.id }`} title={row.title}>
|
<PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
|
||||||
{row.title}
|
{row.title}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
import { useParams } from 'react-router-dom'
|
||||||
|
|
||||||
|
import TagLink from '@/components/TagLink'
|
||||||
|
import Label from '@/components/common/Label'
|
||||||
|
import PageTitle from '@/components/common/PageTitle'
|
||||||
|
import MainArea from '@/components/layout/MainArea'
|
||||||
|
import { toast } from '@/components/ui/use-toast'
|
||||||
|
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
||||||
|
import { apiPut } from '@/lib/api'
|
||||||
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
|
import { fetchTag } from '@/lib/tags'
|
||||||
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
|
import type { FC, FormEvent } from 'react'
|
||||||
|
|
||||||
|
import type { Category, Tag } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
|
export default (() => {
|
||||||
|
const { id } = useParams ()
|
||||||
|
const tagId = String (id ?? '')
|
||||||
|
const tagKey = tagsKeys.show (tagId)
|
||||||
|
|
||||||
|
const { data: tag, isLoading: loading } = useQuery ({
|
||||||
|
queryKey: tagKey,
|
||||||
|
queryFn: () => fetchTag (tagId) })
|
||||||
|
|
||||||
|
const [name, setName] = useState ('')
|
||||||
|
const [category, setCategory] = useState<Category> ('general')
|
||||||
|
const [aliases, setAliases] = useState ('')
|
||||||
|
const [parentTags, setParentTags] = useState ('')
|
||||||
|
const [disabled, setDisabled] = useState (true)
|
||||||
|
|
||||||
|
const qc = useQueryClient ()
|
||||||
|
|
||||||
|
const handleSubmit = async (e: FormEvent) => {
|
||||||
|
e.preventDefault ()
|
||||||
|
|
||||||
|
const formData = new FormData
|
||||||
|
formData.append ('name', name)
|
||||||
|
formData.append ('category', category)
|
||||||
|
formData.append ('aliases', aliases)
|
||||||
|
formData.append ('parent_tags', parentTags)
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
const data = await apiPut<Tag> (`/tags/${ id }`, formData)
|
||||||
|
|
||||||
|
setName (data.name)
|
||||||
|
setCategory (data.category as Category)
|
||||||
|
setAliases (data.aliases.join (' '))
|
||||||
|
setParentTags (data.parents.map (t => t.name).join (' '))
|
||||||
|
|
||||||
|
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
||||||
|
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
||||||
|
toast ({ description: '更新しました.' })
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
toast ({ description: '更新に失敗しました.' })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
useEffect (() => {
|
||||||
|
if (!(tag))
|
||||||
|
{
|
||||||
|
setDisabled (true)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setName (tag.name)
|
||||||
|
setCategory (tag.category as Category)
|
||||||
|
setAliases (tag.aliases.join (' '))
|
||||||
|
setParentTags (tag.parents.map (t => t.name).join (' '))
|
||||||
|
setDisabled (tag.category === 'nico')
|
||||||
|
}, [tag])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<MainArea>
|
||||||
|
{(loading || !(tag)) ? 'Loading...' : (
|
||||||
|
<div className="max-w-xl">
|
||||||
|
<PageTitle>
|
||||||
|
<TagLink
|
||||||
|
tag={tag}
|
||||||
|
withWiki={false}
|
||||||
|
withCount={false}/>
|
||||||
|
</PageTitle>
|
||||||
|
|
||||||
|
<form onSubmit={handleSubmit} className="my-4 space-y-2">
|
||||||
|
{/* 名称 */}
|
||||||
|
<div>
|
||||||
|
<Label>名称</Label>
|
||||||
|
{/* TODO: 補完に対応させる */}
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
disabled={disabled}
|
||||||
|
value={name}
|
||||||
|
onChange={e => setName (e.target.value)}
|
||||||
|
className="w-full border p-2 rounded"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* カテゴリ */}
|
||||||
|
<div>
|
||||||
|
<Label>カテゴリ</Label>
|
||||||
|
<select
|
||||||
|
disabled={disabled}
|
||||||
|
value={category ?? ''}
|
||||||
|
onChange={e => setCategory(e.target.value as Category)}
|
||||||
|
className="w-full border p-2 rounded">
|
||||||
|
{CATEGORIES.filter (cat => tag.category === 'nico' || cat !== 'nico')
|
||||||
|
.map (cat => (
|
||||||
|
<option key={cat} value={cat}>
|
||||||
|
{CATEGORY_NAMES[cat]}
|
||||||
|
</option>))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 別名 */}
|
||||||
|
<div>
|
||||||
|
<Label>別名</Label>
|
||||||
|
{/* TODO: 補完に対応させる */}
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
disabled={disabled}
|
||||||
|
value={aliases}
|
||||||
|
onChange={e => setAliases (e.target.value)}
|
||||||
|
className="w-full border p-2 rounded"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 上位タグ */}
|
||||||
|
<div>
|
||||||
|
<Label>上位タグ</Label>
|
||||||
|
{/* TODO: 補完に対応させる */}
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
disabled={disabled}
|
||||||
|
value={parentTags}
|
||||||
|
onChange={e => setParentTags (e.target.value)}
|
||||||
|
className="w-full border p-2 rounded"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="py-3">
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
disabled={disabled}
|
||||||
|
className={cn ('px-4 py-2 rounded',
|
||||||
|
(disabled
|
||||||
|
? 'text-gray-300 bg-gray-500'
|
||||||
|
: 'text-white bg-blue-500'))}>
|
||||||
|
更新
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>)}
|
||||||
|
</MainArea>)
|
||||||
|
}) satisfies FC
|
||||||
@@ -0,0 +1,212 @@
|
|||||||
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
|
import { useEffect } from 'react'
|
||||||
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
import { useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
|
import PageTitle from '@/components/common/PageTitle'
|
||||||
|
import Pagination from '@/components/common/Pagination'
|
||||||
|
import MainArea from '@/components/layout/MainArea'
|
||||||
|
import { toast } from '@/components/ui/use-toast'
|
||||||
|
import { SITE_TITLE } from '@/config'
|
||||||
|
import { CATEGORY_NAMES } from '@/consts'
|
||||||
|
import { apiPut } from '@/lib/api'
|
||||||
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
|
import { fetchTagChanges } from '@/lib/tags'
|
||||||
|
import { cn, dateString } from '@/lib/utils'
|
||||||
|
|
||||||
|
import type { FC } from 'react'
|
||||||
|
|
||||||
|
|
||||||
|
const renderDiff = (diff: { current: string | null; prev: string | null }) => (
|
||||||
|
<>
|
||||||
|
{(diff.prev && diff.prev !== diff.current) && (
|
||||||
|
<>
|
||||||
|
<del className="text-red-600 dark:text-red-400">
|
||||||
|
{diff.prev}
|
||||||
|
</del>
|
||||||
|
{diff.current && <br/>}
|
||||||
|
</>)}
|
||||||
|
{diff.current}
|
||||||
|
</>)
|
||||||
|
|
||||||
|
|
||||||
|
export default (() => {
|
||||||
|
const location = useLocation ()
|
||||||
|
const query = new URLSearchParams (location.search)
|
||||||
|
const id = query.get ('id')
|
||||||
|
const page = Number (query.get ('page') ?? 1)
|
||||||
|
const limit = Number (query.get ('limit') ?? 20)
|
||||||
|
|
||||||
|
const { data, isLoading: loading } = useQuery ({
|
||||||
|
queryKey: tagsKeys.changes ({ ...(id && { id }), page, limit }),
|
||||||
|
queryFn: () => fetchTagChanges ({ ...(id && { id }), page, limit }) })
|
||||||
|
const changes = data?.versions ?? []
|
||||||
|
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
||||||
|
|
||||||
|
const qc = useQueryClient ()
|
||||||
|
|
||||||
|
useEffect (() => {
|
||||||
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
|
}, [location.search])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<MainArea>
|
||||||
|
<Helmet>
|
||||||
|
<title>{`タグ定義変更履歴 | ${ SITE_TITLE }`}</title>
|
||||||
|
</Helmet>
|
||||||
|
|
||||||
|
<PageTitle>
|
||||||
|
タグ定義変更履歴
|
||||||
|
{id && <>: タグ {<PrefetchLink to={`/tags/${ id }`}>#{id}</PrefetchLink>}</>}
|
||||||
|
</PageTitle>
|
||||||
|
|
||||||
|
{loading ? 'Loading...' : (
|
||||||
|
<>
|
||||||
|
<div className="overflow-x-auto">
|
||||||
|
<table className="w-full min-w-[1200px] table-fixed border-collapse">
|
||||||
|
<colgroup>
|
||||||
|
{/* 版 */}
|
||||||
|
<col className="w-40"/>
|
||||||
|
{/* 名称 */}
|
||||||
|
<col className="w-96"/>
|
||||||
|
{/* カテゴリ */}
|
||||||
|
<col className="w-96"/>
|
||||||
|
{/* 別名 */}
|
||||||
|
<col className="w-[48rem]"/>
|
||||||
|
{/* 上位タグ */}
|
||||||
|
<col className="w-96"/>
|
||||||
|
{/* 更新日時 */}
|
||||||
|
<col className="w-64"/>
|
||||||
|
{/* (差戻ボタン) */}
|
||||||
|
<col className="w-20"/>
|
||||||
|
</colgroup>
|
||||||
|
|
||||||
|
<thead className="border-b-2 border-black dark:border-white">
|
||||||
|
<tr>
|
||||||
|
<th className="p-2 text-left">版</th>
|
||||||
|
<th className="p-2 text-left">名称</th>
|
||||||
|
<th className="p-2 text-left">カテゴリ</th>
|
||||||
|
<th className="p-2 text-left">別名</th>
|
||||||
|
<th className="p-2 text-left">上位タグ</th>
|
||||||
|
<th className="p-2 text-left">更新日時</th>
|
||||||
|
<th className="p-2"/>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
|
||||||
|
<tbody>
|
||||||
|
{changes.map (change => (
|
||||||
|
<tr key={`${ change.tagId }.${ change.versionNo }`}
|
||||||
|
className={cn ('even:bg-gray-100 dark:even:bg-gray-700')}>
|
||||||
|
<td className="p-2">{change.tagId}.{change.versionNo}</td>
|
||||||
|
<td className="p-2 break-all">{renderDiff (change.name)}</td>
|
||||||
|
<td className="p-2 break-all">
|
||||||
|
{renderDiff ({
|
||||||
|
current: CATEGORY_NAMES[change.category.current],
|
||||||
|
prev: (change.category.prev
|
||||||
|
&& CATEGORY_NAMES[change.category.prev]) })}
|
||||||
|
</td>
|
||||||
|
<td className="p-2">
|
||||||
|
{change.aliases.map ((tag, i) => (
|
||||||
|
tag.type === 'added'
|
||||||
|
? (
|
||||||
|
<ins
|
||||||
|
key={i}
|
||||||
|
className="mr-2 text-green-600 dark:text-green-400">
|
||||||
|
{tag.name}
|
||||||
|
</ins>)
|
||||||
|
: (
|
||||||
|
tag.type === 'removed'
|
||||||
|
? (
|
||||||
|
<del
|
||||||
|
key={i}
|
||||||
|
className="mr-2 text-red-600 dark:text-red-400">
|
||||||
|
{tag.name}
|
||||||
|
</del>)
|
||||||
|
: (
|
||||||
|
<span key={i} className="mr-2">
|
||||||
|
{tag.name}
|
||||||
|
</span>))))}
|
||||||
|
</td>
|
||||||
|
<td className="p-2">
|
||||||
|
{change.parentTags.map ((tag, i) => (
|
||||||
|
tag.type === 'added'
|
||||||
|
? (
|
||||||
|
<ins
|
||||||
|
key={i}
|
||||||
|
className="mr-2 text-green-600 dark:text-green-400">
|
||||||
|
{tag.tag.name}
|
||||||
|
</ins>)
|
||||||
|
: (
|
||||||
|
tag.type === 'removed'
|
||||||
|
? (
|
||||||
|
<del
|
||||||
|
key={i}
|
||||||
|
className="mr-2 text-red-600 dark:text-red-400">
|
||||||
|
{tag.tag.name}
|
||||||
|
</del>)
|
||||||
|
: (
|
||||||
|
<span key={i} className="mr-2">
|
||||||
|
{tag.tag.name}
|
||||||
|
</span>))))}
|
||||||
|
</td>
|
||||||
|
<td className="p-2">
|
||||||
|
{change.createdByUser
|
||||||
|
? (
|
||||||
|
<PrefetchLink to={`/users/${ change.createdByUser.id }`}>
|
||||||
|
{change.createdByUser.name
|
||||||
|
|| `名もなきニジラー(#${ change.createdByUser.id })`}
|
||||||
|
</PrefetchLink>)
|
||||||
|
: 'bot 操作'}
|
||||||
|
<br/>
|
||||||
|
{dateString (change.createdAt)}
|
||||||
|
</td>
|
||||||
|
<td className="p-2">
|
||||||
|
<a
|
||||||
|
href="#"
|
||||||
|
onClick={async e => {
|
||||||
|
e.preventDefault ()
|
||||||
|
|
||||||
|
if (!(confirm (
|
||||||
|
`タグ『${ change.name.current }』を版 ${
|
||||||
|
change.versionNo } に差戻します.\nよろしいですか?`)))
|
||||||
|
return
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await apiPut (
|
||||||
|
`/tags/${ change.tagId }`,
|
||||||
|
{ name: change.name.current,
|
||||||
|
category: change.category.current,
|
||||||
|
aliases:
|
||||||
|
change.aliases
|
||||||
|
.filter (t => t.type !== 'removed')
|
||||||
|
.map (t => t.name)
|
||||||
|
.join (' '),
|
||||||
|
parent_tags:
|
||||||
|
change.parentTags
|
||||||
|
.filter (t => t.type !== 'removed')
|
||||||
|
.map (t => t.tag.name)
|
||||||
|
.join (' ') })
|
||||||
|
|
||||||
|
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
||||||
|
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
||||||
|
toast ({ description: '差戻しました.' })
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
toast ({ description: '差戻に失敗……' })
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
復元
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
</tr>))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Pagination page={page} totalPages={totalPages}/>
|
||||||
|
</>)}
|
||||||
|
</MainArea>)
|
||||||
|
}) satisfies FC
|
||||||
@@ -205,13 +205,15 @@ export default (() => {
|
|||||||
{loading ? 'Loading...' : (results.length > 0 ? (
|
{loading ? 'Loading...' : (results.length > 0 ? (
|
||||||
<div className="mt-4">
|
<div className="mt-4">
|
||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full min-w-[1200px] table-fixed border-collapse">
|
<table className="w-full min-w-[2000px] table-fixed border-collapse">
|
||||||
<colgroup>
|
<colgroup>
|
||||||
<col className="w-72"/>
|
<col className="w-72"/>
|
||||||
<col className="w-48"/>
|
|
||||||
<col className="w-16"/>
|
<col className="w-16"/>
|
||||||
<col className="w-44"/>
|
<col className="w-48"/>
|
||||||
<col className="w-44"/>
|
<col className="w-72"/>
|
||||||
|
<col className="w-48"/>
|
||||||
|
<col className="w-56"/>
|
||||||
|
<col className="w-56"/>
|
||||||
<col className="w-16"/>
|
<col className="w-16"/>
|
||||||
</colgroup>
|
</colgroup>
|
||||||
|
|
||||||
@@ -224,13 +226,6 @@ export default (() => {
|
|||||||
currentOrder={order}
|
currentOrder={order}
|
||||||
defaultDirection={defaultDirection}/>
|
defaultDirection={defaultDirection}/>
|
||||||
</th>
|
</th>
|
||||||
<th className="p-2 text-left whitespace-nowrap">
|
|
||||||
<SortHeader<FetchTagsOrderField>
|
|
||||||
by="category"
|
|
||||||
label="カテゴリ"
|
|
||||||
currentOrder={order}
|
|
||||||
defaultDirection={defaultDirection}/>
|
|
||||||
</th>
|
|
||||||
<th className="p-2 text-left whitespace-nowrap">
|
<th className="p-2 text-left whitespace-nowrap">
|
||||||
<SortHeader<FetchTagsOrderField>
|
<SortHeader<FetchTagsOrderField>
|
||||||
by="post_count"
|
by="post_count"
|
||||||
@@ -238,6 +233,15 @@ export default (() => {
|
|||||||
currentOrder={order}
|
currentOrder={order}
|
||||||
defaultDirection={defaultDirection}/>
|
defaultDirection={defaultDirection}/>
|
||||||
</th>
|
</th>
|
||||||
|
<th className="p-2 text-left whitespace-nowrap">
|
||||||
|
<SortHeader<FetchTagsOrderField>
|
||||||
|
by="category"
|
||||||
|
label="カテゴリ"
|
||||||
|
currentOrder={order}
|
||||||
|
defaultDirection={defaultDirection}/>
|
||||||
|
</th>
|
||||||
|
<th className="p-2 text-left whitespace-nowrap">別名</th>
|
||||||
|
<th className="p-2 text-left whitespace-nowrap">上位タグ</th>
|
||||||
<th className="p-2 text-left whitespace-nowrap">
|
<th className="p-2 text-left whitespace-nowrap">
|
||||||
<SortHeader<FetchTagsOrderField>
|
<SortHeader<FetchTagsOrderField>
|
||||||
by="created_at"
|
by="created_at"
|
||||||
@@ -260,10 +264,23 @@ export default (() => {
|
|||||||
{results.map (row => (
|
{results.map (row => (
|
||||||
<tr key={row.id} className="even:bg-gray-100 dark:even:bg-gray-700">
|
<tr key={row.id} className="even:bg-gray-100 dark:even:bg-gray-700">
|
||||||
<td className="p-2">
|
<td className="p-2">
|
||||||
<TagLink tag={row} withCount={false}/>
|
<TagLink
|
||||||
|
tag={row}
|
||||||
|
to={`/tags/${ encodeURIComponent (row.id) }`}
|
||||||
|
withCount={false}/>
|
||||||
</td>
|
</td>
|
||||||
<td className="p-2">{CATEGORY_NAMES[row.category]}</td>
|
|
||||||
<td className="p-2 text-right">{row.postCount}</td>
|
<td className="p-2 text-right">{row.postCount}</td>
|
||||||
|
<td className="p-2">{CATEGORY_NAMES[row.category]}</td>
|
||||||
|
<td className="p-2">{row.aliases.join (' ')}</td>
|
||||||
|
<td className="p-2">
|
||||||
|
{row.parents.map (t => (
|
||||||
|
<span key={t.id} className="mr-2">
|
||||||
|
<TagLink
|
||||||
|
tag={t}
|
||||||
|
withWiki={false}
|
||||||
|
withCount={false}/>
|
||||||
|
</span>))}
|
||||||
|
</td>
|
||||||
<td className="p-2">{dateString (row.createdAt)}</td>
|
<td className="p-2">{dateString (row.createdAt)}</td>
|
||||||
<td className="p-2">{dateString (row.updatedAt)}</td>
|
<td className="p-2">{dateString (row.updatedAt)}</td>
|
||||||
<td className="p-2">
|
<td className="p-2">
|
||||||
|
|||||||
@@ -232,7 +232,7 @@ export default (() => {
|
|||||||
return <ErrorScreen status={status}/>
|
return <ErrorScreen status={status}/>
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="md:flex md:flex-1">
|
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
||||||
<Helmet>
|
<Helmet>
|
||||||
{theatre && (
|
{theatre && (
|
||||||
<title>
|
<title>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user