openwrite 0.16.1__tar.gz → 0.17.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.16.1
+Version: 0.17.1
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -761,7 +761,25 @@ to run it in background.
 
 5. Default user is `admin` with password `openwrite`. You can (and should!) change it in your dashboard. Enjoy!
 
+### Local development over HTTP
 
-#### Docker
+For `http://localhost:8081`, set these values in `.env`:
 
-Docker image is still being prepared. Stay tuned!
+```dotenv
+DOMAIN=localhost:8081
+IP=127.0.0.1
+PORT=8081
+GEMINI=no
+```
+
+When working from a checkout, install it with `./venv/bin/python -m pip install -e .`
+so changes in this folder are used by the CLI.
+Run `./venv/bin/openwrite debugrun` (or `./venv/bin/openwrite run`) and open
+`http://localhost:8081`. `DOMAIN` must match the hostname and port in the browser,
+without a protocol prefix. For a custom local hostname such as `openwrite.local`,
+use `DOMAIN=openwrite.local:8081` and point that hostname to `127.0.0.1` in your hosts file.
+Restart the server after changing `.env`.
+
+Both commands serve plain HTTP. In an HTTPS deployment, terminate TLS at a reverse
+proxy and forward the original host and scheme with `X-Forwarded-Host` and
+`X-Forwarded-Proto` so browser links use the public address.

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

@@ -71,7 +71,25 @@ to run it in background.
 
 5. Default user is `admin` with password `openwrite`. You can (and should!) change it in your dashboard. Enjoy!
 
+### Local development over HTTP
 
-#### Docker
+For `http://localhost:8081`, set these values in `.env`:
 
-Docker image is still being prepared. Stay tuned!
+```dotenv
+DOMAIN=localhost:8081
+IP=127.0.0.1
+PORT=8081
+GEMINI=no
+```
+
+When working from a checkout, install it with `./venv/bin/python -m pip install -e .`
+so changes in this folder are used by the CLI.
+Run `./venv/bin/openwrite debugrun` (or `./venv/bin/openwrite run`) and open
+`http://localhost:8081`. `DOMAIN` must match the hostname and port in the browser,
+without a protocol prefix. For a custom local hostname such as `openwrite.local`,
+use `DOMAIN=openwrite.local:8081` and point that hostname to `127.0.0.1` in your hosts file.
+Restart the server after changing `.env`.
+
+Both commands serve plain HTTP. In an HTTPS deployment, terminate TLS at a reverse
+proxy and forward the original host and scheme with `X-Forwarded-Host` and
+`X-Forwarded-Proto` so browser links use the public address.

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

@@ -6,7 +6,6 @@ import os
 from .utils.helpers import generate_nonce, get_ip
 import time
 from .utils.models import Settings, Home
-from sqlalchemy import distinct
 import bcrypt
 import json
 from cryptography.hazmat.primitives.asymmetric import rsa
@@ -87,8 +86,8 @@ def create_app(test_config=None):
                 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}}",
+                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](/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=\"/dashboard/page/1/edit\">dashboard</a></p>\n\n<hr>\n<h3>Posts\n\n{{posts}}",
                 show="0"
             )
             SessionLocal.add(new_page)
@@ -193,12 +192,20 @@ def create_app(test_config=None):
 
     app.jinja_env.globals['_'] = _
 
+    @app.template_filter('with_toc')
+    def with_toc(content, enabled):
+        if enabled != "1":
+            return content
+        from .utils.toc import add_table_of_contents
+        label = g.trans.get('table-of-contents', 'Spis treści' if g.lang == 'pl' else 'Table of contents')
+        return add_table_of_contents(content, label)
+
     @app.before_request
     def before():
         from flask import request, session
         from openwrite.utils.models import Home, Settings
         g.db = SessionLocal
-        t_query = g.db.query(distinct(Home.language)).all()
+        t_query = g.db.query(Home.language).distinct().all()
         translations = [row[0] for row in t_query]
         lang = request.cookies.get("lang")
         if not lang or lang not in translations:
@@ -253,7 +260,6 @@ def create_app(test_config=None):
 
     @app.after_request
     def after(response):
-        nonce = g.nonce
         #response.headers["Content-Security-Policy"] = (
         #    f"default-src 'none'; "
         #    f"script-src 'self' 'nonce-{nonce}' https://cdn.jsdelivr.net http://{g.main_domain}"
