diff --git a/drama/classes/user.py b/drama/classes/user.py index 28cc9da54..c6855858b 100644 --- a/drama/classes/user.py +++ b/drama/classes/user.py @@ -649,8 +649,6 @@ class User(Base, Stndrd, Age_times): def can_make_guild(self): return False - # return (self.has_premium or self.dramacoins >= 250 or (self.created_utc <= 1592974538 and self.dramacoins >= 50)) and len([x for x in self.boards_modded if x.is_siegable]) < 10 - @property def can_join_gms(self): return len([x for x in self.boards_modded if x.is_siegable]) < 10 @@ -671,19 +669,15 @@ class User(Base, Stndrd, Age_times): # Has premium # Has 1000 Rep, or 500 for older accounts # if connecting through Tor, must have verified email - return (self.has_premium or self.dramacoins >= 0 or ( - self.created_utc <= 1592974538 and self.dramacoins >= 500)) and ( - self.is_activated or request.headers.get("cf-ipcountry") != "T1") + return self.dramacoins >= 0 @property def can_upload_avatar(self): - return (self.has_premium or self.dramacoins >= 0 or self.created_utc <= 1592974538) and ( - self.is_activated or request.headers.get("cf-ipcountry") != "T1") + return self.dramacoins >= 0 @property def can_upload_banner(self): - return (self.has_premium or self.dramacoins >= 0 or self.created_utc <= 1592974538) and ( - self.is_activated or request.headers.get("cf-ipcountry") != "T1") + return self.dramacoins >= 0 @property def json_raw(self): diff --git a/drama/routes/users.py b/drama/routes/users.py index edff967aa..b3f3ac5e3 100644 --- a/drama/routes/users.py +++ b/drama/routes/users.py @@ -212,20 +212,12 @@ def followers(username, v): users = [x.user for x in u.followers] return render_template("followers.html", v=v, u=u, users=users) -@app.route("/@/views", methods=["GET"]) +@app.get("/views") @auth_required -def visitors(username, v): - - u = get_user(username, v=v) - - if u.id != v.id: - abort(403) - - if v.admin_level < 1 and not v.patron: - abort(403) - - viewers=sorted(u.viewers, key = lambda x: x.last_view_utc) +def visitors(v): + if v.admin_level < 1 and not v.patron: abort(403) + viewers=sorted(v.viewers, key = lambda x: x.last_view_utc) return render_template("viewers.html", v=v, viewers=viewers) @app.route("/@", methods=["GET"])