#306

AGENTS.md

@@ -271,12 +271,7 @@ const value =
 - In TypeScript and TSX, convert every leading run of 8 spaces to a tab
   character.
 - A leading tab is exactly equivalent to 8 leading spaces.
-- In TypeScript and TSX function declarations, including `const` arrow
-  function declarations, when the parameter list spans multiple lines, always
-  put the closing parenthesis at the beginning of its own line before the return
-  type or `=>`.
-- In TypeScript and TSX, never place a closing parenthesis at the beginning of
-  a line except for a multi-line function declaration parameter list.
+- Never place a closing parenthesis at the beginning of a line.
 - Never place a closing square bracket at the beginning of a line.
 - For object literals and other associative-array-style braces, do not place
   the closing brace at the beginning of a line. Function, lambda, callback, and

backend/app/controllers/post_versions_controller.rb

@@ -25,7 +25,6 @@ class PostVersionsController < ApplicationController
         SQL
         .select('post_versions.*', 'prev.title AS prev_title', 'prev.url AS prev_url',
                 'prev.thumbnail_base AS prev_thumbnail_base', 'prev.tags AS prev_tags',
-                'prev.video_ms AS prev_video_ms',
                 'prev.original_created_from AS prev_original_created_from',
                 'prev.original_created_before AS prev_original_created_before')
     q = q.where('post_versions.post_id = ?', post_id) if post_id
@@ -75,10 +74,6 @@ class PostVersionsController < ApplicationController
           current: row.thumbnail_base,
           prev: row.attributes['prev_thumbnail_base']
         },
-        video_ms: {
-          current: row.video_ms,
-          prev: row.attributes['prev_video_ms']
-        },
         tags: build_version_tags(cur_tags, prev_tags),
         original_created_from: {
           current: row.original_created_from&.iso8601,

backend/app/controllers/posts_controller.rb

@@ -1,10 +1,6 @@
 class PostsController < ApplicationController
   Event = Struct.new(:post, :tag, :user, :change_type, :timestamp, keyword_init: true)
 
-  class VideoMsParseError < ArgumentError
-    ;
-  end
-
   def index
     url = params[:url].presence
     title = params[:title].presence
@@ -49,9 +45,7 @@ class PostsController < ApplicationController
         .joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
         .reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
         .preload(:uploaded_user, :parents, :children,
-                 active_post_tags: [:sections,
-                                    { tag: [:deerjikists, :materials,
-                                            { tag_name: :wiki_page }] }])
+                 tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
         .with_attached_thumbnail
 
     q = q.where('posts.url LIKE ?', "%#{ url }%") if url
@@ -103,9 +97,7 @@ class PostsController < ApplicationController
 
   def random
     post = filtered_posts.preload(:uploaded_user, :parents, :children,
-                                  active_post_tags: [:sections,
-                                                     { tag: [:deerjikists, :materials,
-                                                             { tag_name: :wiki_page }] }])
+                                  tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
                          .with_attached_thumbnail
                          .order('RAND()')
                          .first
@@ -118,9 +110,7 @@ class PostsController < ApplicationController
     post =
         Post
         .includes(:uploaded_user, :parents, :children,
-                  active_post_tags: [:sections,
-                                     { tag: [:deerjikists, :materials,
-                                             { tag_name: :wiki_page }] }])
+                  tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
         .with_attached_thumbnail
         .find_by(id: params[:id])
     return head :not_found unless post
@@ -135,7 +125,7 @@ class PostsController < ApplicationController
                                  child_posts:,
                                  sibling_posts:,
                                  related:)
-                         .merge(tags: build_tag_tree_for(post))
+                         .merge(tags: build_tag_tree_for(post.tags))
   end
 
   def create
@@ -150,27 +140,24 @@ class PostsController < ApplicationController
     original_created_from = params[:original_created_from]
     original_created_before = params[:original_created_before]
     parent_post_ids = parse_parent_post_ids
-    resized_thumbnail = thumbnail.present? ? Post.resized_thumbnail_attachment(thumbnail) : nil
 
     post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
                     original_created_from:, original_created_before:)
-    post.thumbnail.attach(resized_thumbnail) if resized_thumbnail
+    post.thumbnail.attach(thumbnail) if thumbnail.present?
 
     ApplicationRecord.transaction do
       post.save!
 
-      Tag.normalise_tags!(tag_names, deny_deprecated: true, with_sections: true) =>
-          { tags:, sections: }
+      tags = Tag.normalise_tags!(tag_names, deny_deprecated: true)
       TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
 
       tags = Tag.expand_parent_tags(tags).reject(&:deprecated?)
-      post.video_ms = normalise_video_ms(tags)
-      validate_video_sections!(post.video_ms, sections)
-      post.save!
-      sync_post_tags!(post, tags, sections)
+      sync_post_tags!(post, tags)
 
       sync_parent_posts!(post, parent_post_ids)
 
+      post.resized_thumbnail!
+
       PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
     end
 
@@ -180,12 +167,6 @@ class PostsController < ApplicationController
     render_validation_error fields: { tags: 'ニコニコ・タグは直接指定できません．' }
   rescue Tag::DeprecatedTagNormalisationError
     render_unprocessable_entity '廃止済みタグは付与できません．', field: :tags
-  rescue Tag::SectionLiteralParseError
-    render_validation_error fields: { tags: ['タグ区間の記法が不正です．'] }
-  rescue VideoMsParseError
-    render_validation_error fields: { video_ms: ['動画時間の記法が不正です．'] }
-  rescue MiniMagick::Error
-    render_validation_error fields: { thumbnail: ['サムネイル画像の変換に失敗しました．'] }
   rescue ArgumentError => e
     render_validation_error fields: { parent_post_ids: [e.message] }
   rescue ActiveRecord::RecordInvalid => e
@@ -242,8 +223,6 @@ class PostsController < ApplicationController
                                                  original_created_from:,
                                                  original_created_before:,
                                                  tag_names:,
-                                                 video_ms_param: params[:video_ms],
-                                                 duration_param: params[:duration],
                                                  parent_post_ids:)
 
       snapshot_to_apply =
@@ -274,16 +253,12 @@ class PostsController < ApplicationController
 
     post.reload
     json = PostRepr.base(post, current_user)
-    json['tags'] = build_tag_tree_for(post)
+    json['tags'] = build_tag_tree_for(post.tags)
     render json:, status: :ok
   rescue Tag::NicoTagNormalisationError
     render_validation_error fields: { tags: ['ニコニコ・タグは直接指定できません．'] }
   rescue Tag::DeprecatedTagNormalisationError
     render_unprocessable_entity '廃止済みタグは付与できません．', field: :tags
-  rescue Tag::SectionLiteralParseError
-    render_validation_error fields: { tags: ['タグ区間の記法が不正です．'] }
-  rescue VideoMsParseError
-    render_validation_error fields: { video_ms: ['動画時間の記法が不正です．'] }
   rescue ArgumentError => e
     render_validation_error fields: { parent_post_ids: [e.message] }
   rescue ActiveRecord::RecordInvalid => e
@@ -382,7 +357,7 @@ class PostsController < ApplicationController
   def tagged_post_ids_for(name) =
       Post.joins(tags: :tag_name).where(tag_names: { name: }).select(:id)
 
-  def sync_post_tags! post, desired_tags, sections
+  def sync_post_tags! post, desired_tags
     desired_tags.each do |t|
       t.save! if t.new_record?
     end
@@ -401,21 +376,13 @@ class PostsController < ApplicationController
       end
     end
 
-    PostTagSection.where(post_id: post.id).destroy_all
-    sections.each do |tag_id, ranges|
-      ranges.each do |begin_ms, end_ms|
-        PostTagSection.create!(post_id: post.id, tag_id:, begin_ms:, end_ms:)
-      end
-    end
-
     PostTag.where(post_id: post.id, tag_id: to_remove.to_a).kept.find_each do |pt|
       pt.discard_by!(current_user)
     end
   end
 
-  def build_tag_tree_for post
-    post_tags = post.active_post_tags.reject { |post_tag| post_tag.tag.deprecated? }
-    tags = post_tags.map(&:tag)
+  def build_tag_tree_for tags
+    tags = tags.reject(&:deprecated?).to_a
     tag_ids = tags.map(&:id)
 
     implications = TagImplication.where(parent_tag_id: tag_ids, tag_id: tag_ids)
@@ -430,9 +397,6 @@ class PostsController < ApplicationController
     root_ids = tag_ids - child_ids
 
     tags_by_id = tags.index_by(&:id)
-    sections_by_tag_id = post_tags.to_h { |post_tag|
-      [post_tag.tag_id, post_tag.sections.as_json(only: [:begin_ms, :end_ms])]
-    }
 
     memo = { }
 
@@ -440,10 +404,8 @@ class PostsController < ApplicationController
       tag = tags_by_id[tag_id]
       return nil unless tag
 
-      sections = sections_by_tag_id.fetch(tag_id, [])
-
       if path.include?(tag_id)
-        return TagRepr.inline(tag).merge(children: [], sections:)
+        return TagRepr.inline(tag).merge(children: [])
       end
 
       if memo.key?(tag_id)
@@ -455,7 +417,7 @@ class PostsController < ApplicationController
 
       children = child_ids.filter_map { |cid| build_node.(cid, new_path) }
 
-      memo[tag_id] = TagRepr.inline(tag).merge(children:, sections:)
+      memo[tag_id] = TagRepr.inline(tag).merge(children:)
     end
 
     root_ids.filter_map { |id| build_node.call(id, []) }
@@ -524,7 +486,6 @@ class PostsController < ApplicationController
 
   def post_snapshot_from_version version
     { title: version.title,
-      video_ms: version.respond_to?(:video_ms) ? version.video_ms : nil,
       original_created_from: snapshot_time(version.original_created_from),
       original_created_before: snapshot_time(version.original_created_before),
       tag_names: editable_tag_names_from_version(version),
@@ -537,7 +498,6 @@ class PostsController < ApplicationController
 
   def post_snapshot_from_record post
     { title: post.title,
-      video_ms: post.video_ms,
       original_created_from: snapshot_time(post.original_created_from),
       original_created_before: snapshot_time(post.original_created_before),
       tag_names: editable_tag_names_from_post(post),
@@ -545,41 +505,16 @@ class PostsController < ApplicationController
   end
 
   def editable_tag_names_from_post post
-    post
-        .post_tags
-        .kept
-        .joins(tag: :tag_name)
-        .merge(Tag.not_nico)
-        .merge(Tag.where(deprecated_at: nil))
-        .includes(:sections, tag: :tag_name)
-        .order('tag_names.name')
-        .map do |post_tag|
-      name = post_tag.tag.tag_name.name
-      sections = post_tag.sections.sort_by(&:begin_ms)
-
-      next name if sections.empty?
-
-      "#{ name }#{ sections.map { Post.section_literal(_1) }.join }"
-    end
+    post.tags.not_nico.where(deprecated_at: nil)
+        .joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
   end
 
   def post_incoming_snapshot title:, original_created_from:, original_created_before:,
-                             tag_names:, video_ms_param:, duration_param:, parent_post_ids:
-    Tag.normalise_tags!(tag_names, with_tagme: false, deny_deprecated: true,
-                                        with_sections: true) =>
-        { tags:, sections: }
-
-    tags = Tag.expand_parent_tags(tags).reject(&:deprecated?)
-    video_ms = normalise_video_ms(tags, video_ms_param:, duration_param:)
-    validate_video_sections!(video_ms, sections)
-
+                             tag_names:, parent_post_ids:
     { title:,
-      video_ms:,
       original_created_from: snapshot_time(original_created_from),
       original_created_before: snapshot_time(original_created_before),
-      tag_names: tags.uniq(&:id).map { |tag|
-        "#{ tag.name }#{ sections[tag.id].to_a.map { section_literal(_1) }.join }"
-      }.sort,
+      tag_names: incoming_tag_names_for_snapshot(tag_names),
       parent_post_ids: parent_post_ids.sort }
   end
 
@@ -602,8 +537,11 @@ class PostsController < ApplicationController
     value.to_s
   end
 
-  def section_literal section
-    "[#{ Post.ms_to_time(section[0]) }-#{ section[1] ? Post.ms_to_time(section[1]) : '' }]"
+  def incoming_tag_names_for_snapshot raw_tag_names
+    tags = Tag.normalise_tags!(raw_tag_names, with_tagme: false,
+                                              deny_deprecated: true)
+
+    Tag.expand_parent_tags(tags).reject(&:deprecated?).map(&:name).uniq.sort
   end
 
   def post_conflict_json post:, base_version_no:, base_snapshot:,
@@ -624,8 +562,6 @@ class PostsController < ApplicationController
   def post_snapshot_changes base_snapshot, current_snapshot, incoming_snapshot
     [scalar_snapshot_change(:title, 'タイトル',
                             base_snapshot, current_snapshot, incoming_snapshot),
-     scalar_snapshot_change(:video_ms, '動画時間',
-                            base_snapshot, current_snapshot, incoming_snapshot),
      scalar_snapshot_change(:original_created_from, 'オリジナルの作成日時（以降）',
                             base_snapshot, current_snapshot, incoming_snapshot),
      scalar_snapshot_change(:original_created_before, 'オリジナルの作成日時（より前）',
@@ -689,14 +625,11 @@ class PostsController < ApplicationController
     PostVersionRecorder.ensure_snapshot!(post, created_by_user: current_user)
 
     post.update!(title: snapshot[:title],
-                 video_ms: snapshot[:video_ms],
                  original_created_from: snapshot[:original_created_from],
                  original_created_before: snapshot[:original_created_before])
 
-    Tag.normalise_tags!(snapshot[:tag_names], with_tagme: false,
-                                               deny_deprecated: true,
-                                               with_sections: true) =>
-        { tags: editable_tags, sections: }
+    editable_tags = Tag.normalise_tags!(snapshot[:tag_names], with_tagme: false,
+                                                               deny_deprecated: true)
     TagVersioning.record_tag_snapshots!(editable_tags, created_by_user: current_user)
 
     readonly_tags = post.tags.nico.to_a
@@ -704,17 +637,14 @@ class PostsController < ApplicationController
     tags = readonly_tags + editable_tags
     tags = Tag.expand_parent_tags(tags).reject(&:deprecated?)
 
-    post.video_ms = tags.any? { _1.id == Tag.video.id } ? snapshot[:video_ms] : nil
-    validate_video_sections!(post.video_ms, sections)
-    post.save!
-    sync_post_tags!(post, tags, sections)
+    sync_post_tags!(post, tags)
     sync_parent_posts!(post, snapshot[:parent_post_ids])
 
     PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
   end
 
   def merge_post_snapshots base_snapshot, current_snapshot, incoming_snapshot
-    [:title, :video_ms, :original_created_from, :original_created_before].map {
+    [:title, :original_created_from, :original_created_before].map {
       [_1, merge_scalar_snapshot_value(base_snapshot[_1],
                                        current_snapshot[_1],
                                        incoming_snapshot[_1])]
@@ -758,44 +688,4 @@ class PostsController < ApplicationController
       render_validation_error record
     end
   end
-
-  def normalise_video_ms tags, video_ms_param: params[:video_ms], duration_param: params[:duration]
-    return nil unless tags.any? { _1.id == Tag.video.id }
-
-    if video_ms_param.present?
-      video_ms = Integer(video_ms_param, exception: false)
-      raise VideoMsParseError unless video_ms&.positive?
-
-      return video_ms
-    end
-
-    return nil if duration_param.blank?
-
-    video_ms = Tag.time_to_ms!(duration_param.to_s, tag_name: '動画時間')
-    raise VideoMsParseError unless video_ms.positive?
-
-    video_ms
-  rescue Tag::SectionLiteralParseError
-    raise VideoMsParseError
-  end
-
-  def validate_video_sections! video_ms, sections
-    return unless video_ms
-
-    sections.each_value do |ranges|
-      ranges.each do |begin_ms, end_ms|
-        if begin_ms >= video_ms
-          post = Post.new
-          post.errors.add :video_ms, 'タグ区間の開始が動画時間以上です．'
-          raise ActiveRecord::RecordInvalid, post
-        end
-
-        if end_ms && end_ms > video_ms
-          post = Post.new
-          post.errors.add :video_ms, 'タグ区間の終端が動画時間を超えてゐます．'
-          raise ActiveRecord::RecordInvalid, post
-        end
-      end
-    end
-  end
 end

backend/app/controllers/tags_controller.rb

@@ -245,7 +245,10 @@ class TagsController < ApplicationController
     return render_unprocessable_entity('カテゴリは必須です．', field: :category) if category.blank?
     return render_unprocessable_entity '廃止状態は必須です．', field: :deprecated unless params.key?(:deprecated)
 
-    return unless validate_tag_rename(tag, name)
+    if (name != tag.name &&
+        tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico]))
+      return render_unprocessable_entity 'システム・タグの名称は変更できません．', field: :name
+    end
 
     alias_names = params[:aliases].to_s.split.uniq
     parent_names = params[:parent_tags].to_s.split.uniq
@@ -271,7 +274,7 @@ class TagsController < ApplicationController
       else
         tag.update!(category:, deprecated_at: deprecated ? Time.current : nil)
       end
-      rename_tag_name!(tag, name) if name_changed
+      tag.tag_name.update!(name:)
 
       alias_names << old_name if name_changed
       alias_names.delete(name)
@@ -307,8 +310,6 @@ class TagsController < ApplicationController
       return render_unprocessable_entity 'ニコタグは廃止できません．', field: :deprecated
     end
 
-    return unless validate_tag_rename(tag, name)
-
     if tag.nico? || (category.present? && category == 'nico')
       return render_unprocessable_entity 'ニコタグは変更できません．', field: :category
     end
@@ -320,7 +321,7 @@ class TagsController < ApplicationController
       name_changed = name.present? && name != old_name
       wiki_page = tag.tag_name.wiki_page if name_changed
 
-      rename_tag_name!(tag, name) if name_changed
+      tag.tag_name.update!(name:) if name.present?
       tag.update!(category:) if category.present?
       if deprecated_given && tag.deprecated? != deprecated
         tag.update!(deprecated_at: deprecated ? Time.current : nil)
@@ -534,67 +535,6 @@ class TagsController < ApplicationController
         created_by_user:)
   end
 
-  def validate_tag_rename tag, name
-    return true if name.blank? || name == tag.name
-
-    if tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico])
-      render_unprocessable_entity 'システム・タグの名称は変更できません．', field: :name
-      return false
-    end
-
-    target_tag_name = TagName.with_discarded.find_by(name:)
-    return true if target_tag_name.nil?
-    return true if target_tag_name.canonical_id?
-
-    render_unprocessable_entity 'その名前は既に使はれてゐます．', field: :name
-    false
-  end
-
-  def rename_tag_name! tag, name
-    return if name == tag.name
-
-    current_tag_name = tag.tag_name
-    target_tag_name = TagName.with_discarded.find_by(name:)
-
-    if target_tag_name.nil?
-      current_tag_name.update!(name:)
-      return
-    end
-
-    promote_tag_alias!(
-        tag,
-        current_tag_name:,
-        promoted_tag_name: target_tag_name)
-  end
-
-  def promote_tag_alias! tag, current_tag_name:, promoted_tag_name:
-    old_owner_tag = promoted_tag_name.canonical&.tag
-
-    if old_owner_tag && old_owner_tag != tag
-      TagVersioning.ensure_snapshot!(old_owner_tag, created_by_user: current_user)
-    end
-
-    promoted_tag_name.undiscard! if promoted_tag_name.discarded?
-    promoted_tag_name.update!(canonical: nil)
-
-    TagName.with_discarded
-           .where(canonical_id: current_tag_name.id)
-           .where.not(id: promoted_tag_name.id)
-           .find_each do |alias_tag_name|
-      alias_tag_name.update!(canonical: promoted_tag_name)
-    end
-
-    current_tag_name.wiki_page&.update!(tag_name: promoted_tag_name)
-    tag.update!(tag_name: promoted_tag_name)
-    current_tag_name.association(:wiki_page).reset
-    current_tag_name.association(:tag).reset
-    current_tag_name.reload.update!(canonical: promoted_tag_name)
-
-    return unless old_owner_tag && old_owner_tag != tag
-
-    record_tag_version!(old_owner_tag.reload, event_type: :update, created_by_user: current_user)
-  end
-
   def update_aliases! tag, alias_names
     alias_names = alias_names.uniq
 

backend/app/models/post.rb

@@ -1,19 +1,5 @@
 class Post < ApplicationRecord
   require 'mini_magick'
-  require 'stringio'
-
-  def self.resized_thumbnail_attachment(upload)
-    upload.rewind
-    image = MiniMagick::Image.read(upload.read)
-    image.resize '180x180'
-    image.format 'jpg'
-
-    { io: StringIO.new(image.to_blob),
-      filename: 'resized_thumbnail.jpg',
-      content_type: 'image/jpeg' }
-  ensure
-    upload.rewind
-  end
 
   belongs_to :uploaded_user, class_name: 'User', optional: true
 
@@ -60,7 +46,6 @@ class Post < ApplicationRecord
   before_validation :normalise_url
 
   validates :url, presence: true, uniqueness: true
-  validates :video_ms, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
   validate :validate_original_created_range
   validate :url_must_be_http_url
@@ -84,42 +69,7 @@ class Post < ApplicationRecord
     super(options).merge(thumbnail: nil)
   end
 
-  def snapshot_tag_names
-    post_tags
-        .kept
-        .joins(tag: :tag_name)
-        .includes(:sections, tag: :tag_name)
-        .order('tag_names.name')
-        .map do |post_tag|
-      name = post_tag.tag.tag_name.name
-      sections = post_tag.sections.sort_by(&:begin_ms)
-
-      next name if sections.empty?
-
-      "#{ name }#{ sections.map { Post.section_literal(_1) }.join }"
-    end
-  end
-
-  def self.section_literal section
-    "[#{ Post.ms_to_time(section.begin_ms) }-#{ section.end_ms ? Post.ms_to_time(section.end_ms) : '' }]"
-  end
-
-  def self.ms_to_time ms
-    total_s = ms / 1_000
-    s = total_s % 60
-    min = (total_s / 60) % 60
-    h = total_s / 3_600
-    remainder_ms = ms % 1_000
-
-    base =
-        if h.positive?
-          '%d:%02d:%02d' % [h, min, s]
-        else
-          '%d:%02d' % [min, s]
-        end
-
-    remainder_ms.positive? ? "#{ base }.#{ remainder_ms.to_s.rjust(3, '0') }" : base
-  end
+  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)
 
@@ -137,7 +87,12 @@ class Post < ApplicationRecord
   def resized_thumbnail!
     return unless thumbnail.attached?
 
-    thumbnail.attach(self.class.resized_thumbnail_attachment(StringIO.new(thumbnail.download)))
+    image = MiniMagick::Image.read(thumbnail.download)
+    image.resize '180x180'
+    thumbnail.purge
+    thumbnail.attach(io:            File.open(image.path),
+                     filename:      'resized_thumbnail.jpg',
+                     content_type:  'image/jpeg')
   end
 
   private

backend/app/models/post_tag.rb

@@ -10,12 +10,6 @@ class PostTag < ApplicationRecord
   belongs_to :created_user, class_name: 'User', optional: true
   belongs_to :deleted_user, class_name: 'User', optional: true
 
