#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
+- Never place a closing parenthesis at the beginning of a line.
-  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 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/material_sync_suppressions_controller.rb

@@ -1,49 +0,0 @@
-class MaterialSyncSuppressionsController < ApplicationController
-  def index
-    return head :unauthorized unless current_user
-    return head :forbidden unless current_user.gte_member?
-
-    suppressions =
-        MaterialSyncSuppression
-        .includes(:created_by_user)
-        .order(created_at: :desc, id: :desc)
-
-    render json: { suppressions: suppressions.map { |s| repr(s) } }
-  end
-
-  def create
-    return head :unauthorized unless current_user
-    return head :forbidden unless current_user.gte_member?
-
-    suppression =
-        MaterialSyncSuppressionRegistrar.create!(suppression_params,
-                                                 created_by_user: current_user)
-
-    render json: repr(suppression), status: :created
-  rescue ActiveRecord::RecordInvalid => e
-    render_validation_error e.record
-  end
-
-  private
-
-  def suppression_params
-    params.permit(:source_kind,
-                  :source_uri,
-                  :drive_path,
-                  :drive_file_id,
-                  :reason)
-  end
-
-  def repr suppression
-    { id: suppression.id,
-      source_kind: suppression.source_kind,
-      source_uri: suppression.source_uri,
-      drive_path: suppression.drive_path,
-      drive_file_id: suppression.drive_file_id,
-      normalized_source_key: suppression.normalized_source_key,
-      reason: suppression.reason,
-      created_by_user: suppression.created_by_user&.as_json(UserRepr::BASE),
-      created_at: suppression.created_at,
-      updated_at: suppression.updated_at }
-  end
-end

backend/app/controllers/material_versions_controller.rb

@@ -1,54 +0,0 @@
-class MaterialVersionsController < ApplicationController
-  def index
-    page = (params[:page].presence || 1).to_i
-    limit = (params[:limit].presence || 20).to_i
-
-    page = 1 if page < 1
-    limit = 1 if limit < 1
-
-    offset = (page - 1) * limit
-
-    q = MaterialVersion.includes(:created_by_user)
-    q = q.where(material_id: params[:material_id]) if params[:material_id].present?
-    q = q.where(tag_name: params[:tag].to_s.strip) if params[:tag].present?
-    q = q.where(event_type: params[:event_type]) if params[:event_type].present?
-
-    count = q.except(:order, :limit, :offset).count
-    versions =
-        q
-        .order(Arel.sql('material_versions.created_at DESC, material_versions.id DESC'))
-        .limit(limit)
-        .offset(offset)
-
-    render json: { versions: serialise_versions(versions), count: }
-  end
-
-  private
-
-  def serialise_versions rows
-    rows.map do |row|
-      { id: row.id,
-        material_id: row.material_id,
-        version_no: row.version_no,
-        event_type: row.event_type,
-        tag_id: row.tag_id,
-        tag_name: row.tag_name,
-        tag_category: row.tag_category,
-        url: row.url,
-        source_kind: row.source_kind,
-        source_uri: row.source_uri,
-        source_path: row.source_path,
-        source_file_id: row.source_file_id,
-        normalized_source_key: row.normalized_source_key,
-        file_blob_id: row.file_blob_id,
-        file_filename: row.file_filename,
-        file_content_type: row.file_content_type,
-        file_byte_size: row.file_byte_size,
-        file_sha256: row.file_sha256,
-        export_paths_json: row.export_paths_hash,
-        discarded_at: row.discarded_at,
-        created_by_user: row.created_by_user&.as_json(UserRepr::BASE),
-        created_at: row.created_at }
-    end
-  end
-end

backend/app/controllers/materials_controller.rb

@@ -1,6 +1,3 @@
-require 'set'
-
-
 class MaterialsController < ApplicationController
   rescue_from MaterialZipExporter::EmptyExportError, with: :render_zip_empty
   rescue_from MaterialZipExporter::DuplicatePathError, with: :render_zip_duplicate_path
@@ -16,14 +13,14 @@ class MaterialsController < ApplicationController
     offset = (page - 1) * limit
 
     filters = material_index_filters
-    tag_graph = material_index_tag_graph(filters)
     q = Material.includes(:material_export_items,
                           thumbnail_attachment: :blob,
                           file_attachment: :blob,
                           tag: :tag_name)
+    q = q.where(file_suppressed_at: nil) if filters[:suppression] == 'active'
+    q = q.where.not(file_suppressed_at: nil) if filters[:suppression] == 'suppressed'
     q = q.where(tag_id: nil) if filters[:tag_state] == 'untagged'
     q = q.where.not(tag_id: nil) if filters[:tag_state] == 'tagged'
-    q = apply_material_tag_filter(q, filters, tag_graph)
     q = q.where('materials.created_at >= ?', filters[:created_from]) if filters[:created_from]
     q = q.where('materials.created_at <= ?', filters[:created_to]) if filters[:created_to]
     q = q.where('materials.updated_at >= ?', filters[:updated_from]) if filters[:updated_from]
@@ -42,16 +39,8 @@ class MaterialsController < ApplicationController
         .offset(offset)
         .to_a
 
-    response = { materials: MaterialRepr.list_many(materials, host: request.base_url),
+    render json: { materials: MaterialRepr.list_many(materials, host: request.base_url),
-                 count: }
+                   count: }
-    if filters[:tag_id]
-      response[:tag_scope] = material_index_tag_scope(filters, tag_graph)
-    end
-    if filters[:group_by] == 'parent_tag'
-      response[:groups] = material_index_groups(materials, tag_graph)
-    end
-
-    render json: response
   end
 
   def show
@@ -108,7 +97,8 @@ class MaterialsController < ApplicationController
     end
 
     if material
-      log_thumbnail_generation(material, MaterialThumbnailGenerator.generate!(material))
+      MaterialThumbnailGenerator.generate!(material)
+      material.reload
       render json: MaterialRepr.base(material, host: request.base_url), status: :created
     else
       render_validation_error material
@@ -146,6 +136,7 @@ class MaterialsController < ApplicationController
         material.assign_attributes(tag:, url:, updated_by_user: current_user)
         if uploaded_blob
           material.file.attach(uploaded_blob)
+          clear_file_suppression!(material)
         elsif params.key?(:url) && url.present? && file.blank?
           material.file.detach
         end
@@ -159,7 +150,8 @@ class MaterialsController < ApplicationController
       raise
     end
 
-    log_thumbnail_generation(material, MaterialThumbnailGenerator.generate!(material))
+    MaterialThumbnailGenerator.generate!(material)
+    material.reload
 
     render json: MaterialRepr.base(material, host: request.base_url)
   end
@@ -190,6 +182,37 @@ class MaterialsController < ApplicationController
               filename: "btrc-materials-#{ profile }.zip"
   end
 
+  def suppress_file
+    return head :unauthorized unless current_user
+    return head :forbidden unless current_user.admin?
+
+    material = Material.with_attached_file.find_by(id: params[:id])
+    return head :not_found unless material
+
+    reason = params[:reason].to_s.strip.presence
+    return render_unprocessable_entity('理由は必須です．', field: :reason) unless reason
+    purge = bool?(:purge)
+    file_snapshot = purge_material_file_snapshot(material) if purge
+    attachment = purge && material.file.attached? ? material.file.attachment : nil
+
+    Material.transaction do
+      MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
+      material.update!(file_suppressed_at: Time.current,
+                       file_suppressed_by_user: current_user,
+                       file_suppression_reason: reason,
+                       updated_by_user: current_user)
+      MaterialVersionRecorder.record!(material:, event_type: :suppress,
+                                      created_by_user: current_user,
+                                      file_snapshot:)
+    end
+    # Enqueue failure raises here after the suppress metadata has been committed.
+    # In that case the file remains suppressed in UI/ZIP and purge can be retried.
+    attachment&.purge_later
+    material.reload if purge
+
+    render json: MaterialRepr.base(material, host: request.base_url)
+  end
+
   private
 
   def material_index_filters
@@ -202,6 +225,9 @@ class MaterialsController < ApplicationController
       media_kind = 'all'
     end
 
+    suppression = params[:suppression].to_s.presence
+    suppression = 'active' unless ['active', 'suppressed', 'all'].include?(suppression)
+
     sort = params[:sort].to_s.presence
     unless ['created_at', 'updated_at', 'tag_name', 'media_kind', 'file_byte_size',
             'version_no', 'id'].include?(sort)
@@ -211,18 +237,10 @@ class MaterialsController < ApplicationController
     direction = params[:direction].to_s.downcase
     direction = 'desc' unless ['asc', 'desc'].include?(direction)
 
-    group_by = params[:group_by].to_s.presence
-    group_by = 'none' unless ['none', 'parent_tag'].include?(group_by)
-
-    tag_id = params[:tag_id].to_i
-    tag_id = nil if tag_id <= 0
-
     { q: params[:q].to_s.strip.presence,
       tag_state:,
       media_kind:,
-      tag_id:,
+      suppression:,
-      include_descendants: bool?(:include_descendants),
-      group_by:,
       created_from: parse_time_param(:created_from),
       created_to: parse_time_param(:created_to),
       updated_from: parse_time_param(:updated_from),
@@ -292,147 +310,6 @@ class MaterialsController < ApplicationController
     end
   end
 
-  def apply_material_tag_filter q, filters, tag_graph
-    return q unless filters[:tag_id]
-
-    tag_ids =
-        if tag_graph
-          tag_graph[:scope_tag_ids]
-        else
-          [filters[:tag_id]]
-        end
-
-    q.where(tag_id: tag_ids)
-  end
-
-  def material_index_tag_graph filters
-    return nil unless filters[:tag_id]
-
-    children_by_parent_id = Hash.new { |h, k| h[k] = [] }
-    TagImplication.pluck(:parent_tag_id, :tag_id).each do |parent_id, child_id|
-      children_by_parent_id[parent_id] << child_id
-    end
-
-    scope_tag_ids =
-        if filters[:include_descendants]
-          collect_material_descendant_ids(filters[:tag_id], children_by_parent_id)
-        else
-          Set.new([filters[:tag_id]])
-        end
-    tags_by_id =
-        Tag
-        .joins(:tag_name)
-        .where(id: scope_tag_ids)
-        .pluck('tags.id', 'tag_names.name', 'tags.category', 'tags.deprecated_at')
-        .each_with_object({ }) do |(id, name, category, deprecated_at), hash|
-          hash[id] = { id:, name:, category:, deprecated: deprecated_at.present? }
-        end
-
-    selected_tag = tags_by_id[filters[:tag_id]]
-    return nil unless selected_tag
-
-    group_tag_id_by_tag_id = { }
-    children_by_parent_id[filters[:tag_id]].each do |child_tag_id|
-      assign_material_group_branch(child_tag_id,
-                                   children_by_parent_id:,
-                                   tags_by_id:,
-                                   group_tag_id_by_tag_id:,
-                                   current_group_tag_id: nil,
-                                   seen: Set.new([filters[:tag_id]]))
-    end
-
-    { selected_tag_id: filters[:tag_id],
-      selected_tag:,
-      scope_tag_ids: scope_tag_ids.to_a,
-      tags_by_id:,
-      group_tag_id_by_tag_id: }
-  end
-
-  def collect_material_descendant_ids selected_tag_id, children_by_parent_id
-    ids = Set.new([selected_tag_id])
-    stack = [selected_tag_id]
-
-    until stack.empty?
-      tag_id = stack.pop
-      children_by_parent_id[tag_id].each do |child_tag_id|
-        next if ids.include?(child_tag_id)
-
-        ids << child_tag_id
-        stack << child_tag_id
-      end
-    end
-
-    ids
-  end
-
-  def assign_material_group_branch tag_id, children_by_parent_id:, tags_by_id:,
-                                   group_tag_id_by_tag_id:, current_group_tag_id:, seen:
-    return if seen.include?(tag_id)
-
-    tag = tags_by_id[tag_id]
-    return unless tag
-
-    seen = seen.dup << tag_id
-    next_group_tag_id = current_group_tag_id
-    next_group_tag_id = tag_id if next_group_tag_id.nil? && !tag[:deprecated]
-    group_tag_id_by_tag_id[tag_id] = next_group_tag_id if next_group_tag_id
-
-    children_by_parent_id[tag_id].each do |child_tag_id|
-      assign_material_group_branch(child_tag_id,
-                                   children_by_parent_id:,
-                                   tags_by_id:,
-                                   group_tag_id_by_tag_id:,
-                                   current_group_tag_id: next_group_tag_id,
-                                   seen:)
-    end
-  end
-
-  def material_index_groups materials, tag_graph
-    return [] unless tag_graph
-
-    groups_by_key = { }
-
-    materials.each do |material|
-      next unless material.tag_id
-
-      group_tag_id =
-          if material.tag_id == tag_graph[:selected_tag_id]
-            tag_graph[:selected_tag_id]
-          else
-            tag_graph[:group_tag_id_by_tag_id][material.tag_id] || tag_graph[:selected_tag_id]
-          end
-
-      group_tag = tag_graph[:tags_by_id][group_tag_id]
-      next unless group_tag
-
-      key = "tag:#{ group_tag_id }"
-      group =
-          groups_by_key[key] ||= { key:,
-                                   tag: group_tag_repr(group_tag),
-                                   material_ids: [],
-                                   count: 0 }
-      group[:material_ids] << material.id
-      group[:count] += 1
-    end
-
-    groups_by_key.values.sort_by { |group| group[:tag][:name] }
-  end
-
-  def material_index_tag_scope filters, tag_graph
-    return nil unless tag_graph
-
-    {
-      tag: group_tag_repr(tag_graph[:selected_tag]),
-      include_descendants: filters[:include_descendants]
-    }
-  end
-
-  def group_tag_repr group_tag
-    { id: group_tag[:id],
-      name: group_tag[:name],
-      category: group_tag[:category] }
-  end
-
   def material_index_order_sql filters
     direction = filters[:direction] == 'asc' ? 'ASC' : 'DESC'
     sort_sql =
@@ -523,23 +400,37 @@ class MaterialsController < ApplicationController
         content_type: file.content_type,
     )
 
-    MaterialFileSha256.assign_metadata_sha256!(blob, file_sha256)
+    if file_sha256.present?
+      blob.metadata['sha256'] = file_sha256
+      blob.save! if blob.changed?
+    end
 
     blob
   ensure
     file.tempfile.rewind if file&.tempfile
   end
 
+  def clear_file_suppression! material
+    material.file_suppressed_at = nil
+    material.file_suppressed_by_user = nil
+    material.file_suppression_reason = nil
+  end
+
+  def purge_material_file_snapshot material
+    return nil unless material.file.attached?
+
+    blob = material.file.blob
+
+    { file_blob_id: blob.id,
+      file_filename: blob.filename.to_s,
+      file_content_type: blob.content_type,
+      file_byte_size: blob.byte_size,
+      file_checksum: blob.checksum,
+      file_sha256: blob.metadata['sha256'] ||
+                   MaterialFileSha256.from_blob(blob, allow_download: true) }
+  end
+
   def render_material_import_block block
     render_validation_error fields: { file: ["抑止された素材です: #{ block.reason }"] }
   end
-
-  def log_thumbnail_generation material, result
-    material.reload
-    Rails.logger.info(
-        "Material thumbnail generation: material_id=#{ material.id } " \
-        "result=#{ result } " \
-        "thumbnail_attached=#{ material.thumbnail.attached? } " \
-        "content_type=#{ material.content_type }")
-  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)
@@ -378,20 +379,12 @@ class TagsController < ApplicationController
   end
 
   def visible_root_tag_ids graph
-    root_ids = Set.new
+    graph[:tags_by_id].filter_map do |tag_id, _attrs|
-
-    graph[:tags_by_id].each do |tag_id, attrs|
       next unless visible_root_tag?(tag_id, graph)
       next unless visible_subtree?(tag_id, graph)
 
-      if attrs[:deprecated]
+      tag_id
-        collect_visible_child_tag_ids(tag_id, graph, root_ids, Set.new)
-      else
-        root_ids << tag_id
-      end
     end
-
-    root_ids.to_a
   end
 
   def visible_root_tag? tag_id, graph
@@ -534,67 +527,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/material.rb

@@ -1,9 +1,6 @@
 class Material < ApplicationRecord
   include MyDiscard
 
-  SOURCE_KINDS = ['uri', 'google_drive_path', 'google_drive_file',
-                  'legacy_drive_path'].freeze
-
   default_scope -> { kept }
 
   belongs_to :parent, class_name: 'Material', optional: true
@@ -12,6 +9,7 @@ class Material < ApplicationRecord
   belongs_to :tag, optional: true
   belongs_to :created_by_user, class_name: 'User', optional: true
   belongs_to :updated_by_user, class_name: 'User', optional: true
+  belongs_to :file_suppressed_by_user, class_name: 'User', optional: true
 
   has_many :material_versions, dependent: :destroy
   has_many :material_export_items, dependent: :destroy
@@ -19,17 +17,13 @@ class Material < ApplicationRecord
   has_one_attached :file, dependent: :purge
   has_one_attached :thumbnail, dependent: :purge
 
-  before_validation :assign_normalized_source_key
+  validates :tag_id, presence: true, uniqueness: true
-
-  validates :tag_id, uniqueness: true, allow_nil: true
-  validates :source_kind,
-            inclusion: { in: SOURCE_KINDS },
-            allow_blank: true
 
   validate :file_must_be_attached
   validate :tag_must_be_material_category
 
   def content_type
+    return nil if file_suppressed?
     return nil unless file&.attached?
 
     file.blob.content_type
@@ -47,25 +41,14 @@ class Material < ApplicationRecord
     file.blob.filename.to_s
   end
 
+  def file_suppressed? = file_suppressed_at.present?
+
   def snapshot_export_paths
     material_export_items.order(:profile).pluck(:profile, :export_path).to_h
   end
 
   private
 
-  def assign_normalized_source_key
-    if source_kind.blank?
-      self.normalized_source_key = nil
-      return
-    end
-
-    self.normalized_source_key =
-        MaterialSyncSuppression.normalize_source_key(source_kind:,
-                                                     source_uri:,
-                                                     drive_path: source_path,
-                                                     drive_file_id: source_file_id)
-  end
-
   def file_must_be_attached
     return if url.present? || file.attached?
 

backend/app/models/material_sync_source.rb

@@ -1,45 +0,0 @@
-class MaterialSyncSource < ApplicationRecord
-  SOURCE_KINDS = ['uri', 'google_drive_path', 'google_drive_file', 'legacy_drive_path'].freeze
-
-  belongs_to :created_by_user, class_name: 'User', optional: true
-  belongs_to :updated_by_user, class_name: 'User', optional: true
-
-  validates :name, presence: true
-  validates :source_kind,
-            presence: true,
-            inclusion: { in: SOURCE_KINDS }
-  validates :profile, presence: true, inclusion: { in: MaterialExportItem::VALID_PROFILES }
-  validate :source_value_must_be_present
-
-  scope :enabled, -> { where(enabled: true) }
-
-  def normalized_source_key
-    MaterialSyncSuppression.normalize_source_key(source_kind:,
-                                                 source_uri:,
-                                                 source_path:,
-                                                 source_file_id:)
-  end
-
-  private
-
-  def source_value_must_be_present
-    return if source_value_present?
-
-    errors.add(:base, '同期元を指定してください．')
-  end
-
-  def source_value_present?
-    case source_kind
-    when 'uri'
-      source_uri.present?
-    when 'google_drive_file'
-      source_file_id.present? || source_uri.present?
-    when 'google_drive_path'
-      source_file_id.present? || source_uri.present?
-    when 'legacy_drive_path'
-      source_path.present?
-    else
-      normalized_source_key.present?
-    end
-  end
-end

backend/app/models/material_sync_suppression.rb