@@ -281,6 +287,6 @@ def create_app(test_config=None):
 
     @app.teardown_appcontext
     def shutdown_session(exception=None):
-        g.db.remove()
+        SessionLocal.remove()
 
     return app

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

@@ -168,6 +168,9 @@ def init():
 @click.option("-d", "--daemon", is_flag=True, help="Run in background (daemon)")
 def run(daemon):
     print_banner()
+    # Initialize/migrate once before concurrent web workers and the queue worker start.
+    from openwrite import create_app
+    create_app()
 
     ip = os.getenv("IP", "0.0.0.0")
     port = int(os.getenv("PORT", 8080))
@@ -184,7 +187,7 @@ def run(daemon):
     gunicorn_error_log = os.path.join(logs_dir, "openwrite_error.log")
 
     gunicorn_cmd = [
-        "gunicorn",
+        sys.executable, "-m", "gunicorn",
         "-w", "4",
         "openwrite:create_app()",
         "--bind", f"{ip}:{port}"

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

@@ -3,6 +3,7 @@ from openwrite.utils.models import Blog, Post, User, View, Like, Page, PostDraft
 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 openwrite.utils.activitypub import actor_url, create_activity_object, iso_date
 from feedgen.feed import FeedGenerator
 from sqlalchemy import desc
 import os
@@ -33,59 +34,11 @@ def process_posts_content(page, blog_id, blog_url, domain):
         
     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")
-    dt = dt.replace(tzinfo=timezone.utc)
-    iso = dt.isoformat(timespec="seconds").replace("+00:00", "Z")
-    
-    clean_content = re.sub(r'<[^>]+>', '', post.content_html)
-    content_length = len(clean_content)
-    
-    base_object = {
-        "id": f"{url}/{post.link}",
-        "attributedTo": url,
-        "published": iso,
-        "url": f"{url}/{post.link}",
-        "to": ["https://www.w3.org/ns/activitystreams#Public"],
-        "cc": [f"https://{g.main_domain}/followers/{blog}"],
-        "sensitive": False,
-        "atomUri": f"{url}/{post.link}",
-        "attachment": [],
-        "tag": []
-    }
-    
-    if content_length > 200:
-        words = clean_content.split()[:50]
-        summary = ' '.join(words) + '...' if len(words) == 50 else ' '.join(words)
-        
-        if full_content:
-            content = f"<h1>{post.title}</h1>{post.content_html}"
-        else:
-            content = f"<p><a href=\"{url}/{post.link}\">Read full article: {post.title}</a></p>"
-        
-        base_object.update({
-            "type": "Article",
-            "name": post.title,
-            "summary": summary,
-            "content": content
-        })
-    else:
-        base_object.update({
-            "type": "Note",
-            "summary": None,
-            "content": f"<h3>{post.title}</h3>{post.content_html}<p><a href=\"{url}/{post.link}\">View post</a></p>"
-        })
-    
-    return base_object
-
 def create_person_object(blog, url):
     """Create ActivityPub Person object for the blog"""
-    published = blog.created
-    dt = datetime.strptime(str(published), "%Y-%m-%d %H:%M:%S")
-    dt = dt.replace(tzinfo=timezone.utc)
-    iso = dt.isoformat(timespec="seconds").replace("+00:00", "Z")
-    if blog.fedi_description != "":
+    url = actor_url(blog)
+    iso = iso_date(blog.created)
+    if blog.fedi_description:
         summary = blog.fedi_description
     else:
         summary = f"{blog.name} - Blog on {g.main_domain}"
@@ -131,6 +84,8 @@ def create_person_object(blog, url):
             "url": f"https://{g.main_domain}/static/avatar.png"
         }
     }
+    if blog.updated:
+        actor['updated'] = iso_date(blog.updated)
     return actor
 
 def is_activitypub_request():
@@ -147,7 +102,7 @@ def show_blog(blog):
         return redirect("/")
 
     if blog_obj.access == "domain":
-        return redirect(f"https://{blog_obj.name}.{os.getenv('DOMAIN')}/")
+        return redirect(f"{request.scheme}://{blog_obj.name}.{os.getenv('DOMAIN')}/")
 
     if is_activitypub_request():
         url = f"https://{g.main_domain}/b/{blog}"