-  has_many :sections, -> { order(:begin_ms) }, class_name: 'PostTagSection',
-                                               foreign_key: [:post_id, :tag_id],
-                                               primary_key: [:post_id, :tag_id],
-                                               dependent: :delete_all,
-                                               inverse_of: :post_tag
-
   validates :post_id, presence: true
   validates :tag_id, presence: true
   validates :post_id, uniqueness: {

backend/app/models/post_tag_section.rb

@@ -1,20 +0,0 @@
-class PostTagSection < ApplicationRecord
-  self.primary_key = :post_id, :tag_id, :begin_ms
-
-  belongs_to :post
-  belongs_to :tag
-
-  belongs_to :post_tag, -> { kept }, foreign_key: [:post_id, :tag_id],
-                                     primary_key: [:post_id, :tag_id],
-                                     inverse_of: :sections,
-                                     optional: true
-
-  validates :post_id, presence: true
-  validates :tag_id, presence: true
-
-  validates :begin_ms, presence: true,
-                       numericality: { only_integer: true, greater_than_or_equal_to: 0 }
-
-  validates :end_ms, numericality: { only_integer: true, greater_than: :begin_ms },
-                     allow_nil: true
-end

backend/app/models/post_version.rb

@@ -5,7 +5,6 @@ class PostVersion < ApplicationRecord
   belongs_to :parent, class_name: 'Post', optional: true
 
   validates :url, presence: true
-  validates :video_ms, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
   validate :validate_original_created_range
 

backend/app/models/tag.rb

@@ -17,16 +17,6 @@ class Tag < ApplicationRecord
     end
   end
 
-  class SectionLiteralParseError < ArgumentError
-    attr_reader :tag_name, :literal
-
-    def initialize tag_name, literal
-      @tag_name = tag_name
-      @literal = literal
-      super("invalid section literal for tag #{ tag_name }: #{ literal }")
-    end
-  end
-
   has_many :post_tags, inverse_of: :tag
   has_many :active_post_tags, -> { kept }, class_name: 'PostTag', inverse_of: :tag
   has_many :post_tags_with_discarded, -> { with_discarded }, class_name: 'PostTag'
@@ -115,60 +105,26 @@ class Tag < ApplicationRecord
   def self.normalise_tags! tag_names, with_tagme: true,
                                       with_no_deerjikist: true,
                                       deny_nico: true,
-                                      deny_deprecated: false,
-                                      with_sections: false
+                                      deny_deprecated: false
     if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
       raise NicoTagNormalisationError
     end
 
-    sections = { }
     tags = tag_names.map do |name|
-      raw_name = name
       pf, cat = CATEGORY_PREFIXES.find { |p, _| name.downcase.start_with?(p) } || ['', nil]
-
-      name = name.sub(/\A#{ pf }/i, '')
-
-      sections_by_tag = []
-      while (match = name.match(/\A(\S*?)\[([^\[\]\s]*)-([^\[\]\s]*)\](\S*)\z/))
-        name = "#{ match[1] }#{ match[4] }"
-        next if match[2].empty? && match[3].empty?
-
-        sections_by_tag << normalise_section_range!(
-            begin_raw: match[2],
-            end_raw: match[3],
-            tag_name: name)
-      end
-
-      if name.include?('[') || name.include?(']')
-        raise SectionLiteralParseError.new(raw_name, raw_name)
-      end
-
-      name = TagName.canonicalise(name).first
-
+      name = TagName.canonicalise(name.sub(/\A#{ pf }/i, '')).first
       find_or_create_by_tag_name!(name, category: (cat || :general)).tap do |tag|
         if deny_deprecated && tag.deprecated?
           raise DeprecatedTagNormalisationError, [tag.name]
         end
 
         tag.update!(category: cat) if cat && tag.category != cat
-        next if sections_by_tag.empty?
-
-        sections[tag.id] ||= []
-        sections[tag.id].concat(sections_by_tag)
-        sections[tag.id] = merge_section_ranges(sections[tag.id])
-        sections.delete(tag.id) if sections[tag.id] == [[0, nil]]
       end
     end
 
     tags << Tag.tagme if with_tagme && tags.size < 10 && tags.none?(Tag.tagme)
     tags << Tag.no_deerjikist if with_no_deerjikist && tags.all? { |t| !(t.deerjikist?) }
-    tags.uniq!(&:id)
-
-    if with_sections
-      { tags:, sections: }
-    else
-      tags
-    end
+    tags.uniq(&:id)
   end
 
   def self.expand_parent_tags tags
@@ -194,45 +150,6 @@ class Tag < ApplicationRecord
     (result + tags).uniq { |t| t.id }
   end
 
-  def self.normalise_section_range! begin_raw:, end_raw:, tag_name:
-    begin_ms = begin_raw.empty? ? 0 : time_to_ms!(begin_raw, tag_name:)
-    end_ms = end_raw.empty? ? nil : time_to_ms!(end_raw, tag_name:)
-
-    if end_ms
-      begin_ms, end_ms = end_ms, begin_ms if begin_ms > end_ms
-      end_ms = begin_ms + 1 if begin_ms == end_ms
-    end
-
-    [begin_ms, end_ms]
-  end
-
-  def self.merge_section_ranges ranges
-    sorted_ranges = ranges.sort_by { |begin_ms, end_ms| [begin_ms, end_ms || Float::INFINITY] }
-    merged = []
-
-    sorted_ranges.each do |begin_ms, end_ms|
-      if merged.empty?
-        merged << [begin_ms, end_ms]
-        next
-      end
-
-      last_begin_ms, last_end_ms = merged[-1]
-      if last_end_ms.nil? || begin_ms <= last_end_ms
-        merged[-1] = [last_begin_ms, merge_section_end(last_end_ms, end_ms)]
-      else
-        merged << [begin_ms, end_ms]
-      end
-    end
-
-    merged
-  end
-
-  def self.merge_section_end left_end_ms, right_end_ms
-    return nil if left_end_ms.nil? || right_end_ms.nil?
-
-    [left_end_ms, right_end_ms].max
-  end
-
   def self.find_or_create_by_tag_name! name, category:
     tn = TagName.find_undiscard_or_create_by!(name: name.to_s.strip)
     tn = tn.canonical if tn.canonical_id?
@@ -329,32 +246,6 @@ class Tag < ApplicationRecord
     end
   end
 
-  def self.time_to_ms! str, tag_name:
-    match =
-        case str
-        when /\A(?<seconds>\d+)(?:\.(?<ms>\d{1,3}))?\z/
-          { hours: nil, minutes: nil, seconds: Regexp.last_match[:seconds],
-            ms: Regexp.last_match[:ms] }
-        when /\A(?<minutes>\d+):(?<seconds>[0-5]?\d)(?:\.(?<ms>\d{1,3}))?\z/
-          { hours: nil, minutes: Regexp.last_match[:minutes],
-            seconds: Regexp.last_match[:seconds],
-            ms: Regexp.last_match[:ms] }
-        when /\A(?<hours>\d+):(?<minutes>[0-5]?\d):(?<seconds>[0-5]?\d)(?:\.(?<ms>\d{1,3}))?\z/
-          { hours: Regexp.last_match[:hours],
-            minutes: Regexp.last_match[:minutes],
-            seconds: Regexp.last_match[:seconds],
-            ms: Regexp.last_match[:ms] }
-        end
-
-    raise SectionLiteralParseError.new(tag_name, str) unless match
-
-    total_s = match[:seconds].to_i
-    total_s += match[:minutes].to_i * 60 if match[:minutes]
-    total_s += match[:hours].to_i * 3_600 if match[:hours]
-
-    total_s * 1_000 + match[:ms].to_s.ljust(3, '0')[0, 3].to_i
-  end
-
   def nico_tags_cannot_be_deprecated
     if nico? && deprecated_at.present?
       errors.add :deprecated_at, 'ニコタグは廃止できません．'

backend/app/models/tag_implication.rb

@@ -6,7 +6,6 @@ class TagImplication < ApplicationRecord
   validates :parent_tag_id, presence: true
 
   validate :parent_tag_mustnt_be_itself
-  validate :parent_tag_mustnt_create_cycle
 
   private
 
@@ -15,27 +14,4 @@ class TagImplication < ApplicationRecord
       errors.add :parent_tag_id, '親タグは子タグと同一であってはなりません．'
     end
   end
-
-  def parent_tag_mustnt_create_cycle
-    return if tag_id.blank? || parent_tag_id.blank?
-    return if errors[:parent_tag_id].present?
-
-    seen = { }
-    stack = [parent_tag_id]
-
-    until stack.empty?
-      current_id = stack.pop
-      next if seen[current_id]
-
-      seen[current_id] = true
-
-      if current_id == tag_id
-        errors.add :parent_tag_id, '親タグに子孫タグを指定すると循環します．'
-        errors.add :base, 'タグの親子関係が循環します．'
-        return
-      end
-
-      stack.concat(TagImplication.where(tag_id: current_id).pluck(:parent_tag_id))
-    end
-  end
 end

backend/app/representations/post_repr.rb

@@ -8,7 +8,6 @@ module PostRepr
       :url,
       :title,
       :thumbnail_base,
-      :video_ms,
       :original_created_from,
       :original_created_before,
       :created_at,
@@ -19,7 +18,7 @@ module PostRepr
 
   def base post, current_user = nil
     json = common(post)
-    json['tags'] = tag_json(post)
+    json['tags'] = tag_json(post.tags)
     json['uploaded_user'] = post.uploaded_user && UserRepr.base(post.uploaded_user)
     json['viewed'] = current_user ? current_user.viewed?(post) : false
     json
@@ -53,16 +52,8 @@ module PostRepr
                .merge('thumbnail' => thumbnail_url(post))
   end
 
-  def tag_json post
-    post
-        .active_post_tags
-        .reject { _1.tag.deprecated? }
-        .sort_by { _1.tag.name }
-        .map { |post_tag|
-      TagRepr.inline(post_tag.tag).merge(
-          'children' => [],
-          'sections' => post_tag.sections.as_json(only: [:begin_ms, :end_ms]))
-    }
+  def tag_json tags
+    tags.reject(&:deprecated?).map { |tag| TagRepr.inline(tag) }
   end
 
   def thumbnail_url post

backend/app/services/google_drive/api_client.rb

@@ -26,19 +26,13 @@ module GoogleDrive
 
     def list_material_files_under_folder folder_id
       files = []
-      each_material_file_under_folder(folder_id) { |entry| files << entry }
-      files
-    end
-
-    def each_material_file_under_folder folder_id
-      return enum_for(__method__, folder_id) unless block_given?
-
       walk_folder(folder_id, nil) do |entry, relative_path|
         next if entry['mimeType'] == FOLDER_MIME_TYPE
         next if native_file?(entry['mimeType'])
 
-        yield build_file_entry(entry, relative_path)
+        files << build_file_entry(entry, relative_path)
       end
+      files
     end
 
     def fetch_material_file file_id
@@ -50,10 +44,9 @@ module GoogleDrive
 
     def download_to_tempfile file_id, filename:
       tempfile = Tempfile.new(['material-sync', File.extname(filename.to_s)])
-      tempfile.binmode
       request_binary("/files/#{ file_id }",
                      { alt: 'media', supportsAllDrives: true }) do |chunk|
-        tempfile.write(chunk.b)
+        tempfile.write(chunk)
       end
       tempfile.rewind
       tempfile
@@ -146,7 +139,7 @@ module GoogleDrive
         end
 
         response.read_body do |chunk|
-          yield chunk.b
+          yield chunk
         end
       end
     end

backend/app/services/material_sync_runner.rb

@@ -21,14 +21,10 @@ class MaterialSyncRunner
     result = Result.new(imported: 0, updated: 0, unchanged: 0,
                         suppressed: 0, failed: 0, errors: [])
 
-    if @source.source_kind == 'google_drive_path'
-      sync_google_drive_path!(result)
-    else
-      candidates.each do |candidate|
-        next if candidate.blank?
+    candidates.each do |candidate|
+      next if candidate.blank?
 
-        sync_candidate!(candidate, result)
-      end
+      sync_candidate!(candidate, result)
     end
 
     @source.update!(last_synced_at: Time.current)
@@ -47,6 +43,8 @@ class MaterialSyncRunner
     case @source.source_kind
     when 'uri'
       [uri_candidate]
+    when 'google_drive_path'
+      google_drive_path_candidates
     when 'google_drive_file'
       [google_drive_file_candidate]
     when 'legacy_drive_path'
@@ -106,25 +104,12 @@ class MaterialSyncRunner
   def google_drive_path_candidates
     folder_id = google_drive_folder_id
     Enumerator.new do |entries|
-      drive_client.each_material_file_under_folder(folder_id).each do |entry|
+      drive_client.list_material_files_under_folder(folder_id).each do |entry|
         entries << build_google_drive_candidate(entry)
       end
     end
   end
 
-  def sync_google_drive_path! result
-    folder_id = google_drive_folder_id
-    scanned_count = 0
-
-    drive_client.each_material_file_under_folder(folder_id) do |entry|
-      scanned_count += 1
-      sync_candidate!(build_google_drive_candidate(entry), result)
-      log_google_drive_progress(folder_id, scanned_count, result) if progress_log_scan_count?(scanned_count)
-    end
-
-    log_google_drive_progress(folder_id, scanned_count, result, summary: true)
-  end
-
   def google_drive_file_candidate
     entry = drive_client.fetch_material_file(google_drive_file_id)
     return nil unless entry
@@ -228,22 +213,6 @@ class MaterialSyncRunner
                                         failed: result.failed))
   end
 
-  def progress_log_scan_count? scanned_count
-    scanned_count == 1 || (scanned_count % 50).zero?
-  end
-
-  def log_google_drive_progress folder_id, scanned_count, result, summary: false
-    Rails.logger.info(
-        material_sync_log(folder_id:,
-                          scanned_count:,
-                          imported: result.imported,
-                          updated: result.updated,
-                          unchanged: result.unchanged,
-                          suppressed: result.suppressed,
-                          failed: result.failed,
-                          progress: summary ? 'summary' : 'scan'))
-  end
-
   def material_sync_log fields
     { material_sync_source_id: @source.id,
       material_sync_source_name: @source.name }.merge(fields).to_json

backend/app/services/post_version_recorder.rb

@@ -23,7 +23,6 @@ class PostVersionRecorder < VersionRecorder
     { title: @record.title,
       url: @record.url,
       thumbnail_base: @record.thumbnail_base,
-      video_ms: @record.video_ms,
       tags: @record.snapshot_tag_names.join(' '),
       parent_post_ids: @record.snapshot_parent_post_ids.join(' '),
       original_created_from: @record.original_created_from,

backend/db/migrate/20260519013100_add_video_ms_to_posts.rb

@@ -1,9 +0,0 @@
-class AddVideoMsToPosts < ActiveRecord::Migration[8.0]
-  def change
-    add_column :posts, :video_ms, :integer
-    add_index :posts, [:video_ms, :id], name: 'idx_posts_video_ms_id'
-
-    add_check_constraint :posts, 'video_ms IS NULL OR video_ms > 0',
-                         name: 'chk_posts_video_ms_positive'
-  end
-end

backend/db/migrate/20260622010000_create_post_tag_sections.rb

@@ -1,19 +0,0 @@
-class CreatePostTagSections < ActiveRecord::Migration[8.0]
-  def change
-    create_table :post_tag_sections, primary_key: [:post_id, :tag_id, :begin_ms] do |t|
-      t.references :post, null: false, foreign_key: true, index: false
-      t.references :tag, null: false, foreign_key: true, index: false
-      t.integer :begin_ms, null: false
-      t.integer :end_ms, null: true
-      t.timestamps
-
-      t.index [:post_id, :begin_ms], name: 'idx_post_tag_sections_post_id_begin_ms'
-
-      t.check_constraint 'begin_ms >= 0',
-                         name: 'chk_post_tag_sections_begin_ms_natural'
-
-      t.check_constraint 'end_ms IS NULL OR begin_ms < end_ms',
-                         name: 'chk_post_tag_sections_end_ms_after_begin_ms'
-    end
-  end
-end

backend/db/migrate/20260622020000_add_video_ms_to_post_versions.rb

@@ -1,9 +0,0 @@
-class AddVideoMsToPostVersions < ActiveRecord::Migration[8.0]
-  def change
-    add_column :post_versions, :video_ms, :integer
-    add_index :post_versions, [:video_ms, :post_id], name: 'idx_post_versions_video_ms_post_id'
-
-    add_check_constraint :post_versions, 'video_ms IS NULL OR video_ms > 0',
-                         name: 'chk_post_versions_video_ms_positive'
-  end
-end

backend/db/schema.rb

@@ -298,19 +298,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
     t.index ["target_post_id"], name: "index_post_similarities_on_target_post_id"
   end
 
-  create_table "post_tag_sections", primary_key: ["post_id", "tag_id", "begin_ms"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.bigint "post_id", null: false
-    t.bigint "tag_id", null: false
-    t.integer "begin_ms", null: false
-    t.integer "end_ms"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["post_id", "begin_ms"], name: "idx_post_tag_sections_post_id_begin_ms"
-    t.index ["tag_id"], name: "fk_rails_8be3847903"
-    t.check_constraint "(`end_ms` is null) or (`begin_ms` < `end_ms`)", name: "chk_post_tag_sections_end_ms_after_begin_ms"
-    t.check_constraint "`begin_ms` >= 0", name: "chk_post_tag_sections_begin_ms_natural"
-  end
-
   create_table "post_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "post_id", null: false
     t.bigint "tag_id", null: false
@@ -344,12 +331,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
     t.datetime "original_created_before"
     t.datetime "created_at", null: false
     t.bigint "created_by_user_id"
-    t.integer "video_ms"
     t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
     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 ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id"
-    t.check_constraint "(`video_ms` is null) or (`video_ms` > 0)", name: "chk_post_versions_video_ms_positive"
     t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
     t.check_constraint "`version_no` > 0", name: "post_versions_version_no_positive"
   end
@@ -364,11 +348,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
     t.datetime "original_created_before"
     t.datetime "updated_at", null: false
     t.integer "version_no", null: false
-    t.integer "video_ms"
     t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
     t.index ["url"], name: "index_posts_on_url", unique: true
-    t.index ["video_ms", "id"], name: "idx_posts_video_ms_id"
-    t.check_constraint "(`video_ms` is null) or (`video_ms` > 0)", name: "chk_posts_video_ms_positive"
     t.check_constraint "`version_no` > 0", name: "chk_posts_version_no_positive"
   end
 
@@ -697,8 +678,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
   add_foreign_key "post_implications", "posts", column: "parent_post_id"
   add_foreign_key "post_similarities", "posts"
   add_foreign_key "post_similarities", "posts", column: "target_post_id"
-  add_foreign_key "post_tag_sections", "posts"
-  add_foreign_key "post_tag_sections", "tags"
   add_foreign_key "post_tags", "posts"
   add_foreign_key "post_tags", "tags"
   add_foreign_key "post_tags", "users", column: "created_user_id"

backend/spec/factories/post_tag_sections.rb

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :post_tag_section do
-    association :post
-    association :tag
-    begin_ms { 1_000 }
-    end_ms { 2_000 }
-  end
-end

backend/spec/factories/post_tags.rb

@@ -1,6 +0,0 @@
-FactoryBot.define do
-  factory :post_tag do
-    association :post
-    association :tag
-  end
-end

backend/spec/factories/posts.rb

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :post do
-    sequence(:url) { |n| "https://example.com/factory-post-#{ n }" }
-    title { 'factory post' }
-    thumbnail_base { nil }
-    uploaded_user { nil }
-  end
-end

backend/spec/models/post_tag_spec.rb

@@ -1,41 +0,0 @@
-RSpec.describe PostTag, type: :model do
-  describe '#sections' do
-    it 'loads sections by post_id and tag_id' do
-      post_tag = create(:post_tag)
-      section = create(:post_tag_section,
-                       post: post_tag.post,
-                       tag: post_tag.tag,
-                       begin_ms: 1000,
-                       end_ms: 2000)
-
-      expect(post_tag.sections).to contain_exactly(section)
-    end
-
-    it 'does not load sections for another tag on the same post' do
-      post = create(:post)
-      tag = create(:tag)
-      other_tag = create(:tag)
-
-      post_tag = create(:post_tag, post:, tag:)
-      create(:post_tag_section,
-             post:,
-             tag: other_tag,
-             begin_ms: 1000,
-             end_ms: 2000)
-
-      expect(post_tag.sections).to be_empty
-    end
-
-    it 'allows open-ended sections' do
-      post_tag = create(:post_tag)
-      section = create(:post_tag_section,
-                       post: post_tag.post,
-                       tag: post_tag.tag,
-                       begin_ms: 1000,
-                       end_ms: nil)
-
-      expect(section).to be_valid
-      expect(post_tag.sections).to contain_exactly(section)
-    end
-  end
-end

backend/spec/models/tag_implication_spec.rb

@@ -1,36 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe TagImplication, type: :model do
-  it 'rejects a parent tag that would create a cycle' do
-    child = create(:tag, name: 'tag_implication_cycle_child')
-    parent = create(:tag, name: 'tag_implication_cycle_parent')
-
-    described_class.create!(tag: child, parent_tag: parent)
-
-    implication = described_class.new(tag: parent, parent_tag: child)
-
-    expect(implication).not_to be_valid
-    expect(implication.errors[:parent_tag_id]).to include(
-      '親タグに子孫タグを指定すると循環します．'
-    )
-    expect(implication.errors[:base]).to be_present
-  end
-
-  it 'terminates even when existing data already contains a cycle' do
-    child = create(:tag, name: 'tag_implication_existing_cycle_child')
-    parent = create(:tag, name: 'tag_implication_existing_cycle_parent')
-    ancestor = create(:tag, name: 'tag_implication_existing_cycle_ancestor')
-
-    described_class.create!(tag: parent, parent_tag: ancestor)
-    described_class.insert_all!(
-      [
-        { tag_id: ancestor.id, parent_tag_id: parent.id,
-          created_at: Time.current, updated_at: Time.current }
-      ]
-    )
-
-    implication = described_class.new(tag: child, parent_tag: parent)
-
-    expect(implication).to be_valid
-  end
-end

backend/spec/models/tag_spec.rb

@@ -19,95 +19,6 @@ RSpec.describe Tag, type: :model do
         expect(error.tag_names).to eq([deprecated_tag.name])
       }
     end
-
-    it 'rejects invalid section literals instead of treating them as zero' do
-      expect {
-        described_class.normalise_tags!(
-          ['normalise_invalid_section[1:aa-2:00]'],
-          with_sections: true
-        )
-      }.to raise_error(Tag::SectionLiteralParseError)
-    end
-
-    it 'parses open-ended section literals' do
-      result = described_class.normalise_tags!(
-        ['伊地知ニジカ[1:00-]'],
-        with_sections: true
-      )
-
-      tag = result.fetch(:tags).find { _1.name == '伊地知ニジカ' }
-      expect(result.fetch(:sections).fetch(tag.id)).to eq([[60_000, nil]])
-    end
-
-    it 'parses omitted begin as zero' do
-      result = described_class.normalise_tags!(
-        ['伊地知ニジカ[-1:00]'],
-        with_sections: true
-      )
-
-      tag = result.fetch(:tags).find { _1.name == '伊地知ニジカ' }
-      expect(result.fetch(:sections).fetch(tag.id)).to eq([[0, 60_000]])
-    end
-
-    it 'treats fully open section literals as plain tags' do
-      result = described_class.normalise_tags!(
-        ['伊地知ニジカ[-]'],
-        with_sections: true
-      )
-
-      tag = result.fetch(:tags).find { _1.name == '伊地知ニジカ' }
-      expect(result.fetch(:sections)[tag.id]).to be_nil
-    end
-
-    it 'treats [0:00-] as a plain tag' do
-      result = described_class.normalise_tags!(
-        ['伊地知ニジカ[0:00-]'],
-        with_sections: true
-      )
-
-      tag = result.fetch(:tags).find { _1.name == '伊地知ニジカ' }
-      expect(result.fetch(:sections)[tag.id]).to be_nil
-    end
-
-    it 'expands zero-width sections to one millisecond' do
-      result = described_class.normalise_tags!(
-        ['伊地知ニジカ[1:00-1:00]'],
-        with_sections: true
-      )
-
-      tag = result.fetch(:tags).find { _1.name == '伊地知ニジカ' }
-      expect(result.fetch(:sections).fetch(tag.id)).to eq([[60_000, 60_001]])
-    end
-
-    it 'swaps reversed section boundaries' do
-      result = described_class.normalise_tags!(
-        ['伊地知ニジカ[2:00-1:00]'],
-        with_sections: true
-      )
-
-      tag = result.fetch(:tags).find { _1.name == '伊地知ニジカ' }
-      expect(result.fetch(:sections).fetch(tag.id)).to eq([[60_000, 120_000]])
-    end
-
-    it 'merges open-ended sections over later bounded sections' do
-      result = described_class.normalise_tags!(
-        ['伊地知ニジカ[1:00-][2:00-3:00]'],
-        with_sections: true
-      )
-
-      tag = result.fetch(:tags).find { _1.name == '伊地知ニジカ' }
-      expect(result.fetch(:sections).fetch(tag.id)).to eq([[60_000, nil]])
-    end
-
-    it 'merges adjacent bounded and open-ended sections' do
-      result = described_class.normalise_tags!(
-        ['伊地知ニジカ[1:00-3:00][3:00-]'],
-        with_sections: true
-      )
-
-      tag = result.fetch(:tags).find { _1.name == '伊地知ニジカ' }
-      expect(result.fetch(:sections).fetch(tag.id)).to eq([[60_000, nil]])
-    end
   end
 
   describe '.expand_parent_tags' do
@@ -143,17 +54,7 @@ RSpec.describe Tag, type: :model do
       first = create(:tag, name: 'expand_cycle_first')
       second = create(:tag, name: 'expand_cycle_second')
       TagImplication.create!(tag: first, parent_tag: second)
-      now = Time.current
-      TagImplication.insert_all!(
-        [
-          {
-            tag_id: second.id,
-            parent_tag_id: first.id,
-            created_at: now,
-            updated_at: now
-          }
-        ]
-      )
+      TagImplication.create!(tag: second, parent_tag: first)
 
       expect(described_class.expand_parent_tags([first])).to contain_exactly(first, second)
     end

backend/spec/requests/posts_spec.rb

@@ -1,5 +1,4 @@
 require 'rails_helper'
-require 'base64'
 require 'set'
 
 include ActiveSupport::Testing::TimeHelpers
@@ -9,11 +8,6 @@ RSpec.describe 'Posts API', type: :request do
   # resized_thumbnail! が MiniMagick 依存でコケやすいので request spec ではスタブしとくのが無難。
   before do
     allow_any_instance_of(Post).to receive(:resized_thumbnail!).and_return(true)
-    allow(Post).to receive(:resized_thumbnail_attachment).and_return(
-      io: StringIO.new('dummy'),
-      filename: 'resized_thumbnail.jpg',
-      content_type: 'image/jpeg'
-    )
   end
 
   def create_nico_tag!(name)
@@ -25,18 +19,6 @@ RSpec.describe 'Posts API', type: :request do
     Rack::Test::UploadedFile.new(StringIO.new('dummy'), 'image/jpeg', original_filename: 'dummy.jpg')
   end
 
-  def real_thumbnail_upload
-    gif =
-        Base64.decode64(
-            'R0lGODdhAQABAIABAP///wAAACwAAAAAAQABAAACAkQBADs=')
-
-    Rack::Test::UploadedFile.new(
-      StringIO.new(gif),
-      'image/gif',
-      original_filename: 'thumbnail.gif'
-    )
-  end
-
   def post_write_params params = { }
     { parent_post_ids: '' }.merge(params)
   end
@@ -54,7 +36,6 @@ RSpec.describe 'Posts API', type: :request do
             title: post.title,
             url: post.url,
             thumbnail_base: post.thumbnail_base,
-            video_ms: post.video_ms,
             tags: post.snapshot_tag_names.join(' '),
             parent_post_ids: post.snapshot_parent_post_ids.join(' '),
             original_created_from: post.original_created_from,
@@ -146,22 +127,6 @@ RSpec.describe 'Posts API', type: :request do
       expect(all_tag_names).to include("spec_tag")
     end
 
-    it 'keeps children and sections keys in non-detail tag responses' do
-      PostTagSection.create!(post: hit_post, tag:, begin_ms: 1_000, end_ms: nil)
-
-      get '/posts'
-
-      expect(response).to have_http_status(:ok)
-
-      hit_json = json.fetch('posts').find { |post| post['id'] == hit_post.id }
-      tag_json = hit_json.fetch('tags').find { |item| item['name'] == 'spec_tag' }
-
-      expect(tag_json.fetch('children')).to eq([])
-      expect(tag_json.fetch('sections')).to eq([
-        { 'begin_ms' => 1_000, 'end_ms' => nil }
-      ])
-    end
-
     context "when q is provided" do
       it "filters posts by q (hit case)" do
         get "/posts", params: { tags: "spec_tag" }
@@ -731,66 +696,6 @@ RSpec.describe 'Posts API', type: :request do
       expect(json['tags'][0]).to have_key('name')
     end
 
-    it '201 when posting manually with a thumbnail' do
-      sign_in_as(member)
-      allow(Post).to receive(:resized_thumbnail_attachment).and_call_original
-
-      post '/posts', params: post_write_params(
-        title: 'thumbnail post',
-        url: 'https://example.com/thumbnail-post',
-        tags: 'spec_tag',
-        thumbnail: real_thumbnail_upload
-      )
-
-      expect(response).to have_http_status(:created)
-      post_record = Post.find(json.fetch('id'))
-      expect(post_record.thumbnail).to be_attached
-      expect(post_record.thumbnail.blob.content_type).to eq('image/jpeg')
-      expect { post_record.thumbnail.download }.not_to raise_error
-    end
-
-    it 'resizes the thumbnail before the create transaction begins' do
-      sign_in_as(member)
-
-      open_transactions = []
-      baseline_open_transactions = Post.connection.open_transactions
-      allow(Post).to receive(:resized_thumbnail_attachment) do |_upload|
-        open_transactions << Post.connection.open_transactions
-        { io: StringIO.new('dummy'),
-          filename: 'resized_thumbnail.jpg',
-          content_type: 'image/jpeg' }
-      end
-
-      post '/posts', params: post_write_params(
-        title: 'transaction post',
-        url: 'https://example.com/transaction-post',
-        tags: 'spec_tag',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-      expect(open_transactions).to eq([baseline_open_transactions])
-    end
-
-    it 'returns 422 and does not create a post when thumbnail resize fails' do
-      sign_in_as(member)
-      allow(Post).to receive(:resized_thumbnail_attachment).and_raise(MiniMagick::Error)
-
-      expect {
-        post '/posts', params: post_write_params(
-          title: 'broken thumbnail post',
-          url: 'https://example.com/broken-thumbnail-post',
-          tags: 'spec_tag',
-          thumbnail: dummy_upload
-        )
-      }.not_to change(Post, :count)
-
-      expect(response).to have_http_status(:unprocessable_entity)
-      expect(json.fetch('errors')).to include(
-        'thumbnail' => ['サムネイル画像の変換に失敗しました．']
-      )
-    end
-
     it '201 and creates post + tags when member and tags have aliases' do
       sign_in_as(member)
 
@@ -862,198 +767,6 @@ RSpec.describe 'Posts API', type: :request do
       expect(saved_names).not_to include('deprecated_parent', 'deprecated_grandparent')
     end
 
-    it 'returns validation error for an invalid section literal' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'invalid section literal',
-        url: 'https://example.com/invalid-section-literal',
-        tags: 'spec_tag[1:aa-2:00]',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:unprocessable_entity)
-      expect(json).to include(
-        'type' => 'validation_error',
-        'message' => '入力内容を確認してください．'
-      )
-      expect(json.fetch('errors')).to include(
-        'tags' => ['タグ区間の記法が不正です．']
-      )
-    end
-
-    it 'creates a video post with duration' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'video post',
-        url: 'https://example.com/video-post',
-        tags: '動画 spec_tag',
-        duration: '3:00.500',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-      expect(Post.find(json.fetch('id')).video_ms).to eq(180_500)
-      expect(json.fetch('video_ms')).to eq(180_500)
-    end
-
-    it 'creates a video post with number input duration seconds' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'video post seconds',
-        url: 'https://example.com/video-post-seconds',
-        tags: '動画 spec_tag',
-        duration: '180.5',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-      expect(Post.find(json.fetch('id')).video_ms).to eq(180_500)
-      expect(json.fetch('video_ms')).to eq(180_500)
-    end
-
-    it 'clears video_ms when the saved tags do not include 動画' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'non video post',
-        url: 'https://example.com/non-video-post',
-        tags: 'spec_tag',
-        duration: '3:00',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-      expect(Post.find(json.fetch('id')).video_ms).to be_nil
-    end
-
-    it 'returns validation error when a bounded section exceeds duration' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'too long section',
-        url: 'https://example.com/too-long-section',
-        tags: '動画 伊地知ニジカ[2:50-3:10]',
-        duration: '3:00',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:unprocessable_entity)
-      expect(json.fetch('errors')).to include(
-        'video_ms' => ['タグ区間の終端が動画時間を超えてゐます．']
-      )
-    end
-
-    it 'saves open-ended sections with end_ms NULL' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'open ended section literal',
-        url: 'https://example.com/open-ended-section-literal',
-        tags: '動画 伊地知ニジカ[1:00-]',
-        duration: '3:00',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-
-      created_post = Post.find(json.fetch('id'))
-      tag = Tag.joins(:tag_name).find_by!(tag_names: { name: '伊地知ニジカ' })
-      section = PostTagSection.find_by!(post: created_post, tag:)
-
-      expect(section.begin_ms).to eq(60_000)
-      expect(section.end_ms).to be_nil
-    end
-
-    it 'does not save sections for [-]' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'fully open section literal',
-        url: 'https://example.com/fully-open-section-literal',
-        tags: '伊地知ニジカ[-]',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-
-      created_post = Post.find(json.fetch('id'))
-      tag = Tag.joins(:tag_name).find_by!(tag_names: { name: '伊地知ニジカ' })
-      expect(PostTagSection.find_by(post: created_post, tag:)).to be_nil
-    end
-
-    it 'does not save sections for [0:00-]' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'zero open ended section literal',
-        url: 'https://example.com/zero-open-ended-section-literal',
-        tags: '伊地知ニジカ[0:00-]',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-
-      created_post = Post.find(json.fetch('id'))
-      tag = Tag.joins(:tag_name).find_by!(tag_names: { name: '伊地知ニジカ' })
-      expect(PostTagSection.find_by(post: created_post, tag:)).to be_nil
-    end
-
-    it 'returns end_ms null for open-ended sections in show response' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'show open ended section literal',
-        url: 'https://example.com/show-open-ended-section-literal',
-        tags: '動画 伊地知ニジカ[1:00-]',
-        duration: '3:00',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-
-      get "/posts/#{ json.fetch('id') }"
-
-      expect(response).to have_http_status(:ok)
-      tag_json = json.fetch('tags').find { |item| item['name'] == '伊地知ニジカ' }
-      expect(tag_json.fetch('sections')).to eq([
-        { 'begin_ms' => 60_000, 'end_ms' => nil }
-      ])
-    end
-
-    it 'allows open-ended sections when begin is within duration' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'valid open ended section literal',
-        url: 'https://example.com/valid-open-ended-section-literal',
-        tags: '動画 伊地知ニジカ[1:00-]',
-        duration: '3:00',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:created)
-    end
-
-    it 'rejects open-ended sections when begin equals duration' do
-      sign_in_as(member)
-
-      post '/posts', params: post_write_params(
-        title: 'invalid open ended section literal',
-        url: 'https://example.com/invalid-open-ended-section-literal',
-        tags: '動画 伊地知ニジカ[3:00-]',
-        duration: '3:00',
-        thumbnail: dummy_upload
-      )
-
-      expect(response).to have_http_status(:unprocessable_entity)
-      expect(json.fetch('errors')).to include(
-        'video_ms' => ['タグ区間の開始が動画時間以上です．']
-      )
-    end
-
     context "when nico tag already exists in tags" do
       before do
         Tag.find_undiscard_or_create_by!(

backend/spec/requests/tag_children_spec.rb

@@ -56,17 +56,6 @@ RSpec.describe "TagChildren", type: :request do
 
         expect(response).to have_http_status(:no_content)
       end
-
-      it 'returns 422 and does not create relation when the new link makes a cycle' do
-        TagImplication.create!(tag: parent, parent_tag: child)
-
-        expect {
-          do_request
-        }.not_to change(TagImplication, :count)
-
-        expect(response).to have_http_status(:unprocessable_entity)
-        expect(TagImplication.where(tag: child, parent_tag: parent)).not_to exist
-      end
     end
 
     context "when Tag.find raises (invalid ids)" do

backend/spec/requests/tags_spec.rb

@@ -581,58 +581,6 @@ RSpec.describe 'Tags API', type: :request do
         expect(response).to have_http_status(:ok)
         expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_version_count)
       end
-
-      it 'full update で旧名 alias が残った tag を PATCH で旧名へ戻せる' do
-        put "/tags/#{ tag.id }", params: {
-          name: 'patch_roundtrip_target',
-          category: 'general',
-          aliases: 'unko',
-          parent_tags: '',
-          deprecated: '0',
-        }
-
-        expect(response).to have_http_status(:ok)
-        expect(TagName.find_by!(name: 'spec_tag').canonical).to eq(tag.reload.tag_name)
-
-        patch "/tags/#{ tag.id }", params: { name: 'spec_tag' }
-
-        expect(response).to have_http_status(:ok)
-
-        tag.reload
-
-        expect(tag.name).to eq('spec_tag')
-        expect(tag.tag_name.canonical_id).to be_nil
-        expect(TagName.find_by!(name: 'patch_roundtrip_target').canonical).to eq(tag.tag_name)
-      end
-
-      it '別 tag の正規名には変更できない' do
-        wiki_page =
-            Wiki::Commit.create_content!(
-                tag_name: tag.tag_name,
-                body: 'patch collision wiki',
-                created_by_user: member_user,
-                message: 'init')
-
-        patch "/tags/#{ tag.id }", params: { name: 'unknown' }
-
-        expect(response).to have_http_status(:unprocessable_entity)
-        expect(json.fetch('errors')).to include(
-          'name' => ['その名前は既に使はれてゐます．']
-        )
-
-        expect(tag.reload.name).to eq('spec_tag')
-        expect(tag.tag_name.aliases.map(&:name)).to contain_exactly('unko')
-        expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
-      end
-
-      it 'system tag の name は変更できない' do
-        system_tag = Tag.bot
-
-        patch "/tags/#{ system_tag.id }", params: { name: 'patch_system_tag_renamed' }
-
-        expect(response).to have_http_status(:unprocessable_entity)
-        expect(system_tag.reload.name).to eq('bot操作')
-      end
     end
   end
 
@@ -797,17 +745,7 @@ RSpec.describe 'Tags API', type: :request do
       )
       TagImplication.create!(tag: first, parent_tag: root_material)
       TagImplication.create!(tag: second, parent_tag: first)
