forked from rDrama/rDrama
Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost
commit
baa447ba19
|
@ -95,8 +95,8 @@ reddit_domain_regex = re.compile("(^|\s|\()https?:\/\/(reddit\.com|(?:(?:[A-z]{2
|
||||||
color_regex = re.compile("[a-z0-9]{6}", flags=re.A)
|
color_regex = re.compile("[a-z0-9]{6}", flags=re.A)
|
||||||
|
|
||||||
# lazy match on the {}?, only match if there is trailing stuff
|
# lazy match on the {}?, only match if there is trailing stuff
|
||||||
# don't match between nested </p></li> etc, this can break but works for Snappy
|
# Specifically match Snappy's way of formatting, this might break some losers' comments.
|
||||||
showmore_regex = re.compile(r"^(.{3000,}?</p>)(\s*<p>.*)", flags=re.A|re.DOTALL)
|
showmore_regex = re.compile(r"^(.{3000,}?</p>(?:</li></ul>)?)(\s*<p>.*)", flags=re.A|re.DOTALL)
|
||||||
|
|
||||||
search_token_regex = re.compile('"([^"]*)"|(\S+)', flags=re.A)
|
search_token_regex = re.compile('"([^"]*)"|(\S+)', flags=re.A)
|
||||||
|
|
||||||
|
|
|
@ -386,7 +386,7 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=True, count_marseys
|
||||||
if '<pre>' not in sanitized:
|
if '<pre>' not in sanitized:
|
||||||
sanitized = sanitized.replace('\n','')
|
sanitized = sanitized.replace('\n','')
|
||||||
|
|
||||||
if showmore and len(sanitized) > 5000:
|
if showmore and len(sanitized) > 3500:
|
||||||
sanitized = showmore_regex.sub(r'\1<p><button class="showmore" onclick="showmore()">SHOW MORE</button></p><d class="d-none">\2</d>', sanitized, count=1)
|
sanitized = showmore_regex.sub(r'\1<p><button class="showmore" onclick="showmore()">SHOW MORE</button></p><d class="d-none">\2</d>', sanitized, count=1)
|
||||||
|
|
||||||
return sanitized.strip()
|
return sanitized.strip()
|
||||||
|
|
29
schema.sql
29
schema.sql
|
@ -561,6 +561,19 @@ CREATE TABLE public.marseys (
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Name: media; Type: TABLE; Schema: public; Owner: -
|
||||||
|
--
|
||||||
|
|
||||||
|
CREATE TABLE public.media (
|
||||||
|
kind character varying(5) NOT NULL,
|
||||||
|
filename character varying(23) NOT NULL,
|
||||||
|
user_id integer NOT NULL,
|
||||||
|
created_utc integer NOT NULL,
|
||||||
|
size integer NOT NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name: modactions; Type: TABLE; Schema: public; Owner: -
|
-- Name: modactions; Type: TABLE; Schema: public; Owner: -
|
||||||
--
|
--
|
||||||
|
@ -1319,6 +1332,14 @@ ALTER TABLE ONLY public.marseys
|
||||||
ADD CONSTRAINT marseys_pkey PRIMARY KEY (name);
|
ADD CONSTRAINT marseys_pkey PRIMARY KEY (name);
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Name: media media_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
||||||
|
--
|
||||||
|
|
||||||
|
ALTER TABLE ONLY public.media
|
||||||
|
ADD CONSTRAINT media_pkey PRIMARY KEY (kind, filename);
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name: modactions modactions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
-- Name: modactions modactions_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
||||||
--
|
--
|
||||||
|
@ -2352,6 +2373,14 @@ ALTER TABLE ONLY public.marseys
|
||||||
ADD CONSTRAINT marsey_submitter_fkey FOREIGN KEY (submitter_id) REFERENCES public.users(id);
|
ADD CONSTRAINT marsey_submitter_fkey FOREIGN KEY (submitter_id) REFERENCES public.users(id);
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Name: media media_user_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
|
||||||
|
--
|
||||||
|
|
||||||
|
ALTER TABLE ONLY public.media
|
||||||
|
ADD CONSTRAINT media_user_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name: mods mod_sub_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
|
-- Name: mods mod_sub_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
|
||||||
--
|
--
|
||||||
|
|
Loading…
Reference in New Issue