Description
-
+
<%= format_text(@post.description, max_thumbs: 0) %>
diff --git a/config/routes.rb b/config/routes.rb
index 66150c3a3..81e710a22 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -291,15 +291,6 @@ Rails.application.routes.draw do
get :search
end
end
- resources :artist_commentaries, :only => [:index, :show] do
- collection do
- put :create_or_update
- get :search
- end
- member do
- put :revert
- end
- end
resource :related_tag, :only => [:show, :update]
match "related_tag/bulk", to: "related_tags#bulk", via: [:get, :post]
resource :recommended_posts, only: [:show]
diff --git a/db/migrate/20220203154846_remove_artist_commentaries.rb b/db/migrate/20220203154846_remove_artist_commentaries.rb
new file mode 100644
index 000000000..2369f9cba
--- /dev/null
+++ b/db/migrate/20220203154846_remove_artist_commentaries.rb
@@ -0,0 +1,10 @@
+class RemoveArtistCommentaries < ActiveRecord::Migration[6.1]
+ def change
+ remove_column :uploads, :artist_commentary_title
+ remove_column :uploads, :artist_commentary_desc
+ remove_column :uploads, :include_artist_commentary
+
+ drop_table :artist_commentaries
+ drop_table :artist_commentary_versions
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index ab7d251dd..3077dd524 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -175,80 +175,6 @@ CREATE TABLE public.ar_internal_metadata (
);
---
--- Name: artist_commentaries; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.artist_commentaries (
- id integer NOT NULL,
- post_id integer NOT NULL,
- original_title text DEFAULT ''::text NOT NULL,
- original_description text DEFAULT ''::text NOT NULL,
- translated_title text DEFAULT ''::text NOT NULL,
- translated_description text DEFAULT ''::text NOT NULL,
- created_at timestamp without time zone,
- updated_at timestamp without time zone
-);
-
-
---
--- Name: artist_commentaries_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.artist_commentaries_id_seq
- AS integer
- START WITH 1
- INCREMENT BY 1
- NO MINVALUE
- NO MAXVALUE
- CACHE 1;
-
-
---
--- Name: artist_commentaries_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.artist_commentaries_id_seq OWNED BY public.artist_commentaries.id;
-
-
---
--- Name: artist_commentary_versions; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.artist_commentary_versions (
- id integer NOT NULL,
- post_id integer NOT NULL,
- updater_id integer NOT NULL,
- updater_ip_addr inet NOT NULL,
- original_title text,
- original_description text,
- translated_title text,
- translated_description text,
- created_at timestamp without time zone,
- updated_at timestamp without time zone
-);
-
-
---
--- Name: artist_commentary_versions_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE public.artist_commentary_versions_id_seq
- AS integer
- START WITH 1
- INCREMENT BY 1
- NO MINVALUE
- NO MAXVALUE
- CACHE 1;
-
-
---
--- Name: artist_commentary_versions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE public.artist_commentary_versions_id_seq OWNED BY public.artist_commentary_versions.id;
-
-
--
-- Name: artist_urls; Type: TABLE; Schema: public; Owner: -
--
@@ -2455,9 +2381,6 @@ CREATE TABLE public.uploads (
file_size integer,
image_width integer,
image_height integer,
- artist_commentary_desc text,
- artist_commentary_title text,
- include_artist_commentary boolean,
context text,
referer_url text,
description text DEFAULT ''::text NOT NULL
@@ -2792,20 +2715,6 @@ ALTER SEQUENCE public.wiki_pages_id_seq OWNED BY public.wiki_pages.id;
ALTER TABLE ONLY public.api_keys ALTER COLUMN id SET DEFAULT nextval('public.api_keys_id_seq'::regclass);
---
--- Name: artist_commentaries id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.artist_commentaries ALTER COLUMN id SET DEFAULT nextval('public.artist_commentaries_id_seq'::regclass);
-
-
---
--- Name: artist_commentary_versions id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.artist_commentary_versions ALTER COLUMN id SET DEFAULT nextval('public.artist_commentary_versions_id_seq'::regclass);
-
-
--
-- Name: artist_urls id; Type: DEFAULT; Schema: public; Owner: -
--
@@ -3277,22 +3186,6 @@ ALTER TABLE ONLY public.ar_internal_metadata
ADD CONSTRAINT ar_internal_metadata_pkey PRIMARY KEY (key);
---
--- Name: artist_commentaries artist_commentaries_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.artist_commentaries
- ADD CONSTRAINT artist_commentaries_pkey PRIMARY KEY (id);
-
-
---
--- Name: artist_commentary_versions artist_commentary_versions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.artist_commentary_versions
- ADD CONSTRAINT artist_commentary_versions_pkey PRIMARY KEY (id);
-
-
--
-- Name: artist_urls artist_urls_pkey; Type: CONSTRAINT; Schema: public; Owner: -
--
@@ -3837,34 +3730,6 @@ CREATE UNIQUE INDEX index_api_keys_on_key ON public.api_keys USING btree (key);
CREATE UNIQUE INDEX index_api_keys_on_user_id ON public.api_keys USING btree (user_id);
---
--- Name: index_artist_commentaries_on_post_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE UNIQUE INDEX index_artist_commentaries_on_post_id ON public.artist_commentaries USING btree (post_id);
-
-
---
--- Name: index_artist_commentary_versions_on_post_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_artist_commentary_versions_on_post_id ON public.artist_commentary_versions USING btree (post_id);
-
-
---
--- Name: index_artist_commentary_versions_on_updater_id_and_post_id; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_artist_commentary_versions_on_updater_id_and_post_id ON public.artist_commentary_versions USING btree (updater_id, post_id);
-
-
---
--- Name: index_artist_commentary_versions_on_updater_ip_addr; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX index_artist_commentary_versions_on_updater_ip_addr ON public.artist_commentary_versions USING btree (updater_ip_addr);
-
-
--
-- Name: index_artist_urls_on_artist_id; Type: INDEX; Schema: public; Owner: -
--
@@ -5340,6 +5205,7 @@ INSERT INTO "schema_migrations" (version) VALUES
('20210506235640'),
('20210625155528'),
('20210718172512'),
-('20220106081415');
+('20220106081415'),
+('20220203154846');
diff --git a/test/factories/artist_commentary.rb b/test/factories/artist_commentary.rb
deleted file mode 100644
index 2a10e962e..000000000
--- a/test/factories/artist_commentary.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-FactoryBot.define do
- factory(:artist_commentary) do
- post factory: :post
- original_title { FFaker::Lorem.sentences.join(" ") }
- original_description { FFaker::Lorem.sentences.join(" ") }
- translated_title { FFaker::Lorem.sentences.join(" ") }
- translated_description { FFaker::Lorem.sentences.join(" ") }
- end
-end
diff --git a/test/functional/artist_commentaries_controller_test.rb b/test/functional/artist_commentaries_controller_test.rb
deleted file mode 100644
index 1e2f50713..000000000
--- a/test/functional/artist_commentaries_controller_test.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'test_helper'
-
-class ArtistCommentariesControllerTest < ActionDispatch::IntegrationTest
- context "The artist commentaries controller" do
- setup do
- @user = create(:user)
-
- as_user do
- @commentary1 = create(:artist_commentary)
- @commentary2 = create(:artist_commentary)
- end
- end
-
- context "index action" do
- should "render" do
- get artist_commentaries_path
- assert_response :success
- end
-
- should "render with search params" do
- params = {
- search: {
- text_matches: @commentary1.original_title,
- post_id: @commentary1.post_id,
- original_present: "yes",
- translated_present: "yes",
- post_tags_match: @commentary1.post.tag_array.first,
- }
- }
-
- get artist_commentaries_path(params)
- assert_response :success
- end
- end
-
- context "show action" do
- should "render" do
- get artist_commentary_path(@commentary1.id)
- assert_redirected_to(@commentary1.post)
-
- get artist_commentary_path(post_id: @commentary1.post_id)
- assert_redirected_to(@commentary1.post)
- end
- end
-
- context "create_or_update action" do
- should "render for create" do
- params = {
- artist_commentary: {
- original_title: "foo",
- post_id: FactoryBot.create(:post).id,
- },
- format: "js"
- }
-
- assert_difference("ArtistCommentary.count", 1) do
- put_auth create_or_update_artist_commentaries_path(params), @user, as: :js
- end
- assert_response :success
- end
-
- should "render for update" do
- params = {
- artist_commentary: {
- post_id: @commentary1.post_id,
- original_title: "foo",
- },
- format: "js"
- }
-
- put_auth create_or_update_artist_commentaries_path(params), @user
- @commentary1.reload
- assert_response :success
- assert_equal("foo", @commentary1.reload.original_title)
- end
- end
-
- context "revert action" do
- should "work" do
- original_title = @commentary1.original_title
- @commentary1.update(original_title: "foo")
- @commentary1.reload
- put_auth revert_artist_commentary_path(@commentary1.post_id, version_id: @commentary1.versions.first.id, format: "js"), @user
- assert_response :success
- assert_equal(original_title, @commentary1.reload.original_title)
- end
-
- should "return 404 when trying to revert a nonexistent commentary" do
- put_auth revert_artist_commentary_path(-1, version_id: -1, format: "js"), @user
- assert_response 404
- end
-
- should "not allow reverting to a previous version of another artist commentary" do
- put_auth revert_artist_commentary_path(@commentary1.post_id, version_id: @commentary2.versions.first.id, format: "js"), @user
- @commentary1.reload
- assert_not_equal(@commentary1.original_title, @commentary2.original_title)
- assert_response :missing
- end
- end
- end
-end
diff --git a/test/functional/artist_commentary_versions_controller_test.rb b/test/functional/artist_commentary_versions_controller_test.rb
deleted file mode 100644
index 9fe51a13d..000000000
--- a/test/functional/artist_commentary_versions_controller_test.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require 'test_helper'
-
-class ArtistCommentaryVersionsControllerTest < ActionDispatch::IntegrationTest
- context "The artist commentary versions controller" do
- setup do
- @user = FactoryBot.create(:user)
-
- as_user do
- @commentary1 = FactoryBot.create(:artist_commentary)
- @commentary2 = FactoryBot.create(:artist_commentary)
- end
- end
-
- context "index action" do
- should "render" do
- get artist_commentary_versions_path
- assert_response :success
- end
- end
- end
-end
diff --git a/test/models/upload_service_test.rb b/test/models/upload_service_test.rb
index 60b2b8732..57bc64def 100644
--- a/test/models/upload_service_test.rb
+++ b/test/models/upload_service_test.rb
@@ -1209,12 +1209,6 @@ class UploadServiceTest < ActiveSupport::TestCase
@upload = FactoryBot.create(:source_upload, file_size: 1000, md5: "12345", file_ext: "jpg", image_width: 100, image_height: 100)
end
- should "create a commentary record" do
- assert_difference(-> { ArtistCommentary.count }) do
- subject.new({include_artist_commentary: true, artist_commentary_title: "blah", artist_commentary_desc: "blah"}).create_post_from_upload(@upload)
- end
- end
-
should "create a post" do
post = subject.new({}).create_post_from_upload(@upload)
assert_equal([], post.errors.full_messages)