-      now = Time.current
-      TagImplication.insert_all!(
-        [
-          {
-            tag_id: first.id,
-            parent_tag_id: second.id,
-            created_at: now,
-            updated_at: now
-          }
-        ]
-      )
+      TagImplication.create!(tag: first, parent_tag: second)
 
       get '/tags/with-depth', params: { parent: root_material.id }
 
@@ -1091,42 +1029,6 @@ RSpec.describe 'Tags API', type: :request do
         expect(versions.second.created_by_user_id).to eq(member_user.id)
       end
 
-      it '同じ tag の旧 alias へ戻しても rename できる' do
-        put "/tags/#{ tag.id }", params: {
-          name: 'put_roundtrip_b',
-          category: 'general',
-          aliases: 'unko',
-          parent_tags: '',
-          deprecated: '0',
-        }
-
-        expect(response).to have_http_status(:ok)
-
-        put "/tags/#{ tag.id }", params: {
-          name: 'spec_tag',
-          category: 'general',
-          aliases: 'unko',
-          parent_tags: '',
-          deprecated: '0',
-        }
-
-        expect(response).to have_http_status(:ok)
-
-        tag.reload
-
-        expect(tag.name).to eq('spec_tag')
-        expect(TagName.find_by!(name: 'put_roundtrip_b').canonical).to eq(tag.tag_name)
-        expect(tag.tag_name.aliases.map(&:name)).to contain_exactly('put_roundtrip_b', 'unko')
-        expect(tag.tag_name.aliases.map(&:name)).not_to include('spec_tag')
-        expect(alias_tn.reload.canonical).to eq(tag.tag_name)
-
-        version = tag.tag_versions.order(:version_no).last
-
-        expect(version.event_type).to eq('update')
-        expect(version.name).to eq('spec_tag')
-        expect(version.aliases.split).to contain_exactly('put_roundtrip_b', 'unko')
-      end
-
       it 'parent tag の snapshot も作成する' do
         old_parent = Tag.create!(
           tag_name: TagName.create!(name: 'put_snapshot_old_parent'),
@@ -1251,48 +1153,6 @@ RSpec.describe 'Tags API', type: :request do
         )
       end
 
