diff --git a/src/database/ddl.py b/src/database/ddl.py index 491d521..4a0d9c3 100644 --- a/src/database/ddl.py +++ b/src/database/ddl.py @@ -1,14 +1,15 @@ import json +import time + import logging - import math -import timeit - import typing -from peewee import ModelSelect -from playhouse.shortcuts import model_to_dict from peewee import * +import nacl.hash + +from src.server.validation import is_valid_base_comment +from src.misc import clean def get_database_connection(): @@ -125,10 +126,6 @@ def comment_list(claim_id: str = None, parent_id: str = None, return data -def clean(thing: dict) -> dict: - return {k: v for k, v in thing.items() if v is not None} - - def get_comment(comment_id: str) -> dict: return (comment_list(expressions=(Comment.comment_id == comment_id), page_size=1) .get('items') diff --git a/src/database/writes.py b/src/database/writes.py index b9d4b98..9f13f3f 100644 --- a/src/database/writes.py +++ b/src/database/writes.py @@ -7,7 +7,7 @@ from src.server.validation import is_valid_base_comment from src.server.validation import is_valid_credential_input from src.server.validation import validate_signature_from_claim from src.server.validation import body_is_valid -from src.server.misc import get_claim_from_id +from src.misc import get_claim_from_id from src.server.external import send_notifications from src.server.external import send_notification import src.database.queries as db diff --git a/src/server/misc.py b/src/misc.py similarity index 86% rename from src/server/misc.py rename to src/misc.py index 4f620e6..e9d5be8 100644 --- a/src/server/misc.py +++ b/src/misc.py @@ -20,3 +20,7 @@ def clean_input_params(kwargs: dict): kwargs[k] = v.strip() if k in ID_LIST: kwargs[k] = v.lower() + + +def clean(thing: dict) -> dict: + return {k: v for k, v in thing.items() if v is not None} \ No newline at end of file diff --git a/src/server/handles.py b/src/server/handles.py index c2d5f3e..a63504b 100644 --- a/src/server/handles.py +++ b/src/server/handles.py @@ -9,7 +9,7 @@ import src.database.queries as db from src.database.writes import abandon_comment, create_comment from src.database.writes import hide_comments from src.database.writes import edit_comment -from src.server.misc import clean_input_params +from src.misc import clean_input_params from src.server.errors import make_error, report_error logger = logging.getLogger(__name__)