@@ -1,105 +0,0 @@
-class MaterialSyncSuppression < ApplicationRecord
-  SOURCE_KINDS = [
-    'uri',
-    'google_drive_path',
-    'google_drive_path_prefix',
-    'google_drive_file',
-    'legacy_drive_path',
-    'legacy_drive_path_prefix'
-  ].freeze
-
-  REASONS = [
-    'copyright_high_risk',
-    'copyright_takedown',
-    'adult_or_sensitive',
-    'personal_information',
-    'malware_or_dangerous_file',
-    'duplicate_or_low_quality',
-    'source_owner_request',
-    'other'
-  ].freeze
-
-  belongs_to :created_by_user, class_name: 'User', optional: true
-
-  before_validation :assign_normalized_source_key
-
-  validates :source_kind, presence: true, inclusion: { in: SOURCE_KINDS }
-  validates :reason, presence: true, inclusion: { in: REASONS }
-  validates :normalized_source_key, presence: true, uniqueness: true
-  validate :source_value_must_be_present
-  validate :drive_path_must_be_safe_relative_path
-
-  def self.normalize_source_key source_kind:,
-                                source_uri: nil,
-                                drive_path: nil,
-                                drive_file_id: nil,
-                                source_path: nil,
-                                source_file_id: nil
-    kind = source_kind.to_s
-    value =
-        case kind
-        when 'uri'
-          source_uri.to_s.strip
-        when 'google_drive_path', 'google_drive_path_prefix',
-             'legacy_drive_path', 'legacy_drive_path_prefix'
-          (source_path || drive_path).to_s.strip.gsub(%r{/+}, '/')
-        when 'google_drive_file'
-          (source_file_id || drive_file_id).to_s.strip
-        else
-          ''
-        end
-
-    return nil if kind.blank? || value.blank?
-
-    "#{ kind }:#{ value }"
-  end
-
-  private
-
-  def assign_normalized_source_key
-    normalize_path_fields!
-    self.normalized_source_key =
-        self.class.normalize_source_key(source_kind:,
-                                        source_uri:,
-                                        drive_path:,
-                                        drive_file_id:)
-  end
-
-  def source_value_must_be_present
-    return if normalized_source_key.present?
-
-    errors.add(:base, '同期元を指定してください．')
-  end
-
-  def drive_path_must_be_safe_relative_path
-    return unless source_kind.in?(
-        ['google_drive_path', 'google_drive_path_prefix',
-         'legacy_drive_path', 'legacy_drive_path_prefix'])
-
-    value = drive_path.to_s
-    return if value.blank?
-
-    if value.start_with?('/') || value.match?(/\A[A-Za-z]:\//)
-      errors.add(:drive_path, '相対 path を指定してください．')
-    end
-    if value.start_with?('My Drive/', 'マイドライブ/')
-      errors.add(:drive_path, '同期元フォルダからの相対 path を指定してください．')
-    end
-    errors.add(:drive_path, 'NUL は使へません．') if value.include?("\0")
-    errors.add(:drive_path, '連続スラッシュは使へません．') if value.include?('//')
-    errors.add(:drive_path, '末尾スラッシュは使へません．') if value.end_with?('/')
-
-    parts = value.split('/')
-    if parts.any? { |part| part.in?(['.', '..']) }
-      errors.add(:drive_path, '. や .. は使へません．')
-    end
-  end
-
-  def normalize_path_fields!
-    return unless source_kind.in?(
-        ['google_drive_path', 'google_drive_path_prefix',
-         'legacy_drive_path', 'legacy_drive_path_prefix'])
-
-    self.drive_path = drive_path.to_s.tr('\\', '/').strip.presence
-  end
-end

backend/app/models/material_version.rb

@@ -2,7 +2,8 @@ class MaterialVersion < ApplicationRecord
   EVENT_TYPE_MAP = { create: 'create',
                      update: 'update',
                      discard: 'discard',
-                     restore: 'restore' }.freeze
+                     restore: 'restore',
+                     suppress: 'suppress' }.freeze
 
   include VersionRecord
 

backend/app/representations/material_repr.rb

@@ -2,9 +2,8 @@
 
 
 module MaterialRepr
