openwrite 0.15.0__tar.gz → 0.16.1__tar.gz

{openwrite-0.15.0/openwrite.egg-info → openwrite-0.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.15.0
+Version: 0.16.1
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -726,6 +726,8 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Subpages per blog
 - Valkey support
 - Post tags, filtering
+- Optional comments per post
+- Auto save during typing
 
 
 ## Installation

{openwrite-0.15.0 → openwrite-0.16.1}/README.md

@@ -36,6 +36,8 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Subpages per blog
 - Valkey support
 - Post tags, filtering
+- Optional comments per post
+- Auto save during typing
 
 
 ## Installation

{openwrite-0.15.0 → openwrite-0.16.1}/openwrite/__init__.py

@@ -167,6 +167,7 @@ def create_app(test_config=None):
     app.wsgi_app = ProxyFix(app.wsgi_app, x_for=1, x_proto=1, x_host=1, x_port=1)
     app.secret_key = os.getenv("SECRET_KEY")
     app.config['SERVER_NAME'] = os.getenv("DOMAIN")
+    app.config['SESSION_COOKIE_DOMAIN'] = '.' + os.getenv("DOMAIN", "").split(':')[0]
 
     from .routes.auth import auth_bp
     from .routes.dashboard import dashboard_bp

{openwrite-0.15.0 → openwrite-0.16.1}/openwrite/cli.py

@@ -152,8 +152,8 @@ def init():
         if captcha_enabled:
             f.write(f"FRIENDLY_CAPTCHA_SITEKEY={captcha_sitekey}\n")
             f.write(f"FRIENDLY_CAPTCHA_APIKEY={captcha_apikey}\n")
+        f.write(f"VALKEY_ENABLED={'yes' if valkey_enabled else 'no'}\n")
         if valkey_enabled:
-            f.write(f"VALKEY_ENABLED={'yes' if valkey_enabled else 'no'}\n")
             f.write(f"VALKEY_HOST={valkey_host}\n")
             f.write(f"VALKEY_PORT={valkey_port}\n")
             f.write(f"VALKEY_PASSWORD={valkey_password}\n")

{openwrite-0.15.0 → openwrite-0.16.1}/openwrite/routes/auth.py

@@ -1,4 +1,4 @@
-from flask import Blueprint, render_template, redirect, request, session, g
+from flask import Blueprint, render_template, redirect, request, session, g, current_app
 from openwrite.utils.models import User
 import bcrypt
 import re
@@ -74,5 +74,10 @@ def login():
 @auth_bp.route("/logout")
 def logout():
     session.clear()
-    return redirect("/")
+    response = redirect("/")
+    cookie_name = current_app.config.get('SESSION_COOKIE_NAME', 'session')
+    cookie_domain = current_app.config.get('SESSION_COOKIE_DOMAIN')
+    response.delete_cookie(cookie_name, path='/', domain=cookie_domain)
+    response.delete_cookie(cookie_name, path='/')
+    return response
 

{openwrite-0.15.0 → openwrite-0.16.1}/openwrite/routes/blog.py

@@ -1,5 +1,5 @@
-from flask import Blueprint, render_template, redirect, request, g, Response, abort, send_file
-from openwrite.utils.models import Blog, Post, User, View, Like, Page
+from flask import Blueprint, render_template, redirect, request, g, Response, abort, send_file, jsonify
+from openwrite.utils.models import Blog, Post, User, View, Like, Page, PostDraft, Comment
 from openwrite.utils.tags import get_post_tags, parse_tags_from_posts_syntax, get_posts_by_tags
 from openwrite.utils.helpers import gen_link, sanitize_html, anonymize, get_ip
 from openwrite.utils.valkey_client import valkey_client
@@ -255,9 +255,10 @@ def show_post(blog, post):
     one_post.liked = liked
 
     post_tags = get_post_tags(g.db, one_post)
+    comments = g.db.query(Comment).filter_by(blog_id=blog_obj.id, post_id=one_post.id).order_by(Comment.created_at.asc()).all() if one_post.comments_allowed == "1" else []
 
     user = g.db.query(User).filter_by(id=g.user) if g.user else None
-    return render_template("post.html", blog=blog_obj, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags)
+    return render_template("post.html", blog=blog_obj, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags, comments=comments)
 
 @blog_bp.route("/<post>", subdomain="<blog>")
 def show_subpost(blog, post):
@@ -325,9 +326,10 @@ def show_subpost(blog, post):
     one_post.liked = liked
  
     post_tags = get_post_tags(g.db, one_post)
+    comments = g.db.query(Comment).filter_by(blog_id=blog_obj.id, post_id=one_post.id).order_by(Comment.created_at.asc()).all() if one_post.comments_allowed == "1" else []
 
     user = g.db.query(User).filter_by(id=g.user) if g.user else None
-    return render_template("post.html", blog=blog_obj, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags)
+    return render_template("post.html", blog=blog_obj, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags, comments=comments)
 
 @blog_bp.route("/.well-known/webfinger")
 def webfinger():
@@ -438,9 +440,10 @@ def single_showpost(post):
     one_post.liked = liked
 
     post_tags = get_post_tags(g.db, one_post)
+    comments = g.db.query(Comment).filter_by(blog_id=blog.id, post_id=one_post.id).order_by(Comment.created_at.asc()).all() if one_post.comments_allowed == "1" else []
 
     user = g.db.query(User).filter_by(id=g.user) if g.user else None
-    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags)
+    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags, comments=comments)
 
 @blog_bp.route("/rss")
 def single_rss():
