', ':marseytrain:')
diff --git a/files/classes/user.py b/files/classes/user.py
index 6f3fb05b7..0149235c9 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -109,7 +109,6 @@ class User(Base):
unban_utc = Column(Integer, default=0)
ban_reason = deferred(Column(String))
is_muted = Column(Boolean, default=False, nullable=False)
- club_allowed = Column(Boolean)
login_nonce = Column(Integer, default=0)
coins = Column(Integer, default=0)
truescore = Column(Integer, default=0)
@@ -451,14 +450,6 @@ class User(Base):
def has_blocked(self, target):
return g.db.query(UserBlock).filter_by(user_id=self.id, target_id=target.id).one_or_none()
- @property
- @lazy
- def paid_dues(self):
- if not FEATURES['COUNTRY_CLUB']: return True
- if self.shadowbanned: return False
- if self.is_suspended_permanently: return False
- return self.admin_level >= PERMS['VIEW_CLUB'] or self.club_allowed or (self.club_allowed != False and self.truescore >= DUES)
-
@lazy
def any_block_exists(self, other):
@@ -1015,11 +1006,8 @@ class User(Base):
if other.is_banned: return False
if other.deleted_utc: return False
if other.author.shadowbanned and not (user and user.can_see_shadowbanned): return False
- if isinstance(other, Submission):
- if other.club and not (user and user.paid_dues): return False
- if other.sub == 'chudrama' and not (user and user.can_see_chudrama): return False
- else:
- if other.parent_submission and not cls.can_see_content(user, other.post): return False
+ if isinstance(other, Comment):
+ if other.parent_submission and not cls.can_see(user, other.post): return False
return True
@classmethod
@@ -1045,7 +1033,9 @@ class User(Base):
if other.parent_submission and other.post.sub and not cls.can_see(user, other.post.subr): return False
# if other.parent_submission and not cls.can_see(user, other.post): return False
elif isinstance(other, Sub):
- return other.name != 'chudrama' or (user and user.can_see_chudrama)
+ if other.name == 'chudrama': return bool(user) and user.can_see_chudrama
+ if other.name == 'countryclub': return bool(user) and user.can_see_countryclub
+ if other.name == 'masterbaiters': return bool(user) and user.can_see_masterbaiters
elif isinstance(other, User):
return (user and user.id == other.id) or (user and user.can_see_shadowbanned) or not other.shadowbanned
return True
@@ -1055,17 +1045,33 @@ class User(Base):
def can_see_chudrama(self):
if self.admin_level >= PERMS['VIEW_CHUDRAMA']: return True
if self.client: return True
- if self.truescore >= 5000: return True
+ if self.truescore >= TRUESCORE_CHUDRAMA_MINIMUM: return True
if self.agendaposter: return True
if self.patron: return True
return False
-
+
+ @property
+ @lazy
+ def can_see_countryclub(self):
+ if self.shadowbanned: return False
+ if self.is_suspended_permanently: return False
+ if self.agendaposter == 1: return False
+ if self.admin_level >= PERMS['VIEW_CLUB']: return True
+ if self.truescore >= TRUESCORE_CLUB_MINIMUM: return True
+ return False
+
+ @property
+ @lazy
+ def can_see_masterbaiters(self):
+ if self.shadowbanned: return False
+ if self.is_suspended_permanently: return False
+ return True
+
@property
@lazy
def can_post_in_ghost_threads(self):
if not TRUESCORE_GHOST_MINIMUM: return True
if self.admin_level >= PERMS['POST_IN_GHOST_THREADS']: return True
- if self.club_allowed: return True
if self.truescore >= TRUESCORE_GHOST_MINIMUM: return True
if self.patron: return True
return False
diff --git a/files/helpers/const.py b/files/helpers/const.py
index c6be9c931..5b2e00319 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -29,7 +29,6 @@ GUMROAD_TOKEN = environ.get("GUMROAD_TOKEN", DEFAULT_CONFIG_VALUE).strip()
GUMROAD_LINK = environ.get("GUMROAD_LINK", DEFAULT_CONFIG_VALUE).strip()
GUMROAD_ID = environ.get("GUMROAD_ID", DEFAULT_CONFIG_VALUE).strip()
DISABLE_DOWNVOTES = bool(int(environ.get("DISABLE_DOWNVOTES", "0").strip()))
-DUES = int(environ.get("DUES", "0").strip())
DEFAULT_THEME = environ.get("DEFAULT_THEME", "midnight").strip()
DEFAULT_COLOR = environ.get("DEFAULT_COLOR", "805ad5").strip()
CARD_VIEW = bool(int(environ.get("CARD_VIEW", "0").strip()))
@@ -69,10 +68,6 @@ REDDIT_NOTIFS_CACHE_KEY = "reddit_notifications"
MARSEYS_CACHE_KEY = "marseys"
EMOJIS_CACHE_KEY = "emojis"
-if SITE_NAME == 'PCM': CC = "SPLASH MOUNTAIN"
-else: CC = "COUNTRY CLUB"
-CC_TITLE = CC.title()
-
CASINO_RELEASE_DAY = 1662825600
if SITE_NAME == 'rDrama': patron = 'Paypig'
@@ -241,7 +236,6 @@ PERMS = { # Minimum admin_level to perform action.
'USER_BAN': 2,
'USER_SHADOWBAN': 2,
'USER_AGENDAPOSTER': 2,
- 'USER_CLUB_ALLOW_BAN': 2,
'USER_LINK': 2,
'USER_MERGE': 3, # note: extra check for Aevann
'USER_TITLE_CHANGE': 2,
@@ -300,7 +294,6 @@ FEATURES = {
'AWARDS': True,
'CHAT': True,
'PINS': True,
- 'COUNTRY_CLUB': True,
'PRONOUNS': False,
'BADGES': True,
'HATS': True,
@@ -403,6 +396,8 @@ COSMETIC_AWARD_COIN_AWARD_PCT = 0.10
TRUESCORE_CHAT_MINIMUM = 0
TRUESCORE_DONATE_MINIMUM = 100
TRUESCORE_GHOST_MINIMUM = 0
+TRUESCORE_CHUDRAMA_MINIMUM = 5000
+TRUESCORE_CLUB_MINIMUM = 1000
CHAT_DISPLAY_USER_COUNT_MINIMUM = 0
LOGGEDIN_ACTIVE_TIME = 15 * 60
diff --git a/files/routes/admin.py b/files/routes/admin.py
index e68d343b7..995409e06 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -295,58 +295,6 @@ def revert_actions(v, username):
return {"message": f"@{user.username}'s admin actions have been reverted!"}
-@app.post("/@{{c.body.strip()}}
{% endif %}
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index eb49f845c..80647b9d3 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -57,10 +57,6 @@
{% endif %}
- {% if FEATURES['COUNTRY_CLUB'] and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == p.author_id) %}
-
-
- {% endif %}
{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index de5a95b62..8fa7f8edd 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -42,12 +42,6 @@
-
-
- {% if FEATURES['COUNTRY_CLUB'] -%}
-
-
- {%- endif %}
{% else %}
{% if not p.ghost %}
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index c42af5a87..b78eca81e 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -17,10 +17,6 @@
{% endif %}
- {% if FEATURES['COUNTRY_CLUB'] -%}
-
-
- {%- endif %}
{% if v.can_edit(p) %}
diff --git a/files/templates/search.html b/files/templates/search.html
index a5d4d3854..297e1d9a2 100644
--- a/files/templates/search.html
+++ b/files/templates/search.html
@@ -68,10 +68,6 @@
Post Title Only:
-
-
{% endif %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 38bdcc20b..392a1c00a 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -64,12 +64,6 @@
{% block content %}
-{% if SITE == 'pcmemes.net' %}
- {% set cc='SPLASH MOUNTAIN' %}
-{% else %}
- {% set cc='COUNTRY CLUB' %}
-{% endif %}
-
Country Club:
-
-
@@ -101,14 +95,12 @@
{% if p.realurl(v) and not v_forbid_deleted %}
{% endif %}
diff --git a/migrations/20220702-poll-rework.sql b/migrations/20220702-poll-rework.sql
new file mode 100644
index 000000000..fb7524cd0
--- /dev/null
+++ b/migrations/20220702-poll-rework.sql
@@ -0,0 +1,109 @@
+CREATE TABLE public.submission_options (
+ id integer PRIMARY KEY,
+ submission_id integer NOT NULL,
+ body_html character varying(500) NOT NULL,
+ exclusive boolean NOT NULL
+);
+
+CREATE INDEX option_submission ON public.submission_options USING btree (submission_id);
+
+ALTER TABLE ONLY public.submission_options
+ ADD CONSTRAINT option_submission_fkey FOREIGN KEY (submission_id) REFERENCES public.submissions(id) MATCH FULL;
+
+
+
+CREATE SEQUENCE public.submission_option_id_seq
+ AS integer
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+ALTER TABLE ONLY public.submission_options ALTER COLUMN id SET DEFAULT nextval('public.submission_option_id_seq'::regclass);
+
+
+
+CREATE TABLE public.submission_option_votes (
+ option_id integer NOT NULL,
+ user_id integer NOT NULL,
+ created_utc integer NOT NULL,
+ submission_id integer
+);
+
+
+
+ALTER TABLE ONLY public.submission_option_votes
+ ADD CONSTRAINT submission_option_votes_pkey PRIMARY KEY (option_id, user_id);
+
+
+ALTER TABLE ONLY public.submission_option_votes
+ ADD CONSTRAINT vote_option_fkey FOREIGN KEY (option_id) REFERENCES public.submission_options(id) MATCH FULL;
+
+ALTER TABLE ONLY public.submission_option_votes
+ ADD CONSTRAINT vote_user_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) MATCH FULL;
+
+ALTER TABLE ONLY public.submission_option_votes
+ ADD CONSTRAINT vote_submission_fkey FOREIGN KEY (submission_id) REFERENCES public.submissions(id) MATCH FULL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+CREATE TABLE public.comment_options (
+ id integer PRIMARY KEY,
+ comment_id integer NOT NULL,
+ body_html character varying(500) NOT NULL,
+ exclusive boolean NOT NULL
+);
+
+CREATE INDEX option_comment ON public.comment_options USING btree (comment_id);
+
+ALTER TABLE ONLY public.comment_options
+ ADD CONSTRAINT option_comment_fkey FOREIGN KEY (comment_id) REFERENCES public.comments(id) MATCH FULL;
+
+
+
+CREATE SEQUENCE public.comment_option_id_seq
+ AS integer
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+ALTER TABLE ONLY public.comment_options ALTER COLUMN id SET DEFAULT nextval('public.comment_option_id_seq'::regclass);
+
+
+
+CREATE TABLE public.comment_option_votes (
+ option_id integer NOT NULL,
+ user_id integer NOT NULL,
+ created_utc integer NOT NULL,
+ comment_id integer
+);
+
+
+
+ALTER TABLE ONLY public.comment_option_votes
+ ADD CONSTRAINT comment_option_votes_pkey PRIMARY KEY (option_id, user_id);
+
+
+ALTER TABLE ONLY public.comment_option_votes
+ ADD CONSTRAINT vote_option_fkey FOREIGN KEY (option_id) REFERENCES public.comment_options(id) MATCH FULL;
+
+ALTER TABLE ONLY public.comment_option_votes
+ ADD CONSTRAINT vote_user_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) MATCH FULL;
+
+ALTER TABLE ONLY public.comment_option_votes
+ ADD CONSTRAINT vote_comment_fkey FOREIGN KEY (comment_id) REFERENCES public.comments(id) MATCH FULL;
diff --git a/migrations/20220708-notification-rework.sql b/migrations/20220708-notification-rework.sql
new file mode 100644
index 000000000..e03129c58
--- /dev/null
+++ b/migrations/20220708-notification-rework.sql
@@ -0,0 +1,2 @@
+alter table users add column last_viewed_post_notifs int not null default 0;
+alter table users alter column last_viewed_post_notifs drop default;
diff --git a/migrations/20220711-pronouns.sql b/migrations/20220711-pronouns.sql
new file mode 100644
index 000000000..22d3d68f5
--- /dev/null
+++ b/migrations/20220711-pronouns.sql
@@ -0,0 +1,2 @@
+alter table users add column pronouns varchar(11) not null default 'they/them';
+alter table users alter column pronouns drop default;
diff --git a/migrations/20220805-modaction-notifs-rework.sql b/migrations/20220805-modaction-notifs-rework.sql
new file mode 100644
index 000000000..d9998ecb6
--- /dev/null
+++ b/migrations/20220805-modaction-notifs-rework.sql
@@ -0,0 +1,2 @@
+alter table users add column last_viewed_log_notifs int not null default 0;
+alter table users alter column last_viewed_log_notifs drop default;
diff --git a/migrations/20220831-casino-feature.sql b/migrations/20220831-casino-feature.sql
new file mode 100644
index 000000000..f3dfd87cd
--- /dev/null
+++ b/migrations/20220831-casino-feature.sql
@@ -0,0 +1,15 @@
+CREATE TYPE casino_game_kind AS ENUM ('blackjack', 'slots');
+
+CREATE TYPE casino_game_currency AS ENUM ('coins', 'procoins');
+
+CREATE TABLE casino_games (
+ id SERIAL PRIMARY KEY,
+ user_id integer NOT NULL REFERENCES users(id),
+ created_utc integer NOT NULL,
+ active boolean NOT NULL DEFAULT true,
+ currency casino_game_currency NOT NULL,
+ wager integer NOT NULL,
+ winnings integer NOT NULL,
+ kind casino_game_kind NOT NULL,
+ game_state jsonb NOT NULL
+);
diff --git a/migrations/20220903-hats.sql b/migrations/20220903-hats.sql
new file mode 100644
index 000000000..895305f6f
--- /dev/null
+++ b/migrations/20220903-hats.sql
@@ -0,0 +1,249 @@
+CREATE TABLE public.hat_defs (
+ id integer PRIMARY KEY,
+ name character varying(50) NOT NULL UNIQUE,
+ description character varying(300) NOT NULL,
+ author_id integer NOT NULL,
+ price integer NOT NULL
+);
+
+CREATE SEQUENCE public.hat_defs_id_seq
+ AS integer
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+ALTER SEQUENCE public.hat_defs_id_seq OWNED BY public.hat_defs.id;
+
+ALTER TABLE ONLY public.hat_defs ALTER COLUMN id SET DEFAULT nextval('public.hat_defs_id_seq'::regclass);
+
+ALTER TABLE ONLY public.hat_defs
+ ADD CONSTRAINT hat_defs_author_id_fkey FOREIGN KEY (author_id) REFERENCES public.users(id);
+
+
+
+
+
+CREATE TABLE public.hats (
+ hat_id integer NOT NULL,
+ user_id integer NOT NULL
+);
+
+ALTER TABLE ONLY public.hats
+ ADD CONSTRAINT hats_pkey PRIMARY KEY (user_id, hat_id);
+
+ALTER TABLE ONLY public.hats
+ ADD CONSTRAINT hats_hat_id_fkey FOREIGN KEY (hat_id) REFERENCES public.hat_defs(id);
+
+ALTER TABLE ONLY public.hats
+ ADD CONSTRAINT hats_user_id_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
+
+alter table users add column coins_spent_on_hats integer DEFAULT 0 NOT NULL;
+alter table users add column equipped_hat_id integer;
+ALTER TABLE ONLY public.users
+ ADD CONSTRAINT users_equipped_hat_id_fkey FOREIGN KEY (equipped_hat_id) REFERENCES public.hat_defs(id);
+
+insert into hat_defs (name, description, author_id, price) values
+('Ushanka', 'The People''s Hat', 2, 500),
+('Fur Hat', 'The first step on your path to fursuit ownership', 2, 500),
+('Cat Ears I', 'Mew :3', 2, 500),
+('Cat Ears II', 'Meow :3', 2, 500),
+('Playboy Bunny', 'Will this bring daddy back?', 2, 500),
+('Macaroni', 'Get it? Like the song lol', 2, 500),
+('Pirate', 'BUTT pirate', 2, 500),
+('Pirate Captain', 'Like a regular butt pirate, but for tops only', 2, 500),
+('Dreads', 'Finally, an excuse for poor hygiene', 2, 500),
+('The XXXTentacion', 'Pay homage to your favorite dead criminal!', 2, 500),
+('the 6ix9ine', 'The finest piece of snitch couture on the market', 2, 500),
+('The Elvis', 'Remember when this dude nailed a 13-year-old?', 2, 500),
+('Gussy Hat', 'Let everyone know that you''re NOT a rapist. Honest.', 2, 500),
+('Riveter', 'Can you do it? Really?', 2, 500),
+('Top Hat (leprechaun)', 'LLM but Irish', 2, 500),
+('Drinky Beer Hat', 'I actually didn''t know these were real things until I made this', 2, 500),
+('Viking', 'Rape, pillage, never bathe. Live the dream.', 2, 500),
+('Nonspecific Military Officer Hat', '[removed]', 2, 500),
+('Soviet Officer I', 'OUR hat', 2, 500),
+('Nonspecific Military Officer Hat II', '[removed]', 2, 500),
+('Soviet Officer II', 'High fashion war criminal chic', 2, 500),
+('Southern Gentleman', 'Slaveowner? Fried chicken chain founder? You decide!', 2, 500),
+('Cowboy I', 'Make him wish he could quit you', 2, 500),
+('Cowboy II', 'You''re my favorite deputy!', 2, 500),
+('Halo', 'Dramamine criticized this one and now I''m too self-conscious about it to write a description', 2, 500),
+('Fedora I', 'M''arsey', 2, 500),
+('Bowler', 'Why would you need a hat to go bowling?', 2, 500),
+('Du Rag (black)', 'Shitty bandana 1/6', 2, 500),
+('Du Rag (red)', 'Shitty bandana 2/6', 2, 500),
+('Du Rag (blue)', 'Shitty bandana 3/6', 2, 500),
+('Du Rag (purple)', 'Shitty bandana 4/6', 2, 500),
+('Du Rag (green)', 'Shitty bandana 5/6', 2, 500),
+('Du Rag (yellow)', 'Shitty bandana 6/6', 2, 500),
+('Ash Ketchum', 'You''re not so different, you and he', 2, 500),
+('The Hotep', 'Traditional kangwear. POC ONLY.', 2, 500),
+('Roman', 'Reddit delenda est', 2, 500),
+('Confederate Soldier Cap', 'Basically the Gryffindor of American history', 2, 500),
+('Northern Aggressor Soldier Cap', 'Slytherin irl', 2, 500),
+('Rhodesian Light Infantry Beret', 'Rhodesians never die. Immortality guaranteed!', 2, 500),
+('Magyar Headdress', 'Channel your inner QuadNarca and join Orban''s elite cavalry', 2, 500),
+('The Senator Warren', 'heya heya heya heya heya heya heya heya heya heya heya', 2, 500),
+('Please Be Patient I Have Autism', 'The OFFICIAL hat of rDrama.net', 2, 500),
+('Samurai Helmet', 'Never be mistaken for a baka gaijin again', 2, 500),
+('Watermelmet', 'Hydration and head protection all rolled into one stylish headpiece', 2, 500),
+('Frankenstein', 'Akshually, Frankenstein was the scientist. The monster didn''t have a name.', 2, 500),
+('The Drumpf', 'Orange hair bad', 2, 500),
+('Tinfoil Hat', 'Keep Bill Gates'' 5G vaccine OUT of your precious brain!', 2, 500),
+('Fez', 'Isn''t it CUTE?', 2, 500),
+('Ching Chong', 'Me Chinese Me No Dumb Me Stick Finger In Daddy''s Bum', 2, 500),
+('Octopus Friend', 'Awwwwwww!', 2, 500),
+('In The Navy', 'It''s not gay', 2, 500),
+('Seaman', 'semen lol', 2, 500),
+('Flower Crown I', 'oh god i have to write descriptions for 15 flower crowns', 2, 500),
+('Flower Crown II', 'A very cute flower crown', 2, 500),
+('Flower Crown III', 'A super cute flower crown', 2, 500),
+('Flower Crown IV', 'A really cute flower crown', 2, 500),
+('Flower Crown V', 'The cutest flower crown?', 2, 500),
+('Flower Crown VI', 'An extremely cute flower crown', 2, 500),
+('Flower Crown VII', 'A flower crown that''s just so cute', 2, 500),
+('Flower Crown VIII', 'A majorly cute flower crown', 2, 500),
+('Flower Crown IX', 'A mega cute flower crown', 2, 500),
+('Flower Crown X', 'An ultra cute flower crown', 2, 500),
+('Flower Crown XI', 'Definitely the cutest flower crown', 2, 500),
+('Flower Crown XII', 'A hella cute flower crown', 2, 500),
+('Flower Crown XIII', 'An experimental anti-gravity cute flower crown', 2, 500),
+('Flower Crown XIV', 'An adorably cute flower crown', 2, 500),
+('Flower Crown XV', 'The final cute flower crown', 2, 500),
+('Bow', 'What a cute little bow omg', 2, 500),
+('BIPOCsmoke', 'It''s a Newport. You know it''s a Newport.', 2, 500),
+('Gigachin', 'Aw yeah, this user definitely supports trans rights', 2, 500),
+('Queensguard', 'A bear died for this', 2, 500),
+('Queen Crown', 'Don''t be a drag', 2, 500),
+('King Crown', 'King is like the n word, only racists and black people should be allowed to say it', 2, 500),
+('Pope Hat', 'Matthew 16:18', 2, 500),
+('Heebhead', 'Do NOT google the Lavon Affair', 2, 500),
+('Zoomie Zoom Zoom', 'Underage user, do not interact', 2, 500),
+('Sombrero I', 'El Autistico', 2, 500),
+('Sombrero II', 'El Autistico Grandisimo', 2, 500),
+('Crypto Billionaire', 'Sorry about the ice cream machine', 2, 500),
+('Burger King Crown', 'I''m gonna say it', 2, 500),
+('Burger King', 'You can have it your way and you still chose this', 2, 500),
+('Wendys', 'Sassy social media intern', 2, 500),
+('KFC', 'Popeyes is too far away', 2, 500),
+('In-N-Out', 'Kill the commiefornian', 2, 500),
+('Carls Jr', 'Purveyor of literally the finest food in the world', 2, 500),
+('Whataburger', 'Texans don''t know any better', 2, 500),
+('Five Guys', 'I love having 5 guys in my mouth', 2, 500),
+('Taco Bell', 'Enabler of drunken mistakes', 2, 500),
+('Marsey-In-A-Box', 'Awww you''re playing make-believe!', 2, 500),
+('Orthodox Hood', 'User is a schismatic lunatic', 2, 500),
+('Afro', 'Pool''s closed motherlover', 2, 500),
+('Top Hat (black)', 'Traditional. Classy. Elegant.', 2, 500),
+('Wizard I', 'Three decades a KHHV', 2, 500),
+('Wizard II', 'Avada kedavra ✨', 2, 500),
+('Witch I', 'Hex the patriarchy', 2, 500),
+('Witch II', 'Bardfinn cosplay gear', 2, 500),
+('Sun Hat', 'Tradwife simplicity', 2, 500),
+('Obey Snapback', 'The timeless classic', 2, 500),
+('Thug Life Snapback', 'User confirmed mayo', 2, 500),
+('Supreme Snapback', 'Drip so hard omg', 2, 500),
+('Make America Great Again', 'The official headgear of stochastic terrorists everywhere', 2, 500),
+('Born To Feel', 'Do you pee standing up?', 2, 500),
+('Fortunate Son', 'BORN TO SHIT FORCED TO WIPE', 2, 500),
+('WWI', 'How is this supposed to offer any meaningful protection??', 2, 500),
+('Pickelhaube', 'Inarguably the most fashionable of all contemporary military headgear ', 2, 500),
+('Wehrmacht', 'What a cool helmet, I bet the people who wore it were real classy folks ', 2, 500),
+('Chair Force', 'Yeah I''m a combat veteran, I''ve seen shit you wouldn''t believe. One time the wifi was out for almost an hour. ', 2, 500),
+('Helmet w Dog Tags', 'More like dog fags lol', 2, 500),
+('Urban Camo Helmet', 'Man urban camo is cool', 2, 500),
+('Nightvision Helmet', 'Four-eyed freak', 2, 500),
+('Helmet w Mesh', 'Sexy fishnet stocking helmet', 2, 500),
+('Tojo Helmet', 'Artifact from Weeb War II', 2, 500),
+('Officers Cap', 'Get fragged bozo', 2, 500),
+('Jailbird Cap', 'The apex of prison fashion. Why did we stop using this?', 2, 500),
+('P-Hat (green)', 'Zezima fanboy', 2, 500),
+('P-Hat (red)', 'おれはPigAmericanですおれはばか i am average american man i enjoy bad game runescape', 2, 500),
+('P-Hat (yellow)', 'PISS HAT PISS HAT', 2, 500),
+('P-Hat (blue)', 'Ughhhh coming up with different descriptions for RuneScape party hats', 2, 500),
+('P-Hat (pink)', 'It''s pink.', 2, 500),
+('P-Hat (rainbow)', 'LGBTscape 😍', 2, 500),
+('Newsboy', 'Or newsgirl. It''s okay, the hat is actually gender-neutral.', 2, 500),
+('Whirly Tard Hat I', 'Wouldn''t it be neat if they could make one that like uses body heat or whatever to keep the propeller in a state of constant motion', 2, 500),
+('Dunce Cap', 'You retard. Imbecile. Utter buffoon. Oaf. Nincompoop. Idiot. Moron. CLOWN.', 2, 500),
+('Beret', 'Literally the most basic possible hat choice. Please do better. ', 2, 500),
+('Mario', 'BING BING WAHOO ', 2, 500),
+('Luigi', 'LING LING LAHOO', 2, 500),
+('Wing Cap', 'If the hat''s wings are what provide the thrust necessary for flight then how does it stay on and let YOU fly with it huh', 2, 500),
+('Metal Mario', 'Mario hat but with yelling and lots of double bass and distorted guitars and shit heck yeah', 2, 500),
+('Cappy', 'A sentient hat-creature that''s actually a pretty horrifying parasite if you think about it', 2, 500),
+('Wario', 'For the fat, yellow, extremely flatulent dramautist (in loving memory of Bidpots)', 2, 500),
+('Waluigi', 'Coming soon to Smash for sure', 2, 500),
+('Top Hat (kek)', 'Technically a top hat, shut up', 2, 500),
+('Top Hat (white)', 'Oh, how dignified', 2, 500),
+('Top Hat (striped)', 'Tim Burton''s take on the top hat', 2, 500),
+('Top Hat (checkered)', 'Actually chessed, but that''s not really a word.', 2, 500),
+('Top Hat (march hare)', 'April hare, May hare, June hare, July hare,', 2, 500),
+('Top Hat (mad hatter)', 'Hatters mad [x24]', 2, 500),
+('Top Hat (red)', 'Top hat, menstrual edition', 2, 500),
+('Top Hat (uncle sam)', 'THIS HAT WAS FACT-CHECKED BY TRUE AMERICAN PATRIOTS', 2, 500),
+('Fireperson I', 'In loving memory of r/HateForFirefighters', 2, 500),
+('Constable', 'Useless bong cop nonsense', 2, 500),
+('NYPD Officer', 'This user is authorized to stop, frisk and cavity search you at any time for any reason', 2, 500),
+('Crossing Guard', 'We love Officer Marsey!', 2, 500),
+('Paper Sailor', 'As idle as a paper ship, upon a paper ocean. Paper, paper, everywhere.', 2, 500),
+('FBI', 'Federal Bussy Inspector', 2, 500),
+('CIA', 'Cisgender Incineration Agency', 2, 500),
+('ATF', 'Ass-Tickling Faggot. HIDE YOUR DOG!', 2, 500),
+('Graduate', 'This hat signifies that the bearer has completed four (4) years of pan-african gender studies coursework', 2, 500),
+('Nurse', 'Minor TikTok celebrity, OnlyFans top 91%', 2, 500),
+('Farmer', 'Feed & Seed shopper', 2, 500),
+('Farmette', 'Feed & Seed shoppette', 2, 500),
+('Kung Lao', 'Why did I make a Kung Lao hat', 2, 500),
+('Top Hat (steampunk)', 'Like a regular top hat but with goggles and gears', 2, 500),
+('Brain Hat', 'Peter Griffin''s dog', 2, 500),
+('The TED_SIMP', 'Wear this hat to express your undying adoration for carp', 2, 500),
+('The Brandon', 'Listen here fat', 2, 500),
+('The Brandon II', 'LISTEN HERE FAT', 2, 500),
+('The King George', 'Proto-drag if you think about it', 2, 500),
+('The Mao', 'Our hair!', 2, 500),
+('The Young Stalin', 'Pockmarks not included', 2, 500),
+('The Ripe Stalin', 'An homage to the #1 most prolific killer of commies in world history', 2, 500),
+('The Austrian Painter', 'For aficionados of mid-20th century fine artists slash authors', 2, 500),
+('Kenny I', 'User''s life insurance claim was rejected', 2, 500),
+('Modern Major General', 'For my military knowledge, though I''m plucky and adventury / Has only been brought down to the beginning of the century / But still, in matters vegetable, animal, and mineral / I am the very model of a modern Major-General', 2, 500),
+('Red Star Cap', 'Cannon fodder', 2, 500),
+('Cartman', 'Fat antisemite - the archetypal rDrama user', 2, 500),
+('Cheesehead', 'For fans of the Green Gay Fudge Packers', 2, 500),
+('Kyle', 'ngl I don''t watch South Park so idk the difference between this and Stan', 2, 500),
+('Stan', 'ngl I don''t watch South Park so idk the difference between this and Kyle', 2, 500),
+('Kenny II', 'Like Kenny I except it shows more of your ugly face', 2, 500),
+('The Cleopatra', 'Did you know she was actually white?', 2, 500),
+('Pimp Hat I', 'Women are objects', 2, 500),
+('Devil Horns', 'Satan is so cool and quirky!!!', 2, 500),
+('Nooticer', 'THIS USER IS ENGAGED IN THOUGHTCRIME. DO NOT INTERACT.', 2, 500),
+('Airpods', 'oh god oh fuck he cant hear us', 2, 500),
+('Maskmaxxer', 'Why aren''t there two? Are you trying to kill us?', 2, 500),
+('The Tupac', 'dead nigger storage', 2, 500),
+('Media Executive', 'despite making up just 2% of the population,', 2, 500),
+('Surgeon', 'Lobotomize me daddy', 2, 500),
+('Mouseketeer', 'please don''t sue please don''t sue please don''t sue please don''t sue please don''t sue', 2, 500),
+('Karen', 'Let me speak to your manager', 2, 500),
+('Badass Fighter Ace', ' Top Gun™ Maverick® Now Showing In Theaters!', 2, 500),
+('Taqiyah', 'It''s not a yarmulke I swear', 2, 500),
+('Cock', 'DM me yours!', 2, 500),
+('Nervous, Sweating', '>mfw', 2, 500),
+('The Cat', 'does this really need a description', 2, 500),
+('Noose', 'Cope or rope', 2, 500),
+('The Penny', 'This shower cap bonnet is perfect for hiding nappy, alopecia-ridden hair', 2, 500),
+('Hard Hat (yellow)', 'A rock hard, throbbing, veiny hat. Check out the girth on this thing', 2, 500),
+('Hard Hat (white)', 'The mayo variant of the hard hat, used to signify someone of importance, or a visitor, at a job site', 2, 500),
+('Beret (TF2)', 'Stylish vidya-variant of the beret', 2, 500),
+('Texas Ten Gallon', 'Yeehaw!', 2, 500),
+('Demoman', 'KaBOOM', 2, 500),
+('Fireperson II', 'For extinguishing hot threads', 2, 500),
+('Miners Hat', 'Please don''t touch minors', 2, 500),
+('Old Man Hat', 'AKA the Wizdumb', 2, 500),
+('Pimp Hat II', 'Women are people and they deserve respect just kidding they should suck my penis', 2, 500),
+('Whirly Tard Hat II', 'Propeller go brrrrrrrrrr', 2, 500),
+('Family Man Free Hat', 'It''s a good show!', 2, 500),
+('Engineer', 'Choo choo!', 2, 500),
+('Vexillaurius Helmet', 'Degenerates like you belong on rDrama', 2, 500),
+('Astronaut Helmet', 'See you, space marsey', 2, 500);
diff --git a/migrations/20220909-marsey-submissin-ui.sql b/migrations/20220909-marsey-submissin-ui.sql
new file mode 100644
index 000000000..7321779aa
--- /dev/null
+++ b/migrations/20220909-marsey-submissin-ui.sql
@@ -0,0 +1,6 @@
+alter table marseys add column submitter_id int;
+
+ALTER TABLE ONLY public.marseys
+ ADD CONSTRAINT marsey_submitter_fkey FOREIGN KEY (submitter_id) REFERENCES public.users(id);
+
+CREATE INDEX marseys_idx4 ON public.marseys USING btree (submitter_id);
diff --git a/migrations/20220910-hat-submissin-ui.sql b/migrations/20220910-hat-submissin-ui.sql
new file mode 100644
index 000000000..6d6507924
--- /dev/null
+++ b/migrations/20220910-hat-submissin-ui.sql
@@ -0,0 +1,6 @@
+alter table hat_defs add column submitter_id int;
+
+ALTER TABLE ONLY public.hat_defs
+ ADD CONSTRAINT hat_def_submitter_fkey FOREIGN KEY (submitter_id) REFERENCES public.users(id);
+
+CREATE INDEX hat_defs_submitter_id_idx ON public.hat_defs USING btree (submitter_id);
diff --git a/migrations/20220910-notify-followers.sql b/migrations/20220910-notify-followers.sql
new file mode 100644
index 000000000..908a72169
--- /dev/null
+++ b/migrations/20220910-notify-followers.sql
@@ -0,0 +1,2 @@
+alter table submissions add column notify bool not null default true;
+alter table submissions alter column notify drop default;
diff --git a/migrations/20220911-add-roulette.sql b/migrations/20220911-add-roulette.sql
new file mode 100644
index 000000000..a7f49f11c
--- /dev/null
+++ b/migrations/20220911-add-roulette.sql
@@ -0,0 +1 @@
+ALTER TYPE casino_game_kind ADD VALUE 'roulette';
diff --git a/migrations/20220912-created_utc-columns.sql b/migrations/20220912-created_utc-columns.sql
new file mode 100644
index 000000000..62f51f4cb
--- /dev/null
+++ b/migrations/20220912-created_utc-columns.sql
@@ -0,0 +1,22 @@
+alter table alts add column created_utc int;
+alter table award_relationships add column created_utc int;
+alter table badge_defs add column created_utc int;
+alter table oauth_apps add column created_utc int;
+alter table client_auths add column created_utc int;
+alter table banneddomains add column created_utc int;
+alter table exiles add column created_utc int;
+alter table hat_defs add column created_utc int;
+alter table hats add column created_utc int;
+alter table lotteries add column created_utc int;
+alter table marseys add column created_utc int;
+alter table submission_options add column created_utc int;
+alter table comment_options add column created_utc int;
+alter table save_relationship add column created_utc int;
+alter table comment_save_relationship add column created_utc int;
+alter table sub_blocks add column created_utc int;
+alter table sub_joins add column created_utc int;
+alter table sub_subscriptions add column created_utc int;
+alter table subs add column created_utc int;
+alter table subscriptions add column created_utc int;
+alter table userblocks add column created_utc int;
+alter table viewers add column created_utc int;
diff --git a/migrations/20220913-transactions.sql b/migrations/20220913-transactions.sql
new file mode 100644
index 000000000..927e99144
--- /dev/null
+++ b/migrations/20220913-transactions.sql
@@ -0,0 +1,9 @@
+CREATE TABLE public.transactions (
+ id character varying(36) PRIMARY KEY,
+ created_utc integer NOT NULL,
+ type character varying(12) NOT NULL,
+ amount integer NOT NULL,
+ email character varying(255) NOT NULL
+);
+
+CREATE INDEX transactions_email_idx ON public.transactions USING btree (email);
diff --git a/migrations/20220916-remove-winnings-column.sql b/migrations/20220916-remove-winnings-column.sql
new file mode 100644
index 000000000..1b9e75110
--- /dev/null
+++ b/migrations/20220916-remove-winnings-column.sql
@@ -0,0 +1 @@
+alter table users drop column winnings;
diff --git a/migrations/20220920-spider-award.sql b/migrations/20220920-spider-award.sql
new file mode 100644
index 000000000..b4fd56bbc
--- /dev/null
+++ b/migrations/20220920-spider-award.sql
@@ -0,0 +1 @@
+alter table users add column spider int;
diff --git a/migrations/20220929-hole-logs.sql b/migrations/20220929-hole-logs.sql
new file mode 100644
index 000000000..e58762bd0
--- /dev/null
+++ b/migrations/20220929-hole-logs.sql
@@ -0,0 +1,43 @@
+CREATE TABLE public.subactions (
+ id integer PRIMARY KEY,
+ 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
+);
+
+CREATE SEQUENCE public.subactions_id_seq
+ AS integer
+ START WITH 1
+ INCREMENT BY 1
+ NO MINVALUE
+ NO MAXVALUE
+ CACHE 1;
+
+ALTER SEQUENCE public.subactions_id_seq OWNED BY public.subactions.id;
+
+ALTER TABLE ONLY public.subactions ALTER COLUMN id SET DEFAULT nextval('public.subactions_id_seq'::regclass);
+
+CREATE INDEX fki_subactions_user_fkey ON public.subactions USING btree (target_user_id);
+
+CREATE INDEX modaction_action_idx ON public.subactions USING btree (kind);
+
+CREATE INDEX modaction_pid_idx ON public.subactions USING btree (target_submission_id);
+
+ALTER TABLE ONLY public.subactions
+ ADD CONSTRAINT subactions_submission_fkey FOREIGN KEY (target_submission_id) REFERENCES public.submissions(id);
+
+CREATE INDEX modaction_cid_idx ON public.subactions USING btree (target_comment_id);
+
+ALTER TABLE ONLY public.subactions
+ ADD CONSTRAINT subactions_comment_fkey FOREIGN KEY (target_comment_id) REFERENCES public.comments(id);
+
+ALTER TABLE ONLY public.subactions
+ ADD CONSTRAINT subactions_user_fkey FOREIGN KEY (target_user_id) REFERENCES public.users(id);
+
+ALTER TABLE ONLY public.subactions
+ ADD CONSTRAINT subactions_sub_fkey FOREIGN KEY (sub) REFERENCES public.subs(name);
diff --git a/migrations/20221002-body-tsvector.sql b/migrations/20221002-body-tsvector.sql
new file mode 100644
index 000000000..1151ef682
--- /dev/null
+++ b/migrations/20221002-body-tsvector.sql
@@ -0,0 +1,3 @@
+ALTER TABLE public.comments ADD COLUMN body_ts tsvector
+ GENERATED ALWAYS AS (to_tsvector('english', body)) STORED;
+CREATE INDEX comments_body_ts_idx ON public.comments USING GIN (body_ts);
diff --git a/migrations/20221006-media-table.sql b/migrations/20221006-media-table.sql
new file mode 100644
index 000000000..fa0dc4f4d
--- /dev/null
+++ b/migrations/20221006-media-table.sql
@@ -0,0 +1,13 @@
+CREATE TABLE public.media (
+ kind character varying(5) NOT NULL,
+ filename character varying(55) NOT NULL,
+ user_id Integer NOT NULL,
+ created_utc integer NOT NULL,
+ size integer NOT NULL
+);
+
+ALTER TABLE ONLY public.media
+ ADD CONSTRAINT media_pkey PRIMARY KEY (kind, filename);
+
+ALTER TABLE ONLY public.media
+ ADD CONSTRAINT media_user_fkey FOREIGN KEY (user_id) REFERENCES public.users(id);
diff --git a/migrations/20221204-new-cc-system.sql b/migrations/20221204-new-cc-system.sql
new file mode 100644
index 000000000..895651437
--- /dev/null
+++ b/migrations/20221204-new-cc-system.sql
@@ -0,0 +1,4 @@
+UPDATE submissions SET sub = 'countryclub' WHERE club = true AND sub IS NULL;
+DELETE FROM modactions WHERE kind IN ('club_allow','club_ban','club_post','unclub_post');
+ALTER TABLE submissions DROP COLUMN club;
+ALTER TABLE users DROP COLUMN club_allowed;
diff --git a/schema.sql b/schema.sql
index ee91837d7..e7ff39b1c 100644
--- a/schema.sql
+++ b/schema.sql
@@ -107,7 +107,6 @@ CREATE TABLE public.submissions (
is_bot boolean DEFAULT false NOT NULL,
bannedfor character varying(40),
comment_count integer DEFAULT 0 NOT NULL,
- club boolean DEFAULT false NOT NULL,
stickied character varying(40),
title character varying(500) NOT NULL,
url character varying(2083),
@@ -989,7 +988,6 @@ CREATE TABLE public.users (
highlightcomments boolean DEFAULT true NOT NULL,
nitter boolean,
truescore integer DEFAULT 0 NOT NULL,
- club_allowed boolean,
frontsize integer DEFAULT 25 NOT NULL,
coins_spent integer DEFAULT 0 NOT NULL,
marseybux integer DEFAULT 0 NOT NULL,
@@ -2722,4 +2720,3 @@ ALTER TABLE ONLY public.comment_option_votes
--
-- PostgreSQL database dump complete
--
-
- {% if p.club %}{{CC}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}}
{% else %}- {% if p.club %}{{CC}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}}
@@ -518,7 +510,6 @@ localStorage.setItem("post-new", false) localStorage.setItem("post-nsfw", false) localStorage.setItem("post-private", false) - localStorage.setItem("post-club", false) localStorage.setItem("post-ghost", false) {% endif %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 5bcc18cb7..302e332df 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -4,12 +4,6 @@ {% include "modals/award.html" %} {% endif %} -{% if SITE == 'pcmemes.net' %} - {% set cc='SPLASH MOUNTAIN' %} -{% else %} - {% set cc='COUNTRY CLUB' %} -{% endif %} - {% if not v or v.highlightcomments %} {% endif %} @@ -79,9 +73,7 @@ {% if not v_forbid_deleted %}
- {% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %}
- 
- {% elif not p.url %}
+ {% if not p.url %}
@@ -118,7 +110,6 @@
- {% elif not p.url %}
+ {% if not p.url %}
- {% if p.club %}{{CC}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}}
@@ -237,7 +228,7 @@ {% endif %} -{% if (not p.club or v and (v.paid_dues or v.id == p.author_id)) and not v_forbid_deleted %} +{% if not v_forbid_deleted %} {% if p.realbody(v, listing=True) %} - {% if FEATURES['COUNTRY_CLUB'] -%} -
-
-
-
- {%- endif %}
{% if v.can_post_in_ghost_threads %}
diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html
index 0bc7e5c39..243be5376 100644
--- a/files/templates/userpage/admintools.html
+++ b/files/templates/userpage/admintools.html
@@ -101,10 +101,6 @@
{% endif %}
- {% if FEATURES['COUNTRY_CLUB'] and v and v.admin_level >= PERMS['USER_CLUB_ALLOW_BAN'] %}
-
-
- {% endif %}