comments rename field username -> nickname

4 files changed, 15 insertions, 15 deletions

diff --git a/blog.node5.net/templates/base.html b/blog.node5.net/templates/base.html
index 4cfacfb..9f8c8bc 100644
--- a/blog.node5.net/templates/base.html
+++ b/blog.node5.net/templates/base.html
@@ -25,8 +25,8 @@
     <h2>Comments</h2>
 
     <form action="/comment" method="post">
-        <label for="username">Username (optional)</label><br>
-        <input type="text" id="username" name="username">
+        <label for="nickname">Nickname (optional)</label><br>
+        <input type="text" id="nickname" name="nickname">
         <br><br>
 
         <label for="visitor_url">Your website URL (optional)</label><br>
@@ -49,7 +49,7 @@
     {% if comments|length > 0 %}
     <h3>
         ID <span class="dark-grey">|</span>
-        Username <span class="dark-grey">|</span>
+        Nickname <span class="dark-grey">|</span>
         Visitor website URL<span class="dark-grey">|</span>
         Means of contact <span class="dark-grey">|</span>
         Created at
@@ -60,7 +60,7 @@
         <li>
             <span class="grey">
                 {{ comment.id }} <span class="dark-grey">|</span>
-                {% if comment.username %}<span title="Username">{{ comment.username }}</span> <span class="dark-grey">|</span>{% endif %}
+                {% if comment.nickname %}<span title="Nickname">{{ comment.nickname }}</span> <span class="dark-grey">|</span>{% endif %}
                 {% if comment.visitor_url %}<a title="Visitor url" href="{{comment.visitor_url}}">{{ comment.visitor_url }}</a> <span class="dark-grey">|</span>{% endif %}
                 {% if comment.contact %}<span title="Means of contact">{{ comment.contact  }}</span> <span class="dark-grey">|</span>{% endif %}
                 {{ comment.created_at }}
diff --git a/create_db.sql b/create_db.sql
index b8aacbe..c4202af 100644
--- a/create_db.sql
+++ b/create_db.sql
@@ -3,7 +3,7 @@ CREATE TABLE comment (
 	comment          text NOT NULL,
 	page_url         text,
 	visitor_url      text,
-	username         text,
+	nickname         text,
 	show_visitor_url bool,
 	contact		     text,
 	show_contact     bool,
@@ -18,14 +18,14 @@ comment on column comment.contact is 'A means of contacting this person, email p
 comment on column comment.show_contact is 'True: Publicly show the contact information, False: Site creators eyes only';
 comment on column comment.public is 'Indicates if the comment is to be publicly viewable, or if it''s merely for the creator';
 
-INSERT INTO comment (comment, page_url, username, visitor_url, show_visitor_url, contact, show_contact, public, approved)
+INSERT INTO comment (comment, page_url, nickname, visitor_url, show_visitor_url, contact, show_contact, public, approved)
              VALUES ('Hello world!', '/', 'user@node5.net', 'https://blog.node5.net/', TRUE, 'Leave a comment on this blog', TRUE, TRUE, TRUE);
 
-INSERT INTO comment (comment, page_url, username, visitor_url, show_visitor_url, contact, show_contact, public, approved)
+INSERT INTO comment (comment, page_url, nickname, visitor_url, show_visitor_url, contact, show_contact, public, approved)
              VALUES ('Test private means of contact', '/', NULL, NULL, TRUE, 'Death star plans', FALSE, TRUE, TRUE);
 
-INSERT INTO comment (comment, page_url, username, visitor_url, show_visitor_url, contact, show_contact, public, approved)
+INSERT INTO comment (comment, page_url, nickname, visitor_url, show_visitor_url, contact, show_contact, public, approved)
              VALUES ('Test private comment', '/', NULL, NULL, TRUE, 'Don''t', TRUE, FALSE, TRUE);
 
-INSERT INTO comment (comment, page_url, username, visitor_url, show_visitor_url, contact, show_contact, public, approved)
+INSERT INTO comment (comment, page_url, nickname, visitor_url, show_visitor_url, contact, show_contact, public, approved)
              VALUES ('Test unapproved comment', '/', NULL, NULL, TRUE, NULL, TRUE, TRUE, FALSE);
\ No newline at end of file
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}
             )