@@ -170,10 +125,10 @@ def show_subblog(blog):
         return redirect("/")
     blog_obj = g.db.query(Blog).filter_by(name=blog).first()
     if blog_obj is None:
-        return redirect(f"https://{os.getenv('DOMAIN')}/")
+        return redirect(f"{request.scheme}://{os.getenv('DOMAIN')}/")
 
     if blog_obj.access == "path":
-        return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog_obj.name}")
+        return redirect(f"{request.scheme}://{os.getenv('DOMAIN')}/b/{blog_obj.name}")
 
     if is_activitypub_request():
         url = f"https://{blog}.{g.main_domain}"
@@ -183,7 +138,7 @@ def show_subblog(blog):
             'Vary': 'Accept'
         })
 
-    blog_obj.url = f"https://{blog_obj.name}.{os.getenv('DOMAIN')}"
+    blog_obj.url = f"{request.scheme}://{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()
     
@@ -202,7 +157,7 @@ def show_post(blog, post):
         return serve_rss(blog_obj)
 
     if blog_obj.access == "domain":
-        return redirect(f"https://{blog_obj.name}.{os.getenv('DOMAIN')}/{post}")
+        return redirect(f"{request.scheme}://{blog_obj.name}.{os.getenv('DOMAIN')}/{post}")
 
     blog_obj.url = f"/b/{blog_obj.name}"
     pages = g.db.query(Page).filter_by(blog=blog_obj.id).all()
@@ -266,15 +221,15 @@ def show_subpost(blog, post):
         return redirect("/")
     blog_obj = g.db.query(Blog).filter_by(name=blog).first()
     if blog_obj is None:
-        return redirect(f"https://{os.getenv('DOMAIN')}/")
+        return redirect(f"{request.scheme}://{os.getenv('DOMAIN')}/")
 
     if post == "rss":
         return serve_rss(blog_obj)
 
     if blog_obj.access == "path":
-        return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog_obj.name}/{post}")
+        return redirect(f"{request.scheme}://{os.getenv('DOMAIN')}/b/{blog_obj.name}/{post}")
 
-    blog_obj.url = f"https://{blog_obj.name}.{os.getenv('DOMAIN')}"
+    blog_obj.url = f"{request.scheme}://{blog_obj.name}.{os.getenv('DOMAIN')}"
 
     pages = g.db.query(Page).filter_by(blog=blog_obj.id).all()
     one_post = g.db.query(Post).filter(Post.blog == blog_obj.id, Post.link == post, Post.isdraft == "0").first()
@@ -298,7 +253,7 @@ def show_subpost(blog, post):
 
     post_author = g.db.query(User).filter_by(id=blog_obj.owner).first()
     one_post.authorname = post_author.username
-    blog_obj.url = f"https://{blog_obj.name}.{os.getenv('DOMAIN')}"
+    blog_obj.url = f"{request.scheme}://{blog_obj.name}.{os.getenv('DOMAIN')}"
 
     user_agent = request.headers.get('User-Agent')
     ip = anonymize(get_ip())
@@ -347,11 +302,10 @@ def webfinger():
     if not blog_obj:
         abort(404)
     
-    if blog_obj.access == "domain":
-        blog_url = f"https://{username}.{g.main_domain}"
-    else:
-        blog_url = f"https://{g.main_domain}/b/{username}"
-    
+    if domain != g.main_domain:
+        abort(404)
+    blog_url = actor_url(blog_obj)
+
     data = {
         "subject": f"acct:{username}@{g.main_domain}",
         "links": [{
@@ -379,9 +333,9 @@ def subdomain_webfinger(blog):
         if "@" in account_part:
             username = account_part.split("@")[0]
             corrected_resource = f"acct:{username}@{g.main_domain}"
-            return redirect(f"https://{g.main_domain}/.well-known/webfinger?resource={corrected_resource}")
+            return redirect(f"{request.scheme}://{g.main_domain}/.well-known/webfinger?resource={corrected_resource}")
     
-    return redirect(f"https://{g.main_domain}/.well-known/webfinger?resource={resource}")
+    return redirect(f"{request.scheme}://{g.main_domain}/.well-known/webfinger?resource={resource}")
 
 @blog_bp.route("/p/<post>")
 def single_showpost(post):
@@ -574,7 +528,8 @@ def autosave_post(blog_name):
     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)
+    draft = PostDraft(post_id=post_id, blog_id=blog.id, session_key=session_key, title=title, content_raw=content_raw, saved_at=now,
+                      toc_enabled='1' if data.get('toc_enabled') == '1' else '0')
     g.db.add(draft)
     g.db.flush()
 
@@ -613,5 +568,6 @@ def get_autosaves(blog_name):
         'id': d.id,
         'title': d.title,
         'content_raw': d.content_raw,
+        'toc_enabled': d.toc_enabled,
         'saved_at': d.saved_at.strftime('%Y-%m-%dT%H:%M:%SZ')
     } for d in drafts])

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

