openwrite 0.14.0__tar.gz → 0.15.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.14.0
+Version: 0.15.0
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -689,13 +689,13 @@ Requires-Dist: redis
 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)
-![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/openwriteio/openwrite/python-tests.yml)
 
 ---
 
@@ -715,7 +715,7 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Lightweight
 - No tracking, only data collected is anonymized(hashed) IP for post view counting and likes
 - Custom CSS per blog
-- Federation using ActivityPub protocol: Follow and Like
+- Federation using ActivityPub protocol
 - Likes system
 - Posts importing from xml/csv
 - Blog themes
@@ -724,6 +724,8 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Multilanguage (currently English and Polish)
 - Custom favicon per blog
 - Subpages per blog
+- Valkey support
+- Post tags, filtering
 
 
 ## Installation

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

@@ -1,11 +1,11 @@
 ![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)
-![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/openwriteio/openwrite/python-tests.yml)
 
 ---
 
@@ -25,7 +25,7 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Lightweight
 - No tracking, only data collected is anonymized(hashed) IP for post view counting and likes
 - Custom CSS per blog
-- Federation using ActivityPub protocol: Follow and Like
+- Federation using ActivityPub protocol
 - Likes system
 - Posts importing from xml/csv
 - Blog themes
@@ -34,6 +34,8 @@ openwrite is a minimalist blogging platform built for writing freely, hosting in
 - Multilanguage (currently English and Polish)
 - Custom favicon per blog
 - Subpages per blog
+- Valkey support
+- Post tags, filtering
 
 
 ## Installation

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

@@ -25,17 +25,21 @@ def create_app(test_config=None):
         db_path = test_config.get("DB_PATH", "data.db")
         load_dotenv(test_config.get("env"), override=True)
 
+    # Always run database migrations to ensure schema is up to date
+    from .utils.create_db import init_db
+    init_db(db_type, db_path)
+    
+    # Initialize database engine and session
+    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
+
     if not os.path.exists(".initialized") or test_config is not None:
         mode = os.getenv("MODE")
         domain = os.getenv("DOMAIN")
         f_abs_path = os.path.abspath(__file__)
         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, Page
-        from .utils.db import init_engine, SessionLocal
-        init_engine(db_type, db_path)
-        from .utils.db import SessionLocal
         admin_password = os.urandom(16).hex()
         hashed = bcrypt.hashpw("openwrite".encode("utf-8"), bcrypt.gensalt())
         admin_user = User(username="admin", email="", password_hash=hashed.decode("utf-8"), verified=1, admin=1)
@@ -171,14 +175,10 @@ def create_app(test_config=None):
     from .routes.main import main_bp
     from .routes.upload import upload_bp
     from .routes.federation import federation_bp
-    from .utils.db import init_engine, SessionLocal
     from flask_cors import CORS
     
     CORS(app)
 
-    init_engine(db_type, db_path)    
-    from .utils.db import SessionLocal
-
     app.register_blueprint(auth_bp)
     app.register_blueprint(dashboard_bp)
     app.register_blueprint(blog_bp)
@@ -212,7 +212,7 @@ def create_app(test_config=None):
 
         trans = g.db.query(Home).filter(Home.type == "translation", Home.language == lang).all()
         
-        g.version = "0.14.0"
+        g.version = "0.15.0"
         g.mode = os.getenv("MODE")
         f_abs_path = os.path.abspath(__file__)
         g.mainpath = "/".join(f_abs_path.split("/")[:-1])

{openwrite-0.14.0 → openwrite-0.15.0}/openwrite/gemini_multi.py

@@ -22,8 +22,10 @@ def root(req):
     global session
     resp = f"```\n{openwrite_logo}\n```"
     resp += "\nopenwrite.io is a minimalist blogging platform built for writing freely, hosting independently, and publishing without noise. To create your own blog, visit:\n"
-    resp += "=> https://openwrite.io openwrite.io\n"
+    resp += "=> https://openwrite.io https://openwrite.io\n"
     resp += "In here you can read posts published.\n"
+    resp += "If you want to list all blogs (that did not disable indexing) find them in the link below:\n"
+    resp += "=> /blogs All Blogs list"
     resp += "\n## 🗞️ Latest posts:\n"
     try:
         posts = (session.query(Post).filter(Post.feed == "1", Post.isdraft == "0").order_by(Post.id.desc()).limit(10).all())
