Merge remote-tracking branch 'origin/main' into feature/047

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/tags_controller.rb

@@ -1,7 +1,3 @@
-require 'net/http'
-require 'uri'
-
-
 class TagsController < ApplicationController
   def index
     post_id = params[:post]
@@ -186,8 +182,7 @@ class TagsController < ApplicationController
              .find_by(id: params[:id])
     return head :not_found unless tag
 
-    render json: { tag: TagRepr.base(tag),
+    render json: DeerjikistRepr.many(tag.deerjikists)
-                   deerjikists: DeerjikistRepr.many(tag.deerjikists) }
   end
 
   def deerjikists_by_name
@@ -199,31 +194,7 @@ class TagsController < ApplicationController
              .find_by(tag_names: { name: })
     return head :not_found unless tag
 
-    render json: { tag: TagRepr.base(tag),
+    render json: DeerjikistRepr.many(tag.deerjikists)
-                   deerjikists: DeerjikistRepr.many(tag.deerjikists) }
-  end
-
-  def update_deerjikists
-    return head :unauthorized unless current_user
-    return head :forbidden unless current_user.gte_member?
-
-    tag = Tag.joins(:tag_name)
-             .includes(:tag_name, tag_name: :wiki_page)
-             .find_by(id: params[:id])
-    return head :not_found unless tag
-
-    ApplicationRecord.transaction do
-      tag.deerjikists = []
-      params[:_json].each do
-        platform = _1[:platform]
-        code = normalise_deerjikist_code(platform, _1[:code])
-        deerjikist = Deerjikist.find_or_initialize_by(platform:, code:)
-        deerjikist.tag = tag
-        deerjikist.save!
-      end
-    end
-
-    render json: DeerjikistRepr.many(tag.reload.deerjikists)
   end
 
   def materials_by_name
@@ -420,21 +391,4 @@ class TagsController < ApplicationController
       TagImplication.create!(tag:, parent_tag:)
     end
   end
-
-  def normalise_deerjikist_code platform, code
-    return code if platform != 'youtube' || code[0] != '@'
-
-    url = "https://www.youtube.com/#{ code }"
-
-    html = Net::HTTP.get(URI(url))
-
-    canonical = html[
-        /<link rel="canonical" href="https:\/\/www\.youtube\.com\/channel\/(UC[a-zA-Z0-9_-]{22})"/,
-        1]
-    return canonical if canonical
-
-    html[/"channelId":"(UC[a-zA-Z0-9_-]{22})"/, 1] || html[/\bUC[a-zA-Z0-9_-]{22}\b/]
-  rescue
-    nil
-  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/controllers/wiki_assets_controller.rb

@@ -0,0 +1,39 @@
+require 'digest'
+
+
+class WikiAssetsController < ApplicationController
+  def index
+    page_id = params[:wiki_page_id].to_i
+    page = WikiPage.find_by(id: page_id)
+    return head :not_found unless page
+
+    render json: WikiAssetRepr.many(page.assets)
+  end
+
+  def create
+    return head :unauthorized unless current_user
+    return head :forbidden unless current_user.gte_member?
+
+    wiki_page_id = params[:wiki_page_id].to_i
+    page = WikiPage.find_by(id: wiki_page_id)
+    return head :not_found unless page
+
+    file = params[:file]
+    return head :bad_request if file.blank?
+
+    asset = nil
+    page.with_lock do
+      no = page.next_asset_no
+      alt_text = params[:alt_text].presence
+      sha256 = Digest::SHA256.file(file.tempfile.path).digest
+
+      asset = WikiAsset.new(wiki_page_id:, no:, alt_text:, sha256:, created_by_user: current_user)
+      asset.file.attach(file)
+      asset.save!
+
+      page.update!(next_asset_no: no + 1)
+    end
+
+    render json: WikiAssetRepr.base(asset)
+  end
+end

backend/app/controllers/wiki_pages_controller.rb

@@ -109,7 +109,7 @@ class WikiPagesController < ApplicationController
     return head :unauthorized unless current_user
     return head :forbidden unless current_user.gte_member?
 
-    title = params[:title]&.strip
+    title = params[:title].to_s.strip
     body = params[:body].to_s
 
     return head :unprocessable_entity if title.blank? || body.blank?
@@ -143,7 +143,14 @@ class WikiPagesController < ApplicationController
       end
     end
 
-    head :ok
+    message = params[:message].presence
+    Wiki::Commit.content!(page:,
+                          body:,
+                          created_user: current_user,
+                          message:,
+                          base_revision_id:)
+
+    render json: WikiPageRepr.base(page).merge(body:)
   end
 
   def search

backend/app/models/ip_address.rb

@@ -4,7 +4,11 @@ class IpAddress < ApplicationRecord
   has_many :user_ips, dependent: :destroy
   has_many :users, through: :user_ips
 
-  def banned? = banned_at.present?
+  def banned? = banned_at?
-  def ban! = banned? || update!(banned_at: Time.current)
+  def banned = banned?
-  def unban! = update!(banned_at: nil)
+
+  def banned= value
+    bool = ActiveModel::Type::Boolean.new.cast(value)
+    self.banned_at = bool ? banned_at || Time.current : nil
+  end
 end

backend/app/models/post_version.rb

@@ -2,7 +2,6 @@ class PostVersion < ApplicationRecord
   include VersionRecord
 
   belongs_to :post
-  belongs_to :parent, class_name: 'Post', optional: true
 
   validates :url, presence: true
 

backend/app/models/tag.rb

@@ -79,8 +79,6 @@ class Tag < ApplicationRecord
 
   def material_id = materials.first&.id
 
-  def has_deerjikists = deerjikists.present?
-
   def self.tagme = find_or_create_by_tag_name!('タグ希望', category: :meta)
   def self.bot = find_or_create_by_tag_name!('bot操作', category: :meta)
   def self.no_deerjikist = find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)

backend/app/models/user.rb

@@ -17,11 +17,14 @@ class User < ApplicationRecord
   has_many :updated_wiki_pages,
            class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
 
+  def banned? = banned_at?
+  def banned = banned?
+
+  def banned= value
+    bool = ActiveModel::Type::Boolean.new.cast(value)
+    self.banned_at = bool ? (banned_at || Time.current) : nil
+  end
+
   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_asset.rb