@@ -504,3 +507,111 @@ def serve_rss(blog):
     Here we just serve static RSS files :)
     """
     return send_file(f"{g.mainpath}/static/feed/{blog.name}.xml")
+
+
+@blog_bp.route("/comment", methods=['POST'])
+@blog_bp.route("/comment", subdomain="<blog>", methods=['POST'])
+def add_comment(blog=None):
+    blog_id = request.form.get('blog_id', type=int)
+    post_id = request.form.get('post_id', type=int)
+    author_name = request.form.get('author_name', '').strip()[:50]
+    content = request.form.get('content', '').strip()[:1000]
+    redirect_to = request.referrer or '/'
+
+    if not blog_id or not post_id:
+        abort(400)
+
+    post = g.db.query(Post).filter_by(id=post_id, blog=blog_id).first()
+    if not post or post.comments_allowed != '1':
+        abort(403)
+
+    if not author_name or not content:
+        return redirect(redirect_to)
+
+    now = datetime.now(timezone.utc).replace(microsecond=0)
+    comment = Comment(blog_id=blog_id, post_id=post_id, author_name=author_name, content=content, created_at=now)
+    g.db.add(comment)
+    g.db.commit()
+    return redirect(redirect_to)
+
+
+@blog_bp.route("/comment/<int:comment_id>/delete", methods=['POST'])
+@blog_bp.route("/comment/<int:comment_id>/delete", subdomain="<blog>", methods=['POST'])
+def delete_comment(comment_id, blog=None):
+    if g.user is None:
+        abort(403)
+
+    comment = g.db.query(Comment).filter_by(id=comment_id).first()
+    if not comment:
+        abort(404)
+
+    blog = g.db.query(Blog).filter_by(id=comment.blog_id).first()
+    if not blog or blog.owner != g.user:
+        abort(403)
+
+    redirect_to = request.referrer or '/'
+    g.db.delete(comment)
+    g.db.commit()
+    return redirect(redirect_to)
+
+
+@blog_bp.route("/dashboard/autosave/<blog_name>", methods=['POST'])
+def autosave_post(blog_name):
+    if g.user is None:
+        abort(403)
+
+    blog = g.db.query(Blog).filter_by(name=blog_name).first()
+    if blog is None or blog.owner != g.user:
+        abort(403)
+
+    data = request.get_json()
+    if not data:
+        abort(400)
+
+    title = data.get('title', '')[:128]
+    content_raw = data.get('content_raw', '')
+    post_id = data.get('post_id')
+    session_key = data.get('session_key') if post_id is None else None
+
+    now = datetime.now(timezone.utc).replace(microsecond=0)
+    draft = PostDraft(post_id=post_id, blog_id=blog.id, session_key=session_key, title=title, content_raw=content_raw, saved_at=now)
+    g.db.add(draft)
+    g.db.flush()
+
+    if post_id is not None:
+        existing = g.db.query(PostDraft).filter_by(post_id=post_id, blog_id=blog.id).order_by(PostDraft.saved_at.desc()).all()
+    else:
+        existing = g.db.query(PostDraft).filter_by(session_key=session_key, blog_id=blog.id).order_by(PostDraft.saved_at.desc()).all()
+
+    for old in existing[20:]:
+        g.db.delete(old)
+
+    g.db.commit()
+    return {'status': 'ok'}, 200
+
+
+@blog_bp.route("/dashboard/autosaves/<blog_name>", methods=['GET'])
+def get_autosaves(blog_name):
+    if g.user is None:
+        abort(403)
+
+    blog = g.db.query(Blog).filter_by(name=blog_name).first()
+    if blog is None or blog.owner != g.user:
+        abort(403)
+
+    post_id = request.args.get('post_id', type=int)
+    session_key = request.args.get('session_key')
+
+    if post_id is not None:
+        drafts = g.db.query(PostDraft).filter_by(post_id=post_id, blog_id=blog.id).order_by(PostDraft.saved_at.desc()).limit(20).all()
+    elif session_key:
+        drafts = g.db.query(PostDraft).filter_by(session_key=session_key, blog_id=blog.id).order_by(PostDraft.saved_at.desc()).limit(20).all()
+    else:
+        drafts = []
+
+    return jsonify([{
+        'id': d.id,
+        'title': d.title,
+        'content_raw': d.content_raw,
+        'saved_at': d.saved_at.strftime('%Y-%m-%dT%H:%M:%SZ')
+    } for d in drafts])

{openwrite-0.15.0 → openwrite-0.16.1}/openwrite/routes/dashboard.py

@@ -250,10 +250,10 @@ def new_post(name):
     u = g.db.query(User).filter_by(id=g.user).first()
     title = request.form.get('title')
     if len(title) > 120:
-        return render_template("new_post.html", blog=blog, error="title-too-long")
+        return render_template("new_post.html", blog=blog, error="title-too-long", form_data=request.form)
 
     if len(title) < 1:
-        return render_template("new_post.html", blog=blog, error="title-empty")
+        return render_template("new_post.html", blog=blog, error="title-empty", form_data=request.form)
 
     link = gen_link(title)
     if link == "rss":
@@ -276,7 +276,8 @@ def new_post(name):
         link=link,
         date=now,
         feed=request.form.get('feed'),
-        isdraft=request.form.get('draft', '0')
+        isdraft=request.form.get('draft', '0'),
+        comments_allowed=request.form.get('comments_allowed', '0')
     )
     g.db.add(post)
     g.db.flush()  # Get the post ID
@@ -392,7 +393,8 @@ def edit_post(blog, post):
 
     title = request.form.get("title")
     if len(title) > 120:
-        return render_template("new_post.html", blog=blog_obj, error="title-too-long")
+        existing_tags = get_post_tags(g.db, p) if p else []
+        return render_template("new_post.html", blog=blog_obj, post=p, existing_tags=existing_tags, error="title-too-long", form_data=request.form)
     link = gen_link(title)
     if link == "rss":
         link = "p_rss"
@@ -408,6 +410,7 @@ def edit_post(blog, post):
     p.content_html = sanitize_html(request.form.get("content"))
     p.author = request.form.get("author")
     p.feed = request.form.get("feed")
+    p.comments_allowed = request.form.get("comments_allowed", "0")
     p.link = link
     if request.form.get("publish") == "1":
         p.date = now

{openwrite-0.15.0 → openwrite-0.16.1}/openwrite/static/style/blog_design.css

@@ -256,6 +256,80 @@ i.caption {
     cursor: pointer;
 }
 
+.post-comments {
+    margin-top: 2rem;
+    padding-top: 1rem;
+    border-top: 1px solid #333;
+}
+
+.post-comments h3 {
+    margin-bottom: 1rem;
+}
+
+.comment-item {
+    margin: 1rem 0;
+    padding-bottom: 1rem;
+    border-bottom: 1px solid #222;
+}
+
+.comment-meta {
+    font-size: 0.85em;
+    color: #999;
+    margin-bottom: 0.3rem;
+}
+
+.comment-content {
+    white-space: pre-wrap;
+}
+
+.comment-empty {
+    color: #999;
+    font-size: 0.9em;
+}
+
+.comment-form {
+    margin-top: 1.5rem;
+}
+
+.comment-form input[type="text"],
+.comment-form textarea {
+    display: block;
+    width: 100%;
+    box-sizing: border-box;
+    margin-bottom: 0.5rem;
+    padding: 0.4rem;
+}
+
+.comment-form textarea {
+    resize: vertical;
+}
+
+.comment-form input[type="submit"] {
+    padding: 0.4rem 1rem;
+    cursor: pointer;
+}
+
+.comment-delete-form {
+    display: inline;
+    margin-left: 0.5rem;
+}
+
+.comment-delete {
+    background: none;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    font-size: 1em;
+    line-height: 1;
+    opacity: 0.4;
+    color: inherit;
+    vertical-align: middle;
+}
+
+.comment-delete:hover {
+    opacity: 1;
+}
+
 @media only screen and (max-width: 850px) {
     .container {
         width: 80% !important;

{openwrite-0.15.0 → openwrite-0.16.1}/openwrite/static/style/default.css

@@ -133,6 +133,61 @@ a.action:hover {
     text-decoration: underline;
 }
 
+.post-comments {
+    border-top: 1px solid #3333333b;
+}
+
+.comment-item {
+    border-bottom: 1px solid #3333333b;
+}
+
+.comment-meta {
+    color: #757575;
+}
+
+.comment-empty {
+    color: #757575;
+}
+
+.comment-form input[type="text"],
+.comment-form textarea {
+    background: #282c34;
+    border: 1px solid #3333333b;
+    color: #e6e6e6;
+    border-radius: 4px;
+    font-family: "IBMPlexSans";
+}
+
+.comment-form input[type="text"]:focus,
+.comment-form textarea:focus {
+    outline: none;
+    border-color: #af9cfb;
+}
+
+.comment-form input[type="submit"] {
+    background: #795EB5;
+    border: none;
+    color: #fff;
+    border-radius: 4px;
+    font-family: "IBMPlexSans";
+}
+
+.comment-form input[type="submit"]:hover {
+    background: #8f72cc;
+}
+
+.comment-form input[type="text"]::placeholder,
+.comment-form textarea::placeholder {
+    color: #555;
+}
+
+.comment-form {
+    background: #1a1a20;
+    border: 1px solid #3333333b;
+    border-radius: 4px;
+    padding: 1rem;
+}
+
 @media only screen and (max-width: 850px) {
     .content h1 {
         font-size: 30px !important;

{openwrite-0.15.0 → openwrite-0.16.1}/openwrite/static/style/themes/cyberpunk.css

@@ -384,6 +384,75 @@ p code {
     text-shadow: 0 0 5px rgba(255, 0, 255, 0.5);
 }
 
+.post-comments {
+    border-top: 1px solid rgba(0, 255, 255, 0.3);
+}
+
+.post-comments h3 {
+    color: #ff00ff;
+    text-shadow: 0 0 10px rgba(255, 0, 255, 0.3);
+    border-bottom: 2px solid rgba(255, 0, 255, 0.3);
+    padding-bottom: 0.5rem;
+}
+
+.comment-item {
+    border-bottom: 1px solid rgba(0, 255, 255, 0.1);
+}
+
+.comment-meta {
+    color: #888;
+}
+
+.comment-empty {
+    color: #888;
+}
+
+.comment-form input[type="text"],
+.comment-form textarea {
+    background: rgba(16, 16, 32, 0.8);
+    border: 1px solid rgba(0, 255, 255, 0.3);
+    color: #e0e0e0;
+    border-radius: 4px;
+    font-family: 'Courier New', monospace;
+}
+
+.comment-form input[type="text"]:focus,
+.comment-form textarea:focus {
+    outline: none;
+    border-color: #00ffff;
+    box-shadow: 0 0 8px rgba(0, 255, 255, 0.3);
+}
+
+.comment-form input[type="submit"] {
+    background: transparent;
+    border: 1px solid #00ffff;
+    color: #00ffff;
+    border-radius: 20px;
+    font-size: 0.8rem;
+    letter-spacing: 1px;
+    text-transform: uppercase;
+    transition: all 0.3s ease;
+}
+
+.comment-form input[type="submit"]:hover {
+    background: rgba(0, 255, 255, 0.1);
+    box-shadow: 0 0 15px rgba(0, 255, 255, 0.3);
+}
+
+.comment-form input[type="text"]::placeholder,
+.comment-form textarea::placeholder {
+    color: rgba(0, 255, 255, 0.35);
+    font-style: italic;
+}
+
+.comment-form {
+    border: 1px solid rgba(255, 0, 255, 0.2);
+    border-radius: 8px;
+    padding: 1.2rem;
+    background: rgba(255, 0, 255, 0.02);
+    box-shadow: inset 0 0 20px rgba(255, 0, 255, 0.03);
+}
+
 .postlist_item i.datetime {
     color: #888;
     font-size: 0.9rem;

openwrite-0.16.1/openwrite/static/style/themes/light.css

@@ -0,0 +1,111 @@
+@font-face {
+    font-family: 'IBMPlexSans';
+    src: url('/static/IBMPlexSans-Regular.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Merriweather';
+    src: url('/static/Merriweather.ttf') format('truetype');
+}
+
+
+body {
+    background: #efefef;
+    color: #464646;
+}
+
+article.post-content {
+    color: #3c3c3c;
+}
+
+article.post-content a {
+    color: #6834ab;
+}
+
+h1.blog-name {
+  font-family: "Merriweather";
+}
+
+h1.blog-name a {
+    color: #6834ab;
+}
+
+.header {
+    border-bottom: 1px solid #3333333b;
+    font-family: "IBMPlexSans";
+}
+
+.header #menu a {
+    color: #6834ab;
+    font-weight: bold;
+}
+
+.header #menu a:hover {
+    text-decoration: underline;
+    color: #6834ab;
+}
+
+i.post-date {
+    color: #505050;
+}
+
+svg {
+    fill: #6834ab;
+}
+
+pre code.hljs {
+    background: #fff;
+}
+
+.post-comments {
+    border-top: 1px solid #3333333b;
+}
+
+.comment-item {
+    border-bottom: 1px solid #3333331a;
+}
+
+.comment-meta {
+    color: #888;
+}
+
+.comment-empty {
+    color: #888;
+}
+
+.comment-form input[type="text"],
+.comment-form textarea {
+    background: #fff;
+    border: 1px solid #ccc;
+    color: #464646;
+    border-radius: 4px;
+}
+
+.comment-form input[type="text"]:focus,
+.comment-form textarea:focus {
+    outline: none;
+    border-color: #6834ab;
+}
+
+.comment-form input[type="submit"] {
+    background: #6834ab;
+    border: none;
+    color: #fff;
+    border-radius: 4px;
+}
+
+.comment-form input[type="submit"]:hover {
+    background: #7a3fc8;
+}
+
+.comment-form input[type="text"]::placeholder,
+.comment-form textarea::placeholder {
+    color: #aaa;
+}
+
+.comment-form {
+    background: #f5f5f5;
+    border: 1px solid #d0d0d0;
+    border-radius: 4px;
+    padding: 1rem;
+}

openwrite-0.16.1/openwrite/static/style/themes/obscura.css

@@ -0,0 +1,82 @@
+body {
+    background: #11111a;
+}
+
+h1.blog-name {
+    font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+}
+
+h1.blog-name a, article.blog-content h3, article.post-content a {
+    color: #e3bc5e;
+}
+
+div#menu a svg {
+    fill: #e3bc5e;
+}
+
+article.post-content {
+    color: #bbbaba;
+}
+
+h1.post-title {
+    color: #fff;
+}
+
+i.post-date {
+    color: #737373;
+}
+
+.post-comments {
+    border-top: 1px solid rgba(227, 188, 94, 0.3);
+}
+
+.post-comments h3 {
+    color: #e3bc5e;
+}
+
+.comment-item {
+    border-bottom: 1px solid rgba(227, 188, 94, 0.15);
+}
+
+.comment-meta {
+    color: #737373;
+}
+
+.comment-empty {
+    color: #737373;
+}
+
+.comment-form input[type="text"],
+.comment-form textarea {
+    background: #1a1a25;
+    border: 1px solid rgba(227, 188, 94, 0.3);
+    color: #bbbaba;
+    border-radius: 2px;
+}
+
+.comment-form input[type="text"]:focus,
+.comment-form textarea:focus {
+    outline: none;
+    border-color: #e3bc5e;
+}
+
+.comment-form input[type="submit"] {
+    background: transparent;
+    border: 1px solid #e3bc5e;
+    color: #e3bc5e;
+}
+
+.comment-form input[type="submit"]:hover {
+    background: rgba(227, 188, 94, 0.1);
+}
+
+.comment-form input[type="text"]::placeholder,
+.comment-form textarea::placeholder {
+    color: rgba(227, 188, 94, 0.3);
+}
+
+.comment-form {
+    background: rgba(227, 188, 94, 0.03);
+    border: 1px solid rgba(227, 188, 94, 0.15);
+    padding: 1rem;
+}