@@ -36,6 +38,20 @@ def root(req):
     finally:
         session.close()
 
+def all_blogs(req):
+    global session
+    blogs = session.query(Blog).filter_by(index='on').order_by(Blog.title).all()
+    resp = "Here you will find a list of all blogs in openwrite that did not disable their indexing:\n"
+    resp += "\n"
+    for b in blogs:
+        posts = session.query(Post).filter_by(blog=b.id).count()
+        last = session.query(Post).filter_by(blog=b.id).order_by(Post.date.desc()).first()
+        resp += f"=> /b/{b.name} {b.title} \n"
+        resp += f"Posts: {posts}\n"
+        resp += f"Last posted: {last.date if last is not None else 'never'}\n\n"
+
+    return resp
+
 def blog_index(req):                                                                           
         global session
         path = req.path
@@ -134,3 +150,7 @@ def init(capsule):
     capsule.add("/b/*",
         blog_index,
         protocol='gemini')
+
+    capsule.add("/blogs",
+                all_blogs,
+                protocol='gemini')

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

@@ -19,7 +19,7 @@ def register():
         return render_template('register.html')
 
     form_username = request.form.get('username')
-    if not re.match(r"^[a-zA-Z0-9](?:[a-zA-Z0-9_-]{1,28}[a-zA-Z0-9])?$", form_username):
+    if not re.match(r"^[a-zA-Z0-9](?:[a-zA-Z0-9_-]{1,28}[a-zA-Z0-9])+$", form_username):
         return render_template('register.html', error=g.trans['wrong_username'])
     form_password = request.form.get('password')
     form_password2 = request.form.get('password2')

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

@@ -1,5 +1,6 @@
-from flask import Blueprint, render_template, redirect, request, g, Response, abort
+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 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
 from feedgen.feed import FeedGenerator
@@ -12,6 +13,26 @@ from datetime import timezone, datetime
 
 blog_bp = Blueprint("blog", __name__)
 
+def process_posts_content(page, blog_id, blog_url, domain):
+    posts_matches = re.findall(r'{posts[^}]*}', page.content_raw)
+    if not posts_matches:
+        return [], page.content_html
+        
+    posts_syntax = posts_matches[0]
+    tag_names = parse_tags_from_posts_syntax(posts_syntax)
+    posts = get_posts_by_tags(g.db, blog_id, tag_names)
+    
+    posts_html = ""
+    for post in posts:
+        post_url = f"{blog_url}/{post.link}"
+        posts_html += f'<div class="postlist_item"><i class="datetime">{post.date}</i> - <a href="{post_url}">{post.title}</a></div>'
+    
+    processed_content = page.content_html
+    for match in posts_matches:
+        processed_content = processed_content.replace(match, posts_html)
+        
+    return posts, processed_content
+
 def create_activity_object(post, blog, url, full_content=True):
     """Create ActivityPub object (Article or Note) based on post content length"""
     dt = datetime.strptime(str(post.date), "%Y-%m-%d %H:%M:%S")
@@ -139,11 +160,9 @@ def show_blog(blog):
     pages = g.db.query(Page).filter_by(blog=blog_obj.id).all()
     blog_obj.url = f"/b/{blog_obj.name}"
     homepage = g.db.query(Page).filter(Page.blog == blog_obj.id, Page.url == "").first()
