LobotomyLabs/classquiz-ai
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fixed regex

Browse Source
This commit is contained in:
Mawoka
2022-04-12 13:10:59 +02:00
parent 9b0ab16a8c
commit 5e507d7b41
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classquiz/routers/quiz.py
+4 -3
View File
@@ -27,7 +27,7 @@ async def create_quiz_lol(quiz_input: QuizInput, user: User = Depends(get_curren
if question.image == "": if question.image == "":
question.image = None question.image = None
if question.image is not None: if question.image is not None:
if not re.match(imgur_regex, question.image) or not re.match(server_regex, question.image): if not re.match(imgur_regex, question.image) and not re.match(server_regex, question.image):
raise HTTPException(status_code=400, detail="image url is not valid") raise HTTPException(status_code=400, detail="image url is not valid")
quiz = Quiz(**quiz_input.dict(), user_id=user.id, id=uuid.uuid4()) quiz = Quiz(**quiz_input.dict(), user_id=user.id, id=uuid.uuid4())
await redis.delete("global_quiz_count") await redis.delete("global_quiz_count")
@@ -94,12 +94,13 @@ async def get_quiz_list(user: User = Depends(get_current_user)):
@router.put("/update/{quiz_id}") @router.put("/update/{quiz_id}")
async def update_quiz(quiz_id: str, quiz_input: QuizInput, user: User = Depends(get_current_user)): async def update_quiz(quiz_id: str, quiz_input: QuizInput, user: User = Depends(get_current_user)):
imgur_regex = r"^https://i\.imgur\.com\/.{7}.(jpg|png|gif)$" imgur_regex = r"^https://i\.imgur\.com\/.{7}.(jpg|png|gif)$"
server_regex = rf"^{settings.root_address}/api/v1/storage/download/.{36}--.{36}$" server_regex = rf"^{settings.root_address}/api/v1/storage/download/.{{36}}--.{{36}}$"
for question in quiz_input.questions: for question in quiz_input.questions:
if question.image == "": if question.image == "":
question.image = None question.image = None
if question.image is not None: if question.image is not None:
if not re.match(imgur_regex, question.image) or not re.match(server_regex, question.image): if not bool(re.match(server_regex, question.image)) and not bool(re.match(imgur_regex, question.image)):
print("not valid", question.image)
raise HTTPException(status_code=400, detail="image url is not valid") raise HTTPException(status_code=400, detail="image url is not valid")
try: try:
quiz_id = uuid.UUID(quiz_id) quiz_id = uuid.UUID(quiz_id)