openwrite 0.11.0__tar.gz → 0.13.0__tar.gz

{openwrite-0.11.0 → openwrite-0.13.0}/MANIFEST.in

@@ -1,3 +1,6 @@
 include openwrite/utils/i18n.json
 recursive-include openwrite/templates *
 recursive-include openwrite/static *
+exclude logs/*
+exclude gemini/*
+exclude uploads/*

{openwrite-0.11.0/openwrite.egg-info → openwrite-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.11.0
+Version: 0.13.0
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -690,6 +690,7 @@ Dynamic: license-file
 ![logo](https://openwrite.io/static/logo.png)
 openwrite is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise.
 
+![PyPI - Downloads](https://img.shields.io/pypi/dw/openwrite)
 ![PyPI - Version](https://img.shields.io/pypi/v/openwrite)
 [![License: AGPL-3.0-or-later](https://img.shields.io/badge/License-AGPL--3.0--or--later-blue.svg)](LICENSE)
 ![pythonver](https://img.shields.io/badge/python%20version-3.11-blue)
@@ -703,6 +704,7 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Single-blog mode
 - Supports sqlite and mysql databases
 - Upload images to local storage or bunny cdn
+- Drafts
 - Simple markdown editor in posting
 - Discover section
 - Privacy: 
@@ -719,6 +721,8 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Gemini protocol
 - Statistics per post
 - Multilanguage (currently English and Polish)
+- Custom favicon per blog
+- Subpages per blog
 
 
 ## Installation

{openwrite-0.11.0 → openwrite-0.13.0}/README.md

@@ -1,6 +1,7 @@
 ![logo](https://openwrite.io/static/logo.png)
 openwrite is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise.
 
+![PyPI - Downloads](https://img.shields.io/pypi/dw/openwrite)
 ![PyPI - Version](https://img.shields.io/pypi/v/openwrite)
 [![License: AGPL-3.0-or-later](https://img.shields.io/badge/License-AGPL--3.0--or--later-blue.svg)](LICENSE)
 ![pythonver](https://img.shields.io/badge/python%20version-3.11-blue)
@@ -14,6 +15,7 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Single-blog mode
 - Supports sqlite and mysql databases
 - Upload images to local storage or bunny cdn
+- Drafts
 - Simple markdown editor in posting
 - Discover section
 - Privacy: 
@@ -30,6 +32,8 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Gemini protocol
 - Statistics per post
 - Multilanguage (currently English and Polish)
+- Custom favicon per blog
+- Subpages per blog
 
 
 ## Installation

{openwrite-0.11.0 → openwrite-0.13.0}/openwrite/__init__.py

@@ -32,7 +32,7 @@ def create_app(test_config=None):
         file_cwd = "/".join(f_abs_path.split("/")[:-1])
         from .utils.create_db import init_db
         init_db(db_type, db_path)
-        from .utils.models import User, Blog, Post, Settings, Home
+        from .utils.models import User, Blog, Post, Settings, Home, Page
         from .utils.db import init_engine, SessionLocal
         init_engine(db_type, db_path)
         from .utils.db import SessionLocal
@@ -68,15 +68,26 @@ def create_app(test_config=None):
                 title=domain, 
                 index="on", 
                 access="domain",
-                description_raw=f"![hello](https://openwrite.b-cdn.net/hello.jpg =500x258)\n\n# Hello there! 👋\n\nYou can edit your blog description in [dashboard](http://{domain}/dashboard/edit/default)",
-                description_html=f"<p><img src=\"https://openwrite.b-cdn.net/hello.jpg\" width=\"500\" height=\"258\"></p><h1>Hello there! 👋</h1><p>You can edit your blog description in <a href=\"http://{domain}/dashboard/edit/default\">dashboard</a></p>",
                 css="",
+                description_raw="x",
+                description_html="x",
                 pub_key=public_pem,
                 priv_key=private_pem,
                 theme="default",
+                favicon="",
                 created=now
             )
             SessionLocal.add(new_blog)
+            
+            new_page = Page(
+                blog=1,
+                name="Home",
+                url="",
+                content_raw=f"![hello](https://openwrite.b-cdn.net/hello.jpg =500x258)\n\n# Hello there! 👋\n\nYou can edit your blog home page in [dashboard](https://{domain}/dashboard/page/1/edit)\n\n---\n### Posts\n\n{{posts}}",
+                content_html=f"<p><img src=\"https://openwrite.b-cdn.net/hello.jpg\" width=\"500\" height=\"258\"></p><h1>Hello there! 👋</h1><p>You can edit your blog home page in <a href=\"https://{domain}/dashboard/page/1/edit\">dashboard</a></p>\n\n<hr>\n<h3>Posts\n\n{{posts}}",
+                show="0"
+            )
+            SessionLocal.add(new_page)
 
         hometext_pl = """
                  <h1 class="centered"><span style="color: #f2d2c8">cicha</span> przestrzeń na <span style="color: #5a36bf">głośne</span> myśli.</h1>

{openwrite-0.11.0 → openwrite-0.13.0}/openwrite/gemini_multi.py

@@ -1,10 +1,11 @@
 import os, subprocess
 from dotenv import load_dotenv
 from openwrite.utils.db import init_engine, SessionLocal
-from openwrite.utils.models import Blog, Post, User, View
+from openwrite.utils.models import Blog, Post, User, View, Page
 from openwrite.utils.helpers import anonymize
 from md2gemini import md2gemini
 from datetime import datetime, timezone
+import re
 session = None
 
 openwrite_logo = """
@@ -25,7 +26,7 @@ def root(req):
     resp += "In here you can read posts published.\n"
     resp += "\n## 🗞️ Latest posts:\n"
     try:
-        posts = (session.query(Post).filter_by(feed="1").order_by(Post.id.desc()).limit(10).all())
+        posts = (session.query(Post).filter(Post.feed == "1", Post.isdraft == "0").order_by(Post.id.desc()).limit(10).all())
         for p in posts:
             blog = session.query(Blog).filter_by(id=p.blog).first()
             resp += f"\n{p.date} - 📓 {blog.title}\n"
@@ -45,15 +46,24 @@ def blog_index(req):
                 if not blog:
                     return "not found"
                 posts = (session.query(Post)
-                                .filter_by(blog=blog.id)
-                                .order_by(Post.id.desc())
-                                .all())
+                        .filter_by(blog=blog.id, isdraft="0")
+                        .order_by(Post.id.desc())
+                        .all())
+                pages = (session.query(Page)
+                        .filter(Page.blog == blog.id, Page.show == "1").all())
+                homepage = session.query(Page).filter(Page.blog == blog.id, Page.url == "").first()
                 body = f"# 📓 {blog.title}\n\n"
-                body += md2gemini(blog.description_raw.replace("#", ""))
-                body += "\n--------------------------------------------------\n"
-                body += "### Posts:\n\n"
+                posts_data = ""
                 for post in posts:
-                    body += f"=> /b/{blogname}/{post.link} {post.title}\n"
+                    posts_data += f"=> /b/{blogname}/{post.link} {post.title}\n\n"
+                pages_data = ""
+                for page in pages:
+                    pages_data += f"=> /b/{blogname}/{page.url} {page.name}\n\n"
+                content = pages_data + "\n"
+                content += homepage.content_raw.replace('{posts}', f"\n{posts_data}")
+                content = re.sub(r'!\[(.*?)\]\((.*?)\s*=\d+x\d+\)', r'![\1](\2)', content)
+                body += md2gemini(content)
+                
                 return body
             finally:
                 session.close()
@@ -67,10 +77,19 @@ def blog_index(req):
                     return "not found"
 
                 post = (session.query(Post)
-                              .filter_by(blog=blog.id, link=slug)
+                              .filter_by(blog=blog.id, link=slug, isdraft="0")
                               .first())
                 if not post:
-                    return "not found"
+                    page = (session.query(Page)
+                              .filter_by(blog=blog.id, url=slug)
+                              .first())
+                    if page:
+                        content = f"=> /b/{blog.name} 📓 {blog.title}\n\n"
+                        content += page.content_raw
+                        content = re.sub(r'!\[(.*?)\]\((.*?)\s*=\d+x\d+\)', r'![\1](\2)', content)
+                        return md2gemini(content)
+                    else:
+                        return "not found"
                 user = session.query(User).filter_by(id=blog.owner).first()
 
                 now = datetime.now(timezone.utc)
@@ -88,7 +107,9 @@ def blog_index(req):
                 if post.author != "0":
                     gemtext += f"by {post.authorname}"
                 gemtext += "\n--------------------------------------------------\n"
-                gemtext += f"\n\n{md2gemini(post.content_raw)}"
+                content = post.content_raw
+                content = re.sub(r'!\[(.*?)\]\((.*?)\s*=\d+x\d+\)', r'![\1](\2)', content)
+                gemtext += f"\n\n{md2gemini(content)}\n\n"
                 return gemtext
               
             finally:

{openwrite-0.11.0 → openwrite-0.13.0}/openwrite/gemini_single.py

@@ -11,17 +11,28 @@ def blog_index(req):
     global session
     try:
         blog = session.query(Blog).filter_by(name="default").first()
-        posts = (session.query(Post)
+                if not blog:
+                    return "not found"
+                posts = (session.query(Post)
                         .filter_by(blog=blog.id)
                         .order_by(Post.id.desc())
                         .all())
-        body = f"# 📓 {blog.title}\n\n"
-        body += md2gemini(blog.description_raw.replace("#", ""))
-        body += "\n--------------------------------------------------\n"
-        body += "### Posts:\n\n"
-        for post in posts:
-            body += f"=> /p/{post.link} {post.title}\n"
-        return body
+                pages = (session.query(Page)
+                        .filter(Page.blog == blog.id, Page.show == "1").all())
+                homepage = session.query(Page).filter(Page.blog == blog.id, Page.url == "").first()
+                body = f"# 📓 {blog.title}\n\n"
+                posts_data = ""
+                for post in posts:
+                    posts_data += f"=> /b/{blogname}/{post.link} {post.title}\n\n"
+                pages_data = ""
+                for page in pages:
+                    pages_data += f"=> /b/{blogname}/{page.url} {page.name}\n\n"
+                content = pages_data + "\n"
+                content += homepage.content_raw.replace('{posts}', f"\n{posts_data}")
+                content = re.sub(r'!\[(.*?)\]\((.*?)\s*=\d+x\d+\)', r'![\1](\2)', content)
+                body += md2gemini(content)
+                
+                return body
     finally:
         session.close()
 
@@ -33,11 +44,23 @@ def blog_post(req):
         slug = path.split("/")[2]
         try:
             blog = session.query(Blog).filter_by(name="default").first()
+            if not blog:
+                return "not found"
+
             post = (session.query(Post)
-                          .filter_by(blog=blog.id, link=slug)
-                          .first())
+                            .filter_by(blog=blog.id, link=slug, isdraft="0")
+                            .first())
             if not post:
-                return "not found"
+                page = (session.query(Page)
+                            .filter_by(blog=blog.id, url=slug)
+                            .first())
+                if page:
+                    content = f"=> /b/{blog.name} 📓 {blog.title}\n\n"
+                    content += page.content_raw
+                    content = re.sub(r'!\[(.*?)\]\((.*?)\s*=\d+x\d+\)', r'![\1](\2)', content)
+                    return md2gemini(content)
+                else:
+                    return "not found"
             user = session.query(User).filter_by(id=blog.owner).first()
 
             now = datetime.now(timezone.utc)
@@ -55,7 +78,9 @@ def blog_post(req):
             if post.author != "0":
                 gemtext += f"by {post.authorname}"
             gemtext += "\n--------------------------------------------------\n"
-            gemtext += f"\n\n{md2gemini(post.content_raw)}"
+            content = post.content_raw
+            content = re.sub(r'!\[(.*?)\]\((.*?)\s*=\d+x\d+\)', r'![\1](\2)', content)
+            gemtext += f"\n\n{md2gemini(content)}\n\n"
             return gemtext
           
         finally:

{openwrite-0.11.0 → openwrite-0.13.0}/openwrite/routes/admin.py

@@ -1,4 +1,5 @@
-from flask import Blueprint, render_template, redirect, g, request
+from flask import Blueprint, render_template, redirect, g, request, make_response
+import json
 from openwrite.utils.models import Blog, User, Settings, Home
 import re
 import bcrypt
@@ -13,6 +14,9 @@ ALLOWED_EXTENSIONS = {"png", "jpg", "jpeg", "gif", "webp"}
 
 @admin_bp.route("/admin")
 def admin():
+    """
+    Admin dashboard to manage blogs and users.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -26,6 +30,9 @@ def admin():
 
 @admin_bp.route("/admin/delete_blog/<blog>")
 def admin_delete_blog(blog):
+    """
+    Delete a blog by its name.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -38,6 +45,9 @@ def admin_delete_blog(blog):
 
 @admin_bp.route("/admin/delete_user/<username>")
 def admin_delete_user(username):
+    """
+    Delete a user and all their blogs.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -59,6 +69,9 @@ def admin_delete_user(username):
 
 @admin_bp.route("/admin/make_admin/<username>")
 def admin_make_admin(username):
+    """
+    Grant admin privileges to a user.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -73,6 +86,9 @@ def admin_make_admin(username):
 
 @admin_bp.route("/admin/remove_admin/<username>")
 def admin_remove_admin(username):
+    """
+    Remove admin privileges from a user.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -90,6 +106,9 @@ def admin_remove_admin(username):
 
 @admin_bp.route("/admin/add_user", methods=['GET', 'POST'])
 def admin_add_user():
+    """
+    Add a new user to the system.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
     if request.method == "GET":
@@ -122,6 +141,9 @@ def admin_add_user():
 
 @admin_bp.route("/admin/settings", methods=['GET', 'POST'])
 def admin_settings():
+    """
+    Manage application settings.
+    """
     if g.user is None or g.isadmin == 0 or g.mode == "single":
         return redirect("/")
 
@@ -174,6 +196,14 @@ def admin_settings():
 
 @admin_bp.route("/admin/translations", methods=['GET', 'POST'])
 def translations():
+    """
+    Manage translations for the application.
+    Allows viewing, editing, and saving translations.
+    (I can't believe I didn't secured it earlier lol)
+    """
+    if g.user is None or g.isadmin == 0 or g.mode == "single":
+        return redirect("/")
+
     if request.method == "GET":
         trans = g.db.query(Home).filter_by(type="translation").all()
         grouped = defaultdict(dict)
@@ -198,3 +228,21 @@ def translations():
 
     g.db.commit()
     return redirect("/admin/translations")
+
+@admin_bp.route("/admin/download_translations")
+def download_translations():
+    """
+    Download all translations as a json file.
+    """
+    if g.user is None or g.isadmin == 0 or g.mode == "single":
+        return redirect("/")
+
+    translations = g.db.query(Home).filter_by(type="translation").all()
+    trans_dict = defaultdict(dict)
+    for t in translations:
+        trans_dict[t.language][t.name] = t.content
+    
+    response = make_response(json.dumps(dict(trans_dict), ensure_ascii=False))
+    response.headers["Content-Disposition"] = "attachment; filename=i18n.json"
+    response.headers["Content-Type"] = "application/json"
+    return response

{openwrite-0.11.0 → openwrite-0.13.0}/openwrite/routes/blog.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, render_template, redirect, request, g, Response, abort
-from openwrite.utils.models import Blog, Post, User, View, Like
+from openwrite.utils.models import Blog, Post, User, View, Like, Page
 from openwrite.utils.helpers import gen_link, sanitize_html, anonymize, get_ip
 from feedgen.feed import FeedGenerator
 from sqlalchemy import desc
@@ -20,10 +20,14 @@ def show_blog(blog):
     if blog.access == "domain":
         return redirect(f"https://{blog.name}.{os.getenv('DOMAIN')}/")
 
-    posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
     blog.url = f"/b/{blog.name}"
+    homepage = g.db.query(Page).filter(Page.blog == blog.id, Page.url == "").first()
+    if "{posts}" in homepage.content_raw:
+        posts = g.db.query(Post).filter(Post.blog == blog.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
+        return render_template("blog.html", blog=blog, page=homepage, posts=posts, pages=pages)
 
-    return render_template("blog.html", blog=blog, posts=posts)
+    return render_template("blog.html", blog=blog, page=homepage, pages=pages)
 
 @blog_bp.route("/", subdomain="<blog>")
 def show_subblog(blog):
@@ -36,9 +40,14 @@ def show_subblog(blog):
     if blog.access == "path":
         return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog.name}")
 
-    posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+    blog.url = f"https://{blog.name}.{os.getenv('DOMAIN')}"
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
+    homepage = g.db.query(Page).filter(Page.blog == blog.id, Page.url == "").first()
+    if "{posts}" in homepage.content_raw:
+        posts = g.db.query(Post).filter(Post.blog == blog.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
+        return render_template("blog.html", blog=blog, page=homepage, posts=posts, pages=pages)
 
-    return render_template("blog.html", blog=blog, posts=posts)
+    return render_template("blog.html", blog=blog, page=homepage, pages=pages)
 
 @blog_bp.route("/b/<blog>/<post>")
 def show_post(blog, post):
@@ -54,9 +63,21 @@ def show_post(blog, post):
     if blog.access == "domain":
         return redirect(f"https://{blog.name}.{os.getenv('DOMAIN')}/{post}")
 
-    one_post = g.db.query(Post).filter(Post.blog == blog.id, Post.link == post).first()
+    blog.url = f"/b/{blog.name}"
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
+    one_post = g.db.query(Post).filter(Post.blog == blog.id, Post.link == post, Post.isdraft == "0").first()
     if not one_post:
-        return redirect("/")
+        page = g.db.query(Page).filter(Page.blog == blog.id, Page.url == post).first()
+        if not page:
+            return redirect("/")
+
+        if "{posts}" in page.content_raw:
+            posts = g.db.query(Post).filter(Post.blog == blog.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
+
+            return render_template("blog.html", blog=blog, page=page, posts=posts, pages=pages)
+        
+        return render_template("blog.html", blog=blog, page=page, pages=pages)
+
 
     post_author = g.db.query(User).filter_by(id=blog.owner).first()
     one_post.authorname = post_author.username
@@ -76,7 +97,7 @@ def show_post(blog, post):
     one_post.liked = liked
 
     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)
+    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, likes=likes, pages=pages)
 
 @blog_bp.route("/<post>", subdomain="<blog>")
 def show_subpost(blog, post):
@@ -92,9 +113,22 @@ def show_subpost(blog, post):
     if blog.access == "path":
         return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog.name}/{post}")
 
-    one_post = g.db.query(Post).filter(Post.blog == blog.id, Post.link == post).first()
+    blog.url = f"https://{blog.name}.{os.getenv('DOMAIN')}"
+
+    pages = g.db.query(Page).filter_by(blog=blog.id).all()
+    one_post = g.db.query(Post).filter(Post.blog == blog.id, Post.link == post, Post.isdraft == "0").first()
+
     if not one_post:
-        return redirect("/")
+        page = g.db.query(Page).filter(Page.blog == blog.id, Page.url == post).first()
+        if not page:
+            return redirect("/")
+
+        if "{posts}" in page.content_raw:
+            posts = g.db.query(Post).filter(Post.blog == blog.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
+
+            return render_template("blog.html", blog=blog, page=page, posts=posts, pages=pages)
+        
+        return render_template("blog.html", blog=blog, page=page, pages=pages)
 
     post_author = g.db.query(User).filter_by(id=blog.owner).first()
     one_post.authorname = post_author.username
@@ -115,7 +149,7 @@ def show_subpost(blog, post):
     one_post.liked = liked
 
     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)
+    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, pages=pages)
 
 @blog_bp.route("/p/<post>")
 def single_showpost(post):
@@ -123,9 +157,22 @@ def single_showpost(post):
         return redirect("/")
 
     blog = g.db.query(Blog).filter_by(id=1).first()
-    one_post = g.db.query(Post).filter(Post.blog == 1, Post.link == post).first()
+    blog.url = f"http://{g.main_domain}"
+    one_post = g.db.query(Post).filter(Post.blog == 1, Post.link == post, Post.isdraft == "0").first()
+
+    pages = g.db.query(Page).filter_by(blog=1).all()
+
     if not one_post:
-        return redirect("/")
+        page = g.db.query(Page).filter(Page.blog == blog.id, Page.url == post).first()
+        if not page:
+            return redirect("/")
+
+        if "{posts}" in page.content_raw:
+            posts = g.db.query(Post).filter(Post.blog == blog.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
+
+            return render_template("blog.html", blog=blog, page=page, posts=posts, pages=pages)
+        
+        return render_template("blog.html", blog=blog, page=page, pages=pages)
 
     post_author = g.db.query(User).filter_by(id=1).first()
     one_post.authorname = post_author.username
@@ -145,7 +192,7 @@ def single_showpost(post):
     one_post.liked = liked
 
     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)
+    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, pages=pages)
 
 @blog_bp.route("/rss")
 def single_rss():
@@ -186,7 +233,7 @@ def like():
     
 
 def _generate_rss(blog):
-    posts = g.db.query(Post).filter_by(blog=blog.id).all()
+    posts = g.db.query(Post).filter(Post.blog == blog.id, Post.isdraft == "0").all()
     fg = FeedGenerator()
     fg.title(blog.title)
     fg.link(href=f"https://{os.getenv('DOMAIN')}/b/{blog.name}", rel="alternate")