diff --git a/drama/classes/comment.py b/drama/classes/comment.py index e6734a22e..e685edadc 100644 --- a/drama/classes/comment.py +++ b/drama/classes/comment.py @@ -44,8 +44,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing): is_approved = Column(Integer, default=0) approved_utc = Column(Integer, default=0) creation_ip = Column(String(64), default='') - score_hot = Column(Float, default=0) - score_top = Column(Integer, default=1) level = Column(Integer, default=0) parent_comment_id = Column(Integer, ForeignKey("comments.id")) @@ -53,7 +51,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing): is_bot = Column(Boolean, default=False) banaward = Column(String) is_pinned = Column(Boolean, default=False) - creation_region=Column(String(2)) sentto=Column(Integer) app_id = Column(Integer, ForeignKey("oauth_apps.id")) @@ -381,9 +378,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing): @property def json_admin(self): data= self.json_raw - - data["creation_ip"] = self.creation_ip - data["creation_region"] = self.creation_region return data diff --git a/drama/classes/mix_ins.py b/drama/classes/mix_ins.py index 85313a7a2..0e792f972 100644 --- a/drama/classes/mix_ins.py +++ b/drama/classes/mix_ins.py @@ -128,7 +128,7 @@ class Scores: @property #@cache.memoize(timeout=60) def score(self): - return int(self.score_top) or 0 + return int(self.score) or 0 class Fuzzing: @@ -137,7 +137,7 @@ class Fuzzing: #@cache.memoize(timeout=60) def score_fuzzed(self): - real = self.score_top if self.score_top else self.score + real = self.score real = int(real) if real <= 10: return real diff --git a/drama/classes/submission.py b/drama/classes/submission.py index e26e55bc0..4367cdbde 100644 --- a/drama/classes/submission.py +++ b/drama/classes/submission.py @@ -63,27 +63,17 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing): is_approved = Column(Integer, ForeignKey("users.id"), default=0) approved_utc = Column(Integer, default=0) over_18 = Column(Boolean, default=False) - creation_ip = Column(String(64), default="") - mod_approved = Column(Integer) - accepted_utc = Column(Integer, default=0) - has_thumb = Column(Boolean, default=False) - post_public = Column(Boolean, default=True) - score_hot = Column(Float, default=0) - score_top = Column(Float, default=1) - score_activity = Column(Float, default=0) author = relationship( "User", lazy="joined", innerjoin=True, primaryjoin="Submission.author_id==User.id") is_pinned = Column(Boolean, default=False) - score_best = Column(Float, default=0) reports = relationship("Report", backref="submission") is_bot = Column(Boolean, default=False) upvotes = Column(Integer, default=1) downvotes = Column(Integer, default=0) - creation_region=Column(String(2)) app_id=Column(Integer, ForeignKey("oauth_apps.id")) oauth_app=relationship("OauthApp") @@ -245,13 +235,8 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing): def thumb_url(self): if self.over_18: return f"/assets/images/nsfw.png" - elif self.has_thumb: - if self.thumburl: return self.thumburl - else: return f"https://s3.eu-central-1.amazonaws.com/i.ruqqus.ga/posts/{self.base36id}/thumb.png" - elif self.is_image: - return self.url - else: - return None + elif self.thumburl: return self.thumburl + else: return None @property @@ -500,9 +485,6 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing): data=self.json_raw - data["creation_ip"]=self.creation_ip - data["creation_region"]=self.creation_region - return data @property diff --git a/drama/classes/user.py b/drama/classes/user.py index 5f67f91e2..4c9148312 100644 --- a/drama/classes/user.py +++ b/drama/classes/user.py @@ -699,8 +699,6 @@ class User(Base, Stndrd, Age_times): def json_admin(self): data = self.json_raw - data['creation_ip'] = self.creation_ip - data['creation_region'] = self.creation_region data['email'] = self.email data['email_verified'] = self.is_activated diff --git a/drama/routes/login.py b/drama/routes/login.py index 3b2ebf4fe..64d59af57 100644 --- a/drama/routes/login.py +++ b/drama/routes/login.py @@ -350,9 +350,7 @@ def sign_up_post(v): password=request.form.get("password"), email=email, created_utc=int(time.time()), - #creation_ip=request.remote_addr, referred_by=ref_id or None, - #creation_region=request.headers.get("cf-ipcountry"), ban_evade = int(any([x.is_banned for x in g.db.query(User).filter(User.id.in_(tuple(session.get("history", [])))).all() if x])) ) diff --git a/drama/routes/posts.py b/drama/routes/posts.py index dd260d180..b0c023af1 100644 --- a/drama/routes/posts.py +++ b/drama/routes/posts.py @@ -337,7 +337,6 @@ def edit_post(pid, v): over_18=False, is_bot=True, app_id=None, - creation_region=request.headers.get("cf-ipcountry"), is_pinned=True, distinguish_level=6 ) @@ -543,7 +542,6 @@ def thumbs(new_post): file.write(chunk) post.thumburl = upload_from_file(name, tempname, resize=(100, 100)) - if post.thumburl: post.has_thumb = True g.db.add(post) g.db.commit() @@ -884,7 +882,6 @@ def submit_post(v): over_18=bool(request.form.get("over_18","")), repost_id=repost.id if repost else None, app_id=v.client.application.id if v.client else None, - creation_region=request.headers.get("cf-ipcountry"), is_bot = request.headers.get("X-User-Type","").lower()=="bot" ) @@ -988,7 +985,6 @@ def submit_post(v): over_18=False, is_bot=True, app_id=None, - creation_region=request.headers.get("cf-ipcountry"), is_pinned=True, distinguish_level=6 ) @@ -1025,7 +1021,6 @@ def submit_post(v): over_18=False, is_bot=True, app_id=None, - creation_region=request.headers.get("cf-ipcountry") ) g.db.add(c)