#171

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: [:materials, { tag_name: :wiki_page }])
+        .preload(tags: [:deerjikists, :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: [:materials, { tag_name: :wiki_page }])
+    post = filtered_posts.preload(tags: [:deerjikists, :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: [:materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
+    post = Post.includes(tags: [:deerjikists, :materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
     return head :not_found unless post
 
     render json: PostRepr.base(post, current_user)
@@ -173,33 +173,68 @@ 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 = Post.find(params[:id].to_i)
+    post = nil
+    conflict_json = nil
 
     ApplicationRecord.transaction do
-      PostVersionRecorder.ensure_snapshot!(post, created_by_user: current_user)
+      post = Post.lock.find(params[:id].to_i)
 
-      post.update!(title:, original_created_from:, original_created_before:)
+      base_version = nil
+      base_snapshot = nil
+      current_snapshot = nil
+      unless force
+        base_version = post.post_versions.find_by!(version_no: base_version_no)
 
-      normalised_tags = Tag.normalise_tags!(tag_names, with_tagme: false)
-      TagVersioning.record_tag_snapshots!(normalised_tags, created_by_user: current_user)
+        base_snapshot = post_snapshot_from_version(base_version)
+        current_snapshot = post_snapshot_from_record(post)
+      end
+      incoming_snapshot = post_incoming_snapshot(title:,
+                                                 original_created_from:,
+                                                 original_created_before:,
+                                                 tag_names:,
+                                                 parent_post_ids:)
 
-      tags = post.tags.nico.to_a + normalised_tags
-      tags = Tag.expand_parent_tags(tags)
-      sync_post_tags!(post, tags)
+      snapshot_to_apply =
+          if force || post.version_no == base_version_no || current_snapshot == base_snapshot
+            incoming_snapshot
+          else
+            changes = post_snapshot_changes(base_snapshot, current_snapshot, incoming_snapshot)
+            conflicts = changes.select { |change| change[:conflict] }
 
-      sync_parent_posts!(post, parent_post_ids)
-
-      PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
+            if merge && conflicts.empty?
+              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)
+    end
+
+    return render json: conflict_json, status: :conflict if conflict_json
+
     post.reload
-    json = post.as_json
+    json = PostRepr.base(post, current_user)
     json['tags'] = build_tag_tree_for(post.tags)
     render json:, status: :ok
   rescue Tag::NicoTagNormalisationError
@@ -225,7 +260,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: [:materials, { tag_name: :wiki_page }])
+                       tag: [:deerjikists, :materials, { tag_name: :wiki_page }])
 
     events = []
     pts.each do |pt|
@@ -404,4 +439,203 @@ 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/models/post.rb

@@ -28,6 +28,8 @@ 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,6 +40,8 @@ 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/wiki_page.rb

@@ -15,6 +15,8 @@ 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,19 +16,20 @@ class VersionRecorder
       @record = record_class.unscoped.lock.find(@record.id)
       latest = latest_version
 
-      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
+      validate_version_sequence! latest
 
       attrs = snapshot_attributes
 
-      return latest if @event_type == 'update' && latest && same_snapshot?(latest, attrs)
+      if @event_type == 'update' && latest && same_snapshot?(latest, attrs)
+        return latest
+      end
 
-      version_class.create!(base_attributes(latest).merge(record_key => @record).merge(attrs))
+      version = version_class.create!(
+          base_attributes(latest).merge(record_key => @record).merge(attrs))
+
+      update_record_version_no! version.version_no
+
+      version
     end
   end
 
@@ -45,7 +46,31 @@ class VersionRecorder
       created_by_user: @created_by_user }
   end
 
-  def same_snapshot?(version, attrs) = attrs.all? { |k, v| version.public_send(k) == v }
+  def update_record_version_no! version_no
+    @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/20260507124000_add_version_no_to_posts.rb

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,37 @@
+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

@@ -0,0 +1,27 @@
+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_01_153900) do
+ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) 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
@@ -186,8 +186,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) 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|
@@ -262,8 +264,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) 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|
@@ -369,10 +373,12 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_01_153900) 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|

frontend/src/App.tsx

