openwrite 0.12.0__tar.gz → 0.13.0__tar.gz

{openwrite-0.12.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.12.0/openwrite.egg-info → openwrite-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwrite
-Version: 0.12.0
+Version: 0.13.0
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                Version 3, 19 November 2007
         
@@ -704,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: 

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

@@ -15,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: 

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

@@ -85,7 +85,7 @@ def create_app(test_config=None):
                 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="off"
+                show="0"
             )
             SessionLocal.add(new_page)
 

{openwrite-0.12.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.12.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.12.0 → openwrite-0.13.0}/openwrite/routes/blog.py

@@ -24,7 +24,7 @@ def show_blog(blog):
     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_by(blog=blog.id).order_by(desc(Post.id)).all()
+        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, page=homepage, pages=pages)
@@ -40,10 +40,11 @@ def show_subblog(blog):
     if blog.access == "path":
         return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog.name}")
 
+    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_by(blog=blog.id).order_by(desc(Post.id)).all()
+        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, page=homepage, pages=pages)
@@ -64,14 +65,14 @@ def show_post(blog, post):
 
     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).first()
+    one_post = g.db.query(Post).filter(Post.blog == blog.id, Post.link == post, Post.isdraft == "0").first()
     if not one_post:
         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_by(blog=blog.id).order_by(desc(Post.id)).all()
+            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)
         
@@ -112,8 +113,10 @@ def show_subpost(blog, post):
     if blog.access == "path":
         return redirect(f"https://{os.getenv('DOMAIN')}/b/{blog.name}/{post}")
 
+    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).first()
+    one_post = g.db.query(Post).filter(Post.blog == blog.id, Post.link == post, Post.isdraft == "0").first()
 
     if not one_post:
         page = g.db.query(Page).filter(Page.blog == blog.id, Page.url == post).first()
@@ -121,7 +124,7 @@ def show_subpost(blog, post):
             return redirect("/")
 
         if "{posts}" in page.content_raw:
-            posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+            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)
         
@@ -155,7 +158,7 @@ def single_showpost(post):
 
     blog = g.db.query(Blog).filter_by(id=1).first()
     blog.url = f"http://{g.main_domain}"
-    one_post = g.db.query(Post).filter(Post.blog == 1, Post.link == post).first()
+    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()
 
@@ -165,7 +168,7 @@ def single_showpost(post):
             return redirect("/")
 
         if "{posts}" in page.content_raw:
-            posts = g.db.query(Post).filter_by(blog=blog.id).order_by(desc(Post.id)).all()
+            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)
         
@@ -230,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")

{openwrite-0.12.0 → openwrite-0.13.0}/openwrite/routes/dashboard.py

@@ -99,8 +99,8 @@ def create_blog():
             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\n\n{{posts}}",
-            show="off"
+            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}}",
+            show="0"
         )
         g.db.add(new_page)
         g.db.commit()
@@ -177,6 +177,9 @@ def new_post(name):
     title = request.form.get('title')
     if len(title) > 120:
         return render_template("new_post.html", blog=blog, error="Title too long! Max 120 characters.")
+
+    if len(title) < 1:
+        return render_template("new_post.html", blog=blog, error="Title cannot be empty!")
         
     link = gen_link(title)
     if link == "rss":
@@ -198,7 +201,8 @@ def new_post(name):
         author=request.form.get('author'),
         link=link,
         date=now,
-        feed=request.form.get('feed')
+        feed=request.form.get('feed'),
+        isdraft=request.form.get('draft', '0')
     )
     g.db.add(post)
     g.db.commit()
@@ -319,6 +323,7 @@ def edit_post(blog, post):
     p.feed = request.form.get("feed")
     p.link = link
     p.updated = now
+    p.isdraft = request.form.get("draft", "0")
     g.db.commit()
     return redirect(f"/dashboard/edit/{blog_obj.name}")
 
@@ -557,6 +562,9 @@ def page_delete(page):
     if blog.owner != g.user:
         return abort(403)
 
+    if page.url == "":
+        return redirect("/dashboard")
+
     g.db.delete(page)
     g.db.commit()
 

{openwrite-0.12.0 → openwrite-0.13.0}/openwrite/routes/federation.py

@@ -78,7 +78,100 @@ def activity(blog):
         }
     }
 