-  BASE = { only: [:id, :url, :version_no, :source_kind, :source_uri,
+  BASE = { only: [:id, :url, :version_no, :file_suppressed_at,
-                  :source_path, :source_file_id, :normalized_source_key,
+                  :file_suppression_reason, :created_at, :updated_at],
-                  :created_at, :updated_at],
            methods: [:content_type],
            include: { tag: TagRepr::BASE,
                       created_by_user: UserRepr::BASE,
@@ -14,7 +13,7 @@ module MaterialRepr
 
   def base material, host:
     material.as_json(BASE).merge(
-        file: if material.file.attached?
+        file: if material.file.attached? && !material.file_suppressed?
                 Rails.application.routes.url_helpers.rails_storage_proxy_url(
                     material.file, host:)
               end,
@@ -35,11 +34,6 @@ module MaterialRepr
     { id: material.id,
       version_no: material.version_no,
       url: material.url,
-      source_kind: material.source_kind,
-      source_uri: material.source_uri,
-      source_path: material.source_path,
-      source_file_id: material.source_file_id,
-      normalized_source_key: material.normalized_source_key,
       tag: compact_tag(material.tag),
       thumbnail: thumbnail_url(material, host:),
       thumbnail_fallback_text: thumbnail_fallback_text(material),
@@ -47,6 +41,7 @@ module MaterialRepr
       media_kind: media_kind(material),
       content_type: material.content_type,
       file_byte_size: material.file_byte_size,
+      file_suppressed_at: material.file_suppressed_at,
       created_at: material.created_at,
       updated_at: material.updated_at,
       export_paths: export_paths(material),
@@ -73,6 +68,7 @@ module MaterialRepr
   end
 
   def thumbnail_url material, host:
+    return nil if material.file_suppressed?
     return nil unless material.thumbnail.attached?
 
     Rails.application.routes.url_helpers.rails_storage_proxy_url(
@@ -88,6 +84,7 @@ module MaterialRepr
   end
 
   def media_kind material
+    return 'suppressed' if material.file_suppressed?
     return 'url_only' unless material.file.attached?
 
     content_type = material.file.blob.content_type.to_s

backend/app/services/google_drive/api_client.rb

@@ -1,233 +0,0 @@
-require 'json'
-require 'jwt'
-require 'net/http'
-require 'openssl'
-require 'tempfile'
-require 'uri'
-
-
-module GoogleDrive
-  class ApiClient
-    DRIVE_ENDPOINT = 'https://www.googleapis.com/drive/v3'
-    TOKEN_ENDPOINT = 'https://oauth2.googleapis.com/token'
-    FOLDER_MIME_TYPE = 'application/vnd.google-apps.folder'
-    NATIVE_FILE_MIME_TYPE_PREFIX = 'application/vnd.google-apps.'
-    DRIVE_SCOPE = 'https://www.googleapis.com/auth/drive.readonly'
-
-    def initialize service_account_email: ENV['GOOGLE_DRIVE_SERVICE_ACCOUNT_EMAIL'],
-                   private_key: ENV['GOOGLE_DRIVE_PRIVATE_KEY'],
-                   private_key_path: ENV['GOOGLE_DRIVE_PRIVATE_KEY_PATH'],
-                   subject: ENV['GOOGLE_DRIVE_SUBJECT']
-      @service_account_email = service_account_email.to_s
-      @private_key = load_private_key(private_key, private_key_path)
-      @subject = subject.to_s.presence
-      @access_token = nil
-    end
-
-    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)
-      end
-    end
-
-    def fetch_material_file file_id
-      metadata = get_file(file_id)
-      return nil if native_file?(metadata['mimeType'])
-
-      build_file_entry(metadata, metadata['name'])
-    end
-
-    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)
-      end
-      tempfile.rewind
-      tempfile
-    rescue StandardError
-      tempfile&.close!
-      raise
-    end
-
-    def extract_file_id value
-      raw = value.to_s.strip
-      return nil if raw.blank?
-      return raw unless raw.include?('/')
-
-      uri = URI.parse(raw)
-      return uri.query.to_s[%r{(?:^|&)id=([^&]+)}, 1] if uri.query.present?
-      return uri.path[%r{/folders/([^/]+)}, 1] if uri.path.include?('/folders/')
-
-      uri.path[%r{/d/([^/]+)}, 1]
-    rescue URI::InvalidURIError
-      nil
-    end
-
-    private
-
-    def walk_folder folder_id, prefix, &block
-      list_children(folder_id).each do |entry|
-        relative_path = MaterialSyncExportPath.build(prefix:,
-                                                     relative_path: entry['name'])
-        if entry['mimeType'] == FOLDER_MIME_TYPE
-          walk_folder(entry['id'], relative_path, &block)
-          next
-        end
-
-        block.call(entry, relative_path)
-      end
-    end
-
-    def build_file_entry entry, relative_path
-      { id: entry['id'],
-        name: entry['name'],
-        mime_type: entry['mimeType'],
-        relative_path: MaterialSyncExportPath.normalize_path(relative_path),
-        sha256_checksum: entry['sha256Checksum'],
-        web_view_link: entry['webViewLink'],
-        web_content_link: entry['webContentLink'] }
-    end
-
-    def list_children folder_id
-      files = []
-      page_token = nil
-
-      loop do
-        response =
-            request_json('/files', {
-                q: "'#{ folder_id }' in parents and trashed = false",
-                fields: 'nextPageToken,files(id,name,mimeType,sha256Checksum,' \
-                        'webViewLink,webContentLink)',
-                orderBy: 'folder,name',
-                pageSize: 1000,
-                supportsAllDrives: true,
-                includeItemsFromAllDrives: true,
-                pageToken: page_token }.compact)
-        files.concat(response.fetch('files'))
-        page_token = response['nextPageToken']
-        break if page_token.blank?
-      end
-
-      files
-    end
-
-    def get_file file_id
-      request_json("/files/#{ file_id }",
-                   fields: 'id,name,mimeType,sha256Checksum,webViewLink,webContentLink',
-                   supportsAllDrives: true)
-    end
-
-    def request_json path, params = {}
-      response = request(:get, path, params:)
-      unless response.is_a?(Net::HTTPSuccess)
-        raise "Google Drive API error: #{ response.code } #{ response.body }"
-      end
-
-      JSON.parse(response.body)
-    end
-
-    def request_binary path, params = {}
-      request(:get, path, params:) do |response|
-        unless response.is_a?(Net::HTTPSuccess)
-          raise "Google Drive download error: #{ response.code } #{ response.body }"
-        end
-
-        response.read_body do |chunk|
-          yield chunk.b
-        end
-      end
-    end
-
-    def request method, path, params: nil
-      uri = URI(DRIVE_ENDPOINT + path)
-      uri.query = URI.encode_www_form(params) if params.present?
-
-      klass =
-          case method
-          when :get
-            Net::HTTP::Get
-          else
-            raise ArgumentError, "Unsupported Google Drive request method: #{ method }"
-          end
-      request = klass.new(uri)
-      request['Authorization'] = "Bearer #{ access_token }"
-
-      Net::HTTP.start(uri.host,
-                      uri.port,
-                      use_ssl: true,
-                      open_timeout: 10,
-                      read_timeout: 60) do |http|
-        if block_given?
-          http.request(request) do |response|
-            return yield response
-          end
-        else
-          http.request(request)
-        end
-      end
-    end
-
-    def access_token
-      @access_token ||= fetch_access_token
-    end
-
-    def fetch_access_token
-      raise 'GOOGLE_DRIVE_SERVICE_ACCOUNT_EMAIL is required' if @service_account_email.blank?
-      raise 'Google Drive private key is required' if @private_key.blank?
-
-      payload = { iss: @service_account_email,
-                  scope: DRIVE_SCOPE,
-                  aud: TOKEN_ENDPOINT,
-                  exp: 1.hour.from_now.to_i,
-                  iat: Time.current.to_i }
-      payload[:sub] = @subject if @subject.present?
-
-      assertion = JWT.encode(payload, @private_key, 'RS256')
-      uri = URI(TOKEN_ENDPOINT)
-      request = Net::HTTP::Post.new(uri)
-      request.set_form_data(
-          grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-          assertion:)
-
-      response =
-          Net::HTTP.start(uri.host,
-                          uri.port,
-                          use_ssl: true,
-                          open_timeout: 10,
-                          read_timeout: 30) do |http|
-            http.request(request)
-          end
-      unless response.is_a?(Net::HTTPSuccess)
-        raise "Google OAuth error: #{ response.code } #{ response.body }"
-      end
-
-      JSON.parse(response.body).fetch('access_token')
-    end
-
-    def load_private_key private_key, private_key_path
-      raw = private_key.to_s
-      raw = raw.gsub('\n', "\n") if raw.present?
-      raw = File.read(private_key_path) if raw.blank? && private_key_path.present?
-      return nil if raw.blank?
-
-      OpenSSL::PKey::RSA.new(raw)
-    end
-
-    def native_file? mime_type
-      mime_type.to_s.start_with?(NATIVE_FILE_MIME_TYPE_PREFIX)
-    end
-  end
-end

backend/app/services/material_file_sha256.rb

@@ -1,39 +1,16 @@
 require 'digest'
-require 'json'
 
 class MaterialFileSha256
-  def self.blob_metadata blob
-    metadata = blob.metadata
-    return metadata if metadata.is_a?(Hash)
-    return { } if metadata.blank?
-
-    JSON.parse(metadata)
-  rescue JSON::ParserError
-    { }
-  end
-
-  def self.metadata_sha256 blob
-    blob_metadata(blob)['sha256'].presence
-  end
-
-  def self.assign_metadata_sha256! blob, sha256
-    return if sha256.blank?
-
-    metadata = blob_metadata(blob)
-    metadata['sha256'] = sha256
-    blob.metadata = metadata
-    blob.save! if blob.changed?
-  end
-
   def self.from_blob blob, allow_download: false
-    sha256 = metadata_sha256(blob)
+    sha256 = blob.metadata['sha256']
     return sha256 if sha256.present?
     return nil unless allow_download
 
     begin
       blob.open do |file|
         sha256 = Digest::SHA256.file(file.path).hexdigest
-        assign_metadata_sha256!(blob, sha256)
+        blob.metadata['sha256'] = sha256
+        blob.save! if blob.changed?
         sha256
       end
     rescue ActiveStorage::FileNotFoundError, ArgumentError => error

backend/app/services/material_sync_export_path.rb

@@ -1,56 +0,0 @@
-class MaterialSyncExportPath
-  class << self
-    def build prefix: nil, relative_path: nil, filename: nil, source_file_id: nil
-      path = normalize_path(relative_path)
-      path = fallback_filename(filename, source_file_id) if path.blank?
-
-      normalized_prefix = normalize_path(prefix)
-      return path if normalized_prefix.blank?
-      return normalized_prefix if path.blank?
-
-      [normalized_prefix, path].join('/')
-    end
-
-    def normalize_path path
-      raw = path.to_s.delete("\0").tr('\\', '/').strip
-      raw = raw.sub(%r{\A[A-Za-z]:/+}, '')
-      raw = raw.sub(%r{\A/+}, '')
-      return nil if raw.blank?
-
-      segments = raw.split('/').filter_map do |segment|
-        normalized = normalize_segment(segment)
-        normalized.presence
-      end
-      return nil if segments.empty?
-
-      segments.join('/')
-    end
-
-    def uniquify path, source_file_id
-      normalized = normalize_path(path)
-      return normalized if normalized.blank? || source_file_id.blank?
-
-      ext = File.extname(normalized)
-      base = ext.present? ? normalized.delete_suffix(ext) : normalized
-      "#{ base }--#{ source_file_id }#{ ext }"
-    end
-
-    private
-
-    def fallback_filename filename, source_file_id
-      name = normalize_path(filename)
-      return name if name.present?
-      return nil if source_file_id.blank?
-
-      source_file_id.to_s
-    end
-
-    def normalize_segment segment
-      cleaned = segment.to_s.delete("\0").tr('\\/', '_').strip
-      return nil if cleaned.blank? || cleaned == '.'
-      return '__' if cleaned == '..'
-
-      cleaned
-    end
-  end
-end

backend/app/services/material_sync_importer.rb

@@ -1,259 +0,0 @@
-require 'digest'
-
-class MaterialSyncImporter
-  Result = Struct.new(:material, :action, :suppressed, :suppression, keyword_init: true)
-
-  def self.import! attributes
-    new(attributes).import!
-  end
-
-  def initialize attributes
-    @attributes = attributes
-  end
-
-  def import!
-    source = source_attributes
-    key = normalized_source_key(source)
-    raise ArgumentError, 'normalized_source_key is required for material sync' if key.blank?
-
-    suppression = suppression_for(source)
-    if suppression
-      return Result.new(material: nil,
-                        action: :suppressed,
-                        suppressed: true,
-                        suppression:)
-    end
-
-    material =
-        Material
-        .unscoped
-        .find_or_initialize_by(normalized_source_key: key)
-    if unchanged?(material, source)
-      return Result.new(material:,
-                        action: :unchanged,
-                        suppressed: false,
-                        suppression: nil)
-    end
-
-    event_type =
-        if material.new_record?
-          :create
-        elsif material.discarded?
-          :restore
-        else
-          :update
-        end
-    uploaded_blob = uploaded_blob!
-    if @import_block
-      return Result.new(material: nil,
-                        action: :suppressed,
-                        suppressed: true,
-                        suppression: @import_block)
-    end
-
-    Material.transaction do
-      if material.persisted?
-        MaterialVersionRecorder.ensure_snapshot!(material,
-                                                 created_by_user: @attributes[:updated_by_user])
-      end
-      material.assign_attributes(material_attributes_for(material).merge(source))
-      material.discarded_at = nil if material.respond_to?(:discarded_at=)
-      material.file.attach(uploaded_blob) if uploaded_blob
-      material.save!
-      upsert_export_item!(material)
-      MaterialVersionRecorder.record!(material:,
-                                      event_type:,
-                                      created_by_user: @attributes[:updated_by_user])
-    end
-    MaterialThumbnailGenerator.generate!(material)
-
-    Result.new(material:,
-               action: event_type == :create ? :imported : :updated,
-               suppressed: false,
-               suppression: nil)
-  rescue StandardError
-    uploaded_blob&.purge_later
-    raise
-  ensure
-    close_tempfile!
-  end
-
-  private
-
-  def source_attributes
-    { source_kind: @attributes[:source_kind],
-      source_uri: @attributes[:source_uri],
-      source_path: @attributes[:source_path],
-      source_file_id: @attributes[:source_file_id] }
-  end
-
-  def normalized_source_key source
-    MaterialSyncSuppression.normalize_source_key(source_kind: source[:source_kind],
-                                                 source_uri: source[:source_uri],
-                                                 source_path: source[:source_path],
-                                                 source_file_id: source[:source_file_id])
-  end
-
-  def material_attributes_for material
-    attrs =
-        @attributes
-        .except(:source_kind, :source_uri, :source_path, :source_file_id,
-                :file_blob, :file_tempfile, :file_downloader,
-                :filename, :content_type,
-                :file_sha256, :export_path, :profile, :tag, :url)
-
-    if material.new_record?
-      attrs[:tag] = @attributes[:tag] if @attributes.key?(:tag)
-      attrs[:url] = @attributes[:url] if @attributes.key?(:url)
-      return attrs
-    end
-
-    if @attributes.key?(:tag) && @attributes[:tag].present?
-      attrs[:tag] = @attributes[:tag]
-    end
-    if @attributes.key?(:url) && @attributes[:url].present?
-      attrs[:url] = @attributes[:url]
-    end
-
-    attrs
-  end
-
-  def suppression_for source
-    if source[:source_kind] == 'google_drive_file' && source[:source_path].present?
-      return MaterialSyncSuppressionMatcher.match_google_drive_candidate(
-          drive_file_id: source[:source_file_id],
-          relative_path: source[:source_path])
-    end
-
-    MaterialSyncSuppressionMatcher.match(**source)
-  end
-
-  def uploaded_blob!
-    return @attributes[:file_blob] if @attributes[:file_blob]
-
-    tempfile = upload_tempfile
-    return nil unless tempfile
-
-    tempfile.rewind
-    file_sha256 = @attributes[:file_sha256] || Digest::SHA256.file(tempfile.path).hexdigest
-    @attributes[:file_sha256] = file_sha256
-
-    @import_block = MaterialImportBlockMatcher.match_for_sha256(file_sha256)
-    if @import_block
-      tempfile.rewind
-      return nil
-    end
-
-    blob = ActiveStorage::Blob.create_and_upload!(
-        io: tempfile,
-        filename: @attributes[:filename],
-        content_type: @attributes[:content_type])
-    MaterialFileSha256.assign_metadata_sha256!(blob, file_sha256)
-    tempfile.rewind
-    blob
-  end
-
-  def upload_tempfile
-    return @upload_tempfile if defined?(@upload_tempfile)
-
-    @upload_tempfile = @attributes[:file_tempfile]
-    if @upload_tempfile.blank? && @attributes[:file_downloader]
-      @upload_tempfile = @attributes[:file_downloader].call
-    end
-    @upload_tempfile
-  end
-
-  def upsert_export_item! material
-    export_path = resolved_export_path(material)
-    return if export_path.blank?
-
-    item = material.material_export_items.find_or_initialize_by(profile: effective_profile)
-    item.export_path = export_path
-    item.enabled = true
-    item.created_by_user ||= @attributes[:created_by_user]
-    item.save!
-  end
-
-  def export_path_taken_by_other? material, profile, export_path
-    MaterialExportItem
-      .where(profile:, export_path:)
-      .where.not(material_id: material.id)
-      .exists?
-  end
-
-  def close_tempfile!
-    tempfile = upload_tempfile
-    return unless tempfile
-
-    tempfile.close! unless tempfile.closed?
-  rescue StandardError
-    nil
-  end
-
-  def unchanged? material, source
-    return false if material.new_record? || material.discarded?
-    return false unless same_source_attributes?(material, source)
-    return false unless same_export_path?(material)
-    return false unless same_material_attributes?(material)
-
-    same_file_snapshot?(material)
-  end
-
-  def same_source_attributes? material, source
-    material.source_kind == source[:source_kind] \
-      && material.source_uri == source[:source_uri] \
-      && material.source_path == source[:source_path] \
-      && material.source_file_id == source[:source_file_id]
-  end
-
-  def same_export_path? material
-    expected = resolved_export_path(material)
-    current = material.material_export_items.find { |item| item.profile == effective_profile }
-
-    return current.blank? if expected.blank?
-
-    current&.enabled && current.export_path == expected
-  end
-
-  def same_material_attributes? material
-    same_tag_attribute?(material) && same_url_attribute?(material)
-  end
-
-  def same_file_snapshot? material
-    expected_sha256 = @attributes[:file_sha256].to_s.presence
-
-    if expected_sha256.present?
-      return false unless material.file.attached?
-
-      return MaterialFileSha256.metadata_sha256(material.file.blob) == expected_sha256
-    end
-
-    !material.file.attached?
-  end
-
-  def effective_profile
-    @attributes[:profile].presence || 'legacy_drive'
-  end
-
-  def resolved_export_path material
-    export_path = @attributes[:export_path].to_s.strip
-    return export_path if export_path.blank?
-    return export_path unless export_path_taken_by_other?(material, effective_profile, export_path)
-
-    MaterialSyncExportPath.uniquify(export_path, @attributes[:source_file_id])
-  end
-
-  def same_tag_attribute? material
-    return true unless @attributes.key?(:tag)
-    return true if @attributes[:tag].blank?
-
-    material.tag_id == @attributes[:tag].id
-  end
-
-  def same_url_attribute? material
-    return true unless @attributes.key?(:url)
-    return true if @attributes[:url].blank?
-
-    material.url == @attributes[:url]
-  end
-end

backend/app/services/material_sync_runner.rb

@@ -1,251 +0,0 @@
-class MaterialSyncRunner
-  Result = Struct.new(:imported, :updated, :unchanged, :suppressed, :failed,
-                      :errors, keyword_init: true)
-
-  def self.sync_enabled!
-    results = MaterialSyncSource.enabled.order(:id).map { |source| new(source).sync! }
-
-    Result.new(imported: results.sum(&:imported),
-               updated: results.sum(&:updated),
-               unchanged: results.sum(&:unchanged),
-               suppressed: results.sum(&:suppressed),
-               failed: results.sum(&:failed),
-               errors: results.flat_map(&:errors))
-  end
-
-  def initialize source
-    @source = source
-  end
-
-  def sync!
-    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?
-
-        sync_candidate!(candidate, result)
-      end
-    end
-
-    @source.update!(last_synced_at: Time.current)
-    log_result(result)
-    result
-  rescue NotImplementedError, StandardError => e
-    result.failed += 1
-    result.errors << { source_id: @source.id, error: e.message }
-    log_result(result)
-    result
-  end
-
-  private
-
-  def candidates
-    case @source.source_kind
-    when 'uri'
-      [uri_candidate]
-    when 'google_drive_file'
-      [google_drive_file_candidate]
-    when 'legacy_drive_path'
-      raise NotImplementedError, 'legacy_drive_path material sync is not implemented'
-    else
-      raise NotImplementedError, "Unsupported material sync source_kind: #{ @source.source_kind }"
-    end
-  end
-
-  def uri_candidate
-    { source_kind: @source.source_kind,
-      source_uri: @source.source_uri,
-      source_path: @source.source_path,
-      source_file_id: @source.source_file_id,
-      url: @source.source_uri,
-      tag: nil,
-      created_by_user: @source.created_by_user,
-      updated_by_user: @source.updated_by_user || @source.created_by_user }
-  end
-
-  def sync_candidate! candidate, result
-    block = MaterialImportBlockMatcher.match_for_sha256(candidate[:file_sha256])
-    if block
-      result.suppressed += 1
-      Rails.logger.info(
-          material_sync_log(action: 'suppressed',
-                            reason: block.reason,
-                            normalized_source_key: candidate_normalized_source_key(candidate)))
-      return
-    end
-
-    suppression = suppression_for(candidate)
-
-    if suppression
-      result.suppressed += 1
-      Rails.logger.info(
-          material_sync_log(action: 'suppressed',
-                            normalized_source_key: suppression.normalized_source_key))
-      return
-    end
-
-    import = MaterialSyncImporter.import!(candidate)
-    result.public_send("#{ import.action }=", result.public_send(import.action) + 1)
-  rescue StandardError => e
-    result.failed += 1
-    result.errors << { source_id: @source.id,
-                       normalized_source_key: candidate_normalized_source_key(candidate),
-                       error: e.message }
-    Rails.logger.warn(
-        material_sync_log(action: 'failed',
-                          error: e.message,
-                          normalized_source_key: candidate_normalized_source_key(candidate)))
-  ensure
-    close_candidate_tempfile(candidate)
-  end
-
-  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|
-        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
-
-    build_google_drive_candidate(entry, single_file: true)
-  end
-
-  def build_google_drive_candidate entry, single_file: false
-    relative_path =
-        if single_file
-          nil
-        else
-          entry[:relative_path]
-        end
-    export_path =
-        MaterialSyncExportPath.build(prefix: @source.export_path_prefix,
-                                     relative_path:,
-                                     filename: entry[:name],
-                                     source_file_id: entry[:id])
-
-    { source_kind: 'google_drive_file',
-      source_uri: entry[:web_view_link] || google_drive_file_url(entry[:id]),
-      source_path: relative_path.presence || MaterialSyncExportPath.normalize_path(entry[:name]),
-      source_file_id: entry[:id],
-      filename: entry[:name],
-      content_type: entry[:mime_type],
-      file_downloader: lambda {
-        drive_client.download_to_tempfile(entry[:id], filename: entry[:name])
-      },
-      file_sha256: entry[:sha256_checksum],
-      export_path:,
-      profile: @source.profile,
-      tag: nil,
-      url: nil,
-      created_by_user: @source.created_by_user,
-      updated_by_user: @source.updated_by_user || @source.created_by_user }
-  end
-
-  def candidate_normalized_source_key candidate
-    MaterialSyncSuppression.normalize_source_key(source_kind: candidate[:source_kind],
-                                                 source_uri: candidate[:source_uri],
-                                                 source_path: candidate[:source_path],
-                                                 source_file_id: candidate[:source_file_id])
-  end
-
-  def suppression_for candidate
-    if candidate[:source_kind] == 'google_drive_file' && candidate[:source_path].present?
-      return MaterialSyncSuppressionMatcher.match_google_drive_candidate(
-          drive_file_id: candidate[:source_file_id],
-          relative_path: candidate[:source_path])
-    end
-
-    MaterialSyncSuppressionMatcher.match(source_kind: candidate[:source_kind],
-                                         source_uri: candidate[:source_uri],
-                                         source_path: candidate[:source_path],
-                                         source_file_id: candidate[:source_file_id])
-  end
-
-  def drive_client
-    @drive_client ||= GoogleDrive::ApiClient.new
-  end
-
-  def google_drive_folder_id
-    google_drive_target_id.tap do |id|
-      if id.blank?
-        raise ArgumentError, 'google_drive_path source_file_id or source_uri is required'
-      end
-    end
-  end
-
-  def google_drive_file_id
-    google_drive_target_id.tap do |id|
-      if id.blank?
-        raise ArgumentError, 'google_drive_file source_file_id or source_uri is required'
-      end
-    end
-  end
-
-  def google_drive_target_id
-    @source.source_file_id.presence || drive_client.extract_file_id(@source.source_uri)
-  end
-
-  def google_drive_file_url file_id
-    "https://drive.google.com/file/d/#{ file_id }/view"
-  end
-
-  def close_candidate_tempfile candidate
-    tempfile = candidate[:file_tempfile]
-    return unless tempfile
-
-    tempfile.close! unless tempfile.closed?
-  rescue StandardError
-    nil
-  end
-
-  def log_result result
-    Rails.logger.info(material_sync_log(imported: result.imported,
-                                        updated: result.updated,
-                                        unchanged: result.unchanged,
-                                        suppressed: result.suppressed,
-                                        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
-  end
-end

backend/app/services/material_sync_suppression_matcher.rb

@@ -1,68 +0,0 @@
-class MaterialSyncSuppressionMatcher
-  def self.match source_kind:,
-                 source_uri: nil,
-                 drive_path: nil,
-                 drive_file_id: nil,
-                 source_path: nil,
-                 source_file_id: nil
-    key = MaterialSyncSuppression.normalize_source_key(source_kind:,
-                                                       source_uri:,
-                                                       drive_path:,
-                                                       drive_file_id:,
-                                                       source_path:,
-                                                       source_file_id:)
-    return nil if key.blank?
-
-    MaterialSyncSuppression.find_by(normalized_source_key: key)
-  end
-
-  def self.match_google_drive_candidate drive_file_id:, relative_path:
-    normalized_path = validate_relative_path!(relative_path)
-
-    exact = [
-      normalize_key('google_drive_file', drive_file_id),
-      normalize_key('google_drive_path', normalized_path),
-      normalize_key('legacy_drive_path', normalized_path),
-    ].compact
-
-    suppression =
-        MaterialSyncSuppression.find_by(normalized_source_key: exact)
-    return suppression if suppression
-
-    MaterialSyncSuppression
-      .where(source_kind: ['google_drive_path_prefix', 'legacy_drive_path_prefix'])
-      .where('drive_path = :path OR :path LIKE CONCAT(drive_path, "/%")', path: normalized_path)
-      .order(:id)
-      .first
-  end
-
-  def self.suppressed?(...)
-    match(...).present?
-  end
-
-  def self.validate_relative_path! relative_path
-    raw = relative_path.to_s.delete("\0").tr('\\', '/').strip
-    raise ArgumentError, 'relative_path is required' if raw.blank?
-    raise ArgumentError, 'relative_path must be relative' if raw.start_with?('/')
-    raise ArgumentError, 'relative_path must be relative' if raw.match?(/\A[A-Za-z]:\//)
-    if raw.start_with?('My Drive/', 'マイドライブ/')
-      raise ArgumentError, 'relative_path must be relative to source folder'
-    end
-    raise ArgumentError, 'relative_path must not contain //' if raw.include?('//')
-    raise ArgumentError, 'relative_path must not end with /' if raw.end_with?('/')
-
-    parts = raw.split('/')
-    if parts.any? { |part| part.in?(['.', '..']) }
-      raise ArgumentError, 'relative_path must not contain dot segments'
-    end
-
-    raw
-  end
-
-  def self.normalize_key source_kind, value
-    return nil if value.blank?
-
-    MaterialSyncSuppression.normalize_source_key(source_kind:, source_path: value,
-                                                 source_file_id: value)
-  end
-end

backend/app/services/material_sync_suppression_registrar.rb

@@ -1,51 +0,0 @@
-class MaterialSyncSuppressionRegistrar
-  def self.create! attributes, created_by_user:
-    new(attributes, created_by_user:).create!
-  end
-
-  def initialize attributes, created_by_user:
-    @attributes = attributes
-    @created_by_user = created_by_user
-  end
-
-  def create!
-    suppression = nil
-
-    MaterialSyncSuppression.transaction do
-      suppression = MaterialSyncSuppression.create!(
-          @attributes.merge(created_by_user: @created_by_user))
-      discard_existing_materials!(suppression)
-    end
-
-    suppression
-  end
-
-  private
-
-  def discard_existing_materials! suppression
-    matching_materials(suppression).find_each do |material|
-      MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: @created_by_user)
-      material.discard!
-      MaterialVersionRecorder.record!(material:,
-                                      event_type: :discard,
-                                      created_by_user: @created_by_user)
-    end
-  end
-
-  def matching_materials suppression
-    materials = Material.unscoped.kept
-
-    case suppression.source_kind
-    when 'google_drive_path', 'legacy_drive_path'
-      materials.where(source_path: suppression.drive_path)
-    when 'google_drive_path_prefix', 'legacy_drive_path_prefix'
-      path = suppression.drive_path.to_s
-      materials.where(
-          'source_path = :path OR source_path LIKE :prefix',
-          path:,
-          prefix: "#{ path }/%")
-    else
-      materials.where(normalized_source_key: suppression.normalized_source_key)
-    end
-  end
-end

backend/app/services/material_thumbnail_generator.rb

@@ -11,30 +11,25 @@ class MaterialThumbnailGenerator
   class << self
     def generate! material
       new(material).generate!
+    rescue ActiveStorage::FileNotFoundError, ArgumentError, MiniMagick::Error => e
+      Rails.logger.warn("Material thumbnail generation skipped: #{ e.class }: #{ e.message }")
+      nil
     end
   end
 
   def initialize material
     @material = material
-    @ffmpeg_stderr = []
   end
 
   def generate!
-    return log_result(:no_file) unless @material.file.attached?
+    @material.thumbnail.purge if @material.thumbnail.attached?
-    return log_result(:unsupported_content_type) unless image? || video?
+    return unless @material.file.attached?
+    return unless image? || video?
 
     @material.file.blob.open do |file|
       thumbnail = image? ? image_thumbnail(file.path) : video_thumbnail(file.path)
-      return log_result(:generation_failed) unless thumbnail
+      attach_thumbnail(thumbnail) if thumbnail
-
-      return attach_thumbnail(thumbnail)
     end
-  rescue ActiveStorage::FileNotFoundError => e
-    log_result(:file_not_found, error: e)
-  rescue MiniMagick::Error => e
-    log_result(:mini_magick_error, error: e)
-  rescue ArgumentError, StandardError => e
-    log_result(:generation_failed, error: e)
   end
 
   private
@@ -43,11 +38,7 @@ class MaterialThumbnailGenerator
 
   def video? = content_type.start_with?('video/')
 
-  def content_type
+  def content_type = @material.file.blob.content_type.to_s
-    return nil unless @material.file.attached?
-
-    @material.file.blob.content_type.to_s
-  end
 
   def image_thumbnail path
     image = MiniMagick::Image.open(path)
@@ -80,47 +71,16 @@ class MaterialThumbnailGenerator
                        '-frames:v', '1',
                        '-f', 'image2',
                        output_path)
-    @ffmpeg_stderr << stderr if stderr.present?
+    Rails.logger.warn("ffmpeg thumbnail failed: #{ stderr }") unless status.success?
     status.success?
   rescue Errno::ENOENT => e
-    @ffmpeg_stderr << "ffmpeg unavailable: #{ e.message }"
+    Rails.logger.warn("ffmpeg unavailable for material thumbnail: #{ e.message }")
     false
   end
 
   def attach_thumbnail image
-    blob = nil
+    @material.thumbnail.attach(io: File.open(image.path),
-    File.open(image.path) do |io|
+                               filename: 'material-thumbnail.jpg',
-      blob = ActiveStorage::Blob.create_and_upload!(
+                               content_type: 'image/jpeg')
-          io:,
-          filename: 'material-thumbnail.jpg',
-          content_type: 'image/jpeg')
-    end
-    @material.thumbnail.attach(blob)
-    log_result(:attached)
-  rescue StandardError => e
-    blob&.purge_later
-    log_result(:attach_failed, error: e)
-  end
-
-  def log_result result, error: nil
-    log_payload = { material_id: @material.id,
-                    file_blob_id: file_blob_id,
-                    content_type:,
-                    result:,
-                    error_class: error&.class&.name,
-                    error_message: error&.message,
-                    ffmpeg_stderr: @ffmpeg_stderr.join("\n").presence }
-    if [:attached, :no_file, :unsupported_content_type].include?(result)
-      Rails.logger.info("Material thumbnail generation: #{ log_payload.to_json }")
-    else
-      Rails.logger.warn("Material thumbnail generation: #{ log_payload.to_json }")
-    end
-    result
-  end
-
-  def file_blob_id
-    return nil unless @material.file.attached?
-
-    @material.file.blob.id
   end
 end

backend/app/services/material_version_recorder.rb

@@ -1,5 +1,5 @@
 class MaterialVersionRecorder < VersionRecorder
-  EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
+  EVENT_TYPES = ['create', 'update', 'discard', 'restore', 'suppress'].freeze
 
   def self.record! material:, event_type:, created_by_user:, file_snapshot: nil
     new(material:, event_type:, created_by_user:, file_snapshot:).record!
@@ -33,11 +33,6 @@ class MaterialVersionRecorder < VersionRecorder
       tag: @record.tag,
       tag_name: @record.tag&.name,
       tag_category: @record.tag&.category,
-      source_kind: @record.source_kind,
-      source_uri: @record.source_uri,
-      source_path: @record.source_path,
-      source_file_id: @record.source_file_id,
-      normalized_source_key: @record.normalized_source_key,
       export_paths_json: @record.snapshot_export_paths,
       discarded_at: @record.discarded_at,
       file_blob_id: file_snapshot[:file_blob_id],
@@ -45,7 +40,9 @@ class MaterialVersionRecorder < VersionRecorder
       file_content_type: file_snapshot[:file_content_type],
       file_byte_size: file_snapshot[:file_byte_size],
       file_checksum: file_snapshot[:file_checksum],
-      file_sha256: file_snapshot[:file_sha256] }
+      file_sha256: file_snapshot[:file_sha256],
+      file_suppressed_at: @record.file_suppressed_at,
+      file_suppression_reason: @record.file_suppression_reason }
   end
 
   def build_file_snapshot blob
@@ -57,7 +54,7 @@ class MaterialVersionRecorder < VersionRecorder
       file_content_type: blob.content_type,
       file_byte_size: blob.byte_size,
       file_checksum: blob.checksum,
-      file_sha256: MaterialFileSha256.metadata_sha256(blob) }
+      file_sha256: blob.metadata['sha256'] }
   end
 
   def empty_file_snapshot

backend/app/services/material_zip_exporter.rb

@@ -40,6 +40,7 @@ class MaterialZipExporter
            .joins(:material)
            .merge(Material.kept)
            .where(profile: @profile)
+           .where(materials: { file_suppressed_at: nil })
            .order(:export_path)
 
     rows = rows.where(materials: { tag_id: @tag_id }) if @tag_id

backend/config/routes.rb

@@ -114,7 +114,9 @@ Rails.application.routes.draw do
   end
 
   get 'materials/download.zip', to: 'materials#download'
-  get 'materials/versions', to: 'material_versions#index'
+  resources :materials, only: [:index, :show, :create, :update, :destroy] do
-  resources :material_sync_suppressions, path: 'materials/suppressions', only: [:index, :create]
+    member do
-  resources :materials, only: [:index, :show, :create, :update, :destroy]
+      patch :suppress_file
+    end
+  end
 end

backend/db/migrate/20260623000000_enhance_material_management.rb

@@ -2,6 +2,9 @@ class EnhanceMaterialManagement < ActiveRecord::Migration[8.0]
   def up
     change_table :materials, bulk: true do |t|
       t.integer :version_no, null: false, default: 1
+      t.datetime :file_suppressed_at
+      t.references :file_suppressed_by_user, foreign_key: { to_table: :users }
+      t.string :file_suppression_reason
     end
 
     change_table :material_versions, bulk: true do |t|
@@ -15,6 +18,8 @@ class EnhanceMaterialManagement < ActiveRecord::Migration[8.0]
       t.bigint :file_byte_size
       t.string :file_checksum
       t.string :file_sha256
+      t.datetime :file_suppressed_at
+      t.string :file_suppression_reason
     end
 
     execute <<~SQL.squish
@@ -30,7 +35,7 @@ class EnhanceMaterialManagement < ActiveRecord::Migration[8.0]
     add_index :material_versions, :file_blob_id
 
     add_check_constraint :material_versions,
-                         "event_type IN ('create', 'update', 'discard', 'restore')",
+                         "event_type IN ('create', 'update', 'discard', 'restore', 'suppress')",
                          name: 'material_versions_event_type_valid'
 
     create_table :material_export_items do |t|
@@ -82,7 +87,12 @@ class EnhanceMaterialManagement < ActiveRecord::Migration[8.0]
     remove_column :material_versions, :file_byte_size
     remove_column :material_versions, :file_checksum
     remove_column :material_versions, :file_sha256
+    remove_column :material_versions, :file_suppressed_at
+    remove_column :material_versions, :file_suppression_reason
 
+    remove_reference :materials, :file_suppressed_by_user, foreign_key: { to_table: :users }
     remove_column :materials, :version_no
+    remove_column :materials, :file_suppressed_at
+    remove_column :materials, :file_suppression_reason
   end
 end

backend/db/migrate/20260625000000_reconcile_material_sync_suppressions.rb

@@ -1,118 +0,0 @@
-class ReconcileMaterialSyncSuppressions < ActiveRecord::Migration[8.0]
-  MATERIAL_VERSION_EVENT_CONSTRAINT = 'material_versions_event_type_valid'
-
-  def up
-    ensure_material_sync_suppressions!
-    ensure_material_source_columns!
-    ensure_material_active_source_key!
-    remove_material_file_suppression!
-    remove_material_version_file_suppression!
-    reconcile_material_version_event_constraint!
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-
-  private
-
-  def ensure_material_sync_suppressions!
-    return if table_exists?(:material_sync_suppressions)
-
-    create_table :material_sync_suppressions do |t|
-      t.string :source_kind, null: false
-      t.string :source_uri
-      t.string :drive_path
-      t.string :drive_file_id
-      t.string :normalized_source_key, null: false
-      t.string :reason, null: false
-      t.references :created_by_user, foreign_key: { to_table: :users }
-      t.timestamps
-
-      t.index :normalized_source_key, unique: true
-      t.index :source_kind
-      t.index :drive_file_id
-    end
-  end
-
-  def ensure_material_source_columns!
-    add_column :materials, :source_kind, :string unless column_exists?(:materials, :source_kind)
-    add_column :materials, :source_uri, :string unless column_exists?(:materials, :source_uri)
-    add_column :materials, :source_path, :string unless column_exists?(:materials, :source_path)
-    unless column_exists?(:materials, :source_file_id)
-      add_column :materials, :source_file_id, :string
-    end
-    unless column_exists?(:materials, :normalized_source_key)
-      add_column :materials, :normalized_source_key, :string
-    end
-
-    if index_exists?(:materials, :normalized_source_key)
-      remove_index :materials, column: :normalized_source_key
-    end
-  end
-
-  def ensure_material_active_source_key!
-    unless column_exists?(:materials, :active_normalized_source_key)
-      change_table :materials do |t|
-        t.virtual :active_normalized_source_key,
-                  type: :string,
-                  as: 'IF(discarded_at IS NULL, normalized_source_key, NULL)',
-                  stored: false
-      end
-    end
-
-    return if index_exists?(:materials,
-                            :active_normalized_source_key,
-                            name: 'index_materials_on_active_normalized_source_key')
-
-    add_index :materials,
-              :active_normalized_source_key,
-              unique: true,
-              name: 'index_materials_on_active_normalized_source_key'
-  end
-
-  def remove_material_file_suppression!
-    if foreign_key_exists?(:materials, :users, column: :file_suppressed_by_user_id)
-      remove_foreign_key :materials, column: :file_suppressed_by_user_id
-    end
-
-    if index_exists?(:materials,
-                    :file_suppressed_by_user_id,
-                    name: 'index_materials_on_file_suppressed_by_user_id')
-      remove_index :materials, name: 'index_materials_on_file_suppressed_by_user_id'
-    end
-
-    remove_column :materials, :file_suppressed_at if column_exists?(
-        :materials,
-        :file_suppressed_at)
-    remove_column :materials, :file_suppressed_by_user_id if column_exists?(
-        :materials,
-        :file_suppressed_by_user_id)
-    remove_column :materials, :file_suppression_reason if column_exists?(
-        :materials,
-        :file_suppression_reason)
-  end
-
-  def remove_material_version_file_suppression!
-    remove_column :material_versions, :file_suppressed_at if column_exists?(
-        :material_versions,
-        :file_suppressed_at)
-    remove_column :material_versions, :file_suppression_reason if column_exists?(
-        :material_versions,
-        :file_suppression_reason)
-  end
-
-  def reconcile_material_version_event_constraint!
-    constraint = check_constraints(:material_versions).find do |candidate|
-      candidate.name == MATERIAL_VERSION_EVENT_CONSTRAINT
-    end
-    return if constraint && !constraint.expression.include?('suppress')
-
-    if constraint
-      remove_check_constraint :material_versions, name: MATERIAL_VERSION_EVENT_CONSTRAINT
-    end
-    add_check_constraint :material_versions,
-                         "event_type IN ('create', 'update', 'discard', 'restore')",
-                         name: MATERIAL_VERSION_EVENT_CONSTRAINT
-  end
-end

backend/db/migrate/20260625010000_create_material_sync_sources.rb

@@ -1,22 +0,0 @@
-class CreateMaterialSyncSources < ActiveRecord::Migration[8.0]
-  def change
-    create_table :material_sync_sources do |t|
-      t.string :name, null: false
-      t.string :source_kind, null: false
-      t.string :source_uri
-      t.string :source_path
-      t.string :source_file_id
-      t.string :profile, null: false, default: 'legacy_drive'
-      t.boolean :enabled, null: false, default: true
-      t.string :default_tag_name
-      t.string :export_path_prefix
-      t.datetime :last_synced_at
-      t.references :created_by_user, foreign_key: { to_table: :users }
-      t.references :updated_by_user, foreign_key: { to_table: :users }
-      t.timestamps
-
-      t.index :enabled
-      t.index :source_kind
-    end
-  end
-end

backend/db/migrate/20260626000000_add_source_snapshot_to_material_versions.rb

@@ -1,19 +0,0 @@
-class AddSourceSnapshotToMaterialVersions < ActiveRecord::Migration[8.0]
-  def change
-    unless column_exists?(:material_versions, :source_kind)
-      add_column :material_versions, :source_kind, :string
-    end
-    unless column_exists?(:material_versions, :source_uri)
-      add_column :material_versions, :source_uri, :string
-    end
-    unless column_exists?(:material_versions, :source_path)
-      add_column :material_versions, :source_path, :string
-    end
-    unless column_exists?(:material_versions, :source_file_id)
-      add_column :material_versions, :source_file_id, :string
-    end
-    unless column_exists?(:material_versions, :normalized_source_key)
-      add_column :material_versions, :normalized_source_key, :string
-    end
-  end
-end

backend/db/migrate/20260626010000_backfill_initial_material_versions.rb

@@ -1,171 +0,0 @@
-require 'json'
-
-class BackfillInitialMaterialVersions < ActiveRecord::Migration[8.0]
-  class MigrationMaterial < ActiveRecord::Base
-    self.table_name = 'materials'
-  end
-
-  class MigrationMaterialExportItem < ActiveRecord::Base
-    self.table_name = 'material_export_items'
-  end
-
-  class MigrationMaterialVersion < ActiveRecord::Base
-    self.table_name = 'material_versions'
-  end
-
-  class MigrationStorageAttachment < ActiveRecord::Base
-    self.table_name = 'active_storage_attachments'
-  end
-
-  class MigrationStorageBlob < ActiveRecord::Base
-    self.table_name = 'active_storage_blobs'
-  end
-
-  class MigrationTag < ActiveRecord::Base
-    self.table_name = 'tags'
-  end
-
-  class MigrationTagName < ActiveRecord::Base
-    self.table_name = 'tag_names'
-  end
-
-  def up
-    say_with_time 'Backfilling initial material versions' do
-      materials_without_versions.find_in_batches(batch_size: 500) do |materials|
-        material_ids = materials.map(&:id)
-        tags_by_id = load_tags(materials.map(&:tag_id).compact.uniq)
-        export_paths_by_material_id = load_export_paths(material_ids)
-        file_snapshots_by_material_id = load_file_snapshots(material_ids)
-
-        rows = materials.map do |material|
-          tag = tags_by_id[material.tag_id]
-          file_snapshot = file_snapshots_by_material_id[material.id] || empty_file_snapshot
-
-          { material_id: material.id,
-            version_no: 1,
-            event_type: 'create',
-            url: material.url,
-            parent_id: material.parent_id,
-            tag_id: material.tag_id,
-            tag_name: tag&.fetch(:name, nil),
-            tag_category: tag&.fetch(:category, nil),
-            source_kind: material.source_kind,
-            source_uri: material.source_uri,
-            source_path: material.source_path,
-            source_file_id: material.source_file_id,
-            normalized_source_key: material.normalized_source_key,
-            export_paths_json: export_paths_by_material_id[material.id] || { },
-            discarded_at: material.discarded_at,
-            file_blob_id: file_snapshot[:file_blob_id],
-            file_filename: file_snapshot[:file_filename],
-            file_content_type: file_snapshot[:file_content_type],
-            file_byte_size: file_snapshot[:file_byte_size],
-            file_checksum: file_snapshot[:file_checksum],
-            file_sha256: file_snapshot[:file_sha256],
-            created_by_user_id: material.created_by_user_id,
-            updated_by_user_id: material.updated_by_user_id,
-            created_at: material.created_at,
-            updated_at: material.created_at }
-        end
-
-        MigrationMaterialVersion.insert_all!(rows) if rows.present?
-      end
-    end
-
-    execute <<~SQL.squish
-      UPDATE materials
-      SET version_no = COALESCE(
-        (
-          SELECT MAX(material_versions.version_no)
-          FROM material_versions
-          WHERE material_versions.material_id = materials.id
-        ),
-        1
-      )
-    SQL
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-
-  private
-
-  def materials_without_versions
-    MigrationMaterial.where.not(id: MigrationMaterialVersion.select(:material_id))
-  end
-
-  def load_tags tag_ids
-    return { } if tag_ids.empty?
-
-    tag_name_ids_by_tag_id = MigrationTag.where(id: tag_ids).pluck(:id, :tag_name_id).to_h
-    tag_names_by_id =
-        MigrationTagName
-        .where(id: tag_name_ids_by_tag_id.values.uniq)
-        .pluck(:id, :name)
-        .to_h
-    categories_by_tag_id = MigrationTag.where(id: tag_ids).pluck(:id, :category).to_h
-
-    tag_ids.each_with_object({ }) do |tag_id, hash|
-      hash[tag_id] = { name: tag_names_by_id[tag_name_ids_by_tag_id[tag_id]],
-                       category: categories_by_tag_id[tag_id] }
-    end
-  end
-
-  def load_export_paths material_ids
-    MigrationMaterialExportItem
-      .where(material_id: material_ids)
-      .order(:material_id, :profile)
-      .pluck(:material_id, :profile, :export_path)
-      .each_with_object({ }) do |(material_id, profile, export_path), hash|
-        hash[material_id] ||= { }
-        hash[material_id][profile] = export_path
-      end
-  end
-
-  def load_file_snapshots material_ids
-    attachments_by_material_id =
-        MigrationStorageAttachment
-        .where(record_type: 'Material', name: 'file', record_id: material_ids)
-        .pluck(:record_id, :blob_id)
-        .to_h
-
-    blobs_by_id =
-        MigrationStorageBlob
-        .where(id: attachments_by_material_id.values.uniq)
-        .index_by(&:id)
-
-    attachments_by_material_id.each_with_object({ }) do |(material_id, blob_id), hash|
-      blob = blobs_by_id[blob_id]
-      next unless blob
-
-      hash[material_id] = {
-        file_blob_id: blob.id,
-        file_filename: blob.filename.to_s,
-        file_content_type: blob.content_type,
-        file_byte_size: blob.byte_size,
-        file_checksum: blob.checksum,
-        file_sha256: blob_metadata(blob)['sha256']
-      }
-    end
-  end
-
-  def empty_file_snapshot
-    { file_blob_id: nil,
-      file_filename: nil,
-      file_content_type: nil,
-      file_byte_size: nil,
-      file_checksum: nil,
-      file_sha256: nil }
-  end
-
-  def blob_metadata blob
-    metadata = blob.metadata
-    return metadata if metadata.is_a?(Hash)
-    return { } if metadata.blank?
-
-    JSON.parse(metadata)
-  rescue JSON::ParserError
-    { }
-  end
-end

backend/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
+ActiveRecord::Schema[8.0].define(version: 2026_06_23_000000) do
   create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", null: false
     t.string "record_type", null: false
@@ -156,43 +156,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
     t.index ["created_by_user_id"], name: "index_material_import_blocks_on_created_by_user_id"
   end
 
-  create_table "material_sync_sources", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.string "name", null: false
-    t.string "source_kind", null: false
-    t.string "source_uri"
-    t.string "source_path"
-    t.string "source_file_id"
-    t.string "profile", default: "legacy_drive", null: false
-    t.boolean "enabled", default: true, null: false
-    t.string "default_tag_name"
-    t.string "export_path_prefix"
-    t.datetime "last_synced_at"
-    t.bigint "created_by_user_id"
-    t.bigint "updated_by_user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["created_by_user_id"], name: "index_material_sync_sources_on_created_by_user_id"
-    t.index ["enabled"], name: "index_material_sync_sources_on_enabled"
-    t.index ["source_kind"], name: "index_material_sync_sources_on_source_kind"
-    t.index ["updated_by_user_id"], name: "index_material_sync_sources_on_updated_by_user_id"
-  end
-
-  create_table "material_sync_suppressions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.string "source_kind", null: false
-    t.string "source_uri"
-    t.string "drive_path"
-    t.string "drive_file_id"
-    t.string "normalized_source_key", null: false
-    t.string "reason", null: false
-    t.bigint "created_by_user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["created_by_user_id"], name: "index_material_sync_suppressions_on_created_by_user_id"
-    t.index ["drive_file_id"], name: "index_material_sync_suppressions_on_drive_file_id"
-    t.index ["normalized_source_key"], name: "index_material_sync_suppressions_on_normalized_source_key", unique: true
-    t.index ["source_kind"], name: "index_material_sync_suppressions_on_source_kind"
-  end
-
   create_table "material_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "material_id", null: false
     t.integer "version_no", null: false
@@ -214,11 +177,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
     t.bigint "file_byte_size"
     t.string "file_checksum"
     t.string "file_sha256"
-    t.string "source_kind"
+    t.datetime "file_suppressed_at"
-    t.string "source_uri"
+    t.string "file_suppression_reason"
-    t.string "source_path"
-    t.string "source_file_id"
-    t.string "normalized_source_key"
     t.index ["created_by_user_id"], name: "index_material_versions_on_created_by_user_id"
     t.index ["discarded_at"], name: "index_material_versions_on_discarded_at"
     t.index ["file_blob_id"], name: "index_material_versions_on_file_blob_id"
@@ -228,7 +188,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
     t.index ["tag_id"], name: "index_material_versions_on_tag_id"
     t.index ["updated_by_user_id"], name: "index_material_versions_on_updated_by_user_id"
     t.index ["url"], name: "index_material_versions_on_url"
-    t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "material_versions_event_type_valid"
+    t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore',_utf8mb4'suppress')", name: "material_versions_event_type_valid"
   end
 
   create_table "materials", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -242,16 +202,13 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
     t.datetime "discarded_at"
     t.virtual "active_url", type: :string, as: "if((`discarded_at` is null),`url`,NULL)"
     t.integer "version_no", default: 1, null: false
-    t.string "source_kind"
+    t.datetime "file_suppressed_at"
-    t.string "source_uri"
+    t.bigint "file_suppressed_by_user_id"
-    t.string "source_path"
+    t.string "file_suppression_reason"
-    t.string "source_file_id"
-    t.string "normalized_source_key"
-    t.virtual "active_normalized_source_key", type: :string, as: "if((`discarded_at` is null),`normalized_source_key`,NULL)"
-    t.index ["active_normalized_source_key"], name: "index_materials_on_active_normalized_source_key", unique: true
     t.index ["active_url"], name: "index_materials_on_active_url", unique: true
     t.index ["created_by_user_id"], name: "index_materials_on_created_by_user_id"
     t.index ["discarded_at"], name: "index_materials_on_discarded_at"
+    t.index ["file_suppressed_by_user_id"], name: "index_materials_on_file_suppressed_by_user_id"
     t.index ["parent_id"], name: "index_materials_on_parent_id"
     t.index ["tag_id"], name: "index_materials_on_tag_id"
     t.index ["updated_by_user_id"], name: "index_materials_on_updated_by_user_id"
@@ -658,9 +615,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
   add_foreign_key "material_export_items", "materials"
   add_foreign_key "material_export_items", "users", column: "created_by_user_id"
   add_foreign_key "material_import_blocks", "users", column: "created_by_user_id"
-  add_foreign_key "material_sync_sources", "users", column: "created_by_user_id"
-  add_foreign_key "material_sync_sources", "users", column: "updated_by_user_id"
-  add_foreign_key "material_sync_suppressions", "users", column: "created_by_user_id"
   add_foreign_key "material_versions", "materials"
   add_foreign_key "material_versions", "materials", column: "parent_id"
   add_foreign_key "material_versions", "tags"
@@ -669,6 +623,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_06_26_010000) do
   add_foreign_key "materials", "materials", column: "parent_id"
   add_foreign_key "materials", "tags"
   add_foreign_key "materials", "users", column: "created_by_user_id"