@@ -0,0 +1,12 @@
+class WikiAsset < ApplicationRecord
+  belongs_to :wiki_page
+  belongs_to :created_by_user, class_name: 'User'
+
+  has_one_attached :file
+
+  validates :file, presence: true
+
+  def url
+    Rails.application.routes.url_helpers.rails_blob_url(file, only_path: true)
+  end
+end

backend/app/models/wiki_page.rb

@@ -13,6 +13,8 @@ class WikiPage < ApplicationRecord
            foreign_key: :redirect_page_id,
            dependent: :nullify
 
+  has_many :assets, class_name: 'WikiAsset', dependent: :destroy
+
   has_many :wiki_versions
 
   belongs_to :tag_name

backend/app/representations/tag_repr.rb

@@ -3,7 +3,7 @@
 
 module TagRepr
   BASE = { only: [:id, :category, :post_count, :created_at, :updated_at],
-           methods: [:name, :has_wiki, :material_id, :has_deerjikists] }.freeze
+           methods: [:name, :has_wiki, :material_id] }.freeze
 
   module_function
 

backend/app/representations/wiki_asset_repr.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+
+module WikiAssetRepr
+  BASE = { only: [:wiki_page_id, :no], methods: [:url] }.freeze
+
+  module_function
+
+  def base wiki_asset
+    wiki_asset.as_json(BASE)
+  end
+
+  def many wiki_assets
+    wiki_assets.map { |a| base(a) }
+  end
+end

backend/config/routes.rb

@@ -24,7 +24,6 @@ Rails.application.routes.draw do
       patch '', action: :update
 
       get :deerjikists
-      put :deerjikists, action: :update_deerjikists
     end
   end
 
@@ -48,6 +47,8 @@ Rails.application.routes.draw do
       get :exists
       get :diff
     end
+
+    resources :assets, controller: :wiki_assets, only: [:index, :create]
   end
 
   resources :posts, only: [:index, :show, :create, :update] do

backend/db/migrate/20260323192300_create_wiki_assets.rb

@@ -0,0 +1,17 @@
+class CreateWikiAssets < ActiveRecord::Migration[8.0]
+  def change
+    create_table :wiki_assets do |t|
+      t.references :wiki_page, null: false, foreign_key: true, index: false
+      t.integer :no, null: false
+      t.string :alt_text
+      t.column :sha256, 'binary(32)', null: false
+      t.references :created_by_user, null: false, foreign_key: { to_table: :users }
+      t.timestamps
+    end
+
+    add_index :wiki_assets, [:wiki_page_id, :sha256], unique: true
+    add_index :wiki_assets, [:wiki_page_id, :no], unique: true
+
+    add_column :wiki_pages, :next_asset_no, :integer, null: false, default: 1
+  end
+end

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/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/posts_spec.rb

@@ -1409,6 +1409,22 @@ RSpec.describe 'Posts API', type: :request do
       post.snapshot_tag_names.join(' ')
     end
 
+    def create_post_version_for!(post)
+      PostVersion.create!(
+        post: post,
+        version_no: 1,
+        event_type: 'create',
+        title: post.title,
+        url: post.url,
+        thumbnail_base: post.thumbnail_base,
+        tags: snapshot_tags(post),
+        original_created_from: post.original_created_from,
+        original_created_before: post.original_created_before,
+        created_at: post.created_at,
+        created_by_user: post.uploaded_user
+      )
+    end
+
     it 'creates version 1 on POST /posts' do
       sign_in_as(member)
 

backend/spec/requests/tags_deerjikists_spec.rb

@@ -8,35 +8,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
 
   let!(:tag) { create(:tag, category: :deerjikist) }
 
-  let(:member) { create(:user, :member) }
-  let(:guest) { create(:user, role: :guest) }
-
   before do
+    # show_by_name / deerjikists_by_name 用に名前を固定
     tag.tag_name.update!(name: 'deerjika')
   end
 
   describe 'GET /tags/:id/deerjikists' do
     subject(:do_request) do
-      get "/tags/#{tag_id}/deerjikists"
+      get "/tags/#{ tag_id }/deerjikists"
     end
 
     let(:tag_id) { tag.id }
 
     context 'when tag exists and has no deerjikists' do
-      it 'returns 200 with tag and empty deerjikists array' do
+      it 'returns 200 and empty array' do
         do_request
-
         expect(response).to have_http_status(:ok)
-
+        expect(json).to eq([])
-        expect(json).to be_a(Hash)
-
-        expect(json['tag']).to be_a(Hash)
-        expect(json['tag']['id']).to eq(tag.id)
-        expect(json['tag']['name']).to eq('deerjika')
-        expect(json['tag']['category']).to eq('deerjikist')
-        expect(json['tag']['has_deerjikists']).to eq(false)
-
-        expect(json['deerjikists']).to eq([])
       end
     end
 
@@ -46,27 +34,17 @@ RSpec.describe 'Tags deerjikists API', type: :request do
         Deerjikist.create!(platform: platform2, code: code2, tag: tag)
       end
 
-      it 'returns 200 with tag and deerjikists array' do
+      it 'returns 200 and deerjikists array' do
         do_request
-
         expect(response).to have_http_status(:ok)
 
-        expect(json).to be_a(Hash)
+        expect(json).to be_a(Array)
+        expect(json.size).to eq(2)
 
-        expect(json['tag']).to be_a(Hash)
+        expect(json.map { |h| [h['platform'], h['code']] }).to contain_exactly(
-        expect(json['tag']['id']).to eq(tag.id)
+          [platform1, code1],
-        expect(json['tag']['name']).to eq('deerjika')
+          [platform2, code2],
-        expect(json['tag']['category']).to eq('deerjikist')
+        )
-        expect(json['tag']['has_deerjikists']).to eq(true)
-
-        expect(json['deerjikists']).to be_a(Array)
-        expect(json['deerjikists'].size).to eq(2)
-
-        expect(json['deerjikists'].map { |h| [h['platform'], h['code']] })
-          .to contain_exactly(
-            [platform1, code1],
-            [platform2, code2],
-          )
       end
     end
 
@@ -75,7 +53,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
 
       it 'returns 404' do
         do_request
-
         expect(response).to have_http_status(:not_found)
       end
     end
@@ -83,7 +60,7 @@ RSpec.describe 'Tags deerjikists API', type: :request do
 
   describe 'GET /tags/name/:name/deerjikists' do
     subject(:do_request) do
-      get "/tags/name/#{name}/deerjikists"
+      get "/tags/name/#{ name }/deerjikists"
     end
 
     let(:name) { 'deerjika' }
