diff --git a/backend/app/controllers/posts_controller.rb b/backend/app/controllers/posts_controller.rb index ce555ed..a3a4538 100644 --- a/backend/app/controllers/posts_controller.rb +++ b/backend/app/controllers/posts_controller.rb @@ -88,7 +88,7 @@ class PostsController < ApplicationController original_created_from = params[:original_created_from] original_created_before = params[:original_created_before] - post = Post.new(title:, url:, thumbnail_base: '', uploaded_user: current_user, + post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user, original_created_from:, original_created_before:) post.thumbnail.attach(thumbnail) if post.save diff --git a/backend/db/migrate/20251230143400_make_thumbnail_base_nullable_in_posts.rb b/backend/db/migrate/20251230143400_make_thumbnail_base_nullable_in_posts.rb new file mode 100644 index 0000000..f9da7c0 --- /dev/null +++ b/backend/db/migrate/20251230143400_make_thumbnail_base_nullable_in_posts.rb @@ -0,0 +1,27 @@ +class MakeThumbnailBaseNullableInPosts < ActiveRecord::Migration[7.0] + def up + change_column_null :posts, :thumbnail_base, true + + execute <<~SQL + UPDATE + posts + SET + thumbnail_base = NULL + WHERE + thumbnail_base = '' + SQL + end + + def down + execute <<~SQL + UPDATE + posts + SET + thumbnail_base = '' + WHERE + thumbnail_base IS NULL + SQL + + change_column_null :posts, :thumbnail_base, false + end +end diff --git a/backend/db/schema.rb b/backend/db/schema.rb index 6a26dfd..697bd8f 100644 --- a/backend/db/schema.rb +++ b/backend/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[8.0].define(version: 2025_12_10_123200) do +ActiveRecord::Schema[8.0].define(version: 2025_12_30_143400) do create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| t.string "name", null: false t.string "record_type", null: false @@ -86,7 +86,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_10_123200) do create_table "posts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| t.string "title", null: false t.string "url", limit: 2000, null: false - t.string "thumbnail_base", limit: 2000, null: false + t.string "thumbnail_base", limit: 2000 t.bigint "parent_id" t.bigint "uploaded_user_id" t.datetime "created_at", null: false @@ -167,18 +167,54 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_10_123200) do t.datetime "updated_at", null: false end + create_table "wiki_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| + t.string "sha256", limit: 64, null: false + t.text "body", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["sha256"], name: "index_wiki_lines_on_sha256", unique: true + end + create_table "wiki_pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| t.string "title", null: false - t.bigint "tag_id" t.bigint "created_user_id", null: false t.bigint "updated_user_id", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.index ["created_user_id"], name: "index_wiki_pages_on_created_user_id" - t.index ["tag_id"], name: "index_wiki_pages_on_tag_id" t.index ["updated_user_id"], name: "index_wiki_pages_on_updated_user_id" end + create_table "wiki_revision_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| + t.bigint "wiki_revision_id", null: false + t.integer "position", null: false + t.bigint "wiki_line_id", null: false + t.index ["wiki_line_id"], name: "index_wiki_revision_lines_on_wiki_line_id" + t.index ["wiki_revision_id", "position"], name: "index_wiki_revision_lines_on_wiki_revision_id_and_position", unique: true + t.index ["wiki_revision_id", "wiki_line_id"], name: "index_wiki_revision_lines_on_wiki_revision_id_and_wiki_line_id" + t.index ["wiki_revision_id"], name: "index_wiki_revision_lines_on_wiki_revision_id" + end + + create_table "wiki_revisions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t| + t.bigint "wiki_page_id", null: false + t.bigint "base_revision_id" + t.bigint "created_user_id", null: false + t.integer "kind", default: 0, null: false + t.bigint "redirect_page_id" + t.string "message" + t.integer "lines_count", default: 0, null: false + t.string "tree_sha256", limit: 64 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["base_revision_id"], name: "index_wiki_revisions_on_base_revision_id" + t.index ["created_user_id"], name: "index_wiki_revisions_on_created_user_id" + t.index ["kind"], name: "index_wiki_revisions_on_kind" + t.index ["redirect_page_id"], name: "index_wiki_revisions_on_redirect_page_id" + t.index ["tree_sha256"], name: "index_wiki_revisions_on_tree_sha256" + t.index ["wiki_page_id", "id"], name: "index_wiki_revisions_on_wiki_page_id_and_id" + t.index ["wiki_page_id"], name: "index_wiki_revisions_on_wiki_page_id" + end + add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "nico_tag_relations", "tags" @@ -201,7 +237,12 @@ ActiveRecord::Schema[8.0].define(version: 2025_12_10_123200) do add_foreign_key "user_ips", "users" add_foreign_key "user_post_views", "posts" add_foreign_key "user_post_views", "users" - add_foreign_key "wiki_pages", "tags" add_foreign_key "wiki_pages", "users", column: "created_user_id" add_foreign_key "wiki_pages", "users", column: "updated_user_id" + add_foreign_key "wiki_revision_lines", "wiki_lines" + add_foreign_key "wiki_revision_lines", "wiki_revisions" + add_foreign_key "wiki_revisions", "users", column: "created_user_id" + add_foreign_key "wiki_revisions", "wiki_pages" + add_foreign_key "wiki_revisions", "wiki_pages", column: "redirect_page_id" + add_foreign_key "wiki_revisions", "wiki_revisions", column: "base_revision_id" end diff --git a/backend/lib/tasks/sync_nico.rake b/backend/lib/tasks/sync_nico.rake index d20150c..d09a424 100644 --- a/backend/lib/tasks/sync_nico.rake +++ b/backend/lib/tasks/sync_nico.rake @@ -49,7 +49,7 @@ namespace :nico do unless post title = datum['title'] url = "https://www.nicovideo.jp/watch/#{ datum['code'] }" - thumbnail_base = fetch_thumbnail.(url) || '' rescue '' + thumbnail_base = fetch_thumbnail.(url) rescue nil post = Post.new(title:, url:, thumbnail_base:, uploaded_user: nil) if thumbnail_base.present? post.thumbnail.attach(