+  add_foreign_key "materials", "users", column: "file_suppressed_by_user_id"
   add_foreign_key "materials", "users", column: "updated_by_user_id"
   add_foreign_key "nico_tag_relations", "tags"
   add_foreign_key "nico_tag_relations", "tags", column: "nico_tag_id"

backend/db/seeds.rb

@@ -7,21 +7,3 @@
 #   ["Action", "Comedy", "Drama", "Horror"].each do |genre_name|
 #     MovieGenre.find_or_create_by!(name: genre_name)
 #   end
-
-material_sync_source_uri = ENV['MATERIAL_SYNC_SOURCE_URI']
-material_sync_source_file_id = ENV['MATERIAL_SYNC_SOURCE_FILE_ID']
-
-if material_sync_source_uri.present? || material_sync_source_file_id.present?
-  source = MaterialSyncSource.find_or_initialize_by(
-      name: ENV.fetch('MATERIAL_SYNC_SOURCE_NAME', 'Legacy URI material sync'))
-  source.assign_attributes(
-      source_kind: ENV.fetch('MATERIAL_SYNC_SOURCE_KIND', 'uri'),
-      source_uri: material_sync_source_uri,
-      source_path: ENV['MATERIAL_SYNC_SOURCE_PATH'],
-      source_file_id: material_sync_source_file_id,
-      profile: ENV.fetch('MATERIAL_SYNC_SOURCE_PROFILE', 'legacy_drive'),
-      enabled: ENV.fetch('MATERIAL_SYNC_SOURCE_ENABLED', 'true') != 'false',
-      default_tag_name: ENV['MATERIAL_SYNC_SOURCE_TAG_NAME'],
-      export_path_prefix: ENV['MATERIAL_SYNC_EXPORT_PATH_PREFIX'])
-  source.save!
-end

backend/lib/tasks/sync_materials.rake

@@ -1,51 +0,0 @@
-namespace :materials do
-  desc '素材同期'
-  task sync: :environment do
-    result = MaterialSyncRunner.sync_enabled!
-    message = [
-      "materials:sync imported=#{ result.imported }",
-      "updated=#{ result.updated }",
-      "unchanged=#{ result.unchanged }",
-      "suppressed=#{ result.suppressed }",
-      "failed=#{ result.failed }"
-    ].join(' ')
-
-    Rails.logger.info(message)
-    puts message
-
-    result.errors.each do |error|
-      Rails.logger.warn(error.to_json)
-      warn error.to_json
-    end
-  end
-
-  namespace :thumbnails do
-    desc '素材サムネールを補完'
-    task backfill: :environment do
-      counts = Hash.new(0)
-
-      Material
-        .with_attached_file
-        .with_attached_thumbnail
-        .find_each do |material|
-          next unless material.file.attached?
-          next if material.thumbnail.attached?
-
-          result = MaterialThumbnailGenerator.generate!(material)
-          counts[result] += 1
-        end
-
-      message =
-          "materials:thumbnails:backfill " \
-          "attached=#{ counts[:attached] } " \
-          "no_file=#{ counts[:no_file] } " \
-          "unsupported_content_type=#{ counts[:unsupported_content_type] } " \
-          "generation_failed=#{ counts[:generation_failed] } " \
-          "attach_failed=#{ counts[:attach_failed] } " \
-          "file_not_found=#{ counts[:file_not_found] } " \
-          "mini_magick_error=#{ counts[:mini_magick_error] }"
-      Rails.logger.info(message)
-      puts message
-    end
-  end
-end

backend/spec/models/material_spec.rb

@@ -1,19 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Material, type: :model do
-  let(:user) { create(:user, :member) }
-
-  it 'allows only material source kinds, not suppression prefix kinds' do
-    material = described_class.new(url: 'https://example.com/material',
-                                   source_kind: 'google_drive_path_prefix',
-                                   source_path: '素材/危険',
-                                   created_by_user: user,
-                                   updated_by_user: user)
-
-    expect(material).not_to be_valid
-    expect(material.errors[:source_kind]).to be_present
-
-    material.source_kind = 'google_drive_path'
-    expect(material).to be_valid
-  end
-end

backend/spec/requests/materials_spec.rb

@@ -64,36 +64,27 @@ RSpec.describe 'Materials API', type: :request do
         'name' => 'material_index_b',
         'category' => 'material'
       )
+      expect(row['created_by_user']).to include(
+        'id' => member_user.id,
+        'name' => member_user.name
+      )
       expect(row['content_type']).to eq('image/png')
-      expect(row['media_kind']).to eq('image')
     end
 
-    it 'filters materials by q' do
+    it 'filters materials by tag_id' do
-      get '/materials', params: { q: 'material_index_a' }
+      get '/materials', params: { tag_id: material_a.tag_id }
 
       expect(response).to have_http_status(:ok)
       expect(json['count']).to eq(1)
       expect(response_materials.map { |m| m['id'] }).to eq([material_a.id])
     end
 
-    it 'filters materials by tag_state' do
+    it 'filters materials by parent_id' do
-      untagged =
+      get '/materials', params: { parent_id: material_a.id }
-          build_material(tag: nil, user: member_user,
-                         file: dummy_upload(filename: 'untagged.png'))
-
-      get '/materials', params: { tag_state: 'untagged' }
 
       expect(response).to have_http_status(:ok)
       expect(json['count']).to eq(1)
-      expect(response_materials.map { |m| m['id'] }).to eq([untagged.id])
+      expect(response_materials.map { |m| m['id'] }).to eq([material_b.id])
-    end
-
-    it 'filters materials by media_kind' do
-      get '/materials', params: { media_kind: 'image' }
-
-      expect(response).to have_http_status(:ok)
-      expect(json['count']).to eq(2)
-      expect(response_materials.map { |m| m['media_kind'] }).to all(eq('image'))
     end
 
     it 'paginates and keeps total count' do
@@ -113,68 +104,6 @@ RSpec.describe 'Materials API', type: :request do
       expect(response_materials.size).to eq(1)
       expect(response_materials.first['id']).to eq(material_b.id)
     end
