From 64fa5e9631534371a40e83962ebdf1803fae5d70 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Thu, 21 Oct 2021 22:50:15 +0200 Subject: [PATCH] tabs --- docker-compose.yml | 118 ++-- files/helpers/const.py | 180 +++--- files/templates/comments.html | 14 +- files/templates/shop.html | 152 ++--- files/templates/submission.html | 14 +- files/templates/submission_listing.html | 18 +- schema.sql | 790 ++++++++++++------------ snappy.txt | 10 +- 8 files changed, 648 insertions(+), 648 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dc7b82cc8..4cdeb0ed6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,66 +2,66 @@ version: '2.3' services: files: - build: - context: . - volumes: - - "./:/service" - environment: - - DATABASE_URL=postgresql://postgres@postgres:5432 - - MASTER_KEY=${MASTER_KEY:-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=} - - REDIS_URL=redis://redis - - DOMAIN=localhost - - SITE_NAME=Drama - - GIPHY_KEY=3435tdfsdudebussylmaoxxt43 - - FORCE_HTTPS=0 - - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43 - - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43 - - DISCORD_CLIENT_SECRET=3435tdfsdudebussylmaoxxt43 - - DISCORD_BOT_TOKEN=3435tdfsdudebussylmaoxxt43 - #- HCAPTCHA_SITEKEY=3435tdfsdudebussylmaoxxt43 - - HCAPTCHA_SECRET=3435tdfsdudebussylmaoxxt43 - - YOUTUBE_KEY=3435tdfsdudebussylmaoxxt43 - - PUSHER_KEY=3435tdfsdudebussylmaoxxt43 - - CATBOX_KEY=3435tdfsdudebussylmaoxxt43 - - SPAM_SIMILARITY_THRESHOLD=0.5 - - SPAM_SIMILAR_COUNT_THRESHOLD=5 - - SPAM_URL_SIMILARITY_THRESHOLD=0.1 - - COMMENT_SPAM_SIMILAR_THRESHOLD=0.5 - - COMMENT_SPAM_COUNT_THRESHOLD=5 - - READ_ONLY=0 - - BOT_DISABLE=0 - - COINS_NAME=Dramacoins - - DEFAULT_TIME_FILTER=all - - DEFAULT_THEME=midnight - - DEFAULT_COLOR=ff66ac #YOU HAVE TO PICK ONE OF THOSE COLORS OR SHIT WILL BREAK: ff66ac, 805ad5, 62ca56, 38a169, 80ffff, 2a96f3, eb4963, ff0000, f39731, 30409f, 3e98a7, e4432d, 7b9ae4, ec72de, 7f8fa6, f8db58 - - SLOGAN=Dude bussy lmao - - GUMROAD_TOKEN=3435tdfsdudebussylmaoxxt43 - - GUMROAD_LINK=https://marsey1.gumroad.com/l/tfcvri - - CARD_VIEW=1 - - DISABLE_DOWNVOTES=0 - - DUES=0 - - MAIL_USERNAME=blahblahblah@gmail.com - - MAIL_PASSWORD=3435tdfsdudebussylmaoxxt43 - links: - - "redis" - - "postgres" - ports: - - "80:80" - depends_on: - - redis - - postgres + build: + context: . + volumes: + - "./:/service" + environment: + - DATABASE_URL=postgresql://postgres@postgres:5432 + - MASTER_KEY=${MASTER_KEY:-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=} + - REDIS_URL=redis://redis + - DOMAIN=localhost + - SITE_NAME=Drama + - GIPHY_KEY=3435tdfsdudebussylmaoxxt43 + - FORCE_HTTPS=0 + - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43 + - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43 + - DISCORD_CLIENT_SECRET=3435tdfsdudebussylmaoxxt43 + - DISCORD_BOT_TOKEN=3435tdfsdudebussylmaoxxt43 + #- HCAPTCHA_SITEKEY=3435tdfsdudebussylmaoxxt43 + - HCAPTCHA_SECRET=3435tdfsdudebussylmaoxxt43 + - YOUTUBE_KEY=3435tdfsdudebussylmaoxxt43 + - PUSHER_KEY=3435tdfsdudebussylmaoxxt43 + - CATBOX_KEY=3435tdfsdudebussylmaoxxt43 + - SPAM_SIMILARITY_THRESHOLD=0.5 + - SPAM_SIMILAR_COUNT_THRESHOLD=5 + - SPAM_URL_SIMILARITY_THRESHOLD=0.1 + - COMMENT_SPAM_SIMILAR_THRESHOLD=0.5 + - COMMENT_SPAM_COUNT_THRESHOLD=5 + - READ_ONLY=0 + - BOT_DISABLE=0 + - COINS_NAME=Dramacoins + - DEFAULT_TIME_FILTER=all + - DEFAULT_THEME=midnight + - DEFAULT_COLOR=ff66ac #YOU HAVE TO PICK ONE OF THOSE COLORS OR SHIT WILL BREAK: ff66ac, 805ad5, 62ca56, 38a169, 80ffff, 2a96f3, eb4963, ff0000, f39731, 30409f, 3e98a7, e4432d, 7b9ae4, ec72de, 7f8fa6, f8db58 + - SLOGAN=Dude bussy lmao + - GUMROAD_TOKEN=3435tdfsdudebussylmaoxxt43 + - GUMROAD_LINK=https://marsey1.gumroad.com/l/tfcvri + - CARD_VIEW=1 + - DISABLE_DOWNVOTES=0 + - DUES=0 + - MAIL_USERNAME=blahblahblah@gmail.com + - MAIL_PASSWORD=3435tdfsdudebussylmaoxxt43 + links: + - "redis" + - "postgres" + ports: + - "80:80" + depends_on: + - redis + - postgres redis: - image: redis - ports: - - "6379:6379" + image: redis + ports: + - "6379:6379" postgres: - image: postgres:12.3 - volumes: - - "./schema.sql:/docker-entrypoint-initdb.d/00-schema.sql" - - "./seed-db.sql:/docker-entrypoint-initdb.d/01-schema.sql" - environment: - - POSTGRES_HOST_AUTH_METHOD=trust - ports: - - "5432:5432" \ No newline at end of file + image: postgres:12.3 + volumes: + - "./schema.sql:/docker-entrypoint-initdb.d/00-schema.sql" + - "./seed-db.sql:/docker-entrypoint-initdb.d/01-schema.sql" + environment: + - POSTGRES_HOST_AUTH_METHOD=trust + ports: + - "5432:5432" \ No newline at end of file diff --git a/files/helpers/const.py b/files/helpers/const.py index afd14f7d6..f0f88c3a0 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -5,79 +5,79 @@ SITE = environ.get("DOMAIN", '').strip() SITE_NAME = environ.get("SITE_NAME", '').strip() SLURS = { - "faggot": "cute twink", - "fag": "cute twink", - "pedophile": "libertarian", - "pedo": "libertarian", - "kill yourself": "keep yourself safe", - "nigger": "🏀", - "rapist": "male feminist", - "steve akins": "penny verity oaken", - "trannie": "🚂🚃🚃", - "tranny": "🚂🚃🚃", - "troon": "🚂🚃🚃", - "nonewnormal": "HorseDewormerAddicts", - "kike": "https://sciencedirect.com/science/article/abs/pii/S016028960600033X", - "janny": "j-slur", - "jannie": "j-slur", - "janny": "j-slur", - "latinos": "latinx", - "latino": "latinx", - "latinas": "latinx", - "latina": "latinx", - "hispanics": "latinx", - "hispanic": "latinx", - "uss liberty incident": "tragic accident aboard the USS Liberty", - "lavon affair": "Lavon Misunderstanding", - "shylock": "Israeli friend", - "yid": "Israeli friend", - "heeb": "Israeli friend", - "sheeny": "Israeli friend", - "sheenies": "Israeli friends", - "hymie": "Israeli friend", - "allah": "Allah (SWT)", - "mohammad": "Mohammad (PBUH)", - "mohammed": "Mohammad (PBUH)", - "muhammad": "Mohammad (PBUH)", - "muhammed": "Mohammad (PBUH)", - "i hate marsey": "i love marsey", - "libertarian": "pedophile", - "billie eilish": "Billie Eilish (fat cow)", - "dancing israelis": "i love Israel", - "sodomite": "total dreamboat", - "pajeet": "sexy Indian dude", - "female": "birthing person", - "landlord": "landchad", - "tenant": "renthog", - "renter": "rentoid", - "autistic": "neurodivergent", - "anime": "p-dophilic japanese cartoons", - "holohoax": "i tried to claim the Holocaust didn't happen because I am a pencil-dicked imbecile and the word filter caught me lol", - "groomercord": "discord (actually a pretty cool service)", - "pedocord": "discord (actually a pretty cool service)", - "i hate carp": "i love Carp", - "manlet": "little king", - "gamer": "g*mer", - "journalist": "journ*list", - "journalism": "journ*lism", - "buttcheeks": "bulva", - "asscheeks": "bulva", - "wuhan flu": "SARS-CoV-2 syndemic", - "china flu": "SARS-CoV-2 syndemic", - "china virus": "SARS-CoV-2 syndemic", - "kung flu": "SARS-CoV-2 syndemic", - "nig": "🏀", - "nigs": "🏀s", + "faggot": "cute twink", + "fag": "cute twink", + "pedophile": "libertarian", + "pedo": "libertarian", + "kill yourself": "keep yourself safe", + "nigger": "🏀", + "rapist": "male feminist", + "steve akins": "penny verity oaken", + "trannie": "🚂🚃🚃", + "tranny": "🚂🚃🚃", + "troon": "🚂🚃🚃", + "nonewnormal": "HorseDewormerAddicts", + "kike": "https://sciencedirect.com/science/article/abs/pii/S016028960600033X", + "janny": "j-slur", + "jannie": "j-slur", + "janny": "j-slur", + "latinos": "latinx", + "latino": "latinx", + "latinas": "latinx", + "latina": "latinx", + "hispanics": "latinx", + "hispanic": "latinx", + "uss liberty incident": "tragic accident aboard the USS Liberty", + "lavon affair": "Lavon Misunderstanding", + "shylock": "Israeli friend", + "yid": "Israeli friend", + "heeb": "Israeli friend", + "sheeny": "Israeli friend", + "sheenies": "Israeli friends", + "hymie": "Israeli friend", + "allah": "Allah (SWT)", + "mohammad": "Mohammad (PBUH)", + "mohammed": "Mohammad (PBUH)", + "muhammad": "Mohammad (PBUH)", + "muhammed": "Mohammad (PBUH)", + "i hate marsey": "i love marsey", + "libertarian": "pedophile", + "billie eilish": "Billie Eilish (fat cow)", + "dancing israelis": "i love Israel", + "sodomite": "total dreamboat", + "pajeet": "sexy Indian dude", + "female": "birthing person", + "landlord": "landchad", + "tenant": "renthog", + "renter": "rentoid", + "autistic": "neurodivergent", + "anime": "p-dophilic japanese cartoons", + "holohoax": "i tried to claim the Holocaust didn't happen because I am a pencil-dicked imbecile and the word filter caught me lol", + "groomercord": "discord (actually a pretty cool service)", + "pedocord": "discord (actually a pretty cool service)", + "i hate carp": "i love Carp", + "manlet": "little king", + "gamer": "g*mer", + "journalist": "journ*list", + "journalism": "journ*lism", + "buttcheeks": "bulva", + "asscheeks": "bulva", + "wuhan flu": "SARS-CoV-2 syndemic", + "china flu": "SARS-CoV-2 syndemic", + "china virus": "SARS-CoV-2 syndemic", + "kung flu": "SARS-CoV-2 syndemic", + "nig": "🏀", + "nigs": "🏀s", } LONGPOST_REPLIES = ['Wow, you must be a JP fan.', 'This is one of the worst posts I have EVER seen. Delete it.', "No, don't reply like this, please do another wall of unhinged rant please.", '# 😴😴😴', "Ma'am we've been over this before. You need to stop.", "I've known more coherent downies.", "Your pulitzer's in the mail", "That's great and all, but I asked for my burger without cheese.", 'That degree finally paying off', "That's nice sweaty. Why don't you have a seat in the time out corner with Pizzashill until you calm down, then you can have your Capri Sun.", "All them words won't bring your pa back.", "You had a chance to not be completely worthless, but it looks like you threw it away. At least you're consistent.", 'Some people are able to display their intelligence by going on at length on a subject and never actually saying anything. This ability is most common in trades such as politics, public relations, and law. You have impressed me by being able to best them all, while still coming off as an absolute idiot.', "You can type 10,000 characters and you decided that these were the one's that you wanted.", 'Have you owned the libs yet?', "I don't know what you said, because I've seen another human naked.", 'Impressive. Normally people with such severe developmental disabilities struggle to write much more than a sentence or two. He really has exceded our expectations for the writing portion. Sadly the coherency of his writing, along with his abilities in the social skills and reading portions, are far behind his peers with similar disabilities.', "This is a really long way of saying you don't fuck.", "Sorry ma'am, looks like his delusions have gotten worse. We'll have to admit him,", '![](https://i.kym-cdn.com/photos/images/newsfeed/001/038/094/0a1.jpg)', 'If only you could put that energy into your relationships', 'Posts like this is why I do Heroine.', 'still unemployed then?', 'K', 'look im gunna have 2 ask u 2 keep ur giant dumps in the toilet not in my replys 😷😷😷', "Mommy is soooo proud of you, sweaty. Let's put this sperg out up on the fridge with all your other failures.", "Good job bobby, here's a star", "That was a mistake. You're about to find out the hard way why.", 'You sat down and wrote all this shit. You could have done so many other things with your life. What happened to your life that made you decide writing novels of bullshit on rdrama.net was the best option?', "I don't have enough spoons to read this shit", "All those words won't bring daddy back.", 'OUT!'] AGENDAPOSTER_MSG = """Hi @{username},\n\nYour comment has been automatically removed because you forgot - to include `trans lives matter`.\n\nDon't worry, we're here to help! We - won't let you post or comment anything that doesn't express your love and acceptance towards - the trans community. Feel free to resubmit your comment with `trans lives matter` - included. \n\n*This is an automated message; if you need help, - you can message us [here](/contact).*""" + to include `trans lives matter`.\n\nDon't worry, we're here to help! We + won't let you post or comment anything that doesn't express your love and acceptance towards + the trans community. Feel free to resubmit your comment with `trans lives matter` + included. \n\n*This is an automated message; if you need help, + you can message us [here](/contact).*""" VAXX_MSG = """Hi @{username}, it appears that you may be trying to spread dangerous misinformation regarding ineffective COVID-19 treatments based on pseudoscientific hearsay. Your post has been removed because it contained the word ivermectin. We ask that you understand that horse dewormer neither treats, nor prevents, COVID-19. For more information, please read up on what the FDA has to say on the matter: @@ -92,27 +92,27 @@ Thank you.""" BASED_MSG = "@{username}'s Based Count has increased by 1. Their Based Count is now {basedcount}.\n\nPills: {pills}" if SITE == "pcmemes.net": - BASEDBOT_ACCOUNT = 800 - NOTIFICATIONS_ACCOUNT = 1046 - AUTOJANNY_ACCOUNT = 1050 - SNAPPY_ACCOUNT = 261 - LONGPOSTBOT_ACCOUNT = 1832 - ZOZBOT_ACCOUNT = 1833 - AUTOPOLLER_ACCOUNT = 3369 + BASEDBOT_ACCOUNT = 800 + NOTIFICATIONS_ACCOUNT = 1046 + AUTOJANNY_ACCOUNT = 1050 + SNAPPY_ACCOUNT = 261 + LONGPOSTBOT_ACCOUNT = 1832 + ZOZBOT_ACCOUNT = 1833 + AUTOPOLLER_ACCOUNT = 3369 elif SITE == 'rdrama.net': - NOTIFICATIONS_ACCOUNT = 1046 - AUTOJANNY_ACCOUNT = 2360 - SNAPPY_ACCOUNT = 261 - LONGPOSTBOT_ACCOUNT = 1832 - ZOZBOT_ACCOUNT = 1833 - AUTOPOLLER_ACCOUNT = 6176 + NOTIFICATIONS_ACCOUNT = 1046 + AUTOJANNY_ACCOUNT = 2360 + SNAPPY_ACCOUNT = 261 + LONGPOSTBOT_ACCOUNT = 1832 + ZOZBOT_ACCOUNT = 1833 + AUTOPOLLER_ACCOUNT = 6176 else: - NOTIFICATIONS_ACCOUNT = 1 - AUTOJANNY_ACCOUNT = 2 - SNAPPY_ACCOUNT = 3 - LONGPOSTBOT_ACCOUNT = 4 - ZOZBOT_ACCOUNT = 5 - AUTOPOLLER_ACCOUNT = 6 + NOTIFICATIONS_ACCOUNT = 1 + AUTOJANNY_ACCOUNT = 2 + SNAPPY_ACCOUNT = 3 + LONGPOSTBOT_ACCOUNT = 4 + ZOZBOT_ACCOUNT = 5 + AUTOPOLLER_ACCOUNT = 6 PUSHER_INSTANCE_ID = '02ddcc80-b8db-42be-9022-44c546b4dce6' PUSHER_KEY = environ.get("PUSHER_KEY", "").strip() @@ -121,11 +121,11 @@ single_words = "|".join([slur.lower() for slur in SLURS.keys()]) SLUR_REGEX = re.compile(rf"(?i)(?<=\s|>)({single_words})(?=[\s<,.]|s[\s<,.])") def sub_matcher(match: re.Match) -> str: - return SLURS[match.group(0).lower()] + return SLURS[match.group(0).lower()] def censor_slurs(body: str, logged_user) -> str: - if not logged_user or logged_user.slurreplacer: body = SLUR_REGEX.sub(sub_matcher, body) - return body + if not logged_user or logged_user.slurreplacer: body = SLUR_REGEX.sub(sub_matcher, body) + return body if SITE_NAME == "Drama": AWARDS = { diff --git a/files/templates/comments.html b/files/templates/comments.html index fab23eb12..3239cd2ef 100755 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -109,13 +109,13 @@ })() {% if c.is_pinned %} - const pinned_info = document.getElementById('pinned-{{c.id}}') - {% if c.is_pinned.startswith('t:') %} - pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{c.is_pinned[2:]}} * 1000).toString()}`) - {% else %} - pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{c.is_pinned}}") - {%endif%} - {%endif%} + const pinned_info = document.getElementById('pinned-{{c.id}}') + {% if c.is_pinned.startswith('t:') %} + pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{c.is_pinned[2:]}} * 1000).toString()}`) + {% else %} + pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{c.is_pinned}}") + {%endif%} + {%endif%} })() diff --git a/files/templates/shop.html b/files/templates/shop.html index 931e884b3..f69f021d3 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -7,95 +7,95 @@ {% block pagetype %}message{% endblock %} {% block Banner %} -
- -