-    return Response(json.dumps(actor), content_type="application/activity+json")
+    return Response(json.dumps(actor), content_type="application/activity+json", headers={
+        'Cache-Control': 'max-age=3600',
+        'Vary': 'Accept'
+    })
+
+@federation_bp.route("/activity/<blog>/create/<int:post_id>")
+def activity_create(blog, post_id):
+    b = g.db.query(Blog).filter_by(name=blog).first()
+    if not b:
+        abort(404)
+    
+    post = g.db.query(Post).filter_by(id=post_id, blog=b.id).first()
+    if not post:
+        abort(404)
+
+    if b.access == "path":
+        url = f"https://{g.main_domain}/b/{blog}"
+    else:
+        url = f"https://{blog}.{g.main_domain}"
+
+    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")
+
+    create_activity = {
+        "@context": "https://www.w3.org/ns/activitystreams",
+        "id": f"https://{g.main_domain}/activity/{blog}/create/{post.id}",
+        "type": "Create",
+        "actor": f"https://{g.main_domain}/activity/{blog}",
+        "published": iso,
+        "to": ["https://www.w3.org/ns/activitystreams#Public"],
+        "cc": [f"https://{g.main_domain}/followers/{blog}"],
+        "object": {
+            "id": f"https://{g.main_domain}/activity/{blog}/posts/{post.id}",
+            "type": "Note",
+            "summary": None,
+            "attributedTo": f"https://{g.main_domain}/activity/{blog}",
+            "content": f"<h3>{post.title}</h3><p><a href=\"{url}/{post.link}\">{url}/{post.link}</a></p>",
+            "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"https://{g.main_domain}/activity/{blog}/posts/{post.id}",
+            "attachment": [],
+            "tag": []
+        }
+    }
+
+    return Response(json.dumps(create_activity), content_type="application/activity+json", headers={
+        'Cache-Control': 'max-age=3600',
+        'Vary': 'Accept'
+    })
+
+@federation_bp.route("/activity/<blog>/posts/<int:post_id>")
+def activity_post(blog, post_id):
+    b = g.db.query(Blog).filter_by(name=blog).first()
+    if not b:
+        abort(404)
+    
+    post = g.db.query(Post).filter_by(id=post_id, blog=b.id).first()
+    if not post:
+        abort(404)
+
+    if b.access == "path":
+        url = f"https://{g.main_domain}/b/{blog}"
+    else:
+        url = f"https://{blog}.{g.main_domain}"
+
+    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")
+
+    note = {
+        "@context": "https://www.w3.org/ns/activitystreams",
+        "id": f"https://{g.main_domain}/activity/{blog}/posts/{post.id}",
+        "type": "Note",
+        "summary": None,
+        "attributedTo": f"https://{g.main_domain}/activity/{blog}",
+        "content": f"<h3>{post.title}</h3><p><a href=\"{url}/{post.link}\">{url}/{post.link}</a></p>",
+        "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"https://{g.main_domain}/activity/{blog}/posts/{post.id}",
+        "attachment": [],
+        "tag": []
+    }
+
+    return Response(json.dumps(note), content_type="application/activity+json", headers={
+        'Cache-Control': 'max-age=3600',
+        'Vary': 'Accept'
+    })
 
 @federation_bp.route("/inbox/<blog>", methods=["POST"])
 def inbox(blog):
@@ -90,12 +183,6 @@ def inbox(blog):
     if not data:
         return "Bad Request", 400
 
-    #print(f"""
-    #   Data received:
-
-    #        {data}
-    #""")
-
     body = request.get_data(as_text=True)
     sign = verify_http_signature(request.headers, body, blog)
     if not sign:
@@ -190,24 +277,66 @@ def inbox(blog):
 @federation_bp.route("/outbox/<blog>")
 def outbox(blog):
     page = request.args.get("page")
+    
     b = g.db.query(Blog).filter_by(name=blog).first()
     if not b:
         abort(404)
 
-    p = g.db.query(Post).filter_by(blog=b.id)
+    p = g.db.query(Post).filter_by(blog=b.id).order_by(Post.date.desc())
     total = p.count()
     posts = p.all()
+    
     first_outbox = {
       "@context": "https://www.w3.org/ns/activitystreams",
-      "id": f"https://openwrite.io/outbox/{blog}",
+      "id": f"https://{g.main_domain}/outbox/{blog}",
       "type": "OrderedCollection",
       "totalItems": total,
-      "first": f"https://openwrite.io/outbox/{blog}?page=1"
+      "first": f"https://{g.main_domain}/outbox/{blog}?page=true"
     }
 
-    if page not in ("true", "1"):
-        return Response(json.dumps(first_outbox), content_type="application/activity+json")
-
+    if not page:
+        if total <= 10:
+            orderedPosts = []
+            if b.access == "path":
+                url = f"https://{g.main_domain}/b/{blog}"
+            else:
+                url = f"https://{blog}.{g.main_domain}"
+            
+            for post in posts:
+                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")   
+                orderedPosts.append({
+                    "id": f"https://{g.main_domain}/activity/{blog}/create/{post.id}",
+                    "type": "Create",
+                    "actor": f"https://{g.main_domain}/activity/{blog}",
+                    "published": iso,
+                    "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                    "cc": [f"https://{g.main_domain}/followers/{blog}"],
+                    "object": {
+                        "id": f"https://{g.main_domain}/activity/{blog}/posts/{post.id}",
+                        "type": "Note",
+                        "attributedTo": f"https://{g.main_domain}/activity/{blog}",
+                        "content": f"<p><strong>{post.title}</strong></p><p><a href=\"{url}/{post.link}\">{url}/{post.link}</a></p>",
+                        "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
+                    }
+                })
+            
+            first_outbox["orderedItems"] = orderedPosts
+            
+            return Response(json.dumps(first_outbox), content_type="application/activity+json; charset=utf-8", headers={
+                'Cache-Control': 'max-age=300',
+                'Vary': 'Accept'
+            })
+        else:
+            return Response(json.dumps(first_outbox), content_type="application/activity+json; charset=utf-8", headers={
+                'Cache-Control': 'max-age=300',
+                'Vary': 'Accept'
+            })
 
     orderedPosts = []
     if b.access == "path":