@@ -8,6 +8,7 @@ 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'
@@ -138,7 +139,9 @@ export default (() => {
   return (
       <>
 	<RouteBlockerOverlay/>
+
 	<BrowserRouter>
+	  <DialogueProvider>
 	    <LayoutGroup>
 	      <motion.div
 		  layout="position"
@@ -148,7 +151,9 @@ export default (() => {
 		<RouteTransitionWrapper user={user} setUser={setUser}/>
 	      </motion.div>
 	    </LayoutGroup>
+
 	    <Toaster/>
+	  </DialogueProvider>
 	</BrowserRouter>
       </>)
 }) satisfies FC

frontend/src/components/PostEditForm.tsx

@@ -3,11 +3,12 @@ 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 { apiPut } from '@/lib/api'
+import { updatePost } from '@/lib/posts'
 
-import type { FC } from 'react'
+import type { FC, FormEvent } from 'react'
 
 import type { Post, Tag } from '@/types'
 
@@ -32,6 +33,7 @@ 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] =
@@ -41,16 +43,14 @@ export default (({ post, onSave }: Props) => {
   const [tags, setTags] = useState<string> ('')
   const [title, setTitle] = useState (post.title)
 
-  const handleSubmit = async () => {
+  const dialogue = useDialogue ()
+
+  const update = async (...args: Parameters<typeof updatePost>) => {
     try
     {
-      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' } })
+      const data = await updatePost (...args)
       onSave ({ ...post,
+		versionNo:              data.versionNo,
 		title:                  data.title,
 		tags:                   data.tags,
 		parentPosts:            data.parentPosts,
@@ -60,10 +60,53 @@ export default (({ post, onSave }: Props) => {
 		originalCreatedBefore:  data.originalCreatedBefore } as Post)
       toast ({ description: '更新しました．' })
     }
-    catch
+    catch (e)
+    {
+      const response = (e as any)?.response
+
+      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 (() => {
@@ -75,7 +118,9 @@ export default (({ post, onSave }: Props) => {
 	{/* タイトル */}
 	<div>
 	  <Label>タイトル</Label>
-	  <input type="text"
+	  <input
+	      type="text"
+	      disabled={disabled}
 	      className="w-full border rounded p-2"
 	      value={title ?? ''}
 	      onChange={ev => setTitle (ev.target.value)}/>
@@ -86,23 +131,31 @@ 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 tags={tags} setTags={setTags}/>
+	<PostFormTagsArea
+	    disabled={disabled}
+	    tags={tags}
+	    setTags={setTags}/>
 
 	{/* オリジナルの作成日時 */}
 	<PostOriginalCreatedTimeField
+	    disabled={disabled}
 	    originalCreatedFrom={originalCreatedFrom}
 	    setOriginalCreatedFrom={setOriginalCreatedFrom}
 	    originalCreatedBefore={originalCreatedBefore}
 	    setOriginalCreatedBefore={setOriginalCreatedBefore}/>
 
 	{/* 送信 */}
-	<Button onClick={handleSubmit}
+	<Button
+	    type="submit"
+	    disabled={disabled}
+	    onClick={handleSubmit}
 	    className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
 	  更新
 	</Button>

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

frontend/src/components/PostOriginalCreatedTimeField.tsx

@@ -5,13 +5,15 @@ 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 (({ originalCreatedFrom,
+export default (({ disabled,
+		   originalCreatedFrom,
 		   setOriginalCreatedFrom,
 		   originalCreatedBefore,
 		   setOriginalCreatedBefore }: Props) => (
@@ -21,6 +23,7 @@ export default (({ originalCreatedFrom,
 	<div className="w-80">
 	  <DateTimeField
 	      className="mr-2"
+	      disabled={disabled ?? false}
 	      value={originalCreatedFrom ?? undefined}
 	      onChange={setOriginalCreatedFrom}
 	      onBlur={ev => {
@@ -40,6 +43,7 @@ export default (({ originalCreatedFrom,
 	<div>
 	  <Button
 	      className="bg-gray-600 text-white rounded"
+	      disabled={disabled}
 	      onClick={() => {
 		setOriginalCreatedFrom (null)
 	      }}>
@@ -51,6 +55,7 @@ export default (({ originalCreatedFrom,
 	<div className="w-80">
 	  <DateTimeField
 	      className="mr-2"
+	      disabled={disabled}
 	      value={originalCreatedBefore ?? undefined}
 	      onChange={setOriginalCreatedBefore}/>
 	  より前
@@ -58,6 +63,7 @@ export default (({ originalCreatedFrom,
 	<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 { FC, FocusEvent } from 'react'
+import type { ComponentPropsWithoutRef, FC, FocusEvent } from 'react'
 
 
 const pad = (n: number): string => n.toString ().padStart (2, '0')
@@ -18,14 +18,14 @@ const toDateTimeLocalValue = (d: Date) => {
 }
 
 
-type Props = {
+type Props = Omit<ComponentPropsWithoutRef<'input'>, 'onChange'> & {
     value?:     string
     onChange?:  (isoUTC: string | null) => void
     className?: string
     onBlur?:    (ev: FocusEvent<HTMLInputElement>) => void }
 
 
-export default (({ value, onChange, className, onBlur }: Props) => {
+export default (({ value, onChange, className, onBlur, ...rest }: Props) => {
   const [local, setLocal] = useState ('')
 
   useEffect (() => {
@@ -42,5 +42,6 @@ export default (({ value, onChange, className, onBlur }: Props) => {
 	    setLocal (v)
 	    onChange?.(v ? (new Date (v)).toISOString () : null)
 	  }}
-	  onBlur={onBlur}/>)
+	  onBlur={onBlur}
+	  {...rest}/>)
 }) satisfies FC<Props>

frontend/src/components/dialogues/DialogueProvider.tsx

@@ -0,0 +1,184 @@
+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,24 +37,26 @@ const DialogContent = React.forwardRef<
     <DialogOverlay />
     <DialogPrimitive.Content
       ref={ref}
-      className={cn(
-	  'fixed left-[50%] top-[50%] z-50 w-[90%] grid max-w-lg',
+      className={cn (
+	  'fixed left-[50%] top-[50%] z-50 grid w-[calc(100%-2rem)] max-w-lg',
 	  'translate-x-[-50%] translate-y-[-50%]',
-	  'gap-4 border bg-gray-300/80 dark:bg-gray-700/80',
-	  'p-6 shadow-lg duration-200',
+	  'gap-5 rounded-2xl border border-border',
+	  'bg-background p-6 text-foreground shadow-2xl',
+	  '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 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">
-        <X className="h-3 w-3" />
+      <DialogPrimitive.Close
+	  className={cn (
+	      'absolute right-4 top-4 rounded-full p-1',
+	      '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>

frontend/src/index.css

@@ -6,6 +6,56 @@
 
 @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;
@@ -54,34 +104,6 @@ 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 } from '@/lib/api'
+import { apiDelete, apiGet, apiPost, apiPut } from '@/lib/api'
 
 import type { FetchPostsParams, Post, PostVersion } from '@/types'
 
@@ -42,6 +42,30 @@ 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,13 +11,14 @@ 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 { apiPut } from '@/lib/api'
-import { fetchPostChanges } from '@/lib/posts'
+import { fetchPostChanges, updatePost } from '@/lib/posts'
 import { postsKeys, tagsKeys } from '@/lib/queryKeys'
 import { fetchTag } from '@/lib/tags'
 import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
 
-import type { FC } from 'react'
+import type { FC, MouseEvent } from 'react'
+
+import type { PostVersion } from '@/types'
 
 
 const renderDiff = (diff: { current: string | null; prev: string | null }) => (
@@ -62,6 +63,45 @@ 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])
@@ -231,46 +271,7 @@ export default (() => {
 			      {dateString (change.createdAt)}
 			    </td>
 			    <td className="p-2">
-			      <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 href="#" onClick={async e => await handleRevert (e, change)}>
 				復元
 			      </a>
 			    </td>

frontend/src/types.ts

@@ -121,6 +121,7 @@ export type Platform = typeof PLATFORMS[number]
 
 export type Post = {
     id:                     number
+    versionNo:              number
     url:                    string
     title:                  string | null
     thumbnail:              string | null
@@ -146,6 +147,7 @@ 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,7 +19,22 @@ 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%' },