diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/blog_node5_net.py | 2 | ||||
| -rw-r--r-- | src/db_handler.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/blog_node5_net.py b/src/blog_node5_net.py index 98e2d78..b6ab03c 100644 --- a/src/blog_node5_net.py +++ b/src/blog_node5_net.py @@ -48,7 +48,7 @@ def post_comment(): 'public': False, 'show_contact': False} telegram_handler.send_message(flask.request.form['comment']) for key, value in flask.request.form.items(): - if key in ('username', 'visitor_url', 'contact', 'show_contact', 'public', 'comment'): + if key in ('nickname', 'visitor_url', 'contact', 'show_contact', 'public', 'comment'): if key in ('public', 'show_contact'): value = value == 'on' args[key] = value diff --git a/src/db_handler.py b/src/db_handler.py index 5820231..a7740f7 100644 --- a/src/db_handler.py +++ b/src/db_handler.py @@ -11,21 +11,21 @@ def get_comments(url: str) -> list[dict]: with psycopg.connect(**db_con_params, row_factory=psycopg.rows.dict_row) as conn: with conn.cursor() as cur: cur.execute( - "SELECT id, comment, page_url, visitor_url, username, " + "SELECT id, comment, page_url, visitor_url, nickname, " "(CASE WHEN show_contact THEN contact ELSE NULL END) as contact, created_at " "FROM comment WHERE approved AND public AND page_url = %(url)s ORDER BY created_at DESC;", {'url': url}) comments = cur.fetchall() return comments -def post_comment(comment: str, page_url: str, visitor_url: str=None, username: str=None, contact: str=None, +def post_comment(comment: str, page_url: str, visitor_url: str=None, nickname: str=None, contact: str=None, show_contact: bool=True, public: bool=True): with psycopg.connect(**db_con_params, row_factory=psycopg.rows.dict_row) as conn: with conn.cursor() as cur: cur.execute( - "INSERT INTO comment (comment, page_url, visitor_url, username, contact, show_contact, public)" - "VALUES (%(comment)s, %(page_url)s, %(visitor_url)s, %(username)s, %(contact)s, %(show_contact)s, " + "INSERT INTO comment (comment, page_url, visitor_url, nickname, contact, show_contact, public)" + "VALUES (%(comment)s, %(page_url)s, %(visitor_url)s, %(nickname)s, %(contact)s, %(show_contact)s, " "%(public)s);", - {'comment': comment, 'page_url': page_url, 'visitor_url': visitor_url, 'username': username, + {'comment': comment, 'page_url': page_url, 'visitor_url': visitor_url, 'nickname': nickname, 'contact': contact, 'show_contact': show_contact, 'public': public} ) |