-    if "{posts}" in homepage.content_raw:
-        posts = g.db.query(Post).filter(Post.blog == blog_obj.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
-        return render_template("blog.html", blog=blog_obj, page=homepage, posts=posts, pages=pages)
-
-    return render_template("blog.html", blog=blog_obj, page=homepage, pages=pages)
+    
+    posts, processed_content = process_posts_content(homepage, blog_obj.id, blog_obj.url, g.main_domain)
+    return render_template("blog.html", blog=blog_obj, page=homepage, posts=posts, pages=pages, processed_content=processed_content)
 
 @blog_bp.route("/", subdomain="<blog>")
 def show_subblog(blog):
@@ -167,11 +186,9 @@ def show_subblog(blog):
     blog_obj.url = f"https://{blog_obj.name}.{os.getenv('DOMAIN')}"
     pages = g.db.query(Page).filter_by(blog=blog_obj.id).all()
     homepage = g.db.query(Page).filter(Page.blog == blog_obj.id, Page.url == "").first()
-    if "{posts}" in homepage.content_raw:
-        posts = g.db.query(Post).filter(Post.blog == blog_obj.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
-        return render_template("blog.html", blog=blog_obj, page=homepage, posts=posts, pages=pages)
-
-    return render_template("blog.html", blog=blog_obj, page=homepage, pages=pages)
+    
+    posts, processed_content = process_posts_content(homepage, blog_obj.id, blog_obj.url, g.main_domain)
+    return render_template("blog.html", blog=blog_obj, page=homepage, posts=posts, pages=pages, processed_content=processed_content)
 
 @blog_bp.route("/b/<blog>/<post>")
 def show_post(blog, post):
@@ -182,7 +199,7 @@ def show_post(blog, post):
         return redirect("/")
 
     if post == "rss":
-        return _generate_rss(blog_obj)
+        return serve_rss(blog_obj)
 
     if blog_obj.access == "domain":
         return redirect(f"https://{blog_obj.name}.{os.getenv('DOMAIN')}/{post}")
@@ -196,11 +213,8 @@ def show_post(blog, post):
         if not page:
             return redirect("/")
 
-        if "{posts}" in page.content_raw:
-            posts = g.db.query(Post).filter(Post.blog == blog_obj.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
-            return render_template("blog.html", blog=blog_obj, page=page, posts=posts, pages=pages)
-        
-        return render_template("blog.html", blog=blog_obj, page=page, pages=pages)
+        posts, processed_content = process_posts_content(page, blog_obj.id, blog_obj.url, g.main_domain)
+        return render_template("blog.html", blog=blog_obj, page=page, posts=posts, pages=pages, processed_content=processed_content)
 
     if is_activitypub_request():
         url = f"https://{g.main_domain}/b/{blog}"
@@ -240,8 +254,10 @@ def show_post(blog, post):
     one_post.likes = likes
     one_post.liked = liked
 
+    post_tags = get_post_tags(g.db, one_post)
+
     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)
+    return render_template("post.html", blog=blog_obj, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags)
 
 @blog_bp.route("/<post>", subdomain="<blog>")
 def show_subpost(blog, post):
@@ -252,7 +268,7 @@ def show_subpost(blog, post):
         return redirect(f"https://{os.getenv('DOMAIN')}/")
 
     if post == "rss":
-        return _generate_rss(blog_obj)
+        return serve_rss(blog_obj)
 
     if blog_obj.access == "path":
         return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog_obj.name}/{post}")
@@ -267,11 +283,8 @@ def show_subpost(blog, post):
         if not page:
             return redirect("/")
 
-        if "{posts}" in page.content_raw:
-            posts = g.db.query(Post).filter(Post.blog == blog_obj.id, Post.isdraft == "0").order_by(desc(Post.id)).all()
-            return render_template("blog.html", blog=blog_obj, page=page, posts=posts, pages=pages)
-        
-        return render_template("blog.html", blog=blog_obj, page=page, pages=pages)
+        posts, processed_content = process_posts_content(page, blog_obj.id, blog_obj.url, g.main_domain)
+        return render_template("blog.html", blog=blog_obj, page=page, posts=posts, pages=pages, processed_content=processed_content)
 
     if is_activitypub_request():
         url = f"https://{blog}.{g.main_domain}"
@@ -310,9 +323,11 @@ def show_subpost(blog, post):
 
     one_post.likes = likes
     one_post.liked = liked
+ 
+    post_tags = get_post_tags(g.db, one_post)
 
     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)
+    return render_template("post.html", blog=blog_obj, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags)
 
 @blog_bp.route("/.well-known/webfinger")
 def webfinger():
@@ -382,12 +397,8 @@ def single_showpost(post):
         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)
+        posts, processed_content = process_posts_content(page, blog.id, blog.url, g.main_domain)
+        return render_template("blog.html", blog=blog, page=page, posts=posts, pages=pages, processed_content=processed_content)
 
     if is_activitypub_request():
         url = f"https://{g.main_domain}"
@@ -426,8 +437,10 @@ def single_showpost(post):
     one_post.likes = likes
     one_post.liked = liked
 
+    post_tags = get_post_tags(g.db, one_post)
+
     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)
+    return render_template("post.html", blog=blog, post=one_post, user=user, views=v, likes=likes, pages=pages, post_tags=post_tags)
 
 @blog_bp.route("/rss")
 def single_rss():
