Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bce04488ed | |||
| c9df340978 | |||
| 3da9b447d4 | |||
| 6b0d262040 | |||
| 8ff1819d5a | |||
| bde7d33949 | |||
| 5c7580d571 | |||
| 48f823a7c8 | |||
| bd11e37fd3 | |||
| e72ec608f4 |
@@ -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,7 +104,7 @@ 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)
|
||||||
@@ -128,9 +128,11 @@ class PostsController < ApplicationController
|
|||||||
original_created_from:, original_created_before:)
|
original_created_from:, original_created_before:)
|
||||||
post.thumbnail.attach(thumbnail)
|
post.thumbnail.attach(thumbnail)
|
||||||
|
|
||||||
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)
|
||||||
post.resized_thumbnail!
|
post.resized_thumbnail!
|
||||||
@@ -170,10 +172,15 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
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)
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
||||||
@@ -204,7 +211,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|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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,52 @@ 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
|
||||||
|
|
||||||
|
tag.update!(category:)
|
||||||
|
tag.tag_name.update!(name:)
|
||||||
|
|
||||||
|
alias_names << old_name if name != old_name
|
||||||
|
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)
|
||||||
|
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 +264,26 @@ 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)
|
||||||
|
|
||||||
|
tag.tag_name.update!(name:) if name.present?
|
||||||
|
tag.update!(category:) if category.present?
|
||||||
|
|
||||||
|
record_tag_version!(tag, event_type: :update, created_by_user: current_user)
|
||||||
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 +296,46 @@ 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:
|
||||||
|
if tag.nico?
|
||||||
|
NicoTagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
||||||
|
else
|
||||||
|
TagVersionRecorder.record!(tag:, event_type:, created_by_user:)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def update_aliases! tag, alias_names
|
||||||
|
current_aliases = tag.tag_name.aliases.to_a
|
||||||
|
|
||||||
|
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
|
||||||
|
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,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,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
|
||||||
|
|||||||
+31
-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,15 @@ 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.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 +101,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 +139,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 +169,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 +178,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 +194,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'
|
||||||
|
|||||||
@@ -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_id: @record.parent_id,
|
||||||
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
|
||||||
@@ -6,7 +6,7 @@ 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
|
||||||
@@ -19,6 +19,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 +52,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,19 @@
|
|||||||
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
|
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
|
||||||
Generated
+37
-1
@@ -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_19_035400) 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,21 @@ 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_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
|
||||||
@@ -216,6 +231,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
|
||||||
@@ -377,6 +409,8 @@ 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_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"
|
||||||
@@ -394,6 +428,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"
|
||||||
|
|||||||
@@ -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,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 ではスタブしとくのが無難。
|
||||||
@@ -756,6 +756,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: 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.parent,
|
||||||
|
original_created_from: post.original_created_from,
|
||||||
|
original_created_before: post.original_created_before,
|
||||||
|
created_at: created_at,
|
||||||
|
created_by_user: 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) }
|
||||||
|
|
||||||
@@ -870,15 +1082,16 @@ 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)
|
||||||
|
create_post_version_for!(post_record.reload)
|
||||||
|
|
||||||
|
expect {
|
||||||
put "/posts/#{post_record.id}", params: {
|
put "/posts/#{post_record.id}", params: {
|
||||||
title: post_record.title,
|
title: post_record.title,
|
||||||
tags: 'spec_tag'
|
tags: 'spec_tag'
|
||||||
}
|
}
|
||||||
end.not_to change(PostVersion, :count)
|
}.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
|
||||||
@@ -918,4 +1131,52 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
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: {
|
||||||
|
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: {
|
||||||
|
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
|
||||||
|
|||||||
@@ -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,72 @@ 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
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -510,4 +613,269 @@ 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
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -214,4 +214,108 @@ RSpec.describe "nico:sync" do
|
|||||||
expect(version.event_type).to eq('create')
|
expect(version.event_type).to eq('create')
|
||||||
expect(version.tags).to eq(snapshot_tags(post.reload))
|
expect(version.tags).to eq(snapshot_tags(post.reload))
|
||||||
end
|
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
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ 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 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'
|
||||||
@@ -55,6 +56,7 @@ const RouteTransitionWrapper = ({ user, setUser }: {
|
|||||||
<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="/theatres/:id" element={<TheatreDetailPage/>}/>
|
||||||
<Route path="/materials" element={<MaterialBasePage/>}>
|
<Route path="/materials" element={<MaterialBasePage/>}>
|
||||||
|
|||||||
@@ -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>)
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ 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>
|
||||||
|
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ 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'
|
||||||
|
|
||||||
@@ -29,6 +29,8 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
|
|||||||
const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (pathName) && wikiId)
|
const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (pathName) && wikiId)
|
||||||
const wikiTitle = pathName.split ('/')[2] ?? ''
|
const wikiTitle = pathName.split ('/')[2] ?? ''
|
||||||
|
|
||||||
|
const tagFlg = /^\/tags\/\d+/.test (pathName)
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{ name: '広場', to: '/posts', subMenu: [
|
{ name: '広場', to: '/posts', subMenu: [
|
||||||
{ name: '一覧', to: '/posts' },
|
{ name: '一覧', to: '/posts' },
|
||||||
@@ -38,10 +40,13 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
|
|||||||
{ 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: '/wiki/ヘルプ:タグ' },
|
||||||
|
{ component: <Separator/>, visible: tagFlg },
|
||||||
|
{ name: `広場 (${ postCount || 0 })`,
|
||||||
|
to: `/posts?tags=${ encodeURIComponent (tag?.name ?? '') }`,
|
||||||
|
visible: tagFlg },
|
||||||
|
{ name: '履歴', to: `/tags/changes?id=${ tag?.id }`, visible: false }] },
|
||||||
{ name: '素材', to: '/materials', visible: false, subMenu: [
|
{ name: '素材', to: '/materials', visible: false, subMenu: [
|
||||||
{ name: '一覧', to: '/materials' },
|
{ name: '一覧', to: '/materials' },
|
||||||
{ name: '検索', to: '/materials/search', visible: false },
|
{ name: '検索', to: '/materials/search', visible: false },
|
||||||
@@ -114,12 +119,14 @@ export default (({ user }: Props) => {
|
|||||||
queryKey: wikiKeys.show (wikiIdStr, { }),
|
queryKey: wikiKeys.show (wikiIdStr, { }),
|
||||||
queryFn: () => fetchWikiPage (wikiIdStr, { }) })
|
queryFn: () => fetchWikiPage (wikiIdStr, { }) })
|
||||||
|
|
||||||
const effectiveTitle = wikiPage?.title ?? ''
|
const tagFlg = /^\/tags\/\d+/.test (location.pathname)
|
||||||
|
const effectiveTitle = (tagFlg ? location.pathname.split ('/')[2] : wikiPage?.title) ?? ''
|
||||||
|
|
||||||
const { data: tag } = useQuery ({
|
const { data: tag } = useQuery ({
|
||||||
enabled: Boolean (effectiveTitle),
|
enabled: Boolean (effectiveTitle),
|
||||||
queryKey: tagsKeys.show (effectiveTitle),
|
queryKey: tagsKeys.show (effectiveTitle),
|
||||||
queryFn: () => fetchTagByName (effectiveTitle) })
|
queryFn: () => (tagFlg ? fetchTag : fetchTagByName) (effectiveTitle) })
|
||||||
|
|
||||||
|
|
||||||
const menu = menuOutline ({ tag, wikiId, user, pathName: location.pathname })
|
const menu = menuOutline ({ tag, wikiId, user, pathName: location.pathname })
|
||||||
const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
|
const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
|
||||||
|
|||||||
@@ -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> => {
|
||||||
|
|||||||
@@ -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,19 @@ 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) })
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
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 +194,9 @@ 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 => u.pathname !== '/tags/nico' && Boolean (mTag (u.pathname)),
|
||||||
|
run: prefetchTagShow }]
|
||||||
|
|
||||||
|
|
||||||
export const prefetchForURL = async (qc: QueryClient, urlLike: string): Promise<void> => {
|
export const prefetchForURL = async (qc: QueryClient, urlLike: string): Promise<void> => {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ 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 = {
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ export default (({ user }: Props) => {
|
|||||||
<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">
|
||||||
<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>
|
||||||
|
|
||||||
@@ -116,7 +116,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"/>
|
||||||
|
|||||||
@@ -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,171 @@ 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
|
{/* オリジナルの投稿日時 */}
|
||||||
for (let j = i + 1;
|
<col className="w-96"/>
|
||||||
(j < changes.length
|
{/* 更新日時 */}
|
||||||
&& change.post.id === changes[j].post.id);
|
<col className="w-64"/>
|
||||||
++j)
|
{/* (差戻ボタン) */}
|
||||||
++rowsCnt
|
<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>
|
||||||
|
<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>
|
||||||
|
<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 (' '),
|
||||||
|
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}/>
|
||||||
</>)}
|
</>)}
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -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">
|
||||||
|
|||||||
@@ -114,13 +114,15 @@ export default () => {
|
|||||||
{...(version && { to: `/wiki/${ encodeURIComponent (title) }` })}/>
|
{...(version && { to: `/wiki/${ encodeURIComponent (title) }` })}/>
|
||||||
</h1>
|
</h1>
|
||||||
{loading ? <div>Loading...</div> : <WikiBody title={title} body={wikiPage?.body}/>}
|
{loading ? <div>Loading...</div> : <WikiBody title={title} body={wikiPage?.body}/>}
|
||||||
</article>
|
|
||||||
|
|
||||||
{(!(version) && posts.length > 0) && (
|
{(!(version) && posts.length > 0) && (
|
||||||
<TabGroup>
|
<div className="not-prose">
|
||||||
<Tab name="広場">
|
<TabGroup>
|
||||||
<PostList posts={posts}/>
|
<Tab name="広場">
|
||||||
</Tab>
|
<PostList posts={posts}/>
|
||||||
</TabGroup>)}
|
</Tab>
|
||||||
|
</TabGroup>
|
||||||
|
</div>)}
|
||||||
|
</article>
|
||||||
</MainArea>)
|
</MainArea>)
|
||||||
}
|
}
|
||||||
|
|||||||
+20
-4
@@ -117,9 +117,9 @@ export type NiconicoViewerHandle = {
|
|||||||
export type Post = {
|
export type Post = {
|
||||||
id: number
|
id: number
|
||||||
url: string
|
url: string
|
||||||
title: string
|
title: string | null
|
||||||
thumbnail: string
|
thumbnail: string | null
|
||||||
thumbnailBase: string
|
thumbnailBase: string | null
|
||||||
tags: Tag[]
|
tags: Tag[]
|
||||||
viewed: boolean
|
viewed: boolean
|
||||||
related: Post[]
|
related: Post[]
|
||||||
@@ -127,7 +127,7 @@ export type Post = {
|
|||||||
originalCreatedBefore: string | null
|
originalCreatedBefore: string | null
|
||||||
createdAt: string
|
createdAt: string
|
||||||
updatedAt: string
|
updatedAt: string
|
||||||
uploadedUser: { id: number; name: string } | null }
|
uploadedUser: { id: number; name: string | null } | null }
|
||||||
|
|
||||||
export type PostTagChange = {
|
export type PostTagChange = {
|
||||||
post: Post
|
post: Post
|
||||||
@@ -136,6 +136,20 @@ export type PostTagChange = {
|
|||||||
changeType: 'add' | 'remove'
|
changeType: 'add' | 'remove'
|
||||||
timestamp: string }
|
timestamp: string }
|
||||||
|
|
||||||
|
export type PostVersion = {
|
||||||
|
postId: number
|
||||||
|
versionNo: number
|
||||||
|
eventType: 'create' | 'update' | 'discard' | 'restore'
|
||||||
|
title: { current: string | null; prev: string | null }
|
||||||
|
url: { current: string; prev: string | null }
|
||||||
|
thumbnail: { current: string | null; prev: string | null }
|
||||||
|
thumbnailBase: { current: string | null; prev: string | null }
|
||||||
|
tags: { name: string; type: 'context' | 'added' | 'removed' }[]
|
||||||
|
originalCreatedFrom: { current: string | null; prev: string | null }
|
||||||
|
originalCreatedBefore: { current: string | null; prev: string | null }
|
||||||
|
createdAt: string
|
||||||
|
createdByUser: { id: number; name: string | null } | null }
|
||||||
|
|
||||||
export type SubMenuComponentItem = {
|
export type SubMenuComponentItem = {
|
||||||
component: ReactNode
|
component: ReactNode
|
||||||
visible: boolean }
|
visible: boolean }
|
||||||
@@ -151,6 +165,8 @@ export type Tag = {
|
|||||||
id: number
|
id: number
|
||||||
name: string
|
name: string
|
||||||
category: Category
|
category: Category
|
||||||
|
aliases: string[]
|
||||||
|
parents: Tag[]
|
||||||
postCount: number
|
postCount: number
|
||||||
createdAt: string
|
createdAt: string
|
||||||
updatedAt: string
|
updatedAt: string
|
||||||
|
|||||||
Reference in New Issue
Block a user