@@ -1,8 +1,11 @@
 from flask import Blueprint, render_template, redirect, request, g, abort, Response
 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.helpers import sanitize_html, gen_link, safe_css, 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.routes.blog import create_person_object
+from openwrite.utils.activitypub import (
+    actor_url, post_url, create_activity_object, activity_for, queue_activity, deliver_pending,
+)
 from openwrite.utils.valkey_client import valkey_client
 import requests
 from sqlalchemy import desc
@@ -105,8 +108,8 @@ def create_blog():
             blog=b_id,
             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://{g.main_domain}/dashboard/edit/{form_url})\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://{g.main_domain}/dashboard/edit/{form_url}\">dashboard</a></p>\n\n<hr>\n<h3>Posts</h3>\n\n{{posts}}",
+            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](/dashboard/edit/{form_url})\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=\"/dashboard/edit/{form_url}\">dashboard</a></p>\n\n<hr>\n<h3>Posts</h3>\n\n{{posts}}",
             show="0"
         )
         g.db.add(new_page)
@@ -127,37 +130,11 @@ def delete_blog(name):
     if blog is None or blog.owner != g.user:
         abort(403)
 
-    if blog.access == "domain":
-        blog_url = f"https://{blog.name}.{g.main_domain}"
-    else:
-        blog_url = f"https://{g.main_domain}/b/{blog.name}"
-
-    followers = []
-    if blog.followers not in (None, "null", "NULL"):
-        followers = json.loads(blog.followers)
-
-    if followers:
-        person_object = create_person_object(blog, blog_url)
-        
-        for actor in followers:
-            now_iso = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
-            delete_activity = {
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "id": f"{blog_url}#delete-{now_iso}",
-                "type": "Delete",
-                "actor": blog_url,
-                "published": now_iso,
-                "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                "cc": [f"https://{g.main_domain}/followers/{blog.name}"],
-                "object": person_object
-            }
-            if valkey_client.is_enabled():
-                valkey_client.queue_federation_activity(delete_activity, blog.id, blog.priv_key, blog_url, f"{actor}/inbox")
-            else:
-                send_activity(delete_activity, blog.priv_key, blog_url, f"{actor}/inbox")
-
+    activity = activity_for(blog, 'Delete', {'id': actor_url(blog), 'type': 'Tombstone', 'formerType': 'Person'})
+    jobs = queue_activity(g.db, blog, activity)
     g.db.delete(blog)
     g.db.commit()
+    deliver_pending(g.db, jobs, budget_seconds=1)
     return redirect("/dashboard")
 
 @dashboard_bp.route("/dashboard/edit/<name>", methods=['GET', 'POST'])
@@ -200,37 +177,12 @@ def edit_blog(name):
     if selected_theme not in themes:
         return render_template("edit.html", blog=blog, posts=posts, themes=themes, pages=pages, error="wrong-theme")
     blog.theme = selected_theme
-    g.db.commit()
-
+    jobs = []
     if old_title != new_title or old_fedi_description != new_fedi_description:
-        if blog.access == "domain":
-            blog_url = f"https://{blog.name}.{g.main_domain}"
-        else:
-            blog_url = f"https://{g.main_domain}/b/{blog.name}"
-
-        followers = []
-        if blog.followers not in (None, "null", "NULL"):
-            followers = json.loads(blog.followers)
-
-        if followers:
-            person_object = create_person_object(blog, blog_url)
-            
-            for actor in followers:
-                now_iso = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
-                update_activity = {
-                    "@context": "https://www.w3.org/ns/activitystreams",
-                    "id": f"{blog_url}#update-{now_iso}",
-                    "type": "Update",
-                    "actor": blog_url,
-                    "published": now_iso,
-                    "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                    "cc": [f"https://{g.main_domain}/followers/{blog.name}"],
-                    "object": person_object
-                }
-                if valkey_client.is_enabled():
-                    valkey_client.queue_federation_activity(update_activity, blog.id, blog.priv_key, blog_url, f"{actor}/inbox")
-                else:
-                    send_activity(update_activity, blog.priv_key, blog_url, f"{actor}/inbox")
+        obj = create_person_object(blog, actor_url(blog))
+        jobs = queue_activity(g.db, blog, activity_for(blog, 'Update', obj))
+    g.db.commit()
+    deliver_pending(g.db, jobs, budget_seconds=1)
 
     return render_template("edit.html", blog=blog, posts=posts, themes=themes, pages=pages)
 
