Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 90c1842224 | |||
| d2eb69d3b0 | |||
| 5f0c1953ce | |||
| 6ac044278f | |||
| c4f5df8b44 | |||
| e3780e2982 |
@@ -336,27 +336,8 @@ class TagsController < ApplicationController
|
||||
end
|
||||
|
||||
def update_aliases! tag, alias_names
|
||||
alias_names = alias_names.uniq
|
||||
|
||||
affected_tags = [tag]
|
||||
|
||||
current_aliases = tag.tag_name.aliases.to_a
|
||||
|
||||
current_aliases.each do |alias_tag_name|
|
||||
next if alias_names.include?(alias_tag_name.name)
|
||||
|
||||
affected_tags << alias_tag_name.canonical&.tag
|
||||
end
|
||||
|
||||
alias_names.each do |alias_name|
|
||||
alias_tag_name = TagName.find_undiscard_or_create_by!(name: alias_name)
|
||||
affected_tags << alias_tag_name.canonical&.tag
|
||||
end
|
||||
|
||||
affected_tags.compact.uniq.each do |affected_tag|
|
||||
TagVersioning.ensure_snapshot!(affected_tag, created_by_user: current_user)
|
||||
end
|
||||
|
||||
current_aliases.each do |alias_tag_name|
|
||||
next if alias_names.include?(alias_tag_name.name)
|
||||
|
||||
@@ -367,10 +348,6 @@ class TagsController < ApplicationController
|
||||
alias_tag_name = TagName.find_undiscard_or_create_by!(name: alias_name)
|
||||
alias_tag_name.update!(canonical: tag.tag_name)
|
||||
end
|
||||
|
||||
affected_tags.compact.uniq.each do |affected_tag|
|
||||
record_tag_version!(affected_tag, event_type: :update, created_by_user: current_user)
|
||||
end
|
||||
end
|
||||
|
||||
def update_parent_tags! tag, parent_names
|
||||
|
||||
@@ -84,7 +84,6 @@ class Tag < ApplicationRecord
|
||||
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,
|
||||
|
||||
@@ -1,68 +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:, page_token: nil
|
||||
get_json('/search', {
|
||||
part: 'snippet',
|
||||
type: 'video',
|
||||
q: q,
|
||||
order: 'date',
|
||||
maxResults: 50,
|
||||
publishedAfter: published_after.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
|
||||
params = { part: 'snippet,contentDetails' }
|
||||
params[:id] = id if id
|
||||
params[:forHandle] = handle if handle
|
||||
|
||||
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,151 +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|
|
||||
response = @client.playlist_items(playlist_id:)
|
||||
response.fetch('items', []).each do |item|
|
||||
video_id = item.dig('contentDetails', '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: 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 << 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
|
||||
end
|
||||
end
|
||||
@@ -1,29 +0,0 @@
|
||||
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
|
||||
@@ -1,6 +0,0 @@
|
||||
namespace :post do
|
||||
desc '投稿同期(ニコニコ以外)'
|
||||
task sync: :environment do
|
||||
Youtube::Sync.new.sync!
|
||||
end
|
||||
end
|
||||
@@ -964,6 +964,8 @@ RSpec.describe 'Tags API', type: :request do
|
||||
end
|
||||
|
||||
it '別名を他 tag から奪った場合、奪はれた側の tag version も作成する' do
|
||||
pending '#329 で対応予定'
|
||||
|
||||
old_owner = Tag.create!(
|
||||
tag_name: TagName.create!(name: 'put_alias_old_owner'),
|
||||
category: :general
|
||||
|
||||
@@ -4,7 +4,7 @@ RSpec.describe 'Wiki body search', type: :request do
|
||||
let!(:user) { create_member_user! }
|
||||
|
||||
it 'searches wiki pages by body text' do
|
||||
pending '#336 で対応予定'
|
||||
pending 'Wiki 本文検索実装時に有効化する'
|
||||
|
||||
Wiki::Commit.create_content!(
|
||||
tag_name: TagName.create!(name: 'wiki_body_search_hit'),
|
||||
|
||||
@@ -8,7 +8,7 @@ RSpec.describe 'Wiki restore', type: :request do
|
||||
end
|
||||
|
||||
it 'restores wiki page to previous version' do
|
||||
pending '#337 で対応予定'
|
||||
pending 'Wiki 版巻き戻し API 実装時に有効化する'
|
||||
|
||||
page =
|
||||
Wiki::Commit.create_content!(
|
||||
|
||||
Reference in New Issue
Block a user