Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bebfe02348 | |||
| 674ac32817 | |||
| 9b1df20ab5 | |||
| fa8eb66535 | |||
| a7020fb129 | |||
| 1d1787312f |
@@ -1,7 +1,3 @@
|
||||
require 'net/http'
|
||||
require 'uri'
|
||||
|
||||
|
||||
class TagsController < ApplicationController
|
||||
def index
|
||||
post_id = params[:post]
|
||||
@@ -186,8 +182,7 @@ class TagsController < ApplicationController
|
||||
.find_by(id: params[:id])
|
||||
return head :not_found unless tag
|
||||
|
||||
render json: { tag: TagRepr.base(tag),
|
||||
deerjikists: DeerjikistRepr.many(tag.deerjikists) }
|
||||
render json: DeerjikistRepr.many(tag.deerjikists)
|
||||
end
|
||||
|
||||
def deerjikists_by_name
|
||||
@@ -199,31 +194,7 @@ class TagsController < ApplicationController
|
||||
.find_by(tag_names: { name: })
|
||||
return head :not_found unless tag
|
||||
|
||||
render json: { tag: TagRepr.base(tag),
|
||||
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)
|
||||
render json: DeerjikistRepr.many(tag.deerjikists)
|
||||
end
|
||||
|
||||
def materials_by_name
|
||||
@@ -420,21 +391,4 @@ class TagsController < ApplicationController
|
||||
TagImplication.create!(tag:, parent_tag:)
|
||||
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
|
||||
|
||||
@@ -79,14 +79,11 @@ class Tag < ApplicationRecord
|
||||
|
||||
def material_id = materials.first&.id
|
||||
|
||||
def has_deerjikists = deerjikists.present?
|
||||
|
||||
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.no_deerjikist = find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
||||
def self.video = find_or_create_by_tag_name!('動画', category: :meta)
|
||||
def self.niconico = find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
||||
def self.youtube = find_or_create_by_tag_name!('YouTube', category: :meta)
|
||||
|
||||
def self.normalise_tags! tag_names, with_tagme: true,
|
||||
with_no_deerjikist: true,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
module TagRepr
|
||||
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
|
||||
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
require 'json'
|
||||
require 'net/http'
|
||||
require 'uri'
|
||||
|
||||
|
||||
module Youtube
|
||||
class ApiClient
|
||||
ENDPOINT = 'https://www.googleapis.com/youtube/v3'
|
||||
|
||||
def initialize api_key: ENV.fetch('YOUTUBE_API_KEY')
|
||||
@api_key = api_key
|
||||
end
|
||||
|
||||
def search_videos q:, published_after: nil, published_before: nil, page_token: nil
|
||||
get_json('/search', {
|
||||
part: 'snippet',
|
||||
type: 'video',
|
||||
q:,
|
||||
order: 'date',
|
||||
maxResults: 50,
|
||||
regionCode: 'JP',
|
||||
relevanceLanguage: 'ja',
|
||||
publishedAfter: published_after&.iso8601,
|
||||
publishedBefore: published_before&.iso8601,
|
||||
pageToken: page_token }.compact)
|
||||
end
|
||||
|
||||
def videos ids
|
||||
return { 'items' => [] } if ids.empty?
|
||||
|
||||
get_json('/videos', part: 'snippet,status,contentDetails', id: ids.join(','))
|
||||
end
|
||||
|
||||
def playlist_items playlist_id:, page_token: nil
|
||||
get_json('/playlistItems', {
|
||||
part: 'snippet,contentDetails,status',
|
||||
playlistId: playlist_id,
|
||||
maxResults: 50,
|
||||
pageToken: page_token }.compact)
|
||||
end
|
||||
|
||||
def channel id: nil, handle: nil
|
||||
raise ArgumentError, 'id or handle is required' if id.present? == handle.present?
|
||||
|
||||
params = { part: 'snippet,contentDetails' }
|
||||
params[:id] = id if id.present?
|
||||
params[:forHandle] = handle if handle.present?
|
||||
|
||||
get_json('/channels', params)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def get_json path, params
|
||||
uri = URI(ENDPOINT + path)
|
||||
uri.query = URI.encode_www_form(params.merge(key: @api_key))
|
||||
|
||||
response = Net::HTTP.start(uri.host,
|
||||
uri.port,
|
||||
use_ssl: true,
|
||||
open_timeout: 10,
|
||||
read_timeout: 30) do |http|
|
||||
http.get(uri)
|
||||
end
|
||||
|
||||
unless response.is_a?(Net::HTTPSuccess)
|
||||
raise "YouTube API error: #{ response.code } #{ response.body }"
|
||||
end
|
||||
|
||||
JSON.parse(response.body)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,168 +0,0 @@
|
||||
require 'open-uri'
|
||||
require 'set'
|
||||
require 'time'
|
||||
|
||||
|
||||
module Youtube
|
||||
class Sync
|
||||
def initialize client: ApiClient.new
|
||||
@client = client
|
||||
end
|
||||
|
||||
def sync!
|
||||
video_ids = discover_video_ids
|
||||
return if video_ids.empty?
|
||||
|
||||
video_ids.each_slice(50) do |ids|
|
||||
@client.videos(ids).fetch('items', []).each do |item|
|
||||
sync_video!(VideoItem.new(item))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def discover_video_ids
|
||||
ids = Set.new
|
||||
|
||||
query_terms.each do |q|
|
||||
response = @client.search_videos(q:, published_after: sync_since)
|
||||
|
||||
response.fetch('items', []).each do |item|
|
||||
video_id = item.dig('id', 'videoId')
|
||||
ids << video_id if video_id.present?
|
||||
end
|
||||
end
|
||||
|
||||
playlist_ids.each do |playlist_id|
|
||||
each_playlist_item(playlist_id) do |item|
|
||||
video_id = item.dig('contentDetails', 'videoId')
|
||||
video_id ||= item.dig('snippet', 'resourceId', 'videoId')
|
||||
|
||||
ids << video_id if video_id.present?
|
||||
end
|
||||
end
|
||||
|
||||
ids.to_a
|
||||
end
|
||||
|
||||
def sync_video! video
|
||||
post = Post.where('url REGEXP ?', youtube_url_regexp(video.id)).first
|
||||
|
||||
original_created_from = video.published_at.change(sec: 0)
|
||||
original_created_before = original_created_from + 1.minute
|
||||
|
||||
post_created = false
|
||||
post_changed = false
|
||||
|
||||
if post
|
||||
post.assign_attributes(title: video.title,
|
||||
original_created_from:,
|
||||
original_created_before:,
|
||||
thumbnail_base: video.thumbnail_url)
|
||||
|
||||
post_changed = post.changed?
|
||||
post.save! if post_changed
|
||||
|
||||
attach_thumbnail_if_needed!(post, video.thumbnail_url)
|
||||
else
|
||||
post_created = true
|
||||
post = Post.create!(
|
||||
title: video.title,
|
||||
url: video.url,
|
||||
thumbnail_base: video.thumbnail_url,
|
||||
uploaded_user_id: nil,
|
||||
original_created_from:,
|
||||
original_created_before:)
|
||||
|
||||
attach_thumbnail_if_needed!(post, video.thumbnail_url)
|
||||
|
||||
sync_post_tags!(post, [Tag.tagme.id, Tag.bot.id, Tag.youtube.id, Tag.video.id])
|
||||
end
|
||||
|
||||
kept_tag_ids = post.tags.pluck(:id).to_set
|
||||
desired_tag_ids = kept_tag_ids.to_a
|
||||
|
||||
deerjikist = Deerjikist.find_by(platform: :youtube, code: video.channel_id)
|
||||
if deerjikist
|
||||
desired_tag_ids.delete(Tag.no_deerjikist.id)
|
||||
desired_tag_ids << deerjikist.tag_id
|
||||
elsif post.tags.where(category: :deerjikist).none?
|
||||
desired_tag_ids << Tag.no_deerjikist.id
|
||||
end
|
||||
|
||||
desired_tag_ids.uniq!
|
||||
|
||||
sync_post_tags!(post, desired_tag_ids, current_tag_ids: kept_tag_ids)
|
||||
|
||||
if post_created
|
||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: nil)
|
||||
elsif post_changed || kept_tag_ids != desired_tag_ids.to_set
|
||||
PostVersionRecorder.ensure_snapshot!(post, created_by_user: nil)
|
||||
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: nil)
|
||||
end
|
||||
end
|
||||
|
||||
def sync_post_tags! post, desired_tag_ids, current_tag_ids: nil
|
||||
current_tag_ids ||= PostTag.kept.where(post_id: post.id).pluck(:tag_id).to_set
|
||||
desired_tag_ids = desired_tag_ids.compact.to_set
|
||||
|
||||
to_add = desired_tag_ids - current_tag_ids
|
||||
to_remove = current_tag_ids - desired_tag_ids
|
||||
|
||||
Tag.where(id: to_add.to_a).find_each do |tag|
|
||||
begin
|
||||
PostTag.create!(post:, tag:)
|
||||
rescue ActiveRecord::RecordNotUnique
|
||||
;
|
||||
end
|
||||
end
|
||||
|
||||
PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
|
||||
pt.discard_by!(nil)
|
||||
end
|
||||
end
|
||||
|
||||
def attach_thumbnail_if_needed! post, thumbnail_url
|
||||
return if post.thumbnail.attached?
|
||||
return if thumbnail_url.blank?
|
||||
|
||||
post.thumbnail.attach(
|
||||
io: URI.open(thumbnail_url),
|
||||
filename: File.basename(URI.parse(thumbnail_url).path),
|
||||
content_type: 'image/jpeg')
|
||||
|
||||
post.resized_thumbnail!
|
||||
end
|
||||
|
||||
def youtube_url_regexp id
|
||||
escaped = Regexp.escape(id)
|
||||
"(youtube\\.com/watch\\?v=#{ escaped }|youtu\\.be/#{ escaped })([^A-Za-z0-9_-]|$)"
|
||||
end
|
||||
|
||||
def query_terms = ['ぼざろクリーチャーシリーズ', '伊地知ニジカ', '伊地知虹鹿']
|
||||
|
||||
def playlist_ids
|
||||
['PLrOch4zHkI5vu29b-f9umUQQ4tQkuWLPX',
|
||||
'PLrOch4zHkI5vOK0RaytQq6PbucxQkkL0K',
|
||||
'PLrOch4zHkI5tdwm9vSegiDQJOM-hgpcOC']
|
||||
end
|
||||
|
||||
def sync_since = 14.days.ago
|
||||
|
||||
def each_playlist_item playlist_id
|
||||
page_token = nil
|
||||
|
||||
loop do
|
||||
response = @client.playlist_items(playlist_id:, page_token:)
|
||||
|
||||
response.fetch('items', []).each do |item|
|
||||
yield item
|
||||
end
|
||||
|
||||
page_token = response['nextPageToken']
|
||||
break if page_token.blank?
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,32 +0,0 @@
|
||||
require 'time'
|
||||
|
||||
|
||||
module Youtube
|
||||
class VideoItem
|
||||
attr_reader :id, :title, :channel_id, :published_at, :thumbnail_url, :raw_tags
|
||||
|
||||
def initialize item
|
||||
snippet = item.fetch('snippet')
|
||||
|
||||
@id = item.fetch('id')
|
||||
@title = snippet['title']
|
||||
@channel_id = snippet['channelId']
|
||||
@published_at = Time.iso8601(snippet['publishedAt'])
|
||||
@thumbnail_url = pick_thumbnail(snippet['thumbnails'] || { })
|
||||
@raw_tags = snippet['tags'] || []
|
||||
end
|
||||
|
||||
def url = "https://www.youtube.com/watch?v=#{ @id }"
|
||||
|
||||
private
|
||||
|
||||
def pick_thumbnail thumbnails
|
||||
['maxres', 'standard', 'high', 'medium', 'default'].each do |key|
|
||||
url = thumbnails.dig(key, 'url')
|
||||
return url if url.present?
|
||||
end
|
||||
|
||||
nil
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -24,7 +24,6 @@ Rails.application.routes.draw do
|
||||
patch '', action: :update
|
||||
|
||||
get :deerjikists
|
||||
put :deerjikists, action: :update_deerjikists
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -17,11 +17,3 @@ every 1.day, at: '0:00 am' do
|
||||
rake 'post_similarity:calc', environment: 'production'
|
||||
rake 'tag_similarity:calc', environment: 'production'
|
||||
end
|
||||
|
||||
every 1.day, at: '7:50 am' do
|
||||
rake 'nico:export', environment: 'production'
|
||||
end
|
||||
|
||||
every :hour do
|
||||
rake 'post:sync', environment: 'production'
|
||||
end
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
namespace :post do
|
||||
desc '投稿同期(ニコニコ以外)'
|
||||
task sync: :environment do
|
||||
Youtube::Sync.new.sync!
|
||||
end
|
||||
end
|
||||
@@ -8,35 +8,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
||||
|
||||
let!(:tag) { create(:tag, category: :deerjikist) }
|
||||
|
||||
let(:member) { create(:user, :member) }
|
||||
let(:guest) { create(:user, role: :guest) }
|
||||
|
||||
before do
|
||||
# show_by_name / deerjikists_by_name 用に名前を固定
|
||||
tag.tag_name.update!(name: 'deerjika')
|
||||
end
|
||||
|
||||
describe 'GET /tags/:id/deerjikists' do
|
||||
subject(:do_request) do
|
||||
get "/tags/#{tag_id}/deerjikists"
|
||||
get "/tags/#{ tag_id }/deerjikists"
|
||||
end
|
||||
|
||||
let(:tag_id) { tag.id }
|
||||
|
||||
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
|
||||
|
||||
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([])
|
||||
expect(json).to eq([])
|
||||
end
|
||||
end
|
||||
|
||||
@@ -46,27 +34,17 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
||||
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
||||
end
|
||||
|
||||
it 'returns 200 with tag and deerjikists array' do
|
||||
it 'returns 200 and deerjikists array' do
|
||||
do_request
|
||||
|
||||
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['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],
|
||||
[platform2, code2],
|
||||
)
|
||||
expect(json.map { |h| [h['platform'], h['code']] }).to contain_exactly(
|
||||
[platform1, code1],
|
||||
[platform2, code2],
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -75,7 +53,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
||||
|
||||
it 'returns 404' do
|
||||
do_request
|
||||
|
||||
expect(response).to have_http_status(:not_found)
|
||||
end
|
||||
end
|
||||
@@ -83,7 +60,7 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
||||
|
||||
describe 'GET /tags/name/:name/deerjikists' do
|
||||
subject(:do_request) do
|
||||
get "/tags/name/#{name}/deerjikists"
|
||||
get "/tags/name/#{ name }/deerjikists"
|
||||
end
|
||||
|
||||
let(:name) { 'deerjika' }
|
||||
@@ -93,7 +70,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
||||
|
||||
it 'returns 400' do
|
||||
do_request
|
||||
|
||||
expect(response).to have_http_status(:bad_request)
|
||||
end
|
||||
end
|
||||
@@ -103,209 +79,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
||||
|
||||
it 'returns 404' do
|
||||
do_request
|
||||
|
||||
expect(response).to have_http_status(:not_found)
|
||||
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
|
||||
before do
|
||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
||||
end
|
||||
|
||||
it 'returns 200 with tag and deerjikists array' do
|
||||
it 'returns 200 and 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(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.size).to eq(1)
|
||||
expect(json[0]['platform']).to eq('youtube')
|
||||
expect(json[0]['code']).to eq(channel_id)
|
||||
end
|
||||
expect(json).to be_a(Array)
|
||||
expect(json.size).to eq(1)
|
||||
expect(json[0]['platform']).to eq(platform1)
|
||||
expect(json[0]['code']).to eq(code1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,130 +0,0 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Youtube::ApiClient do
|
||||
let(:api_key) { 'test-api-key' }
|
||||
let(:client) { described_class.new(api_key:) }
|
||||
|
||||
describe '#search_videos' do
|
||||
it 'calls YouTube search API with expected params' do
|
||||
published_after = Time.zone.parse('2026-05-01 00:00:00')
|
||||
published_before = Time.zone.parse('2026-05-02 00:00:00')
|
||||
|
||||
expect(client).to receive(:get_json).with(
|
||||
'/search',
|
||||
{
|
||||
part: 'snippet',
|
||||
type: 'video',
|
||||
q: 'ぼざろクリーチャー',
|
||||
order: 'date',
|
||||
maxResults: 50,
|
||||
regionCode: 'JP',
|
||||
relevanceLanguage: 'ja',
|
||||
publishedAfter: published_after.iso8601,
|
||||
publishedBefore: published_before.iso8601,
|
||||
pageToken: 'NEXT'
|
||||
}
|
||||
).and_return({ 'items' => [] })
|
||||
|
||||
client.search_videos(
|
||||
q: 'ぼざろクリーチャー',
|
||||
published_after:,
|
||||
published_before:,
|
||||
page_token: 'NEXT'
|
||||
)
|
||||
end
|
||||
|
||||
it 'omits nil optional params' do
|
||||
expect(client).to receive(:get_json).with(
|
||||
'/search',
|
||||
hash_excluding(:publishedAfter, :publishedBefore, :pageToken)
|
||||
).and_return({ 'items' => [] })
|
||||
|
||||
client.search_videos(q: 'ぼざろクリーチャー')
|
||||
end
|
||||
end
|
||||
|
||||
describe '#videos' do
|
||||
it 'returns empty items when ids are empty' do
|
||||
expect(client).not_to receive(:get_json)
|
||||
|
||||
expect(client.videos([])).to eq({ 'items' => [] })
|
||||
end
|
||||
|
||||
it 'calls videos API with comma separated ids' do
|
||||
expect(client).to receive(:get_json).with(
|
||||
'/videos',
|
||||
{
|
||||
part: 'snippet,status,contentDetails',
|
||||
id: 'video-1,video-2'
|
||||
}
|
||||
).and_return({ 'items' => [] })
|
||||
|
||||
client.videos(['video-1', 'video-2'])
|
||||
end
|
||||
end
|
||||
|
||||
describe '#playlist_items' do
|
||||
it 'calls playlistItems API with page token' do
|
||||
expect(client).to receive(:get_json).with(
|
||||
'/playlistItems',
|
||||
{
|
||||
part: 'snippet,contentDetails,status',
|
||||
playlistId: 'PL123',
|
||||
maxResults: 50,
|
||||
pageToken: 'NEXT'
|
||||
}
|
||||
).and_return({ 'items' => [] })
|
||||
|
||||
client.playlist_items(playlist_id: 'PL123', page_token: 'NEXT')
|
||||
end
|
||||
|
||||
it 'omits page token when nil' do
|
||||
expect(client).to receive(:get_json).with(
|
||||
'/playlistItems',
|
||||
{
|
||||
part: 'snippet,contentDetails,status',
|
||||
playlistId: 'PL123',
|
||||
maxResults: 50
|
||||
}
|
||||
).and_return({ 'items' => [] })
|
||||
|
||||
client.playlist_items(playlist_id: 'PL123')
|
||||
end
|
||||
end
|
||||
|
||||
describe '#channel' do
|
||||
it 'calls channels API by id' do
|
||||
expect(client).to receive(:get_json).with(
|
||||
'/channels',
|
||||
{
|
||||
part: 'snippet,contentDetails',
|
||||
id: 'UC123'
|
||||
}
|
||||
).and_return({ 'items' => [] })
|
||||
|
||||
client.channel(id: 'UC123')
|
||||
end
|
||||
|
||||
it 'calls channels API by handle' do
|
||||
expect(client).to receive(:get_json).with(
|
||||
'/channels',
|
||||
{
|
||||
part: 'snippet,contentDetails',
|
||||
forHandle: '@some_handle'
|
||||
}
|
||||
).and_return({ 'items' => [] })
|
||||
|
||||
client.channel(handle: '@some_handle')
|
||||
end
|
||||
|
||||
it 'raises when neither id nor handle is given' do
|
||||
expect { client.channel }.to raise_error(ArgumentError, 'id or handle is required')
|
||||
end
|
||||
|
||||
it 'raises when both id and handle are given' do
|
||||
expect do
|
||||
client.channel(id: 'UC123', handle: '@some_handle')
|
||||
end.to raise_error(ArgumentError, 'id or handle is required')
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,310 +0,0 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Youtube::Sync do
|
||||
let(:client) { instance_double(Youtube::ApiClient) }
|
||||
let(:sync) { described_class.new(client:) }
|
||||
|
||||
before do
|
||||
allow(PostVersionRecorder).to receive(:record!)
|
||||
allow(PostVersionRecorder).to receive(:ensure_snapshot!)
|
||||
allow(sync).to receive(:attach_thumbnail_if_needed!)
|
||||
end
|
||||
|
||||
describe '#sync!' do
|
||||
it 'returns without fetching video details when no video ids are discovered' do
|
||||
allow(sync).to receive(:query_terms).and_return([])
|
||||
allow(sync).to receive(:playlist_ids).and_return([])
|
||||
|
||||
expect(client).not_to receive(:videos)
|
||||
|
||||
sync.sync!
|
||||
end
|
||||
|
||||
it 'discovers ids from search and all playlist pages' do
|
||||
allow(sync).to receive(:query_terms).and_return(['ぼざろクリーチャー'])
|
||||
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||
allow(sync).to receive(:sync_since).and_return(Time.zone.parse('2026-05-01 00:00:00'))
|
||||
|
||||
allow(client).to receive(:search_videos).with(
|
||||
q: 'ぼざろクリーチャー',
|
||||
published_after: Time.zone.parse('2026-05-01 00:00:00')
|
||||
).and_return({
|
||||
'items' => [
|
||||
{
|
||||
'id' => {
|
||||
'videoId' => 'search-video-1'
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
allow(client).to receive(:playlist_items).with(
|
||||
playlist_id: 'PL123',
|
||||
page_token: nil
|
||||
).and_return({
|
||||
'items' => [
|
||||
{
|
||||
'contentDetails' => {
|
||||
'videoId' => 'playlist-video-1'
|
||||
}
|
||||
}
|
||||
],
|
||||
'nextPageToken' => 'NEXT'
|
||||
})
|
||||
|
||||
allow(client).to receive(:playlist_items).with(
|
||||
playlist_id: 'PL123',
|
||||
page_token: 'NEXT'
|
||||
).and_return({
|
||||
'items' => [
|
||||
{
|
||||
'snippet' => {
|
||||
'resourceId' => {
|
||||
'videoId' => 'playlist-video-2'
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
expect(client).to receive(:videos).with(
|
||||
satisfy do |ids|
|
||||
ids.sort == ['playlist-video-1', 'playlist-video-2', 'search-video-1']
|
||||
end
|
||||
).and_return({ 'items' => [] })
|
||||
|
||||
sync.sync!
|
||||
end
|
||||
|
||||
it 'creates a YouTube post with default tags and no_deerjikist when no deerjikist mapping exists' do
|
||||
Tag.tagme
|
||||
Tag.bot
|
||||
Tag.youtube
|
||||
Tag.video
|
||||
Tag.no_deerjikist
|
||||
|
||||
allow(sync).to receive(:query_terms).and_return([])
|
||||
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||
|
||||
allow(client).to receive(:playlist_items).with(
|
||||
playlist_id: 'PL123',
|
||||
page_token: nil
|
||||
).and_return({
|
||||
'items' => [
|
||||
{
|
||||
'contentDetails' => {
|
||||
'videoId' => 'video-1'
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
allow(client).to receive(:videos).with(['video-1']).and_return({
|
||||
'items' => [
|
||||
youtube_video_item(
|
||||
id: 'video-1',
|
||||
title: 'YouTube テスト動画',
|
||||
channel_id: 'UC_NO_MAPPING'
|
||||
)
|
||||
]
|
||||
})
|
||||
|
||||
expect do
|
||||
sync.sync!
|
||||
end.to change(Post, :count).by(1)
|
||||
|
||||
post = Post.find_by!(url: 'https://www.youtube.com/watch?v=video-1')
|
||||
tag_ids = post.tags.pluck(:id)
|
||||
|
||||
expect(post.title).to eq('YouTube テスト動画')
|
||||
expect(post.uploaded_user_id).to be_nil
|
||||
expect(post.original_created_from).to eq(Time.zone.parse('2026-05-01 12:34:00'))
|
||||
expect(post.original_created_before).to eq(Time.zone.parse('2026-05-01 12:35:00'))
|
||||
|
||||
expect(tag_ids).to include(Tag.tagme.id)
|
||||
expect(tag_ids).to include(Tag.bot.id)
|
||||
expect(tag_ids).to include(Tag.youtube.id)
|
||||
expect(tag_ids).to include(Tag.video.id)
|
||||
expect(tag_ids).to include(Tag.no_deerjikist.id)
|
||||
|
||||
expect(PostVersionRecorder).to have_received(:record!).with(
|
||||
post:,
|
||||
event_type: :create,
|
||||
created_by_user: nil
|
||||
)
|
||||
end
|
||||
|
||||
it 'uses deerjikist tag when channel id is mapped' do
|
||||
Tag.tagme
|
||||
Tag.bot
|
||||
Tag.youtube
|
||||
Tag.video
|
||||
Tag.no_deerjikist
|
||||
|
||||
deerjikist_tag = Tag.find_or_create_by_tag_name!('テスト投稿者', category: :deerjikist)
|
||||
Deerjikist.create!(
|
||||
platform: 'youtube',
|
||||
code: 'UC_MAPPED',
|
||||
tag: deerjikist_tag
|
||||
)
|
||||
|
||||
allow(sync).to receive(:query_terms).and_return([])
|
||||
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||
|
||||
allow(client).to receive(:playlist_items).with(
|
||||
playlist_id: 'PL123',
|
||||
page_token: nil
|
||||
).and_return({
|
||||
'items' => [
|
||||
{
|
||||
'contentDetails' => {
|
||||
'videoId' => 'video-1'
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
allow(client).to receive(:videos).with(['video-1']).and_return({
|
||||
'items' => [
|
||||
youtube_video_item(
|
||||
id: 'video-1',
|
||||
title: 'YouTube テスト動画',
|
||||
channel_id: 'UC_MAPPED'
|
||||
)
|
||||
]
|
||||
})
|
||||
|
||||
sync.sync!
|
||||
|
||||
post = Post.find_by!(url: 'https://www.youtube.com/watch?v=video-1')
|
||||
tag_ids = post.tags.pluck(:id)
|
||||
|
||||
expect(tag_ids).to include(deerjikist_tag.id)
|
||||
expect(tag_ids).not_to include(Tag.no_deerjikist.id)
|
||||
end
|
||||
|
||||
it 'removes no_deerjikist when deerjikist mapping is added later' do
|
||||
Tag.no_deerjikist
|
||||
|
||||
post = Post.create!(
|
||||
title: '旧タイトル',
|
||||
url: 'https://www.youtube.com/watch?v=video-1',
|
||||
uploaded_user_id: nil,
|
||||
original_created_from: Time.zone.parse('2026-05-01 00:00:00'),
|
||||
original_created_before: Time.zone.parse('2026-05-01 00:01:00')
|
||||
)
|
||||
PostTag.create!(post:, tag: Tag.no_deerjikist)
|
||||
|
||||
deerjikist_tag = Tag.find_or_create_by_tag_name!('後から判明した投稿者', category: :deerjikist)
|
||||
Deerjikist.create!(
|
||||
platform: 'youtube',
|
||||
code: 'UC_MAPPED_LATER',
|
||||
tag: deerjikist_tag
|
||||
)
|
||||
|
||||
allow(sync).to receive(:query_terms).and_return([])
|
||||
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||
|
||||
allow(client).to receive(:playlist_items).with(
|
||||
playlist_id: 'PL123',
|
||||
page_token: nil
|
||||
).and_return({
|
||||
'items' => [
|
||||
{
|
||||
'contentDetails' => {
|
||||
'videoId' => 'video-1'
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
allow(client).to receive(:videos).with(['video-1']).and_return({
|
||||
'items' => [
|
||||
youtube_video_item(
|
||||
id: 'video-1',
|
||||
title: '新タイトル',
|
||||
channel_id: 'UC_MAPPED_LATER'
|
||||
)
|
||||
]
|
||||
})
|
||||
|
||||
sync.sync!
|
||||
|
||||
post.reload
|
||||
tag_ids = post.tags.pluck(:id)
|
||||
|
||||
expect(post.title).to eq('新タイトル')
|
||||
expect(tag_ids).to include(deerjikist_tag.id)
|
||||
expect(tag_ids).not_to include(Tag.no_deerjikist.id)
|
||||
|
||||
expect(PostVersionRecorder).to have_received(:ensure_snapshot!).with(
|
||||
post,
|
||||
created_by_user: nil
|
||||
)
|
||||
expect(PostVersionRecorder).to have_received(:record!).with(
|
||||
post:,
|
||||
event_type: :update,
|
||||
created_by_user: nil
|
||||
)
|
||||
end
|
||||
|
||||
it 'matches existing youtu.be URL and does not create duplicate post' do
|
||||
post = Post.create!(
|
||||
title: '旧タイトル',
|
||||
url: 'https://youtu.be/video-1',
|
||||
uploaded_user_id: nil,
|
||||
original_created_from: Time.zone.parse('2026-05-01 00:00:00'),
|
||||
original_created_before: Time.zone.parse('2026-05-01 00:01:00')
|
||||
)
|
||||
|
||||
allow(sync).to receive(:query_terms).and_return([])
|
||||
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
|
||||
|
||||
allow(client).to receive(:playlist_items).with(
|
||||
playlist_id: 'PL123',
|
||||
page_token: nil
|
||||
).and_return({
|
||||
'items' => [
|
||||
{
|
||||
'contentDetails' => {
|
||||
'videoId' => 'video-1'
|
||||
}
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
allow(client).to receive(:videos).with(['video-1']).and_return({
|
||||
'items' => [
|
||||
youtube_video_item(
|
||||
id: 'video-1',
|
||||
title: '新タイトル',
|
||||
channel_id: 'UC_NO_MAPPING'
|
||||
)
|
||||
]
|
||||
})
|
||||
|
||||
expect do
|
||||
sync.sync!
|
||||
end.not_to change(Post, :count)
|
||||
|
||||
expect(post.reload.title).to eq('新タイトル')
|
||||
end
|
||||
end
|
||||
|
||||
def youtube_video_item(id:, title:, channel_id:)
|
||||
{
|
||||
'id' => id,
|
||||
'snippet' => {
|
||||
'title' => title,
|
||||
'channelId' => channel_id,
|
||||
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||
'thumbnails' => {
|
||||
'high' => {
|
||||
'url' => "https://img.youtube.com/#{id}.jpg"
|
||||
}
|
||||
},
|
||||
'tags' => ['tag-a', 'tag-b']
|
||||
}
|
||||
}
|
||||
end
|
||||
end
|
||||
@@ -1,93 +0,0 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Youtube::VideoItem do
|
||||
describe '#initialize' do
|
||||
it 'extracts fields from YouTube video API item' do
|
||||
item = {
|
||||
'id' => 'video-1',
|
||||
'snippet' => {
|
||||
'title' => 'テスト動画',
|
||||
'channelId' => 'UC123',
|
||||
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||
'tags' => ['tag-a', 'tag-b'],
|
||||
'thumbnails' => {
|
||||
'high' => {
|
||||
'url' => 'https://img.youtube.com/high.jpg'
|
||||
},
|
||||
'medium' => {
|
||||
'url' => 'https://img.youtube.com/medium.jpg'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
video = described_class.new(item)
|
||||
|
||||
expect(video.id).to eq('video-1')
|
||||
expect(video.title).to eq('テスト動画')
|
||||
expect(video.channel_id).to eq('UC123')
|
||||
expect(video.published_at).to eq(Time.iso8601('2026-05-01T12:34:56Z'))
|
||||
expect(video.thumbnail_url).to eq('https://img.youtube.com/high.jpg')
|
||||
expect(video.raw_tags).to eq(['tag-a', 'tag-b'])
|
||||
expect(video.url).to eq('https://www.youtube.com/watch?v=video-1')
|
||||
end
|
||||
|
||||
it 'uses highest priority thumbnail' do
|
||||
item = {
|
||||
'id' => 'video-1',
|
||||
'snippet' => {
|
||||
'title' => 'テスト動画',
|
||||
'channelId' => 'UC123',
|
||||
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||
'thumbnails' => {
|
||||
'default' => {
|
||||
'url' => 'https://img.youtube.com/default.jpg'
|
||||
},
|
||||
'standard' => {
|
||||
'url' => 'https://img.youtube.com/standard.jpg'
|
||||
},
|
||||
'maxres' => {
|
||||
'url' => 'https://img.youtube.com/maxres.jpg'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
video = described_class.new(item)
|
||||
|
||||
expect(video.thumbnail_url).to eq('https://img.youtube.com/maxres.jpg')
|
||||
end
|
||||
|
||||
it 'falls back to empty raw tags' do
|
||||
item = {
|
||||
'id' => 'video-1',
|
||||
'snippet' => {
|
||||
'title' => 'テスト動画',
|
||||
'channelId' => 'UC123',
|
||||
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||
'thumbnails' => {}
|
||||
}
|
||||
}
|
||||
|
||||
video = described_class.new(item)
|
||||
|
||||
expect(video.raw_tags).to eq([])
|
||||
end
|
||||
|
||||
it 'returns nil thumbnail when no thumbnail exists' do
|
||||
item = {
|
||||
'id' => 'video-1',
|
||||
'snippet' => {
|
||||
'title' => 'テスト動画',
|
||||
'channelId' => 'UC123',
|
||||
'publishedAt' => '2026-05-01T12:34:56Z',
|
||||
'thumbnails' => {}
|
||||
}
|
||||
}
|
||||
|
||||
video = described_class.new(item)
|
||||
|
||||
expect(video.thumbnail_url).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,25 +0,0 @@
|
||||
require 'rails_helper'
|
||||
require 'rake'
|
||||
|
||||
RSpec.describe 'post:sync' do
|
||||
around do |example|
|
||||
original_application = Rake.application
|
||||
Rake.application = Rake::Application.new
|
||||
|
||||
Rake::Task.define_task(:environment)
|
||||
load Rails.root.join('lib/tasks/sync_posts.rake')
|
||||
|
||||
example.run
|
||||
ensure
|
||||
Rake.application = original_application
|
||||
end
|
||||
|
||||
it 'runs Youtube::Sync' do
|
||||
sync = instance_double(Youtube::Sync)
|
||||
|
||||
expect(Youtube::Sync).to receive(:new).once.and_return(sync)
|
||||
expect(sync).to receive(:sync!).once
|
||||
|
||||
Rake::Task['post:sync'].invoke
|
||||
end
|
||||
end
|
||||
@@ -10,7 +10,6 @@ import RouteBlockerOverlay from '@/components/RouteBlockerOverlay'
|
||||
import TopNav from '@/components/TopNav'
|
||||
import { Toaster } from '@/components/ui/toaster'
|
||||
import { apiPost, isApiError } from '@/lib/api'
|
||||
import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
|
||||
import MaterialBasePage from '@/pages/materials/MaterialBasePage'
|
||||
import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
|
||||
import MaterialListPage from '@/pages/materials/MaterialListPage'
|
||||
@@ -59,7 +58,6 @@ const RouteTransitionWrapper = ({ user, setUser }: {
|
||||
<Route path="/posts/changes" element={<PostHistoryPage/>}/>
|
||||
<Route path="/tags" element={<TagListPage/>}/>
|
||||
<Route path="/tags/:id" element={<TagDetailPage/>}/>
|
||||
<Route path="/tags/:id/deerjikists" element={<DeerjikistDetailPage/>}/>
|
||||
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
|
||||
<Route path="/tags/changes" element={<TagHistoryPage/>}/>
|
||||
<Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
|
||||
|
||||
@@ -45,9 +45,9 @@ export default (({ tag,
|
||||
<>
|
||||
{(linkFlg && withWiki) && (
|
||||
<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
|
||||
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
||||
@@ -55,19 +55,11 @@ export default (({ tag,
|
||||
?
|
||||
</PrefetchLink>)
|
||||
: (
|
||||
tag.materialId != null
|
||||
? (
|
||||
<PrefetchLink
|
||||
to={`/materials/${ tag.materialId }`}
|
||||
className={linkClass}>
|
||||
?
|
||||
</PrefetchLink>)
|
||||
: (
|
||||
<PrefetchLink
|
||||
to={`/tags/${ tag.id }/deerjikists`}
|
||||
className={linkClass}>
|
||||
?
|
||||
</PrefetchLink>)))
|
||||
<PrefetchLink
|
||||
to={`/materials/${ tag.materialId }`}
|
||||
className={linkClass}>
|
||||
?
|
||||
</PrefetchLink>))
|
||||
: (
|
||||
['character', 'material'].includes (tag.category)
|
||||
? (
|
||||
@@ -79,23 +71,13 @@ export default (({ tag,
|
||||
!
|
||||
</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
|
||||
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
||||
className="animate-[wiki-blink_.25s_steps(2,end)_infinite]
|
||||
dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
|
||||
title={`${ tag.name } Wiki が存在しません.`}>
|
||||
!
|
||||
</PrefetchLink>)))}
|
||||
<PrefetchLink
|
||||
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
||||
className="animate-[wiki-blink_.25s_steps(2,end)_infinite]
|
||||
dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
|
||||
title={`${ tag.name } Wiki が存在しません.`}>
|
||||
!
|
||||
</PrefetchLink>))}
|
||||
</span>)}
|
||||
{nestLevel > 0 && (
|
||||
<span
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { Category, Platform } from 'types'
|
||||
import type { Category } from 'types'
|
||||
|
||||
export const LIGHT_COLOUR_SHADE = 800
|
||||
export const DARK_COLOUR_SHADE = 300
|
||||
@@ -31,11 +31,6 @@ export const FETCH_POSTS_ORDER_FIELDS = [
|
||||
'updated_at',
|
||||
] 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 = {
|
||||
deerjikist: 'rose',
|
||||
meme: 'purple',
|
||||
|
||||
@@ -9,12 +9,11 @@ export const postsKeys = {
|
||||
['posts', 'changes', p] as const }
|
||||
|
||||
export const tagsKeys = {
|
||||
root: ['tags'] as const,
|
||||
index: (p: FetchTagsParams) => ['tags', 'index', p] as const,
|
||||
show: (name: string) => ['tags', name] as const,
|
||||
changes: (p: { id?: string; page: number; limit: number }) =>
|
||||
['tags', 'changes', p] as const,
|
||||
deerjikists: (id: string) => ['tags', 'deerjikists', id] as const }
|
||||
root: ['tags'] as const,
|
||||
index: (p: FetchTagsParams) => ['tags', 'index', p] as const,
|
||||
show: (name: string) => ['tags', name] as const,
|
||||
changes: (p: { id?: string; page: number; limit: number }) =>
|
||||
['tags', 'changes', p] as const }
|
||||
|
||||
export const wikiKeys = {
|
||||
root: ['wiki'] as const,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { apiGet } from '@/lib/api'
|
||||
|
||||
import type { Deerjikist, FetchTagsParams, Tag, TagVersion } from '@/types'
|
||||
import type { FetchTagsParams, Tag, TagVersion } from '@/types'
|
||||
|
||||
|
||||
export const fetchTags = async (
|
||||
@@ -56,9 +56,3 @@ export const fetchTagChanges = async (
|
||||
versions: TagVersion[]
|
||||
count: number }> =>
|
||||
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
|
||||
@@ -1,6 +1,5 @@
|
||||
import { CATEGORIES,
|
||||
FETCH_POSTS_ORDER_FIELDS,
|
||||
PLATFORMS,
|
||||
USER_ROLES,
|
||||
ViewFlagBehavior } from '@/consts'
|
||||
|
||||
@@ -8,8 +7,6 @@ import type { ReactNode } from 'react'
|
||||
|
||||
export type Category = typeof CATEGORIES[number]
|
||||
|
||||
export type Deerjikist = { platform: Platform; code: string }
|
||||
|
||||
export type FetchPostsOrder = `${ FetchPostsOrderField }:${ 'asc' | 'desc' }`
|
||||
|
||||
export type FetchPostsOrderField = typeof FETCH_POSTS_ORDER_FIELDS[number]
|
||||
@@ -117,8 +114,6 @@ export type NiconicoViewerHandle = {
|
||||
showComments: () => void
|
||||
hideComments: () => void }
|
||||
|
||||
export type Platform = typeof PLATFORMS[number]
|
||||
|
||||
export type Post = {
|
||||
id: number
|
||||
url: string
|
||||
@@ -183,8 +178,7 @@ export type Tag = {
|
||||
createdAt: string
|
||||
updatedAt: string
|
||||
hasWiki: boolean
|
||||
materialId: number | null
|
||||
hasDeerjikists: boolean
|
||||
materialId: number
|
||||
children?: Tag[]
|
||||
matchedAlias?: string | null }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user