From 0c2ba81ea4c7dcc9802adfbe34875848317b6a71 Mon Sep 17 00:00:00 2001
From: John Holdun <john@johnholdun.com>
Date: Tue, 3 Oct 2023 23:16:04 -0700
Subject: [PATCH 1/2] Fix changes to theme update

---
 public/style.css            |  7 ++++-
 src/pages/layouts/admin.hbs | 54 -------------------------------------
 2 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 src/pages/layouts/admin.hbs
diff --git a/public/style.css b/public/style.css
index 3362327..06b66a6 100644
--- a/public/style.css
+++ b/public/style.css
@@ -112,7 +112,7 @@ a {
   min-height: 40vh;
   margin: 2rem 0;
   display: flex;
-  flex-direction: column-reverse;
+  flex-direction: column;
 }
 
 @media (min-width: 600px) {
@@ -128,6 +128,10 @@ a {
   grid-column: 1;
 }
 
+.wrapper > * {
+  order: 2;
+}
+
 .content {
   grid-row: 1;
   grid-column: 2;
@@ -446,6 +450,7 @@ a.bookmark-date {
   font-size: .875rem;
   line-height: 1.25rem;
   color: var(--color-dimmed);
+  order: 1;
 }
 
 .admin-links a {
diff --git a/src/pages/layouts/admin.hbs b/src/pages/layouts/admin.hbs
deleted file mode 100644
index 24b5733..0000000
--- a/src/pages/layouts/admin.hbs
+++ /dev/null
@@ -1,54 +0,0 @@
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="https://glitch.com/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    {{{feedLink}}}
-    <title>{{title}} | {{siteName}}</title>
-    <link rel="apple-touch-icon" sizes="180x180" href="https://cdn.glitch.global/8eaf209c-2fa9-4353-9b99-e8d8f3a5f8d4/postmarks-touch-icon-180.png?v=1693611327251" />
-    <link rel="shortcut icon" href="https://cdn.glitch.global/8eaf209c-2fa9-4353-9b99-e8d8f3a5f8d4/postmarks-favicon.ico?v=1693611323474" />
-    <link rel="stylesheet" href="/style.css" />
-  </head>
-  <body>
-    <div class="header">
-      <div class="logo">
-        <img src="/postmarks-logo-small.png" />
-      </div>
-      <div class="title">
-        <h1><a href="/">{{siteName}}</a></h1>
-      </div>
-      <div class="menu">
-        <a href="/about">About</a>
-        <a href="/bookmark/new">Add</a>
-        {{#if loggedIn}}
-          <a href="/admin">Admin</a>
-          <a href="/logout">Logout</a>
-        {{else}}
-          <a href="/login">Login</a>
-        {{/if}}
-      </div>
-    </div>
-    <div class="wrapper">
-      {{> admin_subnav }}
-      <div class="content" role="main">
-        <h2>{{title}}</h2>
-        {{{body}}}
-      </div>
-    </div>
-    <footer class="footer">
-      <a href="/">Home</a>
-      {{#if loggedIn}}
-        <a href="/bookmark/new">Add</a>
-        <a href="/admin">Admin</a>
-        <a href="/logout">Logout</a>
-      {{else}}
-        <a href="/login">Login</a>
-      {{/if}}
-      <a class="btn--remix" target="_top" href="https://glitch.new/github.com/ckolderup/postmarks">
-        <img src="https://cdn.glitch.com/605e2a51-d45f-4d87-a285-9410ad350515%2FLogo_Color.svg?v=1618199565140" alt="" />
-        Remix on Glitch
-      </a>
-    </footer>
-    {{{_sections.script}}}
-  </body>
-</html>

From edc54bdc4be380101d11c3f1868883e9de0971a9 Mon Sep 17 00:00:00 2001
From: Jeff Sikes <jeffsikes@users.noreply.github.com>
Date: Fri, 6 Oct 2023 21:23:38 -0500
Subject: [PATCH 2/2] Exclude "m/" from Guid

Fix for related issue, the Guid for a new boomark is currently getting written to the database as "m/GUID" rather than "Guid" and when replies are received, the related post wasn't being found because of the. "m/".
---
 src/activitypub.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/activitypub.js b/src/activitypub.js
index 9896aa1..1f81fac 100644
--- a/src/activitypub.js
+++ b/src/activitypub.js
@@ -5,7 +5,7 @@ import { signedGetJSON, signedPostJSON } from './signature.js';
 import { actorInfo, actorMatchesUsername } from './util.js';
 
 function getGuidFromPermalink(urlString) {
-  return urlString.match(/m\/([a-zA-Z0-9+/]+)/)[1];
+  return urlString.match(/(?:\/m\/)([a-zA-Z0-9+/]+)/)[1];
 }
 
 export async function signAndSend(message, name, domain, db, targetDomain, inbox) {