@@ -435,7 +448,7 @@ def single_rss():
         return redirect("/")
 
     blog = g.db.query(Blog).first()
-    return _generate_rss(blog)
+    return serve_rss(blog)
 
 @blog_bp.route("/like", methods=["POST"])
 def like():
@@ -483,29 +496,11 @@ def like():
         status = 201
     
     return resp, status
-    
 
-def _generate_rss(blog):
-    posts = g.db.query(Post).filter(Post.blog == blog.id, Post.isdraft == "0").all()
-    fg = FeedGenerator()
-    fg.title(blog.title)
-    
-    if blog.access == "domain":
-        blog_url = f"https://{blog.name}.{g.main_domain}"
-        post_base_url = blog_url
-    else:
-        blog_url = f"https://{g.main_domain}/b/{blog.name}"
-        post_base_url = blog_url
-    
-    fg.link(href=blog_url, rel="alternate")
-    fg.description(blog.description_html)
-
-    for p in posts:
-        soup = BeautifulSoup(p.content_html, "html.parser")
-        fe = fg.add_entry()
-        fe.title(p.title)
-        fe.link(href=f"{post_base_url}/{p.link}")
-        fe.description(soup.get_text())
-        fe.published(p.date.replace(tzinfo=timezone.utc))
-
-    return Response(fg.rss_str(pretty=True).decode("utf-8"), mimetype="application/rss+xml")
+
+
+def serve_rss(blog):
+    """
+    Here we just serve static RSS files :)
+    """
+    return send_file(f"{g.mainpath}/static/feed/{blog.name}.xml")

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

@@ -1,6 +1,7 @@
 from flask import Blueprint, render_template, redirect, request, g, abort, Response
-from openwrite.utils.models import Blog, Post, User, View, Like, Page
+from openwrite.utils.models import Blog, Post, User, View, Like, Page, Settings, Tag, PostTag
 from openwrite.utils.helpers import sanitize_html, gen_link, safe_css, send_activity, is_html, get_themes
+from openwrite.utils.tags import parse_tags_from_input, update_post_tags, get_post_tags
 from openwrite.routes.blog import create_activity_object, create_person_object
 from openwrite.utils.valkey_client import valkey_client
 import requests
@@ -17,6 +18,7 @@ from user_agents import parse
 import re
 import csv
 from io import StringIO
+from feedgen.feed import FeedGenerator
 
 dashboard_bp = Blueprint("dashboard", __name__)
 
@@ -277,6 +279,14 @@ def new_post(name):
         isdraft=request.form.get('draft', '0')
     )
     g.db.add(post)
+    g.db.flush()  # Get the post ID
+    
+    # Handle tags
+    tags_input = request.form.get('tags', '').strip()
+    if tags_input:
+        tag_names = parse_tags_from_input(tags_input)
+        update_post_tags(g.db, post, tag_names)
+    
     g.db.commit()
     
     if blog.access == "domain":
@@ -308,7 +318,8 @@ def new_post(name):
                     valkey_client.queue_federation_activity(activity, blog.id, blog.priv_key, blog_url, f"{actor}/inbox")
                 else:
                     send_activity(activity, blog.priv_key, blog_url, f"{actor}/inbox")
-        
+
+    generate_rss(blog.name)
     return redirect(f"/dashboard/edit/{blog.name}")
 
 @dashboard_bp.route("/dashboard/preview", methods=['POST'])
@@ -342,11 +353,18 @@ def blog_preview():
         abort(404)
 
     homepage = g.db.query(Page).filter(Page.blog == blog.id, Page.url == "").first()
+    
+    # Process content to handle {posts} patterns with tags
+    content = homepage.content_html
+    if '{posts}' in content:
+        # Replace all {posts} patterns (including {posts:#tags}) with placeholder
+        content = re.sub(r'{posts[^}]*}', '{posts}', content)
+    
     data = {
         'title': request.form.get('title'),
         'css': request.form.get('css'),
         'icon': request.form.get('icon'),
-        'content': homepage.content_html,
+        'content': content,
         'theme': request.form.get('theme')
     }
 
@@ -364,7 +382,9 @@ def edit_post(blog, post):
 
     e_post = g.db.query(Post).filter_by(link=post).first()
     if request.method == "GET":
