#63

backend/app/controllers/application_controller.rb

@@ -1,16 +1,14 @@
 class ApplicationController < ActionController::API
-  before_action :reject_banned_ip_address!
   before_action :authenticate_user
-  before_action :reject_banned_user!
 
-  def current_user = @current_user
+  def current_user
+    @current_user
+  end
 
   private
 
   def authenticate_user
     code = request.headers['X-Transfer-Code'] || request.headers['HTTP_X_TRANSFER_CODE']
-    return if code.blank?
-
     @current_user = User.find_by(inheritance_code: code)
   end
 
@@ -24,17 +22,4 @@ class ApplicationController < ActionController::API
       s.in?(['', '1', 'true', 'on', 'yes'])
     end
   end
-
-  def reject_banned_ip_address!
-    ip_address = IpAddress.find_by(ip_address: IPAddr.new(request.remote_ip).hton)
-    return unless ip_address&.banned?
-
-    head :forbidden
-  end
-
-  def reject_banned_user!
-    return unless current_user&.banned?
-
-    head :forbidden
-  end
 end

backend/app/controllers/posts_controller.rb

@@ -44,7 +44,7 @@ class PostsController < ApplicationController
         filtered_posts
         .joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
         .reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
-        .preload(tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
+        .preload(tags: [:materials, { tag_name: :wiki_page }])
         .with_attached_thumbnail
 
     q = q.where('posts.url LIKE ?', "%#{ url }%") if url
@@ -95,7 +95,7 @@ class PostsController < ApplicationController
   end
 
   def random
-    post = filtered_posts.preload(tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
+    post = filtered_posts.preload(tags: [:materials, { tag_name: :wiki_page }])
                          .order('RAND()')
                          .first
     return head :not_found unless post
@@ -104,7 +104,7 @@ class PostsController < ApplicationController
   end
 
   def show
-    post = Post.includes(tags: [:deerjikists, :materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
+    post = Post.includes(tags: [:materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
     return head :not_found unless post
 
     render json: PostRepr.base(post, current_user)
@@ -173,68 +173,33 @@ class PostsController < ApplicationController
     return head :unauthorized unless current_user
     return head :forbidden unless current_user.gte_member?
 
-    force = bool?(:force)
-    merge = bool?(:merge)
-    return head :bad_request if force && merge
-
-    base_version_no = nil
-    base_version_no = parse_base_version_no unless force
-
     title = params[:title].presence
     tag_names = params[:tags].to_s.split
     original_created_from = params[:original_created_from]
     original_created_before = params[:original_created_before]
     parent_post_ids = parse_parent_post_ids
 
-    post = nil
+    post = Post.find(params[:id].to_i)
-    conflict_json = nil
 
     ApplicationRecord.transaction do
-      post = Post.lock.find(params[:id].to_i)
+      PostVersionRecorder.ensure_snapshot!(post, created_by_user: current_user)
 
-      base_version = nil
+      post.update!(title:, original_created_from:, original_created_before:)
-      base_snapshot = nil
-      current_snapshot = nil
-      unless force
-        base_version = post.post_versions.find_by!(version_no: base_version_no)
 
-        base_snapshot = post_snapshot_from_version(base_version)
+      normalised_tags = Tag.normalise_tags!(tag_names, with_tagme: false)
-        current_snapshot = post_snapshot_from_record(post)
+      TagVersioning.record_tag_snapshots!(normalised_tags, created_by_user: current_user)
-      end
-      incoming_snapshot = post_incoming_snapshot(title:,
-                                                 original_created_from:,
-                                                 original_created_before:,
-                                                 tag_names:,
-                                                 parent_post_ids:)
 
-      snapshot_to_apply =
+      tags = post.tags.nico.to_a + normalised_tags
-          if force || post.version_no == base_version_no || current_snapshot == base_snapshot
+      tags = Tag.expand_parent_tags(tags)
-            incoming_snapshot
+      sync_post_tags!(post, tags)
-          else
-            changes = post_snapshot_changes(base_snapshot, current_snapshot, incoming_snapshot)
-            conflicts = changes.select { |change| change[:conflict] }
 
-            if merge && conflicts.empty?
+      sync_parent_posts!(post, parent_post_ids)
-              merge_post_snapshots(base_snapshot, current_snapshot, incoming_snapshot)
-            else
-              conflict_json = post_conflict_json(post:,
-                                                 base_version_no:,
-                                                 base_snapshot:,
-                                                 current_snapshot:,
-                                                 incoming_snapshot:,
-                                                 changes:,
-                                                 conflicts:)
-              raise ActiveRecord::Rollback
-            end
-          end
 
-      apply_post_snapshot!(post, snapshot_to_apply)
+      PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
     end
 
-    return render json: conflict_json, status: :conflict if conflict_json
-
     post.reload
-    json = PostRepr.base(post, current_user)
+    json = post.as_json
     json['tags'] = build_tag_tree_for(post.tags)
     render json:, status: :ok
   rescue Tag::NicoTagNormalisationError
@@ -260,7 +225,7 @@ class PostsController < ApplicationController
     pts = pts.where(post_id: id) if id.present?
     pts = pts.where(tag_id:) if tag_id.present?
     pts = pts.includes(:post, :created_user, :deleted_user,
-                       tag: [:deerjikists, :materials, { tag_name: :wiki_page }])
+                       tag: [:materials, { tag_name: :wiki_page }])
 
     events = []
     pts.each do |pt|
@@ -439,203 +404,4 @@ class PostsController < ApplicationController
       PostImplication.create_or_find_by!(post_id: post.id, parent_post_id:)
     end
   end
-
-  def parse_base_version_no
-    version_no = Integer(params[:base_version_no], exception: false)
-    raise ArgumentError, 'base_version_no は必須です．' unless version_no&.positive?
-
-    version_no
-  end
-
-  def post_snapshot_from_version version
-    { title: version.title,
-      original_created_from: snapshot_time(version.original_created_from),
-      original_created_before: snapshot_time(version.original_created_before),
-      tag_names: editable_tag_names_from_version(version),
-      parent_post_ids: snapshot_parent_post_ids_from_version(version) }
-  end
-
-  def editable_tag_names_from_version version
-    version.tags.to_s.split.reject { |name| name.downcase.start_with?('nico:') }.sort
-  end
-
-  def post_snapshot_from_record post
-    { title: post.title,
-      original_created_from: snapshot_time(post.original_created_from),
-      original_created_before: snapshot_time(post.original_created_before),
-      tag_names: editable_tag_names_from_post(post),
-      parent_post_ids: post.parent_posts.order(:id).pluck(:id) }
-  end
-
-  def editable_tag_names_from_post post
-    post.tags.not_nico.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
-  end
-
-  def post_incoming_snapshot title:, original_created_from:, original_created_before:,
-                             tag_names:, parent_post_ids:
-    { title:,
-      original_created_from: snapshot_time(original_created_from),
-      original_created_before: snapshot_time(original_created_before),
-      tag_names: incoming_tag_names_for_snapshot(tag_names),
-      parent_post_ids: parent_post_ids.sort }
-  end
-
-  def snapshot_parent_post_ids_from_version version
-    if version.respond_to?(:parent_post_ids)
-      version.parent_post_ids.to_s.split.map { |id| id.to_i }.sort
-    elsif version.respond_to?(:parent_id) && version.parent_id
-      [version.parent_id]
-    else
-      []
-    end
-  end
-
-  def snapshot_time value
-    return nil if value.blank?
-
-    value = Time.zone.parse(value.to_s) if value in String
-    value&.in_time_zone&.iso8601(6)
-  rescue ArgumentError, TypeError
-    value.to_s
-  end
-
-  def incoming_tag_names_for_snapshot raw_tag_names
-    tags = Tag.normalise_tags!(raw_tag_names, with_tagme: false)
-
-    Tag.expand_parent_tags(tags).map(&:name).uniq.sort
-  end
-
-  def post_conflict_json post:, base_version_no:, base_snapshot:,
-                         current_snapshot:, incoming_snapshot:, changes:, conflicts:
-    { error: 'conflict',
-      message: '競合が発生しました．',
-      post_id: post.id,
-      base_version_no:,
-      current_version_no: post.version_no,
-      base: base_snapshot,
-      current: current_snapshot,
-      mine: incoming_snapshot,
-      changes:,
-      conflicts:,
-      mergeable: conflicts.empty? }
-  end
-
-  def post_snapshot_changes base_snapshot, current_snapshot, incoming_snapshot
-    [scalar_snapshot_change(:title, 'タイトル',
-                            base_snapshot, current_snapshot, incoming_snapshot),
-     scalar_snapshot_change(:original_created_from, 'オリジナルの作成日時（以降）',
-                            base_snapshot, current_snapshot, incoming_snapshot),
-     scalar_snapshot_change(:original_created_before, 'オリジナルの作成日時（より前）',
-                            base_snapshot, current_snapshot, incoming_snapshot),
-     set_snapshot_change(:tag_names, 'タグ',
-                         base_snapshot, current_snapshot, incoming_snapshot),
-     set_snapshot_change(:parent_post_ids, '親投稿',
-                         base_snapshot, current_snapshot, incoming_snapshot)].compact
-  end
-
-  def scalar_snapshot_change field, label, base_snapshot, current_snapshot, incoming_snapshot
-    base = base_snapshot[field]
-    current = current_snapshot[field]
-    mine = incoming_snapshot[field]
-
-    return nil if current == base && mine == base
-
-    { field:, label:, base:, current:, mine:,
-      changed_by_current: current != base,
-      changed_by_me: mine != base,
-      conflict: scalar_snapshot_conflict?(base, current, mine) }
-  end
-
-  def scalar_snapshot_conflict? base, current, mine
-    current != base && mine != base && current != mine
-  end
-
-  def set_snapshot_change field, label, base_snapshot, current_snapshot, incoming_snapshot
-    base = base_snapshot[field].to_a
-    current = current_snapshot[field].to_a
-    mine = incoming_snapshot[field].to_a
-
-    added_by_current = current - base
-    removed_by_current = base - current
-    added_by_me = mine - base
-    removed_by_me = base - mine
-
-    if (added_by_current.empty? &&
-        removed_by_current.empty? &&
-        added_by_me.empty? &&
-        removed_by_me.empty?)
-      return nil
-    end
-
-    { field:, label:, base:, current:, mine:, added_by_current:, removed_by_current:,
-      added_by_me:, removed_by_me:,
-      changed_by_current: added_by_current.present? || removed_by_current.present?,
-      changed_by_me: added_by_me.present? || removed_by_me.present?,
-      conflict: set_snapshot_conflict?(added_by_current:,
-                                       removed_by_current:,
-                                       added_by_me:,
-                                       removed_by_me:) }
-  end
-
-  def set_snapshot_conflict? added_by_current:, removed_by_current:,
-                             added_by_me:, removed_by_me:
-    (added_by_current & removed_by_me).present? || (removed_by_current & added_by_me).present?
-  end
-
-  def apply_post_snapshot! post, snapshot
-    PostVersionRecorder.ensure_snapshot!(post, created_by_user: current_user)
-
-    post.update!(title: snapshot[:title],
-                 original_created_from: snapshot[:original_created_from],
-                 original_created_before: snapshot[:original_created_before])
-
-    editable_tags = Tag.normalise_tags!(snapshot[:tag_names], with_tagme: false)
-    TagVersioning.record_tag_snapshots!(editable_tags, created_by_user: current_user)
-
-    readonly_tags = post.tags.nico.to_a
-
-    tags = readonly_tags + editable_tags
-    tags = Tag.expand_parent_tags(tags)
-
-    sync_post_tags!(post, tags)
-    sync_parent_posts!(post, snapshot[:parent_post_ids])
-
-    PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
-  end
-
-  def merge_post_snapshots base_snapshot, current_snapshot, incoming_snapshot
-    [:title, :original_created_from, :original_created_before].map {
-      [_1, merge_scalar_snapshot_value(base_snapshot[_1],
-                                       current_snapshot[_1],
-                                       incoming_snapshot[_1])]
-    }.to_h.merge([:tag_names, :parent_post_ids].map {
-      [_1, merge_set_snapshot_value(base_snapshot[_1],
-                                    current_snapshot[_1],
-                                    incoming_snapshot[_1])]
-    }.to_h)
-  end
-
-  def merge_scalar_snapshot_value base, current, mine
-    return mine if current == base
-    return current if mine == base || current == mine
-
-    raise ArgumentError, '競合してゐる項目はマージできません．'
-  end
-
-  def merge_set_snapshot_value base, current, mine
-    base = base.to_a
-    current = current.to_a
-    mine = mine.to_a
-
-    added_by_current = current - base
-    removed_by_current = base - current
-    added_by_me = mine - base
-    removed_by_me = base - mine
-
-    merged = base + added_by_current + added_by_me
-    merged -= removed_by_current
-    merged -= removed_by_me
-
-    merged.uniq.sort
-  end
 end

backend/app/controllers/users_controller.rb

@@ -1,6 +1,9 @@
 class UsersController < ApplicationController
   def create
+    return head :unprocessable_entity if request.remote_ip.blank?
+
     user = nil
+
     User.transaction do
       user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
       attach_ip_address!(user)
@@ -14,7 +17,8 @@ class UsersController < ApplicationController
   def verify
     user = User.find_by(inheritance_code: params[:code])
     return render json: { valid: false } unless user
-    return head :forbidden if user.banned?
+
+    return head :unprocessable_entity if request.remote_ip.blank?
 
     attach_ip_address!(user)
 

backend/app/models/ip_address.rb

@@ -1,10 +1,7 @@
 class IpAddress < ApplicationRecord
   validates :ip_address, presence: true, length: { maximum: 16 }
+  validates :banned, inclusion: { in: [true, false] }
 
   has_many :user_ips, dependent: :destroy
   has_many :users, through: :user_ips
-
-  def banned? = banned_at.present?
-  def ban! = banned? || update!(banned_at: Time.current)
-  def unban! = update!(banned_at: nil)
 end

backend/app/models/post.rb

@@ -28,8 +28,6 @@ class Post < ApplicationRecord
 
   has_one_attached :thumbnail
 
-  attribute :version_no, :integer, default: 1
-
   before_validation :normalise_url
 
   validates :url, presence: true, uniqueness: true

backend/app/models/tag.rb

@@ -40,8 +40,6 @@ class Tag < ApplicationRecord
   belongs_to :tag_name
   delegate :wiki_page, to: :tag_name
 
-  attribute :version_no, :integer, default: 1
-
   delegate :name, to: :tag_name, allow_nil: true
   validates :tag_name, presence: true
 

backend/app/models/user.rb

@@ -4,6 +4,7 @@ class User < ApplicationRecord
   validates :name, length: { maximum: 255 }
   validates :inheritance_code, presence: true, length: { maximum: 64 }
   validates :role, presence: true, inclusion: { in: roles.keys }
+  validates :banned, inclusion: { in: [true, false] }
 
   has_many :created_posts,
            class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
@@ -18,10 +19,5 @@ class User < ApplicationRecord
            class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
 
   def viewed?(post) = user_post_views.exists?(post_id: post.id)
-
   def gte_member? = member? || admin?
-
-  def banned? = banned_at.present?
-  def ban! = banned? || update!(banned_at: Time.current)
-  def unban! = update!(banned_at: nil)
 end

backend/app/models/wiki_page.rb

@@ -15,8 +15,6 @@ class WikiPage < ApplicationRecord
 
   has_many :wiki_versions
 
-  attribute :version_no, :integer, default: 1
-
   belongs_to :tag_name
   validates :tag_name, presence: true
   validates :body, presence: true

backend/app/services/version_recorder.rb

@@ -16,20 +16,19 @@ class VersionRecorder
       @record = record_class.unscoped.lock.find(@record.id)
       latest = latest_version
 
-      validate_version_sequence! latest
+      if !(latest) && @event_type != 'create'
+        raise "#{ version_class.name } first event must be create"
+      end
+
+      if @event_type == 'create' && latest
+        raise "#{ version_class.name } create event already exists"
+      end
 
       attrs = snapshot_attributes
 
-      if @event_type == 'update' && latest && same_snapshot?(latest, attrs)
+      return latest if @event_type == 'update' && latest && same_snapshot?(latest, attrs)
-        return latest
-      end
 
-      version = version_class.create!(
+      version_class.create!(base_attributes(latest).merge(record_key => @record).merge(attrs))
-          base_attributes(latest).merge(record_key => @record).merge(attrs))
-
-      update_record_version_no! version.version_no
-
-      version
     end
   end
 
@@ -46,31 +45,7 @@ class VersionRecorder
       created_by_user: @created_by_user }
   end
 
-  def update_record_version_no! version_no
+  def same_snapshot?(version, attrs) = attrs.all? { |k, v| version.public_send(k) == v }
-    @record.update_columns version_no: version_no
-    @record.version_no = version_no
-  end
-
-  def validate_version_sequence! latest
-    if !(latest) && @event_type != 'create'
-      raise "#{ version_class.name } first event must be create"
-    end
-
-    if @event_type == 'create' && latest
-      raise "#{ version_class.name } create event already exists"
-    end
-
-    return unless latest
-
-    if @record.version_no != latest.version_no
-      raise ("#{ record_class.name }##{ @record.id } version_no is #{ @record.version_no }, " +
-             "but latest #{ version_class.name } version_no is #{ latest.version_no }")
-    end
-  end
-
-  def same_snapshot? version, attrs
-    attrs.all? { |k, v| version.public_send(k) == v }
-  end
 
   def validate_event_type!
     return if EVENT_TYPES.include?(@event_type)

backend/db/migrate/20260501153900_rename_banned_to_banned_at_in_users_and_ip_addresses.rb

@@ -1,16 +0,0 @@
-class RenameBannedToBannedAtInUsersAndIpAddresses < ActiveRecord::Migration[8.0]
-  def up
-    [:users, :ip_addresses].each do
-      add_column _1, :banned_at, :datetime, after: :banned
-      add_index _1, :banned_at
-      remove_column _1, :banned
-    end
-  end
-
-  def down
-    [:ip_addresses, :users].each do
-      add_column _1, :banned, :boolean, null: false, default: false, after: :banned_at
-      remove_column _1, :banned_at
-    end
-  end
-end

backend/db/migrate/20260507124000_add_version_no_to_posts.rb

@@ -1,27 +0,0 @@
-class AddVersionNoToPosts < ActiveRecord::Migration[8.0]
-  def up
-    add_column :posts, :version_no, :integer
-
-    execute <<~SQL
-      UPDATE
-        posts
-      SET
-        version_no = (
-          SELECT
-            MAX(version_no)
-          FROM
-            post_versions
-          WHERE
-            post_id = posts.id)
-    SQL
-
-    change_column_null :posts, :version_no, false
-
-    add_check_constraint :posts, 'version_no > 0', name: 'chk_posts_version_no_positive'
-  end
-
-  def down
-    remove_check_constraint :posts, name: 'chk_posts_version_no_positive'
-    remove_column :posts, :version_no
-  end
-end

backend/db/migrate/20260507211600_add_version_no_to_tags.rb

@@ -1,37 +0,0 @@
-class AddVersionNoToTags < ActiveRecord::Migration[8.0]
-  def up
-    add_column :tags, :version_no, :integer
-
-    execute <<~SQL
-      UPDATE
-        tags
-      SET
-        version_no = (
-          CASE category
-          WHEN 'nico' THEN
-            (SELECT
-               MAX(version_no)
-             FROM
-               nico_tag_versions
-             WHERE
-               tag_id = tags.id)
-          ELSE
-            (SELECT
-               MAX(version_no)
-             FROM
-               tag_versions
-             WHERE
-               tag_id = tags.id)
-          END)
-    SQL
-
-    change_column_null :tags, :version_no, false
-
-    add_check_constraint :tags, 'version_no > 0', name: 'chk_tags_version_no_positive'
-  end
-
-  def down
-    remove_check_constraint :tags, name: 'chk_tags_version_no_positive'
-    remove_column :tags, :version_no
-  end
-end

backend/db/migrate/20260507213300_add_version_no_to_wiki_pages.rb

@@ -1,27 +0,0 @@
-class AddVersionNoToWikiPages < ActiveRecord::Migration[8.0]
-  def up
-    add_column :wiki_pages, :version_no, :integer
-
-    execute <<~SQL
-      UPDATE
-        wiki_pages
-      SET
-        version_no = (
-          SELECT
-            MAX(version_no)
-          FROM
-            wiki_versions
-          WHERE
-            wiki_page_id = wiki_pages.id)
-    SQL
-
-    change_column_null :wiki_pages, :version_no, false
-
-    add_check_constraint :wiki_pages, 'version_no > 0', name: 'chk_wiki_pages_version_no_positive'
-  end
-
-  def down
-    remove_check_constraint :wiki_pages, name: 'chk_wiki_pages_version_no_positive'
-    remove_column :wiki_pages, :version_no
-  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_05_07_213300) do
+ActiveRecord::Schema[8.0].define(version: 2026_04_27_214800) 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
@@ -50,10 +50,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
 
   create_table "ip_addresses", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.binary "ip_address", limit: 16, null: false
-    t.datetime "banned_at"
+    t.boolean "banned", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["banned_at"], name: "index_ip_addresses_on_banned_at"
     t.index ["ip_address"], name: "index_ip_addresses_on_ip_address", unique: true
   end
 
@@ -186,10 +185,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
     t.datetime "original_created_from"
     t.datetime "original_created_before"
     t.datetime "updated_at", null: false
-    t.integer "version_no", null: false
     t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
     t.index ["url"], name: "index_posts_on_url", unique: true
-    t.check_constraint "`version_no` > 0", name: "chk_posts_version_no_positive"
   end
 
   create_table "settings", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -264,10 +261,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
     t.datetime "updated_at", null: false
     t.integer "post_count", default: 0, null: false
     t.datetime "discarded_at"
-    t.integer "version_no", null: false
     t.index ["discarded_at"], name: "index_tags_on_discarded_at"
     t.index ["tag_name_id"], name: "index_tags_on_tag_name_id", unique: true
-    t.check_constraint "`version_no` > 0", name: "chk_tags_version_no_positive"
   end
 
   create_table "theatre_comments", primary_key: ["theatre_id", "no"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -337,10 +332,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
     t.string "name"
     t.string "inheritance_code", limit: 64, null: false
     t.string "role", null: false
-    t.datetime "banned_at"
+    t.boolean "banned", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["banned_at"], name: "index_users_on_banned_at"
   end
 
   create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
@@ -373,12 +367,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
     t.datetime "updated_at", null: false
     t.datetime "discarded_at"
     t.integer "next_asset_no", default: 1, null: false
-    t.integer "version_no", null: false
     t.index ["created_user_id"], name: "index_wiki_pages_on_created_user_id"
     t.index ["discarded_at"], name: "index_wiki_pages_on_discarded_at"
     t.index ["tag_name_id"], name: "index_wiki_pages_on_tag_name_id", unique: true
     t.index ["updated_user_id"], name: "index_wiki_pages_on_updated_user_id"
-    t.check_constraint "`version_no` > 0", name: "chk_wiki_pages_version_no_positive"
   end
 
   create_table "wiki_revision_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|

backend/spec/factories/ip_addresses.rb

@@ -1,10 +0,0 @@
-FactoryBot.define do
-  factory :ip_address do
-    ip_address { IPAddr.new('203.0.113.10').hton }
-    banned_at { nil }
-
-    trait :banned do
-      banned_at { Time.current }
-    end
-  end
-end

backend/spec/factories/users.rb

@@ -1,24 +1,15 @@
 FactoryBot.define do
   factory :user do
-    name { nil }
+    name { "test-user" }
     inheritance_code { SecureRandom.uuid }
-    role { 'guest' }
+    role { "guest" }
-    banned_at { nil }
-
-    trait :guest do
-      role { 'guest' }
-    end
 
     trait :member do
-      role { 'member' }
+      role { "member" }
     end
 
     trait :admin do
       role { 'admin' }
     end
-
-    trait :banned do
-      banned_at { Time.current }
-    end
   end
 end

backend/spec/requests/users_spec.rb

@@ -1,266 +1,109 @@
-require 'rails_helper'
+require "rails_helper"
-
-RSpec.describe 'Users', type: :request do
-  let(:remote_ip) { '203.0.113.10' }
-
-  before do
-    allow_any_instance_of(ActionDispatch::Request)
-      .to receive(:remote_ip)
-      .and_return(remote_ip)
-  end
-
-  def auth_headers(user)
-    { 'X-Transfer-Code' => user.inheritance_code }
-  end
-
-  describe 'POST /users' do
-    it 'creates guest user, IpAddress and UserIp, and returns code' do
-      expect {
-        post '/users'
-      }.to change(User, :count).by(1)
-        .and change(IpAddress, :count).by(1)
-        .and change(UserIp, :count).by(1)
 
+RSpec.describe "Users", type: :request do
+  describe "POST /users" do
+    it "creates guest user and returns code" do
+      post "/users"
       expect(response).to have_http_status(:created)
-      expect(json['code']).to be_present
+      expect(json["code"]).to be_present
-      expect(json['user']['role']).to eq('guest')
+      expect(json["user"]["role"]).to eq("guest")
-
-      user = User.last
-      ip_address = IpAddress.find_by(ip_address: IPAddr.new(remote_ip).hton)
-
-      expect(user.role).to eq('guest')
-      expect(ip_address).to be_present
-      expect(UserIp.exists?(user:, ip_address:)).to eq(true)
-    end
-
-    it 'returns 403 and does not create user when current IP address is banned' do
-      IpAddress.create!(
-        ip_address: IPAddr.new(remote_ip).hton,
-        banned_at: Time.current
-      )
-
-      expect {
-        post '/users'
-      }.not_to change(User, :count)
-
-      expect(response).to have_http_status(:forbidden)
-      expect(UserIp.count).to eq(0)
     end
   end
 
-  describe 'POST /users/code/renew' do
+  describe "POST /users/code/renew" do
-    it 'returns 401 when not logged in' do
+    it "returns 401 when not logged in" do
-      post '/users/code/renew'
+      sign_out
-
+      post "/users/code/renew"
       expect(response).to have_http_status(:unauthorized)
     end
-
-    it 'returns 403 when current user is banned' do
-      user = create(:user, :banned)
-
-      post '/users/code/renew', headers: auth_headers(user)
-
-      expect(response).to have_http_status(:forbidden)
-    end
-
-    it 'returns 403 when current IP address is banned' do
-      user = create(:user)
-
-      IpAddress.create!(
-        ip_address: IPAddr.new(remote_ip).hton,
-        banned_at: Time.current
-      )
-
-      post '/users/code/renew', headers: auth_headers(user)
-
-      expect(response).to have_http_status(:forbidden)
-    end
   end
 
-  describe 'PUT /users/:id' do
+  describe "PUT /users/:id" do
-    let(:user) { create(:user, name: 'old-name', role: 'guest') }
+    let(:user) { create(:user, name: "old-name", role: "guest") }
-
-    it 'returns 401 when current_user id mismatch' do
-      other_user = create(:user)
-
-      put "/users/#{user.id}",
-          params: { name: 'new-name' },
-          headers: auth_headers(other_user)
 
+    it "returns 401 when current_user id mismatch" do
+      sign_in_as(create(:user))
+      put "/users/#{user.id}", params: { name: "new-name" }
       expect(response).to have_http_status(:unauthorized)
     end
 
-    it 'returns 400 when name is blank' do
+    it "returns 400 when name is blank" do
-      put "/users/#{user.id}",
+      sign_in_as(user)
-          params: { name: '   ' },
+      put "/users/#{user.id}", params: { name: "   " }
-          headers: auth_headers(user)
-
       expect(response).to have_http_status(:bad_request)
     end
 
-    it 'updates name and returns user slice' do
+    it "updates name and returns 201 with user slice" do
-      put "/users/#{user.id}",
+      sign_in_as(user)
-          params: { name: 'new-name' },
+      put "/users/#{user.id}", params: { name: "new-name" }
-          headers: auth_headers(user)
 
       expect(response).to have_http_status(:ok)
-      expect(json['id']).to eq(user.id)
+      expect(json["id"]).to eq(user.id)
-      expect(json['name']).to eq('new-name')
+      expect(json["name"]).to eq("new-name")
 
       user.reload
-      expect(user.name).to eq('new-name')
+      expect(user.name).to eq("new-name")
-    end
-
-    it 'returns 403 when current user is banned' do
-      user.update!(banned_at: Time.current)
-
-      put "/users/#{user.id}",
-          params: { name: 'new-name' },
-          headers: auth_headers(user)
-
-      expect(response).to have_http_status(:forbidden)
-
-      user.reload
-      expect(user.name).to eq('old-name')
-    end
-
-    it 'returns 403 when current IP address is banned' do
-      IpAddress.create!(
-        ip_address: IPAddr.new(remote_ip).hton,
-        banned_at: Time.current
-      )
-
-      put "/users/#{user.id}",
-          params: { name: 'new-name' },
-          headers: auth_headers(user)
-
-      expect(response).to have_http_status(:forbidden)
-
-      user.reload
-      expect(user.name).to eq('old-name')
     end
   end
 
-  describe 'POST /users/verify' do
+  describe "POST /users/verify" do
-    it 'returns valid:false when code not found' do
+    it "returns valid:false when code not found" do
-      post '/users/verify', params: { code: 'nope' }
+      post "/users/verify", params: { code: "nope" }
-
       expect(response).to have_http_status(:ok)
-      expect(json['valid']).to eq(false)
+      expect(json["valid"]).to eq(false)
     end
 
-    it 'returns 403 when current IP address is banned' do
+    it "creates IpAddress and UserIp, and returns valid:true with user slice" do
-      user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
+      user = create(:user, inheritance_code: SecureRandom.uuid, role: "guest")
 
-      IpAddress.create!(
+      # request.remote_ip を固定
-        ip_address: IPAddr.new(remote_ip).hton,
+      allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("203.0.113.10")
-        banned_at: Time.current
-      )
 
       expect {
-        post '/users/verify', params: { code: user.inheritance_code }
+        post "/users/verify", params: { code: user.inheritance_code }
-      }.not_to change(UserIp, :count)
-
-      expect(response).to have_http_status(:forbidden)
-    end
-
-    it 'returns 403 when verified user is banned' do
-      user = create(
-        :user,
-        :banned,
-        inheritance_code: SecureRandom.uuid,
-        role: 'guest'
-      )
-
-      expect {
-        post '/users/verify', params: { code: user.inheritance_code }
-      }.not_to change(UserIp, :count)
-
-      expect(response).to have_http_status(:forbidden)
-    end
-
-    it 'creates IpAddress and UserIp, and returns valid:true with user slice' do
-      user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
-
-      expect {
-        post '/users/verify', params: { code: user.inheritance_code }
-      }.to change(UserIp, :count).by(1)
-        .and change(IpAddress, :count).by(1)
-
-      expect(response).to have_http_status(:ok)
-      expect(json['valid']).to eq(true)
-      expect(json['user']['id']).to eq(user.id)
-      expect(json['user']['inheritance_code']).to eq(user.inheritance_code)
-      expect(json['user']['role']).to eq('guest')
-
-      ip_address = IpAddress.find_by(ip_address: IPAddr.new(remote_ip).hton)
-      expect(ip_address).to be_present
-      expect(UserIp.exists?(user:, ip_address:)).to eq(true)
-    end
-
-    it 'is idempotent for same user and same IP address' do
-      user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
-
-      post '/users/verify', params: { code: user.inheritance_code }
-      expect(response).to have_http_status(:ok)
-
-      expect {
-        post '/users/verify', params: { code: user.inheritance_code }
-      }.not_to change(UserIp, :count)
-
-      expect(response).to have_http_status(:ok)
-      expect(json['valid']).to eq(true)
-    end
-
-    it 'creates another UserIp for same user and different IP address' do
-      user = create(:user, inheritance_code: SecureRandom.uuid, role: 'guest')
-
-      post '/users/verify', params: { code: user.inheritance_code }
-      expect(response).to have_http_status(:ok)
-
-      allow_any_instance_of(ActionDispatch::Request)
-        .to receive(:remote_ip)
-        .and_return('203.0.113.11')
-
-      expect {
-        post '/users/verify', params: { code: user.inheritance_code }
       }.to change(UserIp, :count).by(1)
 
       expect(response).to have_http_status(:ok)
-      expect(json['valid']).to eq(true)
+      expect(json["valid"]).to eq(true)
+      expect(json["user"]["id"]).to eq(user.id)
+      expect(json["user"]["inheritance_code"]).to eq(user.inheritance_code)
+      expect(json["user"]["role"]).to eq("guest")
+
+      # ついでに IpAddress もできてることを確認（ipの保存形式がバイナリでも count で見れる）
+      expect(IpAddress.count).to be >= 1
+    end
+
+    it "is idempotent for same user+ip (does not create duplicate UserIp)" do
+      user = create(:user, inheritance_code: SecureRandom.uuid, role: "guest")
+      allow_any_instance_of(ActionDispatch::Request).to receive(:remote_ip).and_return("203.0.113.10")
+
+      post "/users/verify", params: { code: user.inheritance_code }
+      expect(response).to have_http_status(:ok)
+
+      expect {
+        post "/users/verify", params: { code: user.inheritance_code }
+      }.not_to change(UserIp, :count)
+
+      expect(response).to have_http_status(:ok)
+      expect(json["valid"]).to eq(true)
     end
   end
 
-  describe 'GET /users/me' do
+  describe "GET /users/me" do
-    it 'returns 404 when code not found' do
+    it "returns 404 when code not found" do
-      get '/users/me', params: { code: 'nope' }
+      get "/users/me", params: { code: "nope" }
-
       expect(response).to have_http_status(:not_found)
     end
 
-    it 'returns user slice when found' do
+    it "returns user slice when found" do
-      user = create(:user, inheritance_code: SecureRandom.uuid, name: 'me', role: 'guest')
+      user = create(:user, inheritance_code: SecureRandom.uuid, name: "me", role: "guest")
-
+      get "/users/me", params: { code: user.inheritance_code }
-      get '/users/me', params: { code: user.inheritance_code }
 
       expect(response).to have_http_status(:ok)
-      expect(json['id']).to eq(user.id)
+      expect(json["id"]).to eq(user.id)
-      expect(json['name']).to eq('me')
+      expect(json["name"]).to eq("me")
-      expect(json['inheritance_code']).to eq(user.inheritance_code)
+      expect(json["inheritance_code"]).to eq(user.inheritance_code)
-      expect(json['role']).to eq('guest')
+      expect(json["role"]).to eq("guest")
-    end
-
-    it 'returns 403 when current IP address is banned' do
-      user = create(:user, inheritance_code: SecureRandom.uuid)
-
-      IpAddress.create!(
-        ip_address: IPAddr.new(remote_ip).hton,
-        banned_at: Time.current
-      )
-
-      get '/users/me', params: { code: user.inheritance_code }
-
-      expect(response).to have_http_status(:forbidden)
     end
   end
 end

backend/spec/support/test_records.rb

@@ -2,12 +2,14 @@ module TestRecords
   def create_member_user!
     User.create!(name: 'spec user',
                  inheritance_code: SecureRandom.hex(16),
-                 role: 'member')
+                 role: 'member',
+                 banned: false)
   end
 
   def create_admin_user!
     User.create!(name: 'spec admin',
                  inheritance_code: SecureRandom.hex(16),
-                 role: 'admin')
+                 role: 'admin',
+                 banned: false)
   end
 end

frontend/src/App.tsx

@@ -8,7 +8,6 @@ import { BrowserRouter,
 
 import RouteBlockerOverlay from '@/components/RouteBlockerOverlay'
 import TopNav from '@/components/TopNav'
-import DialogueProvider from '@/components/dialogues/DialogueProvider'
 import { Toaster } from '@/components/ui/toaster'
 import { apiPost, isApiError } from '@/lib/api'
 import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
@@ -139,21 +138,17 @@ export default (() => {
   return (
       <>
 	<RouteBlockerOverlay/>
-
 	<BrowserRouter>
-	  <DialogueProvider>
+	  <LayoutGroup>
-	    <LayoutGroup>
+	    <motion.div
-	      <motion.div
+		layout="position"
-		  layout="position"
+		transition={{ layout: { duration: .2, ease: 'easeOut' } }}
-		  transition={{ layout: { duration: .2, ease: 'easeOut' } }}
+		className="flex flex-col h-dvh w-full overflow-y-hidden">
-		  className="flex flex-col h-dvh w-full overflow-y-hidden">
+	      <TopNav user={user}/>
-		<TopNav user={user}/>
+	      <RouteTransitionWrapper user={user} setUser={setUser}/>
-		<RouteTransitionWrapper user={user} setUser={setUser}/>
+	    </motion.div>
-	      </motion.div>
+	  </LayoutGroup>
-	    </LayoutGroup>
+	  <Toaster/>
-
-	    <Toaster/>
-	  </DialogueProvider>
 	</BrowserRouter>
       </>)
 }) satisfies FC

frontend/src/components/PostEditForm.tsx

@@ -3,12 +3,11 @@ import { useEffect, useState } from 'react'
 import PostFormTagsArea from '@/components/PostFormTagsArea'
 import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
 import Label from '@/components/common/Label'
-import { useDialogue } from '@/components/dialogues/DialogueProvider'
 import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
-import { updatePost } from '@/lib/posts'
+import { apiPut } from '@/lib/api'
 
-import type { FC, FormEvent } from 'react'
+import type { FC } from 'react'
 
 import type { Post, Tag } from '@/types'
 
@@ -33,7 +32,6 @@ type Props = { post:    Post
 
 
 export default (({ post, onSave }: Props) => {
-  const [disabled, setDisabled] = useState (false)
   const [originalCreatedBefore, setOriginalCreatedBefore] =
       useState<string | null> (post.originalCreatedBefore)
   const [originalCreatedFrom, setOriginalCreatedFrom] =
@@ -43,14 +41,16 @@ export default (({ post, onSave }: Props) => {
   const [tags, setTags] = useState<string> ('')
   const [title, setTitle] = useState (post.title)
 
-  const dialogue = useDialogue ()
+  const handleSubmit = async () => {
-
-  const update = async (...args: Parameters<typeof updatePost>) => {
     try
     {
-      const data = await updatePost (...args)
+      const data = await apiPut<Post> (
+	  `/posts/${ post.id }`,
+	  { title, tags, parent_post_ids: parentPostIds,
+	    original_created_from: originalCreatedFrom,
+	    original_created_before: originalCreatedBefore },
+	  { headers: { 'Content-Type': 'multipart/form-data' } })
       onSave ({ ...post,
-		versionNo:              data.versionNo,
 		title:                  data.title,
 		tags:                   data.tags,
 		parentPosts:            data.parentPosts,
@@ -60,55 +60,12 @@ export default (({ post, onSave }: Props) => {
 		originalCreatedBefore:  data.originalCreatedBefore } as Post)
       toast ({ description: '更新しました．' })
     }
-    catch (e)
+    catch
     {
-      const response = (e as any)?.response
+      toast ({ description: '更新はできなかったよ……' })
-
-      if (response?.status !== 409)
-	{
-	  toast ({ description: '更新はできなかったよ……' })
-	  return
-	}
-
-      const action = await dialogue.choice ({
-	  title: '競合が発生しました．',
-	  description: (
-	      <div>
-		<p>ほかの耕作員が先に更新してゐます．</p>
-		<p>現在の変更をどう扱ひますか?</p>
-	      </div>),
-	  choices: [...(response?.data?.mergeable ? [{ value: 'merge', label: '差分をマージ' }] : []),
-		    { value: 'overwrite', label: '強制上書き', variant: 'danger' }] })
-
-      if (action === 'merge')
-	{
-	  // TODO: 差分 UI
-	  await update ({ id: post.id, title, tags, parentPostIds,
-			  originalCreatedFrom, originalCreatedBefore },
-			{ baseVersionNo: post.versionNo, merge: true })
-	  return
-	}
-
-      if (action === 'overwrite')
-	{
-	  await update ({ id: post.id, title, tags, parentPostIds,
-			  originalCreatedFrom, originalCreatedBefore },
-			{ baseVersionNo: post.versionNo, force: true })
-	  return
-	}
     }
   }
 
-  const handleSubmit = async (e: FormEvent) => {
-    e.preventDefault ()
-
-    setDisabled (true)
-    await update ({ id: post.id, title, tags, parentPostIds,
-		    originalCreatedFrom, originalCreatedBefore },
-		  { baseVersionNo: post.versionNo })
-    setDisabled (false)
-  }
-
   useEffect (() => {
     setTags(tagsToStr (post.tags))
   }, [post])
@@ -118,12 +75,10 @@ export default (({ post, onSave }: Props) => {
 	{/* タイトル */}
 	<div>
 	  <Label>タイトル</Label>
-	  <input
+	  <input type="text"
-	      type="text"
+		 className="w-full border rounded p-2"
-	      disabled={disabled}
+		 value={title ?? ''}
-	      className="w-full border rounded p-2"
+		 onChange={ev => setTitle (ev.target.value)}/>
-	      value={title ?? ''}
-	      onChange={ev => setTitle (ev.target.value)}/>
 	</div>
 
 	{/* 親投稿 */}
@@ -131,32 +86,24 @@ export default (({ post, onSave }: Props) => {
 	  <Label>親投稿</Label>
 	  <input
 	      type="text"
-	      disabled={disabled}
 	      value={parentPostIds}
 	      onChange={e => setParentPostIds (e.target.value)}
 	      className="w-full border p-2 rounded"/>
 	</div>
 
 	{/* タグ */}
-	<PostFormTagsArea
+	<PostFormTagsArea tags={tags} setTags={setTags}/>
-	    disabled={disabled}
-	    tags={tags}
-	    setTags={setTags}/>
 
 	{/* オリジナルの作成日時 */}
 	<PostOriginalCreatedTimeField
-	    disabled={disabled}
 	    originalCreatedFrom={originalCreatedFrom}
 	    setOriginalCreatedFrom={setOriginalCreatedFrom}
 	    originalCreatedBefore={originalCreatedBefore}
 	    setOriginalCreatedBefore={setOriginalCreatedBefore}/>
 
 	{/* 送信 */}
-	<Button
+	<Button onClick={handleSubmit}
-	    type="submit"
+		className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
-	    disabled={disabled}
-	    onClick={handleSubmit}
-	    className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
 	  更新
 	</Button>
       </div>)

frontend/src/components/PostFormTagsArea.tsx

@@ -7,7 +7,7 @@ import Label from '@/components/common/Label'
 import TextArea from '@/components/common/TextArea'
 import { apiGet } from '@/lib/api'
 
-import type { ComponentPropsWithoutRef, FC, SyntheticEvent } from 'react'
+import type { FC, SyntheticEvent } from 'react'
 
 import type { Tag } from '@/types'
 
@@ -31,13 +31,12 @@ const replaceToken = (value: string, start: number, end: number, text: string) =
     `${ value.slice (0, start) }${ text }${ value.slice (end) }`
 
 
-type Props =
+type Props = {
-    & { tags:     string
+    tags:     string
-	setTags:  (tags: string) => void }
+    setTags:  (tags: string) => void }
-    & ComponentPropsWithoutRef<'textarea'>
 
 
-export default (({ tags, setTags, ...rest }: Props) => {
+export default (({ tags, setTags }: Props) => {
   const ref = useRef<HTMLTextAreaElement> (null)
 
   const [bounds, setBounds] = useState<{ start: number; end: number }> ({ start: 0, end: 0 })
@@ -88,8 +87,7 @@ export default (({ tags, setTags, ...rest }: Props) => {
 	    onBlur={() => {
 	      setFocused (false)
 	      setSuggestionsVsbl (false)
-	    }}
+	    }}/>
-	    {...rest}/>
 	{focused && (
 	    <TagSearchBox
 		suggestions={suggestionsVsbl && suggestions.length > 0

frontend/src/components/PostOriginalCreatedTimeField.tsx

@@ -5,15 +5,13 @@ import { Button } from '@/components/ui/button'
 import type { FC } from 'react'
 
 type Props = {
-    disabled?:                boolean
     originalCreatedFrom:      string | null
     setOriginalCreatedFrom:   (x: string | null) => void
     originalCreatedBefore:    string | null
     setOriginalCreatedBefore: (x: string | null) => void }
 
 
-export default (({ disabled,
+export default (({ originalCreatedFrom,
-		   originalCreatedFrom,
 		   setOriginalCreatedFrom,
 		   originalCreatedBefore,
 		   setOriginalCreatedBefore }: Props) => (
@@ -23,7 +21,6 @@ export default (({ disabled,
 	<div className="w-80">
 	  <DateTimeField
 	      className="mr-2"
-	      disabled={disabled ?? false}
 	      value={originalCreatedFrom ?? undefined}
 	      onChange={setOriginalCreatedFrom}
 	      onBlur={ev => {
@@ -43,7 +40,6 @@ export default (({ disabled,
 	<div>
 	  <Button
 	      className="bg-gray-600 text-white rounded"
-	      disabled={disabled}
 	      onClick={() => {
 		setOriginalCreatedFrom (null)
 	      }}>
@@ -55,7 +51,6 @@ export default (({ disabled,
 	<div className="w-80">
 	  <DateTimeField
 	      className="mr-2"
-	      disabled={disabled}
 	      value={originalCreatedBefore ?? undefined}
 	      onChange={setOriginalCreatedBefore}/>
 	  より前
@@ -63,7 +58,6 @@ export default (({ disabled,
 	<div>
 	  <Button
 	      className="bg-gray-600 text-white rounded"
-	      disabled={disabled}
 	      onClick={() => {
 		setOriginalCreatedBefore (null)
 	      }}>

frontend/src/components/TopNav.tsx

@@ -36,12 +36,12 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
 	  { name: '一覧', to: '/posts' },
 	  { name: '検索', to: '/posts/search' },
 	  { name: '追加', to: '/posts/new' },
-	  { name: '全体履歴', to: '/posts/changes' },
+	  { name: '履歴', to: '/posts/changes' },
 	  { name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] },
       { name: 'タグ', to: '/tags', subMenu: [
 	  { name: 'マスタ', to: '/tags' },
 	  { name: 'ニコニコ連携', to: '/tags/nico' },
-	  { name: '全体履歴', to: '/tags/changes' },
+	  { name: '履歴', to: '/tags/changes' },
 	  { name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' },
 	  { component: <Separator/>, visible: tagFlg },
 	  { name: `広場 (${ postCount || 0 })`,
@@ -53,7 +53,7 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
 	  { name: '一覧', to: '/materials' },
 	  { name: '検索', to: '/materials/search', visible: false }, 
 	  { name: '追加', to: '/materials/new' },
-	  { name: '全体履歴', to: '/materials/changes', visible: false },
+	  { name: '履歴', to: '/materials/changes', visible: false },
 	  { name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
       { name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
 	  { name: <>第&thinsp;1&thinsp;会場</>, to: '/theatres/1' },

frontend/src/components/common/DateTimeField.tsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
 
 import { cn } from '@/lib/utils'
 
-import type { ComponentPropsWithoutRef, FC, FocusEvent } from 'react'
+import type { FC, FocusEvent } from 'react'
 
 
 const pad = (n: number): string => n.toString ().padStart (2, '0')
@@ -18,14 +18,14 @@ const toDateTimeLocalValue = (d: Date) => {
 }
 
 
-type Props = Omit<ComponentPropsWithoutRef<'input'>, 'onChange'> & {
+type Props = {
     value?:     string
     onChange?:  (isoUTC: string | null) => void
     className?: string
     onBlur?:    (ev: FocusEvent<HTMLInputElement>) => void }
 
 
-export default (({ value, onChange, className, onBlur, ...rest }: Props) => {
+export default (({ value, onChange, className, onBlur }: Props) => {
   const [local, setLocal] = useState ('')
 
   useEffect (() => {
@@ -42,6 +42,5 @@ export default (({ value, onChange, className, onBlur, ...rest }: Props) => {
 	    setLocal (v)
 	    onChange?.(v ? (new Date (v)).toISOString () : null)
 	  }}
-	  onBlur={onBlur}
+	  onBlur={onBlur}/>)
-	  {...rest}/>)
 }) satisfies FC<Props>

frontend/src/components/dialogues/DialogueProvider.tsx

@@ -1,184 +0,0 @@
-import { createContext, useCallback, useContext, useMemo, useState } from 'react'
-
-import { Button } from '@/components/ui/button'
-import { Dialog,
-	 DialogContent,
-	 DialogDescription,
-	 DialogFooter,
-	 DialogTitle } from '@/components/ui/dialog'
-
-import type { FC, ReactNode } from 'react'
-
-type DialogueVariant = 'default' | 'danger'
-
-type ConfirmOptions = { title:        string
-			description?: ReactNode
-			confirmText?: string
-			cancelText?:  string
-			variant?:     DialogueVariant }
-
-type AlertOptions = { title:        string
-		      description?: ReactNode
-		      okText?:      string }
-
-type Choice<T extends string> = { value:    T
-				  label:    string
-				  variant?: DialogueVariant }
-
-type ChoiceOptions<T extends string> = { title:         string
-					 description?:  ReactNode
-					 choices:       Choice<T>[]
-					 cancelText?:   string }
-
-type DialogueRequest =
-    | { id:       number
-	kind:     'confirm'
-	options:  ConfirmOptions
-	resolve:  (value: boolean) => void }
-    | { id:       number
-	kind:     'alert'
-	options:  AlertOptions
-	resolve:  () => void }
-    | { id:       number
-	kind:     'choice'
-	options:  ChoiceOptions<string>
-	resolve:  (value: string | null) => void }
-
-type DialogueAPI =
-    { confirm:  (options: ConfirmOptions) => Promise<boolean>
-      alert:    (options: AlertOptions) => Promise<void>
-      choice:   <T extends string> (options: ChoiceOptions<T>) => Promise<T | null> }
-
-const DialogueContext = createContext<DialogueAPI | null> (null)
-
-let nextDialogueId = 1
-
-type Props = { children: ReactNode }
-
-
-export default (({ children }: Props) => {
-  const [queue, setQueue] = useState<DialogueRequest[]> ([])
-
-  const push = useCallback ((request: Omit<DialogueRequest, 'id'>) => {
-    const id = nextDialogueId
-    ++nextDialogueId
-
-    setQueue (q => [...q, { ...request, id } as DialogueRequest])
-  }, [])
-
-  const closeActive = useCallback ((result?: unknown) => {
-    setQueue (q => {
-      const [active, ...rest] = q
-
-      if (!(active))
-	return rest
-
-      switch (active.kind)
-      {
-      case 'confirm':
-	active.resolve (Boolean (result))
-	break
-
-      case 'alert':
-	active.resolve ()
-	break
-
-      case 'choice':
-	active.resolve ((result ?? null) as string | null)
-	break
-      }
-
-      return rest
-    })
-  }, [])
-
-  const api = useMemo<DialogueAPI> (() => ({
-      confirm: options => new Promise<boolean> (resolve => {
-	push ({ kind: 'confirm', options, resolve })
-      }),
-      alert: options => new Promise<void> (resolve => {
-	push ({ kind: 'alert', options, resolve })
-      }),
-      choice: options => new Promise (resolve => {
-	push ({ kind: 'choice',
-		options: options as ChoiceOptions<string>,
-		resolve: resolve as (value: string | null) => void })
-      }) }), [push])
-
-  const active = queue[0]
-
-  return (
-      <DialogueContext.Provider value={api}>
-	{children}
-
-	<Dialog
-	    open={Boolean (active)}
-	    onOpenChange={open => {
-	      if (!(open))
-		closeActive (active?.kind !== 'confirm' && null)
-	    }}>
-	  {active && (
-	      <DialogContent>
-		<DialogTitle>{active.options.title}</DialogTitle>
-
-		{active.options.description && (
-		    <DialogDescription asChild>
-		      <div>{active.options.description}</div>
-		    </DialogDescription>)}
-
-		<DialogFooter>
-		  {active.kind === 'confirm' && (
-		      <>
-			<Button
-			    variant="outline"
-			    onClick={() => closeActive (false)}>
-			  {active.options.cancelText ?? '取消'}
-			</Button>
-
-			<Button
-			    variant={(active.options.variant === 'danger')
-				     ? 'destructive'
-				     : 'default'}
-			    onClick={() => closeActive (true)}>
-			  {active.options.confirmText ?? '確定'}
-			</Button>
-		      </>)}
-
-		  {active.kind === 'alert' && (
-		      <Button onClick={() => closeActive ()}>
-			{active.options.okText ?? '確定'}
-		      </Button>)}
-
-		  {active.kind === 'choice' && (
-		      <>
-			<Button
-			    variant="outline"
-			    onClick={() => closeActive (null)}>
-			  {active.options.cancelText ?? '取消'}
-			</Button>
-
-			{active.options.choices.map (choice => (
-			    <Button
-				key={choice.value}
-				variant={(choice.variant === 'danger')
-					 ? 'destructive'
-					 : 'default'}
-				onClick={() => closeActive (choice.value)}>
-			      {choice.label}
-			    </Button>))}
-		      </>)}
-		</DialogFooter>
-	      </DialogContent>)}
-	</Dialog>
-      </DialogueContext.Provider>)
-}) satisfies FC<Props>
-
-
-export const useDialogue = () => {
-  const dialogue = useContext (DialogueContext)
-
-  if (!(dialogue))
-    throw new Error ('useDialogue must be used inside DialogueProvider')
-
-  return dialogue
-}

frontend/src/components/ui/dialog.tsx

@@ -37,27 +37,25 @@ const DialogContent = React.forwardRef<
     <DialogOverlay />
     <DialogPrimitive.Content
       ref={ref}
-      className={cn (
+      className={cn(
-	  'fixed left-[50%] top-[50%] z-50 grid w-[calc(100%-2rem)] max-w-lg',
+	  'fixed left-[50%] top-[50%] z-50 w-[90%] grid max-w-lg',
 	  'translate-x-[-50%] translate-y-[-50%]',
-	  'gap-5 rounded-2xl border border-border',
+	  'gap-4 border bg-gray-300/80 dark:bg-gray-700/80',
-	  'bg-background p-6 text-foreground shadow-2xl',
+	  'p-6 shadow-lg duration-200',
-	  'duration-200',
 	  'data-[state=open]:animate-in data-[state=closed]:animate-out',
 	  'data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
 	  'data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
+	  'data-[state=closed]:slide-out-to-left-1/2',
+	  'data-[state=closed]:slide-out-to-top-[48%]',
+	  'data-[state=open]:slide-in-from-left-1/2',
+	  'data-[state=open]:slide-in-from-top-[48%] rounded-lg',
 	  className)}
       {...props}
     >
       {children}
-      <DialogPrimitive.Close
+      <DialogPrimitive.Close className="absolute right-4 top-4 bg-red-500 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
-	  className={cn (
+        <X className="h-3 w-3" />
-	      'absolute right-4 top-4 rounded-full p-1',
+        <span className="sr-only">Close</span>
-	      'text-muted-foreground opacity-70 transition-opacity',
-	      'hover:bg-accent hover:text-accent-foreground hover:opacity-100',
-	      'focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2')}>
-	<X className="h-4 w-4"/>
-	<span className="sr-only">Close</span>
       </DialogPrimitive.Close>
     </DialogPrimitive.Content>
   </DialogPortal>

frontend/src/index.css

@@ -6,56 +6,6 @@
 
 @layer base
 {
-  :root
-  {
-    --background: 0 0% 100%;
-    --foreground: 222.2 84% 4.9%;
-
-    --primary: 222.2 47.4% 11.2%;
-    --primary-foreground: 210 40% 98%;
-
-    --secondary: 210 40% 96.1%;
-    --secondary-foreground: 222.2 47.4% 11.2%;
-
-    --destructive: 0 72.2% 50.6%;
-    --destructive-foreground: 210 40% 98%;
-
-    --muted: 210 40% 96.1%;
-    --muted-foreground: 215.4 16.3% 46.9%;
-
-    --accent: 210 40% 96.1%;
-    --accent-foreground: 222.2 47.4% 11.2%;
-
-    --border: 214.3 31.8% 91.4%;
-    --input: 214.3 31.8% 91.4%;
-    --ring: 222.2 84% 4.9%;
-  }
-
-  .dark
-  {
-    --background: 222.2 84% 4.9%;
-    --foreground: 210 40% 98%;
-
-    --primary: 210 40% 98%;
-    --primary-foreground: 222.2 47.4% 11.2%;
-
-    --secondary: 217.2 32.6% 17.5%;
-    --secondary-foreground: 210 40% 98%;
-
-    --destructive: 0 62.8% 45%;
-    --destructive-foreground: 210 40% 98%;
-
-    --muted: 217.2 32.6% 17.5%;
-    --muted-foreground: 215 20.2% 65.1%;
-
-    --accent: 217.2 32.6% 17.5%;
-    --accent-foreground: 210 40% 98%;
-
-    --border: 217.2 32.6% 17.5%;
-    --input: 217.2 32.6% 17.5%;
-    --ring: 212.7 26.8% 83.9%;
-  }
-
   body
   {
     @apply overflow-x-clip;
@@ -104,6 +54,34 @@ body
   min-height: 100dvh;
 }
 
+h1
+{
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button
+{
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+button:hover
+{
+  border-color: #646cff;
+}
+button:focus,
+button:focus-visible
+{
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
 @media (prefers-color-scheme: light)
 {
   :root

frontend/src/lib/posts.ts

@@ -1,4 +1,4 @@
-import { apiDelete, apiGet, apiPost, apiPut } from '@/lib/api'
+import { apiDelete, apiGet, apiPost } from '@/lib/api'
 
 import type { FetchPostsParams, Post, PostVersion } from '@/types'
 
@@ -42,30 +42,6 @@ export const fetchPostChanges = async (
 						     page, limit } })
 
 
-export const updatePost = async (
-    post: { id:                     number
-	    title:                  string | null
-	    tags:                   string
-	    parentPostIds:          string
-	    originalCreatedFrom:    string | null
-	    originalCreatedBefore:  string | null },
-    { baseVersionNo, force, merge }: {
-	baseVersionNo?: number
-	force?:         boolean
-	merge?:         boolean }
-) =>
-    await apiPut<Post> (
-	`/posts/${ post.id }`,
-	{ title: post.title,
-	  tags: post.tags,
-	  parent_post_ids: post.parentPostIds,
-	  original_created_from: post.originalCreatedFrom,
-	  original_created_before: post.originalCreatedBefore },
-	{ params: { ...(baseVersionNo && { base_version_no: String (baseVersionNo) }),
-	            force: force ? '1' : '0',
-		    merge: merge ? '1' : '0' } })
-
-
 export const toggleViewedFlg = async (id: string, viewed: boolean): Promise<void> => {
   await (viewed ? apiPost : apiDelete) (`/posts/${ id }/viewed`)
 }

frontend/src/pages/posts/PostHistoryPage.tsx

@@ -11,14 +11,13 @@ import Pagination from '@/components/common/Pagination'
 import MainArea from '@/components/layout/MainArea'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
-import { fetchPostChanges, updatePost } from '@/lib/posts'
+import { apiPut } from '@/lib/api'
+import { fetchPostChanges } from '@/lib/posts'
 import { postsKeys, tagsKeys } from '@/lib/queryKeys'
 import { fetchTag } from '@/lib/tags'
 import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
 
-import type { FC, MouseEvent } from 'react'
+import type { FC } from 'react'
-
-import type { PostVersion } from '@/types'
 
 
 const renderDiff = (diff: { current: string | null; prev: string | null }) => (
@@ -63,45 +62,6 @@ export default (() => {
 
   const qc = useQueryClient ()
 
-  const handleRevert = async (e: MouseEvent<HTMLAnchorElement>, change: PostVersion) => {
-    e.preventDefault ()
-
-    if (!(confirm (`『${ change.title.current || change.url.current }』を版 ${
-		       change.versionNo } に差戻します．\nよろしいですか?`)))
-      return
-
-    try
-    {
-      const id = change.postId
-      const title = change.title.current
-      const tags =
-	  change.tags
-	  .filter (t => t.type !== 'removed')
-	  .map (t => t.name)
-	  .filter (t => t.slice (0, 5) !== 'nico:')
-	  .join (' ')
-      const parentPostIds =
-	  (change.parentPosts ?? [])
-	  .filter (p => p.type !== 'removed')
-	  .map (p => p.id)
-	  .join (' ')
-      const originalCreatedFrom = change.originalCreatedFrom.current
-      const originalCreatedBefore = change.originalCreatedBefore.current
-      await updatePost ({ id, title, tags, parentPostIds,
-			  originalCreatedFrom, originalCreatedBefore },
-		        { force: true })
-
-      qc.invalidateQueries ({ queryKey: postsKeys.root })
-      qc.invalidateQueries ({ queryKey: tagsKeys.root })
-
-      toast ({ description: '差戻しました．' })
-    }
-    catch
-    {
-      toast ({ description: '差戻に失敗……' })
-    }
-  }
-
   useEffect (() => {
     document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
   }, [location.search])
@@ -271,7 +231,46 @@ export default (() => {
 			      {dateString (change.createdAt)}
 			    </td>
 			    <td className="p-2">
-			      <a href="#" onClick={async e => await handleRevert (e, change)}>
+			      <a
+				  href="#"
+				  onClick={async e => {
+				    e.preventDefault ()
+
+				    if (!(confirm (
+					`『${ change.title.current
+					      || change.url.current }』を版 ${
+					change.versionNo } に差戻します．\nよろしいですか?`)))
+				      return
+
+				    try
+				    {
+				      await apiPut (
+					  `/posts/${ change.postId }`,
+					  { title: change.title.current,
+					    tags: change.tags
+						  .filter (t => t.type !== 'removed')
+						  .map (t => t.name)
+						  .filter (t => t.slice (0, 5) !== 'nico:')
+						  .join (' '),
+					    parent_post_ids:
+						(change.parentPosts ?? [])
+						.filter (p => p.type !== 'removed')
+						.map (p => p.id)
+						.join (' '),
+					    original_created_from:
+						change.originalCreatedFrom.current,
+					    original_created_before:
+						change.originalCreatedBefore.current })
+
+				      qc.invalidateQueries ({ queryKey: postsKeys.root })
+				      qc.invalidateQueries ({ queryKey: tagsKeys.root })
+				      toast ({ description: '差戻しました．' })
+				    }
+				    catch
+				    {
+				      toast ({ description: '差戻に失敗……' })
+				    }
+				  }}>
 				復元
 			      </a>
 			    </td>

frontend/src/types.ts

@@ -121,7 +121,6 @@ export type Platform = typeof PLATFORMS[number]
 
 export type Post = {
     id:                     number
-    versionNo:              number
     url:                    string
     title:                  string | null
     thumbnail:              string | null
@@ -147,7 +146,6 @@ export type PostTagChange = {
 
 export type PostVersion = {
     postId:                 number
-    latestVersionNo:        number
     versionNo:              number
     eventType:              'create' | 'update' | 'discard' | 'restore'
     title:                  { current: string | null; prev: string | null }

frontend/tailwind.config.js

@@ -19,22 +19,7 @@ export default {
 		'rainbow-scroll': 'rainbow-scroll .25s linear infinite' },
 	    colors: {
 		red: { 925: '#5f1414',
-		       975: '#230505' },
+		       975: '#230505' } },
-		border: 'hsl(var(--border))',
-		input: 'hsl(var(--input))',
-		ring: 'hsl(var(--ring))',
-		background: 'hsl(var(--background))',
-		foreground: 'hsl(var(--foreground))',
-		primary: { DEFAULT: 'hsl(var(--primary))',
-			   foreground: 'hsl(var(--primary-foreground))' },
-		secondary: { DEFAULT: 'hsl(var(--secondary))',
-			     foreground: 'hsl(var(--secondary-foreground))' },
-		destructive: { DEFAULT: 'hsl(var(--destructive))',
-			       foreground: 'hsl(var(--destructive-foreground))' },
-		muted: { DEFAULT: 'hsl(var(--muted))',
-			 foreground: 'hsl(var(--muted-foreground))' },
-		accent: { DEFAULT: 'hsl(var(--accent))',
-			  foreground: 'hsl(var(--accent-foreground))' } },
 	    keyframes: {
 		'rainbow-scroll': {
 		    '0%':   { backgroundPosition: '0% 50%' },