-
-    it 'filters by descendant tags and returns stable parent tag groups' do
-      root =
-          Tag.create!(tag_name: TagName.create!(name: 'material_scope_root'),
-                      category: :material)
-      child_b =
-          Tag.create!(tag_name: TagName.create!(name: 'material_scope_b'),
-                      category: :material)
-      child_a =
-          Tag.create!(tag_name: TagName.create!(name: 'material_scope_a'),
-                      category: :material)
-      deprecated =
-          Tag.create!(tag_name: TagName.create!(name: 'material_scope_old'),
-                      category: :material,
-                      deprecated_at: Time.current)
-      grandchild =
-          Tag.create!(tag_name: TagName.create!(name: 'material_scope_grandchild'),
-                      category: :material)
-      root_material =
-          build_material(tag: root, user: member_user,
-                         file: dummy_upload(filename: 'root.png'))
-      child_a_material =
-          build_material(tag: child_a, user: member_user,
-                         file: dummy_upload(filename: 'child_a.png'))
-      grandchild_material =
-          build_material(tag: grandchild, user: member_user,
-                         file: dummy_upload(filename: 'grandchild.png'))
-
-      TagImplication.create!(parent_tag: root, tag: child_b)
-      TagImplication.create!(parent_tag: root, tag: child_a)
-      TagImplication.create!(parent_tag: child_b, tag: deprecated)
-      TagImplication.create!(parent_tag: deprecated, tag: grandchild)
-
-      get '/materials',
-          params: { tag_id: root.id, include_descendants: '1',
-                    group_by: 'parent_tag', sort: 'id', direction: 'asc' }
-
-      expect(response).to have_http_status(:ok)
-      expect(response_materials.map { |m| m['id'] })
-        .to include(root_material.id, child_a_material.id, grandchild_material.id)
-      expect(json['tag_scope']).to eq(
-        'tag' => {
-          'id' => root.id,
-          'name' => 'material_scope_root',
-          'category' => 'material'
-        },
-        'include_descendants' => true
-      )
-      expect(json['groups'].map { |group| group.dig('tag', 'name') })
-        .to eq(['material_scope_a', 'material_scope_b', 'material_scope_root'])
-      expect(json['groups'].find { |group| group.dig('tag', 'id') == child_b.id }
-        .fetch('material_ids')).to eq([grandchild_material.id])
-    end
-
-    it 'returns nil tag_scope when tag_id is unknown' do
-      get '/materials', params: { tag_id: 999_999, group_by: 'parent_tag' }
-
-      expect(response).to have_http_status(:ok)
-      expect(json['tag_scope']).to be_nil
-      expect(json['groups']).to eq([])
-      expect(response_materials).to eq([])
-    end
   end
 
   describe 'GET /materials/:id' do
@@ -599,8 +528,9 @@ RSpec.describe 'Materials API', type: :request do
       expect(response.body.b).not_to include('素材/b.png'.b)
     end
 
-    it 'does not include disabled export items' do
+    it 'does not include suppressed materials' do
-      material_b.material_export_items.first.update!(enabled: false)
+      material_b.update!(file_suppressed_at: Time.current,
+                         file_suppression_reason: 'copyright_high_risk')
 
       get '/materials/download.zip', params: { profile: 'legacy_drive' }
 
@@ -610,78 +540,62 @@ RSpec.describe 'Materials API', type: :request do
     end
   end
 
-  describe 'GET /materials/versions' do
+  describe 'PATCH /materials/:id/suppress_file' do
     let!(:tag) do
-      Tag.create!(tag_name: TagName.create!(name: 'material_history'), category: :material)
+      Tag.create!(tag_name: TagName.create!(name: 'material_suppress'), category: :material)
     end
     let!(:material) do
-      build_material(tag:, user: member_user, file: dummy_upload(filename: 'history.png'))
+      build_material(tag:, user: member_user, file: dummy_upload(filename: 'suppress.png'))
     end
 
-    it 'returns material versions in reverse chronological order' do
+    it 'allows admin to suppress a file and records a suppress version' do
+      sign_in_as(admin_user)
       MaterialVersionRecorder.record!(material:, event_type: :create,
                                       created_by_user: member_user)
-      material.update!(url: 'https://example.com/history')
-      MaterialVersionRecorder.record!(material:, event_type: :update,
-                                      created_by_user: admin_user)
-
-      get '/materials/versions', params: { material_id: material.id }
-
-      expect(response).to have_http_status(:ok)
-      expect(json['count']).to eq(2)
-      versions = json.fetch('versions')
-      expect(versions.map { |v| v['version_no'] }).to eq([2, 1])
-      expect(versions.first).to include(
-        'material_id' => material.id,
-        'event_type' => 'update',
-        'tag_name' => 'material_history',
-        'file_filename' => 'history.png',
-        'url' => 'https://example.com/history'
-      )
-      expect(versions.first['created_by_user']).to include('id' => admin_user.id)
-    end
-
-    it 'filters material versions by tag and event_type' do
-      MaterialVersionRecorder.record!(material:, event_type: :create,
-                                      created_by_user: member_user)
-
-      get '/materials/versions', params: {
-        tag: 'material_history',
-        event_type: 'create'
-      }
-
-      expect(response).to have_http_status(:ok)
-      expect(json.fetch('versions').map { |v| v['material_id'] }).to include(material.id)
-      expect(json.fetch('versions').map { |v| v['event_type'] }).to all(eq('create'))
-    end
-  end
-
-  describe 'material sync suppressions' do
-    it 'requires member permission for index' do
-      sign_out
-
-      get '/materials/suppressions'
-
-      expect(response).to have_http_status(:unauthorized)
-    end
-
-    it 'creates source suppression as member' do
-      sign_in_as(member_user)
 
       expect do
-        post '/materials/suppressions', params: {
+        patch "/materials/#{ material.id }/suppress_file",
-          source_kind: 'google_drive_path_prefix',
+              params: { reason: 'copyright_high_risk' }
-          drive_path: '伊地知ニジカ/危険素材',
+      end.to change(MaterialVersion, :count).by(1)
-          reason: 'copyright_high_risk'
-        }
-      end.to change(MaterialSyncSuppression, :count).by(1)
 
-      expect(response).to have_http_status(:created)
+      expect(response).to have_http_status(:ok)
-      expect(json).to include(
+
-        'source_kind' => 'google_drive_path_prefix',
+      material.reload
-        'drive_path' => '伊地知ニジカ/危険素材',
+      expect(material.file_suppressed_at).to be_present
-        'normalized_source_key' => 'google_drive_path_prefix:伊地知ニジカ/危険素材'
+      expect(material.file_suppressed_by_user).to eq(admin_user)
-      )
+      expect(material.file_suppression_reason).to eq('copyright_high_risk')
+      expect(material.material_versions.order(:version_no).last.event_type).to eq('suppress')
+      expect(json['file']).to be_nil
+      expect(json['file_suppressed_at']).to be_present
+    end
+
+    it 'purges blob when purge=true is requested' do
+      sign_in_as(admin_user)
+      old_blob_id = material.file.blob.id
+      MaterialVersionRecorder.record!(material:, event_type: :create,
+                                      created_by_user: member_user)
+
+      expect do
+        patch "/materials/#{ material.id }/suppress_file",
+              params: { reason: 'copyright_takedown', purge: '1' }
+      end.to have_enqueued_job(ActiveStorage::PurgeJob)
+
+      expect(response).to have_http_status(:ok)
+
+      version = material.material_versions.order(:version_no).last
+      expect(version.event_type).to eq('suppress')
+      expect(version.file_blob_id).to eq(old_blob_id)
+      expect(version.file_filename).to eq('suppress.png')
+      expect(version.file_sha256).to be_present
+    end
+
+    it 'rejects member suppression' do
+      sign_in_as(member_user)
+
+      patch "/materials/#{ material.id }/suppress_file",
+            params: { reason: 'copyright_high_risk' }
+
+      expect(response).to have_http_status(:forbidden)
     end
   end
 

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
 
@@ -1081,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'),
@@ -1241,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'),
@@ -1321,48 +1191,6 @@ 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 で対応予定'
 

backend/spec/services/material_file_sha256_spec.rb

@@ -1,23 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe MaterialFileSha256 do
-  describe '.metadata_sha256' do
-    it 'reads sha256 from Hash metadata' do
-      blob = instance_double(ActiveStorage::Blob, metadata: { 'sha256' => 'abc123' })
-
-      expect(described_class.metadata_sha256(blob)).to eq('abc123')
-    end
-
-    it 'reads sha256 from JSON string metadata' do
-      blob = instance_double(ActiveStorage::Blob, metadata: '{"sha256":"abc123"}')
-
-      expect(described_class.metadata_sha256(blob)).to eq('abc123')
-    end
-
-    it 'returns nil for invalid metadata' do
-      blob = instance_double(ActiveStorage::Blob, metadata: '{')
-
-      expect(described_class.metadata_sha256(blob)).to be_nil
-    end
-  end
-end

backend/spec/services/material_sync_importer_spec.rb

@@ -1,128 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe MaterialSyncImporter do
-  let(:user) { create(:user, :member) }
-  let(:tag) { Tag.create!(tag_name: TagName.create!(name: 'sync_tag'), category: :material) }
-
-  def tempfile_for body
-    Tempfile.new(['material-sync-importer', '.png']).tap do |file|
-      file.binmode
-      file.write(body)
-      file.rewind
-    end
-  end
-
-  it 'creates an untagged material from a sync candidate with file_downloader' do
-    result =
-        described_class.import!(
-            source_kind: 'google_drive_file',
-            source_path: '素材/a.png',
-            source_file_id: 'drive-file-a',
-            normalized_source_key: 'google_drive_file:drive-file-a',
-            filename: 'a.png',
-            content_type: 'image/png',
-            file_sha256: Digest::SHA256.hexdigest('sync-body'),
-            file_downloader: -> { tempfile_for('sync-body') },
-            export_path: '素材/a.png',
-            tag: nil,
-            url: nil,
-            created_by_user: user,
-            updated_by_user: user)
-
-    material = result.material.reload
-    expect(result.action).to eq(:imported)
-    expect(material.tag).to be_nil
-    expect(material.url).to be_nil
-    expect(material.file).to be_attached
-    expect(material.file.blob.filename.to_s).to eq('a.png')
-    expect(material.material_export_items.first.export_path).to eq('素材/a.png')
-  end
-
-  it 'does not clear a human-assigned tag or URL on existing Drive sync' do
-    material =
-        Material.create!(tag:, url: 'https://example.com/human',
-                         source_kind: 'google_drive_file',
-                         source_path: '素材/a.png',
-                         source_file_id: 'drive-file-a',
-                         created_by_user: user,
-                         updated_by_user: user)
-    material.file.attach(
-        io: StringIO.new('same-body'),
-        filename: 'a.png',
-        content_type: 'image/png')
-    material.file.blob.metadata['sha256'] = Digest::SHA256.hexdigest('same-body')
-    material.file.blob.save!
-    MaterialExportItem.create!(material:,
-                               profile: 'legacy_drive',
-                               export_path: '素材/a.png',
-                               created_by_user: user)
-
-    result =
-        described_class.import!(
-            source_kind: 'google_drive_file',
-            source_path: '素材/a.png',
-            source_file_id: 'drive-file-a',
-            filename: 'a.png',
-            content_type: 'image/png',
-            file_sha256: Digest::SHA256.hexdigest('same-body'),
-            export_path: '素材/a.png',
-            tag: nil,
-            url: nil,
-            updated_by_user: user)
-
-    expect(result.action).to eq(:unchanged)
-    expect(material.reload.tag).to eq(tag)
-    expect(material.url).to eq('https://example.com/human')
-  end
-
-  it 'suppresses a Google Drive candidate by relative path prefix' do
-    MaterialSyncSuppression.create!(source_kind: 'google_drive_path_prefix',
-                                    drive_path: '素材/危険',
-                                    reason: 'copyright_high_risk',
-                                    created_by_user: user)
-
-    result =
-        described_class.import!(
-            source_kind: 'google_drive_file',
-            source_path: '素材/危険/a.png',
-            source_file_id: 'drive-file-b',
-            filename: 'a.png',
-            content_type: 'image/png',
-            file_sha256: Digest::SHA256.hexdigest('blocked-body'),
-            file_downloader: -> { tempfile_for('blocked-body') },
-            export_path: '素材/危険/a.png',
-            updated_by_user: user)
-
-    expect(result.action).to eq(:suppressed)
-    expect(result.suppression.normalized_source_key)
-      .to eq('google_drive_path_prefix:素材/危険')
-    expect(Material.find_by(source_file_id: 'drive-file-b')).to be_nil
-  end
-
-  it 'rechecks import blocks after downloaded file sha256 is known' do
-    MaterialImportBlock.create!(match_kind: 'sha256',
-                                sha256: Digest::SHA256.hexdigest('blocked-body'),
-                                reason: 'copyright_high_risk',
-                                created_by_user: user)
-    blob_count = ActiveStorage::Blob.count
-
-    expect do
-      result =
-          described_class.import!(
-              source_kind: 'google_drive_file',
-              source_path: '素材/blocked.png',
-              source_file_id: 'drive-file-blocked',
-              filename: 'blocked.png',
-              content_type: 'image/png',
-              file_downloader: -> { tempfile_for('blocked-body') },
-              export_path: '素材/blocked.png',
-              updated_by_user: user)
-
-      expect(result.action).to eq(:suppressed)
-      expect(result.suppression.reason).to eq('copyright_high_risk')
-    end.not_to change(Material, :count)
-
-    expect(ActiveStorage::Blob.count).to eq(blob_count)
-    expect(Material.find_by(source_file_id: 'drive-file-blocked')).to be_nil
-  end
-end

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

docs/commands.md

@@ -10,15 +10,6 @@ bundle exec rspec
 bundle exec rails routes
 ```
 
-Material video thumbnail generation requires `ffmpeg` on the host. If `ffmpeg`
-is missing or frame extraction fails, `MaterialThumbnailGenerator` logs the
-result and stderr, then leaves the existing thumbnail unchanged.
-
-```sh
-cd backend
-bundle exec rails materials:thumbnails:backfill
-```
-
 ## Frontend
 
 ```sh

frontend/src/App.tsx

@@ -14,10 +14,8 @@ import { apiPost, isApiError } from '@/lib/api'
 import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
 import MaterialBasePage from '@/pages/materials/MaterialBasePage'
 import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
-import MaterialHistoryPage from '@/pages/materials/MaterialHistoryPage'
 import MaterialListPage from '@/pages/materials/MaterialListPage'
 import MaterialNewPage from '@/pages/materials/MaterialNewPage'
-import MaterialSyncSuppressionsPage from '@/pages/materials/MaterialSyncSuppressionsPage'
 // import MaterialSearchPage from '@/pages/materials/MaterialSearchPage'
 import MorePage from '@/pages/MorePage'
 import GekanatorPage from '@/pages/GekanatorPage'
@@ -70,11 +68,10 @@ const RouteTransitionWrapper = ({ user, setUser }: {
 	  <Route path="/theatres/:id" element={<TheatreDetailPage user={user}/>}/>
 	  <Route path="/materials" element={<MaterialBasePage/>}>
 	    <Route index element={<MaterialListPage/>}/>
-	    <Route path="changes" element={<MaterialHistoryPage/>}/>
 	    <Route path="new" element={<MaterialNewPage/>}/>
-	    <Route path="suppressions" element={<MaterialSyncSuppressionsPage/>}/>
+	    <Route path=":id" element ={<MaterialDetailPage user={user}/>}/>
-	    <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}/>}/>

frontend/src/components/MaterialSidebar.tsx

@@ -1,43 +1,28 @@
+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 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 FILTERS: MaterialFilter[] = ['present', 'missing', 'any']
-const FILTER_LABELS: Record<MaterialFilter, string> = { present: '有', missing: '無', any: '全' }
 