-        return render_template("new_post.html", blog=blog_obj, post=e_post)
+        # Get existing tags for the post
+        existing_tags = get_post_tags(g.db, e_post) if e_post else []
+        return render_template("new_post.html", blog=blog_obj, post=e_post, existing_tags=existing_tags)
 
     p = g.db.query(Post).filter_by(link=post, blog=blog_obj.id).first()
     if not p:
@@ -394,6 +414,12 @@ def edit_post(blog, post):
     else:
         p.updated = now
     p.isdraft = request.form.get("draft", "0")
+    
+    # Handle tags
+    tags_input = request.form.get('tags', '').strip()
+    tag_names = parse_tags_from_input(tags_input)
+    update_post_tags(g.db, p, tag_names)
+    
     g.db.commit()
     
     if blog_obj.access == "domain":
@@ -425,6 +451,7 @@ def edit_post(blog, post):
             else:
                 send_activity(update_activity, blog_obj.priv_key, blog_url, f"{actor}/inbox")
 
+    generate_rss(blog)
     return redirect(f"/dashboard/edit/{blog}")
 
 @dashboard_bp.route("/dashboard/edit/<blog>/<post>/delete")
@@ -475,6 +502,7 @@ def delete_post(blog, post):
         g.db.delete(p)
         g.db.commit()
 
+    generate_rss(blog)
     return redirect(f"/dashboard/edit/{blog_obj.name}")
 
 
@@ -535,6 +563,7 @@ def migrate():
         g.db.add(new_post)
         g.db.commit()
 
+    generate_rss(blog.name)
     return "ok", 200
 
 @dashboard_bp.route("/dashboard/stats/<blog>")
@@ -675,9 +704,15 @@ def page_preview():
     if g.user is None:
         return redirect("/")
 
+    # Process content to handle {posts} patterns with tags
+    content = sanitize_html(request.form.get('content'))
+    if '{posts}' in content:
+        # Replace all {posts} patterns (including {posts:#tags}) with placeholder
+        content = re.sub(r'{posts[^}]*}', '{posts}', content)
+
     data = {
         'name': request.form.get('name'),
-        'content': sanitize_html(request.form.get('content')),
+        'content': content,
         'blog_title': request.form.get('blog_title'),
         'blog_name': request.form.get('blog_name'),
         'theme': request.form.get('theme')
@@ -744,3 +779,39 @@ def export_posts(blog):
             'Content-Disposition': f'attachment; filename={blog}_posts.csv'
         }
     )
+
+def generate_rss(blog):
+    """
+    Function to generate new static RSS feeds
+    """
+    b = g.db.query(Blog).filter_by(name=blog).first()
+    fg = FeedGenerator()
+    fg.ttl(5)
+    fg.logo("https://openwrite.io/static/logo.png")
+    fg.image(url="https://openwrite.io/static/favicon.png")
+    fg.title(b.title)
+
+    if b.access == "domain":
+        blog_url = f"https://{b.name}.{g.main_domain}"
+        post_base_url = blog_url
+    else:
+        blog_url = f"https://{g.main_domain}/b/{b.name}"
+        post_base_url = blog_url
+
+    fg.link(href=blog_url, rel="alternate")
+    soup = BeautifulSoup(b.description_html, "html.parser")
+    fg.description(soup.get_text())
+
+    posts = g.db.query(Post).filter(Post.blog == b.id, Post.isdraft == "0").limit(10).all()
+    for p in posts:
+        soup = BeautifulSoup(p.content_html, "html.parser")
+        content = soup.get_text()
+        fe = fg.add_entry()
+        fe.title(p.title)
+        fe.link(href=f"{post_base_url}/{p.link}")
+        fe.description(" ".join(content.split(" ")[:30]) + "...", True)
+        fe.content(content=p.content_html, type="CDATA")
+        fe.published(p.date.replace(tzinfo=timezone.utc))
+
+    rssfeed = fg.rss_str(pretty=True)
+    fg.rss_file(f"{g.mainpath}/static/feed/{b.name}.xml")

{openwrite-0.14.0 → openwrite-0.15.0}/openwrite/routes/main.py

@@ -3,7 +3,9 @@ import os
 import json
 import datetime
 import requests
-from openwrite.utils.models import Post, Blog, Home, Settings, Page, Like
+import re
+from openwrite.utils.models import Blog, Post, User, View, Like, Page, Settings, Home
+from openwrite.utils.tags import parse_tags_from_posts_syntax, get_posts_by_tags
 from openwrite.routes.blog import create_person_object, is_activitypub_request
 import time
 from openwrite import start_time