@@ -277,7 +229,8 @@ def new_post(name):
         date=now,
         feed=request.form.get('feed'),
         isdraft=request.form.get('draft', '0'),
-        comments_allowed=request.form.get('comments_allowed', '0')
+        comments_allowed=request.form.get('comments_allowed', '0'),
+        toc_enabled='1' if request.form.get('toc_enabled') == '1' else '0'
     )
     g.db.add(post)
     g.db.flush()  # Get the post ID
@@ -288,37 +241,11 @@ def new_post(name):
         tag_names = parse_tags_from_input(tags_input)
         update_post_tags(g.db, post, tag_names)
     
+    jobs = []
+    if post.isdraft == '0':
+        jobs = queue_activity(g.db, blog, activity_for(blog, 'Create', create_activity_object(post, blog)))
     g.db.commit()
-    
-    if blog.access == "domain":
-        blog_url = f"https://{blog.name}.{g.main_domain}"
-    else:
-        blog_url = f"https://{g.main_domain}/b/{blog.name}"
-
-    followers = []
-    if blog.followers not in (None, "null", "NULL"):
-        followers = json.loads(blog.followers)
-
-    if followers:
-        if request.form.get("draft", "0") == "0":
-            activity_object = create_activity_object(post, blog.name, blog_url, full_content=False)
-            
-            for actor in followers:
-                now_iso = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
-                activity = {
-                    "@context": "https://www.w3.org/ns/activitystreams",
-                    "id": f"{blog_url}/{post.link}#create",
-                    "type": "Create",
-                    "actor": blog_url,
-                    "published": now_iso,
-                    "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                    "cc": [f"https://{g.main_domain}/followers/{blog.name}"],
-                    "object": activity_object
-                }       
-                if valkey_client.is_enabled():
-                    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")
+    deliver_pending(g.db, jobs, budget_seconds=1)
 
     generate_rss(blog.name)
     return redirect(f"/dashboard/edit/{blog.name}")