@@ -93,7 +70,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
 
       it 'returns 400' do
         do_request
-
         expect(response).to have_http_status(:bad_request)
       end
     end
@@ -103,209 +79,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
 
       it 'returns 404' do
         do_request
-
         expect(response).to have_http_status(:not_found)
       end
     end
 
-    context 'when tag exists and has no deerjikists' do
-      it 'returns 200 with tag and empty deerjikists array' do
-        do_request
-
-        expect(response).to have_http_status(:ok)
-
-        expect(json).to be_a(Hash)
-
-        expect(json['tag']).to be_a(Hash)
-        expect(json['tag']['id']).to eq(tag.id)
-        expect(json['tag']['name']).to eq('deerjika')
-        expect(json['tag']['category']).to eq('deerjikist')
-        expect(json['tag']['has_deerjikists']).to eq(false)
-
-        expect(json['deerjikists']).to eq([])
-      end
-    end
-
     context 'when tag exists and has deerjikists' do
       before do
         Deerjikist.create!(platform: platform1, code: code1, tag: tag)
       end
 
-      it 'returns 200 with tag and deerjikists array' do
+      it 'returns 200 and deerjikists array' do
         do_request
-
         expect(response).to have_http_status(:ok)
 
-        expect(json).to be_a(Hash)
+        expect(json).to be_a(Array)
-
+        expect(json.size).to eq(1)
-        expect(json['tag']).to be_a(Hash)
+        expect(json[0]['platform']).to eq(platform1)
-        expect(json['tag']['id']).to eq(tag.id)
+        expect(json[0]['code']).to eq(code1)
-        expect(json['tag']['name']).to eq('deerjika')
-        expect(json['tag']['category']).to eq('deerjikist')
-        expect(json['tag']['has_deerjikists']).to eq(true)
-
-        expect(json['deerjikists']).to be_a(Array)
-        expect(json['deerjikists'].size).to eq(1)
-
-        expect(json['deerjikists'][0]['platform']).to eq(platform1)
-        expect(json['deerjikists'][0]['code']).to eq(code1)
-      end
-    end
-  end
-
-  describe 'PUT /tags/:id/deerjikists' do
-    subject(:do_request) do
-      put "/tags/#{tag_id}/deerjikists", params: payload, as: :json
-    end
-
-    let(:tag_id) { tag.id }
-    let(:payload) do
-      [
-        { platform: platform1, code: code1 },
-        { platform: platform2, code: code2 },
-      ]
-    end
-
-    context 'when not logged in' do
-      it 'returns 401' do
-        do_request
-
-        expect(response).to have_http_status(:unauthorized)
-      end
-    end
-
-    context 'when logged in but not member' do
-      before do
-        sign_in_as guest
-      end
-
-      it 'returns 403' do
-        do_request
-
-        expect(response).to have_http_status(:forbidden)
-      end
-    end
-
-    context 'when tag does not exist' do
-      let(:tag_id) { 9_999_999 }
-
-      before do
-        sign_in_as member
-      end
-
-      it 'returns 404' do
-        do_request
-
-        expect(response).to have_http_status(:not_found)
-      end
-    end
-
-    context 'when logged in as member' do
-      before do
-        sign_in_as member
-      end
-
-      context 'when tag has no deerjikists' do
-        it 'creates deerjikists and returns deerjikists array' do
-          expect {
-            do_request
-          }.to change { Deerjikist.where(tag: tag).count }.from(0).to(2)
-
-          expect(response).to have_http_status(:ok)
-
-          expect(json).to be_a(Array)
-          expect(json.map { |h| [h['platform'], h['code']] })
-            .to contain_exactly(
-              [platform1, code1],
-              [platform2, code2],
-            )
-
-          expect(Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] })
-            .to contain_exactly(
-              [platform1, code1],
-              [platform2, code2],
-            )
-        end
-      end
-
-      context 'when tag already has deerjikists' do
-        before do
-          Deerjikist.create!(platform: platform1, code: 'old-code-1', tag: tag)
-          Deerjikist.create!(platform: platform2, code: 'old-code-2', tag: tag)
-        end
-
-        it 'replaces deerjikists and returns deerjikists array' do
-          do_request
-
-          expect(response).to have_http_status(:ok)
-
-          expect(Deerjikist.where(tag: tag).map { |d| [d.platform, d.code] })
-            .to contain_exactly(
-              [platform1, code1],
-              [platform2, code2],
-            )
-
-          expect(Deerjikist.exists?(platform: platform1, code: 'old-code-1')).to eq(false)
-          expect(Deerjikist.exists?(platform: platform2, code: 'old-code-2')).to eq(false)
-
-          expect(json).to be_a(Array)
-          expect(json.map { |h| [h['platform'], h['code']] })
-            .to contain_exactly(
-              [platform1, code1],
-              [platform2, code2],
-            )
-        end
-      end
-
-      context 'when payload is empty array' do
-        let(:payload) { [] }
-
-        before do
-          Deerjikist.create!(platform: platform1, code: code1, tag: tag)
-          Deerjikist.create!(platform: platform2, code: code2, tag: tag)
-        end
-
-        it 'clears deerjikists and returns empty array' do
-          expect {
-            do_request
-          }.to change { Deerjikist.where(tag: tag).count }.from(2).to(0)
-
-          expect(response).to have_http_status(:ok)
-          expect(json).to eq([])
-        end
-      end
-
-      context 'when youtube code is handle' do
-        let(:channel_id) { 'UCabcdefghijklmnopqrstuv' }
-        let(:payload) do
-          [
-            { platform: 'youtube', code: '@deerjika' },
-          ]
-        end
-
-        before do
-          allow(Net::HTTP).to receive(:get).and_return(
-            %(<link rel="canonical" href="https://www.youtube.com/channel/#{channel_id}">),
-          )
-        end
-
-        it 'normalises youtube handle to channel id' do
-          expect {
-            do_request
-          }.to change { Deerjikist.where(tag: tag).count }.from(0).to(1)
-
-          expect(response).to have_http_status(:ok)
-
-          expect(Net::HTTP).to have_received(:get)
-
-          expect(Deerjikist.exists?(platform: 'youtube', code: channel_id, tag: tag))
-            .to eq(true)
-
-          expect(json).to be_a(Array)
-          expect(json.size).to eq(1)
-          expect(json[0]['platform']).to eq('youtube')
-          expect(json[0]['code']).to eq(channel_id)
-        end
       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/requests/wiki_assets_spec.rb