@@ -219,29 +348,52 @@ def outbox(blog):
         dt = dt.replace(tzinfo=timezone.utc)
         iso = dt.isoformat(timespec="seconds").replace("+00:00", "Z")   
         orderedPosts.append({
-            "id": f"https://{g.main_domain}/activity/{blog}#{post.link}",
+            "id": f"https://{g.main_domain}/activity/{blog}/create/{post.id}",
             "type": "Create",
             "actor": f"https://{g.main_domain}/activity/{blog}",
+            "published": iso,
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": [f"https://{g.main_domain}/followers/{blog}"],
             "object": {
-                "id": f"{url}/{post.link}",
+                "id": f"https://{g.main_domain}/activity/{blog}/posts/{post.id}",
                 "type": "Note",
+                "summary": None,
                 "attributedTo": f"https://{g.main_domain}/activity/{blog}",
-                "content": f"<p>{post.title}</p><a href=\"{url}/{post.link}\">{url}/{post.link}</a>",
-                "published": iso
-            },
-            "published": iso,
-            "to": ["https://www.w3.org/ns/activitystreams#Public"]
+                "content": f"<h3>{post.title}</h3><p><a href=\"{url}/{post.link}\">{url}/{post.link}</a></p>",
+                "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"https://{g.main_domain}/activity/{blog}/posts/{post.id}",
+                "attachment": [],
+                "tag": []
+            }
         })
 
     outbox = {
-      "@context": "https://www.w3.org/ns/activitystreams",
-      "id": f"https://openwrite.io/outbox/{blog}?page={page}",
+      "@context": [
+        "https://www.w3.org/ns/activitystreams",
+        {
+          "ostatus": "http://ostatus.org#",
+          "atomUri": "ostatus:atomUri",
+          "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+          "conversation": "ostatus:conversation",
+          "sensitive": "as:sensitive",
+          "toot": "http://joinmastodon.org/ns#",
+          "votersCount": "toot:votersCount"
+        }
+      ],
+      "id": f"https://{g.main_domain}/outbox/{blog}?page={page}",
       "type": "OrderedCollectionPage",
       "partOf": f"https://{g.main_domain}/outbox/{blog}",
       "orderedItems": orderedPosts
     }
 
-    return Response(json.dumps(outbox), content_type="application/activity+json")
+    return Response(json.dumps(outbox), content_type="application/activity+json", headers={
+        'Cache-Control': 'max-age=300',
+        'Vary': 'Accept'
+    })
 
 @federation_bp.route("/followers/<blog>")
 def followers(blog):
@@ -264,7 +416,7 @@ def followers(blog):
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": f"https://{g.main_domain}/followers/{blog}?page=true",
             "type": "OrderedCollectionPage",
-            "partOf": f"https://{g.main_domain}.followers/{blog}",
+            "partOf": f"https://{g.main_domain}/followers/{blog}",
             "totalItems": len(followers),
             "orderedItems": followers
           }

{openwrite-0.12.0 → openwrite-0.13.0}/openwrite/routes/main.py

@@ -3,7 +3,7 @@ import os
 import json
 import datetime
 import requests
-from openwrite.utils.models import Post, Blog, Home, Settings, Page
+from openwrite.utils.models import Post, Blog, Home, Settings, Page, Like
 import time
 from openwrite import start_time
 
@@ -71,7 +71,7 @@ def instances():
 def discover():
     if g.mode == "single":
         return redirect("/")
-    posts = g.db.query(Post).filter_by(feed=1).order_by(desc(Post.id)).all()
+    posts = g.db.query(Post).filter(Post.feed == "1", Post.isdraft == "0").order_by(desc(Post.id)).all()
     for p in posts:
         b = g.db.query(Blog).filter_by(id=p.blog).first()
         if not b:
@@ -82,6 +82,8 @@ def discover():
             url = f"https://{b.name}.{os.getenv('DOMAIN')}/{p.link}"
         else:
             url = "#"
+        l = g.db.query(Like).filter(Like.post == p.id, Like.blog == b.id).count()
+        p.likes = l
         p.url = url
         p.blogname = b.title
 

{openwrite-0.12.0 → openwrite-0.13.0}/openwrite/templates/discover.html

@@ -4,7 +4,7 @@
 <div style="display: flex; flex-direction: column; gap: 1rem">
 {% for p in posts %}
     <div class="discover_post">
-        <i class="datetime">{{ p.date }}</i>{{ p.blogname }}: <a class="action" href="{{ p.url }}" target="_blank">{{ p.title }}</a>
+        <i class="datetime">{{ p.date }}</i>{{ p.blogname }}: <a class="action" href="{{ p.url }}" target="_blank">{{ p.title }}</a> {{ p.likes }} ♡
     </div>
 {% endfor %}
 </div>