-
+const FILTER_LABELS: Record<MaterialFilter, string> = {
-const px = (value: string): number => {
+    present: '素材あり',
-  const parsed = Number.parseFloat (value)
+    missing: '素材なし',
-  return Number.isFinite (parsed) ? parsed : 0
+    any:     'すべて'}
-}
-
-
-const verticalChrome = (el: HTMLElement): number => {
-  const style = window.getComputedStyle (el)
-
-  return (
-      px (style.paddingTop)
-      + px (style.paddingBottom)
-      + px (style.borderTopWidth)
-      + px (style.borderBottomWidth))
-}
 
 
 const setChildrenById = (
     tags:     MaterialSidebarTag[],
     targetId: number,
-    children: MaterialSidebarTag[],
+    children: MaterialSidebarTag[]): MaterialSidebarTag[] => (
-): MaterialSidebarTag[] => (
     tags.map (tag => {
       if (tag.id === targetId)
 	return { ...tag, children }
@@ -50,11 +35,8 @@ const setChildrenById = (
 
 
 const materialPath = (
-    tagId: number,
+    tagName: string,
-    materialFilter: MaterialFilter,
+    materialFilter: MaterialFilter): string => `/materials?q=${ encodeURIComponent (tagName) }&material_filter=${ materialFilter }`
-): string =>
-    `/materials?tag_id=${ tagId }&include_descendants=1&group_by=parent_tag`
-    + `&material_filter=${ materialFilter }`
 
 
 const sidebarTagToTag = (tag: MaterialSidebarTag): Tag => ({
@@ -73,43 +55,33 @@ const sidebarTagToTag = (tag: MaterialSidebarTag): Tag => ({
     matchedAlias:   null })
 
 
-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')
-
-
 const updateMaterialFilterQuery = (
     pathname: string,
     locationSearch: string,
     navigate: ReturnType<typeof useNavigate>,
-    materialFilter: MaterialFilter,
+    materialFilter: MaterialFilter) => {
-) => {
+    const qs = new URLSearchParams (locationSearch)
-  const qs = new URLSearchParams (locationSearch)
+    qs.set ('material_filter', materialFilter)
-  qs.set ('material_filter', materialFilter)
+    navigate (`${ pathname }${ qs.toString () ? `?${ qs.toString () }` : '' }`)
-  navigate (`${ pathname }${ qs.toString () ? `?${ qs.toString () }` : '' }`)
 }
 
 
-const MaterialFilterButtons: FC<{ materialFilter: MaterialFilter
+const MaterialFilterButtons: FC<{
-				  onChange:       (materialFilter: MaterialFilter) => void }> = (
+    materialFilter: MaterialFilter
-    { materialFilter, onChange },
+    onChange:       (materialFilter: MaterialFilter) => void
-) => (
+}> = ({ materialFilter, onChange }) => (
-    <div className="flex flex-wrap gap-2 justify-end md:justify-start flex-center">
+    <div className="flex flex-wrap gap-2">
-      <label className="my-auto text-sm font-bold">素材：</label>
       {FILTERS.map (value => (
 	  <button
 	      key={value}
 	      type="button"
 	      onClick={() => onChange (value)}
-	      className={cn (
+	      className={`rounded-full border px-3 py-1 text-sm ${
-		  'rounded-full border px-3 py-1 text-sm',
+		  materialFilter === value
-		  (materialFilter === value
+		  ? 'border-sky-500 bg-sky-50 text-sky-700 dark:border-sky-400 ' +
-		   ? ['border-sky-500 bg-sky-50 text-sky-700 dark:border-sky-400',
+		    'dark:bg-sky-950 dark:text-sky-100'
-		      'dark:bg-sky-950 dark:text-sky-100']
+		  : 'border-neutral-300 bg-white text-neutral-700 dark:border-stone-700 ' +
-		   : ['border-neutral-300 bg-white text-neutral-700 dark:border-stone-700',
+		    'dark:bg-stone-900 dark:text-stone-200' }`}>
-		      'dark:bg-stone-900 dark:text-stone-200']))}>
 	    {FILTER_LABELS[value]}
 	  </button>))}
     </div>)
@@ -117,14 +89,12 @@ const MaterialFilterButtons: FC<{ materialFilter: MaterialFilter
 
 const MaterialTreeNode: FC<{
     materialFilter: MaterialFilter
-    selectedTagId:  number | null
     nestLevel?:     number
     onChildren:     (tagId: number, children: MaterialSidebarTag[]) => void
     openTags:       Record<number, boolean>
     setOpenTags:    Dispatch<SetStateAction<Record<number, boolean>>>
     tag:            MaterialSidebarTag
-}> = ({ materialFilter, nestLevel = 0, onChildren, openTags, selectedTagId,
+}> = ({ materialFilter, nestLevel = 0, onChildren, openTags, setOpenTags, tag }) => {
-	 setOpenTags, tag }) => {
   const open = Boolean (openTags[tag.id])
   const { data } = useQuery ({
       queryKey: materialsKeys.tree ({ parentId: tag.id, materialFilter }),
@@ -137,10 +107,10 @@ const MaterialTreeNode: FC<{
   }, [data, onChildren, open, tag.children.length, tag.id])
 
   return (
-      <>
+      <Fragment>
 	<li>
-	  <div className="flex flex-center">
+	  <div className="flex">
-	    <div className="flex-none w-4 my-auto">
+	    <div className="flex-none w-4">
 	      {tag.hasChildren && (
 		  <button
 		      type="button"
@@ -149,17 +119,14 @@ const MaterialTreeNode: FC<{
 		    {open ? <>&minus;</> : '+'}
 		  </button>)}
 	    </div>
-	    <div className="min-w-0 flex-1 my-auto">
+	    <div className="flex-1 truncate">
-	      <div className={cn (tagSelectionShellClass (selectedTagId === tag.id),
+	      <TagLink
-				  'min-w-0 truncate')}>
+		  tag={sidebarTagToTag (tag)}
-		<TagLink
+		  nestLevel={nestLevel}
-		    tag={sidebarTagToTag (tag)}
+		  title={tag.name}
-		    nestLevel={nestLevel}
+		  withCount={false}
-		    title={tag.name}
+		  withWiki={false}
-		    withCount={false}
+		  to={materialPath (tag.name, materialFilter)}/>
-		    withWiki={false}
-		    to={materialPath (tag.id, materialFilter)}/>
-	      </div>
 	    </div>
 	  </div>
 	</li>
@@ -171,44 +138,23 @@ const MaterialTreeNode: FC<{
 		      tag={child}
 		      nestLevel={nestLevel + 1}
 		      materialFilter={materialFilter}
-		      selectedTagId={selectedTagId}
 		      openTags={openTags}
 		      setOpenTags={setOpenTags}
 		      onChildren={onChildren}/>))}
 	    </ul>)}
-      </>)
+      </Fragment>)
 }
 
 
-const MobileMaterialTreeNode: FC<{ depth?: number
+const MobileMaterialTreeNode: FC<{
-				   availableInlineSizePx?: number | null
+    depth?:          number
-				   materialFilter: MaterialFilter
+    materialFilter: MaterialFilter
-				   selectedTagId: number | null
+    onChildren:     (tagId: number, children: MaterialSidebarTag[]) => void
-				   onChildren: (tagId: number, children: MaterialSidebarTag[]) =>
+    openTags:       Record<number, boolean>
-						   void
+    setOpenTags:    Dispatch<SetStateAction<Record<number, boolean>>>
-				   openTags: Record<number, boolean>
+    tag:            MaterialSidebarTag
-				   setOpenTags: Dispatch<SetStateAction<Record<number, boolean>>>
+}> = ({ depth = 0, materialFilter, onChildren, openTags, setOpenTags, tag }) => {
-				   tag: MaterialSidebarTag }> = (
-    {
-      depth = 0,
-      availableInlineSizePx = null,
-      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,155 +165,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
+      <div className="flex flex-row-reverse items-start gap-2">
-		      overflow-hidden">
+	<div className="flex flex-col items-center gap-1">
-	<div
-	    ref={tagColumnRef}
-	    className="flex h-full min-h-0 max-h-full flex-col items-center gap-1
-		       overflow-hidden">
 	  <div
-	      ref={chipRef}
+	      className="rounded-xl border border-stone-300 bg-white px-3 py-2 text-sm
-	      className={cn (
+			 text-stone-900 shadow-sm dark:border-stone-700 dark:bg-stone-900
-		  tagSelectionShellClass (selectedTagId === tag.id),
+			 dark:text-stone-100"
-		  'box-border rounded-xl border px-3 py-2 text-sm shadow-sm',
+	      style={{ writingMode: 'vertical-rl' }}>
-		  '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}>
 	    <TagLink
 		tag={sidebarTagToTag (tag)}
 		title={tag.name}
 		withCount={false}
 		withWiki={false}
-		to={materialPath (tag.id, materialFilter)}
+		to={materialPath (tag.name, materialFilter)}/>
-		className="block overflow-hidden text-ellipsis whitespace-nowrap
-			   [max-inline-size:var(--tag-link-inline-size)]
-			   [max-height:var(--tag-link-inline-size)]"/>
 	  </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
+		  className="rounded-full border border-stone-300 bg-white px-2 py-0.5
-			     px-2 py-0.5 text-sm text-stone-700 dark:border-stone-700
+			     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="relative flex flex-row-reverse items-start gap-2 rounded-2xl border
-		className={cn (
+			   border-stone-200 bg-stone-100/70 py-2 pl-2 pr-2 text-stone-900
-		    'h-full min-h-0 max-h-full overflow-hidden box-border',
+			   dark:border-stone-700 dark:bg-stone-900/70 dark:text-stone-100"
-		    depth === 0 ? 'pt-5' : 'pt-3')}>
+		style={{ marginTop: `${ depth === 0 ? 1.25 : .75 }rem` }}>
-	      <div
+	      <span
-		  ref={expansionBorderRef}
+		  aria-hidden="true"
-		  className="relative max-h-full overflow-hidden rounded-2xl border border-stone-200
+		  className="absolute -right-3 top-4 h-px w-3 bg-stone-300 dark:bg-stone-600"/>
-			     bg-stone-100/70 py-2 pl-2 pr-2 text-stone-900
+	      {tag.children.map (child => (
-			     dark:border-stone-700 dark:bg-stone-900/70 dark:text-stone-100">
+		  <div key={child.id} className="relative">
-		<div className="flex h-full min-h-0 max-h-full flex-row-reverse items-start gap-2
+		    <MobileMaterialTreeNode
-				overflow-hidden">
+			tag={child}
-		  <span
+			depth={depth + 1}
-		      aria-hidden="true"
+			materialFilter={materialFilter}
-		      className="absolute -right-3 top-4 h-px w-3 bg-stone-300 dark:bg-stone-600"/>
+			openTags={openTags}
-		  {tag.children.map (child => (
+			setOpenTags={setOpenTags}
-		      <div
+			onChildren={onChildren}/>
-			  key={child.id}
+		  </div>))}
-			  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>
 	    </div>)}
       </div>)
 }
@@ -377,14 +218,11 @@ 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 }),
@@ -404,29 +242,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[]) => {
@@ -448,7 +263,6 @@ const MaterialSidebar: FC = () => {
 	      key={tag.id}
 	      tag={tag}
 	      materialFilter={materialFilter}
-	      selectedTagId={selectedTagId}
 	      openTags={openTags}
 	      setOpenTags={setOpenTags}
 	      onChildren={setChildren}/>)))
@@ -456,23 +270,17 @@ 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
+			dark:text-stone-100 md:hidden">
-			overflow-hidden">
 	  <MaterialFilterButtons
 	      materialFilter={materialFilter}
 	      onChange={handleFilterChange}/>
-	  <div
+	  <div ref={mobileRailRef} className="mt-3 overflow-x-auto">
-	      ref={mobileRailRef}
+	    <div className="flex min-w-max flex-row-reverse gap-3 pb-1">
-	      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">
 	      {visibleRootTags.map (tag => (
 		  <MobileMaterialTreeNode
 		      key={tag.id}
 		      tag={tag}
-		      availableInlineSizePx={mobileAvailableInlineSizePx}
 		      materialFilter={materialFilter}
-		      selectedTagId={selectedTagId}
 		      openTags={openTags}
 		      setOpenTags={setOpenTags}
 		      onChildren={setChildren}/>))}

frontend/src/components/TagLink.tsx

@@ -28,12 +28,11 @@ type Props =
 
 
 const TagLink: FC<Props> = ({ tag,
-			      nestLevel = 0,
+		   nestLevel = 0,
-			      linkFlg   = true,
+		   linkFlg   = true,
-			      withWiki  = true,
+		   withWiki  = true,
-			      withCount = true,
+		   withCount = true,
-			      className,
+		   ...props }) => {
-			      ...props }) => {
   const spanClass = cn (
       `text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE }`,
       `dark:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE }`)
@@ -106,7 +105,7 @@ const TagLink: FC<Props> = ({ tag,
 	    </span>)}
 	{tag.matchedAlias != null && (
 	    <>
-	      <span className={cn (spanClass, className)} {...props}>
+	      <span className={spanClass} {...props}>
 		{tag.matchedAlias}
 	      </span>
 	      <> → </>
@@ -115,12 +114,12 @@ const TagLink: FC<Props> = ({ tag,
 	 ? (
 	    <PrefetchLink
 		to={`/posts?${ (new URLSearchParams ({ tags: tag.name })).toString () }`}
-		className={cn (linkClass, className)}
+		className={linkClass}
 		{...props}>
 	      {tag.name}
 	    </PrefetchLink>)
 	 : (
-	    <span className={cn (spanClass, className)}
+	    <span className={spanClass}
 		  {...props}>
 	      {tag.name}
 	    </span>)}

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 = (
+export const menuOutline = ({ tag, wikiId, user, pathName }: { 
-    { tag, material, wikiId, user, pathName }: {
+    tag?: Tag | null
-	tag?: Tag | null
+    wikiId: number | null
-	material?: Material | null
+    user: User | null,
-	wikiId: number | null
+    pathName: string }): Menu => {
-	user: User | null,
+  const postCount = tag?.postCount ?? 0
-	pathName: string },
-): Menu => {
-  const postCount = tag?.postCount ?? material?.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', visible: false },
-	  { name: '全体履歴', to: '/materials/changes' },
+	  { name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
-	  { 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: '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 ? location.pathname.split ('/')[2] : wikiPage?.title) ?? ''
-  const effectiveTitle = (((tagFlg || materialFlg)
-			   ? 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 }) => (
+const PageTitle: FC<Props> = ({ children }) => (
-    <h1 className={cn ('text-2xl font-bold mb-2', className)} {...rest}>
+    <h1 className="text-2xl font-bold mb-2">
       {children}
     </h1>)
 

frontend/src/components/ui/input.tsx

@@ -1,19 +1,19 @@
-import * as React from 'react'
+import * as React from "react"
-
+
-import { cn } from '@/lib/utils'
+import { cn } from "@/lib/utils"
-
+
-const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<'input'>>(
+const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<"input">>(
-  ({ className, type, ...props }, ref) => {
+  ({ className, type, ...props }, ref) => {
-    return (
+    return (
-      <input
+      <input
-	type={type}
+	type={type}
-	className={cn(
+	className={cn(
-	  'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+	  "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
-	  className)}
+	  className
-	ref={ref}
+)}
-	{...props}
+	ref={ref}
-      />)
+	{...props}
-  })
+      />
-Input.displayName = 'Input'
+)
-
+  }
-export { Input }
+)

frontend/src/components/ui/switch.tsx

@@ -1,26 +1,26 @@
-'use client'
+"use client"
-
+
-import * as React from 'react'
+import * as React from "react"
-import * as SwitchPrimitives from '@radix-ui/react-switch'
+import * as SwitchPrimitives from "@radix-ui/react-switch"
-
+
-import { cn } from '@/lib/utils'
+import { cn } from "@/lib/utils"
-
+
-const Switch = React.forwardRef<
+const Switch = React.forwardRef<
-  React.ElementRef<typeof SwitchPrimitives.Root>,
+  React.ElementRef<typeof SwitchPrimitives.Root>,
-  React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
+  React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
->(({ className, ...props }, ref) => (
+>(({ className, ...props }, ref) => (
-  <SwitchPrimitives.Root
+  <SwitchPrimitives.Root
-    className={cn(
+    className={cn(
-      'peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input',
+      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input",
-      className)}
+      className
-    {...props}
+)}
-    ref={ref}
+    {...props}
-  >
+    ref={ref}
-    <SwitchPrimitives.Thumb
+  >
-      className={cn(
+    <SwitchPrimitives.Thumb
-	'pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0')}
+      className={cn(
-    />
+	"pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0"
-  </SwitchPrimitives.Root>))
+)}
-Switch.displayName = SwitchPrimitives.Root.displayName
+    />
-
+  </SwitchPrimitives.Root>
-export { Switch }
+))

frontend/src/lib/materials.ts

@@ -1,49 +1,48 @@
-import { apiGet, isApiError, apiPost, apiPut } from '@/lib/api'
+import {
+    apiGet,
+    isApiError,
+    apiPatch,
+    apiPost,
+    apiPut,
+} from '@/lib/api'
 
-import type { Material,
+import type {
-	      MaterialIndexResponse,
+    Material,
-	      MaterialVersion,
+    FetchMaterialsParams,
-	      FetchMaterialsParams,
+    MaterialFilter,
-	      MaterialFilter,
+    MaterialSidebarTag,
-	      MaterialSyncSuppression,
+    MaterialTagTree,
-	      MaterialSidebarTag,
+} from '@/types'
-	      MaterialTagTree } from '@/types'
 
 export type FetchMaterialTreeParams = {
     parentId?:       number | null
-    materialFilter:  MaterialFilter }
+    materialFilter:  MaterialFilter
+}
 
-export type MaterialSyncSuppressionResponse = { suppressions: MaterialSyncSuppression[] }
+export type MaterialIndexResponse = {
-
+    materials: Material[]
-export type MaterialChangesResponse = {
+    count:     number
-    versions: MaterialVersion[]
+}
-    count:    number }
 
 const MATERIAL_FILTERS: MaterialFilter[] = ['present', 'missing', 'any']
 
 
 export const parseMaterialFilter = (
     value: unknown,
-    fallback: MaterialFilter = 'present',
+    fallback: MaterialFilter = 'present'): MaterialFilter =>
-): MaterialFilter =>
     typeof value === 'string' && MATERIAL_FILTERS.includes (value as MaterialFilter)
     ? value as MaterialFilter
     : fallback
 
 
 export const fetchMaterials = async (
-    { q, tagState, mediaKind, createdFrom, createdTo,
+    { q, tagState, mediaKind, suppression, createdFrom, createdTo,
-      updatedFrom, updatedTo, sort, direction, page,
+      updatedFrom, updatedTo, sort, direction, page, limit }: FetchMaterialsParams): Promise<MaterialIndexResponse> =>
-      tagId, includeDescendants, groupBy,
-      limit }: FetchMaterialsParams,
-): Promise<MaterialIndexResponse> =>
     await apiGet ('/materials', { params: {
 	...(q && { q }),
 	tag_state:   tagState,
 	media_kind:  mediaKind,
-	...(tagId != null && { tag_id: tagId }),
+	suppression,
-	...(includeDescendants && { include_descendants: '1' }),
-	...(groupBy !== 'none' && { group_by: groupBy }),
 	...(createdFrom && { created_from: createdFrom }),
 	...(createdTo && { created_to: createdTo }),
 	...(updatedFrom && { updated_from: updatedFrom }),
@@ -68,22 +67,6 @@ export const fetchMaterial = async (id: string): Promise<Material | null> => {
 }
 
 
-export const fetchMaterialChanges = async (
-    { materialId, tag, eventType, page, limit }: {
-	materialId?: string
-	tag?:        string
-	eventType?:  string
-	page:        number
-	limit:       number
-    }): Promise<MaterialChangesResponse> =>
-    await apiGet ('/materials/versions', { params: {
-	...(materialId && { material_id: materialId }),
-	...(tag && { tag }),
-	...(eventType && { event_type: eventType }),
-	page,
-	limit} })
-
-
 export const fetchMaterialTagTree = async (
     { parentId, materialFilter }: FetchMaterialTreeParams): Promise<MaterialSidebarTag[]> =>
     await apiGet ('/tags/with-depth', { params: {
@@ -118,22 +101,7 @@ export const updateMaterial = async (
     await apiPut (`/materials/${ id }`, formData)
 
 
-export const fetchMaterialSyncSuppressions =
+export const suppressMaterialFile = async (
-    async (): Promise<MaterialSyncSuppressionResponse> =>
+    id: string,
-        await apiGet ('/materials/suppressions')
+    payload: { reason: string; purge?: boolean }): Promise<Material> =>
-
+    await apiPatch (`/materials/${ id }/suppress_file`, payload)
-
-export const createMaterialSyncSuppression = async (
-    payload: {
-        sourceKind:   string
-        sourceUri?:   string
-        drivePath?:   string
-        driveFileId?: string
-        reason:       string
-    }): Promise<MaterialSyncSuppression> =>
-    await apiPost ('/materials/suppressions', {
-        source_kind:   payload.sourceKind,
-        source_uri:    payload.sourceUri,
-        drive_path:    payload.drivePath,
-        drive_file_id: payload.driveFileId,
-        reason:        payload.reason})

frontend/src/lib/queryKeys.ts

@@ -34,17 +34,9 @@ export const tagsKeys = {
 export const materialsKeys = {
     root:         ['materials'] as const,
     index:        (p: FetchMaterialsParams) => ['materials', 'index', p] as const,
-    changes:      (p: {
-	materialId?: string
-	tag?:        string
-	eventType?:  string
-	page:        number
-	limit:       number
-    }) => ['materials', 'changes', p] as const,
     byTagName:     (name: string, materialFilter: MaterialFilter) =>
 		      ['materials', 'tag', name, materialFilter] as const,
     show:         (id: string) => ['materials', id] as const,
-    suppressions: () => ['materials', 'suppressions'] as const,
     tree:         (p: {
 	parentId?:       number | null
 	materialFilter:  MaterialFilter

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

@@ -7,9 +7,9 @@ import { buildMaterial, buildTag } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
 
 const api = vi.hoisted (() => ({
-  apiGet:     vi.fn (),
+  apiGet: vi.fn (),
-  apiPut:     vi.fn (),
+  apiPatch: vi.fn (),
-  isApiError: vi.fn (),
+  apiPut: vi.fn (),
 }))
 
 const wikiApi = vi.hoisted (() => ({
@@ -35,11 +35,7 @@ const renderPage = () =>
 describe ('MaterialDetailPage', () => {
   beforeEach (() => {
     vi.clearAllMocks ()
-    api.apiGet.mockImplementation (async (path: string) =>
+    api.apiGet.mockResolvedValue ([])
-      path === '/tags/autocomplete'
-      ? []
-      : buildMaterial ({ id: 8 }))
-    api.isApiError.mockReturnValue (false)
     wikiApi.fetchWikiPages.mockResolvedValue ([])
     vi.stubGlobal ('fetch', vi.fn (async () => ({
       blob: async () => new Blob (['image'], { type: 'image/png' }),
@@ -90,22 +86,4 @@ describe ('MaterialDetailPage', () => {
     expect (formData.get ('export_paths[legacy_drive]')).toBe ('素材/new.png')
     expect (toastApi.toast).toHaveBeenCalledWith ({ title: '更新成功!' })
   })
-
-  it ('shows not found when material API returns 404', async () => {
-    api.isApiError.mockReturnValue (true)
-    api.apiGet.mockRejectedValueOnce ({ response: { status: 404 } })
-
-    renderPage ()
-
-    expect (await screen.findByText ('素材が見つかりませんでした．')).toBeInTheDocument ()
-  })
-
-  it ('shows an error for non-404 material API failures', async () => {
-    api.isApiError.mockReturnValue (false)
-    api.apiGet.mockRejectedValueOnce (new Error ('network error'))
-
-    renderPage ()
-
-    expect (await screen.findByText ('素材の取得に失敗しました．')).toBeInTheDocument ()
-  })
 })

frontend/src/pages/materials/MaterialDetailPage.tsx

@@ -15,6 +15,7 @@ import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
 import {
+    suppressMaterialFile,
     fetchMaterial,
     updateMaterial,
 } from '@/lib/materials'
@@ -24,10 +25,12 @@ import { useValidationErrors } from '@/lib/useValidationErrors'
 
 import type { FC } from 'react'
 
+import type { User } from '@/types'
+
 type MaterialFormField = 'tag' | 'file' | 'url' | 'exportPaths'
 
 
-const MaterialDetailPage: FC = () => {
+const MaterialDetailPage: FC<{ user: User | null }> = ({ user }) => {
   const { id } = useParams ()
   const qc = useQueryClient ()
 
@@ -88,11 +91,35 @@ const MaterialDetailPage: FC = () => {
 	toast ({ title: '更新失敗……', description: '入力を見直してください．' })
       }})
 
+  const suppressMutation = useMutation ({
+      mutationFn: async (reason: string) =>
+	  await suppressMaterialFile (id ?? '', { reason }),
+      onSuccess: async data => {
+	qc.setQueryData (materialsKeys.show (id ?? ''), data)
+	setFile (null)
+	setFilePreview ('')
+	await invalidateMaterialQueries ()
+	toast ({ title: '抑止しました' })
+      },
+      onError: () => {
+	toast ({ title: '抑止に失敗しました' })
+      }})
+
   const handleSubmit = () => {
     clearValidationErrors ()
     updateMutation.mutate ()
   }
 
+  const handleSuppress = () => {
+    const reason = window.prompt ('抑止理由を入力してください。')
+    if (reason == null || reason.trim () === '')
+      return
+    if (!window.confirm ('素材ファイルを抑止します。表示と ZIP export から除外されます。'))
+      return
+
+    suppressMutation.mutate (reason)
+  }
+
   return (
       <MainArea>
 	{material && (
@@ -118,7 +145,16 @@ const MaterialDetailPage: FC = () => {
 		 : materialTitle}
 	      </PageTitle>
 
-	      {(material.file && material.contentType) && (
+	      {material.fileSuppressedAt && (
+		  <div className="mb-4 rounded border border-red-300 bg-red-50 p-3
+				  text-red-900 dark:border-red-800 dark:bg-red-950
+				  dark:text-red-100">
+		    <span>素材ファイルは抑止済みです。</span>
+		    {material.fileSuppressionReason && (
+			<span> 理由: {material.fileSuppressionReason}</span>)}
+		  </div>)}
+
+	      {(!material.fileSuppressedAt && material.file && material.contentType) && (
 		  (/image\/.*/.test (material.contentType) && (
 		      <img src={material.file} alt={material.tag?.name || undefined}/>))
 		  || (/video\/.*/.test (material.contentType) && (
@@ -127,12 +163,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}/>
+			  body={material.wikiPageBody ?? undefined}/>)
-		    </Tab>)}
+		   : (
+		      <p className="text-stone-700 dark:text-stone-300">
+			タグ未設定の素材です．
+		      </p>)}
+		</Tab>
 
 		<Tab name="編輯">
 		  <div className="max-w-wl space-y-4 pt-2">
@@ -215,6 +256,14 @@ const MaterialDetailPage: FC = () => {
 			  disabled={updateMutation.isPending}>
 			更新
 		      </Button>
+		      {user?.role === 'admin' && !material.fileSuppressedAt && (
+			  <Button
+			      type="button"
+			      variant="destructive"
+			      onClick={handleSuppress}
+			      disabled={suppressMutation.isPending}>
+			    ファイルを抑止
+			  </Button>)}
 		    </div>
 		  </div>
 		</Tab>

frontend/src/pages/materials/MaterialHistoryPage.tsx

@@ -1,189 +0,0 @@
-import { useQuery } from '@tanstack/react-query'
-import { useEffect, useState } from 'react'
-import { Helmet } from 'react-helmet-async'
-import { useLocation, useNavigate } from 'react-router-dom'
-
-import PrefetchLink from '@/components/PrefetchLink'
-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 { fetchMaterialChanges } from '@/lib/materials'
-import { materialsKeys } from '@/lib/queryKeys'
-import { dateString, inputClass } from '@/lib/utils'
-
-import type { FC, FormEvent } from 'react'
-
-
-const MaterialHistoryPage: FC = () => {
-  const location = useLocation ()
-  const navigate = useNavigate ()
-  const query = new URLSearchParams (location.search)
-
-  const materialId = query.get ('material_id') ?? ''
-  const tag = query.get ('tag') ?? ''
-  const eventType = query.get ('event_type') ?? ''
-  const page = Number (query.get ('page') ?? 1)
-  const limit = Number (query.get ('limit') ?? 20)
-
-  const [materialIdInput, setMaterialIdInput] = useState (materialId)
-  const [tagInput, setTagInput] = useState (tag)
-  const [eventTypeInput, setEventTypeInput] = useState (eventType)
-
-  useEffect (() => {
-    setMaterialIdInput (materialId)
-    setTagInput (tag)
-    setEventTypeInput (eventType)
-  }, [eventType, materialId, tag])
-
-  const { data, isLoading, isError } = useQuery ({
-      queryKey: materialsKeys.changes ({
-	  ...(materialId && { materialId }),
-	  ...(tag && { tag }),
-	  ...(eventType && { eventType }),
-	  page,
-	  limit }),
-      queryFn: () => fetchMaterialChanges ({
-	  ...(materialId && { materialId }),
-	  ...(tag && { tag }),
-	  ...(eventType && { eventType }),
-	  page,
-	  limit }) })
-
-  const versions = data?.versions ?? []
-  const totalPages = data ? Math.ceil (data.count / limit) : 0
-
-  useEffect (() => {
-    document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
-  }, [location.search])
-
-  const handleSearch = (event: FormEvent) => {
-    event.preventDefault ()
-
-    const qs = new URLSearchParams ()
-    if (materialIdInput.trim ())
-      qs.set ('material_id', materialIdInput.trim ())
-    if (tagInput.trim ())
-      qs.set ('tag', tagInput.trim ())
-    if (eventTypeInput.trim ())
-      qs.set ('event_type', eventTypeInput.trim ())
-    qs.set ('page', '1')
-    qs.set ('limit', String (limit))
-    navigate (`/materials/changes?${ qs.toString () }`)
-  }
-
-  return (
-      <MainArea>
-	<Helmet>
-	  <title>{`素材履歴 | ${ SITE_TITLE }`}</title>
-	</Helmet>
-
-	<div className="space-y-5">
-	  <PageTitle>素材履歴</PageTitle>
-
-	  <form
-	      onSubmit={handleSearch}
-	      className="max-w-3xl rounded-lg border border-stone-200 bg-white p-4
-			 text-stone-900 dark:border-stone-700 dark:bg-stone-900
-			 dark:text-stone-100">
-	    <div className="space-y-3">
-	      <FormField label="素材 ID">
-		{({ invalid }) => (
-		    <input
-			type="text"
-			value={materialIdInput}
-			onChange={e => setMaterialIdInput (e.target.value)}
-			className={inputClass (invalid)}/>)}
-	      </FormField>
-
-	      <FormField label="タグ名">
-		{({ invalid }) => (
-		    <input
-			type="text"
-			value={tagInput}
-			onChange={e => setTagInput (e.target.value)}
-			className={inputClass (invalid)}/>)}
-	      </FormField>
-	    </div>
-
-	    <button
-		type="submit"
-		className="mt-4 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">
-	      絞り込む
-	    </button>
-	  </form>
-
-	  {isLoading
-	   ? 'Loading...'
-	   : isError
-	   ? (
-	      <p className="text-red-600 dark:text-red-300">
-		素材履歴の取得に失敗しました．
-	      </p>)
-	   : (
-	      <>
-		<div className="overflow-x-auto">
-		  <table className="w-full min-w-[1200px] table-fixed border-collapse">
-		    <colgroup>
-		      <col className="w-48"/>
-		      <col className="w-28"/>
-		      <col className="w-24"/>
-		      <col className="w-64"/>
-		      <col className="w-64"/>
-		      <col className="w-80"/>
-		      <col className="w-80"/>
-		      <col className="w-48"/>
-		    </colgroup>
-
-		    <thead className="border-b-2 border-black dark:border-white">
-		      <tr>
-			<th className="p-2 text-left">日時</th>
-			<th className="p-2 text-left">素材 ID</th>
-			<th className="p-2 text-left">版</th>
-			<th className="p-2 text-left">タグ名</th>
-			<th className="p-2 text-left">ファイル名</th>
-			<th className="p-2 text-left">URL</th>
-			<th className="p-2 text-left">export_path</th>
-			<th className="p-2 text-left">操作者</th>
-		      </tr>
-		    </thead>
-
-		    <tbody>
-		      {versions.map (version => (
-			  <tr
-			      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">
-			      <PrefetchLink to={`/materials/${ version.materialId }`}>
-				#{version.materialId}
-			      </PrefetchLink>
-			    </td>
-			    <td className="p-2">{version.versionNo}</td>
-			    <td className="p-2 break-all">{version.tagName}</td>
-			    <td className="p-2 break-all">{version.fileFilename}</td>
-			    <td className="p-2 break-all">{version.url}</td>
-			    <td className="p-2 break-all">
-			      {version.exportPathsJson.legacy_drive}
-			    </td>
-			    <td className="p-2">
-			      {version.createdByUser
-			       ? version.createdByUser.name || `#${ version.createdByUser.id }`
-			       : 'bot 操作'}
-			    </td>
-			  </tr>))}
-		    </tbody>
-		  </table>
-		</div>
-
-		<Pagination page={page} totalPages={totalPages}/>
-	      </>)}
-	</div>
-      </MainArea>)
-}
-
-
-export default MaterialHistoryPage

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

@@ -1,5 +1,5 @@
-import { fireEvent, screen, waitFor } from '@testing-library/react'
+import { screen, waitFor } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 
 import MaterialListPage from '@/pages/materials/MaterialListPage'
 import { buildMaterial, buildTag } from '@/test/factories'
@@ -12,169 +12,51 @@ const api = vi.hoisted (() => ({
 vi.mock ('@/lib/api', () => api)
 
 describe ('MaterialListPage', () => {
-  beforeEach (() => {
+  it ('shows the empty selection guide without a tag query', () => {
-    vi.clearAllMocks ()
+    renderWithProviders (<MaterialListPage/>, { route: '/materials' })
-    api.apiGet.mockResolvedValue ({ materials: [], count: 0 })
+
+    expect (screen.getByText ('左のリストから照会したいタグを選択してください。')).toBeInTheDocument ()
+    expect (screen.getByRole ('link', { name: '素材を新規追加する' })).toHaveAttribute (
+        'href',
+        '/materials/new',
+    )
   })
 
-  it ('loads the material index on the initial page', async () => {
+  it ('loads materials for a tag query', async () => {
-    renderWithProviders (<MaterialListPage/>, { route: '/materials' })
+    const tag = {
+      ...buildTag ({
+        id:       4,
+        name:     '素材タグ',
+        category: 'material',
+      }),
+      material: buildMaterial ({ id: 8, contentType: 'image/png', file: 'image.png' }),
+      children: [],
+    }
+    api.apiGet.mockResolvedValueOnce (tag)
+
+    renderWithProviders (<MaterialListPage/>, { route: '/materials?tag=%E7%B4%A0%E6%9D%90' })
 
     await waitFor (() => {
       expect (api.apiGet).toHaveBeenCalledWith (
-          '/materials',
+          '/tags/name/%E7%B4%A0%E6%9D%90/materials',
-          { params: {
-              tag_state:  'all',
-              media_kind: 'all',
-              sort:       'created_at',
-              direction:  'desc',
-              page:       1,
-              limit:      20,
-          } },
       )
     })
-    expect (await screen.findByText ('素材はありません。')).toBeInTheDocument ()
+    expect (await screen.findByRole ('link', { name: '素材タグ' })).toBeInTheDocument ()
+    expect (screen.getByRole ('link', { name: '' })).toHaveAttribute ('href', '/materials/8')
   })
 
-  it ('shows materials in the default card view', async () => {
+  it ('offers adding a missing non-meme material', async () => {
     api.apiGet.mockResolvedValueOnce ({
-      materials: [
+      ...buildTag ({ name: '未登録', category: 'material' }),
-        buildMaterial ({
+      material: null,
-          id:          8,
+      children: [],
-          tag:         buildTag ({ name: '素材タグ', category: 'material' }),
-          thumbnail:   'thumb.png',
-          mediaKind:   'image',
-          contentType: 'image/png',
-        }),
-      ],
-      count: 1,
     })
 
-    renderWithProviders (<MaterialListPage/>, { route: '/materials' })
+    renderWithProviders (<MaterialListPage/>, { route: '/materials?tag=x' })
 
-    expect ((await screen.findByText ('素材タグ')).closest ('a'))
+    expect (await screen.findByRole ('link', { name: '追加' })).toHaveAttribute (
-      .toHaveAttribute ('href', '/materials/8')
-    expect (screen.getByText (/画像 \/ 令和8年1月2日/)).toBeInTheDocument ()
-  })
-
-  it ('submits list filters as material index params', async () => {
-    renderWithProviders (<MaterialListPage/>, { route: '/materials' })
-
-    fireEvent.change (screen.getByPlaceholderText ('タグ名 / URL / ファイル名'), {
-      target: { value: '虹夏' },
-    })
-    const selects = screen.getAllByRole ('combobox')
-    fireEvent.change (selects[0], {
-      target: { value: 'untagged' },
-    })
-    fireEvent.change (selects[1], {
-      target: { value: 'image' },
-    })
-    fireEvent.click (screen.getByRole ('button', { name: '検索' }))
-
-    await waitFor (() => {
-      expect (api.apiGet).toHaveBeenCalledWith (
-          '/materials',
-          expect.objectContaining ({ params: expect.objectContaining ({
-            q:          '虹夏',
-            tag_state:  'untagged',
-            media_kind: 'image',
-          }) }),
-      )
-    })
-  })
-
-  it ('keeps a route back to the material search top for untagged materials', async () => {
-    renderWithProviders (
-        <MaterialListPage/>,
-        { route: '/materials?tag_state=untagged&material_filter=any' },
-    )
-
-    expect (await screen.findByRole (
-        'link',
-        { name: '素材検索トップへ戻る' },
-    )).toHaveAttribute ('href', '/materials?material_filter=any')
-  })
-
-  it ('uses list view for detailed material rows', async () => {
-    api.apiGet.mockResolvedValueOnce ({
-      materials: [
-        buildMaterial ({
-          id:           9,
-          tag:          buildTag ({ name: '詳細素材', category: 'material' }),
-          mediaKind:    'file_other',
-          fileByteSize: 2048,
-        }),
-      ],
-      count: 1,
-    })
-
-    renderWithProviders (<MaterialListPage/>, { route: '/materials?view=list' })
-
-    expect (await screen.findByRole ('link', { name: '詳細素材' })).toHaveAttribute (
         'href',
-        '/materials/9',
+        '/materials/new?tag=%E6%9C%AA%E7%99%BB%E9%8C%B2',
-    )
-    expect (screen.getByText ('サイズ:')).toBeInTheDocument ()
-    expect (screen.getByText ('2.0 KB')).toBeInTheDocument ()
-  })
-
-  it ('shows the selected tag scope and tag-specific add links', async () => {
-    api.apiGet.mockResolvedValueOnce ({
-      materials: [
-        buildMaterial ({
-          id:  10,
-          tag: buildTag ({ id: 30, name: '泣き', category: 'material' }),
-        }),
-      ],
-      count:    1,
-      tagScope: {
-        tag:                { id: 20, name: '伊地知ニジカ', category: 'material' },
-        includeDescendants: true,
-      },
-      groups: [
-        {
-          key:         'tag:30',
-          tag:         { id: 30, name: '泣き', category: 'material' },
-          materialIds: [10],
-          count:       1,
-        },
-      ],
-    })
-
-    renderWithProviders (
-        <MaterialListPage/>,
-        { route: '/materials?tag_id=20&include_descendants=1&group_by=parent_tag' },
-    )
-
-    expect (await screen.findByText (
-        (_, element) => element?.textContent === '伊地知ニジカ 配下の素材を表示中',
-    )).toBeInTheDocument ()
-
-    expect (screen.getByRole ('link', { name: '泣き' })).toHaveAttribute (
-        'href',
-        '/materials?tag_id=30&include_descendants=1&group_by=parent_tag&material_filter=present',
-    )
-    expect (screen.getByRole ('link', { name: 'タグ選択を解除' })).toHaveAttribute (
-        'href',
-        '/materials?material_filter=present',
-    )
-  })
-
-  it ('shows a clear link when tag_id does not resolve to tag_scope', async () => {
-    api.apiGet.mockResolvedValueOnce ({
-      materials: [],
-      count:     0,
-      tagScope:  null,
-      groups:    [],
-    })
-
-    renderWithProviders (<MaterialListPage/>, { route: '/materials?tag_id=999' })
-
-    expect (await screen.findByText ('選択中タグが見つかりません．')).toBeInTheDocument ()
-    expect (screen.getByRole ('link', { name: 'タグ選択を解除' })).toHaveAttribute (
-        'href',
-        '/materials?material_filter=present',
     )
   })
 })

frontend/src/pages/materials/MaterialListPage.tsx

@@ -10,30 +10,30 @@ 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,
+import type {
-	      Material,
+    FetchMaterialsParams,
-	      MaterialFilter,
+    Material,
-	      MaterialIndexGroup,
+    MaterialIndexDirection,
-	      MaterialIndexGroupBy,
+    MaterialIndexMediaKind,
-	      MaterialIndexDirection,
+    MaterialIndexSort,
-	      MaterialIndexMediaKind,
+    MaterialIndexSuppression,
-	      MaterialIndexSort,
+    MaterialIndexTagState,
-	      MaterialIndexTagState,
+    MaterialIndexView } from '@/types'
-	      MaterialIndexView } from '@/types'
 
 const MEDIA_KIND_LABELS: Record<Material['mediaKind'], string> = {
     image:      '画像',
     video:      '動画',
     audio:      '音声',
     file_other: 'その他ファイル',
-    url_only:   'URL のみ'}
+    url_only:   'URL のみ',
+    suppressed: '抑止済み'}
 
 const MEDIA_FILTER_LABELS: Record<MaterialIndexMediaKind, string> = {
     all:        'すべて',
@@ -41,16 +41,16 @@ 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: '容量',
+    file_byte_size: 'ファイルサイズ',
-    version_no:     '版',
+    version_no:     'バージョン',
-    id:             'Id.'}
+    id:             'ID'}
 
 
 const setIf = (qs: URLSearchParams, key: string, value: string | null) => {
@@ -81,44 +81,19 @@ const materialTitle = (material: Material): string =>
     material.tag?.name ?? `素材 #${ material.id }`
 
 
-const groupedTagPath = (
-    tagId: number,
-    materialFilter: MaterialFilter,
-): string =>
-    `/materials?tag_id=${ tagId }&include_descendants=1&group_by=parent_tag`
-    + `&material_filter=${ materialFilter }`
-
-
-const materialNewPath = (
-    tagName: string,
-    returnTo: string,
-): string =>
-    `/materials/new?tag=${ encodeURIComponent (tagName) }`
-    + `&return_to=${ encodeURIComponent (returnTo) }`
-
-
-const clearedTagSelectionPath = (
-    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 MaterialThumb: FC<{ material: Material }> = ({ material }) => (
     <div
 	className={`flex aspect-square h-[180px] w-[180px] items-center justify-center
-		    overflow-hidden rounded-lg border border-stone-200 bg-white text-center
+		    overflow-hidden rounded-lg border text-center shadow-sm ${
-		    text-stone-900 shadow-sm dark:border-stone-700 dark:bg-stone-900
+		    material.fileSuppressedAt
-		    dark:text-stone-100`}>
+		    ? [
+			'border-red-300 bg-red-50 text-red-900 dark:border-red-800',
+			'dark:bg-red-950 dark:text-red-100'].join (' ')
+		    : [
+			'border-stone-200 bg-white text-stone-900 dark:border-stone-700',
+			'dark:bg-stone-900 dark:text-stone-100'].join (' ') }`}>
       {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"
@@ -148,8 +123,14 @@ const MaterialCard: FC<{ material: Material }> = ({ material }) => (
 
 const MaterialListItem: FC<{ material: Material }> = ({ material }) => (
     <article
-	className="rounded-lg border border-stone-200 bg-white p-3 text-stone-900
+	className={`rounded-lg border p-3 shadow-sm ${
-		   shadow-sm dark:border-stone-700 dark:bg-stone-900 dark:text-stone-100">
+		    material.fileSuppressedAt
+		    ? [
+			'border-red-200 bg-red-50 text-red-900 dark:border-red-900',
+			'dark:bg-red-950 dark:text-red-100'].join (' ')
+		    : [
+			'border-stone-200 bg-white text-stone-900 dark:border-stone-700',
+			'dark:bg-stone-900 dark:text-stone-100'].join (' ')}`}>
       <div className="flex gap-3">
 	<MaterialThumb material={material}/>
 	<div className="min-w-0 flex-1 space-y-2">
@@ -160,6 +141,8 @@ const MaterialListItem: FC<{ material: Material }> = ({ material }) => (
 			   dark:text-sky-300">
 	      {materialTitle (material)}
 	    </PrefetchLink>
+	    {material.fileSuppressedAt && (
+		<p className="mt-1 text-sm text-red-700 dark:text-red-200">抑止済み</p>)}
 	  </div>
 	  <dl className="space-y-1 text-sm text-stone-600 dark:text-stone-300">
 	    <div>
@@ -186,28 +169,6 @@ const MaterialListItem: FC<{ material: Material }> = ({ material }) => (
     </article>)
 
 
-const GroupHeading: FC<{
-    count:          number
-    materialFilter: MaterialFilter
-    title:          string
-    tagId:          number
-}> = ({ count, materialFilter, title, tagId }) => (
-    <div className="flex 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">
-	{title}
-      </PrefetchLink>
-      <div className="text-right w-auto">
-	<span className="text-nowrap text-sm text-stone-600 dark:text-stone-300">
-	  {count} 件
-	</span>
-      </div>
-    </div>)
-
-
 const MaterialListPage: FC = () => {
   const location = useLocation ()
   const navigate = useNavigate ()
@@ -216,10 +177,7 @@ const MaterialListPage: FC = () => {
 
   const page = Number (query.get ('page') ?? 1)
   const limit = Number (query.get ('limit') ?? 20)
-  const qQuery = query.get ('q') ?? ''
+  const qQuery = query.get ('q') ?? query.get ('tag') ?? ''
-  const tagIdQuery = Number (query.get ('tag_id') ?? 0)
-  const tagId = tagIdQuery > 0 ? tagIdQuery : null
-  const includeDescendants = query.get ('include_descendants') === '1'
   const tagState = query.get ('unclassified') === '1'
       ? 'untagged'
       : parseOption<MaterialIndexTagState> (
@@ -230,6 +188,10 @@ const MaterialListPage: FC = () => {
       query.get ('media_kind'),
       ['all', 'image', 'video', 'audio', 'file_other', 'url_only'],
       'all')
+  const suppression = parseOption<MaterialIndexSuppression> (
+      query.get ('suppression'),
+      ['active', 'suppressed', 'all'],
+      'active')
   const sort = parseOption<MaterialIndexSort> (
       query.get ('sort'),
       ['created_at', 'updated_at', 'tag_name', 'media_kind', 'file_byte_size',
@@ -239,11 +201,6 @@ const MaterialListPage: FC = () => {
       query.get ('direction'),
       ['asc', 'desc'],
       'desc')
-  const groupByQuery = parseOption<MaterialIndexGroupBy> (
-      query.get ('group_by'),
-      ['none', 'parent_tag'],
-      'none')
-  const groupBy = tagId == null ? 'none' : groupByQuery
   const view = parseOption<MaterialIndexView> (query.get ('view'), ['card', 'list'], 'card')
   const createdFromQuery = query.get ('created_from') ?? ''
   const createdToQuery = query.get ('created_to') ?? ''
@@ -253,7 +210,8 @@ const MaterialListPage: FC = () => {
   const [q, setQ] = useState ('')
   const [tagStateInput, setTagStateInput] = useState<MaterialIndexTagState> ('all')
   const [mediaKindInput, setMediaKindInput] = useState<MaterialIndexMediaKind> ('all')
-  const [groupByInput, setGroupByInput] = useState<MaterialIndexGroupBy> ('none')
+  const [suppressionInput, setSuppressionInput] =
+      useState<MaterialIndexSuppression> ('active')
   const [createdFrom, setCreatedFrom] = useState<string | null> (null)
   const [createdTo, setCreatedTo] = useState<string | null> (null)
   const [updatedFrom, setUpdatedFrom] = useState<string | null> (null)
@@ -263,9 +221,7 @@ const MaterialListPage: FC = () => {
       q: qQuery,
       tagState,
       mediaKind,
-      tagId,
+      suppression,
-      includeDescendants,
-      groupBy,
       createdFrom: createdFromQuery,
       createdTo: createdToQuery,
       updatedFrom: updatedFromQuery,
@@ -278,33 +234,19 @@ const MaterialListPage: FC = () => {
   const { data, isLoading, isError } = useQuery ({
       queryKey: materialsKeys.index (keys),
       queryFn:  () => fetchMaterials (keys)})
-  const tagScope = data?.tagScope ?? null
   const materials = data?.materials ?? []
-  const groups = data?.groups ?? []
   const totalPages = data ? Math.ceil (data.count / limit) : 0
-  const materialsById = useMemo (
-      () => new Map (materials.map (material => [material.id, material])),
-      [materials],
-  )
-  const groupedMaterialIds = useMemo (
-      () => new Set (groups.flatMap (group => group.materialIds)),
-      [groups],
-  )
-  const ungroupedMaterials = useMemo (
-      () => materials.filter (material => !groupedMaterialIds.has (material.id)),
-      [groupedMaterialIds, materials],
-  )
 
   useEffect (() => {
     setQ (qQuery)
     setTagStateInput (tagState)
     setMediaKindInput (mediaKind)
-    setGroupByInput (groupBy)
+    setSuppressionInput (suppression)
     setCreatedFrom (createdFromQuery)
     setCreatedTo (createdToQuery)
     setUpdatedFrom (updatedFromQuery)
     setUpdatedTo (updatedToQuery)
-  }, [createdFromQuery, createdToQuery, groupBy, mediaKind, qQuery, tagState,
+  }, [createdFromQuery, createdToQuery, mediaKind, qQuery, suppression, tagState,
       updatedFromQuery, updatedToQuery])
 
   const search = (e: FormEvent) => {
@@ -314,83 +256,26 @@ const MaterialListPage: FC = () => {
     setIf (qs, 'q', q)
     qs.set ('tag_state', tagStateInput)
     qs.set ('media_kind', mediaKindInput)
+    qs.set ('suppression', suppressionInput)
     setIf (qs, 'created_from', createdFrom)
     setIf (qs, 'created_to', createdTo)
     setIf (qs, 'updated_from', updatedFrom)
     setIf (qs, 'updated_to', updatedTo)
     qs.set ('sort', sort)
     qs.set ('direction', direction)
-    qs.set ('group_by', tagId == null ? 'none' : groupByInput)
     qs.set ('view', view)
     qs.set ('page', '1')
     qs.set ('limit', String (limit))
     qs.set ('material_filter', materialFilter)
-    if (tagId != null)
-      qs.set ('tag_id', String (tagId))
-
-    if (includeDescendants)
-      qs.set ('include_descendants', '1')
-
     navigate (`/materials?${ qs.toString () }`)
   }
 
   const updateQuery = (changes: Record<string, string>) => {
     const qs = new URLSearchParams (location.search)
-    Object.entries (changes).forEach (([key, value]) => {
+    Object.entries (changes).forEach (([key, value]) => qs.set (key, value))
-      if (value === '')
-	qs.delete (key)
-      else
-	qs.set (key, value)
-    })
     navigate (`/materials?${ qs.toString () }`)
   }
 
-  const renderMaterialCollection = (rows: Material[]) =>
-      view === 'card'
-      ? (
-	  <div className="grid grid-cols-[repeat(auto-fill,minmax(196px,1fr))]
-			  justify-items-center gap-4">
-	    {rows.map (material => (
-		<MaterialCard key={material.id} material={material}/>))}
-	  </div>)
-      : (
-	  <div className="space-y-3">
-	    {rows.map (material => (
-		<MaterialListItem key={material.id} material={material}/>))}
-	  </div>)
-
-  const renderGroupedMaterials = (materialGroups: MaterialIndexGroup[]) => (
-      <div className="space-y-6">
-	{materialGroups.map (group => {
-	  const groupMaterials =
-	      group.materialIds
-	      .map (materialId => materialsById.get (materialId))
-	      .filter ((material): material is Material => material != null)
-
-	  if (groupMaterials.length === 0)
-	    return null
-
-	  return (
-	      <section key={group.key} className="space-y-3">
-		<GroupHeading
-		    tagId={group.tag.id}
-		    title={group.tag.name}
-		    count={group.count}
-		    materialFilter={materialFilter}/>
-		{renderMaterialCollection (groupMaterials)}
-	      </section>)
-	})}
-	{ungroupedMaterials.length > 0 && (
-	    <section className="space-y-3">
-	      <div className="border-b border-stone-200 pb-2 dark:border-stone-700">
-		<span className="font-medium text-stone-900 dark:text-stone-100">
-		  その他
-		</span>
-	      </div>
-	      {renderMaterialCollection (ungroupedMaterials)}
-	    </section>)}
-      </div>)
-
   return (
       <MainArea>
 	<Helmet>
@@ -402,15 +287,21 @@ 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: 局所出力を可能にする */}
+	      <PrefetchLink
-	      {/* <a
+		  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>
+	      <a
 		  href={`${ API_BASE_URL }/materials/download.zip?profile=legacy_drive`}
 		  target="_blank"
 		  rel="noopener noreferrer"
@@ -418,38 +309,10 @@ 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>
 
-	  {tagScope && (
-	      <div className="flex flex-wrap items-center gap-3 rounded-lg border
-			      border-sky-200 bg-sky-50 px-4 py-3 text-sm text-sky-900
-			      dark:border-sky-800 dark:bg-sky-950 dark:text-sky-100">
-		<span>
-		  {tagScope.tag.name}
-		  {tagScope.includeDescendants ? ' 配下の素材を表示中' : ' の素材を表示中'}
-		</span>
-		<PrefetchLink
-		    to={clearedTagSelectionPath (location.search, materialFilter)}
-		    className="font-medium underline underline-offset-2
-			       text-sky-700 dark:text-sky-300">
-		  タグ選択を解除
-		</PrefetchLink>
-	      </div>)}
-	  {(tagId != null && tagScope == null) && (
-	      <div className="flex flex-wrap items-center gap-3 rounded-lg border
-			      border-amber-200 bg-amber-50 px-4 py-3 text-sm text-amber-900
-			      dark:border-amber-800 dark:bg-amber-950 dark:text-amber-100">
-		<span>選択中タグが見つかりません．</span>
-		<PrefetchLink
-		    to={clearedTagSelectionPath (location.search, materialFilter)}
-		    className="font-medium underline underline-offset-2
-			       text-amber-800 dark:text-amber-200">
-		  タグ選択を解除
-		</PrefetchLink>
-	      </div>)}
-
 	  {tagState === 'untagged' && (
 	      <PrefetchLink
 		  to={`/materials?material_filter=${ materialFilter }`}
@@ -500,6 +363,19 @@ const MaterialListPage: FC = () => {
 		    </select>)}
 	      </FormField>
 
+	      <FormField label="抑止状態">
+		{({ invalid }) => (
+		    <select
+			value={suppressionInput}
+			onChange={e => setSuppressionInput (
+			    e.target.value as MaterialIndexSuppression)}
+			className={inputClass (invalid)}>
+		      <option value="active">有効のみ</option>
+		      <option value="suppressed">抑止済みのみ</option>
+		      <option value="all">すべて</option>
+		    </select>)}
+	      </FormField>
+
 	      <FormField label="作成日時">
 		{() => (
 		    <div className="flex flex-wrap items-center gap-2">
@@ -542,7 +418,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 +431,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,22 +459,20 @@ const MaterialListPage: FC = () => {
 	  {isError && (
 	      <p className="text-red-600 dark:text-red-300">素材一覧の取得に失敗しました．</p>)}
 	  {(!isLoading && !isError && materials.length === 0) && (
-	      <p>
+	      <p>素材はありません．</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>)}
 	  {materials.length > 0 && (
-	      groupBy === 'parent_tag' && groups.length > 0
+	      view === 'card'
-	      ? renderGroupedMaterials (groups)
+	      ? (
-	      : renderMaterialCollection (materials))}
+		  <div className="grid grid-cols-[repeat(auto-fill,minmax(196px,1fr))]
+				  justify-items-center gap-4">
+		    {materials.map (material => (
+			<MaterialCard key={material.id} material={material}/>))}
+		  </div>)
+	      : (
+		  <div className="space-y-3">
+		    {materials.map (material => (
+			<MaterialListItem key={material.id} material={material}/>))}
+		  </div>))}
 	  <Pagination page={page} totalPages={totalPages}/>
 	</div>
       </MainArea>)

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

@@ -1,6 +1,5 @@
 import { fireEvent, screen, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { Route, Routes, useLocation } from 'react-router-dom'
 
 import MaterialNewPage from '@/pages/materials/MaterialNewPage'
 import { renderWithProviders } from '@/test/render'
@@ -18,11 +17,6 @@ const toastApi = vi.hoisted (() => ({
 vi.mock ('@/lib/api', () => api)
 vi.mock ('@/components/ui/use-toast', () => toastApi)
 
-const LocationView = () => {
-  const location = useLocation ()
-  return <div>{location.pathname + location.search}</div>
-}
-
 describe ('MaterialNewPage', () => {
   beforeEach (() => {
     vi.clearAllMocks ()
@@ -75,50 +69,4 @@ describe ('MaterialNewPage', () => {
     expect (await screen.findAllByText ('ファイルまたは URL は必須です．')).toHaveLength (2)
     expect (screen.getAllByRole ('textbox')[1]).toHaveAttribute ('aria-invalid', 'true')
   })
-
-  it ('returns only to safe material URLs after successful creation', async () => {
-    api.apiPost.mockResolvedValueOnce ({})
-
-    renderWithProviders (
-        <Routes>
-          <Route path="/materials/new" element={<MaterialNewPage/>}/>
-          <Route path="/materials" element={<LocationView/>}/>
-        </Routes>,
-        {
-          route:
-              '/materials/new?tag=%E8%99%B9%E5%A4%8F'
-              + '&return_to=%2Fmaterials%3Ftag_id%3D20',
-        },
-    )
-
-    fireEvent.change (screen.getAllByRole ('textbox')[1], {
-      target: { value: 'https://example.com/ref' },
-    })
-    fireEvent.click (screen.getByRole ('button', { name: '追加' }))
-
-    expect (await screen.findByText ('/materials?tag_id=20')).toBeInTheDocument ()
-  })
-
-  it ('ignores unsafe return_to values after successful creation', async () => {
-    api.apiPost.mockResolvedValueOnce ({})
-
-    renderWithProviders (
-        <Routes>
-          <Route path="/materials/new" element={<MaterialNewPage/>}/>
-          <Route path="/materials" element={<LocationView/>}/>
-        </Routes>,
-        {
-          route:
-              '/materials/new?tag=%E8%99%B9%E5%A4%8F'
-              + '&return_to=https%3A%2F%2Fexample.com%2Fevil',
-        },
-    )
-
-    fireEvent.change (screen.getAllByRole ('textbox')[1], {
-      target: { value: 'https://example.com/ref' },
-    })
-    fireEvent.click (screen.getByRole ('button', { name: '追加' }))
-
-    expect (await screen.findByText ('/materials')).toBeInTheDocument ()
-  })
 })

frontend/src/pages/materials/MaterialNewPage.tsx

@@ -27,8 +27,6 @@ const MaterialNewPage: FC = () => {
   const location = useLocation ()
   const query = new URLSearchParams (location.search)
   const tagQuery = query.get ('tag') ?? ''
-  const returnToQuery = query.get ('return_to') ?? ''
-  const safeReturnTo = returnToQuery.startsWith ('/materials') ? returnToQuery : ''
 
   const navigate = useNavigate ()
 
@@ -56,7 +54,7 @@ const MaterialNewPage: FC = () => {
       onSuccess: async () => {
 	await qc.invalidateQueries ({ queryKey: materialsKeys.root })
 	toast ({ title: '送信成功!' })
-	navigate (safeReturnTo || '/materials')
+	navigate (`/materials?tag=${ encodeURIComponent (tag) }`)
       },
       onError: error => {
 	applyValidationError (error)

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

@@ -1,202 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import { useState } from 'react'
-import { Helmet } from 'react-helmet-async'
-
-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 { materialsKeys } from '@/lib/queryKeys'
-import { dateString, inputClass } from '@/lib/utils'
-
-import type { FC, FormEvent } from 'react'
-
-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: '汎用フォルダ' }
-
-const REASONS = [
-    'copyright_high_risk',
-    'copyright_takedown',
-    'adult_or_sensitive',
-    'personal_information',
-    '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
-
-
-const MaterialSyncSuppressionsPage: FC = () => {
-  const qc = useQueryClient ()
-  const [sourceKind, setSourceKind] =
-      useState<MaterialSyncSuppressionSourceKind> ('uri')
-  const [sourceUri, setSourceUri] = useState ('')
-  const [drivePath, setDrivePath] = useState ('')
-  const [driveFileId, setDriveFileId] = useState ('')
-  const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
-
-  const { data, isError, isLoading } = useQuery ({
-      queryKey: materialsKeys.suppressions (),
-      queryFn:  fetchMaterialSyncSuppressions})
-
-  const createMutation = useMutation ({
-      mutationFn: async () =>
-	  await createMaterialSyncSuppression ({
-	      sourceKind,
-	      sourceUri,
-	      drivePath,
-	      driveFileId,
-	      reason}),
-      onSuccess: async () => {
-	await qc.invalidateQueries ({ queryKey: materialsKeys.suppressions () })
-	await qc.invalidateQueries ({ queryKey: materialsKeys.root })
-	setSourceUri ('')
-	setDrivePath ('')
-	setDriveFileId ('')
-	toast ({ title: '同期元抑止を登録しました' })
-      },
-      onError: () => {
-	toast ({ title: '同期元抑止の登録に失敗しました' })
-      }})
-
-  const handleSubmit = (event: FormEvent) => {
-    event.preventDefault ()
-    createMutation.mutate ()
-  }
-
-  const suppressions = data?.suppressions ?? []
-
-  return (
-      <MainArea>
-	<Helmet>
-	  <title>{`素材同期抑止 | ${ SITE_TITLE }`}</title>
-	</Helmet>
-
-	<div className="space-y-5">
-	  <PageTitle>同期抑止</PageTitle>
-
-	  <form
-	      onSubmit={handleSubmit}
-	      className="max-w-3xl rounded-lg border border-stone-200 bg-white p-4
-			 text-stone-900 dark:border-stone-700 dark:bg-stone-900
-			 dark:text-stone-100">
-	    <div className="space-y-3">
-	      <FormField label="同期元種別">
-		{({ invalid }) => (
-		    <select
-			value={sourceKind}
-			onChange={e => setSourceKind (
-			    e.target.value as MaterialSyncSuppressionSourceKind)}
-			className={inputClass (invalid)}>
-		      {Object.entries (SOURCE_KIND_LABELS).map (([value, label]) => (
-			  <option key={value} value={value}>
-			    {label}
-			  </option>))}
-		    </select>)}
-	      </FormField>
-
-	      <FormField label="同期元 URI">
-		{({ invalid }) => (
-		    <input
-			type="text"
-			value={sourceUri}
-			onChange={e => setSourceUri (e.target.value)}
-			className={inputClass (invalid)}/>)}
-	      </FormField>
-
-	      <FormField label="Google Drive パス">
-		{({ invalid }) => (
-		    <input
-			type="text"
-			value={drivePath}
-			onChange={e => setDrivePath (e.target.value)}
-			className={inputClass (invalid)}/>)}
-	      </FormField>
-
-	      <FormField label="Google Drive ファイル Id.">
-		{({ invalid }) => (
-		    <input
-			type="text"
-			value={driveFileId}
-			onChange={e => setDriveFileId (e.target.value)}
-			className={inputClass (invalid)}/>)}
-	      </FormField>
-
-	      <FormField label="事由">
-		{({ invalid }) => (
-		    <select
-			value={reason}
-			onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)}
-			className={inputClass (invalid)}>
-		      {REASONS.map (value => (
-			  <option key={value} value={value}>
-			    {REASON_NAMES[value]}
-			  </option>))}
-		    </select>)}
-	      </FormField>
-	    </div>
-
-	    <Button
-		type="submit"
-		className="mt-4 rounded bg-blue-600 px-4 py-2 text-white
-			   disabled:bg-gray-400"
-		disabled={createMutation.isPending}>
-	      登録
-	    </Button>
-	  </form>
-
-	  {isLoading && <p>Loading...</p>}
-	  {isError && (
-	      <p className="text-red-600 dark:text-red-300">
-		同期元抑止一覧の取得に失敗しました．
-	      </p>)}
-
-	  <div className="space-y-3">
-	    {suppressions.map (suppression => (
-		<article
-		    key={suppression.id}
-		    className="rounded-lg border border-stone-200 bg-white p-3
-			       text-stone-900 shadow-sm dark:border-stone-700
-			       dark:bg-stone-900 dark:text-stone-100">
-		  <div className="font-medium">
-		    {SOURCE_KIND_LABELS[suppression.sourceKind]}
-		  </div>
-		  <div className="break-all text-sm text-stone-700 dark:text-stone-300">
-		    {suppression.normalizedSourceKey}
-		  </div>
-		  <div className="mt-2 text-sm text-stone-600 dark:text-stone-400">
-		    事由: {reasonName (suppression.reason)} /
-		    登録: {dateString (suppression.createdAt)}
-		  </div>
-		</article>))}
-	  </div>
-	</div>
-      </MainArea>)
-}
-
-export default MaterialSyncSuppressionsPage

frontend/src/test/factories.ts

@@ -76,11 +76,6 @@ export const buildMaterial = (overrides: Partial<Material> = {}): Material => ({
   tag:                   buildTag (),
   file:                  null,
   url:                   null,
-  sourceKind:            null,
-  sourceUri:             null,
-  sourcePath:            null,
-  sourceFileId:          null,
-  normalizedSourceKey:   null,
   wikiPageBody:          null,
   thumbnail:             null,
   thumbnailFallbackText: 'テストタグ',
@@ -88,6 +83,8 @@ export const buildMaterial = (overrides: Partial<Material> = {}): Material => ({
   mediaKind:             'url_only',
   contentType:           null,
   fileByteSize:          null,
+  fileSuppressedAt:      null,
+  fileSuppressionReason: null,
   exportPaths:           {},
   exportItems:           [],
   createdAt:             '2026-01-02T03:04:05.000Z',

frontend/src/types.ts

@@ -86,28 +86,17 @@ export type MaterialIndexSort =
     | 'version_no'
     | 'id'
 
+export type MaterialIndexSuppression = 'active' | 'suppressed' | 'all'
+
 export type MaterialIndexTagState = 'all' | 'tagged' | 'untagged'
 
-export type MaterialIndexGroupBy = 'none' | 'parent_tag'
-
 export type MaterialIndexView = 'card' | 'list'
 
-export type MaterialTagScope = {
-    tag:                {
-	id:          number
-	name:        string
-	category:    Category
-    }
-    includeDescendants: boolean
-}
-
 export type FetchMaterialsParams = {
     q:            string
     tagState:     MaterialIndexTagState
     mediaKind:    MaterialIndexMediaKind
-    tagId:        number | null
+    suppression:  MaterialIndexSuppression
-    includeDescendants: boolean
-    groupBy:      MaterialIndexGroupBy
     createdFrom:  string
     createdTo:    string
     updatedFrom:  string
@@ -124,18 +113,15 @@ export type Material = {
     tag:                    Tag | null
     file:                   string | null
     url:                    string | null
-    sourceKind:             string | null
-    sourceUri:              string | null
-    sourcePath:             string | null
-    sourceFileId:           string | null
-    normalizedSourceKey:    string | null
     wikiPageBody?:          string | null
     thumbnail:              string | null
     thumbnailFallbackText:  string | null
     thumbnailFallbackKind:  'tag_name' | 'created_at'
-    mediaKind:              'image' | 'video' | 'audio' | 'file_other' | 'url_only'
+    mediaKind:              'image' | 'video' | 'audio' | 'file_other' | 'url_only' | 'suppressed'
     contentType:            string | null
     fileByteSize:           number | null
+    fileSuppressedAt:       string | null
+    fileSuppressionReason:  string | null
     exportPaths:            Record<string, string>
     exportItems:            MaterialExportItem[]
     createdAt:              string
@@ -143,26 +129,6 @@ export type Material = {
     updatedAt:              string
     updatedByUser:          { id: number; name: string } }
 
-export type MaterialSyncSuppressionSourceKind =
-    | 'uri'
-    | 'google_drive_path'
-    | 'google_drive_path_prefix'
-    | 'google_drive_file'
-    | 'legacy_drive_path'
-    | 'legacy_drive_path_prefix'
-
-export type MaterialSyncSuppression = {
-    id:                  number
-    sourceKind:          MaterialSyncSuppressionSourceKind
-    sourceUri:           string | null
-    drivePath:           string | null
-    driveFileId:         string | null
-    normalizedSourceKey: string
-    reason:              string
-    createdByUser:       { id: number; name: string } | null
-    createdAt:           string
-    updatedAt:           string }
-
 export type MaterialSidebarTag = {
     id:          number
     name:        string
@@ -184,47 +150,6 @@ export type MaterialExportItem = {
     exportPath:  string
     enabled:     boolean }
 
-export type MaterialIndexGroup = {
-    key:         string
-    tag:         {
-	id:          number
-	name:        string
-	category:    Category
-    }
-    materialIds: number[]
-    count:       number }
-
-export type MaterialIndexResponse = {
-    materials: Material[]
-    count:     number
-    groups?:   MaterialIndexGroup[]
-    tagScope?: MaterialTagScope | null
-}
-
-export type MaterialVersion = {
-    id:               number
-    materialId:       number
-    versionNo:        number
-    eventType:        'create' | 'update' | 'discard' | 'restore'
-    tagId:            number | null
-    tagName:          string | null
-    tagCategory:      Category | null
-    url:              string | null
-    sourceKind:       string | null
-    sourceUri:        string | null
-    sourcePath:       string | null
-    sourceFileId:     string | null
-    normalizedSourceKey: string | null
-    fileBlobId:       number | null
-    fileFilename:     string | null
-    fileContentType:  string | null
-    fileByteSize:     number | null
-    fileSha256:       string | null
-    exportPathsJson:  Record<string, string>
-    discardedAt:      string | null
-    createdByUser:    { id: number; name: string | null } | null
-    createdAt:        string }
-
 export type Menu = MenuItem[]
 
 export type MenuInvisibleItem = {