@@ -0,0 +1,191 @@
+require 'digest'
+require 'rails_helper'
+require 'stringio'
+
+
+RSpec.describe 'WikiAssets API', type: :request do
+  def dummy_upload(content = 'dummy-image', filename: 'dummy.png', content_type: 'image/png')
+    Rack::Test::UploadedFile.new(StringIO.new(content),
+                                 content_type,
+                                 original_filename: filename)
+  end
+
+  let(:member) { create(:user, :member, name: 'member user') }
+  let(:guest)  { create(:user, name: 'guest user') }
+
+  let!(:tag_name) { TagName.create!(name: 'spec_wiki_asset_page') }
+  let!(:page) do
+    WikiPage.create!(tag_name: tag_name, created_user: member, updated_user: member).tap do |p|
+      Wiki::Commit.content!(page: p, body: 'init', created_user: member, message: 'init')
+    end
+  end
+
+  describe 'GET /wiki/:wiki_page_id/assets' do
+    subject(:do_request) do
+      get "/wiki/#{wiki_page_id}/assets"
+    end
+
+    let(:wiki_page_id) { page.id }
+
+    let!(:asset) do
+      WikiAsset.new(wiki_page: page,
+                    no: 1,
+                    alt_text: 'spec alt',
+                    sha256: Digest::SHA256.digest('asset-1'),
+                    created_by_user: member).tap do |record|
+        record.file.attach(dummy_upload('asset-1'))
+        record.save!
+      end
+    end
+
+    context 'when wiki page exists' do
+      it 'returns assets for the page' do
+        do_request
+
+        expect(response).to have_http_status(:ok)
+        expect(json).to be_an(Array)
+        expect(json.size).to eq(1)
+
+        expect(json.first).to include(
+            'wiki_page_id' => page.id,
+            'no' => 1)
+      end
+
+      it 'does not include assets from other pages' do
+        other_tag_name = TagName.create!(name: 'spec_other_wiki_asset_page')
+        other_page = WikiPage.create!(tag_name: other_tag_name,
+                                      created_user: member,
+                                      updated_user: member)
+        Wiki::Commit.content!(page: other_page, body: 'other', created_user: member, message: 'other')
+
+        WikiAsset.new(wiki_page: other_page,
+                      no: 1,
+                      alt_text: 'other alt',
+                      sha256: Digest::SHA256.digest('asset-2'),
+                      created_by_user: member).tap do |record|
+          record.file.attach(dummy_upload('asset-2', filename: 'other.png'))
+          record.save!
+        end
+
+        do_request
+
+        expect(response).to have_http_status(:ok)
+        expect(json.size).to eq(1)
+        expect(json.first['wiki_page_id']).to eq(page.id)
+      end
+    end
+
+    context 'when wiki page does not exist' do
+      let(:wiki_page_id) { 999_999_999 }
+
+      it 'returns 404' do
+        do_request
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+  end
+
+  describe 'POST /wiki/:wiki_page_id/assets' do
+    subject(:do_request) do
+      post "/wiki/#{wiki_page_id}/assets", params: params
+    end
+
+    let(:wiki_page_id) { page.id }
+    let(:params) do
+      { file: dummy_upload(upload_content),
+        alt_text: 'uploaded alt' }
+    end
+    let(:upload_content) { 'uploaded-image-binary' }
+
+    context 'when not logged in' do
+      it 'returns 401' do
+        sign_out
+        do_request
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when logged in but not member' do
+      it 'returns 403' do
+        sign_in_as(guest)
+        do_request
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'when wiki page does not exist' do
+      let(:wiki_page_id) { 999_999_999 }
+
+      it 'returns 404' do
+        sign_in_as(member)
+        do_request
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+
+    context 'when file is blank' do
+      let(:params) { { alt_text: 'uploaded alt' } }
+
+      it 'returns 400' do
+        sign_in_as(member)
+        do_request
+        expect(response).to have_http_status(:bad_request)
+      end
+    end
+
+    context 'when success' do
+      before do
+        sign_in_as(member)
+      end
+
+      it 'creates asset, attaches file, increments next_asset_no, and returns json' do
+        expect { do_request }
+          .to change(WikiAsset, :count).by(1)
+
+        expect(response).to have_http_status(:ok)
+
+        asset = WikiAsset.order(:id).last
+        expect(asset.wiki_page_id).to eq(page.id)
+        expect(asset.no).to eq(1)
+        expect(asset.alt_text).to eq('uploaded alt')
+        expect(asset.sha256).to eq(Digest::SHA256.digest(upload_content))
+        expect(asset.created_by_user_id).to eq(member.id)
+        expect(asset.file).to be_attached
+        expect(asset.file.download).to eq(upload_content)
+
+        expect(page.reload.next_asset_no).to eq(2)
+
+        expect(json).to include(
+          'wiki_page_id' => page.id,
+          'no' => 1,
+          'url' => asset.url
+        )
+      end
+
+      it 'uses the next page-local number when assets already exist' do
+        existing = WikiAsset.new(wiki_page: page,
+                                 no: 1,
+                                 alt_text: 'existing alt',
+                                 sha256: Digest::SHA256.digest('existing'),
+                                 created_by_user: member)
+        existing.file.attach(dummy_upload('existing', filename: 'existing.png'))
+        existing.save!
+        page.update!(next_asset_no: 2)
+
+        do_request
+
+        expect(response).to have_http_status(:ok)
+
+        asset = WikiAsset.order(:id).last
+        expect(asset.no).to eq(2)
+        expect(page.reload.next_asset_no).to eq(3)
+
+        expect(json).to include(
+          'wiki_page_id' => page.id,
+          'no' => 2,
+          'url' => asset.url
+        )
+      end
+    end
+  end
+end

backend/spec/requests/wiki_spec.rb

@@ -113,6 +113,7 @@ RSpec.describe 'Wiki API', type: :request do
 
         page_id = json.fetch('id')
         expect(json.fetch('title')).to eq('TestPage')
+        expect(json.fetch('body')).to eq("a\nb\nc")
 
         created_page = WikiPage.find(page_id)
         version = created_page.wiki_versions.order(:version_no).last

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_at: nil)
   end
 
   def create_admin_user!
     User.create!(name: 'spec admin',
                  inheritance_code: SecureRandom.hex(16),
-                 role: 'admin')
+                 role: 'admin',
+                 banned_at: nil)
   end
 end