Stir drama. Earn coins.

-
Total sales: {{sales}} dramacoins
-
+
+ +

Stir drama. Earn coins.

+
Total sales: {{sales}} dramacoins
+
{% endblock %} {% block content %} - {% if error %} - - {% endif %} - {% if msg %} - - {% endif %} + {% if error %} + + {% endif %} + {% if msg %} + + {% endif %} -

-    

-    
Owned Awards
+

+	

+	
Owned Awards
- - - - - - - - - - - {% for a in owned %} - - - - - - - {% endfor %} -
IconTitleDescriptionOwned
{{a['title']}}{{a['description']}}{{a['owned_num']}}
+ + + + + + + + + + + {% for a in owned %} + + + + + + + {% endfor %} +
IconTitleDescriptionOwned
{{a['title']}}{{a['description']}}{{a['owned_num']}}
-
+	
 
 
-    
+
-
Shop
+
Shop
- - - - - - - - - - - - {% for a in awards %} - - - - - - {% set kind = a['kind'] %} - - - {% endfor %} -
IconTitleDescriptionPriceBuy
{{a['title']}}{{a['description']}}{{a['price']}}Buy
-
+	
+	
+			
+				
+				
+				
+				
+				
+			
+		
+		
+	{% for a in awards %}
+		
+			
+			
+			
+			
+			{% set kind = a['kind'] %}
+			
+		
+	{% endfor %}
+	
IconTitleDescriptionPriceBuy
{{a['title']}}{{a['description']}}{{a['price']}}Buy
+
 
 
 
 
 
