Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue192 Emojis in Usernames #443

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Issue192 Emojis in Usernames #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b93239d
MAde change to db.py authentication.
andersoncedu Dec 5, 2023
36122a2
Remove debugging print statements.
andersoncedu Dec 5, 2023
a1590a6
Merge branch 'RunestoneInteractive:main' into issue192-v2
andersoncedu Dec 5, 2023
f718f37
Undid formatting changes that weren't necessary.
andersoncedu Dec 6, 2023
42214c5
Merge branch 'issue192-v2' of https://github.com/andersoncedu/rs into…
andersoncedu Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bases/rsptx/web2py_server/applications/runestone/models/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ def formatter(self, value):
db.auth_user.username.requires = (
HAS_NO_DOTS(),
IS_NOT_IN_DB(db, db.auth_user.username),
IS_NOT_EMOJI(db.auth_user.username,f"Username cannot contain emojis")
)
db.auth_user.registration_id.requires = IS_NOT_IN_DB(db, db.auth_user.registration_id)
db.auth_user.email.requires = (
Expand Down
16 changes: 15 additions & 1 deletion bases/rsptx/web2py_server/gluon/packages/dal/pydal/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"IS_UPPER",
"IS_URL",
"IS_JSON",
"IS_NOT_EMOJI",
]


Expand Down Expand Up @@ -157,6 +158,19 @@ def validator_caller(func, value, record_id=None):
raise ValidationError(error)
return value

class IS_NOT_EMOJI(Validator):
"""
"""
def __init__(self,expression, error_message="Contains Emojis"):

self.expression = expression
self.error_message = error_message
def validate(self, value, record_id=None):
emoji_pattern = re.compile(r'[\U0001F600-\U0001F64F\U0001F300-\U0001F5FF\U0001F680-\U0001F6FF\U0001F700-\U0001F77F\U0001F780-\U0001F7FF\U0001F800-\U0001F8FF\U0001F900-\U0001F9FF\U0001FA00-\U0001FA6F\U0001FA70-\U0001FAFF]')

if emoji_pattern.search(value):
raise ValidationError(self.translator(self.error_message))
return value

class IS_MATCH(Validator):
"""
Expand Down Expand Up @@ -202,7 +216,7 @@ def __init__(
extract=False,
is_unicode=False,
):

if strict or not search:
if not expression.startswith("^"):
expression = "^(%s)" % expression
Expand Down