frontend/src/App.tsx

@@ -10,7 +10,6 @@ import RouteBlockerOverlay from '@/components/RouteBlockerOverlay'
 import TopNav from '@/components/TopNav'
 import { Toaster } from '@/components/ui/toaster'
 import { apiPost, isApiError } from '@/lib/api'
-import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
 import MaterialBasePage from '@/pages/materials/MaterialBasePage'
 import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
 import MaterialListPage from '@/pages/materials/MaterialListPage'
@@ -59,7 +58,6 @@ const RouteTransitionWrapper = ({ user, setUser }: {
 	  <Route path="/posts/changes" element={<PostHistoryPage/>}/>
 	  <Route path="/tags" element={<TagListPage/>}/>
 	  <Route path="/tags/:id" element={<TagDetailPage/>}/>
-	  <Route path="/tags/:id/deerjikists" element={<DeerjikistDetailPage/>}/>
 	  <Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
 	  <Route path="/tags/changes" element={<TagHistoryPage/>}/>
 	  <Route path="/theatres/:id" element={<TheatreDetailPage/>}/>

frontend/src/components/TagLink.tsx

@@ -45,9 +45,9 @@ export default (({ tag,
       <>
 	{(linkFlg && withWiki) && (
 	    <span className="mr-1">
-	      {(tag.materialId != null || tag.hasWiki || tag.hasDeerjikists)
+	      {(tag.materialId != null || tag.hasWiki)
 	       ? (
-		  tag.materialId == null && !(tag.hasDeerjikists)
+		  tag.materialId == null
 		  ? (
 		      <PrefetchLink
 			  to={`/wiki/${ encodeURIComponent (tag.name) }`}
@@ -55,19 +55,11 @@ export default (({ tag,
 			?
 		      </PrefetchLink>)
 		  : (
-		      tag.materialId != null
+		      <PrefetchLink
-		      ? (
+			  to={`/materials/${ tag.materialId }`}
-			  <PrefetchLink
+			  className={linkClass}>
-			      to={`/materials/${ tag.materialId }`}
+			?
-			      className={linkClass}>
+		      </PrefetchLink>))
-			    ?
-			  </PrefetchLink>)
-		      : (
-			  <PrefetchLink
-			      to={`/tags/${ tag.id }/deerjikists`}
-			      className={linkClass}>
-			    ?
-			  </PrefetchLink>)))
 	       : (
 		  ['character', 'material'].includes (tag.category)
 		  ? (
@@ -79,23 +71,13 @@ export default (({ tag,
 			!
 		      </PrefetchLink>)
 		  : (
-		      tag.category === 'deerjikist'
+		      <PrefetchLink
-		      ? (
+			  to={`/wiki/${ encodeURIComponent (tag.name) }`}
-			  <PrefetchLink
+			  className="animate-[wiki-blink_.25s_steps(2,end)_infinite]
-			      to={`/tags/${ tag.id }/deerjikists`}
+				     dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
-			      className="animate-[wiki-blink_.25s_steps(2,end)_infinite]
+			  title={`${ tag.name } Wiki が存在しません．`}>
-					 dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
+			!
-			      title={`${ tag.name } に関する情報が存在しません．`}>
+		      </PrefetchLink>))}
-			    !
-			  </PrefetchLink>)
-		      : (
-			  <PrefetchLink
-			      to={`/wiki/${ encodeURIComponent (tag.name) }`}
-			      className="animate-[wiki-blink_.25s_steps(2,end)_infinite]
-					 dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
-			      title={`${ tag.name } Wiki が存在しません．`}>
-			    !
-			  </PrefetchLink>)))}
 	    </span>)}
 	{nestLevel > 0 && (
 	    <span

frontend/src/components/WikiBody.tsx

@@ -1,42 +1,9 @@
-import { useQuery } from '@tanstack/react-query'
+import WikiMarkdown from '@/components/WikiMarkdown'
-import { useMemo } from 'react'
-import ReactMarkdown from 'react-markdown'
-import remarkGFM from 'remark-gfm'
-
-import PrefetchLink from '@/components/PrefetchLink'
-import { wikiKeys } from '@/lib/queryKeys'
-import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
-import { fetchWikiPages } from '@/lib/wiki'
 
 import type { FC } from 'react'
-import type { Components } from 'react-markdown'
 
 type Props = { title: string
 	       body?: string }
 
-const mdComponents = { a: (({ href, children }) => (
+export default (({ title, body }: Props) =>
-			      ['/', '.'].some (e => href?.startsWith (e))
+    <WikiMarkdown title={title} body={body ?? ''}/>) satisfies FC<Props>
-			      ? <PrefetchLink to={href!}>{children}</PrefetchLink>
-			      : (
-				  <a href={href}
-				     target="_blank"
-				     rel="noopener noreferrer">
-				    {children}
-				  </a>))) } as const satisfies Components
-
-
-export default (({ title, body }: Props) => {
-  const { data } = useQuery ({
-      enabled: Boolean (body),
-      queryKey: wikiKeys.index ({ }),
-      queryFn: () => fetchWikiPages ({ }) })
-  const pageNames = (data ?? []).map (page => page.title).sort ((a, b) => b.length - a.length)
-
-  const remarkPlugins = useMemo (
-      () => [() => remarkWikiAutoLink (pageNames), remarkGFM], [pageNames])
-
-  return (
-      <ReactMarkdown components={mdComponents} remarkPlugins={remarkPlugins}>
-	{body || `このページは存在しません。[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`}
-      </ReactMarkdown>)
-}) satisfies FC<Props>

frontend/src/components/WikiEditForm.tsx

@@ -0,0 +1,76 @@
+import { useEffect, useState } from 'react'
+import MdEditor from 'react-markdown-editor-lite'
+
+import WikiMarkdown from '@/components/WikiMarkdown'
+import Label from '@/components/common/Label'
+import { apiPost } from '@/lib/api'
+
+import type { FC } from 'react'
+
+import type { WikiAsset } from '@/types'
+
+type Props = {
+    title:    string
+    body:     string
+    onSubmit: (title: string, body: string) => void
+    id?:      number | null }
+
+
+export default (({ title: initTitle, body: initBody, onSubmit, id }: Props) => {
+  const forEdit = id != null
+
+  const [title, setTitle] = useState<string> (initTitle)
+  const [body, setBody] = useState<string> (initBody)
+
+  useEffect (() => {
+    setTitle (initTitle)
+    setBody (initBody)
+  }, [initTitle, initBody])
+
+  const handleImageUpload = async (file: File) => {
+    if (!(forEdit))
+      throw new Error ('画像は Wiki 作成前に追加することができません．')
+
+    const formData = new FormData
+    formData.append ('file', file)
+
+    const asset = await apiPost<WikiAsset> (
+	`/wiki/${ id }/assets`,
+	formData,
+	{ headers: { 'Content-Type': 'multipart/form-data' } })
+
+    return asset.url
+  }
+
+  return (
+      <>
+	{/* タイトル */}
+	{/* TODO: タグ補完 */}
+	<div>
+	  <Label>タイトル</Label>
+	  <input
+	      type="text"
+	      value={title}
+	      onChange={e => setTitle (e.target.value)}
+	      className="w-full border p-2 rounded"/>
+	</div>
+
+	{/* 本文 */}
+	<div>
+	  <Label>本文</Label>
+	  <MdEditor
+	      value={body}
+	      style={{ height: '500px' }}
+	      renderHTML={text => <WikiMarkdown body={text} preview/>}
+	      onChange={({ text }) => setBody (text)}
+	      onImageUpload={handleImageUpload}/>
+	</div>
+
+	{/* 送信 */}
+	<button
+	    onClick={() => onSubmit (title, body)}
+	    className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
+	  {forEdit ? '編輯' : '追加'}
+	</button>
+      </>)
+}) satisfies FC<Props>

frontend/src/components/WikiMarkdown.tsx

@@ -0,0 +1,77 @@
+import { useQuery } from '@tanstack/react-query'
+import { useMemo } from 'react'
+import ReactMarkdown from 'react-markdown'
+import remarkGFM from 'remark-gfm'
+
+import PrefetchLink from '@/components/PrefetchLink'
+import SectionTitle from '@/components/common/SectionTitle'
+import SubsectionTitle from '@/components/common/SubsectionTitle'
+import { wikiKeys } from '@/lib/queryKeys'
+import remarkWikiAutoLink from '@/lib/remark-wiki-autolink'
+import { fetchWikiPages } from '@/lib/wiki'
+
+import type { FC } from 'react'
+import type { Components } from 'react-markdown'
+
+type Props = {
+    title?:   string
+    body:     string
+    preview?: boolean }
+
+
+const makeComponents = (preview = false) => (
+    { h1: ({ children }) => <SectionTitle>{children}</SectionTitle>,
+      h2: ({ children }) => <SubsectionTitle>{children}</SubsectionTitle>,
+      ol: ({ children }) => <ol className="list-decimal pl-6">{children}</ol>,
+      ul: ({ children }) => <ul className="list-disc pl-6">{children}</ul>,
+      a:  ({ href, children }) => {
+	if (!(href))
+	  return <>{children}</>
+
+	if (!(preview) && ['/', '.'].some (e => href.startsWith (e)))
+	  return <PrefetchLink to={href}>{children}</PrefetchLink>
+
+	const ext = /^(?:https?:)?\/\//.test (href)
+
+	return (
+	    <a href={href}
+	       target={ext ? '_blank' : undefined}
+	       rel={ext ? 'noopener noreferrer' : undefined}>
+	      {children}
+	    </a>)
+      },
+      img: (({ src, alt }) => (
+	  <img src={src ?? ''}
+	       alt={alt ?? ''}
+	       className="max-w-[240px] max-h-[320px]"/>)),
+    } as const satisfies Components)
+
+
+export default (({ title, body, preview = false }: Props) => {
+  const { data } = useQuery ({
+      queryKey: wikiKeys.index ({ }),
+      queryFn: () => fetchWikiPages ({ }) })
+
+  const pageNames = useMemo (
+      () => (data ?? []).map ((page) => page.title).sort ((a, b) => b.length - a.length),
+      [data])
+
+  const remarkPlugins = useMemo (
+      () => [() => remarkWikiAutoLink (pageNames), remarkGFM],
+      [pageNames])
+
+  const components = useMemo (
+      () => makeComponents (preview),
+      [preview])
+
+  return (
+      <ReactMarkdown
+	  components={components}
+	  remarkPlugins={remarkPlugins}>
+        {body
+	 || (title
+	     ? ('このページは存在しません。'
+		+`[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`)
+	     : '')}
+      </ReactMarkdown>)
+}) satisfies FC<Props>

frontend/src/consts.ts

@@ -1,4 +1,4 @@
-import type { Category, Platform } from 'types'
+import type { Category } from 'types'
 
 export const LIGHT_COLOUR_SHADE = 800
 export const DARK_COLOUR_SHADE = 300
@@ -31,11 +31,6 @@ export const FETCH_POSTS_ORDER_FIELDS = [
     'updated_at',
     ] as const
 
-export const PLATFORMS = ['nico', 'youtube'] as const
-
-export const PLATFORM_NAMES: Record<Platform, string> =
-    { nico: 'ニコニコ', youtube: 'YouTube' } as const
-
 export const TAG_COLOUR = {
     deerjikist: 'rose',
     meme:       'purple',

frontend/src/lib/queryKeys.ts

@@ -9,12 +9,11 @@ export const postsKeys = {
 		  ['posts', 'changes', p] as const }
 
 export const tagsKeys = {
-    root:         ['tags'] as const,
+    root:     ['tags'] as const,
-    index:        (p: FetchTagsParams) => ['tags', 'index', p] as const,
+    index:    (p: FetchTagsParams) => ['tags', 'index', p] as const,
-    show:         (name: string) => ['tags', name] as const,
+    show:     (name: string) => ['tags', name] as const,
-    changes:      (p: { id?: string; page: number; limit: number }) =>
+    changes:  (p: { id?: string; page: number; limit: number }) =>
-		      ['tags', 'changes', p] as const,
+		  ['tags', 'changes', p] as const }
-    deerjikists:  (id: string) => ['tags', 'deerjikists', id] as const }
 
 export const wikiKeys = {
     root:   ['wiki'] as const,

frontend/src/lib/tags.ts

@@ -1,6 +1,6 @@
 import { apiGet } from '@/lib/api'
 
-import type { Deerjikist, FetchTagsParams, Tag, TagVersion } from '@/types'
+import type { FetchTagsParams, Tag, TagVersion } from '@/types'
 
 
 export const fetchTags = async (
@@ -56,9 +56,3 @@ export const fetchTagChanges = async (
     versions: TagVersion[]
     count:    number }> =>
 	await apiGet ('/tags/versions', { params: { ...(id && { id }), page, limit } })
-
-
-export const fetchDeerjikistsByTag = async (
-    id: string,
-): Promise<{ tag: Tag; deerjikists: Deerjikist[]}> =>
-    await apiGet (`/tags/${ id }/deerjikists`)

frontend/src/pages/deerjikists/DeerjikistDetailPage.tsx

@@ -1,155 +0,0 @@
-import { useQuery, useQueryClient } from '@tanstack/react-query'
-import { useEffect, useState } from 'react'
-import { useParams } from 'react-router-dom'
-
-import TagLink from '@/components/TagLink'
-import Label from '@/components/common/Label'
-import PageTitle from '@/components/common/PageTitle'
-import MainArea from '@/components/layout/MainArea'
-import { toast } from '@/components/ui/use-toast'
-import { PLATFORM_NAMES, PLATFORMS } from '@/consts'
-import { apiPut } from '@/lib/api'
-import { tagsKeys } from '@/lib/queryKeys'
-import { fetchDeerjikistsByTag } from '@/lib/tags'
-import { cn } from '@/lib/utils'
-
-import type { FC, FormEvent } from 'react'
-
-import type { Deerjikist, Platform } from '@/types'
-
-
-export default (() => {
-  const { id } = useParams ()
-  const tagId = String (id ?? '')
-  const tagKey = tagsKeys.deerjikists (tagId)
-
-  const { data: qData, isLoading: loading } =
-      useQuery ({ queryKey: tagKey, queryFn: () => fetchDeerjikistsByTag (tagId) })
-  const tag = qData?.tag
-  const deerjikists = qData?.deerjikists ?? []
-
-  const [data, setData] =
-      useState<(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> ([])
-  const [disabled, setDisabled] = useState (true)
-
-  const qc = useQueryClient ()
-
-  const handleSubmit = async (e: FormEvent) => {
-    e.preventDefault ()
-
-    try
-    {
-      setDisabled (true)
-
-      setData (await apiPut<Deerjikist[]> (`/tags/${ id }/deerjikists`, data))
-      qc.invalidateQueries ({ queryKey: tagsKeys.root })
-
-      toast ({ description: '更新しました．' })
-    }
-    catch
-    {
-      toast ({ title: '更新失敗', description: '入力内容を確認してください．' })
-    }
-    finally
-    {
-      setDisabled (false)
-    }
-  }
-
-  useEffect (() => {
-    if (!(tag))
-      {
-	setDisabled (true)
-	return
-      }
-
-    setData (deerjikists)
-    setDisabled (false)
-  }, [tag, deerjikists])
-
-  return (
-      <MainArea>
-	{(loading || !(tag)) ? 'Loading...' : (
-	    <div className="max-w-xl">
-	      <PageTitle>
-		<TagLink tag={tag} withWiki={false} withCount={false}/>
-	      </PageTitle>
-
-	      <form onSubmit={handleSubmit} className="my-4 space-y-2">
-		{data.map ((datum, i) => (
-		    <fieldset key={i} className="min-w-0 rounded-lg border border-gray-300
-						 dark:border-gray-700 p-4">
-		      <legend className="px-2 text-sm font-semibold text-gray-700
-					 dark:text-gray-300">
-			<button
-			    type="button"
-			    disabled={disabled}
-			    onClick={() => setData (prev => [...prev.slice (0, i),
-							     ...prev.slice (i + 1)])}>
-			  #{i + 1}
-			</button>
-		      </legend>
-
-		      {/* プラットフォーム */}
-		      <div>
-			<Label>プラットフォーム</Label>
-			<select
-			    className="w-full border p-2 rounded"
-			    disabled={disabled}
-			    value={datum.platform ?? ''}
-			    onChange={e => setData (prev => {
-			      const rtn = [...prev]
-			      rtn[i] = { ...rtn[i],
-					 platform: (e.target.value || null) as Platform | null }
-			      return rtn
-			    })}>
-			  <option value="">&nbsp;</option>
-			  {PLATFORMS.map (p => (
-			      <option key={p} value={p}>
-				{PLATFORM_NAMES[p]}
-			      </option>))}
-			</select>
-		      </div>
-
-		      {/* コード */}
-		      <div>
-			<Label>コード</Label>
-			<input
-			    type="text"
-			    disabled={disabled}
-			    className="w-full border p-2 rounded"
-			    value={datum.code}
-			    onChange={e => setData (prev => {
-			      const rtn = [...prev]
-			      rtn[i] = { ...rtn[i], code: e.target.value }
-			      return rtn
-			    })}/>
-		      </div>
-		    </fieldset>
-		))}
-
-		<div className="py-3">
-		  <button
-		      type="button"
-		      disabled={disabled}
-		      onClick={() => setData (prev => [...prev, { platform: null, code: '' }])}>
-		    +
-		  </button>
-		</div>
-
-		<div className="py-3">
-		  <button
-		      type="submit"
-		      disabled={disabled}
-		      className={cn ('px-4 py-2 rounded',
-				     (disabled
-				      ? 'text-gray-300 bg-gray-500'
-				      : 'text-white bg-blue-500'))}>
-		    更新
-		  </button>
-		</div>
-	      </form>
-	    </div>
-	)}
-      </MainArea>)
-}) satisfies FC

frontend/src/pages/wiki/WikiEditPage.tsx

@@ -1,10 +1,9 @@
 import { useQueryClient } from '@tanstack/react-query'
-import MarkdownIt from 'markdown-it'
 import { useEffect, useState } from 'react'
 import { Helmet } from 'react-helmet-async'
-import MdEditor from 'react-markdown-editor-lite'
 import { useParams, useNavigate } from 'react-router-dom'
 
+import WikiEditForm from '@/components/WikiEditForm'
 import MainArea from '@/components/layout/MainArea'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
@@ -18,8 +17,6 @@ import type { FC } from 'react'
 
 import type { User, WikiPage } from '@/types'
 
-const mdParser = new MarkdownIt
-
 type Props = { user: User | null }
 
 
@@ -37,7 +34,7 @@ export default (({ user }: Props) => {
   const [loading, setLoading] = useState (true)
   const [title, setTitle] = useState ('')
 
-  const handleSubmit = async () => {
+  const handleSubmit = async (title: string, body: string) => {
     const formData = new FormData ()
     formData.append ('title', title)
     formData.append ('body', body)
@@ -46,8 +43,6 @@ export default (({ user }: Props) => {
     {
       await apiPut (`/wiki/${ id }`, formData,
 		    { headers: { 'Content-Type': 'multipart/form-data' } })
-      qc.setQueryData (wikiKeys.show (title, { }),
-		       (prev: WikiPage) => ({ ...prev, title, body }))
       qc.invalidateQueries ({ queryKey: wikiKeys.root })
       toast ({ title: '投稿成功!' })
       navigate (`/wiki/${ title }`)
@@ -77,32 +72,11 @@ export default (({ user }: Props) => {
 	  <h1 className="text-2xl font-bold mb-2">Wiki ページを編輯</h1>
 
 	  {loading ? 'Loading...' : (
-	      <>
+	      <WikiEditForm
-		{/* タイトル */}
+		  title={title}
-		{/* TODO: タグ補完 */}
+		  body={body}
-		<div>
+		  onSubmit={handleSubmit}
-		  <label className="block font-semibold mb-1">タイトル</label>
+		  id={Number (id)}/>)}
-		  <input type="text"
-			 value={title}
-			 onChange={e => setTitle (e.target.value)}
-			 className="w-full border p-2 rounded"/>
-		</div>
-
-		{/* 本文 */}
-		<div>
-		  <label className="block font-semibold mb-1">本文</label>
-		  <MdEditor value={body}
-			    style={{ height: '500px' }}
-			    renderHTML={text => mdParser.render (text)}
-			    onChange={({ text }) => setBody (text)}/>
-		</div>
-
-		{/* 送信 */}
-		<button onClick={handleSubmit}
-			className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
-		  編輯
-		</button>
-	      </>)}
 	</div>
       </MainArea>)
 }) satisfies FC<Props>

frontend/src/pages/wiki/WikiNewPage.tsx

@@ -1,21 +1,19 @@
-import MarkdownIt from 'markdown-it'
+import { useQueryClient } from '@tanstack/react-query'
-import { useState } from 'react'
 import { Helmet } from 'react-helmet-async'
-import MdEditor from 'react-markdown-editor-lite'
 import { useLocation, useNavigate } from 'react-router-dom'
 
+import WikiEditForm from '@/components/WikiEditForm'
 import MainArea from '@/components/layout/MainArea'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
 import { apiPost } from '@/lib/api'
+import { wikiKeys } from '@/lib/queryKeys'
 import Forbidden from '@/pages/Forbidden'
 
 import 'react-markdown-editor-lite/lib/index.css'
 
 import type { User, WikiPage } from '@/types'
 
-const mdParser = new MarkdownIt
-
 type Props = { user: User | null }
 
 
@@ -26,13 +24,12 @@ export default ({ user }: Props) => {
   const location = useLocation ()
   const navigate = useNavigate ()
 
+  const qc = useQueryClient ()
+
   const query = new URLSearchParams (location.search)
   const titleQuery = query.get ('title') ?? ''
 
-  const [title, setTitle] = useState (titleQuery)
+  const handleSubmit = async (title: string, body: string) => {
-  const [body, setBody] = useState ('')
-
-  const handleSubmit = async () => {
     const formData = new FormData
     formData.append ('title', title)
     formData.append ('body', body)
@@ -40,7 +37,8 @@ export default ({ user }: Props) => {
     try
     {
       const data = await apiPost<WikiPage> ('/wiki', formData,
-				  { headers: { 'Content-Type': 'multipart/form-data' } })
+	  { headers: { 'Content-Type': 'multipart/form-data' } })
+      qc.invalidateQueries ({ queryKey: wikiKeys.root })
       toast ({ title: '投稿成功!' })
       navigate (`/wiki/${ data.title }`)
     }
@@ -58,30 +56,10 @@ export default ({ user }: Props) => {
 	<div className="max-w-xl mx-auto p-4 space-y-4">
 	  <h1 className="text-2xl font-bold mb-2">新規 Wiki ページ</h1>
 
-	  {/* タイトル */}
+	  <WikiEditForm
-	  {/* TODO: タグ補完 */}
+	      title={titleQuery}
-	  <div>
+	      body=""
-	    <label className="block font-semibold mb-1">タイトル</label>
+	      onSubmit={handleSubmit}/>
-	    <input type="text"
-		   value={title}
-		   onChange={e => setTitle (e.target.value)}
-		   className="w-full border p-2 rounded"/>
-	  </div>
-
-	  {/* 本文 */}
-	  <div>
-	    <label className="block font-semibold mb-1">本文</label>
-	    <MdEditor value={body}
-		      style={{ height: '500px' }}
-		      renderHTML={text => mdParser.render (text)}
-		      onChange={({ text }) => setBody (text)}/>
-	  </div>
-
-	  {/* 送信 */}
-	  <button onClick={handleSubmit}
-		  className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
-	    追加
-	  </button>
 	</div>
       </MainArea>)
 }

frontend/src/types.ts

@@ -1,6 +1,5 @@
 import { CATEGORIES,
 	 FETCH_POSTS_ORDER_FIELDS,
-	 PLATFORMS,
 	 USER_ROLES,
 	 ViewFlagBehavior } from '@/consts'
 
@@ -8,8 +7,6 @@ import type { ReactNode } from 'react'
 
 export type Category = typeof CATEGORIES[number]
 
-export type Deerjikist = { platform: Platform; code: string }
-
 export type FetchPostsOrder = `${ FetchPostsOrderField }:${ 'asc' | 'desc' }`
 
 export type FetchPostsOrderField = typeof FETCH_POSTS_ORDER_FIELDS[number]
@@ -117,8 +114,6 @@ export type NiconicoViewerHandle = {
     showComments: () => void
     hideComments: () => void }
 
-export type Platform = typeof PLATFORMS[number]
-
 export type Post = {
     id:                     number
     url:                    string
@@ -183,8 +178,7 @@ export type Tag = {
     createdAt:      string
     updatedAt:      string
     hasWiki:        boolean
-    materialId:     number | null
+    materialId:     number
-    hasDeerjikists: boolean
     children?:      Tag[]
     matchedAlias?:  string | null }
 
@@ -223,6 +217,11 @@ export type User = {
 
 export type ViewFlagBehavior = typeof ViewFlagBehavior[keyof typeof ViewFlagBehavior]
 
+export type WikiAsset = {
+    wikiPageId: number
+    no:         number
+    url:        string }
+
 export type WikiPage = {
     id:             number
     title:          string