Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fd479cd93a | |||
| 6ee621e565 | |||
| 43122a49c3 | |||
| e90c4d612e | |||
| 39101ca422 |
@@ -1,16 +1,14 @@
|
|||||||
class ApplicationController < ActionController::API
|
class ApplicationController < ActionController::API
|
||||||
before_action :reject_banned_ip_address!
|
|
||||||
before_action :authenticate_user
|
before_action :authenticate_user
|
||||||
before_action :reject_banned_user!
|
|
||||||
|
|
||||||
def current_user = @current_user
|
def current_user
|
||||||
|
@current_user
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def authenticate_user
|
def authenticate_user
|
||||||
code = request.headers['X-Transfer-Code'] || request.headers['HTTP_X_TRANSFER_CODE']
|
code = request.headers['X-Transfer-Code'] || request.headers['HTTP_X_TRANSFER_CODE']
|
||||||
return if code.blank?
|
|
||||||
|
|
||||||
@current_user = User.find_by(inheritance_code: code)
|
@current_user = User.find_by(inheritance_code: code)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -24,17 +22,4 @@ class ApplicationController < ActionController::API
|
|||||||
s.in?(['', '1', 'true', 'on', 'yes'])
|
s.in?(['', '1', 'true', 'on', 'yes'])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def reject_banned_ip_address!
|
|
||||||
ip_address = IpAddress.find_by(ip_address: IPAddr.new(request.remote_ip).hton)
|
|
||||||
return unless ip_address&.banned?
|
|
||||||
|
|
||||||
head :forbidden
|
|
||||||
end
|
|
||||||
|
|
||||||
def reject_banned_user!
|
|
||||||
return unless current_user&.banned?
|
|
||||||
|
|
||||||
head :forbidden
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class NicoTagsController < ApplicationController
|
|||||||
return head :bad_request unless tag.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,
|
||||||
with_no_deerjikist: false)
|
with_no_deerjikist: false)
|
||||||
return head :bad_request if linked_tags.any? { |t| t.nico? }
|
return head :bad_request if linked_tags.any? { |t| t.nico? }
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
render json: PostRepr.base(post, current_user)
|
render json: PostRepr.base(post, current_user)
|
||||||
.merge(tags: build_tag_tree_for(post.tags),
|
.merge(tags: build_tag_tree_for(post.tags),
|
||||||
related: PostRepr.many(post.related(limit: 20)))
|
related: post.related(limit: 20))
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@@ -123,36 +123,28 @@ class PostsController < ApplicationController
|
|||||||
tag_names = params[:tags].to_s.split
|
tag_names = params[:tags].to_s.split
|
||||||
original_created_from = params[:original_created_from]
|
original_created_from = params[:original_created_from]
|
||||||
original_created_before = params[:original_created_before]
|
original_created_before = params[:original_created_before]
|
||||||
parent_post_ids = parse_parent_post_ids
|
|
||||||
|
|
||||||
post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
|
post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
|
||||||
original_created_from:, original_created_before:)
|
original_created_from:, original_created_before:)
|
||||||
post.thumbnail.attach(thumbnail) if thumbnail.present?
|
post.thumbnail.attach(thumbnail)
|
||||||
|
|
||||||
ApplicationRecord.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)
|
TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
|
||||||
|
|
||||||
tags = Tag.expand_parent_tags(tags)
|
tags = Tag.expand_parent_tags(tags)
|
||||||
sync_post_tags!(post, tags)
|
sync_post_tags!(post, tags)
|
||||||
|
|
||||||
sync_parent_posts!(post, parent_post_ids)
|
|
||||||
|
|
||||||
post.resized_thumbnail!
|
post.resized_thumbnail!
|
||||||
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
|
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
post.reload
|
post.reload
|
||||||
render json: PostRepr.base(post), status: :created
|
render json: PostRepr.base(post), status: :created
|
||||||
|
rescue ActiveRecord::RecordInvalid
|
||||||
|
render json: { errors: post.errors.full_messages }, status: :unprocessable_entity
|
||||||
rescue Tag::NicoTagNormalisationError
|
rescue Tag::NicoTagNormalisationError
|
||||||
head :bad_request
|
head :bad_request
|
||||||
rescue ArgumentError => e
|
|
||||||
render json: { errors: [e.message] }, status: :unprocessable_entity
|
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
|
||||||
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def viewed
|
def viewed
|
||||||
@@ -177,7 +169,6 @@ class PostsController < ApplicationController
|
|||||||
tag_names = params[:tags].to_s.split
|
tag_names = params[:tags].to_s.split
|
||||||
original_created_from = params[:original_created_from]
|
original_created_from = params[:original_created_from]
|
||||||
original_created_before = params[:original_created_before]
|
original_created_before = params[:original_created_before]
|
||||||
parent_post_ids = parse_parent_post_ids
|
|
||||||
|
|
||||||
post = Post.find(params[:id].to_i)
|
post = Post.find(params[:id].to_i)
|
||||||
|
|
||||||
@@ -186,15 +177,12 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
post.update!(title:, original_created_from:, original_created_before:)
|
post.update!(title:, original_created_from:, original_created_before:)
|
||||||
|
|
||||||
normalised_tags = 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)
|
TagVersioning.record_tag_snapshots!(normalised_tags, created_by_user: current_user)
|
||||||
|
|
||||||
tags = post.tags.nico.to_a + normalised_tags
|
tags = post.tags.nico.to_a + normalised_tags
|
||||||
tags = Tag.expand_parent_tags(tags)
|
tags = Tag.expand_parent_tags(tags)
|
||||||
sync_post_tags!(post, tags)
|
sync_post_tags!(post, tags)
|
||||||
|
|
||||||
sync_parent_posts!(post, parent_post_ids)
|
|
||||||
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -202,12 +190,10 @@ class PostsController < ApplicationController
|
|||||||
json = post.as_json
|
json = post.as_json
|
||||||
json['tags'] = build_tag_tree_for(post.tags)
|
json['tags'] = build_tag_tree_for(post.tags)
|
||||||
render json:, status: :ok
|
render json:, status: :ok
|
||||||
|
rescue ActiveRecord::RecordInvalid
|
||||||
|
render json: post.errors, status: :unprocessable_entity
|
||||||
rescue Tag::NicoTagNormalisationError
|
rescue Tag::NicoTagNormalisationError
|
||||||
head :bad_request
|
head :bad_request
|
||||||
rescue ArgumentError => e
|
|
||||||
render json: { errors: [e.message] }, status: :unprocessable_entity
|
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
|
||||||
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def changes
|
def changes
|
||||||
@@ -367,41 +353,4 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
root_ids.filter_map { |id| build_node.call(id, []) }
|
root_ids.filter_map { |id| build_node.call(id, []) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def parse_parent_post_ids
|
|
||||||
raise ArgumentError, 'parent_post_ids は必須です.' unless params.key?(:parent_post_ids)
|
|
||||||
|
|
||||||
params[:parent_post_ids].to_s.split.map { |token|
|
|
||||||
id = Integer(token, exception: false)
|
|
||||||
raise ArgumentError, "親投稿 Id. が不正です: #{ token }" if id.nil? || id <= 0
|
|
||||||
|
|
||||||
id
|
|
||||||
}.uniq
|
|
||||||
end
|
|
||||||
|
|
||||||
def sync_parent_posts! post, parent_post_ids
|
|
||||||
if parent_post_ids.include?(post.id)
|
|
||||||
post.errors.add(:base, '自分自身を親投稿にはできません.')
|
|
||||||
raise ActiveRecord::RecordInvalid, post
|
|
||||||
end
|
|
||||||
|
|
||||||
existing_ids = Post.where(id: parent_post_ids).pluck(:id)
|
|
||||||
missing_ids = parent_post_ids - existing_ids
|
|
||||||
|
|
||||||
if missing_ids.present?
|
|
||||||
post.errors.add(:base, "存在しない親投稿 ID があります: #{ missing_ids.join(' ') }")
|
|
||||||
raise ActiveRecord::RecordInvalid, post
|
|
||||||
end
|
|
||||||
|
|
||||||
current_ids = post.parent_posts.pluck(:id)
|
|
||||||
|
|
||||||
ids_to_add = parent_post_ids - current_ids
|
|
||||||
ids_to_remove = current_ids - parent_post_ids
|
|
||||||
|
|
||||||
PostImplication.where(post_id: post.id, parent_post_id: ids_to_remove).delete_all
|
|
||||||
|
|
||||||
ids_to_add.each do |parent_post_id|
|
|
||||||
PostImplication.create_or_find_by!(post_id: post.id, parent_post_id:)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,7 +1,3 @@
|
|||||||
require 'net/http'
|
|
||||||
require 'uri'
|
|
||||||
|
|
||||||
|
|
||||||
class TagsController < ApplicationController
|
class TagsController < ApplicationController
|
||||||
def index
|
def index
|
||||||
post_id = params[:post]
|
post_id = params[:post]
|
||||||
@@ -186,8 +182,7 @@ class TagsController < ApplicationController
|
|||||||
.find_by(id: params[:id])
|
.find_by(id: params[:id])
|
||||||
return head :not_found unless tag
|
return head :not_found unless tag
|
||||||
|
|
||||||
render json: { tag: TagRepr.base(tag),
|
render json: DeerjikistRepr.many(tag.deerjikists)
|
||||||
deerjikists: DeerjikistRepr.many(tag.deerjikists) }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def deerjikists_by_name
|
def deerjikists_by_name
|
||||||
@@ -199,31 +194,7 @@ class TagsController < ApplicationController
|
|||||||
.find_by(tag_names: { name: })
|
.find_by(tag_names: { name: })
|
||||||
return head :not_found unless tag
|
return head :not_found unless tag
|
||||||
|
|
||||||
render json: { tag: TagRepr.base(tag),
|
render json: DeerjikistRepr.many(tag.deerjikists)
|
||||||
deerjikists: DeerjikistRepr.many(tag.deerjikists) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def update_deerjikists
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
return head :forbidden unless current_user.gte_member?
|
|
||||||
|
|
||||||
tag = Tag.joins(:tag_name)
|
|
||||||
.includes(:tag_name, tag_name: :wiki_page)
|
|
||||||
.find_by(id: params[:id])
|
|
||||||
return head :not_found unless tag
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
|
||||||
tag.deerjikists = []
|
|
||||||
params[:_json].each do
|
|
||||||
platform = _1[:platform]
|
|
||||||
code = normalise_deerjikist_code(platform, _1[:code])
|
|
||||||
deerjikist = Deerjikist.find_or_initialize_by(platform:, code:)
|
|
||||||
deerjikist.tag = tag
|
|
||||||
deerjikist.save!
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
render json: DeerjikistRepr.many(tag.reload.deerjikists)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def materials_by_name
|
def materials_by_name
|
||||||
@@ -403,7 +374,7 @@ class TagsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def update_parent_tags! tag, parent_names
|
def update_parent_tags! tag, parent_names
|
||||||
parent_tags = Tag.normalise_tags!(parent_names, with_tagme: false,
|
parent_tags = Tag.normalise_tags(parent_names, with_tagme: false,
|
||||||
with_no_deerjikist: false,
|
with_no_deerjikist: false,
|
||||||
deny_nico: true)
|
deny_nico: true)
|
||||||
|
|
||||||
@@ -420,21 +391,4 @@ class TagsController < ApplicationController
|
|||||||
TagImplication.create!(tag:, parent_tag:)
|
TagImplication.create!(tag:, parent_tag:)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def normalise_deerjikist_code platform, code
|
|
||||||
return code if platform != 'youtube' || code[0] != '@'
|
|
||||||
|
|
||||||
url = "https://www.youtube.com/#{ code }"
|
|
||||||
|
|
||||||
html = Net::HTTP.get(URI(url))
|
|
||||||
|
|
||||||
canonical = html[
|
|
||||||
/<link rel="canonical" href="https:\/\/www\.youtube\.com\/channel\/(UC[a-zA-Z0-9_-]{22})"/,
|
|
||||||
1]
|
|
||||||
return canonical if canonical
|
|
||||||
|
|
||||||
html[/"channelId":"(UC[a-zA-Z0-9_-]{22})"/, 1] || html[/\bUC[a-zA-Z0-9_-]{22}\b/]
|
|
||||||
rescue
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
class UsersController < ApplicationController
|
class UsersController < ApplicationController
|
||||||
def create
|
def create
|
||||||
|
return head :unprocessable_entity if request.remote_ip.blank?
|
||||||
|
|
||||||
user = nil
|
user = nil
|
||||||
|
|
||||||
User.transaction do
|
User.transaction do
|
||||||
user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
|
user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
|
||||||
attach_ip_address!(user)
|
attach_ip_address!(user)
|
||||||
@@ -14,7 +17,8 @@ class UsersController < ApplicationController
|
|||||||
def verify
|
def verify
|
||||||
user = User.find_by(inheritance_code: params[:code])
|
user = User.find_by(inheritance_code: params[:code])
|
||||||
return render json: { valid: false } unless user
|
return render json: { valid: false } unless user
|
||||||
return head :forbidden if user.banned?
|
|
||||||
|
return head :unprocessable_entity if request.remote_ip.blank?
|
||||||
|
|
||||||
attach_ip_address!(user)
|
attach_ip_address!(user)
|
||||||
|
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
require 'digest'
|
|
||||||
|
|
||||||
|
|
||||||
class WikiAssetsController < ApplicationController
|
|
||||||
def index
|
|
||||||
page_id = params[:wiki_page_id].to_i
|
|
||||||
page = WikiPage.find_by(id: page_id)
|
|
||||||
return head :not_found unless page
|
|
||||||
|
|
||||||
render json: WikiAssetRepr.many(page.assets)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
return head :forbidden unless current_user.gte_member?
|
|
||||||
|
|
||||||
wiki_page_id = params[:wiki_page_id].to_i
|
|
||||||
page = WikiPage.find_by(id: wiki_page_id)
|
|
||||||
return head :not_found unless page
|
|
||||||
|
|
||||||
file = params[:file]
|
|
||||||
return head :bad_request if file.blank?
|
|
||||||
|
|
||||||
asset = nil
|
|
||||||
page.with_lock do
|
|
||||||
no = page.next_asset_no
|
|
||||||
alt_text = params[:alt_text].presence
|
|
||||||
sha256 = Digest::SHA256.file(file.tempfile.path).digest
|
|
||||||
|
|
||||||
asset = WikiAsset.new(wiki_page_id:, no:, alt_text:, sha256:, created_by_user: current_user)
|
|
||||||
asset.file.attach(file)
|
|
||||||
asset.save!
|
|
||||||
|
|
||||||
page.update!(next_asset_no: no + 1)
|
|
||||||
end
|
|
||||||
|
|
||||||
render json: WikiAssetRepr.base(asset)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -109,7 +109,7 @@ class WikiPagesController < ApplicationController
|
|||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return head :forbidden unless current_user.gte_member?
|
return head :forbidden unless current_user.gte_member?
|
||||||
|
|
||||||
title = params[:title].to_s.strip
|
title = params[:title]&.strip
|
||||||
body = params[:body].to_s
|
body = params[:body].to_s
|
||||||
|
|
||||||
return head :unprocessable_entity if title.blank? || body.blank?
|
return head :unprocessable_entity if title.blank? || body.blank?
|
||||||
@@ -143,14 +143,7 @@ class WikiPagesController < ApplicationController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
message = params[:message].presence
|
head :ok
|
||||||
Wiki::Commit.content!(page:,
|
|
||||||
body:,
|
|
||||||
created_user: current_user,
|
|
||||||
message:,
|
|
||||||
base_revision_id:)
|
|
||||||
|
|
||||||
render json: WikiPageRepr.base(page).merge(body:)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def search
|
def search
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
class IpAddress < ApplicationRecord
|
class IpAddress < ApplicationRecord
|
||||||
validates :ip_address, presence: true, length: { maximum: 16 }
|
validates :ip_address, presence: true, length: { maximum: 16 }
|
||||||
|
validates :banned, inclusion: { in: [true, false] }
|
||||||
|
|
||||||
has_many :user_ips, dependent: :destroy
|
has_many :user_ips, dependent: :destroy
|
||||||
has_many :users, through: :user_ips
|
has_many :users, through: :user_ips
|
||||||
|
|
||||||
def banned? = banned_at.present?
|
|
||||||
def ban! = banned? || update!(banned_at: Time.current)
|
|
||||||
def unban! = update!(banned_at: nil)
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
class Post < ApplicationRecord
|
class Post < ApplicationRecord
|
||||||
require 'mini_magick'
|
require 'mini_magick'
|
||||||
|
|
||||||
|
belongs_to :parent, class_name: 'Post', optional: true, foreign_key: 'parent_id'
|
||||||
belongs_to :uploaded_user, class_name: 'User', optional: true
|
belongs_to :uploaded_user, class_name: 'User', optional: true
|
||||||
|
|
||||||
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
||||||
@@ -12,20 +13,6 @@ class Post < ApplicationRecord
|
|||||||
has_many :post_similarities, dependent: :delete_all
|
has_many :post_similarities, dependent: :delete_all
|
||||||
has_many :post_versions
|
has_many :post_versions
|
||||||
|
|
||||||
has_many :parent_post_implications,
|
|
||||||
class_name: 'PostImplication',
|
|
||||||
foreign_key: :post_id,
|
|
||||||
dependent: :destroy,
|
|
||||||
inverse_of: :post
|
|
||||||
has_many :parents, through: :parent_post_implications, source: :parent_post
|
|
||||||
|
|
||||||
has_many :child_post_implications,
|
|
||||||
class_name: 'PostImplication',
|
|
||||||
foreign_key: :parent_post_id,
|
|
||||||
dependent: :destroy,
|
|
||||||
inverse_of: :parent_post
|
|
||||||
has_many :children, through: :child_post_implications, source: :post
|
|
||||||
|
|
||||||
has_one_attached :thumbnail
|
has_one_attached :thumbnail
|
||||||
|
|
||||||
before_validation :normalise_url
|
before_validation :normalise_url
|
||||||
@@ -35,29 +22,17 @@ class Post < ApplicationRecord
|
|||||||
validate :validate_original_created_range
|
validate :validate_original_created_range
|
||||||
validate :url_must_be_http_url
|
validate :url_must_be_http_url
|
||||||
|
|
||||||
def parent_posts = parents
|
|
||||||
|
|
||||||
def child_posts = children
|
|
||||||
|
|
||||||
def sibling_posts
|
|
||||||
parent_post_ids = parent_posts.order(:id).pluck(:id)
|
|
||||||
|
|
||||||
parent_post_ids.to_h { [_1, PostImplication.where(parent_post: _1).map(&:post)] }
|
|
||||||
end
|
|
||||||
|
|
||||||
def as_json options = { }
|
def as_json options = { }
|
||||||
super(options).merge(thumbnail: thumbnail.attached? ?
|
super(options).merge({ thumbnail: thumbnail.attached? ?
|
||||||
Rails.application.routes.url_helpers.rails_blob_url(
|
Rails.application.routes.url_helpers.rails_blob_url(
|
||||||
thumbnail, only_path: false) :
|
thumbnail, only_path: false) :
|
||||||
nil)
|
nil })
|
||||||
rescue
|
rescue
|
||||||
super(options).merge(thumbnail: nil)
|
super(options).merge(thumbnail: nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
def snapshot_tag_names = tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
def snapshot_tag_names = tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
||||||
|
|
||||||
def snapshot_parent_post_ids = parents.order(:id).pluck(:id)
|
|
||||||
|
|
||||||
def related limit: nil
|
def related limit: nil
|
||||||
ids = post_similarities.order(cos: :desc)
|
ids = post_similarities.order(cos: :desc)
|
||||||
ids = ids.limit(limit) if limit
|
ids = ids.limit(limit) if limit
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
class PostImplication < ApplicationRecord
|
|
||||||
self.primary_key = :post_id, :parent_post_id
|
|
||||||
|
|
||||||
belongs_to :post, inverse_of: :parent_post_implications
|
|
||||||
belongs_to :parent_post, class_name: 'Post', inverse_of: :child_post_implications
|
|
||||||
|
|
||||||
validates :post_id, presence: true, uniqueness: { scope: :parent_post_id }
|
|
||||||
validates :parent_post_id, presence: true
|
|
||||||
|
|
||||||
validate :parent_post_mustnt_be_itself
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def parent_post_mustnt_be_itself
|
|
||||||
if parent_post_id == post_id
|
|
||||||
errors.add :parent_post_id, '親投稿に同じ投稿を設定することはできません.'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -2,6 +2,7 @@ class PostVersion < ApplicationRecord
|
|||||||
include VersionRecord
|
include VersionRecord
|
||||||
|
|
||||||
belongs_to :post
|
belongs_to :post
|
||||||
|
belongs_to :parent, class_name: 'Post', optional: true
|
||||||
|
|
||||||
validates :url, presence: true
|
validates :url, presence: true
|
||||||
|
|
||||||
|
|||||||
@@ -79,8 +79,6 @@ class Tag < ApplicationRecord
|
|||||||
|
|
||||||
def material_id = materials.first&.id
|
def material_id = materials.first&.id
|
||||||
|
|
||||||
def has_deerjikists = deerjikists.present?
|
|
||||||
|
|
||||||
def self.tagme = find_or_create_by_tag_name!('タグ希望', category: :meta)
|
def self.tagme = find_or_create_by_tag_name!('タグ希望', category: :meta)
|
||||||
def self.bot = find_or_create_by_tag_name!('bot操作', category: :meta)
|
def self.bot = find_or_create_by_tag_name!('bot操作', category: :meta)
|
||||||
def self.no_deerjikist = find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
def self.no_deerjikist = find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
||||||
@@ -88,7 +86,7 @@ class Tag < ApplicationRecord
|
|||||||
def self.niconico = find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
def self.niconico = find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
||||||
def self.youtube = find_or_create_by_tag_name!('YouTube', category: :meta)
|
def self.youtube = find_or_create_by_tag_name!('YouTube', category: :meta)
|
||||||
|
|
||||||
def self.normalise_tags! tag_names, with_tagme: true,
|
def self.normalise_tags tag_names, with_tagme: true,
|
||||||
with_no_deerjikist: true,
|
with_no_deerjikist: true,
|
||||||
deny_nico: 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:') }
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ class User < ApplicationRecord
|
|||||||
validates :name, length: { maximum: 255 }
|
validates :name, length: { maximum: 255 }
|
||||||
validates :inheritance_code, presence: true, length: { maximum: 64 }
|
validates :inheritance_code, presence: true, length: { maximum: 64 }
|
||||||
validates :role, presence: true, inclusion: { in: roles.keys }
|
validates :role, presence: true, inclusion: { in: roles.keys }
|
||||||
|
validates :banned, inclusion: { in: [true, false] }
|
||||||
|
|
||||||
has_many :created_posts,
|
has_many :created_posts,
|
||||||
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
||||||
@@ -18,10 +19,5 @@ class User < ApplicationRecord
|
|||||||
class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
|
class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
|
||||||
|
|
||||||
def viewed?(post) = user_post_views.exists?(post_id: post.id)
|
def viewed?(post) = user_post_views.exists?(post_id: post.id)
|
||||||
|
|
||||||
def gte_member? = member? || admin?
|
def gte_member? = member? || admin?
|
||||||
|
|
||||||
def banned? = banned_at.present?
|
|
||||||
def ban! = banned? || update!(banned_at: Time.current)
|
|
||||||
def unban! = update!(banned_at: nil)
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
class WikiAsset < ApplicationRecord
|
|
||||||
belongs_to :wiki_page
|
|
||||||
belongs_to :created_by_user, class_name: 'User'
|
|
||||||
|
|
||||||
has_one_attached :file
|
|
||||||
|
|
||||||
validates :file, presence: true
|
|
||||||
|
|
||||||
def url
|
|
||||||
Rails.application.routes.url_helpers.rails_blob_url(file, only_path: true)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -13,8 +13,6 @@ class WikiPage < ApplicationRecord
|
|||||||
foreign_key: :redirect_page_id,
|
foreign_key: :redirect_page_id,
|
||||||
dependent: :nullify
|
dependent: :nullify
|
||||||
|
|
||||||
has_many :assets, class_name: 'WikiAsset', dependent: :destroy
|
|
||||||
|
|
||||||
has_many :wiki_versions
|
has_many :wiki_versions
|
||||||
|
|
||||||
belongs_to :tag_name
|
belongs_to :tag_name
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
|
|
||||||
|
|
||||||
module PostRepr
|
module PostRepr
|
||||||
BASE = { include: { tags: TagRepr::BASE, uploaded_user: UserRepr::BASE },
|
BASE = { include: { tags: TagRepr::BASE, uploaded_user: UserRepr::BASE } }.freeze
|
||||||
methods: [:parent_posts, :child_posts, :sibling_posts] }.freeze
|
|
||||||
|
|
||||||
module_function
|
module_function
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
module TagRepr
|
module TagRepr
|
||||||
BASE = { only: [:id, :category, :post_count, :created_at, :updated_at],
|
BASE = { only: [:id, :category, :post_count, :created_at, :updated_at],
|
||||||
methods: [:name, :has_wiki, :material_id, :has_deerjikists] }.freeze
|
methods: [:name, :has_wiki, :material_id] }.freeze
|
||||||
|
|
||||||
module_function
|
module_function
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
# frozen_string_literal: true
|
|
||||||
|
|
||||||
|
|
||||||
module WikiAssetRepr
|
|
||||||
BASE = { only: [:wiki_page_id, :no], methods: [:url] }.freeze
|
|
||||||
|
|
||||||
module_function
|
|
||||||
|
|
||||||
def base wiki_asset
|
|
||||||
wiki_asset.as_json(BASE)
|
|
||||||
end
|
|
||||||
|
|
||||||
def many wiki_assets
|
|
||||||
wiki_assets.map { |a| base(a) }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -24,7 +24,7 @@ class PostVersionRecorder < VersionRecorder
|
|||||||
url: @record.url,
|
url: @record.url,
|
||||||
thumbnail_base: @record.thumbnail_base,
|
thumbnail_base: @record.thumbnail_base,
|
||||||
tags: @record.snapshot_tag_names.join(' '),
|
tags: @record.snapshot_tag_names.join(' '),
|
||||||
parent_post_ids: @record.snapshot_parent_post_ids.join(' '),
|
parent_id: @record.parent_id,
|
||||||
original_created_from: @record.original_created_from,
|
original_created_from: @record.original_created_from,
|
||||||
original_created_before: @record.original_created_before }
|
original_created_before: @record.original_created_before }
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ Rails.application.routes.draw do
|
|||||||
patch '', action: :update
|
patch '', action: :update
|
||||||
|
|
||||||
get :deerjikists
|
get :deerjikists
|
||||||
put :deerjikists, action: :update_deerjikists
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -48,8 +47,6 @@ Rails.application.routes.draw do
|
|||||||
get :exists
|
get :exists
|
||||||
get :diff
|
get :diff
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :assets, controller: :wiki_assets, only: [:index, :create]
|
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :posts, only: [:index, :show, :create, :update] do
|
resources :posts, only: [:index, :show, :create, :update] do
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
class CreateWikiAssets < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
create_table :wiki_assets do |t|
|
|
||||||
t.references :wiki_page, null: false, foreign_key: true, index: false
|
|
||||||
t.integer :no, null: false
|
|
||||||
t.string :alt_text
|
|
||||||
t.column :sha256, 'binary(32)', null: false
|
|
||||||
t.references :created_by_user, null: false, foreign_key: { to_table: :users }
|
|
||||||
t.timestamps
|
|
||||||
end
|
|
||||||
|
|
||||||
add_index :wiki_assets, [:wiki_page_id, :sha256], unique: true
|
|
||||||
add_index :wiki_assets, [:wiki_page_id, :no], unique: true
|
|
||||||
|
|
||||||
add_column :wiki_pages, :next_asset_no, :integer, null: false, default: 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
class CreatePostImplications < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
create_table :post_implications, primary_key: [:post_id, :parent_post_id] do |t|
|
|
||||||
t.references :post, null: false, foreign_key: true, index: false
|
|
||||||
t.references :parent_post, null: false, foreign_key: { to_table: :posts }
|
|
||||||
t.timestamps
|
|
||||||
|
|
||||||
t.check_constraint 'post_id <> parent_post_id',
|
|
||||||
name: 'chk_post_implications_no_self'
|
|
||||||
end
|
|
||||||
|
|
||||||
add_column :post_versions, :parent_post_ids, :text, null: false, after: :parent_id
|
|
||||||
remove_column :post_versions, :parent_id, :bigint
|
|
||||||
remove_reference :posts, :parent, foreign_key: { to_table: :posts }
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
add_reference :posts, :parent, foreign_key: { to_table: :posts }, after: :thumbnail_base
|
|
||||||
add_column :post_versions, :parent_id, :bigint, after: :post_id
|
|
||||||
remove_column :post_versions, :parent_post_ids, :text
|
|
||||||
|
|
||||||
drop_table :post_implications
|
|
||||||
end
|
|
||||||
end
|
|
||||||
-16
@@ -1,16 +0,0 @@
|
|||||||
class RenameBannedToBannedAtInUsersAndIpAddresses < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
[:users, :ip_addresses].each do
|
|
||||||
add_column _1, :banned_at, :datetime, after: :banned
|
|
||||||
add_index _1, :banned_at
|
|
||||||
remove_column _1, :banned
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
[:ip_addresses, :users].each do
|
|
||||||
add_column _1, :banned, :boolean, null: false, default: false, after: :banned_at
|
|
||||||
remove_column _1, :banned_at
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
Generated
+9
-17
@@ -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_05_01_153900) do
|
ActiveRecord::Schema[8.0].define(version: 2026_04_26_120600) 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
|
||||||
@@ -50,10 +50,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) do
|
|||||||
|
|
||||||
create_table "ip_addresses", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "ip_addresses", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.binary "ip_address", limit: 16, null: false
|
t.binary "ip_address", limit: 16, null: false
|
||||||
t.datetime "banned_at"
|
t.boolean "banned", default: false, null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.index ["banned_at"], name: "index_ip_addresses_on_banned_at"
|
|
||||||
t.index ["ip_address"], name: "index_ip_addresses_on_ip_address", unique: true
|
t.index ["ip_address"], name: "index_ip_addresses_on_ip_address", unique: true
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -120,15 +119,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) do
|
|||||||
t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive"
|
t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "post_implications", primary_key: ["post_id", "parent_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "post_id", null: false
|
|
||||||
t.bigint "parent_post_id", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
t.index ["parent_post_id"], name: "index_post_implications_on_parent_post_id"
|
|
||||||
t.check_constraint "`post_id` <> `parent_post_id`", name: "chk_post_implications_no_self"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "post_id", null: false
|
t.bigint "post_id", null: false
|
||||||
t.bigint "target_post_id", null: false
|
t.bigint "target_post_id", null: false
|
||||||
@@ -165,12 +155,13 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) do
|
|||||||
t.string "url", limit: 768, null: false
|
t.string "url", limit: 768, null: false
|
||||||
t.string "thumbnail_base", limit: 2000
|
t.string "thumbnail_base", limit: 2000
|
||||||
t.text "tags", null: false
|
t.text "tags", null: false
|
||||||
t.text "parent_post_ids", null: false
|
t.bigint "parent_id"
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
|
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
|
||||||
|
t.index ["parent_id"], name: "index_post_versions_on_parent_id"
|
||||||
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
|
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
|
||||||
t.index ["post_id"], name: "index_post_versions_on_post_id"
|
t.index ["post_id"], name: "index_post_versions_on_post_id"
|
||||||
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
|
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
|
||||||
@@ -181,11 +172,13 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) do
|
|||||||
t.string "title"
|
t.string "title"
|
||||||
t.string "url", limit: 768, null: false
|
t.string "url", limit: 768, null: false
|
||||||
t.string "thumbnail_base", limit: 2000
|
t.string "thumbnail_base", limit: 2000
|
||||||
|
t.bigint "parent_id"
|
||||||
t.bigint "uploaded_user_id"
|
t.bigint "uploaded_user_id"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
|
t.index ["parent_id"], name: "index_posts_on_parent_id"
|
||||||
t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
|
t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
|
||||||
t.index ["url"], name: "index_posts_on_url", unique: true
|
t.index ["url"], name: "index_posts_on_url", unique: true
|
||||||
end
|
end
|
||||||
@@ -333,10 +326,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) do
|
|||||||
t.string "name"
|
t.string "name"
|
||||||
t.string "inheritance_code", limit: 64, null: false
|
t.string "inheritance_code", limit: 64, null: false
|
||||||
t.string "role", null: false
|
t.string "role", null: false
|
||||||
t.datetime "banned_at"
|
t.boolean "banned", default: false, null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.index ["banned_at"], name: "index_users_on_banned_at"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -436,8 +428,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) do
|
|||||||
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", "tags"
|
||||||
add_foreign_key "nico_tag_versions", "users", column: "created_by_user_id"
|
add_foreign_key "nico_tag_versions", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "post_implications", "posts"
|
|
||||||
add_foreign_key "post_implications", "posts", column: "parent_post_id"
|
|
||||||
add_foreign_key "post_similarities", "posts"
|
add_foreign_key "post_similarities", "posts"
|
||||||
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
||||||
add_foreign_key "post_tags", "posts"
|
add_foreign_key "post_tags", "posts"
|
||||||
@@ -445,7 +435,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) do
|
|||||||
add_foreign_key "post_tags", "users", column: "created_user_id"
|
add_foreign_key "post_tags", "users", column: "created_user_id"
|
||||||
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
||||||
add_foreign_key "post_versions", "posts"
|
add_foreign_key "post_versions", "posts"
|
||||||
|
add_foreign_key "post_versions", "posts", column: "parent_id"
|
||||||
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
||||||
|
add_foreign_key "posts", "posts", column: "parent_id"
|
||||||
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
||||||
add_foreign_key "settings", "users"
|
add_foreign_key "settings", "users"
|
||||||
add_foreign_key "tag_implications", "tags"
|
add_foreign_key "tag_implications", "tags"
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
FactoryBot.define do
|
|
||||||
factory :ip_address do
|
|
||||||
ip_address { IPAddr.new('203.0.113.10').hton }
|
|
||||||
banned_at { nil }
|
|
||||||
|
|
||||||
trait :banned do
|
|
||||||
banned_at { Time.current }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,24 +1,15 @@
|
|||||||
FactoryBot.define do
|
FactoryBot.define do
|
||||||
factory :user do
|
factory :user do
|
||||||
name { nil }
|
name { "test-user" }
|
||||||
inheritance_code { SecureRandom.uuid }
|
inheritance_code { SecureRandom.uuid }
|
||||||
role { 'guest' }
|
role { "guest" }
|
||||||
banned_at { nil }
|
|
||||||
|
|
||||||
trait :guest do
|
|
||||||
role { 'guest' }
|
|
||||||
end
|
|
||||||
|
|
||||||
trait :member do
|
trait :member do
|
||||||
role { 'member' }
|
role { "member" }
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :admin do
|
trait :admin do
|
||||||
role { 'admin' }
|
role { 'admin' }
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :banned do
|
|
||||||
banned_at { Time.current }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe PostImplication, type: :model do
|
|
||||||
let!(:post_record) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'post',
|
|
||||||
url: 'https://example.com/post-implication-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:parent_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'parent post',
|
|
||||||
url: 'https://example.com/post-implication-parent'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'is valid with post and parent_post' do
|
|
||||||
implication = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(implication).to be_valid
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not allow same post as parent_post' do
|
|
||||||
implication = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post: post_record
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(implication).not_to be_valid
|
|
||||||
expect(implication.errors[:parent_post_id]).to be_present
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not allow duplicate pair' do
|
|
||||||
described_class.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
duplicate = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(duplicate).not_to be_valid
|
|
||||||
expect(duplicate.errors[:post_id]).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -19,7 +19,7 @@ RSpec.describe PostVersion, type: :model do
|
|||||||
url: post_record.url,
|
url: post_record.url,
|
||||||
thumbnail_base: post_record.thumbnail_base,
|
thumbnail_base: post_record.thumbnail_base,
|
||||||
tags: post_record.snapshot_tag_names.join(' '),
|
tags: post_record.snapshot_tag_names.join(' '),
|
||||||
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
|
parent: post_record.parent,
|
||||||
original_created_from: post_record.original_created_from,
|
original_created_from: post_record.original_created_from,
|
||||||
original_created_before: post_record.original_created_before,
|
original_created_before: post_record.original_created_before,
|
||||||
created_at: Time.current,
|
created_at: Time.current,
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ RSpec.describe Tag, type: :model do
|
|||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
tags: snapshot_tags(post),
|
tags: snapshot_tags(post),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
parent: post.parent,
|
||||||
original_created_from: post.original_created_from,
|
original_created_from: post.original_created_from,
|
||||||
original_created_before: post.original_created_before,
|
original_created_before: post.original_created_before,
|
||||||
created_at: Time.current,
|
created_at: Time.current,
|
||||||
|
|||||||
@@ -15,31 +15,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
Rack::Test::UploadedFile.new(StringIO.new('dummy'), 'image/jpeg', original_filename: 'dummy.jpg')
|
Rack::Test::UploadedFile.new(StringIO.new('dummy'), 'image/jpeg', original_filename: 'dummy.jpg')
|
||||||
end
|
end
|
||||||
|
|
||||||
def post_write_params params = { }
|
|
||||||
{ parent_post_ids: '' }.merge(params)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_parent_post! title:, url:
|
|
||||||
Post.create!(title:, url:)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_post_version_for! post
|
|
||||||
PostVersion.create!(
|
|
||||||
post:,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
title: post.title,
|
|
||||||
url: post.url,
|
|
||||||
thumbnail_base: post.thumbnail_base,
|
|
||||||
tags: post.snapshot_tag_names.join(' '),
|
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
|
||||||
original_created_from: post.original_created_from,
|
|
||||||
original_created_before: post.original_created_before,
|
|
||||||
created_at: post.created_at,
|
|
||||||
created_by_user: post.uploaded_user
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:tag_name) { TagName.create!(name: 'spec_tag') }
|
let!(:tag_name) { TagName.create!(name: 'spec_tag') }
|
||||||
let!(:tag) { Tag.create!(tag_name: tag_name, category: :general) }
|
let!(:tag) { Tag.create!(tag_name: tag_name, category: :general) }
|
||||||
|
|
||||||
@@ -482,65 +457,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
expect(json).to have_key('viewed')
|
expect(json).to have_key('viewed')
|
||||||
expect([true, false]).to include(json['viewed'])
|
expect([true, false]).to include(json['viewed'])
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when post has parent, child, and sibling posts' do
|
|
||||||
let!(:parent_post) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'shared parent post',
|
|
||||||
url: 'https://example.com/shared-parent-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:child_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'child post',
|
|
||||||
url: 'https://example.com/show-child-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:sibling_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'sibling post',
|
|
||||||
url: 'https://example.com/show-sibling-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
PostImplication.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(
|
|
||||||
post: child_post,
|
|
||||||
parent_post: post_record
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(
|
|
||||||
post: sibling_post,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns parent_posts, child_posts, and sibling_posts' do
|
|
||||||
get "/posts/#{post_record.id}"
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
parent_ids = json.fetch('parent_posts').map { |p| p.fetch('id') }
|
|
||||||
child_ids = json.fetch('child_posts').map { |p| p.fetch('id') }
|
|
||||||
|
|
||||||
expect(parent_ids).to include(parent_post.id)
|
|
||||||
expect(child_ids).to include(child_post.id)
|
|
||||||
|
|
||||||
sibling_posts_by_parent = json.fetch('sibling_posts')
|
|
||||||
siblings = sibling_posts_by_parent.fetch(parent_post.id.to_s)
|
|
||||||
|
|
||||||
sibling_ids = siblings.map { |p| p.fetch('id') }
|
|
||||||
expect(sibling_ids).to include(post_record.id)
|
|
||||||
expect(sibling_ids).to include(sibling_post.id)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when post does not exist' do
|
context 'when post does not exist' do
|
||||||
@@ -559,28 +475,25 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it '401 when not logged in' do
|
it '401 when not logged in' do
|
||||||
sign_out
|
sign_out
|
||||||
post '/posts', params: post_write_params(title: 't', url: 'https://example.com/x', tags: 'a',
|
post '/posts', params: { title: 't', url: 'https://example.com/x', tags: 'a', thumbnail: dummy_upload }
|
||||||
thumbnail: dummy_upload)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '403 when not member' do
|
it '403 when not member' do
|
||||||
sign_in_as(create(:user, role: 'guest'))
|
sign_in_as(create(:user, role: 'guest'))
|
||||||
post '/posts', params: post_write_params(title: 't', url: 'https://example.com/x', tags: 'a',
|
post '/posts', params: { title: 't', url: 'https://example.com/x', tags: 'a', thumbnail: dummy_upload }
|
||||||
thumbnail: dummy_upload)
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
expect(response).to have_http_status(:forbidden)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '201 and creates post + tags when member' do
|
it '201 and creates post + tags when member' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/new',
|
url: 'https://example.com/new',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload
|
||||||
)
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json).to include('id', 'title', 'url')
|
expect(json).to include('id', 'title', 'url')
|
||||||
@@ -594,12 +507,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it '201 and creates post + tags when member and tags have aliases' do
|
it '201 and creates post + tags when member and tags have aliases' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/new',
|
url: 'https://example.com/new',
|
||||||
tags: 'manko', # 既存タグ名を投げる
|
tags: 'manko', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload
|
||||||
)
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json).to include('id', 'title', 'url')
|
expect(json).to include('id', 'title', 'url')
|
||||||
@@ -620,14 +533,13 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'return 400' do
|
it 'return 400' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/nico-tag-post',
|
url: 'https://example.com/nico_tag',
|
||||||
tags: 'nico:nico_tag',
|
tags: 'nico:nico_tag',
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload }
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request), response.body
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -635,11 +547,11 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'returns 422' do
|
it 'returns 422' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: ' ',
|
url: ' ',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload }
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
@@ -649,156 +561,16 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'returns 422' do
|
it 'returns 422' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'ぼざクリタグ広場',
|
url: 'ぼざクリタグ広場',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload
|
||||||
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when parent_post_ids is provided' do
|
|
||||||
let!(:parent_post_1) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'parent post 1',
|
|
||||||
url: 'https://example.com/parent-post-1'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:parent_post_2) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'parent post 2',
|
|
||||||
url: 'https://example.com/parent-post-2'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates post implications for parent posts' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: {
|
|
||||||
title: 'child post',
|
|
||||||
url: 'https://example.com/child-post',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{parent_post_1.id} #{parent_post_2.id}",
|
|
||||||
thumbnail: dummy_upload }
|
|
||||||
}.to change(PostImplication, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
created_post = Post.find(json.fetch('id'))
|
|
||||||
expect(created_post.parent_posts.order(:id).pluck(:id)).to eq(
|
|
||||||
[parent_post_1.id, parent_post_2.id].sort
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(PostImplication.exists?(
|
|
||||||
post_id: created_post.id,
|
|
||||||
parent_post_id: parent_post_1.id
|
|
||||||
)).to be(true)
|
|
||||||
|
|
||||||
expect(PostImplication.exists?(
|
|
||||||
post_id: created_post.id,
|
|
||||||
parent_post_id: parent_post_2.id
|
|
||||||
)).to be(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'deduplicates parent_post_ids' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: post_write_params(
|
|
||||||
title: 'dedup child post',
|
|
||||||
url: 'https://example.com/dedup-child-post',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{parent_post_1.id} #{parent_post_1.id}",
|
|
||||||
thumbnail: dummy_upload
|
|
||||||
)
|
|
||||||
}.to change(PostImplication, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
created_post = Post.find(json.fetch('id'))
|
|
||||||
expect(created_post.parent_posts.pluck(:id)).to eq([parent_post_1.id])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'records parent_post_ids in post version' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
|
||||||
title: 'versioned child post',
|
|
||||||
url: 'https://example.com/versioned-child-post',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{parent_post_1.id} #{parent_post_2.id}",
|
|
||||||
thumbnail: dummy_upload
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
created_post = Post.find(json.fetch('id'))
|
|
||||||
version = PostVersion.find_by!(post: created_post, version_no: 1)
|
|
||||||
|
|
||||||
expect(version.parent_post_ids.split.map(&:to_i)).to eq(
|
|
||||||
[parent_post_1.id, parent_post_2.id].sort
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids is missing' do
|
|
||||||
it 'returns 422' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: {
|
|
||||||
title: 'missing parent_post_ids',
|
|
||||||
url: 'https://example.com/missing-parent-post-ids',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
thumbnail: dummy_upload }
|
|
||||||
}.not_to change(Post, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes invalid token' do
|
|
||||||
it 'returns 422 and does not create post' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: post_write_params(
|
|
||||||
title: 'invalid parent ids',
|
|
||||||
url: 'https://example.com/invalid-parent-ids',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: 'abc',
|
|
||||||
thumbnail: dummy_upload
|
|
||||||
)
|
|
||||||
}.not_to change(Post, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes nonexistent post id' do
|
|
||||||
it 'returns 422 and does not create post implication' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: post_write_params(
|
|
||||||
title: 'missing parent post',
|
|
||||||
url: 'https://example.com/missing-parent-post',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: '999999999',
|
|
||||||
thumbnail: dummy_upload
|
|
||||||
)
|
|
||||||
}.not_to change(PostImplication, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'PUT /posts/:id' do
|
describe 'PUT /posts/:id' do
|
||||||
@@ -806,13 +578,13 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it '401 when not logged in' do
|
it '401 when not logged in' do
|
||||||
sign_out
|
sign_out
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(title: 'updated', tags: 'spec_tag')
|
put "/posts/#{post_record.id}", params: { title: 'updated', tags: 'spec_tag' }
|
||||||
expect(response).to have_http_status(:unauthorized)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '403 when not member' do
|
it '403 when not member' do
|
||||||
sign_in_as(create(:user, role: 'guest'))
|
sign_in_as(create(:user, role: 'guest'))
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(title: 'updated', tags: 'spec_tag')
|
put "/posts/#{post_record.id}", params: { title: 'updated', tags: 'spec_tag' }
|
||||||
expect(response).to have_http_status(:forbidden)
|
expect(response).to have_http_status(:forbidden)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -823,9 +595,10 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
tn2 = TagName.create!(name: 'spec_tag_2')
|
tn2 = TagName.create!(name: 'spec_tag_2')
|
||||||
Tag.create!(tag_name: tn2, category: :general)
|
Tag.create!(tag_name: tn2, category: :general)
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2')
|
tags: 'spec_tag_2'
|
||||||
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json).to have_key('tags')
|
expect(json).to have_key('tags')
|
||||||
@@ -846,178 +619,11 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'return 400' do
|
it 'return 400' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'nico:nico_tag'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request), response.body
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids is provided' do
|
|
||||||
let!(:old_parent_post) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'old parent post',
|
|
||||||
url: 'https://example.com/old-parent-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:new_parent_post_1) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'new parent post 1',
|
|
||||||
url: 'https://example.com/new-parent-post-1'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:new_parent_post_2) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'new parent post 2',
|
|
||||||
url: 'https://example.com/new-parent-post-2'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
PostImplication.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post: old_parent_post
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'replaces parent posts' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{new_parent_post_1.id} #{new_parent_post_2.id}"
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(post_record.reload.parent_posts.order(:id).pluck(:id)).to eq(
|
|
||||||
[new_parent_post_1.id, new_parent_post_2.id].sort
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(PostImplication.exists?(
|
|
||||||
post_id: post_record.id,
|
|
||||||
parent_post_id: old_parent_post.id
|
|
||||||
)).to be(false)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'clears parent posts when parent_post_ids is blank' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: ''
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(post_record.reload.parent_posts).to be_empty
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'records changed parent_post_ids in post version' do
|
|
||||||
sign_in_as(member)
|
|
||||||
create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{new_parent_post_1.id} #{new_parent_post_2.id}"
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
version = post_record.reload.post_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(version.version_no).to eq(2)
|
|
||||||
expect(version.parent_post_ids.split.map(&:to_i)).to eq(
|
|
||||||
[new_parent_post_1.id, new_parent_post_2.id].sort
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids is missing' do
|
|
||||||
it 'returns 422' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{ post_record.id }", params: {
|
put "/posts/#{ post_record.id }", params: {
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag' }
|
tags: 'nico:nico_tag' }
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:bad_request)
|
||||||
expect(json.fetch('errors')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes invalid token' do
|
|
||||||
it 'returns 422 and does not change parent posts' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
parent_post = create_parent_post!(
|
|
||||||
title: 'valid parent post',
|
|
||||||
url: 'https://example.com/valid-parent-post'
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: 'abc'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(post_record.reload.parent_posts.pluck(:id)).to eq([parent_post.id])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes nonexistent post id' do
|
|
||||||
it 'returns 422 and does not change parent posts' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
parent_post = create_parent_post!(
|
|
||||||
title: 'existing parent post',
|
|
||||||
url: 'https://example.com/existing-parent-post'
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: '999999999'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(post_record.reload.parent_posts.pluck(:id)).to eq([parent_post.id])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes self id' do
|
|
||||||
it 'returns 422 and does not create self implication' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: post_record.id.to_s
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
|
|
||||||
expect(PostImplication.exists?(
|
|
||||||
post_id: post_record.id,
|
|
||||||
parent_post_id: post_record.id
|
|
||||||
)).to be(false)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -1167,20 +773,20 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
post.snapshot_tag_names.join(' ')
|
post.snapshot_tag_names.join(' ')
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_post_version! post, version_no:, event_type:, created_by_user:, created_at:
|
def create_post_version!(post, version_no:, event_type:, created_by_user:, created_at:)
|
||||||
PostVersion.create!(
|
PostVersion.create!(
|
||||||
post:,
|
post: post,
|
||||||
version_no:,
|
version_no: version_no,
|
||||||
event_type:,
|
event_type: event_type,
|
||||||
title: post.title,
|
title: post.title,
|
||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
tags: snapshot_tags(post),
|
tags: snapshot_tags(post),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
parent: post.parent,
|
||||||
original_created_from: post.original_created_from,
|
original_created_from: post.original_created_from,
|
||||||
original_created_before: post.original_created_before,
|
original_created_before: post.original_created_before,
|
||||||
created_at:,
|
created_at: created_at,
|
||||||
created_by_user:
|
created_by_user: created_by_user
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1418,6 +1024,7 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
tags: snapshot_tags(post),
|
tags: snapshot_tags(post),
|
||||||
|
parent: post.parent,
|
||||||
original_created_from: post.original_created_from,
|
original_created_from: post.original_created_from,
|
||||||
original_created_before: post.original_created_before,
|
original_created_before: post.original_created_before,
|
||||||
created_at: post.created_at,
|
created_at: post.created_at,
|
||||||
@@ -1429,11 +1036,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'versioned post',
|
title: 'versioned post',
|
||||||
url: 'https://example.com/versioned-post',
|
url: 'https://example.com/versioned-post',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload
|
||||||
|
}
|
||||||
end.to change(PostVersion, :count).by(1)
|
end.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
@@ -1456,9 +1064,10 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
Tag.create!(tag_name: tag_name2, category: :general)
|
Tag.create!(tag_name: tag_name2, category: :general)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2')
|
tags: 'spec_tag_2'
|
||||||
|
}
|
||||||
end.to change(PostVersion, :count).by(1)
|
end.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
@@ -1478,9 +1087,10 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
create_post_version_for!(post_record.reload)
|
create_post_version_for!(post_record.reload)
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
title: post_record.title,
|
title: post_record.title,
|
||||||
tags: 'spec_tag')
|
tags: 'spec_tag'
|
||||||
|
}
|
||||||
}.not_to change(PostVersion, :count)
|
}.not_to change(PostVersion, :count)
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
@@ -1494,11 +1104,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'invalid post',
|
title: 'invalid post',
|
||||||
url: 'ぼざクリタグ広場',
|
url: 'ぼざクリタグ広場',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload
|
||||||
|
}
|
||||||
end.not_to change(PostVersion, :count)
|
end.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
@@ -1509,11 +1120,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
create_post_version_for!(post_record)
|
create_post_version_for!(post_record)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
original_created_from: Time.zone.local(2020, 1, 2, 0, 0, 0).iso8601,
|
original_created_from: Time.zone.local(2020, 1, 2, 0, 0, 0).iso8601,
|
||||||
original_created_before: Time.zone.local(2020, 1, 1, 0, 0, 0).iso8601)
|
original_created_before: Time.zone.local(2020, 1, 1, 0, 0, 0).iso8601
|
||||||
|
}
|
||||||
end.not_to change(PostVersion, :count)
|
end.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
@@ -1527,11 +1139,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'tag versioned post',
|
title: 'tag versioned post',
|
||||||
url: 'https://example.com/tag-versioned-post',
|
url: 'https://example.com/tag-versioned-post',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload
|
||||||
|
}
|
||||||
}.to change { tag.reload.tag_versions.count }.by(1)
|
}.to change { tag.reload.tag_versions.count }.by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
@@ -1551,9 +1164,10 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
tag2 = Tag.create!(tag_name: tag_name2, category: :general)
|
tag2 = Tag.create!(tag_name: tag_name2, category: :general)
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2')
|
tags: 'spec_tag_2'
|
||||||
|
}
|
||||||
}.to change { tag2.reload.tag_versions.count }.by(1)
|
}.to change { tag2.reload.tag_versions.count }.by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|||||||
@@ -8,10 +8,8 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
let!(:tag) { create(:tag, category: :deerjikist) }
|
let!(:tag) { create(:tag, category: :deerjikist) }
|
||||||
|
|
||||||
let(:member) { create(:user, :member) }
|
|
||||||
let(:guest) { create(:user, role: :guest) }
|
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
# show_by_name / deerjikists_by_name 用に名前を固定
|
||||||
tag.tag_name.update!(name: 'deerjika')
|
tag.tag_name.update!(name: 'deerjika')
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -23,20 +21,10 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
let(:tag_id) { tag.id }
|
let(:tag_id) { tag.id }
|
||||||
|
|
||||||
context 'when tag exists and has no deerjikists' do
|
context 'when tag exists and has no deerjikists' do
|
||||||
it 'returns 200 with tag and empty deerjikists array' do
|
it 'returns 200 and empty array' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json).to eq([])
|
||||||
expect(json).to be_a(Hash)
|
|
||||||
|
|
||||||
expect(json['tag']).to be_a(Hash)
|
|
||||||
expect(json['tag']['id']).to eq(tag.id)
|
|
||||||
expect(json['tag']['name']).to eq('deerjika')
|
|
||||||
expect(json['tag']['category']).to eq('deerjikist')
|
|
||||||
expect(json['tag']['has_deerjikists']).to eq(false)
|
|
||||||
|
|
||||||
expect(json['deerjikists']).to eq([])
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -46,24 +34,14 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 200 with tag and deerjikists array' do
|
it 'returns 200 and deerjikists array' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
expect(json).to be_a(Hash)
|
expect(json).to be_a(Array)
|
||||||
|
expect(json.size).to eq(2)
|
||||||
|
|
||||||
expect(json['tag']).to be_a(Hash)
|
expect(json.map { |h| [h['platform'], h['code']] }).to contain_exactly(
|
||||||
expect(json['tag']['id']).to eq(tag.id)
|
|
||||||
expect(json['tag']['name']).to eq('deerjika')
|
|
||||||
expect(json['tag']['category']).to eq('deerjikist')
|
|
||||||
expect(json['tag']['has_deerjikists']).to eq(true)
|
|
||||||
|
|
||||||
expect(json['deerjikists']).to be_a(Array)
|
|
||||||
expect(json['deerjikists'].size).to eq(2)
|
|
||||||
|
|
||||||
expect(json['deerjikists'].map { |h| [h['platform'], h['code']] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
[platform1, code1],
|
||||||
[platform2, code2],
|
[platform2, code2],
|
||||||
)
|
)
|
||||||
@@ -75,7 +53,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -93,7 +70,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 400' do
|
it 'returns 400' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -103,209 +79,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when tag exists and has no deerjikists' do
|
|
||||||
it 'returns 200 with tag and empty deerjikists array' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(json).to be_a(Hash)
|
|
||||||
|
|
||||||
expect(json['tag']).to be_a(Hash)
|
|
||||||
expect(json['tag']['id']).to eq(tag.id)
|
|
||||||
expect(json['tag']['name']).to eq('deerjika')
|
|
||||||
expect(json['tag']['category']).to eq('deerjikist')
|
|
||||||
expect(json['tag']['has_deerjikists']).to eq(false)
|
|
||||||
|
|
||||||
expect(json['deerjikists']).to eq([])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when tag exists and has deerjikists' do
|
context 'when tag exists and has deerjikists' do
|
||||||
before do
|
before do
|
||||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 200 with tag and deerjikists array' do
|
it 'returns 200 and deerjikists array' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
expect(json).to be_a(Hash)
|
|
||||||
|
|
||||||
expect(json['tag']).to be_a(Hash)
|
|
||||||
expect(json['tag']['id']).to eq(tag.id)
|
|
||||||
expect(json['tag']['name']).to eq('deerjika')
|
|
||||||
expect(json['tag']['category']).to eq('deerjikist')
|
|
||||||
expect(json['tag']['has_deerjikists']).to eq(true)
|
|
||||||
|
|
||||||
expect(json['deerjikists']).to be_a(Array)
|
|
||||||
expect(json['deerjikists'].size).to eq(1)
|
|
||||||
|
|
||||||
expect(json['deerjikists'][0]['platform']).to eq(platform1)
|
|
||||||
expect(json['deerjikists'][0]['code']).to eq(code1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PUT /tags/:id/deerjikists' do
|
|
||||||
subject(:do_request) do
|
|
||||||
put "/tags/#{tag_id}/deerjikists", params: payload, as: :json
|
|
||||||
end
|
|
||||||
|
|
||||||
let(:tag_id) { tag.id }
|
|
||||||
let(:payload) do
|
|
||||||
[
|
|
||||||
{ platform: platform1, code: code1 },
|
|
||||||
{ platform: platform2, code: code2 },
|
|
||||||
]
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when not logged in' do
|
|
||||||
it 'returns 401' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when logged in but not member' do
|
|
||||||
before do
|
|
||||||
sign_in_as guest
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when tag does not exist' do
|
|
||||||
let(:tag_id) { 9_999_999 }
|
|
||||||
|
|
||||||
before do
|
|
||||||
sign_in_as member
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 404' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when logged in as member' do
|
|
||||||
before do
|
|
||||||
sign_in_as member
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when tag has no deerjikists' do
|
|
||||||
it 'creates deerjikists and returns deerjikists array' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.to change { Deerjikist.where(tag: tag).count }.from(0).to(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(json).to be_a(Array)
|
|
||||||
expect(json.map { |h| [h['platform'], h['code']] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
|
||||||
[platform2, code2],
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
|
||||||
[platform2, code2],
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when tag already has deerjikists' do
|
|
||||||
before do
|
|
||||||
Deerjikist.create!(platform: platform1, code: 'old-code-1', tag: tag)
|
|
||||||
Deerjikist.create!(platform: platform2, code: 'old-code-2', tag: tag)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'replaces deerjikists and returns deerjikists array' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
|
||||||
[platform2, code2],
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(Deerjikist.exists?(platform: platform1, code: 'old-code-1')).to eq(false)
|
|
||||||
expect(Deerjikist.exists?(platform: platform2, code: 'old-code-2')).to eq(false)
|
|
||||||
|
|
||||||
expect(json).to be_a(Array)
|
|
||||||
expect(json.map { |h| [h['platform'], h['code']] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
|
||||||
[platform2, code2],
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when payload is empty array' do
|
|
||||||
let(:payload) { [] }
|
|
||||||
|
|
||||||
before do
|
|
||||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
|
||||||
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'clears deerjikists and returns empty array' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.to change { Deerjikist.where(tag: tag).count }.from(2).to(0)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json).to eq([])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when youtube code is handle' do
|
|
||||||
let(:channel_id) { 'UCabcdefghijklmnopqrstuv' }
|
|
||||||
let(:payload) do
|
|
||||||
[
|
|
||||||
{ platform: 'youtube', code: '@deerjika' },
|
|
||||||
]
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
allow(Net::HTTP).to receive(:get).and_return(
|
|
||||||
%(<link rel="canonical" href="https://www.youtube.com/channel/#{channel_id}">),
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'normalises youtube handle to channel id' do
|
|
||||||
expect {
|
|
||||||
do_request
|
|
||||||
}.to change { Deerjikist.where(tag: tag).count }.from(0).to(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(Net::HTTP).to have_received(:get)
|
|
||||||
|
|
||||||
expect(Deerjikist.exists?(platform: 'youtube', code: channel_id, tag: tag))
|
|
||||||
.to eq(true)
|
|
||||||
|
|
||||||
expect(json).to be_a(Array)
|
expect(json).to be_a(Array)
|
||||||
expect(json.size).to eq(1)
|
expect(json.size).to eq(1)
|
||||||
expect(json[0]['platform']).to eq('youtube')
|
expect(json[0]['platform']).to eq(platform1)
|
||||||
expect(json[0]['code']).to eq(channel_id)
|
expect(json[0]['code']).to eq(code1)
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,266 +1,109 @@
|
|||||||
require 'rails_helper'
|
require "rails_helper"
|
||||||
|
|
||||||
RSpec.describe 'Users', type: :request do
|
|
||||||
let(:remote_ip) { '203.0.113.10' }
|
|
||||||
|
|
||||||
before do
|
|
||||||
allow_any_instance_of(ActionDispatch::Request)
|
|
||||||
.to receive(:remote_ip)
|
|
||||||
.and_return(remote_ip)
|
|
||||||
end
|
|
||||||
|
|
||||||
def auth_headers(user)
|
|
||||||
{ 'X-Transfer-Code' => user.inheritance_code }
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'POST /users' do
|
|
||||||
it 'creates guest user, IpAddress and UserIp, and returns code' do
|
|
||||||
expect {
|
|
||||||
post '/users'
|
|
||||||
}.to change(User, :count).by(1)
|
|
||||||
.and change(IpAddress, :count).by(1)
|
|
||||||
.and change(UserIp, :count).by(1)
|
|
||||||
|
|
||||||
|
RSpec.describe "Users", type: :request do
|
||||||
|
describe "POST /users" do
|
||||||
|
it "creates guest user and returns code" do
|
||||||
|
post "/users"
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json['code']).to be_present
|
expect(json["code"]).to be_present
|
||||||
expect(json['user']['role']).to eq('guest')
|
expect(json["user"]["role"]).to eq("guest")
|
||||||
|
|
||||||
user = User.last
|
|
||||||
ip_address = IpAddress.find_by(ip_address: IPAddr.new(remote_ip).hton)
|
|
||||||
|
|
||||||
expect(user.role).to eq('guest')
|
|
||||||
expect(ip_address).to be_present
|
|
||||||
expect(UserIp.exists?(user:, ip_address:)).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 and does not create user when current IP address is banned' do
|
|
||||||
IpAddress.create!(
|
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users'
|
|
||||||
}.not_to change(User, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
expect(UserIp.count).to eq(0)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'POST /users/code/renew' do
|
describe "POST /users/code/renew" do
|
||||||
it 'returns 401 when not logged in' do
|
it "returns 401 when not logged in" do
|
||||||
post '/users/code/renew'
|
sign_out
|
||||||
|
post "/users/code/renew"
|
||||||
|
expect(response).to have_http_status(:unauthorized)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "PUT /users/:id" do
|
||||||
|
let(:user) { create(:user, name: "old-name", role: "guest") }
|
||||||
|
|
||||||
|
it "returns 401 when current_user id mismatch" do
|
||||||
|
sign_in_as(create(:user))
|
||||||
|
put "/users/#{user.id}", params: { name: "new-name" }
|
||||||
expect(response).to have_http_status(:unauthorized)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 403 when current user is banned' do
|
it "returns 400 when name is blank" do
|
||||||
user = create(:user, :banned)
|
sign_in_as(user)
|
||||||
|
put "/users/#{user.id}", params: { name: " " }
|
||||||
post '/users/code/renew', headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current IP address is banned' do
|
|
||||||
user = create(:user)
|
|
||||||
|
|
||||||
IpAddress.create!(
|
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
post '/users/code/renew', headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PUT /users/:id' do
|
|
||||||
let(:user) { create(:user, name: 'old-name', role: 'guest') }
|
|
||||||
|
|
||||||
it 'returns 401 when current_user id mismatch' do
|
|
||||||
other_user = create(:user)
|
|
||||||
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: 'new-name' },
|
|
||||||
headers: auth_headers(other_user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 400 when name is blank' do
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: ' ' },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'updates name and returns user slice' do
|
it "updates name and returns 201 with user slice" do
|
||||||
put "/users/#{user.id}",
|
sign_in_as(user)
|
||||||
params: { name: 'new-name' },
|
put "/users/#{user.id}", params: { name: "new-name" }
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['id']).to eq(user.id)
|
expect(json["id"]).to eq(user.id)
|
||||||
expect(json['name']).to eq('new-name')
|
expect(json["name"]).to eq("new-name")
|
||||||
|
|
||||||
user.reload
|
user.reload
|
||||||
expect(user.name).to eq('new-name')
|
expect(user.name).to eq("new-name")
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current user is banned' do
|
|
||||||
user.update!(banned_at: Time.current)
|
|
||||||
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: 'new-name' },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
|
|
||||||
user.reload
|
|
||||||
expect(user.name).to eq('old-name')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current IP address is banned' do
|
|
||||||
IpAddress.create!(
|
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: 'new-name' },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
|
|
||||||
user.reload
|
|
||||||
expect(user.name).to eq('old-name')
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'POST /users/verify' do
|
describe "POST /users/verify" do
|
||||||
it 'returns valid:false when code not found' do
|
it "returns valid:false when code not found" do
|
||||||
post '/users/verify', params: { code: 'nope' }
|
post "/users/verify", params: { code: "nope" }
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['valid']).to eq(false)
|
expect(json["valid"]).to eq(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 403 when current IP address is banned' do
|
it "creates IpAddress and UserIp, and returns valid:true with user slice" do
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
|
user = create(:user, inheritance_code: SecureRandom.uuid, role: "guest")
|
||||||
|
|
||||||
IpAddress.create!(
|
# request.remote_ip を固定
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("203.0.113.10")
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
post "/users/verify", params: { code: user.inheritance_code }
|
||||||
}.not_to change(UserIp, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when verified user is banned' do
|
|
||||||
user = create(
|
|
||||||
:user,
|
|
||||||
:banned,
|
|
||||||
inheritance_code: SecureRandom.uuid,
|
|
||||||
role: 'guest'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
}.not_to change(UserIp, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates IpAddress and UserIp, and returns valid:true with user slice' do
|
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
}.to change(UserIp, :count).by(1)
|
|
||||||
.and change(IpAddress, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['valid']).to eq(true)
|
|
||||||
expect(json['user']['id']).to eq(user.id)
|
|
||||||
expect(json['user']['inheritance_code']).to eq(user.inheritance_code)
|
|
||||||
expect(json['user']['role']).to eq('guest')
|
|
||||||
|
|
||||||
ip_address = IpAddress.find_by(ip_address: IPAddr.new(remote_ip).hton)
|
|
||||||
expect(ip_address).to be_present
|
|
||||||
expect(UserIp.exists?(user:, ip_address:)).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'is idempotent for same user and same IP address' do
|
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
|
|
||||||
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
}.not_to change(UserIp, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json['valid']).to eq(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates another UserIp for same user and different IP address' do
|
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
|
|
||||||
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
allow_any_instance_of(ActionDispatch::Request)
|
|
||||||
.to receive(:remote_ip)
|
|
||||||
.and_return('203.0.113.11')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/users/verify', params: { code: user.inheritance_code }
|
|
||||||
}.to change(UserIp, :count).by(1)
|
}.to change(UserIp, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['valid']).to eq(true)
|
expect(json["valid"]).to eq(true)
|
||||||
|
expect(json["user"]["id"]).to eq(user.id)
|
||||||
|
expect(json["user"]["inheritance_code"]).to eq(user.inheritance_code)
|
||||||
|
expect(json["user"]["role"]).to eq("guest")
|
||||||
|
|
||||||
|
# ついでに IpAddress もできてることを確認(ipの保存形式がバイナリでも count で見れる)
|
||||||
|
expect(IpAddress.count).to be >= 1
|
||||||
|
end
|
||||||
|
|
||||||
|
it "is idempotent for same user+ip (does not create duplicate UserIp)" do
|
||||||
|
user = create(:user, inheritance_code: SecureRandom.uuid, role: "guest")
|
||||||
|
allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("203.0.113.10")
|
||||||
|
|
||||||
|
post "/users/verify", params: { code: user.inheritance_code }
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
expect {
|
||||||
|
post "/users/verify", params: { code: user.inheritance_code }
|
||||||
|
}.not_to change(UserIp, :count)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(json["valid"]).to eq(true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /users/me' do
|
describe "GET /users/me" do
|
||||||
it 'returns 404 when code not found' do
|
it "returns 404 when code not found" do
|
||||||
get '/users/me', params: { code: 'nope' }
|
get "/users/me", params: { code: "nope" }
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns user slice when found' do
|
it "returns user slice when found" do
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid, name: 'me', role: 'guest')
|
user = create(:user, inheritance_code: SecureRandom.uuid, name: "me", role: "guest")
|
||||||
|
get "/users/me", params: { code: user.inheritance_code }
|
||||||
get '/users/me', params: { code: user.inheritance_code }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['id']).to eq(user.id)
|
expect(json["id"]).to eq(user.id)
|
||||||
expect(json['name']).to eq('me')
|
expect(json["name"]).to eq("me")
|
||||||
expect(json['inheritance_code']).to eq(user.inheritance_code)
|
expect(json["inheritance_code"]).to eq(user.inheritance_code)
|
||||||
expect(json['role']).to eq('guest')
|
expect(json["role"]).to eq("guest")
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 403 when current IP address is banned' do
|
|
||||||
user = create(:user, inheritance_code: SecureRandom.uuid)
|
|
||||||
|
|
||||||
IpAddress.create!(
|
|
||||||
ip_address: IPAddr.new(remote_ip).hton,
|
|
||||||
banned_at: Time.current
|
|
||||||
)
|
|
||||||
|
|
||||||
get '/users/me', params: { code: user.inheritance_code }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,191 +0,0 @@
|
|||||||
require 'digest'
|
|
||||||
require 'rails_helper'
|
|
||||||
require 'stringio'
|
|
||||||
|
|
||||||
|
|
||||||
RSpec.describe 'WikiAssets API', type: :request do
|
|
||||||
def dummy_upload(content = 'dummy-image', filename: 'dummy.png', content_type: 'image/png')
|
|
||||||
Rack::Test::UploadedFile.new(StringIO.new(content),
|
|
||||||
content_type,
|
|
||||||
original_filename: filename)
|
|
||||||
end
|
|
||||||
|
|
||||||
let(:member) { create(:user, :member, name: 'member user') }
|
|
||||||
let(:guest) { create(:user, name: 'guest user') }
|
|
||||||
|
|
||||||
let!(:tag_name) { TagName.create!(name: 'spec_wiki_asset_page') }
|
|
||||||
let!(:page) do
|
|
||||||
WikiPage.create!(tag_name: tag_name, created_user: member, updated_user: member).tap do |p|
|
|
||||||
Wiki::Commit.content!(page: p, body: 'init', created_user: member, message: 'init')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'GET /wiki/:wiki_page_id/assets' do
|
|
||||||
subject(:do_request) do
|
|
||||||
get "/wiki/#{wiki_page_id}/assets"
|
|
||||||
end
|
|
||||||
|
|
||||||
let(:wiki_page_id) { page.id }
|
|
||||||
|
|
||||||
let!(:asset) do
|
|
||||||
WikiAsset.new(wiki_page: page,
|
|
||||||
no: 1,
|
|
||||||
alt_text: 'spec alt',
|
|
||||||
sha256: Digest::SHA256.digest('asset-1'),
|
|
||||||
created_by_user: member).tap do |record|
|
|
||||||
record.file.attach(dummy_upload('asset-1'))
|
|
||||||
record.save!
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when wiki page exists' do
|
|
||||||
it 'returns assets for the page' do
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json).to be_an(Array)
|
|
||||||
expect(json.size).to eq(1)
|
|
||||||
|
|
||||||
expect(json.first).to include(
|
|
||||||
'wiki_page_id' => page.id,
|
|
||||||
'no' => 1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not include assets from other pages' do
|
|
||||||
other_tag_name = TagName.create!(name: 'spec_other_wiki_asset_page')
|
|
||||||
other_page = WikiPage.create!(tag_name: other_tag_name,
|
|
||||||
created_user: member,
|
|
||||||
updated_user: member)
|
|
||||||
Wiki::Commit.content!(page: other_page, body: 'other', created_user: member, message: 'other')
|
|
||||||
|
|
||||||
WikiAsset.new(wiki_page: other_page,
|
|
||||||
no: 1,
|
|
||||||
alt_text: 'other alt',
|
|
||||||
sha256: Digest::SHA256.digest('asset-2'),
|
|
||||||
created_by_user: member).tap do |record|
|
|
||||||
record.file.attach(dummy_upload('asset-2', filename: 'other.png'))
|
|
||||||
record.save!
|
|
||||||
end
|
|
||||||
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.size).to eq(1)
|
|
||||||
expect(json.first['wiki_page_id']).to eq(page.id)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when wiki page does not exist' do
|
|
||||||
let(:wiki_page_id) { 999_999_999 }
|
|
||||||
|
|
||||||
it 'returns 404' do
|
|
||||||
do_request
|
|
||||||
expect(response).to have_http_status(:not_found)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'POST /wiki/:wiki_page_id/assets' do
|
|
||||||
subject(:do_request) do
|
|
||||||
post "/wiki/#{wiki_page_id}/assets", params: params
|
|
||||||
end
|
|
||||||
|
|
||||||
let(:wiki_page_id) { page.id }
|
|
||||||
let(:params) do
|
|
||||||
{ file: dummy_upload(upload_content),
|
|
||||||
alt_text: 'uploaded alt' }
|
|
||||||
end
|
|
||||||
let(:upload_content) { 'uploaded-image-binary' }
|
|
||||||
|
|
||||||
context 'when not logged in' do
|
|
||||||
it 'returns 401' do
|
|
||||||
sign_out
|
|
||||||
do_request
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when logged in but not member' do
|
|
||||||
it 'returns 403' do
|
|
||||||
sign_in_as(guest)
|
|
||||||
do_request
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when wiki page does not exist' do
|
|
||||||
let(:wiki_page_id) { 999_999_999 }
|
|
||||||
|
|
||||||
it 'returns 404' do
|
|
||||||
sign_in_as(member)
|
|
||||||
do_request
|
|
||||||
expect(response).to have_http_status(:not_found)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when file is blank' do
|
|
||||||
let(:params) { { alt_text: 'uploaded alt' } }
|
|
||||||
|
|
||||||
it 'returns 400' do
|
|
||||||
sign_in_as(member)
|
|
||||||
do_request
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when success' do
|
|
||||||
before do
|
|
||||||
sign_in_as(member)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates asset, attaches file, increments next_asset_no, and returns json' do
|
|
||||||
expect { do_request }
|
|
||||||
.to change(WikiAsset, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
asset = WikiAsset.order(:id).last
|
|
||||||
expect(asset.wiki_page_id).to eq(page.id)
|
|
||||||
expect(asset.no).to eq(1)
|
|
||||||
expect(asset.alt_text).to eq('uploaded alt')
|
|
||||||
expect(asset.sha256).to eq(Digest::SHA256.digest(upload_content))
|
|
||||||
expect(asset.created_by_user_id).to eq(member.id)
|
|
||||||
expect(asset.file).to be_attached
|
|
||||||
expect(asset.file.download).to eq(upload_content)
|
|
||||||
|
|
||||||
expect(page.reload.next_asset_no).to eq(2)
|
|
||||||
|
|
||||||
expect(json).to include(
|
|
||||||
'wiki_page_id' => page.id,
|
|
||||||
'no' => 1,
|
|
||||||
'url' => asset.url
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'uses the next page-local number when assets already exist' do
|
|
||||||
existing = WikiAsset.new(wiki_page: page,
|
|
||||||
no: 1,
|
|
||||||
alt_text: 'existing alt',
|
|
||||||
sha256: Digest::SHA256.digest('existing'),
|
|
||||||
created_by_user: member)
|
|
||||||
existing.file.attach(dummy_upload('existing', filename: 'existing.png'))
|
|
||||||
existing.save!
|
|
||||||
page.update!(next_asset_no: 2)
|
|
||||||
|
|
||||||
do_request
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
asset = WikiAsset.order(:id).last
|
|
||||||
expect(asset.no).to eq(2)
|
|
||||||
expect(page.reload.next_asset_no).to eq(3)
|
|
||||||
|
|
||||||
expect(json).to include(
|
|
||||||
'wiki_page_id' => page.id,
|
|
||||||
'no' => 2,
|
|
||||||
'url' => asset.url
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -113,7 +113,6 @@ RSpec.describe 'Wiki API', type: :request do
|
|||||||
|
|
||||||
page_id = json.fetch('id')
|
page_id = json.fetch('id')
|
||||||
expect(json.fetch('title')).to eq('TestPage')
|
expect(json.fetch('title')).to eq('TestPage')
|
||||||
expect(json.fetch('body')).to eq("a\nb\nc")
|
|
||||||
|
|
||||||
created_page = WikiPage.find(page_id)
|
created_page = WikiPage.find(page_id)
|
||||||
version = created_page.wiki_versions.order(:version_no).last
|
version = created_page.wiki_versions.order(:version_no).last
|
||||||
|
|||||||
@@ -2,12 +2,14 @@ module TestRecords
|
|||||||
def create_member_user!
|
def create_member_user!
|
||||||
User.create!(name: 'spec user',
|
User.create!(name: 'spec user',
|
||||||
inheritance_code: SecureRandom.hex(16),
|
inheritance_code: SecureRandom.hex(16),
|
||||||
role: 'member')
|
role: 'member',
|
||||||
|
banned: false)
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_admin_user!
|
def create_admin_user!
|
||||||
User.create!(name: 'spec admin',
|
User.create!(name: 'spec admin',
|
||||||
inheritance_code: SecureRandom.hex(16),
|
inheritance_code: SecureRandom.hex(16),
|
||||||
role: 'admin')
|
role: 'admin',
|
||||||
|
banned: false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ RSpec.describe "nico:sync" do
|
|||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
tags: snapshot_tags(post),
|
tags: snapshot_tags(post),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
parent: post.parent,
|
||||||
original_created_from: post.original_created_from,
|
original_created_from: post.original_created_from,
|
||||||
original_created_before: post.original_created_before,
|
original_created_before: post.original_created_before,
|
||||||
created_at: Time.current,
|
created_at: Time.current,
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import RouteBlockerOverlay from '@/components/RouteBlockerOverlay'
|
|||||||
import TopNav from '@/components/TopNav'
|
import TopNav from '@/components/TopNav'
|
||||||
import { Toaster } from '@/components/ui/toaster'
|
import { Toaster } from '@/components/ui/toaster'
|
||||||
import { apiPost, isApiError } from '@/lib/api'
|
import { apiPost, isApiError } from '@/lib/api'
|
||||||
import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
|
|
||||||
import MaterialBasePage from '@/pages/materials/MaterialBasePage'
|
import MaterialBasePage from '@/pages/materials/MaterialBasePage'
|
||||||
import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
|
import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
|
||||||
import MaterialListPage from '@/pages/materials/MaterialListPage'
|
import MaterialListPage from '@/pages/materials/MaterialListPage'
|
||||||
@@ -59,7 +58,6 @@ const RouteTransitionWrapper = ({ user, setUser }: {
|
|||||||
<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/:id" element={<TagDetailPage/>}/>
|
||||||
<Route path="/tags/:id/deerjikists" element={<DeerjikistDetailPage/>}/>
|
|
||||||
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
|
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
|
||||||
<Route path="/tags/changes" element={<TagHistoryPage/>}/>
|
<Route path="/tags/changes" element={<TagHistoryPage/>}/>
|
||||||
<Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
|
<Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import PostFormTagsArea from '@/components/PostFormTagsArea'
|
|||||||
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
||||||
import Label from '@/components/common/Label'
|
import Label from '@/components/common/Label'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
|
||||||
import { apiPut } from '@/lib/api'
|
import { apiPut } from '@/lib/api'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
@@ -36,34 +35,20 @@ export default (({ post, onSave }: Props) => {
|
|||||||
useState<string | null> (post.originalCreatedBefore)
|
useState<string | null> (post.originalCreatedBefore)
|
||||||
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
||||||
useState<string | null> (post.originalCreatedFrom)
|
useState<string | null> (post.originalCreatedFrom)
|
||||||
const [parentPostIds, setParentPostIds] =
|
|
||||||
useState ((post.parentPosts ?? []).map (p => p.id).join (' '))
|
|
||||||
const [tags, setTags] = useState<string> ('')
|
|
||||||
const [title, setTitle] = useState (post.title)
|
const [title, setTitle] = useState (post.title)
|
||||||
|
const [tags, setTags] = useState<string> ('')
|
||||||
|
|
||||||
const handleSubmit = async () => {
|
const handleSubmit = async () => {
|
||||||
try
|
|
||||||
{
|
|
||||||
const data = await apiPut<Post> (
|
const data = await apiPut<Post> (
|
||||||
`/posts/${ post.id }`,
|
`/posts/${ post.id }`,
|
||||||
{ title, tags, parent_post_ids: parentPostIds,
|
{ title, tags, original_created_from: originalCreatedFrom,
|
||||||
original_created_from: originalCreatedFrom,
|
|
||||||
original_created_before: originalCreatedBefore },
|
original_created_before: originalCreatedBefore },
|
||||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||||
onSave ({ ...post,
|
onSave ({ ...post,
|
||||||
title: data.title,
|
title: data.title,
|
||||||
tags: data.tags,
|
tags: data.tags,
|
||||||
parentPosts: data.parentPosts,
|
|
||||||
childPosts: data.childPosts,
|
|
||||||
siblingPosts: data.siblingPosts,
|
|
||||||
originalCreatedFrom: data.originalCreatedFrom,
|
originalCreatedFrom: data.originalCreatedFrom,
|
||||||
originalCreatedBefore: data.originalCreatedBefore } as Post)
|
originalCreatedBefore: data.originalCreatedBefore } as Post)
|
||||||
toast ({ description: '更新しました.' })
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
toast ({ description: '更新はできなかったよ……' })
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
@@ -81,16 +66,6 @@ export default (({ post, onSave }: Props) => {
|
|||||||
onChange={ev => setTitle (ev.target.value)}/>
|
onChange={ev => setTitle (ev.target.value)}/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* 親投稿 */}
|
|
||||||
<div>
|
|
||||||
<Label>親投稿</Label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={parentPostIds}
|
|
||||||
onChange={e => setParentPostIds (e.target.value)}
|
|
||||||
className="w-full border p-2 rounded"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { useRef } from 'react'
|
|||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
import { cn } from '@/lib/utils'
|
|
||||||
import { useSharedTransitionStore } from '@/stores/sharedTransitionStore'
|
import { useSharedTransitionStore } from '@/stores/sharedTransitionStore'
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC, MouseEvent } from 'react'
|
||||||
@@ -40,10 +39,8 @@ export default (({ posts, onClick }: Props) => {
|
|||||||
<motion.div
|
<motion.div
|
||||||
ref={cardRef}
|
ref={cardRef}
|
||||||
layoutId={layoutId}
|
layoutId={layoutId}
|
||||||
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
className="w-full h-full overflow-hidden rounded-xl shadow
|
||||||
'transform-gpu will-change-transform',
|
transform-gpu will-change-transform"
|
||||||
(post.childPosts ?? []).length > 0 && 'outline-4 outline-green-500',
|
|
||||||
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
|
|
||||||
whileHover={{ scale: 1.02 }}
|
whileHover={{ scale: 1.02 }}
|
||||||
onLayoutAnimationStart={() => {
|
onLayoutAnimationStart={() => {
|
||||||
if (!(cardRef.current))
|
if (!(cardRef.current))
|
||||||
|
|||||||
@@ -45,9 +45,9 @@ export default (({ tag,
|
|||||||
<>
|
<>
|
||||||
{(linkFlg && withWiki) && (
|
{(linkFlg && withWiki) && (
|
||||||
<span className="mr-1">
|
<span className="mr-1">
|
||||||
{(tag.materialId != null || tag.hasWiki || tag.hasDeerjikists)
|
{(tag.materialId != null || tag.hasWiki)
|
||||||
? (
|
? (
|
||||||
tag.materialId == null && !(tag.hasDeerjikists)
|
tag.materialId == null
|
||||||
? (
|
? (
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
||||||
@@ -55,19 +55,11 @@ export default (({ tag,
|
|||||||
?
|
?
|
||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
: (
|
: (
|
||||||
tag.materialId != null
|
|
||||||
? (
|
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/materials/${ tag.materialId }`}
|
to={`/materials/${ tag.materialId }`}
|
||||||
className={linkClass}>
|
className={linkClass}>
|
||||||
?
|
?
|
||||||
</PrefetchLink>)
|
</PrefetchLink>))
|
||||||
: (
|
|
||||||
<PrefetchLink
|
|
||||||
to={`/tags/${ tag.id }/deerjikists`}
|
|
||||||
className={linkClass}>
|
|
||||||
?
|
|
||||||
</PrefetchLink>)))
|
|
||||||
: (
|
: (
|
||||||
['character', 'material'].includes (tag.category)
|
['character', 'material'].includes (tag.category)
|
||||||
? (
|
? (
|
||||||
@@ -78,16 +70,6 @@ export default (({ tag,
|
|||||||
title={`${ tag.name } 素材情報が存在しません.`}>
|
title={`${ tag.name } 素材情報が存在しません.`}>
|
||||||
!
|
!
|
||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
: (
|
|
||||||
tag.category === 'deerjikist'
|
|
||||||
? (
|
|
||||||
<PrefetchLink
|
|
||||||
to={`/tags/${ tag.id }/deerjikists`}
|
|
||||||
className="animate-[wiki-blink_.25s_steps(2,end)_infinite]
|
|
||||||
dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
|
|
||||||
title={`${ tag.name } に関する情報が存在しません.`}>
|
|
||||||
!
|
|
||||||
</PrefetchLink>)
|
|
||||||
: (
|
: (
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
||||||
@@ -95,7 +77,7 @@ export default (({ tag,
|
|||||||
dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
|
dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
|
||||||
title={`${ tag.name } Wiki が存在しません.`}>
|
title={`${ tag.name } Wiki が存在しません.`}>
|
||||||
!
|
!
|
||||||
</PrefetchLink>)))}
|
</PrefetchLink>))}
|
||||||
</span>)}
|
</span>)}
|
||||||
{nestLevel > 0 && (
|
{nestLevel > 0 && (
|
||||||
<span
|
<span
|
||||||
|
|||||||
@@ -1,9 +1,42 @@
|
|||||||
import WikiMarkdown from '@/components/WikiMarkdown'
|
import { useQuery } from '@tanstack/react-query'
|
||||||
|
import { useMemo } from 'react'
|
||||||
|
import ReactMarkdown from 'react-markdown'
|
||||||
|
import remarkGFM from 'remark-gfm'
|
||||||
|
|
||||||
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
|
import { wikiKeys } from '@/lib/queryKeys'
|
||||||
|
import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
|
||||||
|
import { fetchWikiPages } from '@/lib/wiki'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
import type { Components } from 'react-markdown'
|
||||||
|
|
||||||
type Props = { title: string
|
type Props = { title: string
|
||||||
body?: string }
|
body?: string }
|
||||||
|
|
||||||
export default (({ title, body }: Props) =>
|
const mdComponents = { a: (({ href, children }) => (
|
||||||
<WikiMarkdown title={title} body={body ?? ''}/>) satisfies FC<Props>
|
['/', '.'].some (e => href?.startsWith (e))
|
||||||
|
? <PrefetchLink to={href!}>{children}</PrefetchLink>
|
||||||
|
: (
|
||||||
|
<a href={href}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer">
|
||||||
|
{children}
|
||||||
|
</a>))) } as const satisfies Components
|
||||||
|
|
||||||
|
|
||||||
|
export default (({ title, body }: Props) => {
|
||||||
|
const { data } = useQuery ({
|
||||||
|
enabled: Boolean (body),
|
||||||
|
queryKey: wikiKeys.index ({ }),
|
||||||
|
queryFn: () => fetchWikiPages ({ }) })
|
||||||
|
const pageNames = (data ?? []).map (page => page.title).sort ((a, b) => b.length - a.length)
|
||||||
|
|
||||||
|
const remarkPlugins = useMemo (
|
||||||
|
() => [() => remarkWikiAutoLink (pageNames), remarkGFM], [pageNames])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ReactMarkdown components={mdComponents} remarkPlugins={remarkPlugins}>
|
||||||
|
{body || `このページは存在しません。[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`}
|
||||||
|
</ReactMarkdown>)
|
||||||
|
}) satisfies FC<Props>
|
||||||
|
|||||||
@@ -1,76 +0,0 @@
|
|||||||
import { useEffect, useState } from 'react'
|
|
||||||
import MdEditor from 'react-markdown-editor-lite'
|
|
||||||
|
|
||||||
import WikiMarkdown from '@/components/WikiMarkdown'
|
|
||||||
import Label from '@/components/common/Label'
|
|
||||||
import { apiPost } from '@/lib/api'
|
|
||||||
|
|
||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
import type { WikiAsset } from '@/types'
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
title: string
|
|
||||||
body: string
|
|
||||||
onSubmit: (title: string, body: string) => void
|
|
||||||
id?: number | null }
|
|
||||||
|
|
||||||
|
|
||||||
export default (({ title: initTitle, body: initBody, onSubmit, id }: Props) => {
|
|
||||||
const forEdit = id != null
|
|
||||||
|
|
||||||
const [title, setTitle] = useState<string> (initTitle)
|
|
||||||
const [body, setBody] = useState<string> (initBody)
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
setTitle (initTitle)
|
|
||||||
setBody (initBody)
|
|
||||||
}, [initTitle, initBody])
|
|
||||||
|
|
||||||
const handleImageUpload = async (file: File) => {
|
|
||||||
if (!(forEdit))
|
|
||||||
throw new Error ('画像は Wiki 作成前に追加することができません.')
|
|
||||||
|
|
||||||
const formData = new FormData
|
|
||||||
formData.append ('file', file)
|
|
||||||
|
|
||||||
const asset = await apiPost<WikiAsset> (
|
|
||||||
`/wiki/${ id }/assets`,
|
|
||||||
formData,
|
|
||||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
|
||||||
|
|
||||||
return asset.url
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
{/* タイトル */}
|
|
||||||
{/* TODO: タグ補完 */}
|
|
||||||
<div>
|
|
||||||
<Label>タイトル</Label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={title}
|
|
||||||
onChange={e => setTitle (e.target.value)}
|
|
||||||
className="w-full border p-2 rounded"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* 本文 */}
|
|
||||||
<div>
|
|
||||||
<Label>本文</Label>
|
|
||||||
<MdEditor
|
|
||||||
value={body}
|
|
||||||
style={{ height: '500px' }}
|
|
||||||
renderHTML={text => <WikiMarkdown body={text} preview/>}
|
|
||||||
onChange={({ text }) => setBody (text)}
|
|
||||||
onImageUpload={handleImageUpload}/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* 送信 */}
|
|
||||||
<button
|
|
||||||
onClick={() => onSubmit (title, body)}
|
|
||||||
className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
|
|
||||||
{forEdit ? '編輯' : '追加'}
|
|
||||||
</button>
|
|
||||||
</>)
|
|
||||||
}) satisfies FC<Props>
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
import { useQuery } from '@tanstack/react-query'
|
|
||||||
import { useMemo } from 'react'
|
|
||||||
import ReactMarkdown from 'react-markdown'
|
|
||||||
import remarkGFM from 'remark-gfm'
|
|
||||||
|
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
|
||||||
import SectionTitle from '@/components/common/SectionTitle'
|
|
||||||
import SubsectionTitle from '@/components/common/SubsectionTitle'
|
|
||||||
import { wikiKeys } from '@/lib/queryKeys'
|
|
||||||
import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
|
|
||||||
import { fetchWikiPages } from '@/lib/wiki'
|
|
||||||
|
|
||||||
import type { FC } from 'react'
|
|
||||||
import type { Components } from 'react-markdown'
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
title?: string
|
|
||||||
body: string
|
|
||||||
preview?: boolean }
|
|
||||||
|
|
||||||
|
|
||||||
const makeComponents = (preview = false) => (
|
|
||||||
{ h1: ({ children }) => <SectionTitle>{children}</SectionTitle>,
|
|
||||||
h2: ({ children }) => <SubsectionTitle>{children}</SubsectionTitle>,
|
|
||||||
ol: ({ children }) => <ol className="list-decimal pl-6">{children}</ol>,
|
|
||||||
ul: ({ children }) => <ul className="list-disc pl-6">{children}</ul>,
|
|
||||||
a: ({ href, children }) => {
|
|
||||||
if (!(href))
|
|
||||||
return <>{children}</>
|
|
||||||
|
|
||||||
if (!(preview) && ['/', '.'].some (e => href.startsWith (e)))
|
|
||||||
return <PrefetchLink to={href}>{children}</PrefetchLink>
|
|
||||||
|
|
||||||
const ext = /^(?:https?:)?\/\//.test (href)
|
|
||||||
|
|
||||||
return (
|
|
||||||
<a href={href}
|
|
||||||
target={ext ? '_blank' : undefined}
|
|
||||||
rel={ext ? 'noopener noreferrer' : undefined}>
|
|
||||||
{children}
|
|
||||||
</a>)
|
|
||||||
},
|
|
||||||
img: (({ src, alt }) => (
|
|
||||||
<img src={src ?? ''}
|
|
||||||
alt={alt ?? ''}
|
|
||||||
className="max-w-[240px] max-h-[320px]"/>)),
|
|
||||||
} as const satisfies Components)
|
|
||||||
|
|
||||||
|
|
||||||
export default (({ title, body, preview = false }: Props) => {
|
|
||||||
const { data } = useQuery ({
|
|
||||||
queryKey: wikiKeys.index ({ }),
|
|
||||||
queryFn: () => fetchWikiPages ({ }) })
|
|
||||||
|
|
||||||
const pageNames = useMemo (
|
|
||||||
() => (data ?? []).map ((page) => page.title).sort ((a, b) => b.length - a.length),
|
|
||||||
[data])
|
|
||||||
|
|
||||||
const remarkPlugins = useMemo (
|
|
||||||
() => [() => remarkWikiAutoLink (pageNames), remarkGFM],
|
|
||||||
[pageNames])
|
|
||||||
|
|
||||||
const components = useMemo (
|
|
||||||
() => makeComponents (preview),
|
|
||||||
[preview])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ReactMarkdown
|
|
||||||
components={components}
|
|
||||||
remarkPlugins={remarkPlugins}>
|
|
||||||
{body
|
|
||||||
|| (title
|
|
||||||
? ('このページは存在しません。'
|
|
||||||
+`[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`)
|
|
||||||
: '')}
|
|
||||||
</ReactMarkdown>)
|
|
||||||
}) satisfies FC<Props>
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { Category, Platform } from 'types'
|
import type { Category } from 'types'
|
||||||
|
|
||||||
export const LIGHT_COLOUR_SHADE = 800
|
export const LIGHT_COLOUR_SHADE = 800
|
||||||
export const DARK_COLOUR_SHADE = 300
|
export const DARK_COLOUR_SHADE = 300
|
||||||
@@ -31,11 +31,6 @@ export const FETCH_POSTS_ORDER_FIELDS = [
|
|||||||
'updated_at',
|
'updated_at',
|
||||||
] as const
|
] as const
|
||||||
|
|
||||||
export const PLATFORMS = ['nico', 'youtube'] as const
|
|
||||||
|
|
||||||
export const PLATFORM_NAMES: Record<Platform, string> =
|
|
||||||
{ nico: 'ニコニコ', youtube: 'YouTube' } as const
|
|
||||||
|
|
||||||
export const TAG_COLOUR = {
|
export const TAG_COLOUR = {
|
||||||
deerjikist: 'rose',
|
deerjikist: 'rose',
|
||||||
meme: 'purple',
|
meme: 'purple',
|
||||||
|
|||||||
@@ -13,8 +13,7 @@ export const tagsKeys = {
|
|||||||
index: (p: FetchTagsParams) => ['tags', 'index', p] as const,
|
index: (p: FetchTagsParams) => ['tags', 'index', p] as const,
|
||||||
show: (name: string) => ['tags', name] as const,
|
show: (name: string) => ['tags', name] as const,
|
||||||
changes: (p: { id?: string; page: number; limit: number }) =>
|
changes: (p: { id?: string; page: number; limit: number }) =>
|
||||||
['tags', 'changes', p] as const,
|
['tags', 'changes', p] as const }
|
||||||
deerjikists: (id: string) => ['tags', 'deerjikists', id] as const }
|
|
||||||
|
|
||||||
export const wikiKeys = {
|
export const wikiKeys = {
|
||||||
root: ['wiki'] as const,
|
root: ['wiki'] as const,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { apiGet } from '@/lib/api'
|
import { apiGet } from '@/lib/api'
|
||||||
|
|
||||||
import type { Deerjikist, FetchTagsParams, Tag, TagVersion } from '@/types'
|
import type { FetchTagsParams, Tag, TagVersion } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
export const fetchTags = async (
|
export const fetchTags = async (
|
||||||
@@ -56,9 +56,3 @@ export const fetchTagChanges = async (
|
|||||||
versions: TagVersion[]
|
versions: TagVersion[]
|
||||||
count: number }> =>
|
count: number }> =>
|
||||||
await apiGet ('/tags/versions', { params: { ...(id && { id }), page, limit } })
|
await apiGet ('/tags/versions', { params: { ...(id && { id }), page, limit } })
|
||||||
|
|
||||||
|
|
||||||
export const fetchDeerjikistsByTag = async (
|
|
||||||
id: string,
|
|
||||||
): Promise<{ tag: Tag; deerjikists: Deerjikist[]}> =>
|
|
||||||
await apiGet (`/tags/${ id }/deerjikists`)
|
|
||||||
|
|||||||
@@ -1,155 +0,0 @@
|
|||||||
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 { PLATFORM_NAMES, PLATFORMS } from '@/consts'
|
|
||||||
import { apiPut } from '@/lib/api'
|
|
||||||
import { tagsKeys } from '@/lib/queryKeys'
|
|
||||||
import { fetchDeerjikistsByTag } from '@/lib/tags'
|
|
||||||
import { cn } from '@/lib/utils'
|
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
|
||||||
|
|
||||||
import type { Deerjikist, Platform } from '@/types'
|
|
||||||
|
|
||||||
|
|
||||||
export default (() => {
|
|
||||||
const { id } = useParams ()
|
|
||||||
const tagId = String (id ?? '')
|
|
||||||
const tagKey = tagsKeys.deerjikists (tagId)
|
|
||||||
|
|
||||||
const { data: qData, isLoading: loading } =
|
|
||||||
useQuery ({ queryKey: tagKey, queryFn: () => fetchDeerjikistsByTag (tagId) })
|
|
||||||
const tag = qData?.tag
|
|
||||||
const deerjikists = qData?.deerjikists ?? []
|
|
||||||
|
|
||||||
const [data, setData] =
|
|
||||||
useState<(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> ([])
|
|
||||||
const [disabled, setDisabled] = useState (true)
|
|
||||||
|
|
||||||
const qc = useQueryClient ()
|
|
||||||
|
|
||||||
const handleSubmit = async (e: FormEvent) => {
|
|
||||||
e.preventDefault ()
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
setDisabled (true)
|
|
||||||
|
|
||||||
setData (await apiPut<Deerjikist[]> (`/tags/${ id }/deerjikists`, data))
|
|
||||||
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
|
||||||
|
|
||||||
toast ({ description: '更新しました.' })
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
toast ({ title: '更新失敗', description: '入力内容を確認してください.' })
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
setDisabled (false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
if (!(tag))
|
|
||||||
{
|
|
||||||
setDisabled (true)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
setData (deerjikists)
|
|
||||||
setDisabled (false)
|
|
||||||
}, [tag, deerjikists])
|
|
||||||
|
|
||||||
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">
|
|
||||||
{data.map ((datum, i) => (
|
|
||||||
<fieldset key={i} className="min-w-0 rounded-lg border border-gray-300
|
|
||||||
dark:border-gray-700 p-4">
|
|
||||||
<legend className="px-2 text-sm font-semibold text-gray-700
|
|
||||||
dark:text-gray-300">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
disabled={disabled}
|
|
||||||
onClick={() => setData (prev => [...prev.slice (0, i),
|
|
||||||
...prev.slice (i + 1)])}>
|
|
||||||
#{i + 1}
|
|
||||||
</button>
|
|
||||||
</legend>
|
|
||||||
|
|
||||||
{/* プラットフォーム */}
|
|
||||||
<div>
|
|
||||||
<Label>プラットフォーム</Label>
|
|
||||||
<select
|
|
||||||
className="w-full border p-2 rounded"
|
|
||||||
disabled={disabled}
|
|
||||||
value={datum.platform ?? ''}
|
|
||||||
onChange={e => setData (prev => {
|
|
||||||
const rtn = [...prev]
|
|
||||||
rtn[i] = { ...rtn[i],
|
|
||||||
platform: (e.target.value || null) as Platform | null }
|
|
||||||
return rtn
|
|
||||||
})}>
|
|
||||||
<option value=""> </option>
|
|
||||||
{PLATFORMS.map (p => (
|
|
||||||
<option key={p} value={p}>
|
|
||||||
{PLATFORM_NAMES[p]}
|
|
||||||
</option>))}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* コード */}
|
|
||||||
<div>
|
|
||||||
<Label>コード</Label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
disabled={disabled}
|
|
||||||
className="w-full border p-2 rounded"
|
|
||||||
value={datum.code}
|
|
||||||
onChange={e => setData (prev => {
|
|
||||||
const rtn = [...prev]
|
|
||||||
rtn[i] = { ...rtn[i], code: e.target.value }
|
|
||||||
return rtn
|
|
||||||
})}/>
|
|
||||||
</div>
|
|
||||||
</fieldset>
|
|
||||||
))}
|
|
||||||
|
|
||||||
<div className="py-3">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
disabled={disabled}
|
|
||||||
onClick={() => setData (prev => [...prev, { platform: null, code: '' }])}>
|
|
||||||
+
|
|
||||||
</button>
|
|
||||||
</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
|
|
||||||
@@ -21,7 +21,7 @@ import ServiceUnavailable from '@/pages/ServiceUnavailable'
|
|||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
import type { NiconicoViewerHandle, Post, User } from '@/types'
|
import type { NiconicoViewerHandle, User } from '@/types'
|
||||||
|
|
||||||
type Props = { user: User | null }
|
type Props = { user: User | null }
|
||||||
|
|
||||||
@@ -108,34 +108,6 @@ export default (({ user }: Props) => {
|
|||||||
{post
|
{post
|
||||||
? (
|
? (
|
||||||
<>
|
<>
|
||||||
{(post.childPosts ?? []).length > 0 && (
|
|
||||||
<div className="mb-4 bg-green-200 dark:bg-green-800 text-sm p-2 rounded-md">
|
|
||||||
<p>この投稿には {post.childPosts!.length} 件の子投稿があります.</p>
|
|
||||||
<PostList posts={[{ ...post, childPosts: [{ } as Post] },
|
|
||||||
...post.childPosts!.map (p => ({
|
|
||||||
...p, parentPosts: [{ } as Post] }))]}/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{(post.parentPosts ?? []).map (pp => {
|
|
||||||
const siblings = post.siblingPosts?.[String (pp.id) as `${ number }`]
|
|
||||||
if (!(siblings))
|
|
||||||
return
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
key={pp.id}
|
|
||||||
className="mb-4 bg-yellow-200 dark:bg-yellow-800 text-sm p-2 rounded-md">
|
|
||||||
<p>
|
|
||||||
この投稿には 1 件の親投稿{
|
|
||||||
siblings.length > 1
|
|
||||||
&& `と ${ siblings.length - 1 } 件の姉妹投稿`}があります.
|
|
||||||
</p>
|
|
||||||
<PostList posts={[{ ...pp, childPosts: [{ } as Post] },
|
|
||||||
...siblings.map (p => ({
|
|
||||||
...p, parentPosts: [{ } as Post] }))]}/>
|
|
||||||
</div>)
|
|
||||||
})}
|
|
||||||
|
|
||||||
{(post.thumbnail || post.thumbnailBase) && (
|
{(post.thumbnail || post.thumbnailBase) && (
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={`page-${ id }`}
|
layoutId={`page-${ id }`}
|
||||||
@@ -174,6 +146,7 @@ export default (({ user }: Props) => {
|
|||||||
(prev: any) => newPost ?? prev)
|
(prev: any) => newPost ?? prev)
|
||||||
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
||||||
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
||||||
|
toast ({ description: '更新しました.' })
|
||||||
}}/>
|
}}/>
|
||||||
</Tab>)}
|
</Tab>)}
|
||||||
</TabGroup>
|
</TabGroup>
|
||||||
|
|||||||
@@ -95,8 +95,6 @@ export default (() => {
|
|||||||
<col className="w-96"/>
|
<col className="w-96"/>
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<col className="w-[48rem]"/>
|
<col className="w-[48rem]"/>
|
||||||
{/* TODO: 親投稿 */}
|
|
||||||
{/* <col className="w-[48rem]"/> */}
|
|
||||||
{/* オリジナルの投稿日時 */}
|
{/* オリジナルの投稿日時 */}
|
||||||
<col className="w-96"/>
|
<col className="w-96"/>
|
||||||
{/* 更新日時 */}
|
{/* 更新日時 */}
|
||||||
@@ -112,8 +110,6 @@ export default (() => {
|
|||||||
<th className="p-2 text-left">タイトル</th>
|
<th className="p-2 text-left">タイトル</th>
|
||||||
<th className="p-2 text-left">URL</th>
|
<th className="p-2 text-left">URL</th>
|
||||||
<th className="p-2 text-left">タグ</th>
|
<th className="p-2 text-left">タグ</th>
|
||||||
{/* TODO: 親投稿の履歴 */}
|
|
||||||
{/* <th className="p-2 text-left">親投稿</th> */}
|
|
||||||
<th className="p-2 text-left">オリジナルの投稿日時</th>
|
<th className="p-2 text-left">オリジナルの投稿日時</th>
|
||||||
<th className="p-2 text-left">更新日時</th>
|
<th className="p-2 text-left">更新日時</th>
|
||||||
<th className="p-2"/>
|
<th className="p-2"/>
|
||||||
@@ -184,29 +180,6 @@ export default (() => {
|
|||||||
{tag.name}
|
{tag.name}
|
||||||
</span>))))}
|
</span>))))}
|
||||||
</td>
|
</td>
|
||||||
{/* TODO: 親投稿の履歴 */}
|
|
||||||
{/* <td className="p-2">
|
|
||||||
{change.parentPosts.map ((pp, i) => (
|
|
||||||
pp.type === 'added'
|
|
||||||
? (
|
|
||||||
<ins
|
|
||||||
key={i}
|
|
||||||
className="mr-2 text-green-600 dark:text-green-400">
|
|
||||||
{pp.title}
|
|
||||||
</ins>)
|
|
||||||
: (
|
|
||||||
pp.type === 'removed'
|
|
||||||
? (
|
|
||||||
<del
|
|
||||||
key={i}
|
|
||||||
className="mr-2 text-red-600 dark:text-red-400">
|
|
||||||
{pp.title}
|
|
||||||
</del>)
|
|
||||||
: (
|
|
||||||
<span key={i} className="mr-2">
|
|
||||||
{pp.title}
|
|
||||||
</span>))))}
|
|
||||||
</td> */}
|
|
||||||
<td className="p-2">
|
<td className="p-2">
|
||||||
{change.versionNo === 1
|
{change.versionNo === 1
|
||||||
? originalCreatedAtString (change.originalCreatedFrom.current,
|
? originalCreatedAtString (change.originalCreatedFrom.current,
|
||||||
@@ -252,11 +225,6 @@ export default (() => {
|
|||||||
.map (t => t.name)
|
.map (t => t.name)
|
||||||
.filter (t => t.slice (0, 5) !== 'nico:')
|
.filter (t => t.slice (0, 5) !== 'nico:')
|
||||||
.join (' '),
|
.join (' '),
|
||||||
parent_post_ids:
|
|
||||||
(change.parentPosts ?? [])
|
|
||||||
.filter (p => p.type !== 'removed')
|
|
||||||
.map (p => p.id)
|
|
||||||
.join (' '),
|
|
||||||
original_created_from:
|
original_created_from:
|
||||||
change.originalCreatedFrom.current,
|
change.originalCreatedFrom.current,
|
||||||
original_created_before:
|
original_created_before:
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ export default (({ user }: Props) => {
|
|||||||
|
|
||||||
const [originalCreatedBefore, setOriginalCreatedBefore] = useState<string | null> (null)
|
const [originalCreatedBefore, setOriginalCreatedBefore] = useState<string | null> (null)
|
||||||
const [originalCreatedFrom, setOriginalCreatedFrom] = useState<string | null> (null)
|
const [originalCreatedFrom, setOriginalCreatedFrom] = useState<string | null> (null)
|
||||||
const [parentPostIds, setParentPostIds] = useState ('')
|
|
||||||
const [tags, setTags] = useState ('')
|
const [tags, setTags] = useState ('')
|
||||||
const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
|
const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
|
||||||
const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
|
const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
|
||||||
@@ -47,7 +46,6 @@ export default (({ user }: Props) => {
|
|||||||
formData.append ('title', title)
|
formData.append ('title', title)
|
||||||
formData.append ('url', url)
|
formData.append ('url', url)
|
||||||
formData.append ('tags', tags)
|
formData.append ('tags', tags)
|
||||||
formData.append ('parent_post_ids', parentPostIds)
|
|
||||||
if (thumbnailFile)
|
if (thumbnailFile)
|
||||||
formData.append ('thumbnail', thumbnailFile)
|
formData.append ('thumbnail', thumbnailFile)
|
||||||
if (originalCreatedFrom)
|
if (originalCreatedFrom)
|
||||||
@@ -179,16 +177,6 @@ export default (({ user }: Props) => {
|
|||||||
className="mt-2 max-h-48 rounded border"/>)}
|
className="mt-2 max-h-48 rounded border"/>)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* 親投稿 */}
|
|
||||||
<div>
|
|
||||||
<Label>親投稿</Label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={parentPostIds}
|
|
||||||
onChange={e => setParentPostIds (e.target.value)}
|
|
||||||
className="w-full border p-2 rounded"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import { useQueryClient } from '@tanstack/react-query'
|
import { useQueryClient } from '@tanstack/react-query'
|
||||||
|
import MarkdownIt from 'markdown-it'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { Helmet } from 'react-helmet-async'
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
import MdEditor from 'react-markdown-editor-lite'
|
||||||
import { useParams, useNavigate } from 'react-router-dom'
|
import { useParams, useNavigate } from 'react-router-dom'
|
||||||
|
|
||||||
import WikiEditForm from '@/components/WikiEditForm'
|
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
@@ -17,6 +18,8 @@ import type { FC } from 'react'
|
|||||||
|
|
||||||
import type { User, WikiPage } from '@/types'
|
import type { User, WikiPage } from '@/types'
|
||||||
|
|
||||||
|
const mdParser = new MarkdownIt
|
||||||
|
|
||||||
type Props = { user: User | null }
|
type Props = { user: User | null }
|
||||||
|
|
||||||
|
|
||||||
@@ -34,7 +37,7 @@ export default (({ user }: Props) => {
|
|||||||
const [loading, setLoading] = useState (true)
|
const [loading, setLoading] = useState (true)
|
||||||
const [title, setTitle] = useState ('')
|
const [title, setTitle] = useState ('')
|
||||||
|
|
||||||
const handleSubmit = async (title: string, body: string) => {
|
const handleSubmit = async () => {
|
||||||
const formData = new FormData ()
|
const formData = new FormData ()
|
||||||
formData.append ('title', title)
|
formData.append ('title', title)
|
||||||
formData.append ('body', body)
|
formData.append ('body', body)
|
||||||
@@ -43,6 +46,8 @@ export default (({ user }: Props) => {
|
|||||||
{
|
{
|
||||||
await apiPut (`/wiki/${ id }`, formData,
|
await apiPut (`/wiki/${ id }`, formData,
|
||||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||||
|
qc.setQueryData (wikiKeys.show (title, { }),
|
||||||
|
(prev: WikiPage) => ({ ...prev, title, body }))
|
||||||
qc.invalidateQueries ({ queryKey: wikiKeys.root })
|
qc.invalidateQueries ({ queryKey: wikiKeys.root })
|
||||||
toast ({ title: '投稿成功!' })
|
toast ({ title: '投稿成功!' })
|
||||||
navigate (`/wiki/${ title }`)
|
navigate (`/wiki/${ title }`)
|
||||||
@@ -72,11 +77,32 @@ export default (({ user }: Props) => {
|
|||||||
<h1 className="text-2xl font-bold mb-2">Wiki ページを編輯</h1>
|
<h1 className="text-2xl font-bold mb-2">Wiki ページを編輯</h1>
|
||||||
|
|
||||||
{loading ? 'Loading...' : (
|
{loading ? 'Loading...' : (
|
||||||
<WikiEditForm
|
<>
|
||||||
title={title}
|
{/* タイトル */}
|
||||||
body={body}
|
{/* TODO: タグ補完 */}
|
||||||
onSubmit={handleSubmit}
|
<div>
|
||||||
id={Number (id)}/>)}
|
<label className="block font-semibold mb-1">タイトル</label>
|
||||||
|
<input type="text"
|
||||||
|
value={title}
|
||||||
|
onChange={e => setTitle (e.target.value)}
|
||||||
|
className="w-full border p-2 rounded"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 本文 */}
|
||||||
|
<div>
|
||||||
|
<label className="block font-semibold mb-1">本文</label>
|
||||||
|
<MdEditor value={body}
|
||||||
|
style={{ height: '500px' }}
|
||||||
|
renderHTML={text => mdParser.render (text)}
|
||||||
|
onChange={({ text }) => setBody (text)}/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 送信 */}
|
||||||
|
<button onClick={handleSubmit}
|
||||||
|
className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
|
||||||
|
編輯
|
||||||
|
</button>
|
||||||
|
</>)}
|
||||||
</div>
|
</div>
|
||||||
</MainArea>)
|
</MainArea>)
|
||||||
}) satisfies FC<Props>
|
}) satisfies FC<Props>
|
||||||
|
|||||||
@@ -1,19 +1,21 @@
|
|||||||
import { useQueryClient } from '@tanstack/react-query'
|
import MarkdownIt from 'markdown-it'
|
||||||
|
import { useState } from 'react'
|
||||||
import { Helmet } from 'react-helmet-async'
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
import MdEditor from 'react-markdown-editor-lite'
|
||||||
import { useLocation, useNavigate } from 'react-router-dom'
|
import { useLocation, useNavigate } from 'react-router-dom'
|
||||||
|
|
||||||
import WikiEditForm from '@/components/WikiEditForm'
|
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { apiPost } from '@/lib/api'
|
import { apiPost } from '@/lib/api'
|
||||||
import { wikiKeys } from '@/lib/queryKeys'
|
|
||||||
import Forbidden from '@/pages/Forbidden'
|
import Forbidden from '@/pages/Forbidden'
|
||||||
|
|
||||||
import 'react-markdown-editor-lite/lib/index.css'
|
import 'react-markdown-editor-lite/lib/index.css'
|
||||||
|
|
||||||
import type { User, WikiPage } from '@/types'
|
import type { User, WikiPage } from '@/types'
|
||||||
|
|
||||||
|
const mdParser = new MarkdownIt
|
||||||
|
|
||||||
type Props = { user: User | null }
|
type Props = { user: User | null }
|
||||||
|
|
||||||
|
|
||||||
@@ -24,12 +26,13 @@ export default ({ user }: Props) => {
|
|||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
|
|
||||||
const qc = useQueryClient ()
|
|
||||||
|
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
const titleQuery = query.get ('title') ?? ''
|
const titleQuery = query.get ('title') ?? ''
|
||||||
|
|
||||||
const handleSubmit = async (title: string, body: string) => {
|
const [title, setTitle] = useState (titleQuery)
|
||||||
|
const [body, setBody] = useState ('')
|
||||||
|
|
||||||
|
const handleSubmit = async () => {
|
||||||
const formData = new FormData
|
const formData = new FormData
|
||||||
formData.append ('title', title)
|
formData.append ('title', title)
|
||||||
formData.append ('body', body)
|
formData.append ('body', body)
|
||||||
@@ -38,7 +41,6 @@ export default ({ user }: Props) => {
|
|||||||
{
|
{
|
||||||
const data = await apiPost<WikiPage> ('/wiki', formData,
|
const data = await apiPost<WikiPage> ('/wiki', formData,
|
||||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||||
qc.invalidateQueries ({ queryKey: wikiKeys.root })
|
|
||||||
toast ({ title: '投稿成功!' })
|
toast ({ title: '投稿成功!' })
|
||||||
navigate (`/wiki/${ data.title }`)
|
navigate (`/wiki/${ data.title }`)
|
||||||
}
|
}
|
||||||
@@ -56,10 +58,30 @@ export default ({ user }: Props) => {
|
|||||||
<div className="max-w-xl mx-auto p-4 space-y-4">
|
<div className="max-w-xl mx-auto p-4 space-y-4">
|
||||||
<h1 className="text-2xl font-bold mb-2">新規 Wiki ページ</h1>
|
<h1 className="text-2xl font-bold mb-2">新規 Wiki ページ</h1>
|
||||||
|
|
||||||
<WikiEditForm
|
{/* タイトル */}
|
||||||
title={titleQuery}
|
{/* TODO: タグ補完 */}
|
||||||
body=""
|
<div>
|
||||||
onSubmit={handleSubmit}/>
|
<label className="block font-semibold mb-1">タイトル</label>
|
||||||
|
<input type="text"
|
||||||
|
value={title}
|
||||||
|
onChange={e => setTitle (e.target.value)}
|
||||||
|
className="w-full border p-2 rounded"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 本文 */}
|
||||||
|
<div>
|
||||||
|
<label className="block font-semibold mb-1">本文</label>
|
||||||
|
<MdEditor value={body}
|
||||||
|
style={{ height: '500px' }}
|
||||||
|
renderHTML={text => mdParser.render (text)}
|
||||||
|
onChange={({ text }) => setBody (text)}/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 送信 */}
|
||||||
|
<button onClick={handleSubmit}
|
||||||
|
className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
|
||||||
|
追加
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</MainArea>)
|
</MainArea>)
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-20
@@ -1,6 +1,5 @@
|
|||||||
import { CATEGORIES,
|
import { CATEGORIES,
|
||||||
FETCH_POSTS_ORDER_FIELDS,
|
FETCH_POSTS_ORDER_FIELDS,
|
||||||
PLATFORMS,
|
|
||||||
USER_ROLES,
|
USER_ROLES,
|
||||||
ViewFlagBehavior } from '@/consts'
|
ViewFlagBehavior } from '@/consts'
|
||||||
|
|
||||||
@@ -8,8 +7,6 @@ import type { ReactNode } from 'react'
|
|||||||
|
|
||||||
export type Category = typeof CATEGORIES[number]
|
export type Category = typeof CATEGORIES[number]
|
||||||
|
|
||||||
export type Deerjikist = { platform: Platform; code: string }
|
|
||||||
|
|
||||||
export type FetchPostsOrder = `${ FetchPostsOrderField }:${ 'asc' | 'desc' }`
|
export type FetchPostsOrder = `${ FetchPostsOrderField }:${ 'asc' | 'desc' }`
|
||||||
|
|
||||||
export type FetchPostsOrderField = typeof FETCH_POSTS_ORDER_FIELDS[number]
|
export type FetchPostsOrderField = typeof FETCH_POSTS_ORDER_FIELDS[number]
|
||||||
@@ -117,8 +114,6 @@ export type NiconicoViewerHandle = {
|
|||||||
showComments: () => void
|
showComments: () => void
|
||||||
hideComments: () => void }
|
hideComments: () => void }
|
||||||
|
|
||||||
export type Platform = typeof PLATFORMS[number]
|
|
||||||
|
|
||||||
export type Post = {
|
export type Post = {
|
||||||
id: number
|
id: number
|
||||||
url: string
|
url: string
|
||||||
@@ -126,9 +121,6 @@ export type Post = {
|
|||||||
thumbnail: string | null
|
thumbnail: string | null
|
||||||
thumbnailBase: string | null
|
thumbnailBase: string | null
|
||||||
tags: Tag[]
|
tags: Tag[]
|
||||||
parentPosts?: Post[]
|
|
||||||
childPosts?: Post[]
|
|
||||||
siblingPosts?: Record<`${ number }`, Post[]>
|
|
||||||
viewed: boolean
|
viewed: boolean
|
||||||
related: Post[]
|
related: Post[]
|
||||||
originalCreatedFrom: string | null
|
originalCreatedFrom: string | null
|
||||||
@@ -152,11 +144,7 @@ export type PostVersion = {
|
|||||||
url: { current: string; prev: string | null }
|
url: { current: string; prev: string | null }
|
||||||
thumbnail: { current: string | null; prev: string | null }
|
thumbnail: { current: string | null; prev: string | null }
|
||||||
thumbnailBase: { current: string | null; prev: string | null }
|
thumbnailBase: { current: string | null; prev: string | null }
|
||||||
tags: { name: string
|
tags: { name: string; type: 'context' | 'added' | 'removed' }[]
|
||||||
type: 'context' | 'added' | 'removed' }[]
|
|
||||||
parentPosts: { id: number
|
|
||||||
title: string
|
|
||||||
type: 'context' | 'added' | 'removed' }[]
|
|
||||||
originalCreatedFrom: { current: string | null; prev: string | null }
|
originalCreatedFrom: { current: string | null; prev: string | null }
|
||||||
originalCreatedBefore: { current: string | null; prev: string | null }
|
originalCreatedBefore: { current: string | null; prev: string | null }
|
||||||
createdAt: string
|
createdAt: string
|
||||||
@@ -183,8 +171,7 @@ export type Tag = {
|
|||||||
createdAt: string
|
createdAt: string
|
||||||
updatedAt: string
|
updatedAt: string
|
||||||
hasWiki: boolean
|
hasWiki: boolean
|
||||||
materialId: number | null
|
materialId: number
|
||||||
hasDeerjikists: boolean
|
|
||||||
children?: Tag[]
|
children?: Tag[]
|
||||||
matchedAlias?: string | null }
|
matchedAlias?: string | null }
|
||||||
|
|
||||||
@@ -223,11 +210,6 @@ export type User = {
|
|||||||
|
|
||||||
export type ViewFlagBehavior = typeof ViewFlagBehavior[keyof typeof ViewFlagBehavior]
|
export type ViewFlagBehavior = typeof ViewFlagBehavior[keyof typeof ViewFlagBehavior]
|
||||||
|
|
||||||
export type WikiAsset = {
|
|
||||||
wikiPageId: number
|
|
||||||
no: number
|
|
||||||
url: string }
|
|
||||||
|
|
||||||
export type WikiPage = {
|
export type WikiPage = {
|
||||||
id: number
|
id: number
|
||||||
title: string
|
title: string
|
||||||
|
|||||||
Reference in New Issue
Block a user