diff --git a/files/classes/submission.py b/files/classes/submission.py index 5fb387339..a78ca04b9 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -395,22 +395,14 @@ class Submission(Base): @lazy def realtitle(self, v): - if self.club and not (v and (v.paid_dues or v.id == self.author_id)): - if v: return random.choice(TROLLTITLES).format(username=v.username) - else: return f'{CC} MEMBERS ONLY' - elif self.title_html: title = self.title_html - else: title = self.title - - return title + if self.title_html: + return self.title_html + else: + return self.title @lazy def plaintitle(self, v): - if self.club and not (v and (v.paid_dues or v.id == self.author_id)): - if v: return random.choice(TROLLTITLES).format(username=v.username) - else: return f'{CC} MEMBERS ONLY' - else: title = self.title - - return title + return self.title @property @lazy diff --git a/files/helpers/const.py b/files/helpers/const.py index df42f658a..a304e74c4 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -17,17 +17,6 @@ else: SITE_FULL = 'https://' + SITE CC = "COUNTRY CLUB" CC_TITLE = CC.title() -AJ_REPLACEMENTS = { - ' your ': " you're ", - ' to ': " too ", - - ' Your ': " You're ", - ' To ': " Too ", - - ' YOUR ': " YOU'RE ", - ' TO ': " TOO ", -} - NOTIFICATIONS_ID = 1 AUTOJANNY_ID = 2 SNAPPY_ID = 3 @@ -408,14 +397,6 @@ AWARDS3 = {} for k, val in AWARDS2.items(): if val['price'] == 300: AWARDS3[k] = val -TROLLTITLES = [ - "how will @{username} ever recover?", - "@{username} BTFO", - "[META] Getting really sick of @{username}’s shit", - "Pretty sure this is @{username}'s Reddit account", - "Hey jannies can you please ban @{username}", -] - NOTIFIED_USERS = { 'aevan': AEVANN_ID, 'avean': AEVANN_ID,