@@ -24,7 +26,6 @@ def index():
     elif g.mode == "single":
         blog = g.db.query(Blog).filter_by(name="default").first()
         
-        # Check for ActivityPub request
         if is_activitypub_request():
             blog_url = f"https://{g.main_domain}"
             person = create_person_object(blog, blog_url)
@@ -36,11 +37,33 @@ def index():
         blog.url = f"http://{g.main_domain}"
         page = g.db.query(Page).filter_by(blog=blog.id, url="").first()
         pages = g.db.query(Page).filter_by(blog=blog.id).all()
+        
         if '{posts}' in page.content_raw:
-            posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
-            return render_template('blog.html', blog=blog, page=page, posts=posts, pages=pages)
-        posts = g.db.query(Post).filter_by(blog=blog.id).all()
-        return render_template('blog.html', blog=blog, posts=posts, page=page, pages=pages)
+            posts_matches = re.findall(r'{posts[^}]*}', page.content_raw)
+            if posts_matches:
+                posts_syntax = posts_matches[0]
+                tag_names = parse_tags_from_posts_syntax(posts_syntax)
+                posts = get_posts_by_tags(g.db, blog.id, tag_names)
+                
+                posts_html = ""
+                for post in posts:
+                    if g.mode == "multi":
+                        post_url = f"{blog.url}/{post.link}"
+                    else:
+                        post_url = f"http://{g.main_domain}/p/{post.link}"
+                    posts_html += f'<div class="postlist_item"><i class="datetime">{post.date}</i> - <a href="{post_url}">{post.title}</a></div>'
+                
+                processed_content = page.content_html
+                for match in posts_matches:
+                    processed_content = processed_content.replace(match, posts_html)
+            else:
+                posts = g.db.query(Post).filter_by(blog=blog.id, isdraft='0').order_by(desc(Post.id)).all()
+                processed_content = page.content_html
+                
+            return render_template('blog.html', blog=blog, page=page, posts=posts, pages=pages, processed_content=processed_content)
+        
+        posts = g.db.query(Post).filter_by(blog=blog.id, isdraft='0').all()
+        return render_template('blog.html', blog=blog, posts=posts, page=page, pages=pages, processed_content=page.content_html)
 
 @main_bp.route("/set-lang/<lang_code>")
 def set_lang(lang_code):

openwrite-0.15.0/openwrite/static/feed/74.xml

@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"><channel><title>Kierunkowy74</title><link>https://74.openwrite.io</link><description>x</description><docs>http://www.rssboard.org/rss-specification</docs><generator>python-feedgen</generator><image><url>https://openwrite.io/static/favicon.png</url><title>Kierunkowy74</title><link>https://74.openwrite.io</link></image><lastBuildDate>Sat, 13 Sep 2025 16:34:24 +0000</lastBuildDate><ttl>5</ttl><item><title>Pierwsze wrażenia na openwrite</title><link>https://74.openwrite.io/pierwsze-wrazenia-na-openwrite</link><description>Ponieważ cały FTdL jest teraz nieczynny (a w związku z tym również i polskie WriteFreely) nastąpiła pora sprawdzić świeżo powstałe openwrite. 
+Muszę zmartwić tych, którzy chcieliby zaobserwować blog przez np....</description><content:encoded><![CDATA[<p><del>Ponieważ cały FTdL jest teraz nieczynny (a w związku z tym również i polskie WriteFreely)</del> nastąpiła pora sprawdzić świeżo powstałe openwrite. </p>
+<p><del>Muszę zmartwić tych, którzy chcieliby zaobserwować blog przez np. Mastodona, bo <strong>federacji na tę chwilę jeszcze nie ma</strong></del> federacja jest, zaobserwujesz mnie z np. Mastodona jako @74@openwrite.io . Tak, są <em>lajki</em> - ale <del>skoro openwrite nie jest jeszcze fedi, to</del> ten wpis można zalajkować… z ulicy.</p>
+<p>Różnic z WriteFreely jest więcej. openwrite nie jest tak minimalistyczny jak jego rywal i wiele rzecz pozwala po prostu wyklikać.  <img src="https://openwrite.b-cdn.net/cf1167fc770ab887cdd2f26a4466ed5c.png" alt="Interfejs openwrite"></p>
+<p>Są przyciski do wstawiania formatowania Markdown. Można normalnie zamieścić obrazek, który będzie znajdował się na openwrite. (czyli nie musisz jak na WriteFreely korzystać z serwisów zewnętrznych do podlinkowania obrazka) Jest możliwość by dołączyć informacje o autorze (nazwa użytkownika). Jest podgląd.</p>
+<p>Można sobie wyklikać motyw lub zrobić własny CSS. Są dostępne statystyki, które są bardziej rozbudowane niż na WriteFreely. Można zobaczyć sobie liczbę wyświetleń na wykresie, w tym według przeglądarki i systemu operacyjnego.</p>
+<h3>Czego brakuje?</h3>
+<p>Na pewno federacji, chociaż (jak wynika z opisu na GitHubie) powinna być. Szkiców i autozapisu. Wpisów publikowanych według harmonogramu (ale wypadałoby wspomnieć, że na WriteFreely takie wpisy nie federują i ślamazarny rozwój WF nie daje wielkich nadziei na zmianę). W końcu zaś biuletynów, tudzież subskrypcji mailem.</p>
+<p>A, i przy okazji zauważyłem jedną usterkę. Dodanie przyciskiem np. <strong>pogrubienia</strong>, <em>kursywy</em> lub <u>przekreślenia</u> dodaje znaczniki początkowy i końcowy, ale umieszcza kursor po nich, a nie pomiędzy nimi. Edytor Markdown w np. PieFedzie robi to lepiej. (edycja: druga - da się dodać wpis bez tytułu. W Odkrywaj wpis będzie bez tytułu i nie będzie dało się weń kliknąć xd)</p>
+<p>Serwis na pewno jest ciekawy. No i chyba tyle.</p>
+<h1>Czy ten wpis jest widoczny na Gemini?</h1>]]></content:encoded><pubDate>Fri, 18 Jul 2025 11:07:52 +0000</pubDate></item></channel></rss>