@@ -332,6 +259,7 @@ def preview():
     data = {
         'title': request.form.get('title'),
         'content': sanitize_html(request.form.get('content')),
+        'toc_enabled': '1' if request.form.get('toc_enabled') == '1' else '0',
         'author': request.form.get('author'),
         'blog_title': request.form.get('blog_title'),
         'blog_name': request.form.get('blog_name'),
@@ -381,7 +309,9 @@ def edit_post(blog, post):
     if blog_obj is None or blog_obj.owner != g.user:
         abort(403)
 
-    e_post = g.db.query(Post).filter_by(link=post).first()
+    e_post = g.db.query(Post).filter_by(link=post, blog=blog_obj.id).first()
+    if e_post is None:
+        abort(404)
     if request.method == "GET":
         # Get existing tags for the post
         existing_tags = get_post_tags(g.db, e_post) if e_post else []
@@ -395,25 +325,23 @@ def edit_post(blog, post):
     if len(title) > 120:
         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"
-    dupes_posts = g.db.query(Post).filter(Post.link.startswith(link), Post.blog == blog_obj.id).count()
-    dupes_pages = g.db.query(Page).filter(Page.url == link, Page.blog == blog_obj.id).count()
-    dupes = dupes_posts + dupes_pages
-    if dupes > 0 and link != post:
-        link += f"-{dupes + 1}"
+    if not title:
+        existing_tags = get_post_tags(g.db, p)
+        return render_template('new_post.html', blog=blog_obj, post=p, existing_tags=existing_tags,
+                               error='title-empty', form_data=request.form)
+    was_draft = p.isdraft == '1'
 
     p.title = title
-    now = datetime.now(timezone.utc).replace(microsecond=0)
+    now = datetime.now(timezone.utc)
     p.content_raw = request.form.get("content_raw")
     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.toc_enabled = "1" if request.form.get("toc_enabled") == "1" else "0"
+    if was_draft and request.form.get("draft", "0") == "0":
         p.date = now
+        p.updated = None
     else:
         p.updated = now
     p.isdraft = request.form.get("draft", "0")
@@ -423,36 +351,15 @@ def edit_post(blog, post):
     tag_names = parse_tags_from_input(tags_input)
     update_post_tags(g.db, p, tag_names)
     
+    jobs = []
+    if p.isdraft == '0':
+        kind = 'Create' if was_draft else 'Update'
+        jobs = queue_activity(g.db, blog_obj, activity_for(blog_obj, kind, create_activity_object(p, blog_obj)))
+    elif not was_draft:
+        tombstone = {'id': post_url(p, blog_obj), 'type': 'Tombstone', 'formerType': 'Note'}
+        jobs = queue_activity(g.db, blog_obj, activity_for(blog_obj, 'Delete', tombstone))
     g.db.commit()
-    
-    if blog_obj.access == "domain":
-        blog_url = f"https://{blog_obj.name}.{g.main_domain}"
-    else:
-        blog_url = f"https://{g.main_domain}/b/{blog_obj.name}"
-
-    followers = []
-    if blog_obj.followers not in (None, "null", "NULL"):
-        followers = json.loads(blog_obj.followers)
-
-    if followers:
-        activity_object = create_activity_object(p, blog_obj.name, blog_url, full_content=False)
-        
-        for actor in followers:
-            now_iso = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
-            update_activity = {
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "id": f"{blog_url}/{p.link}#update",
-                "type": "Update",
-                "actor": blog_url,
-                "published": now_iso,
-                "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                "cc": [f"https://{g.main_domain}/followers/{blog_obj.name}"],
-                "object": activity_object
-            }
-            if valkey_client.is_enabled():
-                valkey_client.queue_federation_activity(update_activity, blog_obj.id, blog_obj.priv_key, blog_url, f"{actor}/inbox")
-            else:
-                send_activity(update_activity, blog_obj.priv_key, blog_url, f"{actor}/inbox")
+    deliver_pending(g.db, jobs, budget_seconds=1)
 
     generate_rss(blog)
     return redirect(f"/dashboard/edit/{blog}")
@@ -468,42 +375,13 @@ def delete_post(blog, post):
 
     p = g.db.query(Post).filter_by(link=post, blog=blog_obj.id).first()
     if p:
-        if blog_obj.access == "domain":
-            blog_url = f"https://{blog_obj.name}.{g.main_domain}"
-        else:
-            blog_url = f"https://{g.main_domain}/b/{blog_obj.name}"
-
-        followers = []
-        if blog_obj.followers not in (None, "null", "NULL"):
-            followers = json.loads(blog_obj.followers)
-
-        if followers:
-            activity_object = create_activity_object(p, blog_obj.name, blog_url, full_content=False)
-            
-            for actor in followers:
-                now_iso = datetime.now(timezone.utc).isoformat().replace("+00:00", "Z")
-                delete_activity = {
-                    "@context": "https://www.w3.org/ns/activitystreams",
-                    "id": f"{blog_url}/{p.link}#delete",
-                    "type": "Delete",
-                    "actor": blog_url,
-                    "published": now_iso,
-                    "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                    "cc": [f"https://{g.main_domain}/followers/{blog_obj.name}"],
-                    "object": activity_object
-                }
-                if valkey_client.is_enabled():
-                    valkey_client.queue_federation_activity(delete_activity, blog_obj.id, blog_obj.priv_key, blog_url, f"{actor}/inbox")
-                else:
-                    send_activity(
-                        delete_activity,
-                        blog_obj.priv_key,
-                        blog_url,
-                        f"{actor}/inbox"
-                    )
-        
+        jobs = []
+        if p.isdraft == '0':
+            tombstone = {'id': post_url(p, blog_obj), 'type': 'Tombstone', 'formerType': 'Note'}
+            jobs = queue_activity(g.db, blog_obj, activity_for(blog_obj, 'Delete', tombstone))
         g.db.delete(p)
         g.db.commit()
+        deliver_pending(g.db, jobs, budget_seconds=1)
 
     generate_rss(blog)
     return redirect(f"/dashboard/edit/{blog_obj.name}")