Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| fd479cd93a | |||
| 6ee621e565 | |||
| 43122a49c3 | |||
| e90c4d612e | |||
| 39101ca422 |
@@ -1,43 +0,0 @@
|
|||||||
---
|
|
||||||
name: 'Codex task'
|
|
||||||
about: 'Codex に実装させるための課題'
|
|
||||||
title: ''
|
|
||||||
labels:
|
|
||||||
- codex-ready
|
|
||||||
---
|
|
||||||
|
|
||||||
## 背景
|
|
||||||
|
|
||||||
なぜ必要か。
|
|
||||||
|
|
||||||
## 対象範囲
|
|
||||||
|
|
||||||
- backend:
|
|
||||||
- frontend:
|
|
||||||
- docs:
|
|
||||||
- migration:
|
|
||||||
|
|
||||||
## やること
|
|
||||||
|
|
||||||
- [ ]
|
|
||||||
|
|
||||||
## 受け入れ条件
|
|
||||||
|
|
||||||
- [ ]
|
|
||||||
|
|
||||||
## 実行すべき確認
|
|
||||||
|
|
||||||
- [ ] `cd backend && bundle exec rspec`
|
|
||||||
- [ ] `cd frontend && npm run build`
|
|
||||||
- [ ] `cd frontend && npm run lint`
|
|
||||||
|
|
||||||
## 禁止事項
|
|
||||||
|
|
||||||
- unrelated refactor はしない
|
|
||||||
- 既存 API response shape を壊さない
|
|
||||||
- 認証・認可・BAN を弱めない
|
|
||||||
|
|
||||||
## Codex への指示
|
|
||||||
|
|
||||||
この issue を読んで実装してください。
|
|
||||||
不明点があれば、実装前に調査結果と選択肢を提示してください。
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
---
|
|
||||||
name: 'Codex task'
|
|
||||||
about: 'Codex に実装させるための課題'
|
|
||||||
title: ''
|
|
||||||
labels:
|
|
||||||
- codex-ready
|
|
||||||
---
|
|
||||||
|
|
||||||
## 背景
|
|
||||||
|
|
||||||
なぜ必要か。
|
|
||||||
|
|
||||||
## 対象範囲
|
|
||||||
|
|
||||||
- backend:
|
|
||||||
- frontend:
|
|
||||||
- docs:
|
|
||||||
- migration:
|
|
||||||
|
|
||||||
## やること
|
|
||||||
|
|
||||||
- [ ]
|
|
||||||
|
|
||||||
## 受け入れ条件
|
|
||||||
|
|
||||||
- [ ]
|
|
||||||
|
|
||||||
## 実行すべき確認
|
|
||||||
|
|
||||||
- [ ] `cd backend && bundle exec rspec`
|
|
||||||
- [ ] `cd frontend && npm run build`
|
|
||||||
- [ ] `cd frontend && npm run lint`
|
|
||||||
|
|
||||||
## 禁止事項
|
|
||||||
|
|
||||||
- unrelated refactor はしない
|
|
||||||
- 既存 API response shape を壊さない
|
|
||||||
- 認証・認可・BAN を弱めない
|
|
||||||
|
|
||||||
## Codex への指示
|
|
||||||
|
|
||||||
この issue を読んで実装してください。
|
|
||||||
不明点があれば、実装前に調査結果と選択肢を提示してください。
|
|
||||||
@@ -1,143 +0,0 @@
|
|||||||
# AGENTS.md
|
|
||||||
|
|
||||||
## Project overview
|
|
||||||
|
|
||||||
BTRC Hub / タグ広場 is a split Rails API and React frontend repository.
|
|
||||||
|
|
||||||
- Backend: Rails API under `backend/`.
|
|
||||||
- Frontend: React + TypeScript + Vite under `frontend/`.
|
|
||||||
- Docs: lightweight command notes under `docs/`.
|
|
||||||
- There is no README or Makefile at the repository root as of this inspection.
|
|
||||||
|
|
||||||
## Stack
|
|
||||||
|
|
||||||
- Backend: Ruby `3.2.2` from `backend/.ruby-version`, Rails `~> 8.0.2`.
|
|
||||||
- Backend dependencies include `mysql2`, `sqlite3`, `rspec-rails`, `factory_bot_rails`, `rack-cors`, `jwt`, `discard`, `gollum`, `whenever`, `aws-sdk-s3`, `brakeman`, and `rubocop-rails-omakase`.
|
|
||||||
- Frontend: React `^19.1.0`, TypeScript `~5.8.3`, Vite `^6.3.5`.
|
|
||||||
- Frontend data/UI dependencies include Axios, TanStack Query, Tailwind CSS, Framer Motion, Radix UI components, lucide-react, MDX/Markdown tooling, and Zustand.
|
|
||||||
|
|
||||||
## Main directories
|
|
||||||
|
|
||||||
- `backend/app/controllers`: Rails API controllers.
|
|
||||||
- `backend/app/models`: Active Record models.
|
|
||||||
- `backend/app/representations`: API response representation classes.
|
|
||||||
- `backend/app/services`: domain services such as version recording, wiki commit, YouTube sync, and similarity calculation.
|
|
||||||
- `backend/config/routes.rb`: API routes.
|
|
||||||
- `backend/db/migrate`: migrations.
|
|
||||||
- `backend/db/schema.rb`: current schema snapshot.
|
|
||||||
- `backend/lib/tasks`: custom Rake tasks.
|
|
||||||
- `backend/spec`: RSpec tests.
|
|
||||||
- `backend/test`: Rails minitest files that still exist in the tree.
|
|
||||||
- `frontend/src/App.tsx`: frontend route definitions and initial user setup.
|
|
||||||
- `frontend/src/pages`: page-level React components.
|
|
||||||
- `frontend/src/components`: shared and feature components.
|
|
||||||
- `frontend/src/lib`: API client helpers, query keys, prefetchers, and domain helpers.
|
|
||||||
- `frontend/src/stores`: Zustand stores.
|
|
||||||
- `docs/commands.md`: command notes.
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
Only list commands that are backed by files inspected in this repository.
|
|
||||||
|
|
||||||
### Backend
|
|
||||||
|
|
||||||
The following binstubs exist under `backend/bin`:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd backend
|
|
||||||
bin/setup
|
|
||||||
bin/dev
|
|
||||||
bin/rails
|
|
||||||
bin/rake
|
|
||||||
bin/rubocop
|
|
||||||
bin/brakeman
|
|
||||||
bin/kamal
|
|
||||||
bin/thrust
|
|
||||||
```
|
|
||||||
|
|
||||||
Common Rails/Rake usage through existing binstubs:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd backend
|
|
||||||
bin/rails db:prepare
|
|
||||||
bin/rails db:migrate
|
|
||||||
bin/rails routes
|
|
||||||
bin/rails server
|
|
||||||
bin/rake
|
|
||||||
bin/rubocop
|
|
||||||
bin/brakeman
|
|
||||||
```
|
|
||||||
|
|
||||||
RSpec is present in `Gemfile` and `.rspec` exists:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd backend
|
|
||||||
bundle exec rspec
|
|
||||||
```
|
|
||||||
|
|
||||||
### Frontend
|
|
||||||
|
|
||||||
The following npm scripts exist in `frontend/package.json`:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd frontend
|
|
||||||
npm run dev
|
|
||||||
npm run build
|
|
||||||
npm run lint
|
|
||||||
npm run preview
|
|
||||||
```
|
|
||||||
|
|
||||||
`npm run build` runs `tsc -b && vite build`, then `postbuild` runs `node scripts/generate-sitemap.js`.
|
|
||||||
|
|
||||||
Do not write or report `npm test` as a repository command unless a `test` script is added to `frontend/package.json`.
|
|
||||||
|
|
||||||
## Coding style
|
|
||||||
|
|
||||||
- Prefer precise, minimal changes.
|
|
||||||
- Do not flatter or over-explain.
|
|
||||||
- Explain risks directly.
|
|
||||||
- Prefer single quotes for strings unless interpolation or escaping makes double quotes better.
|
|
||||||
- Ruby: never put a space before method-call parentheses.
|
|
||||||
- Ruby: do not use `%w` or `%i`.
|
|
||||||
- TypeScript and Python: use GNU-style spacing before parentheses where syntactically valid.
|
|
||||||
- Do not add production dependencies without explicit approval.
|
|
||||||
|
|
||||||
## Backend rules
|
|
||||||
|
|
||||||
- Inspect existing routes, controllers, models, services, and specs before editing backend behavior.
|
|
||||||
- For API behavior changes, add or update request specs under `backend/spec/requests`.
|
|
||||||
- Prefer RSpec for new backend tests; existing minitest files under `backend/test` do not make minitest the default for new coverage.
|
|
||||||
- Do not weaken authentication, BAN user checks, or IP BAN checks.
|
|
||||||
- Preserve the `X-Transfer-Code` user identification flow unless the task explicitly changes authentication.
|
|
||||||
- Be careful with version tables, `version_no`, optimistic concurrency, wiki revisions, and restore/diff behavior.
|
|
||||||
- Be careful with tag names, tag normalization, implications, similarities, and discard behavior.
|
|
||||||
- Keep migration files and `backend/db/schema.rb` consistent when changing schema.
|
|
||||||
|
|
||||||
## Frontend rules
|
|
||||||
|
|
||||||
- Use `frontend/src/lib/api.ts` for API calls so headers and camelCase conversion stay consistent.
|
|
||||||
- Add or reuse TanStack Query keys through `frontend/src/lib/queryKeys.ts`; avoid ad hoc query key arrays.
|
|
||||||
- Encode URL path-segment values with `encodeURIComponent`.
|
|
||||||
- React hooks must be called unconditionally.
|
|
||||||
- Keep page-level code under `frontend/src/pages` and shared UI/feature code under `frontend/src/components` unless existing patterns point elsewhere.
|
|
||||||
- Match existing Tailwind, component, and import alias conventions.
|
|
||||||
|
|
||||||
## Codex workflow
|
|
||||||
|
|
||||||
- First inspect existing patterns; do not invent new architecture when a local convention exists.
|
|
||||||
- Keep changes scoped to the requested issue.
|
|
||||||
- Do not scan or summarize dependency/generated/runtime directories such as `node_modules`, `dist`, `tmp`, `log`, and `storage` unless explicitly needed.
|
|
||||||
- Before touching wiki, tag, versioning, BAN, IP BAN, or authentication behavior, inspect the related request specs and service objects.
|
|
||||||
- If frontend code changes, run the existing frontend verification commands that apply: `npm run build` and `npm run lint`.
|
|
||||||
- If backend code changes, run the relevant RSpec command; for broad backend changes, run `bundle exec rspec`.
|
|
||||||
- If a verification command cannot be run or fails, report the exact command and failure.
|
|
||||||
|
|
||||||
## Completion criteria
|
|
||||||
|
|
||||||
A task is complete only when:
|
|
||||||
|
|
||||||
- implementation is complete,
|
|
||||||
- relevant verification commands pass, or failures are clearly explained,
|
|
||||||
- unrelated files are not changed,
|
|
||||||
- migrations and schema are consistent when schema changes are made,
|
|
||||||
- user-facing behavior is documented when needed.
|
|
||||||
@@ -1,147 +0,0 @@
|
|||||||
# backend/AGENTS.md
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
These rules apply to work under `backend/`.
|
|
||||||
|
|
||||||
This is a Rails API app using Active Record, RSpec, request specs, service objects, representation classes, and version tables for post/tag/wiki history.
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
Use commands backed by files and dependencies in this directory:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
bin/setup
|
|
||||||
bin/dev
|
|
||||||
bin/rails
|
|
||||||
bin/rake
|
|
||||||
bin/rubocop
|
|
||||||
bin/brakeman
|
|
||||||
bundle exec rspec
|
|
||||||
```
|
|
||||||
|
|
||||||
Common checks:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
bundle exec rspec
|
|
||||||
bin/rubocop
|
|
||||||
bin/brakeman
|
|
||||||
```
|
|
||||||
|
|
||||||
Common Rails commands:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
bin/rails db:prepare
|
|
||||||
bin/rails db:migrate
|
|
||||||
bin/rails routes
|
|
||||||
bin/rails server
|
|
||||||
```
|
|
||||||
|
|
||||||
After backend behavior changes, run the relevant RSpec files. For broad backend changes, run:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
bundle exec rspec
|
|
||||||
```
|
|
||||||
|
|
||||||
If a command cannot be run or fails, report the exact command and failure.
|
|
||||||
|
|
||||||
## Rails structure
|
|
||||||
|
|
||||||
- `app/controllers`: API controllers.
|
|
||||||
- `app/models`: Active Record models and concerns.
|
|
||||||
- `app/representations`: JSON response shaping.
|
|
||||||
- `app/services`: domain services such as version recorders, wiki commit, YouTube sync, and similarity calculation.
|
|
||||||
- `config/routes.rb`: public API routes.
|
|
||||||
- `db/migrate`: migrations.
|
|
||||||
- `db/schema.rb`: schema snapshot.
|
|
||||||
- `lib/tasks`: custom Rake tasks.
|
|
||||||
- `spec`: RSpec tests.
|
|
||||||
|
|
||||||
Before changing behavior, inspect the matching route, controller, model, service, representation, and spec.
|
|
||||||
|
|
||||||
## Ruby style
|
|
||||||
|
|
||||||
- Prefer precise, minimal changes.
|
|
||||||
- Use single quotes unless interpolation or escaping makes double quotes better.
|
|
||||||
- Do not put a space before Ruby method-call parentheses.
|
|
||||||
- Do not use `%w` or `%i` in new Ruby code.
|
|
||||||
- Keep comments short and useful; avoid narrating obvious code.
|
|
||||||
- Do not add production dependencies without approval.
|
|
||||||
|
|
||||||
## Authentication and authorization
|
|
||||||
|
|
||||||
- Authentication is handled through the `X-Transfer-Code` header in `ApplicationController#authenticate_user`.
|
|
||||||
- `current_user` is set by looking up `User.inheritance_code`.
|
|
||||||
- Do not bypass or weaken the `X-Transfer-Code` flow unless the task explicitly changes authentication.
|
|
||||||
- Unauthenticated write actions should return `:unauthorized` consistently with existing controllers.
|
|
||||||
- Role checks use `User` enum roles: `guest`, `member`, and `admin`.
|
|
||||||
- Use `current_user.gte_member?` for member-or-admin write permissions where existing controllers do so.
|
|
||||||
- Use `current_user.admin?` only for admin-only paths, such as tag child relationship changes.
|
|
||||||
- Do not replace role checks with looser presence checks.
|
|
||||||
|
|
||||||
## BAN and IP BAN
|
|
||||||
|
|
||||||
- `ApplicationController` runs these before actions in order:
|
|
||||||
- `reject_banned_ip_address!`
|
|
||||||
- `authenticate_user`
|
|
||||||
- `reject_banned_user!`
|
|
||||||
- User and IP bans use `banned_at`, not a boolean `banned` column.
|
|
||||||
- `User#banned?` and `IpAddress#banned?` check `banned_at.present?`.
|
|
||||||
- Do not weaken BAN or IP BAN behavior.
|
|
||||||
- If changing request authentication or controller before actions, add or update request specs covering banned users and banned IP addresses.
|
|
||||||
|
|
||||||
## RSpec
|
|
||||||
|
|
||||||
- Prefer RSpec for new backend tests.
|
|
||||||
- Put API behavior coverage under `spec/requests`.
|
|
||||||
- Put model behavior under `spec/models`.
|
|
||||||
- Put service behavior under `spec/services`.
|
|
||||||
- Put Rake task coverage under `spec/tasks`.
|
|
||||||
- `spec/rails_helper.rb` loads `spec/support/**/*.rb`.
|
|
||||||
- Request specs include `AuthHelper` and `JsonHelper`.
|
|
||||||
- `AuthHelper#sign_in_as(user)` stubs `ApplicationController#current_user`; use it when matching existing request spec style.
|
|
||||||
- Add or update request specs for API behavior changes, especially status codes, permissions, response shape, and version conflict behavior.
|
|
||||||
|
|
||||||
## Migrations
|
|
||||||
|
|
||||||
- Keep migrations and `db/schema.rb` consistent.
|
|
||||||
- Use reversible migrations where practical; otherwise define explicit `up` and `down`.
|
|
||||||
- For data backfills inside migrations, follow the existing pattern of defining migration-local `ActiveRecord::Base` classes with `self.table_name`.
|
|
||||||
- Preserve existing indexes, foreign keys, check constraints, and null constraints.
|
|
||||||
- Be careful with MySQL-specific options already present in migrations, such as `after:`.
|
|
||||||
- Do not edit old migrations just to change current behavior unless explicitly requested; add a new migration.
|
|
||||||
|
|
||||||
## Version tables
|
|
||||||
|
|
||||||
- Versioned records include posts, tags, nico tags, and wiki pages.
|
|
||||||
- Current records have `version_no`; version tables have positive `version_no` with unique indexes scoped to the parent record.
|
|
||||||
- Version event types are `create`, `update`, `discard`, and `restore`.
|
|
||||||
- Version rows are readonly through the `VersionRecord` concern.
|
|
||||||
- Use the existing recorder services instead of manually inserting version rows in application code:
|
|
||||||
- `PostVersionRecorder`
|
|
||||||
- `TagVersionRecorder`
|
|
||||||
- `NicoTagVersionRecorder`
|
|
||||||
- `WikiVersionRecorder`
|
|
||||||
- `TagVersioning`
|
|
||||||
- `VersionRecorder` locks the current record, validates sequence consistency, skips unchanged update snapshots, creates the next version row, and updates the record `version_no`.
|
|
||||||
- Do not update versioned records without considering whether a version snapshot must be created.
|
|
||||||
- For optimistic concurrency paths, preserve `base_version_no`, `force`, and `merge` semantics and cover conflicts in request specs.
|
|
||||||
|
|
||||||
## Domain cautions
|
|
||||||
|
|
||||||
- Posts have tag snapshots, parent post implications, original-created ranges, viewed state, and version conflict behavior.
|
|
||||||
- Tags have canonical names, aliases through `TagName`, categories, parent implications, discard behavior, and version snapshots.
|
|
||||||
- Nico tags have separate relation/version behavior; do not treat them like normal editable tags without checking existing code.
|
|
||||||
- Wiki pages involve page content, revisions/history, version rows, title/tag-name behavior, and diff/restore paths.
|
|
||||||
- Materials, theatres, and comments have user and permission checks; inspect the controller before changing them.
|
|
||||||
|
|
||||||
## API responses
|
|
||||||
|
|
||||||
- Use representation classes under `app/representations` when existing endpoints do.
|
|
||||||
- Keep response keys consistent with existing JSON contracts; frontend code expects camelCase conversion client-side, while Rails params and JSON keys are generally snake_case.
|
|
||||||
- Preserve existing HTTP status conventions: `:unauthorized` for no user, `:forbidden` for insufficient role or banned user, `:not_found` for missing records, and `:unprocessable_entity` for validation failures.
|
|
||||||
|
|
||||||
## Files to avoid in routine work
|
|
||||||
|
|
||||||
- Do not inspect or edit `tmp/`, `log/`, `storage/`, `vendor/`, or dependency directories unless explicitly needed.
|
|
||||||
- Do not modify generated schema or migration output without the corresponding migration when schema changes are made.
|
|
||||||
@@ -1,16 +1,14 @@
|
|||||||
class ApplicationController < ActionController::API
|
class ApplicationController < ActionController::API
|
||||||
before_action :reject_banned_ip_address!
|
|
||||||
before_action :authenticate_user
|
before_action :authenticate_user
|
||||||
before_action :reject_banned_user!
|
|
||||||
|
|
||||||
def current_user = @current_user
|
def current_user
|
||||||
|
@current_user
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def authenticate_user
|
def authenticate_user
|
||||||
code = request.headers['X-Transfer-Code'] || request.headers['HTTP_X_TRANSFER_CODE']
|
code = request.headers['X-Transfer-Code'] || request.headers['HTTP_X_TRANSFER_CODE']
|
||||||
return if code.blank?
|
|
||||||
|
|
||||||
@current_user = User.find_by(inheritance_code: code)
|
@current_user = User.find_by(inheritance_code: code)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -24,17 +22,4 @@ class ApplicationController < ActionController::API
|
|||||||
s.in?(['', '1', 'true', 'on', 'yes'])
|
s.in?(['', '1', 'true', 'on', 'yes'])
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ class NicoTagsController < ApplicationController
|
|||||||
return head :bad_request unless tag.nico?
|
return head :bad_request unless tag.nico?
|
||||||
|
|
||||||
linked_tag_names = params[:tags].to_s.split
|
linked_tag_names = params[:tags].to_s.split
|
||||||
linked_tags = Tag.normalise_tags!(linked_tag_names, with_tagme: false,
|
linked_tags = Tag.normalise_tags(linked_tag_names, with_tagme: false,
|
||||||
with_no_deerjikist: false)
|
with_no_deerjikist: false)
|
||||||
return head :bad_request if linked_tags.any? { |t| t.nico? }
|
return head :bad_request if linked_tags.any? { |t| t.nico? }
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ class PostsController < ApplicationController
|
|||||||
filtered_posts
|
filtered_posts
|
||||||
.joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
|
.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"))
|
.reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
|
||||||
.preload(tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
.preload(tags: [:materials, { tag_name: :wiki_page }])
|
||||||
.with_attached_thumbnail
|
.with_attached_thumbnail
|
||||||
|
|
||||||
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
||||||
@@ -95,7 +95,7 @@ class PostsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def random
|
def random
|
||||||
post = filtered_posts.preload(tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
post = filtered_posts.preload(tags: [:materials, { tag_name: :wiki_page }])
|
||||||
.order('RAND()')
|
.order('RAND()')
|
||||||
.first
|
.first
|
||||||
return head :not_found unless post
|
return head :not_found unless post
|
||||||
@@ -104,12 +104,12 @@ class PostsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
post = Post.includes(tags: [:deerjikists, :materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
|
post = Post.includes(tags: [:materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
|
||||||
return head :not_found unless post
|
return head :not_found unless post
|
||||||
|
|
||||||
render json: PostRepr.base(post, current_user)
|
render json: PostRepr.base(post, current_user)
|
||||||
.merge(tags: build_tag_tree_for(post.tags),
|
.merge(tags: build_tag_tree_for(post.tags),
|
||||||
related: PostRepr.many(post.related(limit: 20)))
|
related: post.related(limit: 20))
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@@ -123,36 +123,28 @@ class PostsController < ApplicationController
|
|||||||
tag_names = params[:tags].to_s.split
|
tag_names = params[:tags].to_s.split
|
||||||
original_created_from = params[:original_created_from]
|
original_created_from = params[:original_created_from]
|
||||||
original_created_before = params[:original_created_before]
|
original_created_before = params[:original_created_before]
|
||||||
parent_post_ids = parse_parent_post_ids
|
|
||||||
|
|
||||||
post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
|
post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
|
||||||
original_created_from:, original_created_before:)
|
original_created_from:, original_created_before:)
|
||||||
post.thumbnail.attach(thumbnail) if thumbnail.present?
|
post.thumbnail.attach(thumbnail)
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
ApplicationRecord.transaction do
|
||||||
post.save!
|
post.save!
|
||||||
|
tags = Tag.normalise_tags(tag_names)
|
||||||
tags = Tag.normalise_tags!(tag_names)
|
|
||||||
TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
|
TagVersioning.record_tag_snapshots!(tags, created_by_user: current_user)
|
||||||
|
|
||||||
tags = Tag.expand_parent_tags(tags)
|
tags = Tag.expand_parent_tags(tags)
|
||||||
sync_post_tags!(post, tags)
|
sync_post_tags!(post, tags)
|
||||||
|
|
||||||
sync_parent_posts!(post, parent_post_ids)
|
|
||||||
|
|
||||||
post.resized_thumbnail!
|
post.resized_thumbnail!
|
||||||
|
|
||||||
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
|
PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
post.reload
|
post.reload
|
||||||
render json: PostRepr.base(post), status: :created
|
render json: PostRepr.base(post), status: :created
|
||||||
|
rescue ActiveRecord::RecordInvalid
|
||||||
|
render json: { errors: post.errors.full_messages }, status: :unprocessable_entity
|
||||||
rescue Tag::NicoTagNormalisationError
|
rescue Tag::NicoTagNormalisationError
|
||||||
head :bad_request
|
head :bad_request
|
||||||
rescue ArgumentError => e
|
|
||||||
render json: { errors: [e.message] }, status: :unprocessable_entity
|
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
|
||||||
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def viewed
|
def viewed
|
||||||
@@ -173,76 +165,35 @@ class PostsController < ApplicationController
|
|||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return head :forbidden unless current_user.gte_member?
|
return head :forbidden unless current_user.gte_member?
|
||||||
|
|
||||||
force = bool?(:force)
|
|
||||||
merge = bool?(:merge)
|
|
||||||
return head :bad_request if force && merge
|
|
||||||
|
|
||||||
base_version_no = parse_base_version_no
|
|
||||||
return head :bad_request if !(force) && !(base_version_no)
|
|
||||||
|
|
||||||
title = params[:title].presence
|
title = params[:title].presence
|
||||||
tag_names = params[:tags].to_s.split
|
tag_names = params[:tags].to_s.split
|
||||||
original_created_from = params[:original_created_from]
|
original_created_from = params[:original_created_from]
|
||||||
original_created_before = params[:original_created_before]
|
original_created_before = params[:original_created_before]
|
||||||
parent_post_ids = parse_parent_post_ids
|
|
||||||
|
|
||||||
post = nil
|
post = Post.find(params[:id].to_i)
|
||||||
conflict_json = nil
|
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
ApplicationRecord.transaction do
|
||||||
post = Post.lock.find(params[:id].to_i)
|
PostVersionRecorder.ensure_snapshot!(post, created_by_user: current_user)
|
||||||
|
|
||||||
base_version = nil
|
post.update!(title:, original_created_from:, original_created_before:)
|
||||||
base_snapshot = nil
|
|
||||||
current_snapshot = nil
|
|
||||||
unless force
|
|
||||||
base_version = post.post_versions.find_by!(version_no: base_version_no)
|
|
||||||
|
|
||||||
base_snapshot = post_snapshot_from_version(base_version)
|
normalised_tags = Tag.normalise_tags(tag_names, with_tagme: false)
|
||||||
current_snapshot = post_snapshot_from_record(post)
|
TagVersioning.record_tag_snapshots!(normalised_tags, created_by_user: current_user)
|
||||||
|
|
||||||
|
tags = post.tags.nico.to_a + normalised_tags
|
||||||
|
tags = Tag.expand_parent_tags(tags)
|
||||||
|
sync_post_tags!(post, tags)
|
||||||
|
PostVersionRecorder.record!(post:, event_type: :update, created_by_user: current_user)
|
||||||
end
|
end
|
||||||
incoming_snapshot = post_incoming_snapshot(title:,
|
|
||||||
original_created_from:,
|
|
||||||
original_created_before:,
|
|
||||||
tag_names:,
|
|
||||||
parent_post_ids:)
|
|
||||||
|
|
||||||
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] }
|
|
||||||
|
|
||||||
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
|
post.reload
|
||||||
json = PostRepr.base(post, current_user)
|
json = post.as_json
|
||||||
json['tags'] = build_tag_tree_for(post.tags)
|
json['tags'] = build_tag_tree_for(post.tags)
|
||||||
render json:, status: :ok
|
render json:, status: :ok
|
||||||
|
rescue ActiveRecord::RecordInvalid
|
||||||
|
render json: post.errors, status: :unprocessable_entity
|
||||||
rescue Tag::NicoTagNormalisationError
|
rescue Tag::NicoTagNormalisationError
|
||||||
head :bad_request
|
head :bad_request
|
||||||
rescue ArgumentError => e
|
|
||||||
render json: { errors: [e.message] }, status: :unprocessable_entity
|
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
|
||||||
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def changes
|
def changes
|
||||||
@@ -260,7 +211,7 @@ class PostsController < ApplicationController
|
|||||||
pts = pts.where(post_id: id) if id.present?
|
pts = pts.where(post_id: id) if id.present?
|
||||||
pts = pts.where(tag_id:) if tag_id.present?
|
pts = pts.where(tag_id:) if tag_id.present?
|
||||||
pts = pts.includes(:post, :created_user, :deleted_user,
|
pts = pts.includes(:post, :created_user, :deleted_user,
|
||||||
tag: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
tag: [:materials, { tag_name: :wiki_page }])
|
||||||
|
|
||||||
events = []
|
events = []
|
||||||
pts.each do |pt|
|
pts.each do |pt|
|
||||||
@@ -402,242 +353,4 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
root_ids.filter_map { |id| build_node.call(id, []) }
|
root_ids.filter_map { |id| build_node.call(id, []) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def parse_parent_post_ids
|
|
||||||
raise ArgumentError, 'parent_post_ids は必須です.' unless params.key?(:parent_post_ids)
|
|
||||||
|
|
||||||
params[:parent_post_ids].to_s.split.map { |token|
|
|
||||||
id = Integer(token, exception: false)
|
|
||||||
raise ArgumentError, "親投稿 Id. が不正です: #{ token }" if id.nil? || id <= 0
|
|
||||||
|
|
||||||
id
|
|
||||||
}.uniq
|
|
||||||
end
|
|
||||||
|
|
||||||
def sync_parent_posts! post, parent_post_ids
|
|
||||||
if parent_post_ids.include?(post.id)
|
|
||||||
post.errors.add(:base, '自分自身を親投稿にはできません.')
|
|
||||||
raise ActiveRecord::RecordInvalid, post
|
|
||||||
end
|
|
||||||
|
|
||||||
existing_ids = Post.where(id: parent_post_ids).pluck(:id)
|
|
||||||
missing_ids = parent_post_ids - existing_ids
|
|
||||||
|
|
||||||
if missing_ids.present?
|
|
||||||
post.errors.add(:base, "存在しない親投稿 ID があります: #{ missing_ids.join(' ') }")
|
|
||||||
raise ActiveRecord::RecordInvalid, post
|
|
||||||
end
|
|
||||||
|
|
||||||
current_ids = post.parent_posts.pluck(:id)
|
|
||||||
|
|
||||||
ids_to_add = parent_post_ids - current_ids
|
|
||||||
ids_to_remove = current_ids - parent_post_ids
|
|
||||||
|
|
||||||
PostImplication.where(post_id: post.id, parent_post_id: ids_to_remove).delete_all
|
|
||||||
|
|
||||||
ids_to_add.each do |parent_post_id|
|
|
||||||
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)
|
|
||||||
if version_no&.positive?
|
|
||||||
version_no
|
|
||||||
else
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
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
|
end
|
||||||
|
|||||||
@@ -1,7 +1,3 @@
|
|||||||
require 'net/http'
|
|
||||||
require 'uri'
|
|
||||||
|
|
||||||
|
|
||||||
class TagsController < ApplicationController
|
class TagsController < ApplicationController
|
||||||
def index
|
def index
|
||||||
post_id = params[:post]
|
post_id = params[:post]
|
||||||
@@ -186,8 +182,7 @@ class TagsController < ApplicationController
|
|||||||
.find_by(id: params[:id])
|
.find_by(id: params[:id])
|
||||||
return head :not_found unless tag
|
return head :not_found unless tag
|
||||||
|
|
||||||
render json: { tag: TagRepr.base(tag),
|
render json: DeerjikistRepr.many(tag.deerjikists)
|
||||||
deerjikists: DeerjikistRepr.many(tag.deerjikists) }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def deerjikists_by_name
|
def deerjikists_by_name
|
||||||
@@ -199,31 +194,7 @@ class TagsController < ApplicationController
|
|||||||
.find_by(tag_names: { name: })
|
.find_by(tag_names: { name: })
|
||||||
return head :not_found unless tag
|
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
|
end
|
||||||
|
|
||||||
def materials_by_name
|
def materials_by_name
|
||||||
@@ -403,7 +374,7 @@ class TagsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def update_parent_tags! tag, parent_names
|
def update_parent_tags! tag, parent_names
|
||||||
parent_tags = Tag.normalise_tags!(parent_names, with_tagme: false,
|
parent_tags = Tag.normalise_tags(parent_names, with_tagme: false,
|
||||||
with_no_deerjikist: false,
|
with_no_deerjikist: false,
|
||||||
deny_nico: true)
|
deny_nico: true)
|
||||||
|
|
||||||
@@ -420,21 +391,4 @@ class TagsController < ApplicationController
|
|||||||
TagImplication.create!(tag:, parent_tag:)
|
TagImplication.create!(tag:, parent_tag:)
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
class UsersController < ApplicationController
|
class UsersController < ApplicationController
|
||||||
def create
|
def create
|
||||||
|
return head :unprocessable_entity if request.remote_ip.blank?
|
||||||
|
|
||||||
user = nil
|
user = nil
|
||||||
|
|
||||||
User.transaction do
|
User.transaction do
|
||||||
user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
|
user = User.create!(inheritance_code: SecureRandom.uuid, role: :guest)
|
||||||
attach_ip_address!(user)
|
attach_ip_address!(user)
|
||||||
@@ -14,7 +17,8 @@ class UsersController < ApplicationController
|
|||||||
def verify
|
def verify
|
||||||
user = User.find_by(inheritance_code: params[:code])
|
user = User.find_by(inheritance_code: params[:code])
|
||||||
return render json: { valid: false } unless user
|
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)
|
attach_ip_address!(user)
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
class IpAddress < ApplicationRecord
|
class IpAddress < ApplicationRecord
|
||||||
validates :ip_address, presence: true, length: { maximum: 16 }
|
validates :ip_address, presence: true, length: { maximum: 16 }
|
||||||
|
validates :banned, inclusion: { in: [true, false] }
|
||||||
|
|
||||||
has_many :user_ips, dependent: :destroy
|
has_many :user_ips, dependent: :destroy
|
||||||
has_many :users, through: :user_ips
|
has_many :users, through: :user_ips
|
||||||
|
|
||||||
def banned? = banned_at.present?
|
|
||||||
def ban! = banned? || update!(banned_at: Time.current)
|
|
||||||
def unban! = update!(banned_at: nil)
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
class Post < ApplicationRecord
|
class Post < ApplicationRecord
|
||||||
require 'mini_magick'
|
require 'mini_magick'
|
||||||
|
|
||||||
|
belongs_to :parent, class_name: 'Post', optional: true, foreign_key: 'parent_id'
|
||||||
belongs_to :uploaded_user, class_name: 'User', optional: true
|
belongs_to :uploaded_user, class_name: 'User', optional: true
|
||||||
|
|
||||||
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
has_many :post_tags, dependent: :destroy, inverse_of: :post
|
||||||
@@ -12,24 +13,8 @@ class Post < ApplicationRecord
|
|||||||
has_many :post_similarities, dependent: :delete_all
|
has_many :post_similarities, dependent: :delete_all
|
||||||
has_many :post_versions
|
has_many :post_versions
|
||||||
|
|
||||||
has_many :parent_post_implications,
|
|
||||||
class_name: 'PostImplication',
|
|
||||||
foreign_key: :post_id,
|
|
||||||
dependent: :destroy,
|
|
||||||
inverse_of: :post
|
|
||||||
has_many :parents, through: :parent_post_implications, source: :parent_post
|
|
||||||
|
|
||||||
has_many :child_post_implications,
|
|
||||||
class_name: 'PostImplication',
|
|
||||||
foreign_key: :parent_post_id,
|
|
||||||
dependent: :destroy,
|
|
||||||
inverse_of: :parent_post
|
|
||||||
has_many :children, through: :child_post_implications, source: :post
|
|
||||||
|
|
||||||
has_one_attached :thumbnail
|
has_one_attached :thumbnail
|
||||||
|
|
||||||
attribute :version_no, :integer, default: 1
|
|
||||||
|
|
||||||
before_validation :normalise_url
|
before_validation :normalise_url
|
||||||
|
|
||||||
validates :url, presence: true, uniqueness: true
|
validates :url, presence: true, uniqueness: true
|
||||||
@@ -37,29 +22,17 @@ class Post < ApplicationRecord
|
|||||||
validate :validate_original_created_range
|
validate :validate_original_created_range
|
||||||
validate :url_must_be_http_url
|
validate :url_must_be_http_url
|
||||||
|
|
||||||
def parent_posts = parents
|
|
||||||
|
|
||||||
def child_posts = children
|
|
||||||
|
|
||||||
def sibling_posts
|
|
||||||
parent_post_ids = parent_posts.order(:id).pluck(:id)
|
|
||||||
|
|
||||||
parent_post_ids.to_h { [_1, PostImplication.where(parent_post: _1).map(&:post)] }
|
|
||||||
end
|
|
||||||
|
|
||||||
def as_json options = { }
|
def as_json options = { }
|
||||||
super(options).merge(thumbnail: thumbnail.attached? ?
|
super(options).merge({ thumbnail: thumbnail.attached? ?
|
||||||
Rails.application.routes.url_helpers.rails_blob_url(
|
Rails.application.routes.url_helpers.rails_blob_url(
|
||||||
thumbnail, only_path: false) :
|
thumbnail, only_path: false) :
|
||||||
nil)
|
nil })
|
||||||
rescue
|
rescue
|
||||||
super(options).merge(thumbnail: nil)
|
super(options).merge(thumbnail: nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
def snapshot_tag_names = tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
def snapshot_tag_names = tags.joins(:tag_name).order('tag_names.name').pluck('tag_names.name')
|
||||||
|
|
||||||
def snapshot_parent_post_ids = parents.order(:id).pluck(:id)
|
|
||||||
|
|
||||||
def related limit: nil
|
def related limit: nil
|
||||||
ids = post_similarities.order(cos: :desc)
|
ids = post_similarities.order(cos: :desc)
|
||||||
ids = ids.limit(limit) if limit
|
ids = ids.limit(limit) if limit
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
class PostImplication < ApplicationRecord
|
|
||||||
self.primary_key = :post_id, :parent_post_id
|
|
||||||
|
|
||||||
belongs_to :post, inverse_of: :parent_post_implications
|
|
||||||
belongs_to :parent_post, class_name: 'Post', inverse_of: :child_post_implications
|
|
||||||
|
|
||||||
validates :post_id, presence: true, uniqueness: { scope: :parent_post_id }
|
|
||||||
validates :parent_post_id, presence: true
|
|
||||||
|
|
||||||
validate :parent_post_mustnt_be_itself
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def parent_post_mustnt_be_itself
|
|
||||||
if parent_post_id == post_id
|
|
||||||
errors.add :parent_post_id, '親投稿に同じ投稿を設定することはできません.'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -40,8 +40,6 @@ class Tag < ApplicationRecord
|
|||||||
belongs_to :tag_name
|
belongs_to :tag_name
|
||||||
delegate :wiki_page, to: :tag_name
|
delegate :wiki_page, to: :tag_name
|
||||||
|
|
||||||
attribute :version_no, :integer, default: 1
|
|
||||||
|
|
||||||
delegate :name, to: :tag_name, allow_nil: true
|
delegate :name, to: :tag_name, allow_nil: true
|
||||||
validates :tag_name, presence: true
|
validates :tag_name, presence: true
|
||||||
|
|
||||||
@@ -81,8 +79,6 @@ class Tag < ApplicationRecord
|
|||||||
|
|
||||||
def material_id = materials.first&.id
|
def material_id = materials.first&.id
|
||||||
|
|
||||||
def has_deerjikists = deerjikists.present?
|
|
||||||
|
|
||||||
def self.tagme = find_or_create_by_tag_name!('タグ希望', category: :meta)
|
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.bot = find_or_create_by_tag_name!('bot操作', category: :meta)
|
||||||
def self.no_deerjikist = find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
def self.no_deerjikist = find_or_create_by_tag_name!('ニジラー情報不詳', category: :meta)
|
||||||
@@ -90,7 +86,7 @@ class Tag < ApplicationRecord
|
|||||||
def self.niconico = find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
def self.niconico = find_or_create_by_tag_name!('ニコニコ', category: :meta)
|
||||||
def self.youtube = find_or_create_by_tag_name!('YouTube', category: :meta)
|
def self.youtube = find_or_create_by_tag_name!('YouTube', category: :meta)
|
||||||
|
|
||||||
def self.normalise_tags! tag_names, with_tagme: true,
|
def self.normalise_tags tag_names, with_tagme: true,
|
||||||
with_no_deerjikist: true,
|
with_no_deerjikist: true,
|
||||||
deny_nico: true
|
deny_nico: true
|
||||||
if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
|
if deny_nico && tag_names.any? { |n| n.downcase.start_with?('nico:') }
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ class User < ApplicationRecord
|
|||||||
validates :name, length: { maximum: 255 }
|
validates :name, length: { maximum: 255 }
|
||||||
validates :inheritance_code, presence: true, length: { maximum: 64 }
|
validates :inheritance_code, presence: true, length: { maximum: 64 }
|
||||||
validates :role, presence: true, inclusion: { in: roles.keys }
|
validates :role, presence: true, inclusion: { in: roles.keys }
|
||||||
|
validates :banned, inclusion: { in: [true, false] }
|
||||||
|
|
||||||
has_many :created_posts,
|
has_many :created_posts,
|
||||||
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
||||||
@@ -18,10 +19,5 @@ class User < ApplicationRecord
|
|||||||
class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
|
class_name: 'WikiPage', foreign_key: :updated_user_id, dependent: :nullify
|
||||||
|
|
||||||
def viewed?(post) = user_post_views.exists?(post_id: post.id)
|
def viewed?(post) = user_post_views.exists?(post_id: post.id)
|
||||||
|
|
||||||
def gte_member? = member? || admin?
|
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
|
end
|
||||||
|
|||||||
@@ -15,8 +15,6 @@ class WikiPage < ApplicationRecord
|
|||||||
|
|
||||||
has_many :wiki_versions
|
has_many :wiki_versions
|
||||||
|
|
||||||
attribute :version_no, :integer, default: 1
|
|
||||||
|
|
||||||
belongs_to :tag_name
|
belongs_to :tag_name
|
||||||
validates :tag_name, presence: true
|
validates :tag_name, presence: true
|
||||||
validates :body, presence: true
|
validates :body, presence: true
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
|
|
||||||
|
|
||||||
module PostRepr
|
module PostRepr
|
||||||
BASE = { include: { tags: TagRepr::BASE, uploaded_user: UserRepr::BASE },
|
BASE = { include: { tags: TagRepr::BASE, uploaded_user: UserRepr::BASE } }.freeze
|
||||||
methods: [:parent_posts, :child_posts, :sibling_posts] }.freeze
|
|
||||||
|
|
||||||
module_function
|
module_function
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
module TagRepr
|
module TagRepr
|
||||||
BASE = { only: [:id, :category, :post_count, :created_at, :updated_at],
|
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
|
module_function
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ class PostVersionRecorder < VersionRecorder
|
|||||||
url: @record.url,
|
url: @record.url,
|
||||||
thumbnail_base: @record.thumbnail_base,
|
thumbnail_base: @record.thumbnail_base,
|
||||||
tags: @record.snapshot_tag_names.join(' '),
|
tags: @record.snapshot_tag_names.join(' '),
|
||||||
parent_post_ids: @record.snapshot_parent_post_ids.join(' '),
|
parent_id: @record.parent_id,
|
||||||
original_created_from: @record.original_created_from,
|
original_created_from: @record.original_created_from,
|
||||||
original_created_before: @record.original_created_before }
|
original_created_before: @record.original_created_before }
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -16,20 +16,19 @@ class VersionRecorder
|
|||||||
@record = record_class.unscoped.lock.find(@record.id)
|
@record = record_class.unscoped.lock.find(@record.id)
|
||||||
latest = latest_version
|
latest = latest_version
|
||||||
|
|
||||||
validate_version_sequence!(latest)
|
if !(latest) && @event_type != 'create'
|
||||||
|
raise "#{ version_class.name } first event must be create"
|
||||||
|
end
|
||||||
|
|
||||||
|
if @event_type == 'create' && latest
|
||||||
|
raise "#{ version_class.name } create event already exists"
|
||||||
|
end
|
||||||
|
|
||||||
attrs = snapshot_attributes
|
attrs = snapshot_attributes
|
||||||
|
|
||||||
if @event_type == 'update' && latest && same_snapshot?(latest, attrs)
|
return latest if @event_type == 'update' && latest && same_snapshot?(latest, attrs)
|
||||||
return latest
|
|
||||||
end
|
|
||||||
|
|
||||||
version = version_class.create!(
|
version_class.create!(base_attributes(latest).merge(record_key => @record).merge(attrs))
|
||||||
base_attributes(latest).merge(record_key => @record).merge(attrs))
|
|
||||||
|
|
||||||
update_record_version_no!(version.version_no)
|
|
||||||
|
|
||||||
version
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -46,31 +45,7 @@ class VersionRecorder
|
|||||||
created_by_user: @created_by_user }
|
created_by_user: @created_by_user }
|
||||||
end
|
end
|
||||||
|
|
||||||
def update_record_version_no! version_no
|
def same_snapshot?(version, attrs) = attrs.all? { |k, v| version.public_send(k) == v }
|
||||||
@record.update_columns(version_no:)
|
|
||||||
@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!
|
def validate_event_type!
|
||||||
return if EVENT_TYPES.include?(@event_type)
|
return if EVENT_TYPES.include?(@event_type)
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ Rails.application.routes.draw do
|
|||||||
patch '', action: :update
|
patch '', action: :update
|
||||||
|
|
||||||
get :deerjikists
|
get :deerjikists
|
||||||
put :deerjikists, action: :update_deerjikists
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,24 +0,0 @@
|
|||||||
class CreatePostImplications < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
create_table :post_implications, primary_key: [:post_id, :parent_post_id] do |t|
|
|
||||||
t.references :post, null: false, foreign_key: true, index: false
|
|
||||||
t.references :parent_post, null: false, foreign_key: { to_table: :posts }
|
|
||||||
t.timestamps
|
|
||||||
|
|
||||||
t.check_constraint 'post_id <> parent_post_id',
|
|
||||||
name: 'chk_post_implications_no_self'
|
|
||||||
end
|
|
||||||
|
|
||||||
add_column :post_versions, :parent_post_ids, :text, null: false, after: :parent_id
|
|
||||||
remove_column :post_versions, :parent_id, :bigint
|
|
||||||
remove_reference :posts, :parent, foreign_key: { to_table: :posts }
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
add_reference :posts, :parent, foreign_key: { to_table: :posts }, after: :thumbnail_base
|
|
||||||
add_column :post_versions, :parent_id, :bigint, after: :post_id
|
|
||||||
remove_column :post_versions, :parent_post_ids, :text
|
|
||||||
|
|
||||||
drop_table :post_implications
|
|
||||||
end
|
|
||||||
end
|
|
||||||
-16
@@ -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
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
class AddVersionNoToPosts < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
add_column :posts, :version_no, :integer
|
|
||||||
|
|
||||||
execute <<~SQL
|
|
||||||
UPDATE
|
|
||||||
posts
|
|
||||||
SET
|
|
||||||
version_no = (
|
|
||||||
SELECT
|
|
||||||
MAX(version_no)
|
|
||||||
FROM
|
|
||||||
post_versions
|
|
||||||
WHERE
|
|
||||||
post_id = posts.id)
|
|
||||||
SQL
|
|
||||||
|
|
||||||
change_column_null :posts, :version_no, false
|
|
||||||
|
|
||||||
add_check_constraint :posts, 'version_no > 0', name: 'chk_posts_version_no_positive'
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
remove_check_constraint :posts, name: 'chk_posts_version_no_positive'
|
|
||||||
remove_column :posts, :version_no
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
class AddVersionNoToTags < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
add_column :tags, :version_no, :integer
|
|
||||||
|
|
||||||
execute <<~SQL
|
|
||||||
UPDATE
|
|
||||||
tags
|
|
||||||
SET
|
|
||||||
version_no = (
|
|
||||||
CASE category
|
|
||||||
WHEN 'nico' THEN
|
|
||||||
(SELECT
|
|
||||||
MAX(version_no)
|
|
||||||
FROM
|
|
||||||
nico_tag_versions
|
|
||||||
WHERE
|
|
||||||
tag_id = tags.id)
|
|
||||||
ELSE
|
|
||||||
(SELECT
|
|
||||||
MAX(version_no)
|
|
||||||
FROM
|
|
||||||
tag_versions
|
|
||||||
WHERE
|
|
||||||
tag_id = tags.id)
|
|
||||||
END)
|
|
||||||
SQL
|
|
||||||
|
|
||||||
change_column_null :tags, :version_no, false
|
|
||||||
|
|
||||||
add_check_constraint :tags, 'version_no > 0', name: 'chk_tags_version_no_positive'
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
remove_check_constraint :tags, name: 'chk_tags_version_no_positive'
|
|
||||||
remove_column :tags, :version_no
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
class AddVersionNoToWikiPages < ActiveRecord::Migration[8.0]
|
|
||||||
def up
|
|
||||||
add_column :wiki_pages, :version_no, :integer
|
|
||||||
|
|
||||||
execute <<~SQL
|
|
||||||
UPDATE
|
|
||||||
wiki_pages
|
|
||||||
SET
|
|
||||||
version_no = (
|
|
||||||
SELECT
|
|
||||||
MAX(version_no)
|
|
||||||
FROM
|
|
||||||
wiki_versions
|
|
||||||
WHERE
|
|
||||||
wiki_page_id = wiki_pages.id)
|
|
||||||
SQL
|
|
||||||
|
|
||||||
change_column_null :wiki_pages, :version_no, false
|
|
||||||
|
|
||||||
add_check_constraint :wiki_pages, 'version_no > 0', name: 'chk_wiki_pages_version_no_positive'
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
remove_check_constraint :wiki_pages, name: 'chk_wiki_pages_version_no_positive'
|
|
||||||
remove_column :wiki_pages, :version_no
|
|
||||||
end
|
|
||||||
end
|
|
||||||
Generated
+9
-23
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
ActiveRecord::Schema[8.0].define(version: 2026_04_26_120600) do
|
||||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.string "record_type", null: false
|
t.string "record_type", null: false
|
||||||
@@ -50,10 +50,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
|
|
||||||
create_table "ip_addresses", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "ip_addresses", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.binary "ip_address", limit: 16, null: false
|
t.binary "ip_address", limit: 16, null: false
|
||||||
t.datetime "banned_at"
|
t.boolean "banned", default: false, null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.index ["banned_at"], name: "index_ip_addresses_on_banned_at"
|
|
||||||
t.index ["ip_address"], name: "index_ip_addresses_on_ip_address", unique: true
|
t.index ["ip_address"], name: "index_ip_addresses_on_ip_address", unique: true
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -120,15 +119,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive"
|
t.check_constraint "`version_no` > 0", name: "nico_tag_versions_version_no_positive"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "post_implications", primary_key: ["post_id", "parent_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "post_id", null: false
|
|
||||||
t.bigint "parent_post_id", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
t.index ["parent_post_id"], name: "index_post_implications_on_parent_post_id"
|
|
||||||
t.check_constraint "`post_id` <> `parent_post_id`", name: "chk_post_implications_no_self"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "post_similarities", primary_key: ["post_id", "target_post_id"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "post_id", null: false
|
t.bigint "post_id", null: false
|
||||||
t.bigint "target_post_id", null: false
|
t.bigint "target_post_id", null: false
|
||||||
@@ -165,12 +155,13 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
t.string "url", limit: 768, null: false
|
t.string "url", limit: 768, null: false
|
||||||
t.string "thumbnail_base", limit: 2000
|
t.string "thumbnail_base", limit: 2000
|
||||||
t.text "tags", null: false
|
t.text "tags", null: false
|
||||||
t.text "parent_post_ids", null: false
|
t.bigint "parent_id"
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
|
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
|
||||||
|
t.index ["parent_id"], name: "index_post_versions_on_parent_id"
|
||||||
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
|
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
|
||||||
t.index ["post_id"], name: "index_post_versions_on_post_id"
|
t.index ["post_id"], name: "index_post_versions_on_post_id"
|
||||||
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
|
t.check_constraint "`event_type` in (_utf8mb4'create',_utf8mb4'update',_utf8mb4'discard',_utf8mb4'restore')", name: "post_versions_event_type_valid"
|
||||||
@@ -181,15 +172,15 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
t.string "title"
|
t.string "title"
|
||||||
t.string "url", limit: 768, null: false
|
t.string "url", limit: 768, null: false
|
||||||
t.string "thumbnail_base", limit: 2000
|
t.string "thumbnail_base", limit: 2000
|
||||||
|
t.bigint "parent_id"
|
||||||
t.bigint "uploaded_user_id"
|
t.bigint "uploaded_user_id"
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "original_created_from"
|
t.datetime "original_created_from"
|
||||||
t.datetime "original_created_before"
|
t.datetime "original_created_before"
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.integer "version_no", null: false
|
t.index ["parent_id"], name: "index_posts_on_parent_id"
|
||||||
t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
|
t.index ["uploaded_user_id"], name: "index_posts_on_uploaded_user_id"
|
||||||
t.index ["url"], name: "index_posts_on_url", unique: true
|
t.index ["url"], name: "index_posts_on_url", unique: true
|
||||||
t.check_constraint "`version_no` > 0", name: "chk_posts_version_no_positive"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "settings", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "settings", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -264,10 +255,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.integer "post_count", default: 0, null: false
|
t.integer "post_count", default: 0, null: false
|
||||||
t.datetime "discarded_at"
|
t.datetime "discarded_at"
|
||||||
t.integer "version_no", null: false
|
|
||||||
t.index ["discarded_at"], name: "index_tags_on_discarded_at"
|
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.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
|
end
|
||||||
|
|
||||||
create_table "theatre_comments", primary_key: ["theatre_id", "no"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "theatre_comments", primary_key: ["theatre_id", "no"], charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -337,10 +326,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
t.string "name"
|
t.string "name"
|
||||||
t.string "inheritance_code", limit: 64, null: false
|
t.string "inheritance_code", limit: 64, null: false
|
||||||
t.string "role", null: false
|
t.string "role", null: false
|
||||||
t.datetime "banned_at"
|
t.boolean "banned", default: false, null: false
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.index ["banned_at"], name: "index_users_on_banned_at"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -373,12 +361,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.datetime "discarded_at"
|
t.datetime "discarded_at"
|
||||||
t.integer "next_asset_no", default: 1, null: false
|
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 ["created_user_id"], name: "index_wiki_pages_on_created_user_id"
|
||||||
t.index ["discarded_at"], name: "index_wiki_pages_on_discarded_at"
|
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 ["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.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
|
end
|
||||||
|
|
||||||
create_table "wiki_revision_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_revision_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
@@ -442,8 +428,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
add_foreign_key "nico_tag_relations", "tags", column: "nico_tag_id"
|
add_foreign_key "nico_tag_relations", "tags", column: "nico_tag_id"
|
||||||
add_foreign_key "nico_tag_versions", "tags"
|
add_foreign_key "nico_tag_versions", "tags"
|
||||||
add_foreign_key "nico_tag_versions", "users", column: "created_by_user_id"
|
add_foreign_key "nico_tag_versions", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "post_implications", "posts"
|
|
||||||
add_foreign_key "post_implications", "posts", column: "parent_post_id"
|
|
||||||
add_foreign_key "post_similarities", "posts"
|
add_foreign_key "post_similarities", "posts"
|
||||||
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
add_foreign_key "post_similarities", "posts", column: "target_post_id"
|
||||||
add_foreign_key "post_tags", "posts"
|
add_foreign_key "post_tags", "posts"
|
||||||
@@ -451,7 +435,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_05_07_213300) do
|
|||||||
add_foreign_key "post_tags", "users", column: "created_user_id"
|
add_foreign_key "post_tags", "users", column: "created_user_id"
|
||||||
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
add_foreign_key "post_tags", "users", column: "deleted_user_id"
|
||||||
add_foreign_key "post_versions", "posts"
|
add_foreign_key "post_versions", "posts"
|
||||||
|
add_foreign_key "post_versions", "posts", column: "parent_id"
|
||||||
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
add_foreign_key "post_versions", "users", column: "created_by_user_id"
|
||||||
|
add_foreign_key "posts", "posts", column: "parent_id"
|
||||||
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
add_foreign_key "posts", "users", column: "uploaded_user_id"
|
||||||
add_foreign_key "settings", "users"
|
add_foreign_key "settings", "users"
|
||||||
add_foreign_key "tag_implications", "tags"
|
add_foreign_key "tag_implications", "tags"
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -1,24 +1,15 @@
|
|||||||
FactoryBot.define do
|
FactoryBot.define do
|
||||||
factory :user do
|
factory :user do
|
||||||
name { nil }
|
name { "test-user" }
|
||||||
inheritance_code { SecureRandom.uuid }
|
inheritance_code { SecureRandom.uuid }
|
||||||
role { 'guest' }
|
role { "guest" }
|
||||||
banned_at { nil }
|
|
||||||
|
|
||||||
trait :guest do
|
|
||||||
role { 'guest' }
|
|
||||||
end
|
|
||||||
|
|
||||||
trait :member do
|
trait :member do
|
||||||
role { 'member' }
|
role { "member" }
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :admin do
|
trait :admin do
|
||||||
role { 'admin' }
|
role { 'admin' }
|
||||||
end
|
end
|
||||||
|
|
||||||
trait :banned do
|
|
||||||
banned_at { Time.current }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe PostImplication, type: :model do
|
|
||||||
let!(:post_record) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'post',
|
|
||||||
url: 'https://example.com/post-implication-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:parent_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'parent post',
|
|
||||||
url: 'https://example.com/post-implication-parent'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'is valid with post and parent_post' do
|
|
||||||
implication = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(implication).to be_valid
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not allow same post as parent_post' do
|
|
||||||
implication = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post: post_record
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(implication).not_to be_valid
|
|
||||||
expect(implication.errors[:parent_post_id]).to be_present
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not allow duplicate pair' do
|
|
||||||
described_class.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
duplicate = described_class.new(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(duplicate).not_to be_valid
|
|
||||||
expect(duplicate.errors[:post_id]).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -19,7 +19,7 @@ RSpec.describe PostVersion, type: :model do
|
|||||||
url: post_record.url,
|
url: post_record.url,
|
||||||
thumbnail_base: post_record.thumbnail_base,
|
thumbnail_base: post_record.thumbnail_base,
|
||||||
tags: post_record.snapshot_tag_names.join(' '),
|
tags: post_record.snapshot_tag_names.join(' '),
|
||||||
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
|
parent: post_record.parent,
|
||||||
original_created_from: post_record.original_created_from,
|
original_created_from: post_record.original_created_from,
|
||||||
original_created_before: post_record.original_created_before,
|
original_created_before: post_record.original_created_before,
|
||||||
created_at: Time.current,
|
created_at: Time.current,
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ RSpec.describe Tag, type: :model do
|
|||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
tags: snapshot_tags(post),
|
tags: snapshot_tags(post),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
parent: post.parent,
|
||||||
original_created_from: post.original_created_from,
|
original_created_from: post.original_created_from,
|
||||||
original_created_before: post.original_created_before,
|
original_created_before: post.original_created_before,
|
||||||
created_at: Time.current,
|
created_at: Time.current,
|
||||||
|
|||||||
@@ -10,53 +10,11 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
allow_any_instance_of(Post).to receive(:resized_thumbnail!).and_return(true)
|
allow_any_instance_of(Post).to receive(:resized_thumbnail!).and_return(true)
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_nico_tag!(name)
|
|
||||||
Tag.find_or_create_by_tag_name!(name, category: :nico)
|
|
||||||
end
|
|
||||||
|
|
||||||
def dummy_upload
|
def dummy_upload
|
||||||
# 中身は何でもいい(加工処理はスタブしてる)
|
# 中身は何でもいい(加工処理はスタブしてる)
|
||||||
Rack::Test::UploadedFile.new(StringIO.new('dummy'), 'image/jpeg', original_filename: 'dummy.jpg')
|
Rack::Test::UploadedFile.new(StringIO.new('dummy'), 'image/jpeg', original_filename: 'dummy.jpg')
|
||||||
end
|
end
|
||||||
|
|
||||||
def post_write_params params = { }
|
|
||||||
{ parent_post_ids: '' }.merge(params)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_parent_post! title:, url:
|
|
||||||
Post.create!(title:, url:)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_post_version_for!(post)
|
|
||||||
version =
|
|
||||||
PostVersion.create!(
|
|
||||||
post:,
|
|
||||||
version_no: 1,
|
|
||||||
event_type: 'create',
|
|
||||||
title: post.title,
|
|
||||||
url: post.url,
|
|
||||||
thumbnail_base: post.thumbnail_base,
|
|
||||||
tags: post.snapshot_tag_names.join(' '),
|
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
|
||||||
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)
|
|
||||||
|
|
||||||
post.update_columns(version_no: version.version_no) if post.has_attribute?(:version_no)
|
|
||||||
post.version_no = version.version_no if post.respond_to?(:version_no=)
|
|
||||||
|
|
||||||
version
|
|
||||||
end
|
|
||||||
|
|
||||||
def post_update_params(post, params = { })
|
|
||||||
base_version =
|
|
||||||
post.post_versions.order(version_no: :desc).first ||
|
|
||||||
create_post_version_for!(post.reload)
|
|
||||||
|
|
||||||
post_write_params({ base_version_no: base_version.version_no }.merge(params))
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:tag_name) { TagName.create!(name: 'spec_tag') }
|
let!(:tag_name) { TagName.create!(name: 'spec_tag') }
|
||||||
let!(:tag) { Tag.create!(tag_name: tag_name, category: :general) }
|
let!(:tag) { Tag.create!(tag_name: tag_name, category: :general) }
|
||||||
|
|
||||||
@@ -499,65 +457,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
expect(json).to have_key('viewed')
|
expect(json).to have_key('viewed')
|
||||||
expect([true, false]).to include(json['viewed'])
|
expect([true, false]).to include(json['viewed'])
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when post has parent, child, and sibling posts' do
|
|
||||||
let!(:parent_post) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'shared parent post',
|
|
||||||
url: 'https://example.com/shared-parent-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:child_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'child post',
|
|
||||||
url: 'https://example.com/show-child-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:sibling_post) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'sibling post',
|
|
||||||
url: 'https://example.com/show-sibling-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
PostImplication.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(
|
|
||||||
post: child_post,
|
|
||||||
parent_post: post_record
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(
|
|
||||||
post: sibling_post,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns parent_posts, child_posts, and sibling_posts' do
|
|
||||||
get "/posts/#{post_record.id}"
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
parent_ids = json.fetch('parent_posts').map { |p| p.fetch('id') }
|
|
||||||
child_ids = json.fetch('child_posts').map { |p| p.fetch('id') }
|
|
||||||
|
|
||||||
expect(parent_ids).to include(parent_post.id)
|
|
||||||
expect(child_ids).to include(child_post.id)
|
|
||||||
|
|
||||||
sibling_posts_by_parent = json.fetch('sibling_posts')
|
|
||||||
siblings = sibling_posts_by_parent.fetch(parent_post.id.to_s)
|
|
||||||
|
|
||||||
sibling_ids = siblings.map { |p| p.fetch('id') }
|
|
||||||
expect(sibling_ids).to include(post_record.id)
|
|
||||||
expect(sibling_ids).to include(sibling_post.id)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when post does not exist' do
|
context 'when post does not exist' do
|
||||||
@@ -576,28 +475,25 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it '401 when not logged in' do
|
it '401 when not logged in' do
|
||||||
sign_out
|
sign_out
|
||||||
post '/posts', params: post_write_params(title: 't', url: 'https://example.com/x', tags: 'a',
|
post '/posts', params: { title: 't', url: 'https://example.com/x', tags: 'a', thumbnail: dummy_upload }
|
||||||
thumbnail: dummy_upload)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '403 when not member' do
|
it '403 when not member' do
|
||||||
sign_in_as(create(:user, role: 'guest'))
|
sign_in_as(create(:user, role: 'guest'))
|
||||||
post '/posts', params: post_write_params(title: 't', url: 'https://example.com/x', tags: 'a',
|
post '/posts', params: { title: 't', url: 'https://example.com/x', tags: 'a', thumbnail: dummy_upload }
|
||||||
thumbnail: dummy_upload)
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
expect(response).to have_http_status(:forbidden)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '201 and creates post + tags when member' do
|
it '201 and creates post + tags when member' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/new',
|
url: 'https://example.com/new',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload
|
||||||
)
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json).to include('id', 'title', 'url')
|
expect(json).to include('id', 'title', 'url')
|
||||||
@@ -611,12 +507,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it '201 and creates post + tags when member and tags have aliases' do
|
it '201 and creates post + tags when member and tags have aliases' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/new',
|
url: 'https://example.com/new',
|
||||||
tags: 'manko', # 既存タグ名を投げる
|
tags: 'manko', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload
|
||||||
)
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
expect(json).to include('id', 'title', 'url')
|
expect(json).to include('id', 'title', 'url')
|
||||||
@@ -637,14 +533,13 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'return 400' do
|
it 'return 400' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'https://example.com/nico-tag-post',
|
url: 'https://example.com/nico_tag',
|
||||||
tags: 'nico:nico_tag',
|
tags: 'nico:nico_tag',
|
||||||
thumbnail: dummy_upload
|
thumbnail: dummy_upload }
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request), response.body
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -652,11 +547,11 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'returns 422' do
|
it 'returns 422' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: ' ',
|
url: ' ',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload }
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
@@ -666,156 +561,16 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'returns 422' do
|
it 'returns 422' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'new post',
|
title: 'new post',
|
||||||
url: 'ぼざクリタグ広場',
|
url: 'ぼざクリタグ広場',
|
||||||
tags: 'spec_tag', # 既存タグ名を投げる
|
tags: 'spec_tag', # 既存タグ名を投げる
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload
|
||||||
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when parent_post_ids is provided' do
|
|
||||||
let!(:parent_post_1) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'parent post 1',
|
|
||||||
url: 'https://example.com/parent-post-1'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:parent_post_2) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'parent post 2',
|
|
||||||
url: 'https://example.com/parent-post-2'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates post implications for parent posts' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: {
|
|
||||||
title: 'child post',
|
|
||||||
url: 'https://example.com/child-post',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{parent_post_1.id} #{parent_post_2.id}",
|
|
||||||
thumbnail: dummy_upload }
|
|
||||||
}.to change(PostImplication, :count).by(2)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
created_post = Post.find(json.fetch('id'))
|
|
||||||
expect(created_post.parent_posts.order(:id).pluck(:id)).to eq(
|
|
||||||
[parent_post_1.id, parent_post_2.id].sort
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(PostImplication.exists?(
|
|
||||||
post_id: created_post.id,
|
|
||||||
parent_post_id: parent_post_1.id
|
|
||||||
)).to be(true)
|
|
||||||
|
|
||||||
expect(PostImplication.exists?(
|
|
||||||
post_id: created_post.id,
|
|
||||||
parent_post_id: parent_post_2.id
|
|
||||||
)).to be(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'deduplicates parent_post_ids' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: post_write_params(
|
|
||||||
title: 'dedup child post',
|
|
||||||
url: 'https://example.com/dedup-child-post',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{parent_post_1.id} #{parent_post_1.id}",
|
|
||||||
thumbnail: dummy_upload
|
|
||||||
)
|
|
||||||
}.to change(PostImplication, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
created_post = Post.find(json.fetch('id'))
|
|
||||||
expect(created_post.parent_posts.pluck(:id)).to eq([parent_post_1.id])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'records parent_post_ids in post version' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
post '/posts', params: post_write_params(
|
|
||||||
title: 'versioned child post',
|
|
||||||
url: 'https://example.com/versioned-child-post',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{parent_post_1.id} #{parent_post_2.id}",
|
|
||||||
thumbnail: dummy_upload
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
created_post = Post.find(json.fetch('id'))
|
|
||||||
version = PostVersion.find_by!(post: created_post, version_no: 1)
|
|
||||||
|
|
||||||
expect(version.parent_post_ids.split.map(&:to_i)).to eq(
|
|
||||||
[parent_post_1.id, parent_post_2.id].sort
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids is missing' do
|
|
||||||
it 'returns 422' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: {
|
|
||||||
title: 'missing parent_post_ids',
|
|
||||||
url: 'https://example.com/missing-parent-post-ids',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
thumbnail: dummy_upload }
|
|
||||||
}.not_to change(Post, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes invalid token' do
|
|
||||||
it 'returns 422 and does not create post' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: post_write_params(
|
|
||||||
title: 'invalid parent ids',
|
|
||||||
url: 'https://example.com/invalid-parent-ids',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: 'abc',
|
|
||||||
thumbnail: dummy_upload
|
|
||||||
)
|
|
||||||
}.not_to change(Post, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes nonexistent post id' do
|
|
||||||
it 'returns 422 and does not create post implication' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
post '/posts', params: post_write_params(
|
|
||||||
title: 'missing parent post',
|
|
||||||
url: 'https://example.com/missing-parent-post',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: '999999999',
|
|
||||||
thumbnail: dummy_upload
|
|
||||||
)
|
|
||||||
}.not_to change(PostImplication, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'PUT /posts/:id' do
|
describe 'PUT /posts/:id' do
|
||||||
@@ -823,33 +578,33 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it '401 when not logged in' do
|
it '401 when not logged in' do
|
||||||
sign_out
|
sign_out
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
put "/posts/#{post_record.id}", params: { title: 'updated', tags: 'spec_tag' }
|
||||||
post_record, title: 'updated', tags: 'spec_tag')
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '403 when not member' do
|
it '403 when not member' do
|
||||||
sign_in_as(create(:user, role: 'guest'))
|
sign_in_as(create(:user, role: 'guest'))
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
put "/posts/#{post_record.id}", params: { title: 'updated', tags: 'spec_tag' }
|
||||||
post_record, title: 'updated', tags: 'spec_tag')
|
|
||||||
expect(response).to have_http_status(:forbidden)
|
expect(response).to have_http_status(:forbidden)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '200 and updates title + resync tags when member' do
|
it '200 and updates title + resync tags when member' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
|
# 追加で別タグも作って、更新時に入れ替わることを見る
|
||||||
tn2 = TagName.create!(name: 'spec_tag_2')
|
tn2 = TagName.create!(name: 'spec_tag_2')
|
||||||
Tag.create!(tag_name: tn2, category: :general)
|
Tag.create!(tag_name: tn2, category: :general)
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
post_record,
|
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2')
|
tags: 'spec_tag_2'
|
||||||
|
}
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json).to have_key('tags')
|
expect(json).to have_key('tags')
|
||||||
expect(json['tags']).to be_an(Array)
|
expect(json['tags']).to be_an(Array)
|
||||||
|
|
||||||
|
# show と同様、update 後レスポンスもツリー形式
|
||||||
names = json['tags'].map { |n| n['name'] }
|
names = json['tags'].map { |n| n['name'] }
|
||||||
expect(names).to include('spec_tag_2')
|
expect(names).to include('spec_tag_2')
|
||||||
end
|
end
|
||||||
@@ -864,402 +619,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
it 'return 400' do
|
it 'return 400' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
put "/posts/#{ post_record.id }", params: {
|
||||||
post_record,
|
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'nico:nico_tag')
|
tags: 'nico:nico_tag' }
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request), response.body
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids is provided' do
|
|
||||||
let!(:old_parent_post) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'old parent post',
|
|
||||||
url: 'https://example.com/old-parent-post'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:new_parent_post_1) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'new parent post 1',
|
|
||||||
url: 'https://example.com/new-parent-post-1'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:new_parent_post_2) do
|
|
||||||
create_parent_post!(
|
|
||||||
title: 'new parent post 2',
|
|
||||||
url: 'https://example.com/new-parent-post-2'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
before do
|
|
||||||
PostImplication.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post: old_parent_post
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'replaces parent posts' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
|
||||||
post_record,
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{new_parent_post_1.id} #{new_parent_post_2.id}")
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
expect(post_record.reload.parent_posts.order(:id).pluck(:id)).to eq(
|
|
||||||
[new_parent_post_1.id, new_parent_post_2.id].sort
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(PostImplication.exists?(
|
|
||||||
post_id: post_record.id,
|
|
||||||
parent_post_id: old_parent_post.id
|
|
||||||
)).to be(false)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'clears parent posts when parent_post_ids is blank' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
|
||||||
post_record,
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: ''
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(post_record.reload.parent_posts).to be_empty
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'records changed parent_post_ids in post version' do
|
|
||||||
sign_in_as(member)
|
|
||||||
create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
|
||||||
post_record,
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: "#{new_parent_post_1.id} #{new_parent_post_2.id}"
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
version = post_record.reload.post_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(version.version_no).to eq(2)
|
|
||||||
expect(version.parent_post_ids.split.map(&:to_i)).to eq(
|
|
||||||
[new_parent_post_1.id, new_parent_post_2.id].sort
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids is missing' do
|
|
||||||
it 'returns 422' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: {
|
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag' }
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes invalid token' do
|
|
||||||
it 'returns 422 and does not change parent posts' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
parent_post = create_parent_post!(
|
|
||||||
title: 'valid parent post',
|
|
||||||
url: 'https://example.com/valid-parent-post'
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
|
||||||
post_record,
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: 'abc'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(post_record.reload.parent_posts.pluck(:id)).to eq([parent_post.id])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes nonexistent post id' do
|
|
||||||
it 'returns 422 and does not change parent posts' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
parent_post = create_parent_post!(
|
|
||||||
title: 'existing parent post',
|
|
||||||
url: 'https://example.com/existing-parent-post'
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(
|
|
||||||
post: post_record,
|
|
||||||
parent_post:
|
|
||||||
)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
|
||||||
post_record,
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: '999999999'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(post_record.reload.parent_posts.pluck(:id)).to eq([parent_post.id])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when parent_post_ids includes self id' do
|
|
||||||
it 'returns 422 and does not create self implication' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_update_params(
|
|
||||||
post_record,
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
parent_post_ids: post_record.id.to_s
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
|
|
||||||
expect(PostImplication.exists?(
|
|
||||||
post_id: post_record.id,
|
|
||||||
parent_post_id: post_record.id
|
|
||||||
)).to be(false)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'with optimistic locking' do
|
|
||||||
let!(:no_deerjikist_tag) { Tag.no_deerjikist }
|
|
||||||
|
|
||||||
before do
|
|
||||||
PostTag.create!(post: post_record, tag: no_deerjikist_tag)
|
|
||||||
end
|
|
||||||
|
|
||||||
it '400 when base_version_no is missing without force' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag')
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '400 when force and merge are both true' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'updated title',
|
|
||||||
tags: 'spec_tag',
|
|
||||||
force: '1',
|
|
||||||
merge: '1')
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
|
||||||
end
|
|
||||||
|
|
||||||
it '409 when scalar fields are changed both by current and incoming updates' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
post_record.update!(title: 'updated by other user')
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: 'updated by me',
|
|
||||||
tags: "spec_tag #{Tag.no_deerjikist.name}")
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:conflict)
|
|
||||||
|
|
||||||
expect(json.fetch('error')).to eq('conflict')
|
|
||||||
expect(json.fetch('base_version_no')).to eq(base_version.version_no)
|
|
||||||
expect(json.fetch('current_version_no')).to eq(2)
|
|
||||||
expect(json.fetch('mergeable')).to be(false)
|
|
||||||
|
|
||||||
conflict_fields = json.fetch('conflicts').map { |change| change.fetch('field') }
|
|
||||||
expect(conflict_fields).to include('title')
|
|
||||||
|
|
||||||
expect(post_record.reload.title).to eq('updated by other user')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 409 with mergeable true when stale tag changes do not conflict but merge is not requested' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
current_tag = Tag.find_or_create_by_tag_name!('current_added_tag', category: :general)
|
|
||||||
PostTag.create!(post: post_record, tag: current_tag, created_user: member)
|
|
||||||
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: post_record.title,
|
|
||||||
tags: "spec_tag #{Tag.no_deerjikist.name} incoming_added_tag")
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:conflict)
|
|
||||||
|
|
||||||
expect(json.fetch('mergeable')).to be(true)
|
|
||||||
|
|
||||||
tag_change = json.fetch('changes').find { |change| change.fetch('field') == 'tag_names' }
|
|
||||||
expect(tag_change).to be_present
|
|
||||||
expect(tag_change.fetch('conflict')).to be(false)
|
|
||||||
expect(tag_change.fetch('added_by_current')).to include('current_added_tag')
|
|
||||||
expect(tag_change.fetch('added_by_me')).to include('incoming_added_tag')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'merges non-conflicting stale tag changes when merge is true' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
current_tag = Tag.find_or_create_by_tag_name!('current_merge_tag', category: :general)
|
|
||||||
PostTag.create!(post: post_record, tag: current_tag, created_user: member)
|
|
||||||
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: post_record.title,
|
|
||||||
tags: "spec_tag #{Tag.no_deerjikist.name} incoming_merge_tag",
|
|
||||||
merge: '1')
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
names = post_record.reload.tags.map(&:name)
|
|
||||||
|
|
||||||
expect(names).to include('spec_tag')
|
|
||||||
expect(names).to include(Tag.no_deerjikist.name)
|
|
||||||
expect(names).to include('current_merge_tag')
|
|
||||||
expect(names).to include('incoming_merge_tag')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not conflict when only nico tags changed after the base version' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
nico_tag = create_nico_tag!('nico:optimistic_lock_nico')
|
|
||||||
PostTag.create!(post: post_record, tag: nico_tag, created_user: member)
|
|
||||||
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect(post_record.reload.version_no).to eq(2)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: post_record.title,
|
|
||||||
tags: "spec_tag #{ Tag.no_deerjikist.name }")
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
names = post_record.reload.tags.map(&:name)
|
|
||||||
|
|
||||||
expect(names).to include('spec_tag')
|
|
||||||
expect(names).to include(Tag.no_deerjikist.name)
|
|
||||||
expect(names).to include(nico_tag.name)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'keeps nico tags even when they are not included in PUT tags' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
nico_tag = create_nico_tag!('nico:readonly_update_nico')
|
|
||||||
PostTag.create!(post: post_record, tag: nico_tag, created_user: member)
|
|
||||||
|
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: 'updated title',
|
|
||||||
tags: "spec_tag #{ Tag.no_deerjikist.name }")
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
names = post_record.reload.tags.map(&:name)
|
|
||||||
|
|
||||||
expect(names).to include('spec_tag')
|
|
||||||
expect(names).to include(Tag.no_deerjikist.name)
|
|
||||||
expect(names).to include(nico_tag.name)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'allows non-nico tags linked from nico tags to be removed by normal post update' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
nico_tag = create_nico_tag!('nico:relation_source')
|
|
||||||
linked_tag = Tag.find_or_create_by_tag_name!('relation_linked_tag', category: :general)
|
|
||||||
|
|
||||||
NicoTagRelation.create!(nico_tag:, tag: linked_tag)
|
|
||||||
PostTag.create!(post: post_record, tag: nico_tag, created_user: member)
|
|
||||||
PostTag.create!(post: post_record, tag: linked_tag, created_user: member)
|
|
||||||
|
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: post_record.title,
|
|
||||||
tags: "spec_tag #{ Tag.no_deerjikist.name }")
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
names = post_record.reload.tags.map(&:name)
|
|
||||||
|
|
||||||
expect(names).to include(nico_tag.name)
|
|
||||||
expect(names).to include('spec_tag')
|
|
||||||
expect(names).to include(Tag.no_deerjikist.name)
|
|
||||||
expect(names).not_to include(linked_tag.name)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'force-updates stale posts without base_version_no' do
|
|
||||||
sign_in_as(member)
|
|
||||||
|
|
||||||
create_post_version_for!(post_record.reload)
|
|
||||||
|
|
||||||
post_record.update!(title: 'updated by other user')
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
|
||||||
title: 'forced title',
|
|
||||||
tags: "spec_tag #{Tag.no_deerjikist.name}",
|
|
||||||
force: '1')
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(post_record.reload.title).to eq('forced title')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1408,20 +773,20 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
post.snapshot_tag_names.join(' ')
|
post.snapshot_tag_names.join(' ')
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_post_version! post, version_no:, event_type:, created_by_user:, created_at:
|
def create_post_version!(post, version_no:, event_type:, created_by_user:, created_at:)
|
||||||
PostVersion.create!(
|
PostVersion.create!(
|
||||||
post:,
|
post: post,
|
||||||
version_no:,
|
version_no: version_no,
|
||||||
event_type:,
|
event_type: event_type,
|
||||||
title: post.title,
|
title: post.title,
|
||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
tags: snapshot_tags(post),
|
tags: snapshot_tags(post),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
parent: post.parent,
|
||||||
original_created_from: post.original_created_from,
|
original_created_from: post.original_created_from,
|
||||||
original_created_before: post.original_created_before,
|
original_created_before: post.original_created_before,
|
||||||
created_at:,
|
created_at: created_at,
|
||||||
created_by_user:
|
created_by_user: created_by_user
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1650,15 +1015,33 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
post.snapshot_tag_names.join(' ')
|
post.snapshot_tag_names.join(' ')
|
||||||
end
|
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),
|
||||||
|
parent: post.parent,
|
||||||
|
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
|
it 'creates version 1 on POST /posts' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'versioned post',
|
title: 'versioned post',
|
||||||
url: 'https://example.com/versioned-post',
|
url: 'https://example.com/versioned-post',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload
|
||||||
|
}
|
||||||
end.to change(PostVersion, :count).by(1)
|
end.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
expect(response).to have_http_status(:created)
|
||||||
@@ -1675,16 +1058,16 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it 'creates next version on PUT /posts/:id when snapshot changes' do
|
it 'creates next version on PUT /posts/:id when snapshot changes' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
base_version = create_post_version_for!(post_record)
|
create_post_version_for!(post_record)
|
||||||
|
|
||||||
tag_name2 = TagName.create!(name: 'spec_tag_2')
|
tag_name2 = TagName.create!(name: 'spec_tag_2')
|
||||||
Tag.create!(tag_name: tag_name2, category: :general)
|
Tag.create!(tag_name: tag_name2, category: :general)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2')
|
tags: 'spec_tag_2'
|
||||||
|
}
|
||||||
end.to change(PostVersion, :count).by(1)
|
end.to change(PostVersion, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
@@ -1701,15 +1084,14 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
PostTag.create!(post: post_record, tag: Tag.no_deerjikist)
|
PostTag.create!(post: post_record, tag: Tag.no_deerjikist)
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
create_post_version_for!(post_record.reload)
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: post_record.title,
|
title: post_record.title,
|
||||||
tags: 'spec_tag')
|
tags: 'spec_tag'
|
||||||
|
}
|
||||||
}.not_to change(PostVersion, :count)
|
}.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
version = post_record.reload.post_versions.order(:version_no).last
|
version = post_record.reload.post_versions.order(:version_no).last
|
||||||
@@ -1722,11 +1104,12 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
post '/posts', params: post_write_params(
|
post '/posts', params: {
|
||||||
title: 'invalid post',
|
title: 'invalid post',
|
||||||
url: 'ぼざクリタグ広場',
|
url: 'ぼざクリタグ広場',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
thumbnail: dummy_upload)
|
thumbnail: dummy_upload
|
||||||
|
}
|
||||||
end.not_to change(PostVersion, :count)
|
end.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
@@ -1734,15 +1117,15 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
|
|
||||||
it 'does not create a version when PUT /posts/:id is invalid' do
|
it 'does not create a version when PUT /posts/:id is invalid' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
base_version = create_post_version_for!(post_record)
|
create_post_version_for!(post_record)
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag',
|
tags: 'spec_tag',
|
||||||
original_created_from: Time.zone.local(2020, 1, 2, 0, 0, 0).iso8601,
|
original_created_from: Time.zone.local(2020, 1, 2, 0, 0, 0).iso8601,
|
||||||
original_created_before: Time.zone.local(2020, 1, 1, 0, 0, 0).iso8601)
|
original_created_before: Time.zone.local(2020, 1, 1, 0, 0, 0).iso8601
|
||||||
|
}
|
||||||
end.not_to change(PostVersion, :count)
|
end.not_to change(PostVersion, :count)
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
@@ -1752,22 +1135,48 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
describe 'tag versioning from post write actions' do
|
describe 'tag versioning from post write actions' do
|
||||||
let(:member) { create(:user, :member) }
|
let(:member) { create(:user, :member) }
|
||||||
|
|
||||||
it 'creates tag snapshot for normalised tags on PUT /posts/:id' do
|
it 'creates tag snapshot for normalised tags on POST /posts' do
|
||||||
sign_in_as(member)
|
sign_in_as(member)
|
||||||
|
|
||||||
base_version = create_post_version_for!(post_record.reload)
|
expect {
|
||||||
|
post '/posts', params: {
|
||||||
|
title: 'tag versioned post',
|
||||||
|
url: 'https://example.com/tag-versioned-post',
|
||||||
|
tags: 'spec_tag',
|
||||||
|
thumbnail: dummy_upload
|
||||||
|
}
|
||||||
|
}.to change { tag.reload.tag_versions.count }.by(1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:created)
|
||||||
|
|
||||||
|
version = tag.reload.tag_versions.order(:version_no).last
|
||||||
|
expect(version.version_no).to eq(1)
|
||||||
|
expect(version.event_type).to eq('create')
|
||||||
|
expect(version.name).to eq('spec_tag')
|
||||||
|
expect(version.category).to eq('general')
|
||||||
|
expect(version.created_by_user_id).to eq(member.id)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates tag snapshot for normalised tags on PUT /posts/:id' do
|
||||||
|
sign_in_as(member)
|
||||||
|
|
||||||
tag_name2 = TagName.create!(name: 'spec_tag_2')
|
tag_name2 = TagName.create!(name: 'spec_tag_2')
|
||||||
tag2 = Tag.create!(tag_name: tag_name2, category: :general)
|
tag2 = Tag.create!(tag_name: tag_name2, category: :general)
|
||||||
|
|
||||||
expect {
|
expect {
|
||||||
put "/posts/#{post_record.id}", params: post_write_params(
|
put "/posts/#{post_record.id}", params: {
|
||||||
base_version_no: base_version.version_no,
|
|
||||||
title: 'updated title',
|
title: 'updated title',
|
||||||
tags: 'spec_tag_2')
|
tags: 'spec_tag_2'
|
||||||
|
}
|
||||||
}.to change { tag2.reload.tag_versions.count }.by(1)
|
}.to change { tag2.reload.tag_versions.count }.by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok), response.body
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
version = tag2.reload.tag_versions.order(:version_no).last
|
||||||
|
expect(version.version_no).to eq(1)
|
||||||
|
expect(version.event_type).to eq('create')
|
||||||
|
expect(version.name).to eq('spec_tag_2')
|
||||||
|
expect(version.created_by_user_id).to eq(member.id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ RSpec.describe 'TagVersions API', type: :request do
|
|||||||
created_by_user:,
|
created_by_user:,
|
||||||
created_at:
|
created_at:
|
||||||
)
|
)
|
||||||
version =
|
|
||||||
TagVersion.create!(
|
TagVersion.create!(
|
||||||
tag: tag,
|
tag: tag,
|
||||||
version_no: version_no,
|
version_no: version_no,
|
||||||
@@ -36,12 +35,8 @@ RSpec.describe 'TagVersions API', type: :request do
|
|||||||
aliases: Array(aliases).join(' '),
|
aliases: Array(aliases).join(' '),
|
||||||
parent_tag_ids: Array(parent_tags).map(&:id).join(' '),
|
parent_tag_ids: Array(parent_tags).map(&:id).join(' '),
|
||||||
created_by_user: created_by_user,
|
created_by_user: created_by_user,
|
||||||
created_at: created_at)
|
created_at: created_at
|
||||||
|
)
|
||||||
tag.update_columns(version_no: version_no) if tag.has_attribute?(:version_no)
|
|
||||||
tag.version_no = version_no if tag.respond_to?(:version_no=)
|
|
||||||
|
|
||||||
version
|
|
||||||
end
|
end
|
||||||
|
|
||||||
let!(:v1) do
|
let!(:v1) do
|
||||||
|
|||||||
@@ -8,35 +8,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
let!(:tag) { create(:tag, category: :deerjikist) }
|
let!(:tag) { create(:tag, category: :deerjikist) }
|
||||||
|
|
||||||
let(:member) { create(:user, :member) }
|
|
||||||
let(:guest) { create(:user, role: :guest) }
|
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
# show_by_name / deerjikists_by_name 用に名前を固定
|
||||||
tag.tag_name.update!(name: 'deerjika')
|
tag.tag_name.update!(name: 'deerjika')
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /tags/:id/deerjikists' do
|
describe 'GET /tags/:id/deerjikists' do
|
||||||
subject(:do_request) do
|
subject(:do_request) do
|
||||||
get "/tags/#{tag_id}/deerjikists"
|
get "/tags/#{ tag_id }/deerjikists"
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:tag_id) { tag.id }
|
let(:tag_id) { tag.id }
|
||||||
|
|
||||||
context 'when tag exists and has no deerjikists' do
|
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
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -46,24 +34,14 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
Deerjikist.create!(platform: platform2, code: code2, tag: tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 200 with tag and deerjikists array' do
|
it 'returns 200 and deerjikists array' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
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)
|
|
||||||
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(2)
|
|
||||||
|
|
||||||
expect(json['deerjikists'].map { |h| [h['platform'], h['code']] })
|
|
||||||
.to contain_exactly(
|
|
||||||
[platform1, code1],
|
[platform1, code1],
|
||||||
[platform2, code2],
|
[platform2, code2],
|
||||||
)
|
)
|
||||||
@@ -75,7 +53,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -83,7 +60,7 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
describe 'GET /tags/name/:name/deerjikists' do
|
describe 'GET /tags/name/:name/deerjikists' do
|
||||||
subject(:do_request) do
|
subject(:do_request) do
|
||||||
get "/tags/name/#{name}/deerjikists"
|
get "/tags/name/#{ name }/deerjikists"
|
||||||
end
|
end
|
||||||
|
|
||||||
let(:name) { 'deerjika' }
|
let(:name) { 'deerjika' }
|
||||||
@@ -93,7 +70,6 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 400' do
|
it 'returns 400' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -103,209 +79,23 @@ RSpec.describe 'Tags deerjikists API', type: :request do
|
|||||||
|
|
||||||
it 'returns 404' do
|
it 'returns 404' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:not_found)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
end
|
||||||
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
|
context 'when tag exists and has deerjikists' do
|
||||||
before do
|
before do
|
||||||
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
Deerjikist.create!(platform: platform1, code: code1, tag: tag)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 200 with tag and deerjikists array' do
|
it 'returns 200 and deerjikists array' do
|
||||||
do_request
|
do_request
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
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(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).to be_a(Array)
|
||||||
expect(json.size).to eq(1)
|
expect(json.size).to eq(1)
|
||||||
expect(json[0]['platform']).to eq('youtube')
|
expect(json[0]['platform']).to eq(platform1)
|
||||||
expect(json[0]['code']).to eq(channel_id)
|
expect(json[0]['code']).to eq(code1)
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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(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
|
||||||
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
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "PUT /users/:id" do
|
||||||
|
let(:user) { create(:user, name: "old-name", role: "guest") }
|
||||||
|
|
||||||
|
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)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns 403 when current user is banned' do
|
it "returns 400 when name is blank" do
|
||||||
user = create(:user, :banned)
|
sign_in_as(user)
|
||||||
|
put "/users/#{user.id}", params: { name: " " }
|
||||||
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
|
|
||||||
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)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns 400 when name is blank' do
|
|
||||||
put "/users/#{user.id}",
|
|
||||||
params: { name: ' ' },
|
|
||||||
headers: auth_headers(user)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
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(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
|
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
|
||||||
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(response).to have_http_status(:ok)
|
||||||
expect(json['valid']).to eq(false)
|
expect(json["valid"]).to eq(false)
|
||||||
end
|
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 {
|
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)
|
}.to change(UserIp, :count).by(1)
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
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
|
||||||
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)
|
expect(response).to have_http_status(:not_found)
|
||||||
end
|
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(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
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,85 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe VersionRecorder do
|
|
||||||
let(:member) { create(:user, :member) }
|
|
||||||
|
|
||||||
let(:post_record) do
|
|
||||||
Post.create!(
|
|
||||||
title: 'version recorder post',
|
|
||||||
url: 'https://example.com/version-recorder-post')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'updates record version_no when creating the first version' do
|
|
||||||
version =
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect(version.version_no).to eq(1)
|
|
||||||
expect(post_record.reload.version_no).to eq(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'updates record version_no when creating the next version' do
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
post_record.update!(title: 'updated version recorder post')
|
|
||||||
|
|
||||||
version =
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect(version.version_no).to eq(2)
|
|
||||||
expect(post_record.reload.version_no).to eq(2)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not create a new version or advance version_no when snapshot is unchanged' do
|
|
||||||
first =
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
version =
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
expect(version).to eq(first)
|
|
||||||
}.not_to change(PostVersion, :count)
|
|
||||||
|
|
||||||
expect(post_record.reload.version_no).to eq(1)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'raises when record version_no is older than the latest version' do
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record,
|
|
||||||
event_type: :create,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
post_record.update!(title: 'updated once')
|
|
||||||
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
|
|
||||||
post_record.update_columns(version_no: 1)
|
|
||||||
|
|
||||||
post_record.update!(title: 'updated with stale version_no')
|
|
||||||
|
|
||||||
expect {
|
|
||||||
PostVersionRecorder.record!(
|
|
||||||
post: post_record.reload,
|
|
||||||
event_type: :update,
|
|
||||||
created_by_user: member)
|
|
||||||
}.to raise_error(RuntimeError, /version_no/)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -2,12 +2,14 @@ module TestRecords
|
|||||||
def create_member_user!
|
def create_member_user!
|
||||||
User.create!(name: 'spec user',
|
User.create!(name: 'spec user',
|
||||||
inheritance_code: SecureRandom.hex(16),
|
inheritance_code: SecureRandom.hex(16),
|
||||||
role: 'member')
|
role: 'member',
|
||||||
|
banned: false)
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_admin_user!
|
def create_admin_user!
|
||||||
User.create!(name: 'spec admin',
|
User.create!(name: 'spec admin',
|
||||||
inheritance_code: SecureRandom.hex(16),
|
inheritance_code: SecureRandom.hex(16),
|
||||||
role: 'admin')
|
role: 'admin',
|
||||||
|
banned: false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ RSpec.describe "nico:sync" do
|
|||||||
url: post.url,
|
url: post.url,
|
||||||
thumbnail_base: post.thumbnail_base,
|
thumbnail_base: post.thumbnail_base,
|
||||||
tags: snapshot_tags(post),
|
tags: snapshot_tags(post),
|
||||||
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
|
parent: post.parent,
|
||||||
original_created_from: post.original_created_from,
|
original_created_from: post.original_created_from,
|
||||||
original_created_before: post.original_created_before,
|
original_created_before: post.original_created_before,
|
||||||
created_at: Time.current,
|
created_at: Time.current,
|
||||||
|
|||||||
@@ -1,646 +0,0 @@
|
|||||||
# Codex handoff for BTRC Hub / タグ広場
|
|
||||||
|
|
||||||
This document transfers project-specific context from prior ChatGPT-assisted design and review work to Codex.
|
|
||||||
|
|
||||||
Use this file as project background.
|
|
||||||
Use `AGENTS.md`, `backend/AGENTS.md`, and `frontend/AGENTS.md` for concrete coding rules and verification commands.
|
|
||||||
|
|
||||||
## Project identity
|
|
||||||
|
|
||||||
BTRC Hub / タグ広場 is a collaborative knowledge base for collecting, tagging, explaining, and rediscovering Bocchi the Rock creature-related works.
|
|
||||||
|
|
||||||
It is not a generic SNS.
|
|
||||||
It is not a comment board.
|
|
||||||
It is not a service for rehosting external content.
|
|
||||||
It is primarily a structured link, tag, wiki, material, and viewing-party system.
|
|
||||||
|
|
||||||
Core domains:
|
|
||||||
|
|
||||||
1. Posts
|
|
||||||
2. Tags
|
|
||||||
3. Wiki pages
|
|
||||||
4. Materials
|
|
||||||
5. Theatre / watch-party features
|
|
||||||
|
|
||||||
The project is already publicly accessible and indexed by search engines, but it has not been broadly announced. Treat it as a small public production system, not a private prototype.
|
|
||||||
|
|
||||||
## Current stack
|
|
||||||
|
|
||||||
Backend:
|
|
||||||
|
|
||||||
- Ruby 3.2.2
|
|
||||||
- Rails 8.0.2 API
|
|
||||||
- MySQL 8
|
|
||||||
- Active Storage
|
|
||||||
- Cloudflare R2 / S3-compatible storage is expected for uploaded files
|
|
||||||
- RSpec
|
|
||||||
|
|
||||||
Frontend:
|
|
||||||
|
|
||||||
- React 19.1
|
|
||||||
- Vite 6.3
|
|
||||||
- TypeScript 5.8
|
|
||||||
- Axios
|
|
||||||
- TanStack Query
|
|
||||||
- Tailwind CSS
|
|
||||||
- Framer Motion
|
|
||||||
- shadcn-like local components
|
|
||||||
- react-markdown
|
|
||||||
- react-markdown-editor-lite
|
|
||||||
- remark-wiki-autolink
|
|
||||||
|
|
||||||
Batch / background-like tasks:
|
|
||||||
|
|
||||||
- Rake tasks
|
|
||||||
- Nico sync
|
|
||||||
- YouTube sync
|
|
||||||
- Similarity calculation tasks
|
|
||||||
|
|
||||||
## Repository working principle
|
|
||||||
|
|
||||||
Before editing, inspect the existing implementation.
|
|
||||||
|
|
||||||
Do not invent a new architecture when the current repo already has an established convention.
|
|
||||||
|
|
||||||
Keep changes scoped to the requested issue.
|
|
||||||
|
|
||||||
Prefer small, reviewable changes over broad rewrites.
|
|
||||||
|
|
||||||
Do not perform unrelated cleanup in the same patch.
|
|
||||||
|
|
||||||
When a task has design ambiguity, first produce a short investigation and recommended plan. Do not silently choose a risky design.
|
|
||||||
|
|
||||||
## User coding preferences
|
|
||||||
|
|
||||||
General:
|
|
||||||
|
|
||||||
- Prefer single quotes for strings unless interpolation, escaping, or framework convention makes double quotes better.
|
|
||||||
- Do not add production dependencies without explicit approval.
|
|
||||||
- Do not perform broad formatting churn.
|
|
||||||
- Do not convert unrelated files to a different style.
|
|
||||||
|
|
||||||
Ruby:
|
|
||||||
|
|
||||||
- Do not put a space before method-call parentheses.
|
|
||||||
- Do not use `%w`.
|
|
||||||
- Do not use `%i`.
|
|
||||||
- Keep Rails code idiomatic, but preserve the user's style where the repo already uses it.
|
|
||||||
|
|
||||||
TypeScript / Python:
|
|
||||||
|
|
||||||
- The user prefers GNU-style spacing before parentheses where syntactically valid.
|
|
||||||
- Preserve existing project formatting if a formatter or nearby code dictates otherwise.
|
|
||||||
|
|
||||||
## Current authentication model
|
|
||||||
|
|
||||||
The system does not use normal email/password authentication.
|
|
||||||
|
|
||||||
Users are authenticated by inheritance code.
|
|
||||||
|
|
||||||
Frontend:
|
|
||||||
|
|
||||||
- Stores the code in `localStorage.user_code`.
|
|
||||||
- Sends it as the `X-Transfer-Code` header.
|
|
||||||
|
|
||||||
Backend:
|
|
||||||
|
|
||||||
- Looks up `users.inheritance_code`.
|
|
||||||
- Sets `current_user`.
|
|
||||||
|
|
||||||
Roles:
|
|
||||||
|
|
||||||
- `guest`
|
|
||||||
- `member`
|
|
||||||
- `admin`
|
|
||||||
|
|
||||||
Important helper:
|
|
||||||
|
|
||||||
- `User#gte_member?` returns true for `member` and `admin`.
|
|
||||||
|
|
||||||
Never introduce a conventional login assumption unless the issue explicitly asks for it.
|
|
||||||
|
|
||||||
## BAN / abuse-control model
|
|
||||||
|
|
||||||
The backend currently enforces BAN at API level.
|
|
||||||
|
|
||||||
The relevant before_action order is conceptually:
|
|
||||||
|
|
||||||
1. Reject banned IP address.
|
|
||||||
2. Authenticate user if transfer code exists.
|
|
||||||
3. Reject banned user.
|
|
||||||
|
|
||||||
Entities:
|
|
||||||
|
|
||||||
- `users.banned_at`
|
|
||||||
- `ip_addresses.banned_at`
|
|
||||||
- `user_ips`
|
|
||||||
|
|
||||||
IP addresses are stored as binary values using `IPAddr#hton`.
|
|
||||||
|
|
||||||
Do not weaken BAN behavior.
|
|
||||||
|
|
||||||
Do not move BAN checks behind optional authentication.
|
|
||||||
|
|
||||||
Do not make preview, theatre, verify, user creation, or public-looking endpoints bypass BAN without an explicit design decision.
|
|
||||||
|
|
||||||
## Public-operation assumptions
|
|
||||||
|
|
||||||
Current practical operation:
|
|
||||||
|
|
||||||
- A few editor accounts exist.
|
|
||||||
- Meaningful editing is mostly done by the owner.
|
|
||||||
- Read access is already public.
|
|
||||||
- Search engines have indexed the site.
|
|
||||||
- Future editor applications are expected through Discord.
|
|
||||||
- Prospective editors are likely people known in the Bocchi creature community.
|
|
||||||
|
|
||||||
This means security and moderation issues matter even if traffic is still small.
|
|
||||||
|
|
||||||
## Core domain summary
|
|
||||||
|
|
||||||
### Posts
|
|
||||||
|
|
||||||
Posts are external URL-based link records.
|
|
||||||
|
|
||||||
Important properties:
|
|
||||||
|
|
||||||
- `url` is required and unique.
|
|
||||||
- URLs are normalized.
|
|
||||||
- Only HTTP / HTTPS are allowed.
|
|
||||||
- Posts can have thumbnails through Active Storage.
|
|
||||||
- `uploaded_user_id` may be NULL for synced or bot-created posts.
|
|
||||||
- `original_created_from` and `original_created_before` represent a time range for original content creation.
|
|
||||||
- When both original time bounds exist, `from < before` is required.
|
|
||||||
|
|
||||||
Parent/child posts:
|
|
||||||
|
|
||||||
- Current implementation uses `post_implications`.
|
|
||||||
- It is many-to-many.
|
|
||||||
- Do not assume `posts.parent_id`.
|
|
||||||
- Frontend/API clients must send `parent_post_ids`, even when empty.
|
|
||||||
- `parent_post_ids` is parsed as a space-separated ID string.
|
|
||||||
- Self-parenting is invalid.
|
|
||||||
- Missing parent IDs are invalid.
|
|
||||||
|
|
||||||
Versions:
|
|
||||||
|
|
||||||
- `post_versions` stores snapshots.
|
|
||||||
- `version_no` is a per-post sequence.
|
|
||||||
- Snapshot includes title, URL, thumbnail base, tags, parent post IDs, original time bounds, event type, and actor.
|
|
||||||
- Optimistic locking for posts is planned / important, but do not assume it is fully implemented unless the code proves it.
|
|
||||||
|
|
||||||
### Tags
|
|
||||||
|
|
||||||
Tags are central.
|
|
||||||
|
|
||||||
There is separation between tag names and tag entities:
|
|
||||||
|
|
||||||
- `tag_names`
|
|
||||||
- `tags`
|
|
||||||
|
|
||||||
Categories:
|
|
||||||
|
|
||||||
- `deerjikist`
|
|
||||||
- `meme`
|
|
||||||
- `character`
|
|
||||||
- `general`
|
|
||||||
- `material`
|
|
||||||
- `nico`
|
|
||||||
- `meta`
|
|
||||||
|
|
||||||
Alias model:
|
|
||||||
|
|
||||||
- `tag_names.canonical_id` expresses aliases.
|
|
||||||
- `canonical_id = NULL` means canonical name.
|
|
||||||
- `canonical_id != NULL` means alias.
|
|
||||||
- An alias must not point to another alias.
|
|
||||||
- A tag name that already has a tag or wiki page generally must not be aliasified.
|
|
||||||
|
|
||||||
Tag normalization:
|
|
||||||
|
|
||||||
- User-entered tags are normalized through existing backend logic.
|
|
||||||
- Known aliases are canonicalized.
|
|
||||||
- Parent tags are expanded recursively.
|
|
||||||
- `nico:` is normally rejected for manual entry.
|
|
||||||
- Special tags such as tag-request / bot / unknown-deerjikist / video / niconico / youtube must be protected.
|
|
||||||
|
|
||||||
Do not casually change tag normalization, alias resolution, or parent expansion. These affect search, wiki, sync, and historical data.
|
|
||||||
|
|
||||||
### Nico tags
|
|
||||||
|
|
||||||
Nico tags use the `nico` category and have separate versioning.
|
|
||||||
|
|
||||||
Important relation:
|
|
||||||
|
|
||||||
- `nico_tag_relations` maps external Nico tags to internal tags.
|
|
||||||
- `nico_tag_id` must be a Nico category tag.
|
|
||||||
- `tag_id` must not be Nico category.
|
|
||||||
|
|
||||||
Do not allow ordinary manual tag editing to create or corrupt Nico tags.
|
|
||||||
|
|
||||||
### Deerjikists
|
|
||||||
|
|
||||||
Deerjikists map external platform identities to internal `deerjikist` tags.
|
|
||||||
|
|
||||||
Known platforms include:
|
|
||||||
|
|
||||||
- `nico`
|
|
||||||
- `youtube`
|
|
||||||
|
|
||||||
YouTube handles may be normalized to `UC...` channel IDs.
|
|
||||||
|
|
||||||
Do not treat user-facing handles and canonical channel IDs as interchangeable without checking existing code.
|
|
||||||
|
|
||||||
### Wiki
|
|
||||||
|
|
||||||
Wiki pages are a major knowledge layer.
|
|
||||||
|
|
||||||
Important points:
|
|
||||||
|
|
||||||
- Wiki pages are tied to tag-like titles.
|
|
||||||
- Title handling, aliases, and canonical tag names matter.
|
|
||||||
- There is line-level storage / revision-oriented behavior in the current implementation.
|
|
||||||
- There has been design tension between wiki revisions and wiki versions.
|
|
||||||
- Wiki conflict detection using `base_revision_id` exists on the backend side.
|
|
||||||
- Frontend support for conflict detection must be verified before assuming it is complete.
|
|
||||||
|
|
||||||
Do not redesign Wiki storage casually.
|
|
||||||
|
|
||||||
Do not add a second competing history system.
|
|
||||||
|
|
||||||
Do not break existing wiki URLs.
|
|
||||||
|
|
||||||
### Materials
|
|
||||||
|
|
||||||
Materials connect files or reference URLs to `material` or `character` tags.
|
|
||||||
|
|
||||||
Important properties:
|
|
||||||
|
|
||||||
- A material has a `tag_id`.
|
|
||||||
- The tag must be `material` or `character`.
|
|
||||||
- A material requires either `url` or attached `file`.
|
|
||||||
- Active Storage is involved.
|
|
||||||
- Upload/security policy matters more than plain link posting.
|
|
||||||
|
|
||||||
Important unresolved/risky area:
|
|
||||||
|
|
||||||
- Material creation permissions have historically been risky because upload endpoints can be abused.
|
|
||||||
- Prefer `member` or higher for material creation unless the issue explicitly says otherwise.
|
|
||||||
|
|
||||||
### Theatre
|
|
||||||
|
|
||||||
Theatre is an experimental watch-party style feature.
|
|
||||||
|
|
||||||
Known pieces include:
|
|
||||||
|
|
||||||
- Display
|
|
||||||
- Presence
|
|
||||||
- Next post
|
|
||||||
- Comments
|
|
||||||
- Host-like control
|
|
||||||
|
|
||||||
Do not assume theatre has complete CRUD/admin support unless the code proves it.
|
|
||||||
|
|
||||||
Theatre may become expensive if next-item selection uses random DB ordering.
|
|
||||||
|
|
||||||
## Current high-risk areas
|
|
||||||
|
|
||||||
Treat these areas with extra care.
|
|
||||||
|
|
||||||
### Security
|
|
||||||
|
|
||||||
- Preview API SSRF protection.
|
|
||||||
- External iframe / embed CSP.
|
|
||||||
- Markdown link safety.
|
|
||||||
- BAN / IP BAN bypass.
|
|
||||||
- Transfer-code leakage.
|
|
||||||
- Guest write access.
|
|
||||||
- Upload endpoints.
|
|
||||||
- Admin-only tag operations.
|
|
||||||
- System tag mutation.
|
|
||||||
|
|
||||||
### Data integrity
|
|
||||||
|
|
||||||
- Tag alias canonicalization.
|
|
||||||
- Tag parent expansion.
|
|
||||||
- Post parent many-to-many relationships.
|
|
||||||
- Version tables.
|
|
||||||
- `version_no` synchronization.
|
|
||||||
- Schema drift from branch migration contamination.
|
|
||||||
- Wiki revision/version split.
|
|
||||||
- Material version recording.
|
|
||||||
|
|
||||||
### Frontend correctness
|
|
||||||
|
|
||||||
- React Hooks must not be called conditionally.
|
|
||||||
- Role guards are currently spread across components/pages.
|
|
||||||
- TanStack Query keys must not collide between ID/name or ID/title variants.
|
|
||||||
- URL path segments containing tag names or wiki titles must use `encodeURIComponent`.
|
|
||||||
- API response types may allow `null` users for bot or migration data.
|
|
||||||
- Tag autocomplete has had duplicated logic and stale state hazards.
|
|
||||||
|
|
||||||
### Performance
|
|
||||||
|
|
||||||
- Avoid unbounded `limit`.
|
|
||||||
- Avoid `order('RAND()')` for growing tables.
|
|
||||||
- Avoid loading full relations just to count.
|
|
||||||
- Avoid Ruby-side sorting/paging for large histories.
|
|
||||||
- Tag sidebar client-side aggregation can become expensive.
|
|
||||||
- Wiki full-text search needs deliberate indexing/design.
|
|
||||||
|
|
||||||
## Current priority order
|
|
||||||
|
|
||||||
Use this as the default priority unless an issue says otherwise.
|
|
||||||
|
|
||||||
### P0: Safety before broad announcement
|
|
||||||
|
|
||||||
1. Preview API SSRF hardening.
|
|
||||||
2. Material creation permission tightening.
|
|
||||||
3. System tag mutation holes.
|
|
||||||
4. `GET /users/me` transfer-code leakage through query params.
|
|
||||||
5. Limit caps for index/history/comment APIs.
|
|
||||||
6. CSP / iframe sandbox policy.
|
|
||||||
7. Confirm BAN enforcement remains global.
|
|
||||||
|
|
||||||
### P1: Core correctness
|
|
||||||
|
|
||||||
1. Post optimistic locking with `version_no`.
|
|
||||||
2. Wiki edit conflict handling.
|
|
||||||
3. Wiki history/revision model clarification.
|
|
||||||
4. Wiki search truthfulness: implement body search or remove false UI.
|
|
||||||
5. Tag alias/canonical/wiki interaction.
|
|
||||||
6. Tag URL encoding.
|
|
||||||
7. TanStack Query key separation.
|
|
||||||
8. Frontend null-user handling.
|
|
||||||
9. React Hooks rule fixes.
|
|
||||||
10. Material version policy.
|
|
||||||
|
|
||||||
### P2: Operational/admin usability
|
|
||||||
|
|
||||||
1. Admin screens for users, IPs, bans, aliases, and settings.
|
|
||||||
2. Settings table and user settings usage.
|
|
||||||
3. Better tag sidebar.
|
|
||||||
4. Better role guard helpers.
|
|
||||||
5. Better frontend tests.
|
|
||||||
6. Better issue triage and closure of already-implemented issues.
|
|
||||||
|
|
||||||
### P3: Future features
|
|
||||||
|
|
||||||
1. Theatre list/create/edit/admin flow.
|
|
||||||
2. Muted/hidden tags.
|
|
||||||
3. Tag category custom colors.
|
|
||||||
4. Responsive refinements.
|
|
||||||
5. Watch-party improvements.
|
|
||||||
6. Broader embed support.
|
|
||||||
|
|
||||||
## Known issue triage notes
|
|
||||||
|
|
||||||
Some existing issues may already be partially or mostly implemented.
|
|
||||||
|
|
||||||
Before implementing an issue, check code first.
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
|
|
||||||
- Tag search and OR/NOT search may already be mostly implemented.
|
|
||||||
- BAN enforcement may have been implemented after earlier issue drafts.
|
|
||||||
- YouTube sync exists and should not be treated as purely planned.
|
|
||||||
- Parent posts are many-to-many in current schema, even if older issues mention one-to-many.
|
|
||||||
- Some issues may reflect old schema or old branch state.
|
|
||||||
|
|
||||||
When in doubt:
|
|
||||||
|
|
||||||
1. Inspect current code.
|
|
||||||
2. Inspect schema.
|
|
||||||
3. Inspect routes.
|
|
||||||
4. Inspect frontend usage.
|
|
||||||
5. Report whether the issue is implemented, partially implemented, not implemented, or obsolete.
|
|
||||||
6. Only then edit.
|
|
||||||
|
|
||||||
## Verification expectations
|
|
||||||
|
|
||||||
Backend changes:
|
|
||||||
|
|
||||||
- Run RSpec when possible.
|
|
||||||
- Add request specs for API behavior changes.
|
|
||||||
- Add model specs for validation / normalization changes.
|
|
||||||
- Check migrations and schema consistency.
|
|
||||||
- Do not silently ignore pending migrations.
|
|
||||||
|
|
||||||
Frontend changes:
|
|
||||||
|
|
||||||
- Run build.
|
|
||||||
- Run lint if configured.
|
|
||||||
- Run tests if configured.
|
|
||||||
- Add tests for important behavior when the test framework exists.
|
|
||||||
- If frontend tests are not yet installed, state that clearly.
|
|
||||||
|
|
||||||
Full-stack changes:
|
|
||||||
|
|
||||||
- Verify both backend and frontend compile/test paths where possible.
|
|
||||||
- Confirm API response shapes match TypeScript types.
|
|
||||||
- Confirm authorization behavior on both server and UI.
|
|
||||||
|
|
||||||
If commands cannot be run because dependencies are missing, report that explicitly. Do not pretend verification passed.
|
|
||||||
|
|
||||||
## Branch / migration caution
|
|
||||||
|
|
||||||
The project has previously suffered from schema contamination caused by running migrations from another branch.
|
|
||||||
|
|
||||||
Be careful when touching:
|
|
||||||
|
|
||||||
- `db/schema.rb`
|
|
||||||
- migration files
|
|
||||||
- parent post schema
|
|
||||||
- banned / banned_at schema
|
|
||||||
- version_no migrations
|
|
||||||
- wiki asset schema
|
|
||||||
|
|
||||||
Before changing migrations:
|
|
||||||
|
|
||||||
1. Inspect current schema.
|
|
||||||
2. Inspect existing migrations.
|
|
||||||
3. Confirm whether the intended branch already includes related migrations.
|
|
||||||
4. Prefer additive migrations for shared branches.
|
|
||||||
5. Do not edit already-applied production migrations unless explicitly instructed.
|
|
||||||
|
|
||||||
## API design principles
|
|
||||||
|
|
||||||
Prefer explicit server-side authorization.
|
|
||||||
|
|
||||||
Do not rely only on frontend hiding.
|
|
||||||
|
|
||||||
Do not return sensitive codes unnecessarily.
|
|
||||||
|
|
||||||
Use 403 for authorization failures.
|
|
||||||
|
|
||||||
Use 422 for validation failures.
|
|
||||||
|
|
||||||
Use 409 for edit conflicts.
|
|
||||||
|
|
||||||
Do not expose internal exception messages to users.
|
|
||||||
|
|
||||||
Clamp or reject abusive limits consistently.
|
|
||||||
|
|
||||||
Keep response shape stable unless the issue explicitly includes a breaking API change.
|
|
||||||
|
|
||||||
## Frontend design principles
|
|
||||||
|
|
||||||
Use existing route and query-key conventions.
|
|
||||||
|
|
||||||
Use TanStack Query `enabled` rather than conditional hook calls.
|
|
||||||
|
|
||||||
Do not let role-based early returns change hook order.
|
|
||||||
|
|
||||||
Centralize repeated tag autocomplete logic when touching it.
|
|
||||||
|
|
||||||
Use `encodeURIComponent` for tag names and wiki titles in URL path segments.
|
|
||||||
|
|
||||||
Prefer graceful fallback for nullable actors:
|
|
||||||
|
|
||||||
- bot operation
|
|
||||||
- deleted user
|
|
||||||
- migration-created data
|
|
||||||
- external sync
|
|
||||||
|
|
||||||
Do not assume all API user fields are non-null.
|
|
||||||
|
|
||||||
## Testing priorities to add over time
|
|
||||||
|
|
||||||
Frontend tests are especially important because the backend already has more mature RSpec coverage.
|
|
||||||
|
|
||||||
Suggested first frontend tests:
|
|
||||||
|
|
||||||
1. Tag autocomplete.
|
|
||||||
2. Post form tag editing.
|
|
||||||
3. Tag URL encoding.
|
|
||||||
4. Wiki edit conflict UI.
|
|
||||||
5. Role guard behavior.
|
|
||||||
6. Null-user history rendering.
|
|
||||||
7. Dialog behavior.
|
|
||||||
8. Top navigation responsive behavior.
|
|
||||||
|
|
||||||
Backend test priorities:
|
|
||||||
|
|
||||||
1. BAN enforcement across public-looking endpoints.
|
|
||||||
2. Material permissions.
|
|
||||||
3. Preview SSRF rejection.
|
|
||||||
4. System tag protection.
|
|
||||||
5. Post optimistic locking.
|
|
||||||
6. Wiki conflict detection.
|
|
||||||
7. Tag alias/canonical behavior.
|
|
||||||
8. Limit caps.
|
|
||||||
9. Parent post parsing.
|
|
||||||
10. Version recorder behavior.
|
|
||||||
|
|
||||||
## What Codex should not do without explicit approval
|
|
||||||
|
|
||||||
Do not:
|
|
||||||
|
|
||||||
- Replace Rails.
|
|
||||||
- Replace React.
|
|
||||||
- Replace TanStack Query.
|
|
||||||
- Redesign the database.
|
|
||||||
- Rewrite Wiki storage.
|
|
||||||
- Remove version tables.
|
|
||||||
- Change authentication model.
|
|
||||||
- Change role names.
|
|
||||||
- Change tag category names.
|
|
||||||
- Add background job infrastructure.
|
|
||||||
- Add a new UI framework.
|
|
||||||
- Add a new test framework if one already exists.
|
|
||||||
- Add major dependencies.
|
|
||||||
- Change public URL design.
|
|
||||||
- Change production storage configuration.
|
|
||||||
- Remove historical data behavior.
|
|
||||||
- Simplify BAN/security checks.
|
|
||||||
- Treat the site as private-only.
|
|
||||||
|
|
||||||
## Good first Codex tasks
|
|
||||||
|
|
||||||
Start with investigation-only tasks.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
```txt
|
|
||||||
Inspect the repository and summarize the Rails, React, TypeScript, and test setup.
|
|
||||||
Do not modify files.
|
|
||||||
List commands that actually exist in this repository.
|
|
||||||
List risks Codex should know before editing.
|
|
||||||
```
|
|
||||||
|
|
||||||
Then small safe patches:
|
|
||||||
|
|
||||||
```txt
|
|
||||||
Fix a React Hooks rule violation in one file.
|
|
||||||
Keep behavior unchanged.
|
|
||||||
Run the relevant frontend verification commands.
|
|
||||||
```
|
|
||||||
|
|
||||||
```txt
|
|
||||||
Add encodeURIComponent around one tag-name URL path segment.
|
|
||||||
Add or update a test if the project has a frontend test setup.
|
|
||||||
Run build/lint.
|
|
||||||
```
|
|
||||||
|
|
||||||
```txt
|
|
||||||
Add a request spec for a known authorization rule.
|
|
||||||
Do not change implementation unless the spec fails for the expected reason.
|
|
||||||
```
|
|
||||||
|
|
||||||
Avoid starting with:
|
|
||||||
|
|
||||||
- Wiki history redesign.
|
|
||||||
- Post versioning redesign.
|
|
||||||
- Full admin screen suite.
|
|
||||||
- Broad frontend refactor.
|
|
||||||
- Database cleanup.
|
|
||||||
- Authentication rewrite.
|
|
||||||
|
|
||||||
## Relationship with ChatGPT
|
|
||||||
|
|
||||||
ChatGPT has been used for:
|
|
||||||
|
|
||||||
- Design review.
|
|
||||||
- Risk analysis.
|
|
||||||
- Prioritization.
|
|
||||||
- Specification reconstruction.
|
|
||||||
- Migration/locking discussions.
|
|
||||||
- Codex migration planning.
|
|
||||||
|
|
||||||
Codex should be used mainly for:
|
|
||||||
|
|
||||||
- Repository inspection.
|
|
||||||
- Localized implementation.
|
|
||||||
- Test addition.
|
|
||||||
- Running verification commands.
|
|
||||||
- Producing small reviewable diffs.
|
|
||||||
|
|
||||||
For ambiguous architecture, Codex should stop and present options rather than implement a guessed design.
|
|
||||||
|
|
||||||
## Current strategic stance
|
|
||||||
|
|
||||||
The project should not be rewritten from scratch.
|
|
||||||
|
|
||||||
The current Rails + React system is acceptable.
|
|
||||||
|
|
||||||
The immediate goal is not elegance.
|
|
||||||
The immediate goal is safe public operation, data integrity, and maintainable incremental improvement.
|
|
||||||
|
|
||||||
Priority is:
|
|
||||||
|
|
||||||
1. Prevent abuse/security incidents.
|
|
||||||
2. Preserve data correctness.
|
|
||||||
3. Make editing safe for multiple users.
|
|
||||||
4. Add tests around fragile frontend behavior.
|
|
||||||
5. Improve admin/operation workflows.
|
|
||||||
6. Optimize performance after obvious dangerous patterns are removed.
|
|
||||||
|
|
||||||
## Final rule
|
|
||||||
|
|
||||||
When current code, old specs, issue drafts, and memory disagree, current code wins.
|
|
||||||
|
|
||||||
When current code is unsafe, write that explicitly and propose a small safe fix.
|
|
||||||
|
|
||||||
When the task is too broad, split it.
|
|
||||||
|
|
||||||
When verification cannot be performed, say exactly what was not verified.
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
# Commands
|
|
||||||
|
|
||||||
## Backend
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd backend
|
|
||||||
bundle install
|
|
||||||
bundle exec rails db:migrate
|
|
||||||
bundle exec rspec
|
|
||||||
bundle exec rails routes
|
|
||||||
```
|
|
||||||
|
|
||||||
## Frontend
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd frontend
|
|
||||||
npm install
|
|
||||||
npm run dev
|
|
||||||
npm run build
|
|
||||||
npm run lint
|
|
||||||
npm test
|
|
||||||
```
|
|
||||||
|
|
||||||
### Full verification
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cd backend && bundle exec rspec
|
|
||||||
cd ../frontend && npm run build && npm run lint
|
|
||||||
```
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
# Issue workflow
|
|
||||||
|
|
||||||
## Source of truth
|
|
||||||
|
|
||||||
Gitea Issues are the source of truth for tasks, discussions, labels, milestones, and status.
|
|
||||||
|
|
||||||
Do not copy the full backlog into git.
|
|
||||||
|
|
||||||
Repository documents may define:
|
|
||||||
|
|
||||||
- issue templates
|
|
||||||
- triage rules
|
|
||||||
- Codex task format
|
|
||||||
- verification rules
|
|
||||||
- release checklist
|
|
||||||
|
|
||||||
## Labels
|
|
||||||
|
|
||||||
Recommended labels:
|
|
||||||
|
|
||||||
- `P0`
|
|
||||||
- `P1`
|
|
||||||
- `P2`
|
|
||||||
- `P3`
|
|
||||||
- `security`
|
|
||||||
- `data-integrity`
|
|
||||||
- `backend`
|
|
||||||
- `frontend`
|
|
||||||
- `wiki`
|
|
||||||
- `tags`
|
|
||||||
- `materials`
|
|
||||||
- `theatre`
|
|
||||||
- `codex-ready`
|
|
||||||
- `needs-design`
|
|
||||||
- `blocked`
|
|
||||||
- `good-first-codex-task`
|
|
||||||
|
|
||||||
## Codex-ready criteria
|
|
||||||
|
|
||||||
An issue can be labeled `codex-ready` only when it has:
|
|
||||||
|
|
||||||
- clear background
|
|
||||||
- target area
|
|
||||||
- concrete tasks
|
|
||||||
- acceptance criteria
|
|
||||||
- verification commands
|
|
||||||
- explicit non-goals
|
|
||||||
- no unresolved architecture decision
|
|
||||||
|
|
||||||
## Workflow
|
|
||||||
|
|
||||||
1. Create or refine the issue in Gitea.
|
|
||||||
2. Add labels and milestone.
|
|
||||||
3. If design is unclear, label `needs-design`.
|
|
||||||
4. Discuss design before implementation.
|
|
||||||
5. When scoped enough, label `codex-ready`.
|
|
||||||
6. Give Codex the issue URL or copied issue body.
|
|
||||||
7. Codex creates a branch.
|
|
||||||
8. Codex implements a small patch.
|
|
||||||
9. Codex runs verification commands.
|
|
||||||
10. Human reviews the diff.
|
|
||||||
11. Merge.
|
|
||||||
12. Close the issue from the PR/commit message.
|
|
||||||
|
|
||||||
## Commit message
|
|
||||||
|
|
||||||
Use issue references when possible:
|
|
||||||
|
|
||||||
```txt
|
|
||||||
fix: prevent preview SSRF
|
|
||||||
|
|
||||||
Refs: #123
|
|
||||||
```
|
|
||||||
or
|
|
||||||
```
|
|
||||||
fix: prevent preview SSRF
|
|
||||||
|
|
||||||
Closes: #123
|
|
||||||
```
|
|
||||||
depending on whether the change fully resolves the issue.
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
# Release checklist
|
|
||||||
|
|
||||||
- [ ] Backend specs pass
|
|
||||||
- [ ] Frontend build passes
|
|
||||||
- [ ] No pending migrations
|
|
||||||
- [ ] Preview API SSRF checked
|
|
||||||
- [ ] BAN behavior checked
|
|
||||||
- [ ] CSP checked
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
# Roadmap
|
|
||||||
|
|
||||||
## Public announcement readiness
|
|
||||||
|
|
||||||
- Harden preview API
|
|
||||||
- Tighten material creation permission
|
|
||||||
- Add admin MVP
|
|
||||||
- Improve frontend tests
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
# frontend/AGENTS.md
|
|
||||||
|
|
||||||
## Scope
|
|
||||||
|
|
||||||
These rules apply to work under `frontend/`.
|
|
||||||
|
|
||||||
This is a Vite + React + TypeScript app using TanStack Query, Tailwind CSS, Framer Motion, Radix UI-style components, MDX, and Zustand.
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
Use only scripts that exist in `package.json`:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
npm run dev
|
|
||||||
npm run build
|
|
||||||
npm run lint
|
|
||||||
npm run preview
|
|
||||||
```
|
|
||||||
|
|
||||||
`npm run build` runs `tsc -b && vite build`, and `postbuild` runs `node scripts/generate-sitemap.js`.
|
|
||||||
|
|
||||||
There is currently no `test` script in `package.json`. Do not run or report `npm test` unless a test script is added.
|
|
||||||
|
|
||||||
After frontend changes, run:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
npm run build
|
|
||||||
npm run lint
|
|
||||||
```
|
|
||||||
|
|
||||||
If either command cannot be run or fails, report the exact command and failure.
|
|
||||||
|
|
||||||
## TypeScript
|
|
||||||
|
|
||||||
- TypeScript is strict. `tsconfig.app.json` enables `strict`, `noUnusedLocals`, `noUnusedParameters`, `erasableSyntaxOnly`, `noFallthroughCasesInSwitch`, and `noUncheckedSideEffectImports`.
|
|
||||||
- Keep types explicit at module boundaries, API helpers, and exported utilities.
|
|
||||||
- Use `import type` for type-only imports.
|
|
||||||
- Prefer existing shared types from `src/types.ts` before adding local duplicate types.
|
|
||||||
- Preserve the repository's existing spacing style in TypeScript, including GNU-style spacing before call parentheses where it is already used.
|
|
||||||
- Prefer single quotes for strings unless interpolation or escaping makes double quotes better.
|
|
||||||
|
|
||||||
## React
|
|
||||||
|
|
||||||
- Use function components.
|
|
||||||
- Existing page components commonly export an anonymous function satisfying `FC`; match nearby file style when editing.
|
|
||||||
- React hooks must be called unconditionally and at the top level of components or custom hooks.
|
|
||||||
- Keep page-level components under `src/pages`.
|
|
||||||
- Keep shared and feature components under `src/components`.
|
|
||||||
- Use `react-router-dom` route params and navigation patterns already present in `src/App.tsx`.
|
|
||||||
- Encode URL path-segment values with `encodeURIComponent`.
|
|
||||||
|
|
||||||
## TanStack Query
|
|
||||||
|
|
||||||
- Use `@tanstack/react-query` for server state.
|
|
||||||
- Query keys should come from `src/lib/queryKeys.ts`; add key builders there instead of using ad hoc arrays in components.
|
|
||||||
- Fetch functions should live in domain helpers under `src/lib`, such as `posts.ts`, `tags.ts`, or `wiki.ts`.
|
|
||||||
- Use `useQueryClient().invalidateQueries` with the shared root keys when mutations affect cached lists or detail views.
|
|
||||||
- The app-wide `QueryClient` is configured in `src/main.tsx`; do not create additional clients in feature code.
|
|
||||||
|
|
||||||
## API calls
|
|
||||||
|
|
||||||
- Use `src/lib/api.ts` for HTTP calls.
|
|
||||||
- The API wrapper attaches `X-Transfer-Code` from `localStorage` and converts non-blob responses to camelCase.
|
|
||||||
- Send Rails snake_case params and request body keys where the backend expects them.
|
|
||||||
- Do not bypass the API wrapper unless there is a specific reason, such as a third-party request outside the Rails API.
|
|
||||||
- For blob responses, pass `responseType: 'blob'` so the wrapper does not camelCase the body.
|
|
||||||
|
|
||||||
## Imports and aliases
|
|
||||||
|
|
||||||
- The `@` alias points to `frontend/src`.
|
|
||||||
- Prefer `@/...` imports for app code instead of long relative paths.
|
|
||||||
- Keep type imports separate with `import type`.
|
|
||||||
- Match existing import grouping: external packages, app modules, then type imports.
|
|
||||||
|
|
||||||
## Tailwind and UI
|
|
||||||
|
|
||||||
- Tailwind scans `src/**/*.{html,js,ts,jsx,tsx,mdx}`.
|
|
||||||
- Use `cn` from `src/lib/utils.ts` for conditional class names and class merging.
|
|
||||||
- Reuse components from `src/components/common`, `src/components/layout`, and `src/components/ui` before adding new primitives.
|
|
||||||
- Keep Tailwind classes consistent with nearby components.
|
|
||||||
- When adding dynamic tag color classes, update `tailwind.config.js` safelist if the class cannot be statically detected.
|
|
||||||
- Do not introduce new UI libraries or production dependencies without approval.
|
|
||||||
|
|
||||||
## Lint and build constraints
|
|
||||||
|
|
||||||
- ESLint uses `@eslint/js`, `typescript-eslint`, `eslint-plugin-react-hooks`, and `eslint-plugin-react-refresh`.
|
|
||||||
- The hooks rules are enforced; fix hook ordering instead of disabling the rule.
|
|
||||||
- `react-refresh/only-export-components` is enabled as a warning with `allowConstantExport`.
|
|
||||||
- Build failures from unused locals or unused parameters are TypeScript errors, not lint-only issues.
|
|
||||||
|
|
||||||
## Files to avoid in routine work
|
|
||||||
|
|
||||||
- Do not edit `dist/` output directly.
|
|
||||||
- Do not inspect or modify `node_modules/` unless explicitly needed.
|
|
||||||
- Keep generated build artifacts out of source changes unless the user asks for them.
|
|
||||||
@@ -8,10 +8,8 @@ import { BrowserRouter,
|
|||||||
|
|
||||||
import RouteBlockerOverlay from '@/components/RouteBlockerOverlay'
|
import RouteBlockerOverlay from '@/components/RouteBlockerOverlay'
|
||||||
import TopNav from '@/components/TopNav'
|
import TopNav from '@/components/TopNav'
|
||||||
import DialogueProvider from '@/components/dialogues/DialogueProvider'
|
|
||||||
import { Toaster } from '@/components/ui/toaster'
|
import { Toaster } from '@/components/ui/toaster'
|
||||||
import { apiPost, isApiError } from '@/lib/api'
|
import { apiPost, isApiError } from '@/lib/api'
|
||||||
import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
|
|
||||||
import MaterialBasePage from '@/pages/materials/MaterialBasePage'
|
import MaterialBasePage from '@/pages/materials/MaterialBasePage'
|
||||||
import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
|
import MaterialDetailPage from '@/pages/materials/MaterialDetailPage'
|
||||||
import MaterialListPage from '@/pages/materials/MaterialListPage'
|
import MaterialListPage from '@/pages/materials/MaterialListPage'
|
||||||
@@ -60,7 +58,6 @@ const RouteTransitionWrapper = ({ user, setUser }: {
|
|||||||
<Route path="/posts/changes" element={<PostHistoryPage/>}/>
|
<Route path="/posts/changes" element={<PostHistoryPage/>}/>
|
||||||
<Route path="/tags" element={<TagListPage/>}/>
|
<Route path="/tags" element={<TagListPage/>}/>
|
||||||
<Route path="/tags/:id" element={<TagDetailPage/>}/>
|
<Route path="/tags/:id" element={<TagDetailPage/>}/>
|
||||||
<Route path="/tags/:id/deerjikists" element={<DeerjikistDetailPage/>}/>
|
|
||||||
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
|
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
|
||||||
<Route path="/tags/changes" element={<TagHistoryPage/>}/>
|
<Route path="/tags/changes" element={<TagHistoryPage/>}/>
|
||||||
<Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
|
<Route path="/theatres/:id" element={<TheatreDetailPage/>}/>
|
||||||
@@ -139,9 +136,7 @@ export default (() => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<RouteBlockerOverlay/>
|
<RouteBlockerOverlay/>
|
||||||
|
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<DialogueProvider>
|
|
||||||
<LayoutGroup>
|
<LayoutGroup>
|
||||||
<motion.div
|
<motion.div
|
||||||
layout="position"
|
layout="position"
|
||||||
@@ -151,9 +146,7 @@ export default (() => {
|
|||||||
<RouteTransitionWrapper user={user} setUser={setUser}/>
|
<RouteTransitionWrapper user={user} setUser={setUser}/>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</LayoutGroup>
|
</LayoutGroup>
|
||||||
|
|
||||||
<Toaster/>
|
<Toaster/>
|
||||||
</DialogueProvider>
|
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</>)
|
</>)
|
||||||
}) satisfies FC
|
}) satisfies FC
|
||||||
|
|||||||
@@ -3,12 +3,10 @@ import { useEffect, useState } from 'react'
|
|||||||
import PostFormTagsArea from '@/components/PostFormTagsArea'
|
import PostFormTagsArea from '@/components/PostFormTagsArea'
|
||||||
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
||||||
import Label from '@/components/common/Label'
|
import Label from '@/components/common/Label'
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|
||||||
import { Button } from '@/components/ui/button'
|
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, FormEvent } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
import type { Post, Tag } from '@/types'
|
import type { Post, Tag } from '@/types'
|
||||||
|
|
||||||
@@ -33,86 +31,24 @@ type Props = { post: Post
|
|||||||
|
|
||||||
|
|
||||||
export default (({ post, onSave }: Props) => {
|
export default (({ post, onSave }: Props) => {
|
||||||
const [disabled, setDisabled] = useState (false)
|
|
||||||
const [originalCreatedBefore, setOriginalCreatedBefore] =
|
const [originalCreatedBefore, setOriginalCreatedBefore] =
|
||||||
useState<string | null> (post.originalCreatedBefore)
|
useState<string | null> (post.originalCreatedBefore)
|
||||||
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
||||||
useState<string | null> (post.originalCreatedFrom)
|
useState<string | null> (post.originalCreatedFrom)
|
||||||
const [parentPostIds, setParentPostIds] =
|
|
||||||
useState ((post.parentPosts ?? []).map (p => p.id).join (' '))
|
|
||||||
const [tags, setTags] = useState<string> ('')
|
|
||||||
const [title, setTitle] = useState (post.title)
|
const [title, setTitle] = useState (post.title)
|
||||||
|
const [tags, setTags] = useState<string> ('')
|
||||||
|
|
||||||
const dialogue = useDialogue ()
|
const handleSubmit = async () => {
|
||||||
|
const data = await apiPut<Post> (
|
||||||
const update = async (...args: Parameters<typeof updatePost>) => {
|
`/posts/${ post.id }`,
|
||||||
try
|
{ title, tags, original_created_from: originalCreatedFrom,
|
||||||
{
|
original_created_before: originalCreatedBefore },
|
||||||
const data = await updatePost (...args)
|
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||||
onSave ({ ...post,
|
onSave ({ ...post,
|
||||||
versionNo: data.versionNo,
|
|
||||||
title: data.title,
|
title: data.title,
|
||||||
tags: data.tags,
|
tags: data.tags,
|
||||||
parentPosts: data.parentPosts,
|
|
||||||
childPosts: data.childPosts,
|
|
||||||
siblingPosts: data.siblingPosts,
|
|
||||||
originalCreatedFrom: data.originalCreatedFrom,
|
originalCreatedFrom: data.originalCreatedFrom,
|
||||||
originalCreatedBefore: data.originalCreatedBefore } as Post)
|
originalCreatedBefore: data.originalCreatedBefore } as Post)
|
||||||
toast ({ description: '更新しました.' })
|
|
||||||
}
|
|
||||||
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)
|
|
||||||
try
|
|
||||||
{
|
|
||||||
await update ({ id: post.id, title, tags, parentPostIds,
|
|
||||||
originalCreatedFrom, originalCreatedBefore },
|
|
||||||
{ baseVersionNo: post.versionNo })
|
|
||||||
}
|
|
||||||
finally
|
|
||||||
{
|
|
||||||
setDisabled (false)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
@@ -120,48 +56,30 @@ export default (({ post, onSave }: Props) => {
|
|||||||
}, [post])
|
}, [post])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
|
<div className="max-w-xl pt-2 space-y-4">
|
||||||
{/* タイトル */}
|
{/* タイトル */}
|
||||||
<div>
|
<div>
|
||||||
<Label>タイトル</Label>
|
<Label>タイトル</Label>
|
||||||
<input
|
<input type="text"
|
||||||
type="text"
|
|
||||||
disabled={disabled}
|
|
||||||
className="w-full border rounded p-2"
|
className="w-full border rounded p-2"
|
||||||
value={title ?? ''}
|
value={title ?? ''}
|
||||||
onChange={ev => setTitle (ev.target.value)}/>
|
onChange={ev => setTitle (ev.target.value)}/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* 親投稿 */}
|
|
||||||
<div>
|
|
||||||
<Label>親投稿</Label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
disabled={disabled}
|
|
||||||
value={parentPostIds}
|
|
||||||
onChange={e => setParentPostIds (e.target.value)}
|
|
||||||
className="w-full border p-2 rounded"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<PostFormTagsArea
|
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
||||||
disabled={disabled}
|
|
||||||
tags={tags}
|
|
||||||
setTags={setTags}/>
|
|
||||||
|
|
||||||
{/* オリジナルの作成日時 */}
|
{/* オリジナルの作成日時 */}
|
||||||
<PostOriginalCreatedTimeField
|
<PostOriginalCreatedTimeField
|
||||||
disabled={disabled}
|
|
||||||
originalCreatedFrom={originalCreatedFrom}
|
originalCreatedFrom={originalCreatedFrom}
|
||||||
setOriginalCreatedFrom={setOriginalCreatedFrom}
|
setOriginalCreatedFrom={setOriginalCreatedFrom}
|
||||||
originalCreatedBefore={originalCreatedBefore}
|
originalCreatedBefore={originalCreatedBefore}
|
||||||
setOriginalCreatedBefore={setOriginalCreatedBefore}/>
|
setOriginalCreatedBefore={setOriginalCreatedBefore}/>
|
||||||
|
|
||||||
{/* 送信 */}
|
{/* 送信 */}
|
||||||
<Button
|
<Button onClick={handleSubmit}
|
||||||
type="submit"
|
className="px-4 py-2 bg-blue-600 text-white rounded disabled:bg-gray-400">
|
||||||
disabled={disabled}>
|
|
||||||
更新
|
更新
|
||||||
</Button>
|
</Button>
|
||||||
</form>)
|
</div>)
|
||||||
}) satisfies FC<Props>
|
}) satisfies FC<Props>
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import YoutubeEmbed from 'react-youtube'
|
|||||||
|
|
||||||
import NicoViewer from '@/components/NicoViewer'
|
import NicoViewer from '@/components/NicoViewer'
|
||||||
import TwitterEmbed from '@/components/TwitterEmbed'
|
import TwitterEmbed from '@/components/TwitterEmbed'
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|
||||||
|
|
||||||
import type { FC, RefObject } from 'react'
|
import type { FC, RefObject } from 'react'
|
||||||
|
|
||||||
@@ -17,8 +16,6 @@ type Props = {
|
|||||||
|
|
||||||
|
|
||||||
export default (({ ref, post, onLoadComplete, onMetadataChange }: Props) => {
|
export default (({ ref, post, onLoadComplete, onMetadataChange }: Props) => {
|
||||||
const dialogue = useDialogue ()
|
|
||||||
|
|
||||||
const url = new URL (post.url)
|
const url = new URL (post.url)
|
||||||
|
|
||||||
switch (url.hostname.split ('.').slice (-2).join ('.'))
|
switch (url.hostname.split ('.').slice (-2).join ('.'))
|
||||||
@@ -85,17 +82,12 @@ export default (({ ref, post, onLoadComplete, onMetadataChange }: Props) => {
|
|||||||
height={360}/>)
|
height={360}/>)
|
||||||
: (
|
: (
|
||||||
<div>
|
<div>
|
||||||
<a href="#" onClick={async e => {
|
<a href="#" onClick={e => {
|
||||||
e.preventDefault ()
|
e.preventDefault ()
|
||||||
|
setFramed (confirm ('未確認の外部ページを表示します。\n'
|
||||||
setFramed (await dialogue.confirm ({
|
+ '悪意のあるスクリプトが実行される可能性があります。\n'
|
||||||
title: '未確認の外部ページを表示します。',
|
+ '表示しますか?'))
|
||||||
description: (
|
return
|
||||||
<div>
|
|
||||||
<p>悪意のあるスクリプトが実行される可能性があります。</p>
|
|
||||||
<p>表示しますか?</p>
|
|
||||||
</div>),
|
|
||||||
confirmText: '表示' }))
|
|
||||||
}}>
|
}}>
|
||||||
外部ページを表示
|
外部ページを表示
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import Label from '@/components/common/Label'
|
|||||||
import TextArea from '@/components/common/TextArea'
|
import TextArea from '@/components/common/TextArea'
|
||||||
import { apiGet } from '@/lib/api'
|
import { apiGet } from '@/lib/api'
|
||||||
|
|
||||||
import type { ComponentPropsWithoutRef, FC, SyntheticEvent } from 'react'
|
import type { FC, SyntheticEvent } from 'react'
|
||||||
|
|
||||||
import type { Tag } from '@/types'
|
import type { Tag } from '@/types'
|
||||||
|
|
||||||
@@ -31,12 +31,12 @@ const replaceToken = (value: string, start: number, end: number, text: string) =
|
|||||||
`${ value.slice (0, start) }${ text }${ value.slice (end) }`
|
`${ value.slice (0, start) }${ text }${ value.slice (end) }`
|
||||||
|
|
||||||
|
|
||||||
type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
|
type Props = {
|
||||||
tags: string
|
tags: string
|
||||||
setTags: (tags: string) => void }
|
setTags: (tags: string) => void }
|
||||||
|
|
||||||
|
|
||||||
export default (({ tags, setTags, ...rest }: Props) => {
|
export default (({ tags, setTags }: Props) => {
|
||||||
const ref = useRef<HTMLTextAreaElement> (null)
|
const ref = useRef<HTMLTextAreaElement> (null)
|
||||||
|
|
||||||
const [bounds, setBounds] = useState<{ start: number; end: number }> ({ start: 0, end: 0 })
|
const [bounds, setBounds] = useState<{ start: number; end: number }> ({ start: 0, end: 0 })
|
||||||
@@ -76,7 +76,6 @@ export default (({ tags, setTags, ...rest }: Props) => {
|
|||||||
<div className="relative w-full">
|
<div className="relative w-full">
|
||||||
<Label>タグ</Label>
|
<Label>タグ</Label>
|
||||||
<TextArea
|
<TextArea
|
||||||
{...rest}
|
|
||||||
ref={ref}
|
ref={ref}
|
||||||
value={tags}
|
value={tags}
|
||||||
onChange={ev => setTags (ev.target.value)}
|
onChange={ev => setTags (ev.target.value)}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { useRef } from 'react'
|
|||||||
import { useLocation } from 'react-router-dom'
|
import { useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
import { cn } from '@/lib/utils'
|
|
||||||
import { useSharedTransitionStore } from '@/stores/sharedTransitionStore'
|
import { useSharedTransitionStore } from '@/stores/sharedTransitionStore'
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC, MouseEvent } from 'react'
|
||||||
@@ -40,10 +39,8 @@ export default (({ posts, onClick }: Props) => {
|
|||||||
<motion.div
|
<motion.div
|
||||||
ref={cardRef}
|
ref={cardRef}
|
||||||
layoutId={layoutId}
|
layoutId={layoutId}
|
||||||
className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
|
className="w-full h-full overflow-hidden rounded-xl shadow
|
||||||
'transform-gpu will-change-transform',
|
transform-gpu will-change-transform"
|
||||||
(post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
|
|
||||||
(post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
|
|
||||||
whileHover={{ scale: 1.02 }}
|
whileHover={{ scale: 1.02 }}
|
||||||
onLayoutAnimationStart={() => {
|
onLayoutAnimationStart={() => {
|
||||||
if (!(cardRef.current))
|
if (!(cardRef.current))
|
||||||
|
|||||||
@@ -5,15 +5,13 @@ import { Button } from '@/components/ui/button'
|
|||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
disabled?: boolean
|
|
||||||
originalCreatedFrom: string | null
|
originalCreatedFrom: string | null
|
||||||
setOriginalCreatedFrom: (x: string | null) => void
|
setOriginalCreatedFrom: (x: string | null) => void
|
||||||
originalCreatedBefore: string | null
|
originalCreatedBefore: string | null
|
||||||
setOriginalCreatedBefore: (x: string | null) => void }
|
setOriginalCreatedBefore: (x: string | null) => void }
|
||||||
|
|
||||||
|
|
||||||
export default (({ disabled,
|
export default (({ originalCreatedFrom,
|
||||||
originalCreatedFrom,
|
|
||||||
setOriginalCreatedFrom,
|
setOriginalCreatedFrom,
|
||||||
originalCreatedBefore,
|
originalCreatedBefore,
|
||||||
setOriginalCreatedBefore }: Props) => (
|
setOriginalCreatedBefore }: Props) => (
|
||||||
@@ -23,7 +21,6 @@ export default (({ disabled,
|
|||||||
<div className="w-80">
|
<div className="w-80">
|
||||||
<DateTimeField
|
<DateTimeField
|
||||||
className="mr-2"
|
className="mr-2"
|
||||||
disabled={disabled ?? false}
|
|
||||||
value={originalCreatedFrom ?? undefined}
|
value={originalCreatedFrom ?? undefined}
|
||||||
onChange={setOriginalCreatedFrom}
|
onChange={setOriginalCreatedFrom}
|
||||||
onBlur={ev => {
|
onBlur={ev => {
|
||||||
@@ -43,7 +40,6 @@ export default (({ disabled,
|
|||||||
<div>
|
<div>
|
||||||
<Button
|
<Button
|
||||||
className="bg-gray-600 text-white rounded"
|
className="bg-gray-600 text-white rounded"
|
||||||
disabled={disabled}
|
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setOriginalCreatedFrom (null)
|
setOriginalCreatedFrom (null)
|
||||||
}}>
|
}}>
|
||||||
@@ -55,7 +51,6 @@ export default (({ disabled,
|
|||||||
<div className="w-80">
|
<div className="w-80">
|
||||||
<DateTimeField
|
<DateTimeField
|
||||||
className="mr-2"
|
className="mr-2"
|
||||||
disabled={disabled}
|
|
||||||
value={originalCreatedBefore ?? undefined}
|
value={originalCreatedBefore ?? undefined}
|
||||||
onChange={setOriginalCreatedBefore}/>
|
onChange={setOriginalCreatedBefore}/>
|
||||||
より前
|
より前
|
||||||
@@ -63,7 +58,6 @@ export default (({ disabled,
|
|||||||
<div>
|
<div>
|
||||||
<Button
|
<Button
|
||||||
className="bg-gray-600 text-white rounded"
|
className="bg-gray-600 text-white rounded"
|
||||||
disabled={disabled}
|
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setOriginalCreatedBefore (null)
|
setOriginalCreatedBefore (null)
|
||||||
}}>
|
}}>
|
||||||
|
|||||||
@@ -45,9 +45,9 @@ export default (({ tag,
|
|||||||
<>
|
<>
|
||||||
{(linkFlg && withWiki) && (
|
{(linkFlg && withWiki) && (
|
||||||
<span className="mr-1">
|
<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
|
<PrefetchLink
|
||||||
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
||||||
@@ -55,19 +55,11 @@ export default (({ tag,
|
|||||||
?
|
?
|
||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
: (
|
: (
|
||||||
tag.materialId != null
|
|
||||||
? (
|
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/materials/${ tag.materialId }`}
|
to={`/materials/${ tag.materialId }`}
|
||||||
className={linkClass}>
|
className={linkClass}>
|
||||||
?
|
?
|
||||||
</PrefetchLink>)
|
</PrefetchLink>))
|
||||||
: (
|
|
||||||
<PrefetchLink
|
|
||||||
to={`/tags/${ tag.id }/deerjikists`}
|
|
||||||
className={linkClass}>
|
|
||||||
?
|
|
||||||
</PrefetchLink>)))
|
|
||||||
: (
|
: (
|
||||||
['character', 'material'].includes (tag.category)
|
['character', 'material'].includes (tag.category)
|
||||||
? (
|
? (
|
||||||
@@ -78,16 +70,6 @@ export default (({ tag,
|
|||||||
title={`${ tag.name } 素材情報が存在しません.`}>
|
title={`${ tag.name } 素材情報が存在しません.`}>
|
||||||
!
|
!
|
||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
: (
|
|
||||||
tag.category === 'deerjikist'
|
|
||||||
? (
|
|
||||||
<PrefetchLink
|
|
||||||
to={`/tags/${ tag.id }/deerjikists`}
|
|
||||||
className="animate-[wiki-blink_.25s_steps(2,end)_infinite]
|
|
||||||
dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
|
|
||||||
title={`${ tag.name } に関する情報が存在しません.`}>
|
|
||||||
!
|
|
||||||
</PrefetchLink>)
|
|
||||||
: (
|
: (
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
to={`/wiki/${ encodeURIComponent (tag.name) }`}
|
||||||
@@ -95,7 +77,7 @@ export default (({ tag,
|
|||||||
dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
|
dark:animate-[wiki-blink-dark_.25s_steps(2,end)_infinite]"
|
||||||
title={`${ tag.name } Wiki が存在しません.`}>
|
title={`${ tag.name } Wiki が存在しません.`}>
|
||||||
!
|
!
|
||||||
</PrefetchLink>)))}
|
</PrefetchLink>))}
|
||||||
</span>)}
|
</span>)}
|
||||||
{nestLevel > 0 && (
|
{nestLevel > 0 && (
|
||||||
<span
|
<span
|
||||||
|
|||||||
@@ -36,12 +36,12 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
|
|||||||
{ name: '一覧', to: '/posts' },
|
{ name: '一覧', to: '/posts' },
|
||||||
{ name: '検索', to: '/posts/search' },
|
{ name: '検索', to: '/posts/search' },
|
||||||
{ name: '追加', to: '/posts/new' },
|
{ name: '追加', to: '/posts/new' },
|
||||||
{ name: '全体履歴', to: '/posts/changes' },
|
{ name: '履歴', to: '/posts/changes' },
|
||||||
{ name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] },
|
{ name: 'ヘルプ', to: '/wiki/ヘルプ:広場' }] },
|
||||||
{ name: 'タグ', to: '/tags', subMenu: [
|
{ name: 'タグ', to: '/tags', subMenu: [
|
||||||
{ name: 'マスタ', to: '/tags' },
|
{ name: 'マスタ', to: '/tags' },
|
||||||
{ name: 'ニコニコ連携', to: '/tags/nico' },
|
{ name: 'ニコニコ連携', to: '/tags/nico' },
|
||||||
{ name: '全体履歴', to: '/tags/changes' },
|
{ name: '履歴', to: '/tags/changes' },
|
||||||
{ name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' },
|
{ name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' },
|
||||||
{ component: <Separator/>, visible: tagFlg },
|
{ component: <Separator/>, visible: tagFlg },
|
||||||
{ name: `広場 (${ postCount || 0 })`,
|
{ name: `広場 (${ postCount || 0 })`,
|
||||||
@@ -53,7 +53,7 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
|
|||||||
{ name: '一覧', to: '/materials' },
|
{ name: '一覧', to: '/materials' },
|
||||||
{ name: '検索', to: '/materials/search', visible: false },
|
{ name: '検索', to: '/materials/search', visible: false },
|
||||||
{ name: '追加', to: '/materials/new' },
|
{ name: '追加', to: '/materials/new' },
|
||||||
{ name: '全体履歴', to: '/materials/changes', visible: false },
|
{ name: '履歴', to: '/materials/changes', visible: false },
|
||||||
{ name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
|
{ name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
|
||||||
{ name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
|
{ name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
|
||||||
{ name: <>第 1 会場</>, to: '/theatres/1' },
|
{ name: <>第 1 会場</>, to: '/theatres/1' },
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
|
|||||||
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { ComponentPropsWithoutRef, FC, FocusEvent } from 'react'
|
import type { FC, FocusEvent } from 'react'
|
||||||
|
|
||||||
|
|
||||||
const pad = (n: number): string => n.toString ().padStart (2, '0')
|
const pad = (n: number): string => n.toString ().padStart (2, '0')
|
||||||
@@ -18,14 +18,14 @@ const toDateTimeLocalValue = (d: Date) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
type Props = Omit<ComponentPropsWithoutRef<'input'>, 'onChange'> & {
|
type Props = {
|
||||||
value?: string
|
value?: string
|
||||||
onChange?: (isoUTC: string | null) => void
|
onChange?: (isoUTC: string | null) => void
|
||||||
className?: string
|
className?: string
|
||||||
onBlur?: (ev: FocusEvent<HTMLInputElement>) => void }
|
onBlur?: (ev: FocusEvent<HTMLInputElement>) => void }
|
||||||
|
|
||||||
|
|
||||||
export default (({ value, onChange, className, onBlur, ...rest }: Props) => {
|
export default (({ value, onChange, className, onBlur }: Props) => {
|
||||||
const [local, setLocal] = useState ('')
|
const [local, setLocal] = useState ('')
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
@@ -34,7 +34,6 @@ export default (({ value, onChange, className, onBlur, ...rest }: Props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<input
|
<input
|
||||||
{...rest}
|
|
||||||
className={cn ('border rounded p-2', className)}
|
className={cn ('border rounded p-2', className)}
|
||||||
type="datetime-local"
|
type="datetime-local"
|
||||||
value={local}
|
value={local}
|
||||||
|
|||||||
@@ -1,187 +0,0 @@
|
|||||||
import { createContext, useCallback, useContext, useMemo, useState } from 'react'
|
|
||||||
|
|
||||||
import { Button } from '@/components/ui/button'
|
|
||||||
import { Dialog,
|
|
||||||
DialogContent,
|
|
||||||
DialogDescription,
|
|
||||||
DialogFooter,
|
|
||||||
DialogHeader,
|
|
||||||
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 className="px-6 pb-6 pt-7">
|
|
||||||
<DialogHeader className="pl-8">
|
|
||||||
<DialogTitle>{active.options.title}</DialogTitle>
|
|
||||||
|
|
||||||
{active.options.description && (
|
|
||||||
<DialogDescription asChild>
|
|
||||||
<div>{active.options.description}</div>
|
|
||||||
</DialogDescription>)}
|
|
||||||
</DialogHeader>
|
|
||||||
|
|
||||||
<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
|
|
||||||
}
|
|
||||||
@@ -4,47 +4,34 @@ import { cva, type VariantProps } from "class-variance-authority"
|
|||||||
|
|
||||||
import { cn } from "@/lib/utils"
|
import { cn } from "@/lib/utils"
|
||||||
|
|
||||||
const buttonVariants = cva (
|
const buttonVariants = cva(
|
||||||
[
|
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
|
||||||
'inline-flex items-center justify-center gap-2 whitespace-nowrap',
|
|
||||||
'rounded-md text-sm font-medium transition-colors',
|
|
||||||
'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-400',
|
|
||||||
'disabled:pointer-events-none disabled:opacity-50',
|
|
||||||
'[&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
|
|
||||||
].join (' '),
|
|
||||||
{
|
{
|
||||||
variants: {
|
variants: {
|
||||||
variant: {
|
variant: {
|
||||||
default:
|
default: "bg-primary text-primary-foreground hover:bg-primary/90",
|
||||||
'bg-slate-900 text-white hover:bg-slate-700 dark:bg-slate-100 dark:text-slate-900 dark:hover:bg-slate-300',
|
|
||||||
|
|
||||||
destructive:
|
destructive:
|
||||||
'bg-red-600 text-white hover:bg-red-700 dark:bg-red-700 dark:hover:bg-red-600',
|
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
|
||||||
|
|
||||||
outline:
|
outline:
|
||||||
'border border-slate-300 bg-white text-slate-900 hover:bg-slate-100 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-100 dark:hover:bg-slate-800',
|
"border border-input bg-background hover:bg-accent hover:text-accent-foreground",
|
||||||
|
|
||||||
secondary:
|
secondary:
|
||||||
'bg-slate-100 text-slate-900 hover:bg-slate-200 dark:bg-slate-800 dark:text-slate-100 dark:hover:bg-slate-700',
|
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
|
||||||
|
ghost: "hover:bg-accent hover:text-accent-foreground",
|
||||||
ghost:
|
link: "text-primary underline-offset-4 hover:underline",
|
||||||
'text-slate-900 hover:bg-slate-100 dark:text-slate-100 dark:hover:bg-slate-800',
|
|
||||||
|
|
||||||
link:
|
|
||||||
'text-blue-700 underline-offset-4 hover:underline dark:text-blue-300',
|
|
||||||
},
|
},
|
||||||
size: {
|
size: {
|
||||||
default: 'h-10 px-4 py-2',
|
default: "h-10 px-4 py-2",
|
||||||
sm: 'h-9 rounded-md px-3',
|
sm: "h-9 rounded-md px-3",
|
||||||
lg: 'h-11 rounded-md px-8',
|
lg: "h-11 rounded-md px-8",
|
||||||
icon: 'h-10 w-10',
|
icon: "h-10 w-10",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
defaultVariants: {
|
defaultVariants: {
|
||||||
variant: 'default',
|
variant: "default",
|
||||||
size: 'default',
|
size: "default",
|
||||||
},
|
},
|
||||||
})
|
}
|
||||||
|
)
|
||||||
|
|
||||||
export interface ButtonProps
|
export interface ButtonProps
|
||||||
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
|
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
|
||||||
|
|||||||
@@ -37,29 +37,25 @@ const DialogContent = React.forwardRef<
|
|||||||
<DialogOverlay />
|
<DialogOverlay />
|
||||||
<DialogPrimitive.Content
|
<DialogPrimitive.Content
|
||||||
ref={ref}
|
ref={ref}
|
||||||
className={cn (
|
className={cn(
|
||||||
'fixed left-[50%] top-[50%] z-50 grid w-[calc(100%-2rem)] max-w-lg',
|
'fixed left-[50%] top-[50%] z-50 w-[90%] grid max-w-lg',
|
||||||
'translate-x-[-50%] translate-y-[-50%]',
|
'translate-x-[-50%] translate-y-[-50%]',
|
||||||
'gap-5 rounded-2xl border border-border',
|
'gap-4 border bg-gray-300/80 dark:bg-gray-700/80',
|
||||||
'bg-background p-6 text-foreground shadow-2xl',
|
'p-6 shadow-lg duration-200',
|
||||||
'duration-200',
|
|
||||||
'data-[state=open]:animate-in data-[state=closed]:animate-out',
|
'data-[state=open]:animate-in data-[state=closed]:animate-out',
|
||||||
'data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
|
'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]: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)}
|
className)}
|
||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
{children}
|
{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">
|
||||||
<DialogPrimitive.Close
|
<X className="h-3 w-3" />
|
||||||
className={cn (
|
<span className="sr-only">Close</span>
|
||||||
'absolute left-4 top-4 rounded-full p-1',
|
|
||||||
'text-slate-500 transition-colors',
|
|
||||||
'hover:bg-slate-200 hover:text-slate-900',
|
|
||||||
'dark:text-slate-400 dark:hover:bg-slate-700 dark:hover:text-slate-50',
|
|
||||||
'focus:outline-none focus:ring-2 focus:ring-slate-400')}>
|
|
||||||
<X className="h-4 w-4"/>
|
|
||||||
<span className="sr-only">閉ぢる</span>
|
|
||||||
</DialogPrimitive.Close>
|
</DialogPrimitive.Close>
|
||||||
</DialogPrimitive.Content>
|
</DialogPrimitive.Content>
|
||||||
</DialogPortal>
|
</DialogPortal>
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
|
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { Dialog,
|
import { Dialog,
|
||||||
DialogContent,
|
DialogContent,
|
||||||
DialogDescription,
|
|
||||||
DialogHeader,
|
|
||||||
DialogTitle } from '@/components/ui/dialog'
|
DialogTitle } from '@/components/ui/dialog'
|
||||||
import { Input } from '@/components/ui/input'
|
import { Input } from '@/components/ui/input'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
@@ -19,16 +16,10 @@ type Props = { visible: boolean
|
|||||||
|
|
||||||
|
|
||||||
export default ({ visible, onVisibleChange, setUser }: Props) => {
|
export default ({ visible, onVisibleChange, setUser }: Props) => {
|
||||||
const dialogue = useDialogue ()
|
|
||||||
|
|
||||||
const [inputCode, setInputCode] = useState ('')
|
const [inputCode, setInputCode] = useState ('')
|
||||||
|
|
||||||
const handleTransfer = async () => {
|
const handleTransfer = async () => {
|
||||||
if (!(await dialogue.confirm ({
|
if (!(confirm ('引継ぎを行ってもよろしいですか?\n現在のアカウントからはログアウトされます.')))
|
||||||
title: '引継ぎを行ってもよろしいですか?',
|
|
||||||
description: '現在のアカウントからはログアウトされます.',
|
|
||||||
confirmText: '引継ぐ',
|
|
||||||
variant: 'danger' })))
|
|
||||||
return
|
return
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -53,18 +44,14 @@ export default ({ visible, onVisibleChange, setUser }: Props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog open={visible} onOpenChange={onVisibleChange}>
|
<Dialog open={visible} onOpenChange={onVisibleChange}>
|
||||||
<DialogContent className="px-6 pp-6 pt-7">
|
<DialogContent>
|
||||||
<DialogHeader className="pl-8">
|
|
||||||
<DialogTitle>ほかのブラウザから引継ぐ</DialogTitle>
|
<DialogTitle>ほかのブラウザから引継ぐ</DialogTitle>
|
||||||
<DialogDescription asChild>
|
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
<Input placeholder="引継ぎコードを入力"
|
<Input placeholder="引継ぎコードを入力"
|
||||||
value={inputCode}
|
value={inputCode}
|
||||||
onChange={ev => setInputCode (ev.target.value)}/>
|
onChange={ev => setInputCode (ev.target.value)}/>
|
||||||
<Button onClick={handleTransfer}>引継ぐ</Button>
|
<Button onClick={handleTransfer}>引継ぐ</Button>
|
||||||
</div>
|
</div>
|
||||||
</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>)
|
</Dialog>)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,6 @@
|
|||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { Dialog,
|
import { Dialog,
|
||||||
DialogContent,
|
DialogContent,
|
||||||
DialogDescription,
|
|
||||||
DialogFooter,
|
|
||||||
DialogHeader,
|
|
||||||
DialogTitle } from '@/components/ui/dialog'
|
DialogTitle } from '@/components/ui/dialog'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { apiPost } from '@/lib/api'
|
import { apiPost } from '@/lib/api'
|
||||||
@@ -18,20 +14,11 @@ type Props = { visible: boolean
|
|||||||
|
|
||||||
|
|
||||||
export default ({ visible, onVisibleChange, user, setUser }: Props) => {
|
export default ({ visible, onVisibleChange, user, setUser }: Props) => {
|
||||||
const dialogue = useDialogue ()
|
|
||||||
|
|
||||||
const handleChange = async () => {
|
const handleChange = async () => {
|
||||||
if (!(user))
|
if (!(user))
|
||||||
return
|
return
|
||||||
|
|
||||||
if (!(await dialogue.confirm ({
|
if (!(confirm ('引継ぎコードを再発行しますか?\n再発行するとほかのブラウザからはログアウトされます.')))
|
||||||
title: '引継ぎコードを再発行しますか?',
|
|
||||||
description: (
|
|
||||||
<div>
|
|
||||||
<p>再発行するとほかのブラウザからはログアウトされます.</p>
|
|
||||||
</div>),
|
|
||||||
confirmText: '再発行',
|
|
||||||
variant: 'danger' })))
|
|
||||||
return
|
return
|
||||||
|
|
||||||
const data = await apiPost<{ code: string }> ('/users/code/renew', { },
|
const data = await apiPost<{ code: string }> ('/users/code/renew', { },
|
||||||
@@ -46,26 +33,21 @@ export default ({ visible, onVisibleChange, user, setUser }: Props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog open={visible} onOpenChange={onVisibleChange}>
|
<Dialog open={visible} onOpenChange={onVisibleChange}>
|
||||||
<DialogContent className="px-6 pb-6 pt-7">
|
<DialogContent>
|
||||||
<DialogHeader className="pl-8">
|
|
||||||
<DialogTitle>引継ぎコード</DialogTitle>
|
<DialogTitle>引継ぎコード</DialogTitle>
|
||||||
|
|
||||||
<DialogDescription asChild>
|
|
||||||
<div>
|
<div>
|
||||||
<p>あなたの引継ぎコードはこちらです:</p>
|
<p>あなたの引継ぎコードはこちらです:</p>
|
||||||
<div className="m-2">{user?.inheritanceCode}</div>
|
<div className="m-2">{user?.inheritanceCode}</div>
|
||||||
<p className="mt-1 text-sm text-destructive">
|
<p className="mt-1 text-sm text-red-500">
|
||||||
このコードはほかの人には教えないでください!
|
このコードはほかの人には教えないでください!
|
||||||
</p>
|
</p>
|
||||||
</div>
|
<div className="my-4">
|
||||||
</DialogDescription>
|
<Button onClick={handleChange}
|
||||||
</DialogHeader>
|
className="px-4 py-2 bg-red-600 text-white rounded disabled:bg-gray-400">
|
||||||
|
|
||||||
<DialogFooter>
|
|
||||||
<Button onClick={handleChange} variant="destructive">
|
|
||||||
引継ぎコード再発行
|
引継ぎコード再発行
|
||||||
</Button>
|
</Button>
|
||||||
</DialogFooter>
|
</div>
|
||||||
|
</div>
|
||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>)
|
</Dialog>)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import type { Category, Platform } from 'types'
|
import type { Category } from 'types'
|
||||||
|
|
||||||
export const LIGHT_COLOUR_SHADE = 800
|
export const LIGHT_COLOUR_SHADE = 800
|
||||||
export const DARK_COLOUR_SHADE = 300
|
export const DARK_COLOUR_SHADE = 300
|
||||||
@@ -31,11 +31,6 @@ export const FETCH_POSTS_ORDER_FIELDS = [
|
|||||||
'updated_at',
|
'updated_at',
|
||||||
] as const
|
] 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 = {
|
export const TAG_COLOUR = {
|
||||||
deerjikist: 'rose',
|
deerjikist: 'rose',
|
||||||
meme: 'purple',
|
meme: 'purple',
|
||||||
|
|||||||
+28
-50
@@ -6,56 +6,6 @@
|
|||||||
|
|
||||||
@layer base
|
@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
|
body
|
||||||
{
|
{
|
||||||
@apply overflow-x-clip;
|
@apply overflow-x-clip;
|
||||||
@@ -104,6 +54,34 @@ body
|
|||||||
min-height: 100dvh;
|
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)
|
@media (prefers-color-scheme: light)
|
||||||
{
|
{
|
||||||
:root
|
:root
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { apiDelete, apiGet, apiPost, apiPut } from '@/lib/api'
|
import { apiDelete, apiGet, apiPost } from '@/lib/api'
|
||||||
|
|
||||||
import type { FetchPostsParams, Post, PostVersion } from '@/types'
|
import type { FetchPostsParams, Post, PostVersion } from '@/types'
|
||||||
|
|
||||||
@@ -42,30 +42,6 @@ export const fetchPostChanges = async (
|
|||||||
page, limit } })
|
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> => {
|
export const toggleViewedFlg = async (id: string, viewed: boolean): Promise<void> => {
|
||||||
await (viewed ? apiPost : apiDelete) (`/posts/${ id }/viewed`)
|
await (viewed ? apiPost : apiDelete) (`/posts/${ id }/viewed`)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,7 @@ export const tagsKeys = {
|
|||||||
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 = {
|
export const wikiKeys = {
|
||||||
root: ['wiki'] as const,
|
root: ['wiki'] as const,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { apiGet } from '@/lib/api'
|
import { apiGet } from '@/lib/api'
|
||||||
|
|
||||||
import type { Deerjikist, FetchTagsParams, Tag, TagVersion } from '@/types'
|
import type { FetchTagsParams, Tag, TagVersion } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
export const fetchTags = async (
|
export const fetchTags = async (
|
||||||
@@ -56,9 +56,3 @@ export const fetchTagChanges = async (
|
|||||||
versions: TagVersion[]
|
versions: TagVersion[]
|
||||||
count: number }> =>
|
count: number }> =>
|
||||||
await apiGet ('/tags/versions', { params: { ...(id && { id }), page, limit } })
|
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`)
|
|
||||||
|
|||||||
@@ -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=""> </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
|
|
||||||
@@ -21,7 +21,7 @@ import ServiceUnavailable from '@/pages/ServiceUnavailable'
|
|||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
import type { NiconicoViewerHandle, Post, User } from '@/types'
|
import type { NiconicoViewerHandle, User } from '@/types'
|
||||||
|
|
||||||
type Props = { user: User | null }
|
type Props = { user: User | null }
|
||||||
|
|
||||||
@@ -108,34 +108,6 @@ export default (({ user }: Props) => {
|
|||||||
{post
|
{post
|
||||||
? (
|
? (
|
||||||
<>
|
<>
|
||||||
{(post.childPosts ?? []).length > 0 && (
|
|
||||||
<div className="mb-4 bg-green-200 dark:bg-green-800 text-sm p-2 rounded-md">
|
|
||||||
<p>この投稿には {post.childPosts!.length} 件の子投稿があります.</p>
|
|
||||||
<PostList posts={[{ ...post, childPosts: [{ } as Post] },
|
|
||||||
...post.childPosts!.map (p => ({
|
|
||||||
...p, parentPosts: [{ } as Post] }))]}/>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{(post.parentPosts ?? []).map (pp => {
|
|
||||||
const siblings = post.siblingPosts?.[String (pp.id) as `${ number }`]
|
|
||||||
if (!(siblings))
|
|
||||||
return
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
key={pp.id}
|
|
||||||
className="mb-4 bg-yellow-200 dark:bg-yellow-800 text-sm p-2 rounded-md">
|
|
||||||
<p>
|
|
||||||
この投稿には 1 件の親投稿{
|
|
||||||
siblings.length > 1
|
|
||||||
&& `と ${ siblings.length - 1 } 件の姉妹投稿`}があります.
|
|
||||||
</p>
|
|
||||||
<PostList posts={[{ ...pp, childPosts: [{ } as Post] },
|
|
||||||
...siblings.map (p => ({
|
|
||||||
...p, parentPosts: [{ } as Post] }))]}/>
|
|
||||||
</div>)
|
|
||||||
})}
|
|
||||||
|
|
||||||
{(post.thumbnail || post.thumbnailBase) && (
|
{(post.thumbnail || post.thumbnailBase) && (
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={`page-${ id }`}
|
layoutId={`page-${ id }`}
|
||||||
@@ -174,6 +146,7 @@ export default (({ user }: Props) => {
|
|||||||
(prev: any) => newPost ?? prev)
|
(prev: any) => newPost ?? prev)
|
||||||
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
||||||
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
||||||
|
toast ({ description: '更新しました.' })
|
||||||
}}/>
|
}}/>
|
||||||
</Tab>)}
|
</Tab>)}
|
||||||
</TabGroup>
|
</TabGroup>
|
||||||
|
|||||||
@@ -8,18 +8,16 @@ import TagLink from '@/components/TagLink'
|
|||||||
import PrefetchLink from '@/components/PrefetchLink'
|
import PrefetchLink from '@/components/PrefetchLink'
|
||||||
import PageTitle from '@/components/common/PageTitle'
|
import PageTitle from '@/components/common/PageTitle'
|
||||||
import Pagination from '@/components/common/Pagination'
|
import Pagination from '@/components/common/Pagination'
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { fetchPostChanges, updatePost } from '@/lib/posts'
|
import { apiPut } from '@/lib/api'
|
||||||
|
import { fetchPostChanges } from '@/lib/posts'
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchTag } from '@/lib/tags'
|
import { fetchTag } from '@/lib/tags'
|
||||||
import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
|
import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
import type { PostVersion } from '@/types'
|
|
||||||
|
|
||||||
|
|
||||||
const renderDiff = (diff: { current: string | null; prev: string | null }) => (
|
const renderDiff = (diff: { current: string | null; prev: string | null }) => (
|
||||||
@@ -36,8 +34,6 @@ const renderDiff = (diff: { current: string | null; prev: string | null }) => (
|
|||||||
|
|
||||||
|
|
||||||
export default (() => {
|
export default (() => {
|
||||||
const dialogue = useDialogue ()
|
|
||||||
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
const id = query.get ('id')
|
const id = query.get ('id')
|
||||||
@@ -66,48 +62,6 @@ export default (() => {
|
|||||||
|
|
||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
|
|
||||||
const handleRevert = async (e: MouseEvent<HTMLAnchorElement>, change: PostVersion) => {
|
|
||||||
e.preventDefault ()
|
|
||||||
|
|
||||||
if (!(await dialogue.confirm ({
|
|
||||||
title: '差戻の確認',
|
|
||||||
description: `『${ change.title.current || change.url.current }』を版 ${
|
|
||||||
change.versionNo } に差戻します.\nよろしいですか?`,
|
|
||||||
confirmText: '差戻' })))
|
|
||||||
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 (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
}, [location.search])
|
}, [location.search])
|
||||||
@@ -141,8 +95,6 @@ export default (() => {
|
|||||||
<col className="w-96"/>
|
<col className="w-96"/>
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<col className="w-[48rem]"/>
|
<col className="w-[48rem]"/>
|
||||||
{/* TODO: 親投稿 */}
|
|
||||||
{/* <col className="w-[48rem]"/> */}
|
|
||||||
{/* オリジナルの投稿日時 */}
|
{/* オリジナルの投稿日時 */}
|
||||||
<col className="w-96"/>
|
<col className="w-96"/>
|
||||||
{/* 更新日時 */}
|
{/* 更新日時 */}
|
||||||
@@ -158,8 +110,6 @@ export default (() => {
|
|||||||
<th className="p-2 text-left">タイトル</th>
|
<th className="p-2 text-left">タイトル</th>
|
||||||
<th className="p-2 text-left">URL</th>
|
<th className="p-2 text-left">URL</th>
|
||||||
<th className="p-2 text-left">タグ</th>
|
<th className="p-2 text-left">タグ</th>
|
||||||
{/* TODO: 親投稿の履歴 */}
|
|
||||||
{/* <th className="p-2 text-left">親投稿</th> */}
|
|
||||||
<th className="p-2 text-left">オリジナルの投稿日時</th>
|
<th className="p-2 text-left">オリジナルの投稿日時</th>
|
||||||
<th className="p-2 text-left">更新日時</th>
|
<th className="p-2 text-left">更新日時</th>
|
||||||
<th className="p-2"/>
|
<th className="p-2"/>
|
||||||
@@ -230,29 +180,6 @@ export default (() => {
|
|||||||
{tag.name}
|
{tag.name}
|
||||||
</span>))))}
|
</span>))))}
|
||||||
</td>
|
</td>
|
||||||
{/* TODO: 親投稿の履歴 */}
|
|
||||||
{/* <td className="p-2">
|
|
||||||
{change.parentPosts.map ((pp, i) => (
|
|
||||||
pp.type === 'added'
|
|
||||||
? (
|
|
||||||
<ins
|
|
||||||
key={i}
|
|
||||||
className="mr-2 text-green-600 dark:text-green-400">
|
|
||||||
{pp.title}
|
|
||||||
</ins>)
|
|
||||||
: (
|
|
||||||
pp.type === 'removed'
|
|
||||||
? (
|
|
||||||
<del
|
|
||||||
key={i}
|
|
||||||
className="mr-2 text-red-600 dark:text-red-400">
|
|
||||||
{pp.title}
|
|
||||||
</del>)
|
|
||||||
: (
|
|
||||||
<span key={i} className="mr-2">
|
|
||||||
{pp.title}
|
|
||||||
</span>))))}
|
|
||||||
</td> */}
|
|
||||||
<td className="p-2">
|
<td className="p-2">
|
||||||
{change.versionNo === 1
|
{change.versionNo === 1
|
||||||
? originalCreatedAtString (change.originalCreatedFrom.current,
|
? originalCreatedAtString (change.originalCreatedFrom.current,
|
||||||
@@ -277,7 +204,41 @@ export default (() => {
|
|||||||
{dateString (change.createdAt)}
|
{dateString (change.createdAt)}
|
||||||
</td>
|
</td>
|
||||||
<td className="p-2">
|
<td className="p-2">
|
||||||
<a href="#" onClick={async e => await handleRevert (e, change)}>
|
<a
|
||||||
|
href="#"
|
||||||
|
onClick={async e => {
|
||||||
|
e.preventDefault ()
|
||||||
|
|
||||||
|
if (!(confirm (
|
||||||
|
`『${ change.title.current
|
||||||
|
|| change.url.current }』を版 ${
|
||||||
|
change.versionNo } に差戻します.\nよろしいですか?`)))
|
||||||
|
return
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await apiPut (
|
||||||
|
`/posts/${ change.postId }`,
|
||||||
|
{ title: change.title.current,
|
||||||
|
tags: change.tags
|
||||||
|
.filter (t => t.type !== 'removed')
|
||||||
|
.map (t => t.name)
|
||||||
|
.filter (t => t.slice (0, 5) !== 'nico:')
|
||||||
|
.join (' '),
|
||||||
|
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>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ export default (({ user }: Props) => {
|
|||||||
|
|
||||||
const [originalCreatedBefore, setOriginalCreatedBefore] = useState<string | null> (null)
|
const [originalCreatedBefore, setOriginalCreatedBefore] = useState<string | null> (null)
|
||||||
const [originalCreatedFrom, setOriginalCreatedFrom] = useState<string | null> (null)
|
const [originalCreatedFrom, setOriginalCreatedFrom] = useState<string | null> (null)
|
||||||
const [parentPostIds, setParentPostIds] = useState ('')
|
|
||||||
const [tags, setTags] = useState ('')
|
const [tags, setTags] = useState ('')
|
||||||
const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
|
const [thumbnailAutoFlg, setThumbnailAutoFlg] = useState (true)
|
||||||
const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
|
const [thumbnailFile, setThumbnailFile] = useState<File | null> (null)
|
||||||
@@ -47,7 +46,6 @@ export default (({ user }: Props) => {
|
|||||||
formData.append ('title', title)
|
formData.append ('title', title)
|
||||||
formData.append ('url', url)
|
formData.append ('url', url)
|
||||||
formData.append ('tags', tags)
|
formData.append ('tags', tags)
|
||||||
formData.append ('parent_post_ids', parentPostIds)
|
|
||||||
if (thumbnailFile)
|
if (thumbnailFile)
|
||||||
formData.append ('thumbnail', thumbnailFile)
|
formData.append ('thumbnail', thumbnailFile)
|
||||||
if (originalCreatedFrom)
|
if (originalCreatedFrom)
|
||||||
@@ -179,16 +177,6 @@ export default (({ user }: Props) => {
|
|||||||
className="mt-2 max-h-48 rounded border"/>)}
|
className="mt-2 max-h-48 rounded border"/>)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* 親投稿 */}
|
|
||||||
<div>
|
|
||||||
<Label>親投稿</Label>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
value={parentPostIds}
|
|
||||||
onChange={e => setParentPostIds (e.target.value)}
|
|
||||||
className="w-full border p-2 rounded"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
<PostFormTagsArea tags={tags} setTags={setTags}/>
|
||||||
|
|
||||||
|
|||||||
+2
-17
@@ -1,6 +1,5 @@
|
|||||||
import { CATEGORIES,
|
import { CATEGORIES,
|
||||||
FETCH_POSTS_ORDER_FIELDS,
|
FETCH_POSTS_ORDER_FIELDS,
|
||||||
PLATFORMS,
|
|
||||||
USER_ROLES,
|
USER_ROLES,
|
||||||
ViewFlagBehavior } from '@/consts'
|
ViewFlagBehavior } from '@/consts'
|
||||||
|
|
||||||
@@ -8,8 +7,6 @@ import type { ReactNode } from 'react'
|
|||||||
|
|
||||||
export type Category = typeof CATEGORIES[number]
|
export type Category = typeof CATEGORIES[number]
|
||||||
|
|
||||||
export type Deerjikist = { platform: Platform; code: string }
|
|
||||||
|
|
||||||
export type FetchPostsOrder = `${ FetchPostsOrderField }:${ 'asc' | 'desc' }`
|
export type FetchPostsOrder = `${ FetchPostsOrderField }:${ 'asc' | 'desc' }`
|
||||||
|
|
||||||
export type FetchPostsOrderField = typeof FETCH_POSTS_ORDER_FIELDS[number]
|
export type FetchPostsOrderField = typeof FETCH_POSTS_ORDER_FIELDS[number]
|
||||||
@@ -117,19 +114,13 @@ export type NiconicoViewerHandle = {
|
|||||||
showComments: () => void
|
showComments: () => void
|
||||||
hideComments: () => void }
|
hideComments: () => void }
|
||||||
|
|
||||||
export type Platform = typeof PLATFORMS[number]
|
|
||||||
|
|
||||||
export type Post = {
|
export type Post = {
|
||||||
id: number
|
id: number
|
||||||
versionNo: number
|
|
||||||
url: string
|
url: string
|
||||||
title: string | null
|
title: string | null
|
||||||
thumbnail: string | null
|
thumbnail: string | null
|
||||||
thumbnailBase: string | null
|
thumbnailBase: string | null
|
||||||
tags: Tag[]
|
tags: Tag[]
|
||||||
parentPosts?: Post[]
|
|
||||||
childPosts?: Post[]
|
|
||||||
siblingPosts?: Record<`${ number }`, Post[]>
|
|
||||||
viewed: boolean
|
viewed: boolean
|
||||||
related: Post[]
|
related: Post[]
|
||||||
originalCreatedFrom: string | null
|
originalCreatedFrom: string | null
|
||||||
@@ -147,18 +138,13 @@ export type PostTagChange = {
|
|||||||
|
|
||||||
export type PostVersion = {
|
export type PostVersion = {
|
||||||
postId: number
|
postId: number
|
||||||
latestVersionNo: number
|
|
||||||
versionNo: number
|
versionNo: number
|
||||||
eventType: 'create' | 'update' | 'discard' | 'restore'
|
eventType: 'create' | 'update' | 'discard' | 'restore'
|
||||||
title: { current: string | null; prev: string | null }
|
title: { current: string | null; prev: string | null }
|
||||||
url: { current: string; prev: string | null }
|
url: { current: string; prev: string | null }
|
||||||
thumbnail: { current: string | null; prev: string | null }
|
thumbnail: { current: string | null; prev: string | null }
|
||||||
thumbnailBase: { current: string | null; prev: string | null }
|
thumbnailBase: { current: string | null; prev: string | null }
|
||||||
tags: { name: string
|
tags: { name: string; type: 'context' | 'added' | 'removed' }[]
|
||||||
type: 'context' | 'added' | 'removed' }[]
|
|
||||||
parentPosts: { id: number
|
|
||||||
title: string
|
|
||||||
type: 'context' | 'added' | 'removed' }[]
|
|
||||||
originalCreatedFrom: { current: string | null; prev: string | null }
|
originalCreatedFrom: { current: string | null; prev: string | null }
|
||||||
originalCreatedBefore: { current: string | null; prev: string | null }
|
originalCreatedBefore: { current: string | null; prev: string | null }
|
||||||
createdAt: string
|
createdAt: string
|
||||||
@@ -185,8 +171,7 @@ export type Tag = {
|
|||||||
createdAt: string
|
createdAt: string
|
||||||
updatedAt: string
|
updatedAt: string
|
||||||
hasWiki: boolean
|
hasWiki: boolean
|
||||||
materialId: number | null
|
materialId: number
|
||||||
hasDeerjikists: boolean
|
|
||||||
children?: Tag[]
|
children?: Tag[]
|
||||||
matchedAlias?: string | null }
|
matchedAlias?: string | null }
|
||||||
|
|
||||||
|
|||||||
@@ -19,22 +19,7 @@ export default {
|
|||||||
'rainbow-scroll': 'rainbow-scroll .25s linear infinite' },
|
'rainbow-scroll': 'rainbow-scroll .25s linear infinite' },
|
||||||
colors: {
|
colors: {
|
||||||
red: { 925: '#5f1414',
|
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: {
|
keyframes: {
|
||||||
'rainbow-scroll': {
|
'rainbow-scroll': {
|
||||||
'0%': { backgroundPosition: '0% 50%' },
|
'0%': { backgroundPosition: '0% 50%' },
|
||||||
|
|||||||
Reference in New Issue
Block a user