Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

schema.sql

@@ -750,6 +750,43 @@ CREATE TABLE public.sub_subscriptions (
 );
 
 
+--
+-- Name: subactions; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.subactions (
+    id integer NOT NULL,
+    sub character varying(25) NOT NULL,
+    user_id integer,
+    target_user_id integer,
+    target_submission_id integer,
+    target_comment_id integer,
+    created_utc integer NOT NULL,
+    kind character varying(32) DEFAULT NULL::character varying,
+    _note character varying(500) DEFAULT NULL::character varying
+);
+
+
+--
+-- Name: subactions_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE public.subactions_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: subactions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE public.subactions_id_seq OWNED BY public.subactions.id;
+
+
 --
 -- Name: submission_option_id_seq; Type: SEQUENCE; Schema: public; Owner: -
 --
@@ -1076,6 +1113,13 @@ ALTER TABLE ONLY public.modactions ALTER COLUMN id SET DEFAULT nextval('public.m
 ALTER TABLE ONLY public.oauth_apps ALTER COLUMN id SET DEFAULT nextval('public.oauth_apps_id_seq'::regclass);
 
 
+--
+-- Name: subactions id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.subactions ALTER COLUMN id SET DEFAULT nextval('public.subactions_id_seq'::regclass);
+
+
 --
 -- Name: submissions id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1378,6 +1422,14 @@ ALTER TABLE ONLY public.sub_subscriptions
     ADD CONSTRAINT sub_subscriptions_pkey PRIMARY KEY (user_id, sub);
 
 
+--
+-- Name: subactions subactions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.subactions
+    ADD CONSTRAINT subactions_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: submission_option_votes submission_option_votes_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -1680,6 +1732,13 @@ CREATE INDEX fki_sub_joins_sub_fkey ON public.sub_joins USING btree (sub);
 CREATE INDEX fki_sub_subscriptions_sub_fkey ON public.sub_subscriptions USING btree (sub);
 
 
+--
+-- Name: fki_subactions_user_fkey; Type: INDEX; Schema: public; Owner: -
+--
+
+CREATE INDEX fki_subactions_user_fkey ON public.subactions USING btree (target_user_id);
+
+
 --
 -- Name: fki_submissions_approver_fkey; Type: INDEX; Schema: public; Owner: -
 --
@@ -2429,6 +2488,38 @@ ALTER TABLE ONLY public.sub_subscriptions
     ADD CONSTRAINT sub_subscriptions_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) MATCH FULL;
 
 
+--
+-- Name: subactions subactions_comment_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.subactions
+    ADD CONSTRAINT subactions_comment_fkey FOREIGN KEY (target_comment_id) REFERENCES public.comments(id);
+
+
+--
+-- Name: subactions subactions_sub_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.subactions
+    ADD CONSTRAINT subactions_sub_fkey FOREIGN KEY (sub) REFERENCES public.subs(name);
+
+
+--
+-- Name: subactions subactions_submission_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.subactions
+    ADD CONSTRAINT subactions_submission_fkey FOREIGN KEY (target_submission_id) REFERENCES public.submissions(id);
+
+
+--
+-- Name: subactions subactions_user_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.subactions
+    ADD CONSTRAINT subactions_user_fkey FOREIGN KEY (target_user_id) REFERENCES public.users(id);
+
+
 --
 -- Name: submissions submissions_approver_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
 --

seed-db.sql

@@ -1826,6 +1826,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseymacarthur',2,'nuke missile nuclear bomb history',NULL),
 ('marseymad',2,'pissed annoyed furious reaction angry irritated livid',NULL),
 ('marseymagahat',2,'trump 5200 maga american president election vote nazi hat',NULL),
+('marseymagarentfree',2,'cope seethe dilate lib snoo reddit orange drumpf bad nazi hitler rightoid leftoid',1664439482),
 ('marseymajorgeneral',2,'jeffthespammer pirates of penzance safari muttonchops mutton chops army military soldier officer',NULL),
 ('marseymalding',2,'dilate seethe scrote mad moid cope',NULL),
 ('marseymancer',2,'dead undead horror lich halloween necromancer zombies zombie holiday evil',NULL),