-      it 'wiki を持つ tag を旧 alias へ戻しても wiki を新 canonical へ移す' do
-        wiki_page =
-            Wiki::Commit.create_content!(
-                tag_name: tag.tag_name,
-                body: 'wiki body before',
-                created_by_user: member_user,
-                message: 'init')
-
-        expect {
-          put "/tags/#{ tag.id }", params: {
-            name: 'put_wiki_roundtrip_b',
-            category: 'general',
-            aliases: 'unko',
-            parent_tags: '',
-            deprecated: '0',
-          }
-
-          put "/tags/#{ tag.id }", params: {
-            name: 'spec_tag',
-            category: 'general',
-            aliases: 'unko',
-            parent_tags: '',
-            deprecated: '0',
-          }
-        }
-            .to change(TagVersion, :count).by(3)
-            .and change(WikiVersion, :count).by(2)
-
-        expect(response).to have_http_status(:ok)
-
-        tag.reload
-
-        expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
-        expect(TagName.find_by!(name: 'put_wiki_roundtrip_b').wiki_page).to be_nil
-        expect(TagName.find_by!(name: 'put_wiki_roundtrip_b').canonical).to eq(tag.tag_name)
-
-        versions = wiki_page.wiki_versions.order(:version_no).last(2)
-
-        expect(versions.map(&:event_type)).to eq(['update', 'update'])
-        expect(versions.map(&:title)).to eq(['put_wiki_roundtrip_b', 'spec_tag'])
-      end
-
       it '別名を他 tag から奪った場合、奪はれた側の tag version も作成する' do
         old_owner = Tag.create!(
           tag_name: TagName.create!(name: 'put_alias_old_owner'),
@@ -1331,49 +1191,9 @@ RSpec.describe 'Tags API', type: :request do
         expect(old_owner_versions.second.aliases.split).not_to include('put_stolen_alias')
       end
 
-      it '別 tag の alias 名を rename で奪へる' do
-        old_owner = Tag.create!(
-          tag_name: TagName.create!(name: 'put_alias_collision_owner'),
-          category: :general
-        )
-        stolen_alias = TagName.create!(
-          name: 'put_alias_collision_name',
-          canonical: old_owner.tag_name
-        )
-        wiki_page =
-            Wiki::Commit.create_content!(
-                tag_name: tag.tag_name,
-                body: 'put collision wiki',
-                created_by_user: member_user,
-                message: 'init')
-
-        put "/tags/#{ tag.id }", params: {
-          name: 'put_alias_collision_name',
-          category: 'general',
-          aliases: 'unko',
-          parent_tags: '',
-          deprecated: '0',
-        }
-
-        expect(response).to have_http_status(:ok)
-
-        tag.reload
-        old_owner.reload
-        stolen_alias.reload
-
-        expect(tag.name).to eq('put_alias_collision_name')
-        expect(stolen_alias.canonical_id).to be_nil
-        expect(TagName.find_by!(name: 'spec_tag').canonical).to eq(tag.tag_name)
-        expect(old_owner.tag_name.aliases.map(&:name)).not_to include('put_alias_collision_name')
-
-        old_owner_versions = old_owner.tag_versions.order(:version_no)
-
-        expect(old_owner_versions.last.event_type).to eq('update')
-        expect(old_owner_versions.last.aliases.split).not_to include('put_alias_collision_name')
-        expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
-      end
-
       it 'parent_tags に指定すると循環する tag は 422 にする' do
+        pending '#332 で対応予定'
+
         child = Tag.create!(
           tag_name: TagName.create!(name: 'put_cycle_child'),
           category: :general

backend/spec/services/material_sync_runner_spec.rb

@@ -1,89 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe MaterialSyncRunner do
-  let(:user) { create(:user, :member) }
-  let(:source) do
-    MaterialSyncSource.create!(
-        name: 'Drive source',
-        source_kind: 'google_drive_path',
-        source_file_id: 'folder-123',
-        profile: 'legacy_drive',
-        created_by_user: user,
-        updated_by_user: user)
-  end
-  let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
-
-  describe '#sync!' do
-    it 'imports google drive path candidates as they are yielded' do
-      first_entry = { id: 'file-1',
-                      name: 'a.png',
-                      mime_type: 'image/png',
-                      relative_path: '素材/a.png',
-                      sha256_checksum: 'sha-a',
-                      web_view_link: 'https://drive.google.com/file/d/file-1/view',
-                      web_content_link: nil }
-      second_entry = { id: 'file-2',
-                       name: 'b.png',
-                       mime_type: 'image/png',
-                       relative_path: '素材/b.png',
-                       sha256_checksum: 'sha-b',
-                       web_view_link: 'https://drive.google.com/file/d/file-2/view',
-                       web_content_link: nil }
-      yielded = []
-
-      allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
-      allow(drive_client).to receive(:each_material_file_under_folder) do |folder_id, &block|
-        expect(folder_id).to eq('folder-123')
-        block.call(first_entry)
-        expect(yielded).to eq(['素材/a.png'])
-        block.call(second_entry)
-      end
-      allow(MaterialSyncImporter).to receive(:import!) do |candidate|
-        yielded << candidate.fetch(:source_path)
-        instance_double(MaterialSyncImporter::Result,
-                        action: yielded.last == '素材/a.png' ? :imported : :updated)
-      end
-
-      result = described_class.new(source).sync!
-
-      expect(yielded).to eq(['素材/a.png', '素材/b.png'])
-      expect(result.imported).to eq(1)
-      expect(result.updated).to eq(1)
-      expect(result.unchanged).to eq(0)
-      expect(source.reload.last_synced_at).to be_present
-    end
-
-    it 'logs google drive path progress at first item and summary' do
-      entry = { id: 'file-1',
-                name: 'a.png',
-                mime_type: 'image/png',
-                relative_path: '素材/a.png',
-                sha256_checksum: 'sha-a',
-                web_view_link: 'https://drive.google.com/file/d/file-1/view',
-                web_content_link: nil }
-      logged = []
-
-      allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
-      allow(drive_client).to receive(:each_material_file_under_folder) do |_folder_id, &block|
-        block.call(entry)
-      end
-      allow(MaterialSyncImporter).to receive(:import!)
-        .and_return(instance_double(MaterialSyncImporter::Result, action: :imported))
-      allow(Rails.logger).to receive(:info) { |message| logged << JSON.parse(message) }
-
-      described_class.new(source).sync!
-
-      progress_logs = logged.select { |row| row['folder_id'] == 'folder-123' }
-      expect(progress_logs.map { |row| row['progress'] }).to eq(['scan', 'summary'])
-      expect(progress_logs.last).to include(
-          'material_sync_source_id' => source.id,
-          'material_sync_source_name' => 'Drive source',
-          'scanned_count' => 1,
-          'imported' => 1,
-          'updated' => 0,
-          'unchanged' => 0,
-          'suppressed' => 0,
-          'failed' => 0)
-    end
-  end
-end

frontend/src/App.tsx

@@ -6,7 +6,6 @@ import { BrowserRouter,
 	 Routes,
 	 useLocation } from 'react-router-dom'
 
-import DevModeWatermark from '@/components/DevModeWatermark'
 import RouteBlockerOverlay from '@/components/RouteBlockerOverlay'
 import TopNav from '@/components/TopNav'
 import DialogueProvider from '@/components/dialogues/DialogueProvider'
@@ -76,6 +75,7 @@ const RouteTransitionWrapper = ({ user, setUser }: {
 	    <Route path="suppressions" element={<MaterialSyncSuppressionsPage/>}/>
 	    <Route path=":id" element ={<MaterialDetailPage/>}/>
 	  </Route>
+	  {/* <Route path="/materials/search" element={<MaterialSearchPage/>}/> */}
 	  <Route path="/wiki" element={<WikiSearchPage/>}/>
 	  <Route path="/wiki/:title" element={<WikiDetailPage/>}/>
 	  <Route path="/wiki/new" element={<WikiNewPage user={user}/>}/>
@@ -146,7 +146,6 @@ const App: FC = () => {
   return (
       <>
 	<RouteBlockerOverlay/>
-	{import.meta.env.DEV && <DevModeWatermark/>}
 
 	<BrowserRouter>
 	  <DialogueProvider>
@@ -154,7 +153,7 @@ const App: FC = () => {
 	      <motion.div
 		  layout="position"
 		  transition={{ layout: { duration: .2, ease: 'easeOut' } }}
-		  className="relative flex flex-col h-dvh w-full overflow-y-hidden">
+		  className="flex flex-col h-dvh w-full overflow-y-hidden">
 		<TopNav user={user}/>
 		<RouteTransitionWrapper user={user} setUser={setUser}/>
 	      </motion.div>

frontend/src/components/DevModeWatermark.tsx

@@ -1,46 +0,0 @@
-import nikumaru from '@/assets/fonts/nikumaru.otf'
-
-import type { FC } from 'react'
-
-
-const ROW_COUNT = 8
-const COLUMN_COUNT = 12
-
-
-const DevModeWatermark: FC = () => {
-  return (
-      <div
-	  aria-hidden="true"
-	  className="pointer-events-none select-none fixed inset-0 overflow-hidden z-0">
-	<style>{`
-	  @font-face {
-	    font-family: 'Nikumaru';
-	    src: url(${nikumaru}) format('opentype');
-	  }
-	`}</style>
-	<div className="absolute -inset-32 flex flex-col justify-center gap-12 py-48">
-	  {Array.from ({ length: ROW_COUNT }, (_, rowIndex) => (
-	      <div
-		  key={rowIndex}
-		  className={
-		      'flex min-h-32 items-center gap-12 '
-		      + (rowIndex % 2 === 0 ? 'translate-x-0' : 'translate-x-32')
-		  }>
-		{Array.from ({ length: COLUMN_COUNT }, (_, columnIndex) => (
-		    <span
-			key={columnIndex}
-			className={
-			    'whitespace-nowrap text-3xl font-bold '
-			    + 'tracking-[0.3em] text-neutral-950/5 '
-			    + 'dark:text-white/10'
-			}
-			style={{ fontFamily: 'Nikumaru' }}>
-		      開発モード
-		    </span>))}
-	      </div>))}
-	</div>
-      </div>)
-}
-
-
-export default DevModeWatermark

frontend/src/components/DraggableDroppableTagRow.tsx

@@ -87,13 +87,10 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
 	    setDropRef (node)
 	  }}
 	  style={style}
-	  className={cn (
-	      'min-w-0 max-w-full overflow-hidden rounded select-none',
-	      over && 'ring-2 ring-offset-2')}
+	  className={cn ('rounded select-none', over && 'ring-2 ring-offset-2')}
 	  {...attributes}
 	  {...listeners}>
 	<motion.div
-	    className="flex min-w-0 max-w-full items-baseline overflow-hidden"
 	    transition={{ layout: { duration: .2, ease: 'easeOut' } }}
 	    layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
 	  <TagLink tag={tag} nestLevel={nestLevel}/>
@@ -101,4 +98,4 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
       </div>)
 }
 
-export default DraggableDroppableTagRow
+export default DraggableDroppableTagRow

frontend/src/components/MaterialSidebar.tsx

@@ -1,43 +1,29 @@
+import { Fragment, useEffect, useRef, useState } from 'react'
 import { useQuery } from '@tanstack/react-query'
-import { useEffect, useRef, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 
-import SidebarComponent from '@/components/layout/SidebarComponent'
+import PrefetchLink from '@/components/PrefetchLink'
 import TagLink from '@/components/TagLink'
-import { fetchMaterialTagTree, parseMaterialFilter } from '@/lib/materials'
+import SidebarComponent from '@/components/layout/SidebarComponent'
 import { materialsKeys } from '@/lib/queryKeys'
-import { cn } from '@/lib/utils'
+import { fetchMaterialTagTree, parseMaterialFilter } from '@/lib/materials'
 
-import type { CSSProperties, Dispatch, FC, ReactNode, SetStateAction } from 'react'
+import type { Dispatch, FC, ReactNode, SetStateAction } from 'react'
 
 import type { MaterialFilter, MaterialSidebarTag, Tag } from '@/types'
 
-const FILTERS: MaterialFilter[] = ['missing', 'present', 'any']
-const FILTER_LABELS: Record<MaterialFilter, string> = { present: '有', missing: '無', any: '全' }
+const FILTERS: MaterialFilter[] = ['present', 'missing', 'any']
 
-
-const px = (value: string): number => {
-  const parsed = Number.parseFloat (value)
-  return Number.isFinite (parsed) ? parsed : 0
-}
-
-
-const verticalChrome = (el: HTMLElement): number => {
-  const style = window.getComputedStyle (el)
-
-  return (
-      px (style.paddingTop)
-      + px (style.paddingBottom)
-      + px (style.borderTopWidth)
-      + px (style.borderBottomWidth))
-}
+const FILTER_LABELS: Record<MaterialFilter, string> = {
+    present: '素材あり',
+    missing: '素材なし',
+    any:     'すべて'}
 
 
 const setChildrenById = (
     tags:     MaterialSidebarTag[],
     targetId: number,
-    children: MaterialSidebarTag[],
-): MaterialSidebarTag[] => (
+    children: MaterialSidebarTag[]): MaterialSidebarTag[] => (
     tags.map (tag => {
       if (tag.id === targetId)
 	return { ...tag, children }
@@ -51,12 +37,24 @@ const setChildrenById = (
 
 const materialPath = (
     tagId: number,
-    materialFilter: MaterialFilter,
-): string =>
+    materialFilter: MaterialFilter): string =>
     `/materials?tag_id=${ tagId }&include_descendants=1&group_by=parent_tag`
     + `&material_filter=${ materialFilter }`
 
 
+const clearTagSelectionPath = (
+    locationSearch: string,
+    materialFilter: MaterialFilter): string => {
+    const qs = new URLSearchParams (locationSearch)
+    qs.delete ('tag_id')
+    qs.delete ('include_descendants')
+    qs.delete ('group_by')
+    qs.delete ('page')
+    qs.set ('material_filter', materialFilter)
+    return `/materials?${ qs.toString () }`
+}
+
+
 const sidebarTagToTag = (tag: MaterialSidebarTag): Tag => ({
     id:             tag.id,
     name:           tag.name,
@@ -74,42 +72,39 @@ const sidebarTagToTag = (tag: MaterialSidebarTag): Tag => ({
 
 
 const tagSelectionShellClass = (selected: boolean): string =>
-    cn (selected
-	? ['rounded-md border border-sky-500 bg-sky-50 px-2 py-1 text-sky-700',
-	   'dark:border-sky-400 dark:bg-sky-950 dark:text-sky-100']
-	: 'px-2 py-1')
+    selected
+    ? 'rounded-md border border-sky-500 bg-sky-50 px-2 py-1 text-sky-700 '
+      + 'dark:border-sky-400 dark:bg-sky-950 dark:text-sky-100'
+    : 'px-2 py-1'
 
 
 const updateMaterialFilterQuery = (
     pathname: string,
     locationSearch: string,
     navigate: ReturnType<typeof useNavigate>,
-    materialFilter: MaterialFilter,
-) => {
-  const qs = new URLSearchParams (locationSearch)
-  qs.set ('material_filter', materialFilter)
-  navigate (`${ pathname }${ qs.toString () ? `?${ qs.toString () }` : '' }`)
+    materialFilter: MaterialFilter) => {
+    const qs = new URLSearchParams (locationSearch)
+    qs.set ('material_filter', materialFilter)
+    navigate (`${ pathname }${ qs.toString () ? `?${ qs.toString () }` : '' }`)
 }
 
 
-const MaterialFilterButtons: FC<{ materialFilter: MaterialFilter
-				  onChange:       (materialFilter: MaterialFilter) => void }> = (
-    { materialFilter, onChange },
-) => (
-    <div className="flex flex-wrap gap-2 justify-end md:justify-start flex-center">
-      <label className="my-auto text-sm font-bold">素材：</label>
+const MaterialFilterButtons: FC<{
+    materialFilter: MaterialFilter
+    onChange:       (materialFilter: MaterialFilter) => void
+}> = ({ materialFilter, onChange }) => (
+    <div className="flex flex-wrap gap-2">
       {FILTERS.map (value => (
-	  <button
+      <button
 	      key={value}
 	      type="button"
 	      onClick={() => onChange (value)}
-	      className={cn (
-		  'rounded-full border px-3 py-1 text-sm',
-		  (materialFilter === value
-		   ? ['border-sky-500 bg-sky-50 text-sky-700 dark:border-sky-400',
-		      'dark:bg-sky-950 dark:text-sky-100']
-		   : ['border-neutral-300 bg-white text-neutral-700 dark:border-stone-700',
-		      'dark:bg-stone-900 dark:text-stone-200']))}>
+	      className={`rounded-full border px-3 py-1 text-sm ${
+		  materialFilter === value
+		  ? 'border-sky-500 bg-sky-50 text-sky-700 dark:border-sky-400 '
+		    + 'dark:bg-sky-950 dark:text-sky-100'
+		  : 'border-neutral-300 bg-white text-neutral-700 dark:border-stone-700 '
+		    + 'dark:bg-stone-900 dark:text-stone-200' }`}>
 	    {FILTER_LABELS[value]}
 	  </button>))}
     </div>)
@@ -137,10 +132,10 @@ const MaterialTreeNode: FC<{
   }, [data, onChildren, open, tag.children.length, tag.id])
 
   return (
-      <>
+      <Fragment>
 	<li>
-	  <div className="flex flex-center">
-	    <div className="flex-none w-4 my-auto">
+	  <div className="flex">
+	    <div className="flex-none w-4">
 	      {tag.hasChildren && (
 		  <button
 		      type="button"
@@ -149,9 +144,8 @@ const MaterialTreeNode: FC<{
 		    {open ? <>&minus;</> : '+'}
 		  </button>)}
 	    </div>
-	    <div className="min-w-0 flex-1 my-auto">
-	      <div className={cn (tagSelectionShellClass (selectedTagId === tag.id),
-				  'min-w-0 truncate')}>
+	    <div className="flex-1 truncate">
+	      <div className={tagSelectionShellClass (selectedTagId === tag.id)}>
 		<TagLink
 		    tag={sidebarTagToTag (tag)}
 		    nestLevel={nestLevel}
@@ -166,7 +160,7 @@ const MaterialTreeNode: FC<{
 	{open && tag.children.length > 0 && (
 	    <ul>
 	      {tag.children.map (child => (
-		  <MaterialTreeNode
+		      <MaterialTreeNode
 		      key={child.id}
 		      tag={child}
 		      nestLevel={nestLevel + 1}
@@ -176,39 +170,21 @@ const MaterialTreeNode: FC<{
 		      setOpenTags={setOpenTags}
 		      onChildren={onChildren}/>))}
 	    </ul>)}
-      </>)
+      </Fragment>)
 }
 
 
-const MobileMaterialTreeNode: FC<{ depth?: number
-				   availableInlineSizePx?: number | null
-				   materialFilter: MaterialFilter
-				   selectedTagId: number | null
-				   onChildren: (tagId: number, children: MaterialSidebarTag[]) =>
-						   void
-				   openTags: Record<number, boolean>
-				   setOpenTags: Dispatch<SetStateAction<Record<number, boolean>>>
-				   tag: MaterialSidebarTag }> = (
-    {
-      depth = 0,
-      availableInlineSizePx = null,
-      materialFilter,
-      onChildren,
-      openTags,
-      selectedTagId,
-      setOpenTags,
-      tag,
-    },
-) => {
+const MobileMaterialTreeNode: FC<{
+    depth?:          number
+    materialFilter: MaterialFilter
+    selectedTagId:  number | null
+    onChildren:     (tagId: number, children: MaterialSidebarTag[]) => void
+    openTags:       Record<number, boolean>
+    setOpenTags:    Dispatch<SetStateAction<Record<number, boolean>>>
+    tag:            MaterialSidebarTag
+}> = ({ depth = 0, materialFilter, onChildren, openTags, selectedTagId,
+	 setOpenTags, tag }) => {
   const open = Boolean (openTags[tag.id])
-  const tagColumnRef = useRef<HTMLDivElement | null> (null)
-  const chipRef = useRef<HTMLDivElement | null> (null)
-  const buttonRef = useRef<HTMLButtonElement | null> (null)
-  const expansionSlotRef = useRef<HTMLDivElement | null> (null)
-  const expansionBorderRef = useRef<HTMLDivElement | null> (null)
-  const [tagChipInlineSizePx, setTagChipInlineSizePx] = useState<number | null> (null)
-  const [tagLinkInlineSizePx, setTagLinkInlineSizePx] = useState<number | null> (null)
-  const [childAvailableInlineSizePx, setChildAvailableInlineSizePx] = useState<number | null> (null)
   const { data } = useQuery ({
       queryKey: materialsKeys.tree ({ parentId: tag.id, materialFilter }),
       queryFn:  () => fetchMaterialTagTree ({ parentId: tag.id, materialFilter }),
@@ -219,163 +195,50 @@ const MobileMaterialTreeNode: FC<{ depth?: number
       onChildren (tag.id, data)
   }, [data, onChildren, open, tag.children.length, tag.id])
 
-  useEffect (() => {
-    const tagColumn = tagColumnRef.current
-    const chip = chipRef.current
-    if (!(tagColumn) || !(chip))
-      return
-
-    const updateTagInlineSize = () => {
-      const buttonHeight = buttonRef.current?.offsetHeight ?? 0
-      const gap = tag.hasChildren ? px (window.getComputedStyle (tagColumn).rowGap) : 0
-      const columnHeight =
-	  availableInlineSizePx == null
-	  ? tagColumn.clientHeight
-	  : Math.min (tagColumn.clientHeight, availableInlineSizePx)
-      const nextChipInlineSize = Math.max (24, columnHeight - buttonHeight - gap)
-      const nextLinkInlineSize = Math.max (
-	  16,
-	  nextChipInlineSize - verticalChrome (chip),
-      )
-
-      setTagChipInlineSizePx (prev => prev === nextChipInlineSize ? prev : nextChipInlineSize)
-      setTagLinkInlineSizePx (prev => prev === nextLinkInlineSize ? prev : nextLinkInlineSize)
-    }
-
-    updateTagInlineSize ()
-
-    const resizeObserver = new ResizeObserver (() => {
-      updateTagInlineSize ()
-    })
-
-    resizeObserver.observe (tagColumn)
-    resizeObserver.observe (chip)
-
-    if (buttonRef.current)
-      resizeObserver.observe (buttonRef.current)
-
-    return () => {
-      resizeObserver.disconnect ()
-    }
-  }, [availableInlineSizePx, open, tag.hasChildren, tag.children.length])
-
-  useEffect (() => {
-    const expansionSlot = expansionSlotRef.current
-    const expansionBorder = expansionBorderRef.current
-    if (!(expansionSlot) || !(expansionBorder))
-      return
-
-    const updateChildInlineSize = () => {
-      const base =
-	  availableInlineSizePx == null
-	  ? expansionSlot.clientHeight
-	  : availableInlineSizePx
-      const chrome = verticalChrome (expansionSlot) + verticalChrome (expansionBorder)
-      const nextInlineSize = Math.max (24, base - chrome)
-      setChildAvailableInlineSizePx (prev => prev === nextInlineSize ? prev : nextInlineSize)
-    }
-
-    updateChildInlineSize ()
-
-    const resizeObserver = new ResizeObserver (() => {
-      updateChildInlineSize ()
-    })
-
-    resizeObserver.observe (expansionSlot)
-    resizeObserver.observe (expansionBorder)
-
-    return () => {
-      resizeObserver.disconnect ()
-    }
-  }, [availableInlineSizePx, open, tag.children.length])
-
   return (
-      <div className="flex h-full min-h-0 max-h-full flex-row-reverse items-start gap-2
-		      overflow-hidden">
-	<div
-	    ref={tagColumnRef}
-	    className="flex h-full min-h-0 max-h-full flex-col items-center gap-1
-		       overflow-hidden">
+      <div className="flex flex-row-reverse items-start gap-2">
+      <div className="flex flex-col items-center gap-1">
 	  <div
-	      ref={chipRef}
-	      className={cn (
-		  tagSelectionShellClass (selectedTagId === tag.id),
-		  'box-border rounded-xl border px-3 py-2 text-sm shadow-sm',
-		  'min-h-0 overflow-hidden [max-inline-size:var(--tag-chip-inline-size)]',
-		  '[max-height:var(--tag-chip-inline-size)]',
-	      )}
-	      style={{
-		writingMode: 'vertical-rl',
-		'--tag-chip-inline-size': (
-		    tagChipInlineSizePx == null
-		    ? undefined
-		    : `${ tagChipInlineSizePx }px`),
-		'--tag-link-inline-size': (
-		    tagLinkInlineSizePx == null
-		    ? undefined
-		    : `${ tagLinkInlineSizePx }px`),
-	      } as CSSProperties}>
+	      className={`${ tagSelectionShellClass (selectedTagId === tag.id) } rounded-xl
+			 border px-3 py-2 text-sm shadow-sm`}
+	      style={{ writingMode: 'vertical-rl' }}>
 	    <TagLink
 		tag={sidebarTagToTag (tag)}
 		title={tag.name}
-		truncateOnMobile
 		withCount={false}
 		withWiki={false}
-		to={materialPath (tag.id, materialFilter)}
-		className="block overflow-hidden text-ellipsis whitespace-nowrap
-			   [max-inline-size:var(--tag-link-inline-size)]
-			   [max-height:var(--tag-link-inline-size)]
-			   [&_.tag-marquee]:block
-			   [&_.tag-marquee]:h-full
-			   [&_.tag-marquee]:overflow-hidden
-			   [&_.tag-marquee__static]:h-full
-			   [&_.tag-marquee__static]:overflow-hidden
-			   [&_.tag-marquee__static]:text-ellipsis
-			   [&_.tag-marquee__static]:[text-overflow:ellipsis]"/>
+		to={materialPath (tag.id, materialFilter)}/>
 	  </div>
 	  {tag.hasChildren && (
 	      <button
-		  ref={buttonRef}
 		  type="button"
 		  onClick={() => setOpenTags (prev => ({ ...prev, [tag.id]: !prev[tag.id] }))}
-		  className="flex-none rounded-full border border-stone-300 bg-white
-			     px-2 py-0.5 text-sm text-stone-700 dark:border-stone-700
+		  className="rounded-full border border-stone-300 bg-white px-2 py-0.5
+			     text-sm text-stone-700 dark:border-stone-700
 			     dark:bg-stone-900 dark:text-stone-100">
 		{open ? <>&minus;</> : '+'}
 	      </button>)}
 	</div>
 	{open && tag.children.length > 0 && (
 	    <div
-		ref={expansionSlotRef}
-		className={cn (
-		    'h-full min-h-0 max-h-full overflow-hidden box-border',
-		    depth === 0 ? 'pt-5' : 'pt-3')}>
-	      <div
-		  ref={expansionBorderRef}
-		  className="relative max-h-full overflow-hidden rounded-2xl border border-stone-200
-			     bg-stone-100/70 py-2 pl-2 pr-2 text-stone-900
-			     dark:border-stone-700 dark:bg-stone-900/70 dark:text-stone-100">
-		<div className="flex h-full min-h-0 max-h-full flex-row-reverse items-start gap-2
-				overflow-hidden">
-		  <span
-		      aria-hidden="true"
-		      className="absolute -right-3 top-4 h-px w-3 bg-stone-300 dark:bg-stone-600"/>
-		  {tag.children.map (child => (
-		      <div
-			  key={child.id}
-			  className="relative h-full min-h-0 max-h-full overflow-hidden">
-			<MobileMaterialTreeNode
-			    tag={child}
-			    depth={depth + 1}
-			    availableInlineSizePx={childAvailableInlineSizePx}
-			    materialFilter={materialFilter}
-			    selectedTagId={selectedTagId}
-			    openTags={openTags}
-			    setOpenTags={setOpenTags}
-			    onChildren={onChildren}/>
-		      </div>))}
-		</div>
-	      </div>
+		className="relative flex flex-row-reverse items-start gap-2 rounded-2xl border
+			   border-stone-200 bg-stone-100/70 py-2 pl-2 pr-2 text-stone-900
+			   dark:border-stone-700 dark:bg-stone-900/70 dark:text-stone-100"
+		style={{ marginTop: `${ depth === 0 ? 1.25 : .75 }rem` }}>
+	      <span
+		  aria-hidden="true"
+		  className="absolute -right-3 top-4 h-px w-3 bg-stone-300 dark:bg-stone-600"/>
+	      {tag.children.map (child => (
+		  <div key={child.id} className="relative">
+	    <MobileMaterialTreeNode
+		      tag={child}
+		      depth={depth + 1}
+		      materialFilter={materialFilter}
+		      selectedTagId={selectedTagId}
+		      openTags={openTags}
+		      setOpenTags={setOpenTags}
+		      onChildren={onChildren}/>
+		  </div>))}
 	    </div>)}
       </div>)
 }
@@ -385,14 +248,12 @@ const MaterialSidebar: FC = () => {
   const location = useLocation ()
   const navigate = useNavigate ()
   const qs = new URLSearchParams (location.search)
-  const materialFilter = parseMaterialFilter (qs.get ('material_filter'), 'any')
+  const materialFilter = parseMaterialFilter (qs.get ('material_filter'), 'present')
   const selectedTagId = Number (qs.get ('tag_id') ?? 0) || null
 
   const [desktopTags, setDesktopTags] = useState<MaterialSidebarTag[]> ([])
   const [openTags, setOpenTags] = useState<Record<number, boolean>> ({ })
   const mobileRailRef = useRef<HTMLDivElement | null> (null)
-  const [mobileAvailableInlineSizePx, setMobileAvailableInlineSizePx] =
-      useState<number | null> (null)
 
   const { data: rootTags = [], isLoading, isError } = useQuery ({
       queryKey: materialsKeys.tree ({ parentId: null, materialFilter }),
@@ -412,29 +273,6 @@ const MaterialSidebar: FC = () => {
     })
   }, [rootTags, materialFilter])
 
-  useEffect (() => {
-    const el = mobileRailRef.current
-    if (!(el))
-      return
-
-    const updateAvailableInlineSize = () => {
-      const nextInlineSize = Math.max (24, el.clientHeight)
-      setMobileAvailableInlineSizePx (prev => prev === nextInlineSize ? prev : nextInlineSize)
-    }
-
-    updateAvailableInlineSize ()
-
-    const resizeObserver = new ResizeObserver (() => {
-      updateAvailableInlineSize ()
-    })
-
-    resizeObserver.observe (el)
-
-    return () => {
-      resizeObserver.disconnect ()
-    }
-  }, [rootTags, materialFilter])
-
   const visibleRootTags = desktopTags.length > 0 ? desktopTags : rootTags
 
   const setChildren = (tagId: number, children: MaterialSidebarTag[]) => {
@@ -450,6 +288,8 @@ const MaterialSidebar: FC = () => {
     updateMaterialFilterQuery (location.pathname, location.search, navigate, value)
   }
 
+  const clearTagSelection = clearTagSelectionPath (location.search, materialFilter)
+
   const renderDesktopTree = (tags: MaterialSidebarTag[]): ReactNode => (
       tags.map (tag => (
 	  <MaterialTreeNode
@@ -464,21 +304,24 @@ const MaterialSidebar: FC = () => {
   return (
       <>
 	<div className="border-b bg-stone-50 p-3 dark:border-stone-700 dark:bg-stone-950
-			dark:text-stone-100 md:hidden flex h-[25dvh] min-h-0 flex-col
-			overflow-hidden">
+			dark:text-stone-100 md:hidden">
+	  <div className="mb-3">
+	    <PrefetchLink
+		to={clearTagSelection}
+		className="text-sm text-sky-700 underline underline-offset-2
+			   dark:text-sky-300">
+	      {selectedTagId != null ? '選択解除' : '全素材'}
+	    </PrefetchLink>
+	  </div>
 	  <MaterialFilterButtons
 	      materialFilter={materialFilter}
 	      onChange={handleFilterChange}/>
-	  <div
-	      ref={mobileRailRef}
-	      className="mt-3 min-h-0 flex-1 overflow-x-auto overflow-y-hidden">
-	    <div className="flex min-w-max flex-row-reverse items-start gap-3 pb-1 h-full
-			    min-h-0 max-h-full">
+	  <div ref={mobileRailRef} className="mt-3 overflow-x-auto">
+	    <div className="flex min-w-max flex-row-reverse gap-3 pb-1">
 	      {visibleRootTags.map (tag => (
 		  <MobileMaterialTreeNode
 		      key={tag.id}
 		      tag={tag}
-		      availableInlineSizePx={mobileAvailableInlineSizePx}
 		      materialFilter={materialFilter}
 		      selectedTagId={selectedTagId}
 		      openTags={openTags}
@@ -488,23 +331,31 @@ const MaterialSidebar: FC = () => {
 	  </div>
 	</div>
 
-	<SidebarComponent sidebarKey="materials" className="hidden md:block">
-	  <div className="space-y-4">
-	    <MaterialFilterButtons
-		materialFilter={materialFilter}
-		onChange={handleFilterChange}/>
-	    {isLoading && (
-		<p className="text-sm text-neutral-500 dark:text-stone-400">読込中……</p>)}
-	    {isError && (
-		<p className="text-sm text-red-600 dark:text-red-300">
-		  タグ一覧の取得に失敗しました．
-		</p>)}
-	    {(!isLoading && !isError) && (
-		<ul>
-		  {renderDesktopTree (visibleRootTags)}
-		</ul>)}
-	  </div>
-	</SidebarComponent>
+	<div className="hidden md:block">
+	  <SidebarComponent>
+	    <div className="space-y-4">
+	      <PrefetchLink
+		  to={clearTagSelection}
+		  className="text-sm text-sky-700 underline underline-offset-2
+			     dark:text-sky-300">
+		{selectedTagId != null ? '選択解除' : '全素材'}
+	      </PrefetchLink>
+	      <MaterialFilterButtons
+		  materialFilter={materialFilter}
+		  onChange={handleFilterChange}/>
+	      {isLoading && (
+		  <p className="text-sm text-neutral-500 dark:text-stone-400">読込中……</p>)}
+	      {isError && (
+		  <p className="text-sm text-red-600 dark:text-red-300">
+		    タグ一覧の取得に失敗しました．
+		  </p>)}
+	      {(!isLoading && !isError) && (
+		  <ul>
+		    {renderDesktopTree (visibleRootTags)}
+		  </ul>)}
+	    </div>
+	  </SidebarComponent>
+	</div>
       </>)
 }
 

frontend/src/components/PostEditForm.test.tsx

@@ -66,27 +66,4 @@ describe ('PostEditForm', () => {
     expect (onSave).toHaveBeenCalledWith (expect.objectContaining ({ versionNo: 5 }))
     expect (toastApi.toast).toHaveBeenCalledWith ({ description: '更新しました．' })
   })
-
-  it ('preserves duration while the video tag is temporarily removed', () => {
-    const post = buildPost ({
-      videoMs: 180_500,
-      tags:    [
-        buildTag ({ id: 1, name: '動画', category: 'general' }),
-        buildTag ({ id: 2, name: 'general-tag', category: 'general' }),
-      ],
-    })
-
-    render (<PostEditForm post={post} onSave={vi.fn ()}/>)
-
-    expect (screen.getByRole ('spinbutton')).toHaveValue (180.5)
-
-    const tags = screen.getAllByRole ('textbox')[2]
-    fireEvent.change (tags, { target: { value: 'general-tag' } })
-    expect (screen.queryByRole ('spinbutton')).not.toBeInTheDocument ()
-
-    fireEvent.change (tags, {
-      target: { value: '動画 general-tag' },
-    })
-    expect (screen.getByRole ('spinbutton')).toHaveValue (180.5)
-  })
 })

frontend/src/components/PostEditForm.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useState } from 'react'
 
 import PostFormTagsArea from '@/components/PostFormTagsArea'
 import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
@@ -9,35 +9,29 @@ import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { isApiError } from '@/lib/api'
 import { updatePost } from '@/lib/posts'
-import { inputClass, msToTime } from '@/lib/utils'
+import { inputClass } from '@/lib/utils'
 import { useValidationErrors } from '@/lib/useValidationErrors'
 
 import type { FC, FormEvent } from 'react'
 
-import type { Post, TagWithSections } from '@/types'
+import type { Post, Tag } from '@/types'
 
 type PostFormField =
-    'parentPostIds' | 'tags' | 'videoMs' | 'originalCreatedAt'
-
-const videoMsToDurationValue = (videoMs: number | null): string =>
-    videoMs == null ? '' : String (videoMs / 1_000)
+    'parentPostIds' | 'tags' | 'originalCreatedAt'
 
 
-const tagsToStr = (tags: TagWithSections[]): string => {
-  const result: Omit<TagWithSections, 'children'>[] = []
+const tagsToStr = (tags: Tag[]): string => {
+  const result: Tag[] = []
 
-  const walk = (tag: TagWithSections) => {
+  const walk = (tag: Tag) => {
     const { children, ...rest } = tag
     result.push (rest)
-    children.forEach (walk)
+    children?.forEach (walk)
   }
 
   tags.filter (t => t.category !== 'nico').forEach (walk)
 
-  return [...(new Set (result.map (t =>
-      `${ t.name }${ t.sections
-		     .map (s => `[${ msToTime (s.beginMs) }-${ s.endMs == null ? '' : msToTime (s.endMs) }]`)
-		     .join ('') }`)))].join (' ')
+  return [...(new Set (result.map (t => t.name)))].join (' ')
 }
 
 
@@ -47,7 +41,6 @@ type Props = { post:    Post
 
 const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const [disabled, setDisabled] = useState (false)
-  const [duration, setDuration] = useState<string> (videoMsToDurationValue (post.videoMs))
   const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
       useValidationErrors<PostFormField> ()
   const [originalCreatedBefore, setOriginalCreatedBefore] =
@@ -59,10 +52,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const [tags, setTags] = useState<string> ('')
   const [title, setTitle] = useState (post.title)
 
-  const videoFlg =
-      useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
-	       [tags])
-
   const dialogue = useDialogue ()
 
   const update = async (...args: Parameters<typeof updatePost>) => {
@@ -74,7 +63,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
       onSave ({ ...post,
 		versionNo:              data.versionNo,
 		title:                  data.title,
-		videoMs:                data.videoMs,
 		tags:                   data.tags,
 		parentPosts:            data.parentPosts,
 		childPosts:             data.childPosts,
@@ -114,7 +102,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
 	{
 	  // TODO: 差分 UI
 	  await update ({ id: post.id, title, tags, parentPostIds,
-			  duration: videoFlg ? duration : null,
 			  originalCreatedFrom, originalCreatedBefore },
 			{ baseVersionNo: post.versionNo, merge: true })
 	  return
@@ -123,7 +110,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
       if (action === 'overwrite')
 	{
 	  await update ({ id: post.id, title, tags, parentPostIds,
-			  duration: videoFlg ? duration : null,
 			  originalCreatedFrom, originalCreatedBefore },
 			{ baseVersionNo: post.versionNo, force: true })
 	  return
@@ -138,7 +124,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
     try
     {
       await update ({ id: post.id, title, tags, parentPostIds,
-		      duration: videoFlg ? duration : null,
 		      originalCreatedFrom, originalCreatedBefore },
 		    { baseVersionNo: post.versionNo })
     }
@@ -149,8 +134,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   }
 
   useEffect (() => {
-    setTags (tagsToStr (post.tags))
-    setDuration (videoMsToDurationValue (post.videoMs))
+    setTags(tagsToStr (post.tags))
   }, [post])
 
   return (
@@ -165,7 +149,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
 		  disabled={disabled}
 		  className={inputClass (invalid)}
 		  value={title ?? ''}
-		  onChange={e => setTitle (e.target.value)}/>)}
+		  onChange={ev => setTitle (ev.target.value)}/>)}
 	</FormField>
 
 	{/* 親投稿 */}
@@ -197,20 +181,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
 	    setOriginalCreatedBefore={setOriginalCreatedBefore}
 	    errors={fieldErrors.originalCreatedAt}/>
 
-	{/* 動画時間 */}
-	{videoFlg && (
-	    <FormField label="動画時間" messages={fieldErrors.videoMs}>
-	      {({ invalid }) => (
-		  <input
-		      type="number"
-		      min="0.001"
-		      step="0.001"
-		      disabled={disabled}
-		      className={inputClass (invalid)}
-		      value={duration}
-		      onChange={e => setDuration (e.target.value)}/>)}
-	    </FormField>)}
-
 	{/* 送信 */}
 	<Button type="submit" disabled={disabled}>
 	  更新
@@ -218,5 +188,4 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
       </form>)
 }
 
-
 export default PostEditForm

frontend/src/components/ResponsiveMarqueeText.tsx

@@ -1,250 +0,0 @@
-import { cn } from '@/lib/utils'
-import { useEffect, useRef, useState } from 'react'
-
-import type { FC } from 'react'
-
-type Props = {
-    text:      string
-    className?: string
-    truncateOnMobile?: boolean
-    title?:    string }
-
-const DESKTOP_MARQUEE_MEDIA =
-    '(min-width: 768px) and (hover: hover) and (pointer: fine) and (prefers-reduced-motion: no-preference)'
-const MARQUEE_START_DELAY_MS = 1600
-const MARQUEE_END_HOLD_MS = 2400
-const MARQUEE_SCROLL_PX_PER_SECOND = 43
-const MIN_MARQUEE_OVERFLOW_PX = 1
-
-
-const ResponsiveMarqueeText: FC<Props> = (
-    { text, className, truncateOnMobile = false, title },
-) => {
-  const outerRef = useRef<HTMLSpanElement | null> (null)
-  const staticRef = useRef<HTMLSpanElement | null> (null)
-  const animatedRef = useRef<HTMLSpanElement | null> (null)
-  const animationRef = useRef<Animation | null> (null)
-  const timeoutRef = useRef<number | null> (null)
-  const rafRef = useRef<number | null> (null)
-  const [overflowPx, setOverflowPx] = useState (0)
-  const [desktopMarqueeEnabled, setDesktopMarqueeEnabled] = useState (false)
-  const [active, setActive] = useState (false)
-  const [marqueeVisible, setMarqueeVisible] = useState (false)
-
-  useEffect (() => {
-    const outer = outerRef.current
-    const inner = staticRef.current
-
-    if (!(outer) || !(inner))
-      return
-
-    const measure = () => {
-      const nextOverflow = Math.max (0, Math.ceil (inner.scrollWidth - outer.clientWidth))
-      setOverflowPx (prev => Math.abs (prev - nextOverflow) <= 1 ? prev : nextOverflow)
-    }
-
-    measure ()
-
-    const resizeObserver =
-	typeof ResizeObserver === 'undefined'
-	? null
-	: new ResizeObserver (() => {
-	    measure ()
-	  })
-
-    resizeObserver?.observe (outer)
-    resizeObserver?.observe (inner)
-    addEventListener ('resize', measure)
-
-    return () => {
-      resizeObserver?.disconnect ()
-      removeEventListener ('resize', measure)
-    }
-  }, [text])
-
-  useEffect (() => {
-    if (typeof window === 'undefined' || typeof window.matchMedia !== 'function')
-      return
-
-    const media = window.matchMedia (DESKTOP_MARQUEE_MEDIA)
-    const update = () => {
-      setDesktopMarqueeEnabled (media.matches)
-    }
-
-    update ()
-    media.addEventListener ('change', update)
-
-    return () => {
-      media.removeEventListener ('change', update)
-    }
-  }, [])
-
-  useEffect (() => {
-    const clearScheduled = () => {
-      if (timeoutRef.current != null)
-        {
-          clearTimeout (timeoutRef.current)
-          timeoutRef.current = null
-        }
-      if (rafRef.current != null)
-        {
-          cancelAnimationFrame (rafRef.current)
-          rafRef.current = null
-        }
-      animationRef.current?.cancel ()
-      animationRef.current = null
-    }
-
-    const animated = animatedRef.current
-    const canMarquee = (
-        active
-        && desktopMarqueeEnabled
-        && overflowPx >= MIN_MARQUEE_OVERFLOW_PX
-        && animated != null)
-
-    const resetAnimated = () => {
-      const node = animatedRef.current
-
-      animationRef.current?.cancel ()
-      animationRef.current = null
-      node?.getAnimations?.().forEach (animation => {
-        animation.cancel ()
-      })
-
-      if (!(node))
-        return
-
-      node.style.transition = 'none'
-      node.style.transform = 'translateX(0)'
-    }
-
-    if (!canMarquee)
-      {
-        clearScheduled ()
-        resetAnimated ()
-        setMarqueeVisible (false)
-        return
-      }
-
-    let cancelled = false
-
-    const sleep = (ms: number) =>
-	new Promise<void> (resolve => {
-	  timeoutRef.current = window.setTimeout (() => {
-	    timeoutRef.current = null
-	    resolve ()
-	  }, ms)
-	})
-
-    const runLoop = async () => {
-      while (!cancelled)
-        {
-          resetAnimated ()
-          setMarqueeVisible (true)
-
-          await sleep (MARQUEE_START_DELAY_MS)
-          if (cancelled || !(animatedRef.current))
-            break
-
-          const moveDurationMs =
-	      overflowPx / MARQUEE_SCROLL_PX_PER_SECOND * 1000
-          const node = animatedRef.current
-
-          if (typeof node.animate === 'function')
-            {
-              const animation = node.animate (
-		  [
-		    { transform: 'translateX(0)' },
-		    { transform: `translateX(-${ overflowPx }px)` },
-		  ],
-		  { duration: moveDurationMs, easing: 'linear', fill: 'forwards' })
-              animationRef.current = animation
-              try
-              {
-                await animation.finished
-              }
-              catch
-              {
-                break
-              }
-
-              node.style.transform = `translateX(-${ overflowPx }px)`
-              animation.cancel ()
-              if (animationRef.current === animation)
-                animationRef.current = null
-            }
-          else
-            {
-              node.style.transition = `transform ${ moveDurationMs }ms linear`
-              await new Promise<void> (resolve => {
-                rafRef.current = requestAnimationFrame (() => {
-                  rafRef.current = null
-                  node.style.transform = `translateX(-${ overflowPx }px)`
-                  resolve ()
-                })
-              })
-              await sleep (moveDurationMs)
-              node.style.transition = 'none'
-              node.style.transform = `translateX(-${ overflowPx }px)`
-            }
-
-          if (cancelled)
-            break
-
-          await sleep (MARQUEE_END_HOLD_MS)
-          if (cancelled)
-            break
-
-          resetAnimated ()
-        }
-    }
-
-    void runLoop ()
-
-    return () => {
-      cancelled = true
-      clearScheduled ()
-      resetAnimated ()
-      setMarqueeVisible (false)
-    }
-  }, [active, desktopMarqueeEnabled, overflowPx, text])
-
-  return (
-      <span
-	  ref={outerRef}
-	  title={title ?? text}
-	  onMouseEnter={() => setActive (true)}
-	  onMouseLeave={() => setActive (false)}
-	  onFocus={() => setActive (true)}
-	  onBlur={() => setActive (false)}
-	  className={cn (
-	      'tag-marquee inline-block max-w-full min-w-0 align-bottom',
-	      (truncateOnMobile
-	       ? 'overflow-hidden text-ellipsis whitespace-nowrap'
-	       : 'whitespace-normal [overflow-wrap:anywhere]'),
-	      'md:overflow-hidden md:whitespace-nowrap',
-	      className)}>
-	<span
-	    ref={staticRef}
-	    className={cn (
-		'tag-marquee__static block max-w-full',
-		(truncateOnMobile
-		 ? 'overflow-hidden text-ellipsis whitespace-nowrap'
-		 : 'whitespace-normal [overflow-wrap:anywhere]'),
-		'md:overflow-hidden md:text-ellipsis md:whitespace-nowrap',
-		marqueeVisible && 'md:opacity-0')}>
-	  {text}
-	</span>
-	{overflowPx >= MIN_MARQUEE_OVERFLOW_PX && (
-	    <span
-		ref={animatedRef}
-		aria-hidden="true"
-		className={cn (
-		    'tag-marquee__animated hidden md:block',
-		    marqueeVisible ? 'md:opacity-100' : 'md:opacity-0')}>
-	      {text}
-	    </span>)}
-      </span>)
-}
-
-export default ResponsiveMarqueeText

frontend/src/components/TagDetailSidebar.tsx

@@ -26,13 +26,13 @@ import { dateString, originalCreatedAtString } from '@/lib/utils'
 import type { DragEndEvent } from '@dnd-kit/core'
 import type { FC, MutableRefObject, ReactNode } from 'react'
 
-import type { Category, Post, TagWithSections } from '@/types'
+import type { Category, Post, Tag } from '@/types'
 
-type TagByCategory = { [key in Category]: TagWithSections[] }
+type TagByCategory = { [key in Category]: Tag[] }
 
 
 const renderTagTree = (
-    tag:              TagWithSections,
+    tag:              Tag,
     nestLevel:        number,
     path:             string,
     suppressClickRef: MutableRefObject<boolean>,
@@ -62,9 +62,8 @@ const renderTagTree = (
 
 
 const isDescendant = (
-    root:     TagWithSections,
-    targetId: number,
-): boolean => {
+    root:     Tag,
+    targetId: number): boolean => {
   if (!(root.children))
     return false
 
@@ -82,9 +81,8 @@ const isDescendant = (
 
 const findTag = (
     byCat:  TagByCategory,
-    id:     number,
-): TagWithSections | undefined => {
-  const walk = (nodes: TagWithSections[]): TagWithSections | undefined => {
+    id:     number): Tag | undefined => {
+  const walk = (nodes: Tag[]): Tag | undefined => {
     for (const t of nodes)
       {
 	if (t.id === id)
@@ -146,13 +144,10 @@ const DropSlot = ({ cat }: { cat: Category }) => {
 }
 
 
-type Props = {
-    className?: string
-    post:       Post
-    sp?:        boolean }
+type Props = { post: Post; sp?: boolean }
 
 
-const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
+const TagDetailSidebar: FC<Props> = ({ post, sp }) => {
   sp = Boolean (sp)
 
   const qc = useQueryClient ()
@@ -168,7 +163,7 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
       }
 
     for (const cat of Object.keys (tagsTmp) as (keyof typeof tagsTmp)[])
-      tagsTmp[cat].sort ((tagA: TagWithSections, tagB: TagWithSections) => tagA.name < tagB.name ? -1 : 1)
+      tagsTmp[cat].sort ((tagA: Tag, tagB: Tag) => tagA.name < tagB.name ? -1 : 1)
 
     return tagsTmp
   }, [post])
@@ -281,7 +276,7 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
   }, [baseTags])
 
   return (
-      <SidebarComponent sidebarKey="post-detail-tags" className={className}>
+      <SidebarComponent>
 	<TagSearch/>
 	<DndContext
 	    sensors={sensors}
@@ -378,4 +373,4 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
       </SidebarComponent>)
 }
 
-export default TagDetailSidebar
+export default TagDetailSidebar

frontend/src/components/TagLink.tsx

@@ -1,5 +1,4 @@
 import PrefetchLink from '@/components/PrefetchLink'
-import ResponsiveMarqueeText from '@/components/ResponsiveMarqueeText'
 import { LIGHT_COLOUR_SHADE, DARK_COLOUR_SHADE, TAG_COLOUR } from '@/consts'
 import { cn } from '@/lib/utils'
 
@@ -10,7 +9,6 @@ import type { Tag } from '@/types'
 type CommonProps = { 
     tag:        Tag
     nestLevel?: number
-    truncateOnMobile?: boolean
     withWiki?:  boolean
     withCount?: boolean }
 
@@ -30,14 +28,11 @@ type Props =
 
 
 const TagLink: FC<Props> = ({ tag,
-			      nestLevel = 0,
-			      linkFlg   = true,
-			      truncateOnMobile = false,
-			      withWiki  = true,
-			      withCount = true,
-			      className,
-			      title,
-			      ...props }) => {
+		   nestLevel = 0,
+		   linkFlg   = true,
+		   withWiki  = true,
+		   withCount = true,
+		   ...props }) => {
   const spanClass = cn (
       `text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE }`,
       `dark:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE }`)
@@ -45,18 +40,11 @@ const TagLink: FC<Props> = ({ tag,
       spanClass,
       `hover:text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE - 200 }`,
       `dark:hover:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE - 200 }`)
-  const textClass = 'group min-w-0 max-w-full overflow-hidden align-bottom'
-  const rootClass =
-      'inline-flex min-w-0 max-w-full flex-nowrap items-stretch align-baseline gap-x-1 md:items-baseline'
-  const markerWrapClass = 'shrink-0 self-start md:self-auto'
-  const countClass = 'shrink-0 self-end md:self-auto'
-  const textTitle = title
-      ?? (tag.matchedAlias == null ? tag.name : `${ tag.matchedAlias } → ${ tag.name }`)
 
   return (
-      <span className={rootClass}>
+      <>
 	{(linkFlg && withWiki) && (
-	    <span className={markerWrapClass}>
+	    <span className="mr-1">
 	      {(tag.materialId != null || tag.hasWiki || tag.hasDeerjikists)
 	       ? (
 		  tag.materialId == null && !(tag.hasDeerjikists)
@@ -111,48 +99,33 @@ const TagLink: FC<Props> = ({ tag,
 	    </span>)}
 	{nestLevel > 0 && (
 	    <span
-		className="ml-1 mr-1 shrink-0"
+		className="ml-1 mr-1"
 		style={{ paddingLeft: `${ (nestLevel - 1) }rem` }}>
 	      ↳
 	    </span>)}
 	{tag.matchedAlias != null && (
 	    <>
-	      <span
-		  title={textTitle}
-		  className={cn (spanClass, textClass, className)}
-		  {...props}>
-		<ResponsiveMarqueeText
-		    text={tag.matchedAlias}
-		    title={textTitle}
-		    truncateOnMobile={truncateOnMobile}/>
+	      <span className={spanClass} {...props}>
+		{tag.matchedAlias}
 	      </span>
-	      <span className="shrink-0"> → </span>
+	      <> → </>
 	    </>)}
 	{linkFlg
 	 ? (
 	    <PrefetchLink
 		to={`/posts?${ (new URLSearchParams ({ tags: tag.name })).toString () }`}
-		title={textTitle}
-		className={cn (linkClass, textClass, className)}
+		className={linkClass}
 		{...props}>
-	      <ResponsiveMarqueeText
-		  text={tag.name}
-		  title={textTitle}
-		  truncateOnMobile={truncateOnMobile}/>
+	      {tag.name}
 	    </PrefetchLink>)
 	 : (
-	    <span
-		  title={textTitle}
-		  className={cn (spanClass, textClass, className)}
+	    <span className={spanClass}
 		  {...props}>
-	      <ResponsiveMarqueeText
-		  text={tag.name}
-		  title={textTitle}
-		  truncateOnMobile={truncateOnMobile}/>
+	      {tag.name}
 	    </span>)}
 	{withCount && (
-	    <span className={countClass}>{tag.postCount}</span>)}
-      </span>)
+	    <span className="ml-1">{tag.postCount}</span>)}
+      </>)
 }
 
 export default TagLink

frontend/src/components/TagSearchBox.tsx

@@ -20,14 +20,12 @@ const TagSearchBox: FC<Props> = ({ suggestions, activeIndex, onSelect }) => {
 		     rounded shadow">
 	{suggestions.map ((tag, i) => (
 	    <li key={tag.id}
-		className={cn ('min-w-0 overflow-hidden px-3 py-2 cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-700',
+		className={cn ('px-3 py-2 cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-700', 
 			       i === activeIndex && 'bg-gray-300 dark:bg-gray-700')}
 		onMouseDown={() => onSelect (tag)}>
-	      <div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
-		<TagLink tag={tag} linkFlg={false} withWiki={false}/>
-	      </div>
+	      <TagLink tag={tag} linkFlg={false} withWiki={false}/>
 	    </li>))}
       </ul>)
 }
 
-export default TagSearchBox
+export default TagSearchBox

frontend/src/components/TagSidebar.tsx

@@ -64,9 +64,8 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 	<ul>
 	  {CATEGORIES.flatMap (cat => cat in tags ? (
 	      tags[cat].map (tag => (
-		  <li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
+		  <li key={tag.id} className="mb-1">
 		    <motion.div
-			className="flex min-w-0 max-w-full items-baseline overflow-hidden"
 			transition={{ layout: { duration: .2, ease: 'easeOut' } }}
 			layoutId={`tag-${ tag.id }`}>
 		      <TagLink tag={tag} onClick={onClick}/>
@@ -96,7 +95,7 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
       </>)
 
   return (
-      <SidebarComponent sidebarKey="posts-index-tags">
+      <SidebarComponent>
 	<TagSearch/>
 
 	<div className="hidden md:block mt-4">
@@ -129,4 +128,4 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
       </SidebarComponent>)
 }
 
-export default TagSidebar
+export default TagSidebar

frontend/src/components/TopNav.tsx

@@ -7,36 +7,30 @@ import Separator from '@/components/MenuSeparator'
 import PrefetchLink from '@/components/PrefetchLink'
 import TopNavUser from '@/components/TopNavUser'
 import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
-import { materialsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
+import { tagsKeys, wikiKeys } from '@/lib/queryKeys'
 import { fetchTag, fetchTagByName } from '@/lib/tags'
-import { fetchMaterial } from '@/lib/materials'
 import { cn } from '@/lib/utils'
 import { fetchWikiPage } from '@/lib/wiki'
 
 import type { FC, MouseEvent } from 'react'
 
-import type { Material, Menu, MenuVisibleItem, Tag, User } from '@/types'
+import type { Menu, MenuVisibleItem, Tag, User } from '@/types'
 
 type Props = { user: User | null }
 
 
-export const menuOutline = (
-    { tag, material, wikiId, user, pathName }: {
-	tag?: Tag | null
-	material?: Material | null
-	wikiId: number | null
-	user: User | null,
-	pathName: string },
-): Menu => {
-  const postCount = tag?.postCount ?? material?.tag?.postCount ?? 0
+export const menuOutline = ({ tag, wikiId, user, pathName }: { 
+    tag?: Tag | null
+    wikiId: number | null
+    user: User | null,
+    pathName: string }): Menu => {
+  const postCount = tag?.postCount ?? 0
 
   const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^/]+/.test (pathName) && wikiId)
   const wikiTitle = pathName.split ('/')[2] ?? ''
 
   const tagFlg = /^\/tags\/\d+/.test (pathName)
 
-  const materialFlg = /^\/materials\/\d+/.test (pathName)
-
   return [
       { name: '広場', to: '/posts', subMenu: [
 	  { name: '一覧', to: '/posts' },
@@ -55,18 +49,12 @@ export const menuOutline = (
 	    visible: tagFlg },
 	  { name: '履歴', to: `/tags/changes?id=${ tag?.id }`,
 	    visible: tagFlg && tag?.category !== 'nico' }] },
-      { name: '素材', to: '/materials', visible: true, subMenu: [
+      { name: '素材', to: '/materials', visible: false, subMenu: [
 	  { name: '一覧', to: '/materials' },
+	  { name: '検索', to: '/materials/search', visible: false }, 
 	  { name: '追加', to: '/materials/new' },
-	  { name: '抑止', to: '/materials/suppressions' },
-	  { name: '全体履歴', to: '/materials/changes' },
-	  { name: 'ヘルプ', to: '/wiki/ヘルプ:素材管理' },
-	  { component: <Separator/>, visible: materialFlg },
-	  { name: `広場 (${ postCount || 0 })`,
-	    to: `/posts?tags=${ encodeURIComponent (material?.tag?.name ?? '') }`,
-	    visible: materialFlg && Boolean (material?.tag) },
-	  { name: '履歴', to: `/materials/changes?material_id=${ material?.id }`,
-	    visible: materialFlg }] },
+	  { name: '全体履歴', to: '/materials/changes', visible: false },
+	  { name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
       { name: 'Wiki', to: '/wiki/ヘルプ:ホーム', base: '/wiki', subMenu: [
 	  { name: '検索', to: '/wiki' },
 	  { name: '新規', to: '/wiki/new' },
@@ -131,23 +119,15 @@ const TopNav: FC<Props> = ({ user }) => {
       queryFn: () => fetchWikiPage (wikiIdStr, { }) })
 
   const tagFlg = /^\/tags\/\d+/.test (location.pathname)
-  const materialFlg = /^\/materials\/\d+/.test (location.pathname)
-  const effectiveTitle = (((tagFlg || materialFlg)
-			   ? location.pathname.split ('/')[2]
-			   : wikiPage?.title)
-			  ?? '')
+  const effectiveTitle = (tagFlg ? location.pathname.split ('/')[2] : wikiPage?.title) ?? ''
 
   const { data: tag } = useQuery ({
       enabled: Boolean (effectiveTitle),
       queryKey: tagsKeys.show (effectiveTitle),
       queryFn: () => (tagFlg ? fetchTag : fetchTagByName) (effectiveTitle) })
 
-  const { data: material } = useQuery ({
-      enabled: Boolean (effectiveTitle),
-      queryKey: materialsKeys.show (effectiveTitle),
-      queryFn: () => fetchMaterial (effectiveTitle) })
 
-  const menu = menuOutline ({ tag, material, wikiId, user, pathName: location.pathname })
+  const menu = menuOutline ({ tag, wikiId, user, pathName: location.pathname })
   const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
   const moreMenu = menu.filter (item =>
       !(item.visible ?? true)

frontend/src/components/common/PageTitle.tsx

@@ -1,14 +1,12 @@
 import React from 'react'
 
-import { cn } from '@/lib/utils'
-
 import type { FC } from 'react'
 
-type Props = { children: React.ReactNode; className?: string }
+type Props = { children: React.ReactNode }
 
 
-const PageTitle: FC<Props> = ({ children, className, ...rest }) => (
-    <h1 className={cn ('text-2xl font-bold mb-2', className)} {...rest}>
+const PageTitle: FC<Props> = ({ children }) => (
+    <h1 className="text-2xl font-bold mb-2">
       {children}
     </h1>)
 

frontend/src/components/layout/SidebarComponent.test.tsx

@@ -1,124 +0,0 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { HelmetProvider } from 'react-helmet-async'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import SidebarComponent from '@/components/layout/SidebarComponent'
-
-
-const sidebarWidth = (element: Element | null): string =>
-    (element as HTMLElement).style.getPropertyValue ('--sidebar-width')
-
-
-const sidebarRoot = (container: HTMLElement): Element =>
-    container.querySelector ('[style*="--sidebar-width"]')!
-
-
-const sidebarTree = (props: Partial<Parameters<typeof SidebarComponent>[0]>) => (
-    <HelmetProvider>
-      <div data-sidebar-container>
-	<SidebarComponent sidebarKey="test-sidebar" {...props}>
-	  Sidebar body
-	</SidebarComponent>
-      </div>
-    </HelmetProvider>)
-
-
-const renderSidebar = (
-    props: Partial<Parameters<typeof SidebarComponent>[0]> = {},
-    containerWidth = 800,
-) => {
-  Object.defineProperty (HTMLElement.prototype, 'clientWidth', {
-      configurable: true,
-      get () {
-	return this.hasAttribute ('data-sidebar-container') ? containerWidth : 0
-      },
-  })
-
-  const rendered = render (sidebarTree (props))
-
-  return rendered
-}
-
-
-describe ('SidebarComponent', () => {
-  beforeEach (() => {
-    Object.defineProperty (window, 'innerWidth', {
-	configurable: true,
-	value:        1_000,
-    })
-
-    Object.defineProperty (HTMLElement.prototype, 'setPointerCapture', {
-	configurable: true,
-	value:        vi.fn (),
-    })
-    Object.defineProperty (HTMLElement.prototype, 'releasePointerCapture', {
-	configurable: true,
-	value:        vi.fn (),
-    })
-    Object.defineProperty (HTMLElement.prototype, 'hasPointerCapture', {
-	configurable: true,
-	value:        vi.fn (() => true),
-    })
-
-    vi.spyOn (HTMLElement.prototype, 'setPointerCapture').mockImplementation (() => {
-      ;
-    })
-    vi.spyOn (HTMLElement.prototype, 'releasePointerCapture').mockImplementation (() => {
-      ;
-    })
-    vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
-  })
-
-  it ('uses maxWidth without applying the container main-width reserve twice', async () => {
-    localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
-    const onWidthChange = vi.fn ()
-
-    const { container } = renderSidebar ({ maxWidth: 700, onWidthChange }, 800)
-
-    await waitFor (() => {
-      expect (sidebarWidth (sidebarRoot (container))).toBe ('700px')
-    })
-    expect (onWidthChange).toHaveBeenLastCalledWith (700)
-  })
-
-  it ('resets width and removes only its storage key on double click', async () => {
-    localStorage.setItem ('sidebar:test-sidebar:right:width', '420')
-    localStorage.setItem ('sidebar:other-sidebar:right:width', '480')
-
-    const { container } = renderSidebar ({ side: 'right' }, 900)
-
-    await waitFor (() => {
-      expect (sidebarWidth (sidebarRoot (container))).toBe ('420px')
-    })
-
-    fireEvent.doubleClick (screen.getByRole ('separator', { name: 'サイドバー幅' }))
-
-    await waitFor (() => {
-      expect (sidebarWidth (sidebarRoot (container))).toBe ('256px')
-    })
-    expect (localStorage.getItem ('sidebar:test-sidebar:right:width')).toBeNull ()
-    expect (localStorage.getItem ('sidebar:other-sidebar:right:width')).toBe ('480')
-  })
-
-  it ('clamps current width on maxWidth changes without re-reading storage', async () => {
-    localStorage.setItem ('sidebar:test-sidebar:left:width', '420')
-
-    const { container, rerender } = renderSidebar ({ maxWidth: 420 }, 900)
-
-    await waitFor (() => {
-      expect (sidebarWidth (sidebarRoot (container))).toBe ('420px')
-    })
-
-    rerender (sidebarTree ({ maxWidth: 300 }))
-
-    await waitFor (() => {
-      expect (sidebarWidth (sidebarRoot (container))).toBe ('300px')
-    })
-
-    rerender (sidebarTree ({ maxWidth: 500 }))
-
-    await waitFor (() => {
-      expect (sidebarWidth (sidebarRoot (container))).toBe ('300px')
-    })
-  })
-})

frontend/src/components/layout/SidebarComponent.tsx

@@ -1,319 +1,19 @@
 import { motion } from 'framer-motion'
 import { Helmet } from 'react-helmet-async'
 
-import { cn } from '@/lib/utils'
+import type { FC, ReactNode } from 'react'
 
-import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
-import { useCallback, useEffect, useRef, useState } from 'react'
-
-type SidebarSide = 'left' | 'right'
-
-type Props = {
-    children:      ReactNode
-    className?:    string
-    maxWidth?:     number
-    onWidthChange?: (width: number) => void
-    sidebarKey:    string
-    side?:         SidebarSide }
-
-type ResizeState = {
-    pointerId:  number
-    startWidth: number
-    startX:     number
-    side:       SidebarSide }
-
-type PendingPressState = ResizeState & { startY: number }
-
-const DEFAULT_SIDEBAR_WIDTH = 256
-const MIN_SIDEBAR_WIDTH = 192
-const MIN_MAIN_WIDTH = 360
-const MAX_VIEWPORT_WIDTH_RATIO = .8
-const LONG_PRESS_DELAY_MS = 350
-const TOUCH_MOVE_THRESHOLD_PX = 8
+type Props = { children: ReactNode }
 
 
-const storageKeyForSidebar = (sidebarKey: string, side: SidebarSide): string =>
-    `sidebar:${ sidebarKey }:${ side }:width`
-
-
-const getSidebarMaxWidth = (containerWidth: number): number => {
-  const viewportWidth =
-      typeof window === 'undefined' ? containerWidth : window.innerWidth
-  const viewportMaxWidth = Math.floor (viewportWidth * MAX_VIEWPORT_WIDTH_RATIO)
-  const containerMaxWidth = Math.floor (containerWidth - MIN_MAIN_WIDTH)
-  const dynamicMaxWidth = Math.min (viewportMaxWidth, containerMaxWidth)
-
-  return Math.max (MIN_SIDEBAR_WIDTH, dynamicMaxWidth)
-}
-
-
-const readStoredSidebarWidth = (
-    sidebarKey: string,
-    side: SidebarSide): number => {
-  if (typeof window === 'undefined')
-    return DEFAULT_SIDEBAR_WIDTH
-
-  const value = window.localStorage.getItem (storageKeyForSidebar (sidebarKey, side))
-  const width = value == null ? Number.NaN : Number (value)
-
-  return Number.isFinite (width) ? width : DEFAULT_SIDEBAR_WIDTH
-}
-
-
-const SidebarComponent: FC<Props> = ({
-    children,
-    className,
-    maxWidth,
-    onWidthChange,
-    sidebarKey,
-    side = 'left',
-}) => {
-  const rootRef = useRef<HTMLDivElement | null> (null)
-  const maxWidthRef = useRef (maxWidth)
-  const getContainerWidth = useCallback (() => {
-    const containerWidth = rootRef.current
-	?.closest ('[data-sidebar-container]')
-	?.clientWidth
-    ?? window.innerWidth
-    return containerWidth
-  }, [])
-  const getClampedWidth = useCallback ((
-      nextWidth: number,
-      containerWidth: number): number => {
-    const viewportWidth =
-	typeof window === 'undefined' ? containerWidth : window.innerWidth
-    const viewportMaxWidth = Math.floor (viewportWidth * MAX_VIEWPORT_WIDTH_RATIO)
-    const maxAllowedWidth =
-	maxWidthRef.current == null
-	? getSidebarMaxWidth (containerWidth)
-	: Math.max (
-	    MIN_SIDEBAR_WIDTH,
-	    Math.min (viewportMaxWidth, maxWidthRef.current))
-
-    return Math.min (maxAllowedWidth, Math.max (MIN_SIDEBAR_WIDTH, nextWidth))
-  }, [])
-
-  const [width, setWidth] = useState (() => (
-      typeof window === 'undefined'
-      ? DEFAULT_SIDEBAR_WIDTH
-      : getClampedWidth (
-	  readStoredSidebarWidth (sidebarKey, side),
-	  window.innerWidth)))
-  const [resizing, setResizing] = useState (false)
-  const widthRef = useRef (width)
-  const longPressTimerRef = useRef<ReturnType<typeof setTimeout> | null> (null)
-  const pendingPressRef = useRef<PendingPressState | null> (null)
-  const resizeRef = useRef<ResizeState | null> (null)
-  const bodyStyleRef = useRef<{ cursor: string, userSelect: string } | null> (null)
-
-  const clearLongPressTimer = useCallback (() => {
-    if (longPressTimerRef.current == null)
-      return
-
-    clearTimeout (longPressTimerRef.current)
-    longPressTimerRef.current = null
-  }, [])
-
-  const restoreBodyStyle = useCallback (() => {
-    if (bodyStyleRef.current == null)
-      return
-
-    document.body.style.cursor = bodyStyleRef.current.cursor
-    document.body.style.userSelect = bodyStyleRef.current.userSelect
-    bodyStyleRef.current = null
-  }, [])
-
-  const startResize = useCallback ((state: ResizeState) => {
-    clearLongPressTimer ()
-    pendingPressRef.current = null
-    resizeRef.current = state
-    setResizing (true)
-
-    if (bodyStyleRef.current == null)
-    {
-      bodyStyleRef.current = {
-	  cursor: document.body.style.cursor,
-	  userSelect: document.body.style.userSelect }
-    }
-
-    document.body.style.cursor = 'col-resize'
-    document.body.style.userSelect = 'none'
-  }, [clearLongPressTimer])
-
-  const finishResize = useCallback (() => {
-    clearLongPressTimer ()
-    pendingPressRef.current = null
-
-    const state = resizeRef.current
-    resizeRef.current = null
-
-    if (state != null)
-      window.localStorage.setItem (
-	  storageKeyForSidebar (sidebarKey, state.side),
-	  String (widthRef.current))
-
-    setResizing (false)
-    restoreBodyStyle ()
-  }, [clearLongPressTimer, restoreBodyStyle, sidebarKey])
-
-  const applyWidth = useCallback ((nextWidth: number) => {
-    if (nextWidth === widthRef.current)
-      return
-
-    widthRef.current = nextWidth
-    setWidth (nextWidth)
-  }, [])
-
-  useEffect (() => {
-    maxWidthRef.current = maxWidth
-    const containerWidth = getContainerWidth ()
-    const nextWidth = getClampedWidth (widthRef.current, containerWidth)
-    applyWidth (nextWidth)
-  }, [applyWidth, getClampedWidth, getContainerWidth, maxWidth])
-
-  const updateWidth = useCallback ((clientX: number) => {
-    const state = resizeRef.current
-    if (state == null)
-      return
-
-    const containerWidth = getContainerWidth ()
-    const delta = state.side === 'left'
-		  ? clientX - state.startX
-		  : state.startX - clientX
-    const nextWidth = getClampedWidth (state.startWidth + delta, containerWidth)
-    applyWidth (nextWidth)
-  }, [applyWidth, getClampedWidth, getContainerWidth])
-
-  const handlePointerDown = (ev: PointerEvent<HTMLDivElement>) => {
-    if (ev.pointerType !== 'mouse' && ev.pointerType !== 'touch')
-      return
-
-    if (ev.pointerType === 'mouse' && ev.button !== 0)
-      return
-
-    ev.preventDefault ()
-    ev.stopPropagation ()
-    ev.currentTarget.setPointerCapture (ev.pointerId)
-
-    const state = {
-	pointerId: ev.pointerId,
-	side,
-	startWidth: widthRef.current,
-	startX: ev.clientX }
-
-    if (ev.pointerType === 'mouse')
-    {
-      startResize (state)
-      return
-    }
-
-    pendingPressRef.current = { ...state, startY: ev.clientY }
-    clearLongPressTimer ()
-    longPressTimerRef.current = setTimeout (() => {
-      if (pendingPressRef.current != null)
-	startResize (pendingPressRef.current)
-    }, LONG_PRESS_DELAY_MS)
-  }
-
-  const handlePointerMove = (ev: PointerEvent<HTMLDivElement>) => {
-    ev.stopPropagation ()
-
-    if (resizeRef.current != null)
-    {
-      ev.preventDefault ()
-      updateWidth (ev.clientX)
-      return
-    }
-
-    const pendingPress = pendingPressRef.current
-    if (pendingPress == null || pendingPress.pointerId !== ev.pointerId)
-      return
-
-    const deltaX = ev.clientX - pendingPress.startX
-    const deltaY = ev.clientY - pendingPress.startY
-    const distance = Math.hypot (deltaX, deltaY)
-
-    if (distance >= TOUCH_MOVE_THRESHOLD_PX)
-    {
-      clearLongPressTimer ()
-      pendingPressRef.current = null
-    }
-  }
-
-  const handlePointerEnd = (ev: PointerEvent<HTMLDivElement>) => {
-    ev.stopPropagation ()
-
-    if (ev.currentTarget.hasPointerCapture (ev.pointerId))
-      ev.currentTarget.releasePointerCapture (ev.pointerId)
-
-    finishResize ()
-  }
-
-  const resetWidth = useCallback (() => {
-    const containerWidth = getContainerWidth ()
-    const nextWidth = getClampedWidth (DEFAULT_SIDEBAR_WIDTH, containerWidth)
-    applyWidth (nextWidth)
-    window.localStorage.removeItem (storageKeyForSidebar (sidebarKey, side))
-  }, [applyWidth, getClampedWidth, getContainerWidth, sidebarKey, side])
-
-  const handleDoubleClick = (ev: MouseEvent<HTMLDivElement>) => {
-    ev.preventDefault ()
-    ev.stopPropagation ()
-    resetWidth ()
-  }
-
-  useEffect (() => {
-    const containerWidth = getContainerWidth ()
-    const nextWidth = getClampedWidth (
-	readStoredSidebarWidth (sidebarKey, side),
-	containerWidth)
-    applyWidth (nextWidth)
-  }, [applyWidth, getClampedWidth, getContainerWidth, sidebarKey, side])
-
-  useEffect (() => {
-    const containerWidth = getContainerWidth ()
-    const nextWidth = getClampedWidth (widthRef.current, containerWidth)
-    applyWidth (nextWidth)
-  }, [applyWidth, getClampedWidth, getContainerWidth])
-
-  useEffect (() => {
-    if (typeof window === 'undefined')
-      return
-
-    const handleResize = () => {
-      const containerWidth = getContainerWidth ()
-      const nextWidth = getClampedWidth (widthRef.current, containerWidth)
-      applyWidth (nextWidth)
-    }
-
-    window.addEventListener ('resize', handleResize)
-    return () => window.removeEventListener ('resize', handleResize)
-  }, [applyWidth, getClampedWidth, getContainerWidth])
-
-  useEffect (() => {
-    onWidthChange?.(width)
-  }, [onWidthChange, width])
-
-  useEffect (() => () => {
-    clearLongPressTimer ()
-    restoreBodyStyle ()
-  }, [clearLongPressTimer, restoreBodyStyle])
-
-  const style = {
-      '--sidebar-width': `${ width }px` } as CSSProperties
-
-  return (
-      <motion.div
-	  ref={rootRef}
-	  layout="position"
-	  transition={{ layout: { duration: .2, ease: 'easeOut' } }}
-	  style={style}
-	  className={cn (
-	      'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',
-	      className)}>
-	<Helmet>
-	  <style>
-	    {`
+const SidebarComponent: FC<Props> = ({ children }) => (
+    <motion.div
+	layout="position"
+	transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+	className="p-4 w-full md:w-64 md:h-full md:overflow-y-auto sidebar">
+      <Helmet>
+	<style>
+	  {`
 	      .sidebar
 	      {
 		direction: rtl;
@@ -323,34 +23,10 @@ const SidebarComponent: FC<Props> = ({
 	      {
 		direction: ltr;
 	      }`}
-	  </style>
-	</Helmet>
+	</style>
+      </Helmet>
 
-	<div className="h-full overflow-y-auto p-4 sidebar">
-	  {children}
-	</div>
+      {children}
+    </motion.div>)
 
-	<div
-	    role="separator"
-	    aria-orientation="vertical"
-	    aria-label="サイドバー幅"
-	    onPointerDown={handlePointerDown}
-	    onPointerMove={handlePointerMove}
-	    onPointerUp={handlePointerEnd}
-	    onPointerCancel={handlePointerEnd}
-	    onDoubleClick={handleDoubleClick}
-	    className={cn (
-		'hidden md:block absolute top-0 bottom-0 z-20 w-4 cursor-col-resize',
-		'touch-none select-none',
-		side === 'left' ? '-right-2' : '-left-2',
-		'before:absolute before:top-0 before:bottom-0 before:w-px',
-		'before:bg-neutral-500/0 hover:before:bg-neutral-500/30',
-		'before:transition-colors before:duration-150',
-		side === 'left'
-		? 'before:left-1/2'
-		: 'before:right-1/2',
-		resizing && 'before:bg-neutral-500/40')}/>
-      </motion.div>)
-}
-
-export default SidebarComponent
+export default SidebarComponent

frontend/src/index.css

@@ -132,20 +132,3 @@ body
   0%, 100% { color: #f87171; }
   50% { color: #60a5fa; }
 }
-
-.tag-marquee
-{
-  position: relative;
-}
-
-.tag-marquee__animated
-{
-  position: absolute;
-  inset: 0 auto 0 0;
-  min-width: 100%;
-  width: max-content;
-  opacity: 0;
-  pointer-events: none;
-  white-space: nowrap;
-  will-change: transform;
-}

frontend/src/lib/materials.ts

@@ -1,31 +1,41 @@
-import { apiGet, isApiError, apiPost, apiPut } from '@/lib/api'
+import {
+    apiGet,
+    isApiError,
+    apiPost,
+    apiPut,
+} from '@/lib/api'
 
-import type { Material,
-	      MaterialIndexResponse,
-	      MaterialVersion,
-	      FetchMaterialsParams,
-	      MaterialFilter,
-	      MaterialSyncSuppression,
-	      MaterialSidebarTag,
-	      MaterialTagTree } from '@/types'
+import type {
+    Material,
+    MaterialIndexResponse,
+    MaterialVersion,
+    FetchMaterialsParams,
+    MaterialFilter,
+    MaterialSyncSuppression,
+    MaterialSidebarTag,
+    MaterialTagTree,
+} from '@/types'
 
 export type FetchMaterialTreeParams = {
     parentId?:       number | null
-    materialFilter:  MaterialFilter }
+    materialFilter:  MaterialFilter
+}
 
-export type MaterialSyncSuppressionResponse = { suppressions: MaterialSyncSuppression[] }
+export type MaterialSyncSuppressionResponse = {
+    suppressions: MaterialSyncSuppression[]
+}
 
 export type MaterialChangesResponse = {
     versions: MaterialVersion[]
-    count:    number }
+    count:    number
+}
 
 const MATERIAL_FILTERS: MaterialFilter[] = ['present', 'missing', 'any']
 
 
 export const parseMaterialFilter = (
     value: unknown,
-    fallback: MaterialFilter = 'present',
-): MaterialFilter =>
+    fallback: MaterialFilter = 'present'): MaterialFilter =>
     typeof value === 'string' && MATERIAL_FILTERS.includes (value as MaterialFilter)
     ? value as MaterialFilter
     : fallback
@@ -35,8 +45,7 @@ export const fetchMaterials = async (
     { q, tagState, mediaKind, createdFrom, createdTo,
       updatedFrom, updatedTo, sort, direction, page,
       tagId, includeDescendants, groupBy,
-      limit }: FetchMaterialsParams,
-): Promise<MaterialIndexResponse> =>
+      limit }: FetchMaterialsParams): Promise<MaterialIndexResponse> =>
     await apiGet ('/materials', { params: {
 	...(q && { q }),
 	tag_state:   tagState,

frontend/src/lib/posts.test.ts

@@ -70,7 +70,6 @@ describe ('posts API functions', () => {
           id:                    5,
           title:                 'new title',
           tags:                  'tag',
-          duration:              null,
           parentPostIds:         '1 2',
           originalCreatedFrom:   null,
           originalCreatedBefore: '2026-01-02T00:00:00Z',
@@ -83,7 +82,6 @@ describe ('posts API functions', () => {
         {
           title:                   'new title',
           tags:                    'tag',
-          duration:                null,
           parent_post_ids:         '1 2',
           original_created_from:   null,
           original_created_before: '2026-01-02T00:00:00Z',

frontend/src/lib/posts.ts

@@ -44,7 +44,6 @@ export const updatePost = async (
     post: { id:                     number
 	    title:                  string | null
 	    tags:                   string
-	    duration:               string | null
 	    parentPostIds:          string
 	    originalCreatedFrom:    string | null
 	    originalCreatedBefore:  string | null },
@@ -56,7 +55,6 @@ export const updatePost = async (
 	`/posts/${ post.id }`,
 	{ title: post.title,
 	  tags: post.tags,
-	  duration: post.duration,
 	  parent_post_ids: post.parentPostIds,
 	  original_created_from: post.originalCreatedFrom,
 	  original_created_before: post.originalCreatedBefore },

frontend/src/lib/utils.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import { cn, msToTime, originalCreatedAtString, toDate } from '@/lib/utils'
+import { cn, originalCreatedAtString, toDate } from '@/lib/utils'
 
 describe ('utils', () => {
   it ('converts strings to dates and leaves date instances intact', () => {
@@ -26,14 +26,3 @@ describe ('utils', () => {
     ).toContain ('時刻不詳')
   })
 })
-
-describe ('msToTime', () => {
-  it ('keeps milliseconds when present', () => {
-    expect (msToTime (60_500)).toBe ('1:00.500')
-    expect (msToTime (60_001)).toBe ('1:00.001')
-  })
-
-  it ('omits milliseconds when they are zero', () => {
-    expect (msToTime (60_000)).toBe ('1:00')
-  })
-})

frontend/src/lib/utils.ts

@@ -71,22 +71,6 @@ export const originalCreatedAtString = (
 }
 
 
-export const msToTime = (ms: number): string => {
-  const totalS = Math.trunc (ms / 1_000)
-  const s = String (totalS % 60)
-  const min = String (Math.trunc (totalS / 60) % 60)
-  const h = Math.trunc (totalS / 3_600)
-  const remainderMs = ms % 1_000
-
-  const base =
-      (h > 0
-       ? `${ h }:${ min.padStart (2, '0') }:${ s.padStart (2, '0') }`
-       : `${ min }:${ s.padStart (2, '0') }`)
-
-  return remainderMs > 0 ? `${ base }.${ remainderMs.toString ().padStart (3, '0') }` : base
-}
-
-
 export const inputClass = (invalid?: boolean, className?: string): string =>
     cn ('w-full rounded border p-2',
 	(invalid

frontend/src/pages/materials/MaterialBasePage.tsx

@@ -6,11 +6,9 @@ import type { FC } from 'react'
 
 
 const MaterialBasePage: FC = () => (
-    <div
-	data-sidebar-container
-	className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
+    <div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
       <MaterialSidebar/>
       <Outlet/>
     </div>)
 
-export default MaterialBasePage
+export default MaterialBasePage

frontend/src/pages/materials/MaterialDetailPage.tsx

@@ -8,6 +8,7 @@ import WikiBody from '@/components/WikiBody'
 import FieldError from '@/components/common/FieldError'
 import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
+import PrefetchLink from '@/components/PrefetchLink'
 import TabGroup, { Tab } from '@/components/common/TabGroup'
 import TagInput from '@/components/common/TagInput'
 import MainArea from '@/components/layout/MainArea'
@@ -118,6 +119,12 @@ const MaterialDetailPage: FC = () => {
 		 : materialTitle}
 	      </PageTitle>
 
+	      <PrefetchLink
+		  to={`/materials/changes?material_id=${ material.id }`}
+		  className="text-sm text-sky-700 underline underline-offset-2 dark:text-sky-300">
+		この素材の履歴
+	      </PrefetchLink>
+
 	      {(material.file && material.contentType) && (
 		  (/image\/.*/.test (material.contentType) && (
 		      <img src={material.file} alt={material.tag?.name || undefined}/>))
@@ -127,12 +134,17 @@ const MaterialDetailPage: FC = () => {
 		      <audio src={material.file} controls/>)))}
 
 	      <TabGroup>
-		{material.tag && (
-		    <Tab name="Wiki">
+		<Tab name="Wiki">
+		  {material.tag
+		   ? (
 		      <WikiBody
 			  title={material.tag.name}
-			  body={material.wikiPageBody ?? undefined}/>
-		    </Tab>)}
+			  body={material.wikiPageBody ?? undefined}/>)
+		   : (
+		      <p className="text-stone-700 dark:text-stone-300">
+			タグ未設定の素材です．
+		      </p>)}
+		</Tab>
 
 		<Tab name="編輯">
 		  <div className="max-w-wl space-y-4 pt-2">

frontend/src/pages/materials/MaterialHistoryPage.tsx

@@ -80,7 +80,14 @@ const MaterialHistoryPage: FC = () => {
 	</Helmet>
 
 	<div className="space-y-5">
-	  <PageTitle>素材履歴</PageTitle>
+	  <div className="flex flex-wrap items-center justify-between gap-3">
+	    <PageTitle>素材履歴</PageTitle>
+	    <PrefetchLink
+		to="/materials"
+		className="text-sm text-sky-700 underline underline-offset-2 dark:text-sky-300">
+	      素材一覧へ戻る
+	    </PrefetchLink>
+	  </div>
 
 	  <form
 	      onSubmit={handleSearch}
@@ -105,6 +112,20 @@ const MaterialHistoryPage: FC = () => {
 			onChange={e => setTagInput (e.target.value)}
 			className={inputClass (invalid)}/>)}
 	      </FormField>
+
+	      <FormField label="イベント">
+		{({ invalid }) => (
+		    <select
+			value={eventTypeInput}
+			onChange={e => setEventTypeInput (e.target.value)}
+			className={inputClass (invalid)}>
+		      <option value="">すべて</option>
+		      <option value="create">create</option>
+		      <option value="update">update</option>
+		      <option value="discard">discard</option>
+		      <option value="restore">restore</option>
+		    </select>)}
+	      </FormField>
 	    </div>
 
 	    <button
@@ -129,6 +150,7 @@ const MaterialHistoryPage: FC = () => {
 		  <table className="w-full min-w-[1200px] table-fixed border-collapse">
 		    <colgroup>
 		      <col className="w-48"/>
+		      <col className="w-32"/>
 		      <col className="w-28"/>
 		      <col className="w-24"/>
 		      <col className="w-64"/>
@@ -141,6 +163,7 @@ const MaterialHistoryPage: FC = () => {
 		    <thead className="border-b-2 border-black dark:border-white">
 		      <tr>
 			<th className="p-2 text-left">日時</th>
+			<th className="p-2 text-left">event_type</th>
 			<th className="p-2 text-left">素材 ID</th>
 			<th className="p-2 text-left">版</th>
 			<th className="p-2 text-left">タグ名</th>
@@ -157,6 +180,7 @@ const MaterialHistoryPage: FC = () => {
 			      key={version.id}
 			      className="even:bg-gray-100 dark:even:bg-gray-700">
 			    <td className="p-2">{dateString (version.createdAt)}</td>
+			    <td className="p-2">{version.eventType}</td>
 			    <td className="p-2">
 			      <PrefetchLink to={`/materials/${ version.materialId }`}>
 				#{version.materialId}

frontend/src/pages/materials/MaterialListPage.test.tsx

@@ -33,7 +33,15 @@ describe ('MaterialListPage', () => {
           } },
       )
     })
-    expect (await screen.findByText ('素材はありません。')).toBeInTheDocument ()
+    expect (await screen.findByText ('素材はありません．')).toBeInTheDocument ()
+    expect (screen.getByRole ('link', { name: '新規素材を追加' })).toHaveAttribute (
+        'href',
+        '/materials/new',
+    )
+    expect (screen.getByRole ('link', { name: '履歴' })).toHaveAttribute (
+        'href',
+        '/materials/changes',
+    )
   })
 
   it ('shows materials in the default card view', async () => {
@@ -151,9 +159,16 @@ describe ('MaterialListPage', () => {
         (_, element) => element?.textContent === '伊地知ニジカ 配下の素材を表示中',
     )).toBeInTheDocument ()
 
-    expect (screen.getByRole ('link', { name: '泣き' })).toHaveAttribute (
+    const addLinks = screen.getAllByRole ('link', { name: 'このタグに素材を追加' })
+    expect (addLinks[0]).toHaveAttribute (
         'href',
-        '/materials?tag_id=30&include_descendants=1&group_by=parent_tag&material_filter=present',
+        '/materials/new?tag=%E4%BC%8A%E5%9C%B0%E7%9F%A5%E3%83%8B%E3%82%B8%E3%82%AB'
+        + '&return_to=%2Fmaterials%3Ftag_id%3D20%26include_descendants%3D1%26group_by%3Dparent_tag',
+    )
+    expect (addLinks[1]).toHaveAttribute (
+        'href',
+        '/materials/new?tag=%E6%B3%A3%E3%81%8D'
+        + '&return_to=%2Fmaterials%3Ftag_id%3D20%26include_descendants%3D1%26group_by%3Dparent_tag',
     )
     expect (screen.getByRole ('link', { name: 'タグ選択を解除' })).toHaveAttribute (
         'href',

frontend/src/pages/materials/MaterialListPage.tsx

@@ -10,23 +10,24 @@ import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import Pagination from '@/components/common/Pagination'
 import MainArea from '@/components/layout/MainArea'
-import { SITE_TITLE } from '@/config'
+import { API_BASE_URL, SITE_TITLE } from '@/config'
 import { fetchMaterials, parseMaterialFilter } from '@/lib/materials'
 import { materialsKeys } from '@/lib/queryKeys'
 import { dateString, inputClass } from '@/lib/utils'
 
 import type { FC, FormEvent } from 'react'
 
-import type { FetchMaterialsParams,
-	      Material,
-	      MaterialFilter,
-	      MaterialIndexGroup,
-	      MaterialIndexGroupBy,
-	      MaterialIndexDirection,
-	      MaterialIndexMediaKind,
-	      MaterialIndexSort,
-	      MaterialIndexTagState,
-	      MaterialIndexView } from '@/types'
+import type {
+    FetchMaterialsParams,
+    Material,
+    MaterialFilter,
+    MaterialIndexGroup,
+    MaterialIndexGroupBy,
+    MaterialIndexDirection,
+    MaterialIndexMediaKind,
+    MaterialIndexSort,
+    MaterialIndexTagState,
+    MaterialIndexView } from '@/types'
 
 const MEDIA_KIND_LABELS: Record<Material['mediaKind'], string> = {
     image:      '画像',
@@ -41,16 +42,20 @@ const MEDIA_FILTER_LABELS: Record<MaterialIndexMediaKind, string> = {
     video:      '動画',
     audio:      '音声',
     file_other: 'その他ファイル',
-    url_only:   '外部リンクのみ'}
+    url_only:   'URL のみ'}
 
 const SORT_LABELS: Record<MaterialIndexSort, string> = {
     created_at:     '作成日時',
     updated_at:     '更新日時',
     tag_name:       'タグ名',
     media_kind:     '種類',
-    file_byte_size: '容量',
-    version_no:     '版',
-    id:             'Id.'}
+    file_byte_size: 'ファイルサイズ',
+    version_no:     'バージョン',
+    id:             'ID'}
+
+const GROUP_BY_LABELS: Record<MaterialIndexGroupBy, string> = {
+    none:       'オフ',
+    parent_tag: '親タグ'}
 
 
 const setIf = (qs: URLSearchParams, key: string, value: string | null) => {
@@ -83,24 +88,21 @@ const materialTitle = (material: Material): string =>
 
 const groupedTagPath = (
     tagId: number,
-    materialFilter: MaterialFilter,
-): string =>
+    materialFilter: MaterialFilter): string =>
     `/materials?tag_id=${ tagId }&include_descendants=1&group_by=parent_tag`
     + `&material_filter=${ materialFilter }`
 
 
 const materialNewPath = (
     tagName: string,
-    returnTo: string,
-): string =>
+    returnTo: string): string =>
     `/materials/new?tag=${ encodeURIComponent (tagName) }`
     + `&return_to=${ encodeURIComponent (returnTo) }`
 
 
 const clearedTagSelectionPath = (
     locationSearch: string,
-    materialFilter: MaterialFilter,
-): string => {
+    materialFilter: MaterialFilter): string => {
     const qs = new URLSearchParams (locationSearch)
     qs.delete ('tag_id')
     qs.delete ('include_descendants')
@@ -118,7 +120,7 @@ const MaterialThumb: FC<{ material: Material }> = ({ material }) => (
 		    text-stone-900 shadow-sm dark:border-stone-700 dark:bg-stone-900
 		    dark:text-stone-100`}>
       {material.thumbnail
-       ? <img src={material.thumbnail} alt="" className="block h-full w-full object-cover"/>
+       ? <img src={material.thumbnail} alt="" className="h-full w-full object-contain"/>
        : (
 	  <span
 	      className="px-2 text-2xl leading-tight"
@@ -189,22 +191,27 @@ const MaterialListItem: FC<{ material: Material }> = ({ material }) => (
 const GroupHeading: FC<{
     count:          number
     materialFilter: MaterialFilter
+    returnTo:       string
     title:          string
     tagId:          number
-}> = ({ count, materialFilter, title, tagId }) => (
-    <div className="flex items-center gap-2 border-b border-stone-200 pb-2
+}> = ({ count, materialFilter, returnTo, title, tagId }) => (
+    <div className="flex flex-wrap items-center gap-2 border-b border-stone-200 pb-2
 		    dark:border-stone-700">
       <PrefetchLink
 	  to={groupedTagPath (tagId, materialFilter)}
 	  className="font-medium text-sky-700 underline underline-offset-2
-		     dark:text-sky-300 w-full">
+		     dark:text-sky-300">
 	{title}
       </PrefetchLink>
-      <div className="text-right w-auto">
-	<span className="text-nowrap text-sm text-stone-600 dark:text-stone-300">
-	  {count} 件
-	</span>
-      </div>
+      <span className="text-sm text-stone-600 dark:text-stone-300">
+	{count} 件
+      </span>
+      <PrefetchLink
+	  to={materialNewPath (title, returnTo)}
+	  className="text-sm text-sky-700 underline underline-offset-2
+		     dark:text-sky-300">
+	このタグに素材を追加
+      </PrefetchLink>
     </div>)
 
 
@@ -376,7 +383,8 @@ const MaterialListPage: FC = () => {
 		    tagId={group.tag.id}
 		    title={group.tag.name}
 		    count={group.count}
-		    materialFilter={materialFilter}/>
+		    materialFilter={materialFilter}
+		    returnTo={location.pathname + location.search}/>
 		{renderMaterialCollection (groupMaterials)}
 	      </section>)
 	})}
@@ -402,15 +410,35 @@ const MaterialListPage: FC = () => {
 		  src: url(${ nikumaru }) format('opentype');
 		}`}
 	  </style>
-	  <title>{`素材管理 | ${ SITE_TITLE }`}</title>
+	  <title>{`素材一覧 | ${ SITE_TITLE }`}</title>
 	</Helmet>
 
 	<div className="space-y-5">
 	  <div className="flex flex-wrap items-center justify-between gap-3">
-	    <PageTitle className="my-auto">素材管理</PageTitle>
+	    <PageTitle>素材一覧</PageTitle>
 	    <div className="flex flex-wrap gap-2">
-	      {/* TODO: 局所出力を可能にする */}
-	      {/* <a
+	      <PrefetchLink
+		  to="/materials/new"
+		  className="rounded-full border border-stone-300 bg-white px-4 py-2 text-sm
+			     text-stone-900 hover:bg-stone-100 dark:border-stone-700
+			     dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
+		新規素材を追加
+	      </PrefetchLink>
+	      <PrefetchLink
+		  to="/materials/suppressions"
+		  className="rounded-full border border-stone-300 bg-white px-4 py-2 text-sm
+			     text-stone-900 hover:bg-stone-100 dark:border-stone-700
+			     dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
+		同期元抑止
+	      </PrefetchLink>
+	      <PrefetchLink
+		  to="/materials/changes"
+		  className="rounded-full border border-stone-300 bg-white px-4 py-2 text-sm
+			     text-stone-900 hover:bg-stone-100 dark:border-stone-700
+			     dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
+		履歴
+	      </PrefetchLink>
+	      <a
 		  href={`${ API_BASE_URL }/materials/download.zip?profile=legacy_drive`}
 		  target="_blank"
 		  rel="noopener noreferrer"
@@ -418,7 +446,7 @@ const MaterialListPage: FC = () => {
 			     text-stone-900 hover:bg-stone-100 dark:border-stone-700
 			     dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
 		ZIP をダウンロード
-	      </a> */}
+	      </a>
 	    </div>
 	  </div>
 
@@ -430,6 +458,12 @@ const MaterialListPage: FC = () => {
 		  {tagScope.tag.name}
 		  {tagScope.includeDescendants ? ' 配下の素材を表示中' : ' の素材を表示中'}
 		</span>
+		<PrefetchLink
+		    to={materialNewPath (tagScope.tag.name, location.pathname + location.search)}
+		    className="font-medium underline underline-offset-2
+			       text-sky-700 dark:text-sky-300">
+		  このタグに素材を追加
+		</PrefetchLink>
 		<PrefetchLink
 		    to={clearedTagSelectionPath (location.search, materialFilter)}
 		    className="font-medium underline underline-offset-2
@@ -500,6 +534,21 @@ const MaterialListPage: FC = () => {
 		    </select>)}
 	      </FormField>
 
+	      <FormField label="グルーピング">
+		{({ invalid }) => (
+		    <select
+			value={groupByInput}
+			onChange={e => setGroupByInput (
+			    e.target.value as MaterialIndexGroupBy)}
+			disabled={tagId == null}
+			className={inputClass (invalid)}>
+		      <option value="none">{GROUP_BY_LABELS.none}</option>
+		      <option value="parent_tag" disabled={tagId == null}>
+			{GROUP_BY_LABELS.parent_tag}
+		      </option>
+		    </select>)}
+	      </FormField>
+
 	      <FormField label="作成日時">
 		{() => (
 		    <div className="flex flex-wrap items-center gap-2">
@@ -542,7 +591,7 @@ const MaterialListPage: FC = () => {
 		      : [
 			  'border-stone-300 bg-white text-stone-900 dark:border-stone-700',
 			  'dark:bg-stone-900 dark:text-stone-100'].join (' ') }`}>
-		アイコン
+		カード
 	      </button>
 	      <button
 		  type="button"
@@ -555,7 +604,7 @@ const MaterialListPage: FC = () => {
 		      : [
 			  'border-stone-300 bg-white text-stone-900 dark:border-stone-700',
 			  'dark:bg-stone-900 dark:text-stone-100'].join (' ') }`}>
-		詳細
+		一覧
 	      </button>
 	    </div>
 
@@ -583,18 +632,7 @@ const MaterialListPage: FC = () => {
 	  {isError && (
 	      <p className="text-red-600 dark:text-red-300">素材一覧の取得に失敗しました．</p>)}
 	  {(!isLoading && !isError && materials.length === 0) && (
-	      <p>
-		素材はありません。
-		{(tagScope && ['character', 'material'].includes (tagScope.tag.category)) && (
-		    <>
-		      <PrefetchLink
-			  to={materialNewPath (tagScope.tag.name, location.pathname + location.search)}
-			  className="font-medium underline underline-offset-2
-				     text-sky-700 dark:text-sky-300">
-			追加してください
-		      </PrefetchLink>。
-		    </>)}
-	      </p>)}
+	      <p>素材はありません．</p>)}
 	  {materials.length > 0 && (
 	      groupBy === 'parent_tag' && groups.length > 0
 	      ? renderGroupedMaterials (groups)

frontend/src/pages/materials/MaterialSearchPage.tsx

@@ -0,0 +1,51 @@
+import { useState } from 'react'
+import { Helmet } from 'react-helmet-async'
+
+import FormField from '@/components/common/FormField'
+import PageTitle from '@/components/common/PageTitle'
+import TagInput from '@/components/common/TagInput'
+import MainArea from '@/components/layout/MainArea'
+import { SITE_TITLE } from '@/config'
+
+import type { FC, FormEvent } from 'react'
+
+
+const MaterialSearchPage: FC = () => {
+  const [tagName, setTagName] = useState ('')
+  const [parentTagName, setParentTagName] = useState ('')
+
+  const handleSearch = (e: FormEvent) => {
+    e.preventDefault ()
+  }
+
+  return (
+      <MainArea>
+	<Helmet>
+	  <title>素材集 | {SITE_TITLE}</title>
+	</Helmet>
+
+	<div className="max-w-xl">
+	  <PageTitle>素材集</PageTitle>
+
+	  <form onSubmit={handleSearch} className="space-y-2">
+	    {/* タグ */}
+	    <FormField label="タグ">
+	      {() => (
+		  <TagInput
+		      value={tagName}
+		      setValue={setTagName}/>)}
+	    </FormField>
+
+	    {/* 親タグ */}
+	    <FormField label="親タグ">
+	      {() => (
+		  <TagInput
+		      value={parentTagName}
+		      setValue={setParentTagName}/>)}
+	    </FormField>
+	  </form>
+	</div>
+      </MainArea>)
+}
+
+export default MaterialSearchPage

frontend/src/pages/materials/MaterialSyncSuppressionsPage.tsx

@@ -2,13 +2,17 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { useState } from 'react'
 import { Helmet } from 'react-helmet-async'
 
+import PrefetchLink from '@/components/PrefetchLink'
 import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import MainArea from '@/components/layout/MainArea'
 import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
-import { createMaterialSyncSuppression, fetchMaterialSyncSuppressions } from '@/lib/materials'
+import {
+    createMaterialSyncSuppression,
+    fetchMaterialSyncSuppressions,
+} from '@/lib/materials'
 import { materialsKeys } from '@/lib/queryKeys'
 import { dateString, inputClass } from '@/lib/utils'
 
@@ -18,11 +22,11 @@ import type { MaterialSyncSuppressionSourceKind } from '@/types'
 
 const SOURCE_KIND_LABELS: Record<MaterialSyncSuppressionSourceKind, string> = {
     uri:               'URI',
-    google_drive_path: 'Google Drive ファイル',
-    google_drive_path_prefix: 'Google Drive フォルダ',
-    google_drive_file: 'Google Drive ファイル Id.',
-    legacy_drive_path: '汎用ファイル',
-    legacy_drive_path_prefix: '汎用フォルダ' }
+    google_drive_path: 'Google Drive path',
+    google_drive_path_prefix: 'Google Drive path prefix',
+    google_drive_file: 'Google Drive file ID',
+    legacy_drive_path: 'Legacy Drive path',
+    legacy_drive_path_prefix: 'Legacy Drive path prefix'}
 
 const REASONS = [
     'copyright_high_risk',
@@ -32,23 +36,7 @@ const REASONS = [
     'malware_or_dangerous_file',
     'duplicate_or_low_quality',
     'source_owner_request',
-    'other'] as const
-
-type MaterialSyncSuppressionReason = typeof REASONS[number]
-
-const REASON_NAMES: Record<MaterialSyncSuppressionReason, string> = {
-    ['copyright_high_risk']: '著作権への懸念',
-    ['copyright_takedown']: '著作者からの申出',
-    ['adult_or_sensitive']: '成人向け',
-    ['personal_information']: '個人情報',
-    ['malware_or_dangerous_file']: '危険なソフトウェア',
-    ['duplicate_or_low_quality']: '重複',
-    ['source_owner_request']: '同期元管理者からの申出',
-    ['other']: 'その他' } as const
-
-
-const reasonName = (reason: string): string =>
-    REASON_NAMES[reason as MaterialSyncSuppressionReason] ?? reason
+    'other']
 
 
 const MaterialSyncSuppressionsPage: FC = () => {
@@ -58,7 +46,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
   const [sourceUri, setSourceUri] = useState ('')
   const [drivePath, setDrivePath] = useState ('')
   const [driveFileId, setDriveFileId] = useState ('')
-  const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
+  const [reason, setReason] = useState (REASONS[0])
 
   const { data, isError, isLoading } = useQuery ({
       queryKey: materialsKeys.suppressions (),
@@ -94,11 +82,18 @@ const MaterialSyncSuppressionsPage: FC = () => {
   return (
       <MainArea>
 	<Helmet>
-	  <title>{`素材同期抑止 | ${ SITE_TITLE }`}</title>
+	  <title>{`同期元抑止 | ${ SITE_TITLE }`}</title>
 	</Helmet>
 
 	<div className="space-y-5">
-	  <PageTitle>同期抑止</PageTitle>
+	  <div className="flex flex-wrap items-center justify-between gap-3">
+	    <PageTitle>同期元抑止</PageTitle>
+	    <PrefetchLink
+		to="/materials"
+		className="text-sm text-sky-700 underline underline-offset-2 dark:text-sky-300">
+	      素材一覧へ戻る
+	    </PrefetchLink>
+	  </div>
 
 	  <form
 	      onSubmit={handleSubmit}
@@ -120,7 +115,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 		    </select>)}
 	      </FormField>
 
-	      <FormField label="同期元 URI">
+	      <FormField label="Source URI">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -129,7 +124,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="Google Drive パス">
+	      <FormField label="Drive path">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -138,7 +133,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="Google Drive ファイル Id.">
+	      <FormField label="Drive file ID">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -147,15 +142,15 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="事由">
+	      <FormField label="理由">
 		{({ invalid }) => (
 		    <select
 			value={reason}
-			onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)}
+			onChange={e => setReason (e.target.value)}
 			className={inputClass (invalid)}>
 		      {REASONS.map (value => (
 			  <option key={value} value={value}>
-			    {REASON_NAMES[value]}
+			    {value}
 			  </option>))}
 		    </select>)}
 	      </FormField>
@@ -190,8 +185,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 		    {suppression.normalizedSourceKey}
 		  </div>
 		  <div className="mt-2 text-sm text-stone-600 dark:text-stone-400">
-		    事由: {reasonName (suppression.reason)} /
-		    登録: {dateString (suppression.createdAt)}
+		    理由: {suppression.reason} / 登録: {dateString (suppression.createdAt)}
 		  </div>
 		</article>))}
 	  </div>

frontend/src/pages/posts/PostDetailPage.tsx

@@ -92,16 +92,16 @@ const PostDetailPage: FC<Props> = ({ user }) => {
 		       : 'bg-gray-500 hover:bg-gray-600')
 
   return (
-      <div
-	  data-sidebar-container
-	  className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
+      <div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
 	<Helmet>
 	  {(post?.thumbnail || post?.thumbnailBase) && (
 	      <meta name="thumbnail" content={post.thumbnail! || post.thumbnailBase!}/>)}
 	  {post && <title>{`${ post.title || post.url } | ${ SITE_TITLE }`}</title>}
 	</Helmet>
 
-	{post && <TagDetailSidebar post={post} className="hidden md:block"/>}
+	<div className="hidden md:block">
+	  {post && <TagDetailSidebar post={post}/>}
+	</div>
 
 	<MainArea className="relative">
 	  {post
@@ -179,7 +179,9 @@ const PostDetailPage: FC<Props> = ({ user }) => {
 	   : 'Loading...'}
 	</MainArea>
 
-	{post && <TagDetailSidebar post={post} sp className="md:hidden"/>}
+	<div className="md:hidden">
+	  {post && <TagDetailSidebar post={post} sp/>}
+	</div>
       </div>)
 }
 

frontend/src/pages/posts/PostHistoryPage.tsx

@@ -91,13 +91,9 @@ const PostHistoryPage: FC = () => {
 	  .filter (p => p.type !== 'removed')
 	  .map (p => p.id)
 	  .join (' ')
-      const duration =
-	  change.videoMs.current == null
-	  ? null
-	  : String (change.videoMs.current / 1_000)
       const originalCreatedFrom = change.originalCreatedFrom.current
       const originalCreatedBefore = change.originalCreatedBefore.current
-      await updatePost ({ id, title, tags, duration, parentPostIds,
+      await updatePost ({ id, title, tags, parentPostIds,
 			  originalCreatedFrom, originalCreatedBefore },
 		        { force: true })
 

frontend/src/pages/posts/PostListPage.tsx

@@ -70,7 +70,6 @@ const PostListPage: FC = () => {
 
   return (
       <div
-	  data-sidebar-container
 	  className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden"
 	  ref={containerRef}>
 	<Helmet>

frontend/src/pages/posts/PostNewPage.test.tsx

@@ -62,24 +62,6 @@ describe ('PostNewPage', () => {
     expect (toastApi.toast).toHaveBeenCalledWith ({ title: '投稿成功!' })
   })
 
-  it ('preserves duration while the video tag is temporarily removed', () => {
-    api.apiGet.mockResolvedValue ([])
-
-    renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
-
-    const tags = screen.getAllByRole ('textbox')[3]
-    fireEvent.change (tags, { target: { value: '動画' } })
-    fireEvent.change (screen.getByRole ('spinbutton'), { target: { value: '180.5' } })
-
-    fireEvent.change (tags, { target: { value: 'general-tag' } })
-    expect (screen.queryByRole ('spinbutton')).not.toBeInTheDocument ()
-
-    fireEvent.change (tags, {
-      target: { value: '動画 general-tag' },
-    })
-    expect (screen.getByRole ('spinbutton')).toHaveValue (180.5)
-  })
-
   it ('shows 422 validation errors for post fields', async () => {
     api.apiGet.mockResolvedValue ([])
     api.isApiError.mockReturnValue (true)

frontend/src/pages/posts/PostNewPage.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useState, useRef } from 'react'
 import { Helmet } from 'react-helmet-async'
 import { useNavigate } from 'react-router-dom'
 
@@ -25,7 +25,7 @@ import type { User } from '@/types'
 type Props = { user: User | null }
 
 type PostFormField =
-    'url' | 'title' | 'tags' | 'parentPostIds' | 'videoMs' | 'originalCreatedAt' | 'thumbnail'
+    'url' | 'title' | 'tags' | 'parentPostIds' | 'originalCreatedAt' | 'thumbnail'
 
 
 const PostNewPage: FC<Props> = ({ user }) => {
@@ -40,7 +40,6 @@ const PostNewPage: FC<Props> = ({ user }) => {
   const [originalCreatedFrom, setOriginalCreatedFrom] = useState<string | null> (null)
   const [parentPostIds, setParentPostIds] = useState ('')
   const [tags, setTags] = useState ('')
-  const [duration, setDuration] = useState ('')
   const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
   const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
   const [thumbnailLoading, setThumbnailLoading] = useState (false)
@@ -52,9 +51,6 @@ const PostNewPage: FC<Props> = ({ user }) => {
 
   const previousURLRef = useRef ('')
   const thumbnailPreviewRef = useRef ('')
-  const videoFlg =
-      useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
-               [tags])
 
   const handleSubmit = async () => {
     clearValidationErrors ()
@@ -64,8 +60,6 @@ const PostNewPage: FC<Props> = ({ user }) => {
     formData.append ('url', url)
     formData.append ('tags', tags)
     formData.append ('parent_post_ids', parentPostIds)
-    if (videoFlg && duration !== '')
-      formData.append ('duration', duration)
     if (thumbnailFile)
       formData.append ('thumbnail', thumbnailFile)
     if (originalCreatedFrom)
@@ -239,20 +233,6 @@ const PostNewPage: FC<Props> = ({ user }) => {
 	      setOriginalCreatedBefore={setOriginalCreatedBefore}
 	      errors={fieldErrors.originalCreatedAt}/>
 
-	  {/* 動画時間 */}
-	  {(videoFlg &&
-	      <FormField label="動画時間" messages={fieldErrors.videoMs}>
-		{({ invalid }) => (
-		    <input
-			type="number"
-			min="0.001"
-			step="0.001"
-			value={duration}
-			onChange={e => setDuration (e.target.value)}
-			aria-invalid={invalid}
-			className={inputClass (invalid)}/>)}
-	      </FormField>)}
-
 	  {/* 送信 */}
 	  <Button onClick={handleSubmit}
 		  className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400"

frontend/src/pages/theatres/TheatreDetailPage.test.tsx

@@ -1,10 +1,9 @@
-import { act, fireEvent, screen, waitFor, within } from '@testing-library/react'
+import { act, fireEvent, screen, waitFor } from '@testing-library/react'
 import { Route, Routes } from 'react-router-dom'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import TheatreDetailPage from '@/pages/theatres/TheatreDetailPage'
 import { buildPost,
-	 buildTag,
 	 buildTheatre,
 	 buildTheatreComment,
 	 buildTheatreInfo,
@@ -88,10 +87,6 @@ const weights = buildTheatrePostSelectionWeights ({
     tags:    [],
   }],
 })
-const watchingUsers = [
-  { id: 1, name: 'tester' },
-  { id: 2, name: 'another' },
-]
 
 const renderPage = (user = buildUser ({ id: 1, role: 'member' })) =>
   renderWithProviders (
@@ -101,24 +96,7 @@ const renderPage = (user = buildUser ({ id: 1, role: 'member' })) =>
       { route: '/theatres/7' },
   )
 
-const tagSection = (): HTMLElement =>
-  screen.getAllByRole ('heading', { name: 'タグ' })[0].closest ('section')!
-
 const mockDefaultApi = () => {
-  let commentsFetched = false
-  let currentTheatreInfo = buildTheatreInfo ({
-    postId:        currentPost.id,
-    postStartedAt: '2026-01-02T03:04:05.000Z',
-    postElapsedMs: 1_000,
-    watchingUsers,
-    skipVote:      {
-      votesCount:         0,
-      requiredCount:      2,
-      watchingUsersCount: watchingUsers.length,
-      voted:              false,
-    },
-  })
-
   api.apiGet.mockImplementation ((path: string) => {
     switch (path)
     {
@@ -126,17 +104,13 @@ const mockDefaultApi = () => {
       return Promise.resolve (theatre)
 
     case '/theatres/7/comments':
-      if (commentsFetched)
-	return Promise.resolve ([])
-
-      commentsFetched = true
       return Promise.resolve ([
-	  buildTheatreComment ({
-	    theatreId: 7,
-	    no:        2,
-	    user:      { id: 1, name: 'tester' },
-	    content:   '視聴コメント',
-	  }),
+        buildTheatreComment ({
+          theatreId: 7,
+          no:        2,
+          user:      { id: 1, name: 'tester' },
+          content:   '視聴コメント',
+        }),
       ])
 
     case '/theatres/7/programmes':
@@ -154,22 +128,32 @@ const mockDefaultApi = () => {
     switch (path)
     {
     case '/theatres/7/watching':
-      return Promise.resolve (currentTheatreInfo)
+      return Promise.resolve (buildTheatreInfo ({
+        postId:        currentPost.id,
+        postStartedAt: '2026-01-02T03:04:05.000Z',
+        postElapsedMs: 1_000,
+        watchingUsers: [{ id: 1, name: 'tester' }],
+        skipVote:      {
+          votesCount:         0,
+          requiredCount:      2,
+          watchingUsersCount: 1,
+          voted:              false,
+        },
+      }))
 
     case '/theatres/7/skip_vote':
-      currentTheatreInfo = buildTheatreInfo ({
-	postId:        currentPost.id,
-	postStartedAt: '2026-01-02T03:04:05.000Z',
-	postElapsedMs: 2_000,
-	watchingUsers,
-	skipVote:      {
-	  votesCount:         1,
-	  requiredCount:      2,
-	  watchingUsersCount: watchingUsers.length,
-	  voted:              true,
-	},
-      })
-      return Promise.resolve (currentTheatreInfo)
+      return Promise.resolve (buildTheatreInfo ({
+        postId:        currentPost.id,
+        postStartedAt: '2026-01-02T03:04:05.000Z',
+        postElapsedMs: 2_000,
+        watchingUsers: [{ id: 1, name: 'tester' }],
+        skipVote:      {
+          votesCount:         1,
+          requiredCount:      2,
+          watchingUsersCount: 1,
+          voted:              true,
+        },
+      }))
 
     default:
       return Promise.reject (new Error (`Unexpected PUT ${ path }`))
@@ -261,53 +245,6 @@ describe ('TheatreDetailPage', () => {
     expect (postEmbed.seek).not.toHaveBeenCalledWith (0)
   })
 
-  it ('shows child tags from the post tag tree in both vertical and horizontal layouts', async () => {
-    const childTag = buildTag ({ id: 12, name: '子タグ', category: 'general' })
-    const parentTag = buildTag ({
-      id:       11,
-      name:     '親タグ',
-      category: 'general',
-      children: [childTag],
-    })
-    const duplicateParentTag = buildTag ({
-      id:       13,
-      name:     '別親タグ',
-      category: 'general',
-      children: [childTag],
-    })
-
-    postsApi.fetchPost.mockResolvedValueOnce (buildPost ({
-      ...currentPost,
-      tags: [parentTag, duplicateParentTag],
-    }))
-
-    renderPage ()
-
-    await screen.findByText ('Embed:上映中の投稿')
-
-    expect (within (tagSection ()).getByRole ('link', { name: '親タグ' }))
-      .toBeInTheDocument ()
-    expect (within (tagSection ()).getByRole ('link', { name: '別親タグ' }))
-      .toBeInTheDocument ()
-    expect (within (tagSection ()).getAllByRole ('link', { name: '子タグ' })[0])
-      .toBeInTheDocument ()
-    expect (within (tagSection ()).getAllByText ('↳').length).toBeGreaterThan (0)
-
-    fireEvent.click (screen.getByRole ('button', { name: '2 列 A 型' }))
-    fireEvent.click (screen.getAllByRole ('button', { name: '横並び' })[0])
-
-    await waitFor (() => {
-      expect (within (tagSection ()).getByRole ('link', { name: '親タグ' }))
-	.toBeInTheDocument ()
-      expect (within (tagSection ()).getByRole ('link', { name: '別親タグ' }))
-	.toBeInTheDocument ()
-      expect (within (tagSection ()).getByRole ('link', { name: '子タグ' }))
-	.toBeInTheDocument ()
-      expect (within (tagSection ()).getAllByRole ('link', { name: '子タグ' }))
-	.toHaveLength (1)
-    })
-  })
-
   it ('does not advance host post while video length is unknown', async () => {
     api.apiPut.mockImplementation ((path: string) => {
       switch (path)

frontend/src/pages/theatres/TheatreDetailPage.tsx

@@ -10,7 +10,6 @@ import PrefetchLink from '@/components/PrefetchLink'
 import TagLink from '@/components/TagLink'
 import FieldError from '@/components/common/FieldError'
 import { useDialogue } from '@/components/dialogues/DialogueProvider'
-import SidebarComponent from '@/components/layout/SidebarComponent'
 import { Button } from '@/components/ui/button'
 import { SITE_TITLE } from '@/config'
 import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
@@ -53,8 +52,6 @@ const INITIAL_WEIGHTS: TheatrePostSelectionWeights =
 
 const LAYOUT_STORAGE_KEY = 'theatre-layout-mode'
 const TAG_FLOW_STORAGE_KEY = 'theatre-tag-flow'
-const MIN_MAIN_WIDTH = 360
-const SIDEBAR_GAP_WIDTH = 16
 
 const LAYOUT_LABELS: Record<TheatreLayoutMode, string> = {
     threeColumns:   '3 列',
@@ -105,28 +102,6 @@ const compareTagName = (a: Tag, b: Tag): number =>
     a.name === b.name ? 0 : (a.name < b.name ? -1 : 1)
 
 
-const flattenTags = (tags: Tag[]): Tag[] => {
-  const flattened: Tag[] = []
-  const seen = new Set<number> ()
-
-  const visit = (tag: Tag) => {
-    if (seen.has (tag.id))
-      return
-
-    seen.add (tag.id)
-    flattened.push (tag)
-
-    for (const child of tag.children ?? [])
-      visit (child)
-  }
-
-  for (const tag of tags)
-    visit (tag)
-
-  return flattened
-}
-
-
 const tagsByCategory = (tags: Tag[]): Partial<Record<Category, Tag[]>> => {
   const grouped: Partial<Record<Category, Tag[]>> = { }
 
@@ -143,39 +118,15 @@ const tagsByCategory = (tags: Tag[]): Partial<Record<Category, Tag[]>> => {
 }
 
 
-const renderReadonlyTagTree = (
-    tag:       Tag,
-    nestLevel: number,
-    path:      string,
-    ancestors: Set<number> = new Set<number> (),
-): ReactNode[] => {
-  const key = `${ path }-${ tag.id }`
-  const nextAncestors = new Set (ancestors)
-  nextAncestors.add (tag.id)
-
-  return [
-      (
-	  <li key={key} className="text-left leading-tight">
-	    <TagLink tag={tag} nestLevel={nestLevel} withCount={false}/>
-	  </li>),
-      ...((tag.children ?? [])
-	  .filter (child => !(nextAncestors.has (child.id)))
-	  .sort (compareTagName)
-	  .flatMap (child =>
-	      renderReadonlyTagTree (child, nestLevel + 1, key, nextAncestors)))]
-}
-
-
 const TagList: FC<{ tags: Tag[]; compact?: boolean; flow?: TagFlow }> = (
     { tags, compact, flow = 'vertical' }) => {
-  const horizontalGrouped = tagsByCategory (flattenTags (tags))
-  const verticalGrouped = tagsByCategory (tags)
+  const grouped = tagsByCategory (tags)
 
   if (flow === 'horizontal')
     {
       return (
 	  <ul className={cn ('flex flex-wrap gap-x-3 gap-y-1', compact && 'text-sm')}>
-	    {CATEGORIES.flatMap (cat => horizontalGrouped[cat] ?? []).map (tag => (
+	    {CATEGORIES.flatMap (cat => grouped[cat] ?? []).map (tag => (
 		<li key={tag.id} className="text-left leading-tight">
 		  <TagLink tag={tag} withCount={false}/>
 		</li>))}
@@ -185,7 +136,7 @@ const TagList: FC<{ tags: Tag[]; compact?: boolean; flow?: TagFlow }> = (
   return (
       <div className="space-y-3">
 	{CATEGORIES.map (cat => {
-	  const rows = verticalGrouped[cat] ?? []
+	  const rows = grouped[cat] ?? []
 	  if (rows.length === 0)
 	    return null
 
@@ -195,8 +146,10 @@ const TagList: FC<{ tags: Tag[]; compact?: boolean; flow?: TagFlow }> = (
 		  {CATEGORY_NAMES[cat]}
 		</div>
 		<ul className={cn ('space-y-1', compact && 'text-sm')}>
-		  {rows.flatMap (tag =>
-		      renderReadonlyTagTree (tag, 0, `cat-${ cat }`))}
+		  {rows.map (tag => (
+		      <li key={tag.id} className="text-left leading-tight">
+			<TagLink tag={tag} withCount={false}/>
+		      </li>))}
 		</ul>
 	      </div>)
 	})}
@@ -214,16 +167,11 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
   const commentsRef = useRef<HTMLDivElement> (null)
   const embedRef = useRef<NiconicoViewerHandle> (null)
   const loadingRef = useRef (false)
-  const sidebarContainerRef = useRef<HTMLDivElement> (null)
   const theatreInfoRef = useRef<TheatreInfo> (INITIAL_THEATRE_INFO)
   const theatreInfoReceivedAtRef = useRef (performance.now ())
   const videoLengthRef = useRef (0)
   const lastCommentNoRef = useRef (0)
 
-  const [leftSidebarWidth, setLeftSidebarWidth] = useState (256)
-  const [rightSidebarWidth, setRightSidebarWidth] = useState (256)
-  const [sidebarContainerWidth, setSidebarContainerWidth] = useState (
-      () => typeof window === 'undefined' ? 0 : window.innerWidth)
   const [comments, setComments] = useState<TheatreComment[]> ([])
   const [content, setContent] = useState ('')
   const [editingPost, setEditingPost] = useState<Post | null> (null)
@@ -266,7 +214,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 
   const applyTheatreInfo = useCallback ((nextInfo: TheatreInfo) => {
     theatreInfoReceivedAtRef.current = performance.now ()
-    theatreInfoRef.current = nextInfo
     setTheatreInfo (nextInfo)
   }, [])
 
@@ -333,17 +280,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
     lastCommentNoRef.current = comments[0]?.no ?? 0
   }, [comments])
 
-  useEffect (() => {
-    const updateSidebarContainerWidth = () => {
-      const nextWidth = sidebarContainerRef.current?.clientWidth ?? window.innerWidth
-      setSidebarContainerWidth (nextWidth)
-    }
-
-    updateSidebarContainerWidth ()
-    window.addEventListener ('resize', updateSidebarContainerWidth)
-    return () => window.removeEventListener ('resize', updateSidebarContainerWidth)
-  }, [])
-
   useEffect (() => {
     if (!(id))
       return
@@ -407,9 +343,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	    setComments (prev => [...newComments, ...prev])
 	  }
 
-	if (loadingRef.current)
-	  return
-
 	const currentInfo = theatreInfoRef.current
 	const ended =
 	    currentInfo.hostFlg
@@ -431,9 +364,8 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	    return
 	  }
 
-	const watchingRequestedAt = performance.now ()
 	const nextInfo = await apiPut<TheatreInfo> (`/theatres/${ id }/watching`)
-	if (!(cancelled) && watchingRequestedAt >= theatreInfoReceivedAtRef.current)
+	if (!(cancelled))
 	  applyTheatreInfo (nextInfo)
       }
       catch (error)
@@ -562,7 +494,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
     if (!(id) || !(post))
       return
 
-    loadingRef.current = true
     setLoading (true)
     try
     {
@@ -591,7 +522,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
     }
     finally
     {
-      loadingRef.current = false
       setLoading (false)
     }
   }
@@ -665,26 +595,6 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
   if (status >= 400)
     return <ErrorScreen status={status}/>
 
-  const singleSidebarMaxWidth = Math.max (
-      192,
-      sidebarContainerWidth - MIN_MAIN_WIDTH - SIDEBAR_GAP_WIDTH)
-  const leftSidebarMaxWidth = layoutMode === 'threeColumns'
-			      ? Math.max (
-				  192,
-				  sidebarContainerWidth
-				  - rightSidebarWidth
-				  - MIN_MAIN_WIDTH
-				  - SIDEBAR_GAP_WIDTH * 2)
-			      : singleSidebarMaxWidth
-  const rightSidebarMaxWidth = layoutMode === 'threeColumns'
-			       ? Math.max (
-				   192,
-				   sidebarContainerWidth
-				   - leftSidebarWidth
-				   - MIN_MAIN_WIDTH
-				   - SIDEBAR_GAP_WIDTH * 2)
-			       : singleSidebarMaxWidth
-
   const tagPanel = (
       <section className="rounded border-zinc-300 p-4 dark:border-zinc-800">
 	<div className="mb-3 flex items-center justify-between gap-3">
@@ -852,26 +762,30 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	  {theatre && <title>{`${ theatreTitle } | ${ SITE_TITLE }`}</title>}
 	</Helmet>
 
-	<div
-	    ref={sidebarContainerRef}
-	    data-sidebar-container
-	    className="flex min-h-full flex-col gap-4 overflow-visible md:h-full md:flex-row
-		       md:overflow-hidden">
+	<div className={cn (
+	    'grid min-h-full gap-4 overflow-visible md:h-full md:overflow-hidden',
+	    (layoutMode === 'threeColumns'
+	     && ['md:grid-cols-[16rem_minmax(0,1fr)_22rem]',
+		 'xl:grid-cols-[18rem_minmax(0,1fr)_24rem]']),
+	    (layoutMode === 'tagsBottom'
+	     && 'md:grid-cols-[minmax(0,1fr)_22rem] xl:grid-cols-[minmax(0,1fr)_24rem]'),
+	    (layoutMode === 'commentsBottom'
+	     && 'md:grid-cols-[16rem_minmax(0,1fr)] xl:grid-cols-[18rem_minmax(0,1fr)]'))}>
 	  {layoutMode !== 'tagsBottom' && (
-	      <SidebarComponent
-		  sidebarKey="theatre-tags"
-		  side="left"
-		  maxWidth={leftSidebarMaxWidth}
-		  onWidthChange={setLeftSidebarWidth}
-		  className="hidden md:block">
-		{tagPanel}
-	      </SidebarComponent>)}
+	      <motion.aside
+		  layout="position"
+		  className="hidden min-w-0 space-y-4 md:order-none md:block md:overflow-y-auto
+			     md:[direction:rtl]">
+		<div className="md:[direction:ltr]">
+		  {tagPanel}
+		</div>
+	      </motion.aside>)}
 
 	  <motion.main
 	      layout="position"
-	      className="order-1 min-w-0 flex-1 space-y-4 md:order-none
-			 md:min-w-[360px] md:overflow-y-auto">
-	    <div className="space-y-4">
+	      className={cn ('order-1 min-w-0 space-y-4 md:order-none md:overflow-y-auto',
+			     layoutMode === 'tagsBottom' && 'md:[direction:rtl]')}>
+	    <div className={cn ('space-y-4', layoutMode === 'tagsBottom' && 'md:[direction:ltr]')}>
 	      <section className="overflow-hidden rounded border-zinc-300
 				  dark:border-zinc-800">
 		<div className="flex flex-wrap items-center justify-between gap-3
@@ -1007,17 +921,12 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
 	  </motion.main>
 
 	  {layoutMode !== 'commentsBottom' && (
-	      <SidebarComponent
-		  sidebarKey="theatre-comments"
-		  side="right"
-		  maxWidth={rightSidebarMaxWidth}
-		  onWidthChange={setRightSidebarWidth}
-		  className="hidden md:block">
-		<div className="space-y-4">
-		  {commentsPanel}
-		  {participantsPanel}
-		</div>
-	      </SidebarComponent>)}
+	      <motion.aside
+		  layout="position"
+		  className="hidden min-w-0 space-y-4 md:order-none md:block md:overflow-y-auto">
+		{commentsPanel}
+		{participantsPanel}
+	      </motion.aside>)}
 	</div>
       </motion.div>)
 }

frontend/src/test/factories.ts

@@ -1,6 +1,6 @@
 import type { Material,
 	      Post,
-	      TagWithSections,
+	      Tag,
 	      Theatre,
 	      TheatreComment,
 	      TheatreInfo,
@@ -9,7 +9,7 @@ import type { Material,
 	      User,
 	      WikiPage } from '@/types'
 
-export const buildTag = (overrides: Partial<TagWithSections> = {}): TagWithSections => ({
+export const buildTag = (overrides: Partial<Tag> = {}): Tag => ({
   id:             1,
   name:           'テストタグ',
   category:       'general',
@@ -23,8 +23,6 @@ export const buildTag = (overrides: Partial<TagWithSections> = {}): TagWithSecti
   materialId:     null,
   hasDeerjikists: false,
   matchedAlias:   null,
-  sections:       [],
-  children:       [],
   ...overrides,
 })
 
@@ -35,7 +33,6 @@ export const buildPost = (overrides: Partial<Post> = {}): Post => ({
   title:                 'テスト投稿',
   thumbnail:             'https://example.com/thumb.jpg',
   thumbnailBase:         null,
-  videoMs:               null,
   tags:                  [buildTag ()],
   parentPosts:           [],
   childPosts:            [],

frontend/src/types.ts

@@ -288,12 +288,11 @@ export type Post = {
     title:                  string | null
     thumbnail:              string | null
     thumbnailBase:          string | null
-    videoMs:                number | null
     postSimilarityEdges?:   {
 			      targetPostId: number
 			      cos:          number
 			  }[]
-    tags:                   TagWithSections[]
+    tags:                   Tag[]
     parentPosts?:           Post[]
     childPosts?:            Post[]
     siblingPosts?:          Record<`${ number }`, Post[]>
@@ -321,7 +320,6 @@ export type PostVersion = {
     url:                    { current: string; prev: string | null }
     thumbnail:              { current: string | null; prev: string | null }
     thumbnailBase:          { current: string | null; prev: string | null }
-    videoMs:                { current: number | null; prev: number | null }
     tags:                   { name: string
 			      type: 'context' | 'added' | 'removed' }[]
     parentPosts:            { id: number
@@ -371,10 +369,6 @@ export type TagVersion = {
     createdAt:              string
     createdByUser:          { id: number; name: string | null } | null }
 
-export type TagWithSections = Omit<Tag, 'children'> & { sections: { beginMs:  number
-								    endMs:    number | null }[]
-					              children: TagWithSections[] }
-
 export type Theatre = {
     id:             number
     name:           string | null