Merge branch 'main' into issue-empty-title

ckolderup · Oct 9, 2023 · 527d519 · 527d519
2 parents ac48f0e + 983709c
commit 527d519
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 56 deletions.
diff --git 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/activitypub.js b/src/activitypub.js
@@ -5,7 +5,7 @@ import { signedGetJSON, signedPostJSON } from './signature.js';
 import { actorInfo, actorMatchesUsername, replaceEmptyText } 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) {

diff --git a/src/pages/layouts/admin.hbs b/src/pages/layouts/admin.hbs