openwrite-0.15.0/openwrite/static/feed/a.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"><channel><title>A</title><link>https://openwrite.io/b/a</link><description>Hello there! 👋You can edit your blog description in dashboard</description><docs>http://www.rssboard.org/rss-specification</docs><generator>python-feedgen</generator><image><url>https://openwrite.io/static/favicon.png</url><title>A</title><link>https://openwrite.io/b/a</link></image><lastBuildDate>Sat, 13 Sep 2025 16:34:24 +0000</lastBuildDate><ttl>5</ttl></channel></rss>

openwrite-0.15.0/openwrite/static/feed/anim3sh1t.xml

@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"><channel><title>4nim3 typ3 sh1ft</title><link>https://anim3sh1t.openwrite.io</link><description>x</description><docs>http://www.rssboard.org/rss-specification</docs><generator>python-feedgen</generator><image><url>https://openwrite.io/static/favicon.png</url><title>4nim3 typ3 sh1ft</title><link>https://anim3sh1t.openwrite.io</link></image><lastBuildDate>Sat, 13 Sep 2025 16:34:24 +0000</lastBuildDate><ttl>5</ttl><item><title>An1m3 sH1t</title><link>https://anim3sh1t.openwrite.io/an1m3-sh1t</link><description> 
+M3ga like click this all links:
+https://ptoszek.pl/
+https://www.youtube.com/watch?v=dQw4w9WgXcQ
+https://sekurwaposzukaj.pl/
+&lt;33 ...</description><content:encoded><![CDATA[<p><img src="https://openwrite.b-cdn.net/01a494ce9056e43757ca5161ba8a496c.png" alt="alt text"> 
+M3ga like click this all links:
+https://ptoszek.pl/
+https://www.youtube.com/watch?v=dQw4w9WgXcQ
+https://sekurwaposzukaj.pl/
+&lt;33 </p>]]></content:encoded><pubDate>Thu, 24 Jul 2025 13:24:35 +0000</pubDate></item></channel></rss>

openwrite-0.15.0/openwrite/static/feed/b.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"><channel><title>B</title><link>https://openwrite.io/b/b</link><description>Hello there! 👋You can edit your blog description in dashboard</description><docs>http://www.rssboard.org/rss-specification</docs><generator>python-feedgen</generator><image><url>https://openwrite.io/static/favicon.png</url><title>B</title><link>https://openwrite.io/b/b</link></image><lastBuildDate>Sat, 13 Sep 2025 16:34:24 +0000</lastBuildDate><ttl>5</ttl></channel></rss>