discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

Merge branch 'prealpha' into main

Browse Source
This commit is contained in:
tonyrewin
2022-12-02 11:51:53 +03:00
parent e90099ae53 53d3e1ec80
commit 50b2ae4154
19 changed files with 221 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
orm/user.py
View File

@@ -56,7 +56,8 @@ class User(Base):
email = Column(String, unique=True, nullable=False, comment="Email")
username = Column(String, nullable=False, comment="Login")
password = Column(String, nullable=True, comment="Password")
bio = Column(String, nullable=True, comment="Bio")
bio = Column(String, nullable=True, comment="Bio") # status description
about = Column(String, nullable=True, comment="About") # long and formatted
userpic = Column(String, nullable=True, comment="Userpic")
name = Column(String, nullable=True, comment="Display name")
slug = Column(String, unique=True, comment="User's slug")
@@ -100,7 +101,7 @@ class User(Base):
session.commit()
User.default_user = default
async def get_permission(self):
def get_permission(self):
scope = {}
for role in self.roles:
for p in role.permissions: