diff --git a/files/classes/comment.py b/files/classes/comment.py index 09d99d6d2e..ceafaffd5a 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -333,7 +333,9 @@ class Comment(Base): body = add_options(self, body, v) if body: - body = censor_slurs(body, v) + if not (self.parent_submission and self.post.sub == 'chudrama'): + body = censor_slurs(body, v) + body = normalize_urls_runtime(body, v) if not v or v.controversial: captured = [] @@ -365,8 +367,9 @@ class Comment(Base): if not body: return "" - body = censor_slurs(body, v).replace(':marseytrain:', ':marseytrain:') \ - .replace(':marseysleep:', ':marseysleep:') + if not (self.parent_submission and self.post.sub == 'chudrama'): + body = censor_slurs(body, v).replace(':marseytrain:', ':marseytrain:') \ + .replace(':marseysleep:', ':marseysleep:') return body diff --git a/files/classes/submission.py b/files/classes/submission.py index 87027bd580..084659e372 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -302,7 +302,9 @@ class Submission(Base): body = add_options(self, body, v) - body = censor_slurs(body, v) + if self.sub != 'chudrama': + body = censor_slurs(body, v) + body = normalize_urls_runtime(body, v) if not listing and not self.ghost and self.author.show_sig(v): @@ -318,8 +320,9 @@ class Submission(Base): body = self.body if not body: return "" - body = censor_slurs(body, v).replace(':marseytrain:', ':marseytrain:') \ - .replace(':marseysleep:', ':marseysleep:') + if self.sub != 'chudrama': + body = censor_slurs(body, v).replace(':marseytrain:', ':marseytrain:') \ + .replace(':marseysleep:', ':marseysleep:') body = normalize_urls_runtime(body, v) @@ -328,8 +331,9 @@ class Submission(Base): @lazy def realtitle(self, v): title = self.title_html - - title = censor_slurs(title, v) + + if self.sub != 'chudrama': + title = censor_slurs(title, v) return title @@ -337,8 +341,9 @@ class Submission(Base): def plaintitle(self, v): title = self.title - title = censor_slurs(title, v).replace(':marseytrain:', ':marseytrain:') \ - .replace(':marseysleep:', ':marseysleep:') + if self.sub != 'chudrama': + title = censor_slurs(title, v).replace(':marseytrain:', ':marseytrain:') \ + .replace(':marseysleep:', ':marseysleep:') return title