-    
+
{% endblock %} diff --git a/files/templates/submission.html b/files/templates/submission.html index 0e6228ff8..b371285b9 100755 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -866,13 +866,13 @@ {% endif %} {% if p.stickied %} - const pinned_info = document.getElementById('pinned-{{p.id}}') - {% if p.stickied.startswith('t:') %} - pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{p.stickied[2:]}} * 1000).toString()}`) - {% else %} - pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{p.stickied}}") - {%endif%} - {%endif%} + const pinned_info = document.getElementById('pinned-{{p.id}}') + {% if p.stickied.startswith('t:') %} + pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{p.stickied[2:]}} * 1000).toString()}`) + {% else %} + pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{p.stickied}}") + {%endif%} + {%endif%} })() diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 61d18ddeb..7ed55967d 100755 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -60,7 +60,7 @@ coins      - + View @@ -81,14 +81,14 @@ showNewCommentCounts('{{p.id}}', {{p.comment_count}}) {% endif %} - {% if p.stickied %} - const pinned_info = document.getElementById('pinned-{{p.id}}') - {% if p.stickied.startswith('t:') %} - pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{p.stickied[2:]}} * 1000).toString()}`) - {% else %} - pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{p.stickied}}") - {%endif%} - {%endif%} + {% if p.stickied %} + const pinned_info = document.getElementById('pinned-{{p.id}}') + {% if p.stickied.startswith('t:') %} + pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{p.stickied[2:]}} * 1000).toString()}`) + {% else %} + pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{p.stickied}}") + {%endif%} + {%endif%} })() diff --git a/schema.sql b/schema.sql index 5c6069cbf..a5e608d8f 100755 --- a/schema.sql +++ b/schema.sql @@ -67,10 +67,10 @@ SET default_table_access_method = heap; -- CREATE TABLE public.alts ( - id integer NOT NULL, - user1 integer NOT NULL, - user2 integer NOT NULL, - is_manual boolean DEFAULT false + id integer NOT NULL, + user1 integer NOT NULL, + user2 integer NOT NULL, + is_manual boolean DEFAULT false ); @@ -79,12 +79,12 @@ CREATE TABLE public.alts ( -- CREATE SEQUENCE public.alts_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -99,11 +99,11 @@ ALTER SEQUENCE public.alts_id_seq OWNED BY public.alts.id; -- CREATE TABLE public.award_relationships ( - id integer NOT NULL, - user_id integer, - submission_id integer, - comment_id integer, - kind character varying(20) + id integer NOT NULL, + user_id integer, + submission_id integer, + comment_id integer, + kind character varying(20) ); @@ -112,12 +112,12 @@ CREATE TABLE public.award_relationships ( -- CREATE SEQUENCE public.award_relationships_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -132,12 +132,12 @@ ALTER SEQUENCE public.award_relationships_id_seq OWNED BY public.award_relations -- CREATE TABLE public.badge_defs ( - id integer NOT NULL, - name character varying(64), - description character varying(256), - icon character varying(64), - kind integer, - qualification_expr character varying(128) + id integer NOT NULL, + name character varying(64), + description character varying(256), + icon character varying(64), + kind integer, + qualification_expr character varying(128) ); @@ -146,12 +146,12 @@ CREATE TABLE public.badge_defs ( -- CREATE SEQUENCE public.badge_list_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -166,11 +166,11 @@ ALTER SEQUENCE public.badge_list_id_seq OWNED BY public.badge_defs.id; -- CREATE TABLE public.badges ( - id integer NOT NULL, - badge_id integer, - user_id integer, - description character varying(256), - url character varying(256) + id integer NOT NULL, + badge_id integer, + user_id integer, + description character varying(256), + url character varying(256) ); @@ -179,12 +179,12 @@ CREATE TABLE public.badges ( -- CREATE SEQUENCE public.badges_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -199,11 +199,11 @@ ALTER SEQUENCE public.badges_id_seq OWNED BY public.badges.id; -- CREATE TABLE public.badpics ( - id integer NOT NULL, - description character varying(255), - phash character varying(64), - ban_reason character varying(64), - ban_time integer DEFAULT 0 NOT NULL + id integer NOT NULL, + description character varying(255), + phash character varying(64), + ban_reason character varying(64), + ban_time integer DEFAULT 0 NOT NULL ); @@ -212,12 +212,12 @@ CREATE TABLE public.badpics ( -- CREATE SEQUENCE public.badpics_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -232,9 +232,9 @@ ALTER SEQUENCE public.badpics_id_seq OWNED BY public.badpics.id; -- CREATE TABLE public.banneddomains ( - id integer NOT NULL, - domain character varying(100), - reason character varying(100) + id integer NOT NULL, + domain character varying(100), + reason character varying(100) ); @@ -243,10 +243,10 @@ CREATE TABLE public.banneddomains ( -- CREATE TABLE public.client_auths ( - id integer NOT NULL, - user_id integer, - oauth_client integer, - access_token character(128) + id integer NOT NULL, + user_id integer, + oauth_client integer, + access_token character(128) ); @@ -255,12 +255,12 @@ CREATE TABLE public.client_auths ( -- CREATE SEQUENCE public.client_auths_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -275,10 +275,10 @@ ALTER SEQUENCE public.client_auths_id_seq OWNED BY public.client_auths.id; -- CREATE TABLE public.commentflags ( - id integer NOT NULL, - user_id integer, - comment_id integer, - reason character varying(350) + id integer NOT NULL, + user_id integer, + comment_id integer, + reason character varying(350) ); @@ -287,12 +287,12 @@ CREATE TABLE public.commentflags ( -- CREATE SEQUENCE public.commentflags_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -307,32 +307,32 @@ ALTER SEQUENCE public.commentflags_id_seq OWNED BY public.commentflags.id; -- CREATE TABLE public.comments ( - id integer NOT NULL, - author_id integer, - created_utc integer NOT NULL, - parent_submission integer, - is_banned boolean, - distinguish_level integer, - edited_utc integer, - deleted_utc integer NOT NULL, - is_approved integer NOT NULL, - author_name character varying(64), - approved_utc integer, - level integer, - parent_comment_id integer, - over_18 boolean, - upvotes integer, - downvotes integer, - is_bot boolean DEFAULT false, - app_id integer, - sentto integer, - bannedfor boolean, - removed_by integer, - is_pinned character varying(25), - body character varying(10000), - body_html character varying(40000), - ban_reason character varying(256), - notifiedto integer + id integer NOT NULL, + author_id integer, + created_utc integer NOT NULL, + parent_submission integer, + is_banned boolean, + distinguish_level integer, + edited_utc integer, + deleted_utc integer NOT NULL, + is_approved integer NOT NULL, + author_name character varying(64), + approved_utc integer, + level integer, + parent_comment_id integer, + over_18 boolean, + upvotes integer, + downvotes integer, + is_bot boolean DEFAULT false, + app_id integer, + sentto integer, + bannedfor boolean, + removed_by integer, + is_pinned character varying(25), + body character varying(10000), + body_html character varying(40000), + ban_reason character varying(256), + notifiedto integer ); @@ -341,12 +341,12 @@ CREATE TABLE public.comments ( -- CREATE SEQUENCE public.comments_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -361,12 +361,12 @@ ALTER SEQUENCE public.comments_id_seq OWNED BY public.comments.id; -- CREATE TABLE public.commentvotes ( - id integer NOT NULL, - comment_id integer, - vote_type integer, - user_id integer, - creation_ip character(64), - app_id integer + id integer NOT NULL, + comment_id integer, + vote_type integer, + user_id integer, + creation_ip character(64), + app_id integer ); @@ -375,12 +375,12 @@ CREATE TABLE public.commentvotes ( -- CREATE SEQUENCE public.commentvotes_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -395,12 +395,12 @@ ALTER SEQUENCE public.commentvotes_id_seq OWNED BY public.commentvotes.id; -- CREATE SEQUENCE public.domains_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -415,10 +415,10 @@ ALTER SEQUENCE public.domains_id_seq OWNED BY public.banneddomains.id; -- CREATE TABLE public.flags ( - id integer NOT NULL, - user_id integer, - post_id integer, - reason character varying(350) + id integer NOT NULL, + user_id integer, + post_id integer, + reason character varying(350) ); @@ -427,12 +427,12 @@ CREATE TABLE public.flags ( -- CREATE SEQUENCE public.flags_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -447,9 +447,9 @@ ALTER SEQUENCE public.flags_id_seq OWNED BY public.flags.id; -- CREATE TABLE public.follows ( - id integer NOT NULL, - user_id integer, - target_id integer + id integer NOT NULL, + user_id integer, + target_id integer ); @@ -458,12 +458,12 @@ CREATE TABLE public.follows ( -- CREATE SEQUENCE public.follows_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -478,14 +478,14 @@ ALTER SEQUENCE public.follows_id_seq OWNED BY public.follows.id; -- CREATE TABLE public.modactions ( - id integer NOT NULL, - user_id integer, - target_user_id integer, - target_submission_id integer, - target_comment_id integer, - created_utc integer DEFAULT 0, - kind character varying(32) DEFAULT NULL::character varying, - _note character varying(256) DEFAULT NULL::character varying + id integer NOT NULL, + user_id integer, + target_user_id integer, + target_submission_id integer, + target_comment_id integer, + created_utc integer DEFAULT 0, + kind character varying(32) DEFAULT NULL::character varying, + _note character varying(256) DEFAULT NULL::character varying ); @@ -494,12 +494,12 @@ CREATE TABLE public.modactions ( -- CREATE SEQUENCE public.modactions_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -514,15 +514,15 @@ ALTER SEQUENCE public.modactions_id_seq OWNED BY public.modactions.id; -- CREATE TABLE public.notifications ( - id integer NOT NULL, - user_id integer, - comment_id integer, - read boolean NOT NULL, - followsender integer, - unfollowsender integer, - blocksender integer, - unblocksender integer, - removefollowsender integer + id integer NOT NULL, + user_id integer, + comment_id integer, + read boolean NOT NULL, + followsender integer, + unfollowsender integer, + blocksender integer, + unblocksender integer, + removefollowsender integer ); @@ -531,12 +531,12 @@ CREATE TABLE public.notifications ( -- CREATE SEQUENCE public.notifications_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -551,12 +551,12 @@ ALTER SEQUENCE public.notifications_id_seq OWNED BY public.notifications.id; -- CREATE TABLE public.oauth_apps ( - id integer NOT NULL, - client_id character(64), - app_name character varying(50), - redirect_uri character varying(4096), - author_id integer, - description character varying(256) + id integer NOT NULL, + client_id character(64), + app_name character varying(50), + redirect_uri character varying(4096), + author_id integer, + description character varying(256) ); @@ -565,12 +565,12 @@ CREATE TABLE public.oauth_apps ( -- CREATE SEQUENCE public.oauth_apps_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -585,11 +585,11 @@ ALTER SEQUENCE public.oauth_apps_id_seq OWNED BY public.oauth_apps.id; -- CREATE TABLE public.save_relationship ( - id integer NOT NULL, - submission_id integer, - user_id integer, - type integer, - comment_id integer + id integer NOT NULL, + submission_id integer, + user_id integer, + type integer, + comment_id integer ); @@ -598,12 +598,12 @@ CREATE TABLE public.save_relationship ( -- CREATE SEQUENCE public.save_relationship_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -618,37 +618,37 @@ ALTER SEQUENCE public.save_relationship_id_seq OWNED BY public.save_relationship -- CREATE TABLE public.submissions ( - id integer NOT NULL, - author_id integer, - created_utc integer NOT NULL, - is_banned boolean, - over_18 boolean, - distinguish_level integer, - created_str character varying(255), - deleted_utc integer NOT NULL, - domain_ref integer, - is_approved integer NOT NULL, - edited_utc integer, - is_pinned boolean, - upvotes integer, - downvotes integer, - app_id integer, - thumburl character varying(60), - private boolean, - views integer, - is_bot boolean, - bannedfor boolean, - comment_count integer DEFAULT 0, - removed_by integer, - club boolean, - stickied character varying(25), - title character varying(500), - url character varying(2083), - body character varying(10000), - body_html character varying(20000), - embed_url character varying(10000), - ban_reason character varying(128), - title_html character varying(1500) + id integer NOT NULL, + author_id integer, + created_utc integer NOT NULL, + is_banned boolean, + over_18 boolean, + distinguish_level integer, + created_str character varying(255), + deleted_utc integer NOT NULL, + domain_ref integer, + is_approved integer NOT NULL, + edited_utc integer, + is_pinned boolean, + upvotes integer, + downvotes integer, + app_id integer, + thumburl character varying(60), + private boolean, + views integer, + is_bot boolean, + bannedfor boolean, + comment_count integer DEFAULT 0, + removed_by integer, + club boolean, + stickied character varying(25), + title character varying(500), + url character varying(2083), + body character varying(10000), + body_html character varying(20000), + embed_url character varying(10000), + ban_reason character varying(128), + title_html character varying(1500) ); @@ -657,12 +657,12 @@ CREATE TABLE public.submissions ( -- CREATE SEQUENCE public.submissions_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -677,10 +677,10 @@ ALTER SEQUENCE public.submissions_id_seq OWNED BY public.submissions.id; -- CREATE TABLE public.subscriptions ( - id integer NOT NULL, - user_id integer, - board_id integer, - submission_id integer + id integer NOT NULL, + user_id integer, + board_id integer, + submission_id integer ); @@ -689,12 +689,12 @@ CREATE TABLE public.subscriptions ( -- CREATE SEQUENCE public.subscriptions_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -709,9 +709,9 @@ ALTER SEQUENCE public.subscriptions_id_seq OWNED BY public.subscriptions.id; -- CREATE TABLE public.userblocks ( - id integer NOT NULL, - user_id integer, - target_id integer + id integer NOT NULL, + user_id integer, + target_id integer ); @@ -720,12 +720,12 @@ CREATE TABLE public.userblocks ( -- CREATE SEQUENCE public.userblocks_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -740,76 +740,76 @@ ALTER SEQUENCE public.userblocks_id_seq OWNED BY public.userblocks.id; -- CREATE TABLE public.users ( - id integer NOT NULL, - username character varying(255) NOT NULL, - email character varying(255), - passhash character varying(255) NOT NULL, - created_utc integer NOT NULL, - admin_level integer, - over_18 boolean, - is_activated boolean, - bio character varying(1500), - bio_html character varying(10000), - referred_by integer, - is_banned integer, - ban_reason character varying(128), - login_nonce integer, - reserved character varying(256), - mfa_secret character varying(32), - is_private boolean, - unban_utc integer, - is_nofollow boolean DEFAULT false, - custom_filter_list character varying(1000) DEFAULT ''::character varying, - discord_id character varying(64), - stored_subscriber_count integer DEFAULT 0, - ban_evade integer DEFAULT 0, - original_username character varying(255), - customtitle character varying(1000), - defaultsorting character varying(15), - defaulttime character varying(5), - namecolor character varying(6), - titlecolor character varying(6), - profileurl character varying(65), - bannerurl character varying(65), - hidevotedon boolean, - newtab boolean, - flairchanged integer, - defaultsortingcomments character varying(15), - theme character varying(15), - song character varying(50), - slurreplacer boolean, - shadowbanned character varying(25), - newtabexternal boolean, - customtitleplain character varying(100), - themecolor character varying(6), - changelogsub boolean, - oldreddit boolean, - css character varying(4000), - profilecss character varying(4000), - coins integer, - agendaposter boolean, - agendaposter_expires_utc integer DEFAULT 0, - resized boolean, - suicide_utc integer, - post_count integer, - comment_count integer, - highres character varying(60), - rent_utc integer, - patron integer, - controversial boolean, - background character varying(20), - verified character varying(20), - fail_utc integer, - steal_utc integer, - fail2_utc integer, - cardview boolean, - received_award_count integer, - highlightcomments boolean, - club_banned boolean DEFAULT false, - nitter boolean, - truecoins integer, - club_allowed boolean DEFAULT false, - frontsize integer + id integer NOT NULL, + username character varying(255) NOT NULL, + email character varying(255), + passhash character varying(255) NOT NULL, + created_utc integer NOT NULL, + admin_level integer, + over_18 boolean, + is_activated boolean, + bio character varying(1500), + bio_html character varying(10000), + referred_by integer, + is_banned integer, + ban_reason character varying(128), + login_nonce integer, + reserved character varying(256), + mfa_secret character varying(32), + is_private boolean, + unban_utc integer, + is_nofollow boolean DEFAULT false, + custom_filter_list character varying(1000) DEFAULT ''::character varying, + discord_id character varying(64), + stored_subscriber_count integer DEFAULT 0, + ban_evade integer DEFAULT 0, + original_username character varying(255), + customtitle character varying(1000), + defaultsorting character varying(15), + defaulttime character varying(5), + namecolor character varying(6), + titlecolor character varying(6), + profileurl character varying(65), + bannerurl character varying(65), + hidevotedon boolean, + newtab boolean, + flairchanged integer, + defaultsortingcomments character varying(15), + theme character varying(15), + song character varying(50), + slurreplacer boolean, + shadowbanned character varying(25), + newtabexternal boolean, + customtitleplain character varying(100), + themecolor character varying(6), + changelogsub boolean, + oldreddit boolean, + css character varying(4000), + profilecss character varying(4000), + coins integer, + agendaposter boolean, + agendaposter_expires_utc integer DEFAULT 0, + resized boolean, + suicide_utc integer, + post_count integer, + comment_count integer, + highres character varying(60), + rent_utc integer, + patron integer, + controversial boolean, + background character varying(20), + verified character varying(20), + fail_utc integer, + steal_utc integer, + fail2_utc integer, + cardview boolean, + received_award_count integer, + highlightcomments boolean, + club_banned boolean DEFAULT false, + nitter boolean, + truecoins integer, + club_allowed boolean DEFAULT false, + frontsize integer ); @@ -818,12 +818,12 @@ CREATE TABLE public.users ( -- CREATE SEQUENCE public.users_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -838,10 +838,10 @@ ALTER SEQUENCE public.users_id_seq OWNED BY public.users.id; -- CREATE TABLE public.viewers ( - id integer NOT NULL, - user_id integer, - viewer_id integer, - last_view_utc integer + id integer NOT NULL, + user_id integer, + viewer_id integer, + last_view_utc integer ); @@ -850,12 +850,12 @@ CREATE TABLE public.viewers ( -- CREATE SEQUENCE public.viewers_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -870,12 +870,12 @@ ALTER SEQUENCE public.viewers_id_seq OWNED BY public.viewers.id; -- CREATE TABLE public.votes ( - id integer NOT NULL, - user_id integer NOT NULL, - submission_id integer, - vote_type integer, - creation_ip character(64), - app_id integer + id integer NOT NULL, + user_id integer NOT NULL, + submission_id integer, + vote_type integer, + creation_ip character(64), + app_id integer ); @@ -884,12 +884,12 @@ CREATE TABLE public.votes ( -- CREATE SEQUENCE public.votes_id_seq - AS integer - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1; + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; -- @@ -1058,7 +1058,7 @@ ALTER TABLE ONLY public.votes ALTER COLUMN id SET DEFAULT nextval('public.votes_ -- ALTER TABLE ONLY public.alts - ADD CONSTRAINT alts_pkey PRIMARY KEY (user1, user2); + ADD CONSTRAINT alts_pkey PRIMARY KEY (user1, user2); -- @@ -1066,7 +1066,7 @@ ALTER TABLE ONLY public.alts -- ALTER TABLE ONLY public.award_relationships - ADD CONSTRAINT award_constraint UNIQUE (user_id, submission_id, comment_id); + ADD CONSTRAINT award_constraint UNIQUE (user_id, submission_id, comment_id); -- @@ -1074,7 +1074,7 @@ ALTER TABLE ONLY public.award_relationships -- ALTER TABLE ONLY public.award_relationships - ADD CONSTRAINT award_relationships_pkey PRIMARY KEY (id); + ADD CONSTRAINT award_relationships_pkey PRIMARY KEY (id); -- @@ -1082,7 +1082,7 @@ ALTER TABLE ONLY public.award_relationships -- ALTER TABLE ONLY public.badge_defs - ADD CONSTRAINT badge_defs_pkey PRIMARY KEY (id); + ADD CONSTRAINT badge_defs_pkey PRIMARY KEY (id); -- @@ -1090,7 +1090,7 @@ ALTER TABLE ONLY public.badge_defs -- ALTER TABLE ONLY public.badge_defs - ADD CONSTRAINT badge_list_icon_key UNIQUE (icon); + ADD CONSTRAINT badge_list_icon_key UNIQUE (icon); -- @@ -1098,7 +1098,7 @@ ALTER TABLE ONLY public.badge_defs -- ALTER TABLE ONLY public.badges - ADD CONSTRAINT badges_pkey PRIMARY KEY (id); + ADD CONSTRAINT badges_pkey PRIMARY KEY (id); -- @@ -1106,7 +1106,7 @@ ALTER TABLE ONLY public.badges -- ALTER TABLE ONLY public.badpics - ADD CONSTRAINT badpics_pkey PRIMARY KEY (id); + ADD CONSTRAINT badpics_pkey PRIMARY KEY (id); -- @@ -1114,7 +1114,7 @@ ALTER TABLE ONLY public.badpics -- ALTER TABLE ONLY public.client_auths - ADD CONSTRAINT client_auths_pkey PRIMARY KEY (id); + ADD CONSTRAINT client_auths_pkey PRIMARY KEY (id); -- @@ -1122,7 +1122,7 @@ ALTER TABLE ONLY public.client_auths -- ALTER TABLE ONLY public.commentflags - ADD CONSTRAINT commentflags_pkey PRIMARY KEY (id); + ADD CONSTRAINT commentflags_pkey PRIMARY KEY (id); -- @@ -1130,7 +1130,7 @@ ALTER TABLE ONLY public.commentflags -- ALTER TABLE ONLY public.comments - ADD CONSTRAINT comments_pkey PRIMARY KEY (id); + ADD CONSTRAINT comments_pkey PRIMARY KEY (id); -- @@ -1138,7 +1138,7 @@ ALTER TABLE ONLY public.comments -- ALTER TABLE ONLY public.commentvotes - ADD CONSTRAINT commentvotes_pkey PRIMARY KEY (id); + ADD CONSTRAINT commentvotes_pkey PRIMARY KEY (id); -- @@ -1146,7 +1146,7 @@ ALTER TABLE ONLY public.commentvotes -- ALTER TABLE ONLY public.banneddomains - ADD CONSTRAINT domains_domain_key UNIQUE (domain); + ADD CONSTRAINT domains_domain_key UNIQUE (domain); -- @@ -1154,7 +1154,7 @@ ALTER TABLE ONLY public.banneddomains -- ALTER TABLE ONLY public.banneddomains - ADD CONSTRAINT domains_pkey PRIMARY KEY (id); + ADD CONSTRAINT domains_pkey PRIMARY KEY (id); -- @@ -1162,7 +1162,7 @@ ALTER TABLE ONLY public.banneddomains -- ALTER TABLE ONLY public.flags - ADD CONSTRAINT flags_pkey PRIMARY KEY (id); + ADD CONSTRAINT flags_pkey PRIMARY KEY (id); -- @@ -1170,7 +1170,7 @@ ALTER TABLE ONLY public.flags -- ALTER TABLE ONLY public.follows - ADD CONSTRAINT follow_membership_unique UNIQUE (user_id, target_id); + ADD CONSTRAINT follow_membership_unique UNIQUE (user_id, target_id); -- @@ -1178,7 +1178,7 @@ ALTER TABLE ONLY public.follows -- ALTER TABLE ONLY public.follows - ADD CONSTRAINT follows_pkey PRIMARY KEY (id); + ADD CONSTRAINT follows_pkey PRIMARY KEY (id); -- @@ -1186,7 +1186,7 @@ ALTER TABLE ONLY public.follows -- ALTER TABLE ONLY public.modactions - ADD CONSTRAINT modactions_pkey PRIMARY KEY (id); + ADD CONSTRAINT modactions_pkey PRIMARY KEY (id); -- @@ -1194,7 +1194,7 @@ ALTER TABLE ONLY public.modactions -- ALTER TABLE ONLY public.notifications - ADD CONSTRAINT notifications_pkey PRIMARY KEY (id); + ADD CONSTRAINT notifications_pkey PRIMARY KEY (id); -- @@ -1202,7 +1202,7 @@ ALTER TABLE ONLY public.notifications -- ALTER TABLE ONLY public.oauth_apps - ADD CONSTRAINT oauth_apps_pkey PRIMARY KEY (id); + ADD CONSTRAINT oauth_apps_pkey PRIMARY KEY (id); -- @@ -1210,7 +1210,7 @@ ALTER TABLE ONLY public.oauth_apps -- ALTER TABLE ONLY public.users - ADD CONSTRAINT one_discord_account UNIQUE (discord_id); + ADD CONSTRAINT one_discord_account UNIQUE (discord_id); -- @@ -1218,7 +1218,7 @@ ALTER TABLE ONLY public.users -- ALTER TABLE ONLY public.notifications - ADD CONSTRAINT one_notif UNIQUE (user_id, comment_id); + ADD CONSTRAINT one_notif UNIQUE (user_id, comment_id); -- @@ -1226,7 +1226,7 @@ ALTER TABLE ONLY public.notifications -- ALTER TABLE ONLY public.commentvotes - ADD CONSTRAINT onecvote UNIQUE (user_id, comment_id); + ADD CONSTRAINT onecvote UNIQUE (user_id, comment_id); -- @@ -1234,7 +1234,7 @@ ALTER TABLE ONLY public.commentvotes -- ALTER TABLE ONLY public.votes - ADD CONSTRAINT onevote UNIQUE (user_id, submission_id); + ADD CONSTRAINT onevote UNIQUE (user_id, submission_id); -- @@ -1242,7 +1242,7 @@ ALTER TABLE ONLY public.votes -- ALTER TABLE ONLY public.save_relationship - ADD CONSTRAINT save_constraint UNIQUE (submission_id, user_id); + ADD CONSTRAINT save_constraint UNIQUE (submission_id, user_id); -- @@ -1250,7 +1250,7 @@ ALTER TABLE ONLY public.save_relationship -- ALTER TABLE ONLY public.save_relationship - ADD CONSTRAINT save_relationship_pkey PRIMARY KEY (id); + ADD CONSTRAINT save_relationship_pkey PRIMARY KEY (id); -- @@ -1258,7 +1258,7 @@ ALTER TABLE ONLY public.save_relationship -- ALTER TABLE ONLY public.submissions - ADD CONSTRAINT submissions_pkey PRIMARY KEY (id); + ADD CONSTRAINT submissions_pkey PRIMARY KEY (id); -- @@ -1266,7 +1266,7 @@ ALTER TABLE ONLY public.submissions -- ALTER TABLE ONLY public.subscriptions - ADD CONSTRAINT subscriptions_pkey PRIMARY KEY (id); + ADD CONSTRAINT subscriptions_pkey PRIMARY KEY (id); -- @@ -1274,7 +1274,7 @@ ALTER TABLE ONLY public.subscriptions -- ALTER TABLE ONLY public.client_auths - ADD CONSTRAINT unique_access UNIQUE (access_token); + ADD CONSTRAINT unique_access UNIQUE (access_token); -- @@ -1282,7 +1282,7 @@ ALTER TABLE ONLY public.client_auths -- ALTER TABLE ONLY public.oauth_apps - ADD CONSTRAINT unique_id UNIQUE (client_id); + ADD CONSTRAINT unique_id UNIQUE (client_id); -- @@ -1290,7 +1290,7 @@ ALTER TABLE ONLY public.oauth_apps -- ALTER TABLE ONLY public.badges - ADD CONSTRAINT user_badge_constraint UNIQUE (user_id, badge_id); + ADD CONSTRAINT user_badge_constraint UNIQUE (user_id, badge_id); -- @@ -1298,7 +1298,7 @@ ALTER TABLE ONLY public.badges -- ALTER TABLE ONLY public.userblocks - ADD CONSTRAINT userblocks_pkey PRIMARY KEY (id); + ADD CONSTRAINT userblocks_pkey PRIMARY KEY (id); -- @@ -1306,7 +1306,7 @@ ALTER TABLE ONLY public.userblocks -- ALTER TABLE ONLY public.alts - ADD CONSTRAINT userpair UNIQUE (user1, user2); + ADD CONSTRAINT userpair UNIQUE (user1, user2); -- @@ -1314,7 +1314,7 @@ ALTER TABLE ONLY public.alts -- ALTER TABLE ONLY public.users - ADD CONSTRAINT users_email_key UNIQUE (email); + ADD CONSTRAINT users_email_key UNIQUE (email); -- @@ -1322,7 +1322,7 @@ ALTER TABLE ONLY public.users -- ALTER TABLE ONLY public.users - ADD CONSTRAINT users_original_username_key UNIQUE (original_username); + ADD CONSTRAINT users_original_username_key UNIQUE (original_username); -- @@ -1330,7 +1330,7 @@ ALTER TABLE ONLY public.users -- ALTER TABLE ONLY public.users - ADD CONSTRAINT users_pkey PRIMARY KEY (username); + ADD CONSTRAINT users_pkey PRIMARY KEY (username); -- @@ -1338,7 +1338,7 @@ ALTER TABLE ONLY public.users -- ALTER TABLE ONLY public.users - ADD CONSTRAINT users_username_key UNIQUE (username); + ADD CONSTRAINT users_username_key UNIQUE (username); -- @@ -1346,7 +1346,7 @@ ALTER TABLE ONLY public.users -- ALTER TABLE ONLY public.viewers - ADD CONSTRAINT viewers_pkey PRIMARY KEY (id); + ADD CONSTRAINT viewers_pkey PRIMARY KEY (id); -- @@ -1354,7 +1354,7 @@ ALTER TABLE ONLY public.viewers -- ALTER TABLE ONLY public.votes - ADD CONSTRAINT votes_pkey PRIMARY KEY (id); + ADD CONSTRAINT votes_pkey PRIMARY KEY (id); -- @@ -1810,7 +1810,7 @@ CREATE INDEX votes_type_index ON public.votes USING btree (vote_type); -- ALTER TABLE ONLY public.badges - ADD CONSTRAINT badges_badge_id_fkey FOREIGN KEY (badge_id) REFERENCES public.badge_defs(id); + ADD CONSTRAINT badges_badge_id_fkey FOREIGN KEY (badge_id) REFERENCES public.badge_defs(id); -- @@ -1818,7 +1818,7 @@ ALTER TABLE ONLY public.badges -- ALTER TABLE ONLY public.commentflags - ADD CONSTRAINT commentflags_comment_id_fkey FOREIGN KEY (comment_id) REFERENCES public.comments(id); + ADD CONSTRAINT commentflags_comment_id_fkey FOREIGN KEY (comment_id) REFERENCES public.comments(id); -- @@ -1826,7 +1826,7 @@ ALTER TABLE ONLY public.commentflags -- ALTER TABLE ONLY public.flags - ADD CONSTRAINT flags_post_id_fkey FOREIGN KEY (post_id) REFERENCES public.submissions(id); + ADD CONSTRAINT flags_post_id_fkey FOREIGN KEY (post_id) REFERENCES public.submissions(id); -- @@ -1834,7 +1834,7 @@ ALTER TABLE ONLY public.flags -- ALTER TABLE ONLY public.notifications - ADD CONSTRAINT notifications_comment_id_fkey FOREIGN KEY (comment_id) REFERENCES public.comments(id); + ADD CONSTRAINT notifications_comment_id_fkey FOREIGN KEY (comment_id) REFERENCES public.comments(id); -- diff --git a/snappy.txt b/snappy.txt index bc221f306..46d2478b5 100755 --- a/snappy.txt +++ b/snappy.txt @@ -2608,11 +2608,11 @@ There's an extremely excellent reason (backed up by hours of discussion, ten-tho It's because one of the major methods of bad faith apologetics for hate movements is the Tu Quoque: "They're just as bad". But -- importantly -- the female-dating-strategy is not: - pushing their members to remove condoms to commit rape; - pushing their members to commit rape; - pushing their members to assault men; - pushing their members to murder men; - pushing their members to stalk and terrorise men. + pushing their members to remove condoms to commit rape; + pushing their members to commit rape; + pushing their members to assault men; + pushing their members to murder men; + pushing their members to stalk and terrorise men. Importantly, there are no mass murders committed by FDS adherents. There are no restraining orders that we're aware of that cite the FDS subreddit. There are no men on Twitter stepping forward to say that members of the FDS movement are bombarding them with unwelcome tweets and direct messages, sexual advances, and photoshopping pornography of them.