Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use snake_case for method names

Browse Source
This commit is contained in:
rubenwardy
2023-06-19 21:27:49 +01:00
parent 16f93b3e13
commit 45ed12ddf0
53 changed files with 390 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/__init__.py
View File

@@ -116,7 +116,7 @@ class AuditLogEntry(db.Model):
raise Exception("Unknown permission given to AuditLogEntry.check_perm()")
if perm == Permission.VIEW_AUDIT_DESCRIPTION:
return user.rank.atLeast(UserRank.APPROVER if self.package is not None else UserRank.MODERATOR)
return user.rank.at_least(UserRank.APPROVER if self.package is not None else UserRank.MODERATOR)
else:
raise Exception("Permission {} is not related to audit log entries".format(perm.name))
@@ -181,7 +181,7 @@ class ForumTopic(db.Model):
raise Exception("Unknown permission given to ForumTopic.check_perm()")
if perm == Permission.TOPIC_DISCARD:
return self.author == user or user.rank.atLeast(UserRank.EDITOR)
return self.author == user or user.rank.at_least(UserRank.EDITOR)
else:
raise Exception("Permission {} is not related to topics".format(perm.name))

34
app/models/packages.py
View File

@@ -271,7 +271,7 @@ class Dependency(db.Model):
else:
raise Exception("Either meta or package must be given, but not both!")
def getName(self):
def get_name(self):
if self.meta_package:
return self.meta_package.name
elif self.package:
@@ -484,7 +484,7 @@ class Package(db.Model):
query = query.filter_by(optional=not is_hard)
deps = query.all()
deps.sort(key=lambda x: x.getName())
deps.sort(key=lambda x: x.get_name())
return deps
def get_sorted_hard_dependencies(self):
@@ -654,25 +654,25 @@ class Package(db.Model):
raise Exception("Unknown permission given to Package.check_perm()")
is_owner = user == self.author
is_maintainer = is_owner or user.rank.atLeast(UserRank.EDITOR) or user in self.maintainers
is_approver = user.rank.atLeast(UserRank.APPROVER)
is_maintainer = is_owner or user.rank.at_least(UserRank.EDITOR) or user in self.maintainers
is_approver = user.rank.at_least(UserRank.APPROVER)
if perm == Permission.CREATE_THREAD:
return user.rank.atLeast(UserRank.NEW_MEMBER)
return user.rank.at_least(UserRank.NEW_MEMBER)
# Members can edit their own packages, and editors can edit any packages
elif perm == Permission.MAKE_RELEASE or perm == Permission.ADD_SCREENSHOTS:
return is_maintainer
elif perm == Permission.EDIT_PACKAGE:
return is_maintainer and user.rank.atLeast(UserRank.NEW_MEMBER)
return is_maintainer and user.rank.at_least(UserRank.NEW_MEMBER)
elif perm == Permission.APPROVE_RELEASE:
return (is_maintainer or is_approver) and user.rank.atLeast(UserRank.MEMBER if self.approved else UserRank.NEW_MEMBER)
return (is_maintainer or is_approver) and user.rank.at_least(UserRank.MEMBER if self.approved else UserRank.NEW_MEMBER)
# Anyone can change the package name when not approved, but only editors when approved
elif perm == Permission.CHANGE_NAME:
return not self.approved or user.rank.atLeast(UserRank.EDITOR)
return not self.approved or user.rank.at_least(UserRank.EDITOR)
# Editors can change authors and approve new packages
elif perm == Permission.APPROVE_NEW or perm == Permission.CHANGE_AUTHOR:
@@ -680,16 +680,16 @@ class Package(db.Model):
elif perm == Permission.APPROVE_SCREENSHOT:
return (is_maintainer or is_approver) and \
user.rank.atLeast(UserRank.MEMBER if self.approved else UserRank.NEW_MEMBER)
user.rank.at_least(UserRank.MEMBER if self.approved else UserRank.NEW_MEMBER)
elif perm == Permission.EDIT_MAINTAINERS or perm == Permission.DELETE_PACKAGE:
return is_owner or user.rank.atLeast(UserRank.EDITOR)
return is_owner or user.rank.at_least(UserRank.EDITOR)
elif perm == Permission.UNAPPROVE_PACKAGE:
return is_owner or user.rank.atLeast(UserRank.APPROVER)
return is_owner or user.rank.at_least(UserRank.APPROVER)
elif perm == Permission.CHANGE_RELEASE_URL:
return user.rank.atLeast(UserRank.MODERATOR)
return user.rank.at_least(UserRank.MODERATOR)
else:
raise Exception("Permission {} is not related to packages".format(perm.name))
@@ -738,7 +738,7 @@ class Package(db.Model):
elif state == PackageState.WIP:
return self.check_perm(user, Permission.EDIT_PACKAGE) and \
(user in self.maintainers or user.rank.atLeast(UserRank.ADMIN))
(user in self.maintainers or user.rank.at_least(UserRank.ADMIN))
return True
@@ -1018,10 +1018,10 @@ class PackageRelease(db.Model):
is_maintainer = user == self.package.author or user in self.package.maintainers
if perm == Permission.DELETE_RELEASE:
if user.rank.atLeast(UserRank.ADMIN):
if user.rank.at_least(UserRank.ADMIN):
return True
if not (is_maintainer or user.rank.atLeast(UserRank.EDITOR)):
if not (is_maintainer or user.rank.at_least(UserRank.EDITOR)):
return False
if not self.package.approved or self.task_id is not None:
@@ -1033,8 +1033,8 @@ class PackageRelease(db.Model):
return count > 0
elif perm == Permission.APPROVE_RELEASE:
return user.rank.atLeast(UserRank.APPROVER) or \
(is_maintainer and user.rank.atLeast(
return user.rank.at_least(UserRank.APPROVER) or \
(is_maintainer and user.rank.at_least(
UserRank.MEMBER if self.approved else UserRank.NEW_MEMBER))
else:
raise Exception("Permission {} is not related to releases".format(perm.name))

16
app/models/threads.py
View File

@@ -92,21 +92,21 @@ class Thread(db.Model):
if self.package:
isMaintainer = isMaintainer or user in self.package.maintainers
canSee = not self.private or isMaintainer or user.rank.atLeast(UserRank.APPROVER) or user in self.watchers
canSee = not self.private or isMaintainer or user.rank.at_least(UserRank.APPROVER) or user in self.watchers
if perm == Permission.SEE_THREAD:
return canSee
elif perm == Permission.COMMENT_THREAD:
return canSee and (not self.locked or user.rank.atLeast(UserRank.MODERATOR))
return canSee and (not self.locked or user.rank.at_least(UserRank.MODERATOR))
elif perm == Permission.LOCK_THREAD:
return user.rank.atLeast(UserRank.MODERATOR)
return user.rank.at_least(UserRank.MODERATOR)
elif perm == Permission.DELETE_THREAD:
from app.utils.models import get_system_user
return (self.author == get_system_user() and self.package and
user in self.package.maintainers) or user.rank.atLeast(UserRank.MODERATOR)
user in self.package.maintainers) or user.rank.at_least(UserRank.MODERATOR)
else:
raise Exception("Permission {} is not related to threads".format(perm.name))
@@ -157,10 +157,10 @@ class ThreadReply(db.Model):
raise Exception("Unknown permission given to ThreadReply.check_perm()")
if perm == Permission.EDIT_REPLY:
return user.rank.atLeast(UserRank.NEW_MEMBER if user == self.author else UserRank.MODERATOR) and not self.thread.locked
return user.rank.at_least(UserRank.NEW_MEMBER if user == self.author else UserRank.MODERATOR) and not self.thread.locked
elif perm == Permission.DELETE_REPLY:
return user.rank.atLeast(UserRank.MODERATOR) and self.thread.first_reply != self
return user.rank.at_least(UserRank.MODERATOR) and self.thread.first_reply != self
else:
raise Exception("Permission {} is not related to threads".format(perm.name))
@@ -227,7 +227,7 @@ class PackageReview(db.Model):
name=self.package.name,
reviewer=self.author.username)
def getVoteUrl(self, next_url=None):
def get_vote_url(self, next_url=None):
return url_for("packages.review_vote",
author=self.package.author.username,
name=self.package.name,
@@ -248,7 +248,7 @@ class PackageReview(db.Model):
raise Exception("Unknown permission given to PackageReview.check_perm()")
if perm == Permission.DELETE_REVIEW:
return user == self.author or user.rank.atLeast(UserRank.MODERATOR)
return user == self.author or user.rank.at_least(UserRank.MODERATOR)
else:
raise Exception("Permission {} is not related to reviews".format(perm.name))

36
app/models/users.py
View File

@@ -37,7 +37,7 @@ class UserRank(enum.Enum):
MODERATOR = 8
ADMIN = 9
def atLeast(self, min):
def at_least(self, min):
return self.value >= min.value
def get_title(self):
@@ -101,10 +101,10 @@ class Permission(enum.Enum):
self == Permission.APPROVE_RELEASE or \
self == Permission.APPROVE_SCREENSHOT or \
self == Permission.SEE_THREAD:
return user.rank.atLeast(UserRank.APPROVER)
return user.rank.at_least(UserRank.APPROVER)
elif self == Permission.EDIT_TAGS or self == Permission.CREATE_TAG:
return user.rank.atLeast(UserRank.EDITOR)
return user.rank.at_least(UserRank.EDITOR)
else:
raise Exception("Non-global permission checked globally. Use Package.check_perm or User.check_perm instead.")
@@ -234,20 +234,20 @@ class User(db.Model, UserMixin):
# Members can edit their own packages, and editors can edit any packages
if perm == Permission.CHANGE_AUTHOR:
return user.rank.atLeast(UserRank.EDITOR)
return user.rank.at_least(UserRank.EDITOR)
elif perm == Permission.CHANGE_USERNAMES:
return user.rank.atLeast(UserRank.MODERATOR)
return user.rank.at_least(UserRank.MODERATOR)
elif perm == Permission.CHANGE_RANK:
return user.rank.atLeast(UserRank.MODERATOR) and not self.rank.atLeast(user.rank)
return user.rank.at_least(UserRank.MODERATOR) and not self.rank.at_least(user.rank)
elif perm == Permission.CHANGE_EMAIL or perm == Permission.CHANGE_PROFILE_URLS:
return user == self or (user.rank.atLeast(UserRank.MODERATOR) and not self.rank.atLeast(user.rank))
return user == self or (user.rank.at_least(UserRank.MODERATOR) and not self.rank.at_least(user.rank))
elif perm == Permission.CHANGE_DISPLAY_NAME:
return user.rank.atLeast(UserRank.NEW_MEMBER if user == self else UserRank.MODERATOR)
return user.rank.at_least(UserRank.NEW_MEMBER if user == self else UserRank.MODERATOR)
elif perm == Permission.CREATE_TOKEN:
if user == self:
return user.rank.atLeast(UserRank.NEW_MEMBER)
return user.rank.at_least(UserRank.NEW_MEMBER)
else:
return user.rank.atLeast(UserRank.MODERATOR) and user.rank.atLeast(self.rank)
return user.rank.at_least(UserRank.MODERATOR) and user.rank.at_least(self.rank)
else:
raise Exception("Permission {} is not related to users".format(perm.name))
@@ -255,11 +255,11 @@ class User(db.Model, UserMixin):
from app.models import ThreadReply
factor = 1
if self.rank.atLeast(UserRank.ADMIN):
if self.rank.at_least(UserRank.ADMIN):
return True
elif self.rank.atLeast(UserRank.TRUSTED_MEMBER):
elif self.rank.at_least(UserRank.TRUSTED_MEMBER):
factor = 3
elif self.rank.atLeast(UserRank.MEMBER):
elif self.rank.at_least(UserRank.MEMBER):
factor = 2
one_min_ago = datetime.datetime.utcnow() - datetime.timedelta(minutes=1)
@@ -278,11 +278,11 @@ class User(db.Model, UserMixin):
from app.models import Thread
factor = 1
if self.rank.atLeast(UserRank.ADMIN):
if self.rank.at_least(UserRank.ADMIN):
return True
elif self.rank.atLeast(UserRank.TRUSTED_MEMBER):
elif self.rank.at_least(UserRank.TRUSTED_MEMBER):
factor = 5
elif self.rank.atLeast(UserRank.MEMBER):
elif self.rank.at_least(UserRank.MEMBER):
factor = 2
hour_ago = datetime.datetime.utcnow() - datetime.timedelta(hours=1)
@@ -293,9 +293,9 @@ class User(db.Model, UserMixin):
from app.models import PackageReview
factor = 1
if self.rank.atLeast(UserRank.ADMIN):
if self.rank.at_least(UserRank.ADMIN):
return True
elif self.rank.atLeast(UserRank.TRUSTED_MEMBER):
elif self.rank.at_least(UserRank.TRUSTED_MEMBER):
factor *= 5
five_mins_ago = datetime.datetime.utcnow() - datetime.timedelta(minutes=5)