fix alegreya font to not be smallcaps, add examples of appview-level ban data done jankily through json files

.gitignore

···
 .env.production.local
 .env.local
 jwks.json
+data/*.json
 
 # caches
 .eslintcache

config.php

···
 define('FRONTPAGE_FEED', "at://did:plc:ffkgesg3jsv2j7aagkzrtcvt/app.bsky.feed.generator/aaagllxbcbsje");
 define('SLINGSHOT_INSTANCE', "https://slingshot.microcosm.blue");
 define('CONSTELLATION_INSTANCE', "https://constellation.microcosm.blue");
+define('DEFAULT_PDS', "https://bsky.social");
 define('PLC_DIRECTORY', "https://plc.directory");
 define('FAVORITE_FEEDS', [ // list of feeds you want to display in the sidebar to users not logged in
+  "at://did:plc:ffkgesg3jsv2j7aagkzrtcvt/app.bsky.feed.generator/aaagllxbcbsje",
   "at://did:plc:xdtvlh4k3tntzp2vinmgehsz/app.bsky.feed.generator/aaaeb7hxb53jg",
   "at://did:plc:abv47bjgzjgoh3yrygwoi36x/app.bsky.feed.generator/aaai4f7awwzkc",
   "at://did:plc:dltmiiweocm22l656iffwn5a/app.bsky.feed.generator/aaagnt6bwkkb2",

css/_partials/_fonts.scss

···
   font-family: 'Alegreya';
   font-weight: normal;
   font-style: normal;
-  src: url(@fonts/alegreyasc-regular-webfont.woff2) format('woff2');
+  src: url(@fonts/Alegreya-Regular.woff2) format('woff2');
 }
 
 @font-face {
   font-family: 'Alegreya';
   font-weight: bold;
   font-style: normal;
-  src: url(@fonts/alegreyasc-bold-webfont.woff2) format('woff2');
+  src: url(@fonts/Alegreya-Bold.woff2) format('woff2');
 }
 
 @font-face {
   font-family: 'Alegreya';
   font-weight: normal;
   font-style: italic;
-  src: url(@fonts/alegreyasc-italic-webfont.woff2) format('woff2');
+  src: url(@fonts/Alegreya-Italic.woff2) format('woff2');
 }
 
 @font-face {
   font-family: 'Alegreya';
   font-weight: bold;
   font-style: italic;
-  src: url(@fonts/alegreyasc-bolditalic-webfont.woff2) format('woff2');
+  src: url(@fonts/Alegreya-BoldItalic.woff2) format('woff2');
 }
 
 @font-face {

css/_partials/_globals.scss

···
   color: var(--link-color);
 }
 
+h2 {
+  font-size: 1em;
+  text-align: center;
+  margin: 0;
+}
+
 label {
   display: block;
   font-weight: bold;

css/_partials/_layout.scss

···
 main {
   border-right: 1px var(--border-color) solid;
   grid-area: main;
+  max-width: 660px;
+  width: 100%;
   
   &.about,
   &.terms,
···
   padding: 10px;
   border-bottom: 1px var(--border-color) solid;
   grid-area: aside;
+}
+
+#homefeeds {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  
+  li {
+    a {
+      display: block;
+      padding: 8px 0;
+    }
+  }
 }
 
 footer {

css/_partials/_post.scss

···
 .post {
   border-bottom: 1px var(--border-color) solid;
   padding: 10px;
+  width: 100%;
   
   .postHeader {
     display: grid;
···
     gap: 10px;
     margin: 10px 0;
     
-    video {
-      max-width: 100%;
-      height: auto;
-    }
-    
     img {
       max-width: 100%;
       height: 100%;
···
     .btn-invis {
       width: 100%;
       height: 100%;
+    }
+    
+    .video {
+      width: 100%;
+    }
+    
+    video {
+      max-width: 100%;
+      width: 100%;
+      height: auto;
+      margin: 1em 0;
+      border: 1px var(--border-color) solid;
     }
       
     &.img-2 {

data/babyjail.json.example

···
+[
+  {
+    "did": "did:plc:whateverabckdfdkjf",
+    "reason": "being a jerk on main",
+    "timeoutUntil": "2025-10-15T00:00:00Z"
+  }
+]

data/bans.json.example

···
+[
+  {
+    "did": "did:plc:232eprew2nyn75ensoah2lg2",
+    "reason": "jesse singal"
+  }
+]

data/index.php

···
+<?php
+echo 'nope';
+?>

data/pds-bans.json.example

···
+[
+  {
+    "serverUrl": "https://badsite.domain",
+    "reason": "full of jerks"
+  }
+]

index.php

···
 require_once('config.php');
 require_once('lib/helpers.php');
 require_once('lib/bskyToucher.php');
+require_once('lib/bskyRenderer.php');
 
-use Smallnest\Helpers\getTheme;
-use Smallnest\Helpers\getUrl;
-use Smallnest\Helpers\renderLogo;
 use Smallnest\Bsky\BskyToucher;
 
 $dotenv = Dotenv\Dotenv::createImmutable(__DIR__);
 $dotenv->load();
 
-$provider = new BskyToucher();
+$bskyToucher = new BskyToucher();
 
 $mainClass = array_key_exists('p', $_GET) ? " class='".$_GET['p']."'" : "";
 $pageName = array_key_exists('p', $_GET) ? $_GET['p'] : null;
···
         } ?>
       </main>
       <aside>
+        <h2>Recommended Feeds</h2>
+        <ul id="homefeeds">
         <?php
-        foreach (FAVORITE_FEEDS as $feed) {
-          preg_match('/at:\/\/(did:[a-z]+:[a-z0-9]+)\/app.bsky.feed.generator/([a-zA-Z0-9]+)', $feed, $feedParts);
-          
-          if ($feedParts) {
-            $info = $provider->getSlingshotData($feedParts[1], 'app.bsky.feed.generator', $feedParts[2]);
-            $url = Smallnest\Helpers\getUrl('/index.php', PRETTY_URLS, [
-              'p' => 'feed',
-              'did' => $feedParts[1],
-              'rkey' => $feedParts[2]
-            ]);
-            echo "<a href='".$url."'></a>";
+        if (FAVORITE_FEEDS) {
+          foreach (FAVORITE_FEEDS as $feed) {
+            preg_match('/at:\/\/(did:plc:[a-z0-9]+)\/app.bsky.feed.generator\/([a-z0-9]+)/', $feed, $feedParts);
+            if ($feedParts) {
+              $info = $bskyToucher->getSlingshotData($feedParts[1], 'app.bsky.feed.generator', $feedParts[2]);
+              $url = Smallnest\Helpers\getUrl('', PRETTY_URLS, [
+                'p' => 'feed',
+                'did' => $feedParts[1],
+                'rkey' => $feedParts[2]
+              ]);
+              echo "<li><a href='".$url."'>".$info->value->displayName."</a></li>";
+            }
           }
         }
         ?>
+      </ul>
       </aside>
       <footer>
         <div id="themes">
···
             <li><a href="#" data-font="alegreya">alegreya</a></li>
           </ul>
         </div>
-        <a href="<?= Smallnest\Helpers\getUrl('terms', PRETTY_URLS); ?>">terms</a> &bull; <a href="<?= Smallnest\Helpers\getUrl('privacy', PRETTY_URLS); ?>">privacy</a> &bull; <a href="<?= Smallnest\Helpers\getUrl('about', PRETTY_URLS); ?>">about</a><br /><br />
-        <a href="https://tangled.org/@veryroundbird.house/smallbird-social" target="_blank" rel="external">code</a> / <a href="https://bsky.app/profile/smallbirdsocial.on.computer" target="_blank" rel="external"> / <a href="https://ko-fi.com/veryroundbird" target="_blank" rel="external">ko-fi</a><br /><br />
+        <a href="<?= Smallnest\Helpers\getUrl('', PRETTY_URLS, ['p' => 'terms']); ?>">terms</a> &bull; <a href="<?= Smallnest\Helpers\getUrl('', PRETTY_URLS, ['p' => 'privacy']); ?>">privacy</a> &bull; <a href="<?= Smallnest\Helpers\getUrl('', PRETTY_URLS, ['p' => 'about']); ?>">about</a><br /><br />
+        <a href="https://tangled.org/@veryroundbird.house/smallbird-social" target="_blank" rel="external">code</a> / <a href="https://bsky.app/profile/smallbirdsocial.on.computer" target="_blank" rel="external">bsky</a> / <a href="https://ko-fi.com/veryroundbird" target="_blank" rel="external">ko-fi</a><br /><br />
         a <a href="https://veryroundbird.house" target="_blank" rel="external">veryroundbird.house</a> project
       </footer>
     </div>

lib/bskyRenderer.php

···
+<?php
+namespace Smallnest\Bsky;
+
+require_once('config.php');
+
+class BskyRenderer {
+  public function renderProfile(object $user, ?bool $auth = false):string|bool {
+    return false;
+  }
+  
+  public function renderMiniProfile(object $user):string|bool {
+    $profileUrl = getUrl('', PRETTY_URLS, [
+      'p' => 'profile',
+      'handle' => $user->handle
+    ]);
+    $ret = <<<EOD
+    <div class="userMini">
+      <a href="$profileUrl">
+        <div class="avatar">
+          <img src="$user->avatar" alt="$user->displayName" />
+        </div>
+        <div class="name">
+          <span class="displayName">$user->displayName</span>
+          <span class="did">$user->did</span>
+        </div>
+      </a>
+    </div>
+EOD;
+    return false;
+  }
+  
+  public function renderPost(object $post, ?bool $prettyUrls = false):void {
+    $author = $post->author;
+    $profileLink = $prettyUrls ? "/profile/".$author->handle : "/?p=profile&handle=".$author->handle;
+    preg_match('/([a-zA-Z0-9]+)$/', $post->uri, $uriParts);
+    $postId = $uriParts ? $uriParts[1] : '';
+    $postLink = $prettyUrls ? $profileLink."/post/".$postId : $profileLink."&post=".$postId;
+    $postCopyUrl = "https://".getEnv('SERVER_URL').$postLink;
+    $embeds = $this->renderEmbeds($post);
+    $imageEmbedClass = $post->embedType === "images" ? " img-".count($post->embeds) : "";
+    echo <<<EOD
+<div class="post" data-uri="$post->uri">
+  <div class="postHeader">
+    <div class="avatar">
+      <a href="$profileLink"><img src="$author->avatar" /></a>
+    </div>
+    <div class="displayName"><a href="$profileLink">$author->displayName</a></div>
+    <div class="handle"><a href="$profileLink">$author->handle</a></div>
+    <div class="timeAgo"><a href="$postLink">$post->createdAt</a></div>
+  </div>
+  <div class="postContent">$post->content</div>
+  $embeds
+  <div class="postFooter">
+    <div class="postInteraction">
+      <a href="#like">like ($post->likeCount)</a>
+      <a href="#reply">reply ($post->replyCount)</a>
+      <a href="#quote">quote ($post->quoteCount)</a>
+      <a href="#repost">repost ($post->repostCount)</a>
+    </div>
+    <div class="postSharing">
+      <a href="#" data-share="$postCopyUrl">copy link</a>
+    </div>
+  </div>
+</div>
+EOD;
+  }
+  
+  public function renderEmbeds(object $post):string|bool {
+    $embeds = $post->embeds;
+    $type = $post->embedType;
+    $ret = "";
+    if ($embeds) {
+      if ($type === 'app.bsky.embed.images') {
+        $imageCount = count($embeds);
+        $ret .= <<<EOD
+  <div class="postEmbeds img-$imageCount">
+EOD;
+        foreach ($embeds as $i=>$embed) {
+          $altSanitized = addslashes(htmlspecialchars($embed->alt));
+          $pds = $post->pds;
+          $did = $post->author->did;
+          $cid = $embed->cid;
+          $idx = $i+1;
+          $ret .= <<<EOD
+    <div class="img" id="img-$post->postId-$idx-small">
+      <button type="button" class="btn-invis" popovertarget="img-full-$post->postId-$idx"><img src="$pds/xrpc/com.atproto.sync.getBlob?did=$did&cid=$cid" alt="$altSanitized" /></button>
+    </div>
+    <div id="img-full-$post->postId-$idx" popover>
+      <img src="$pds/xrpc/com.atproto.sync.getBlob?did=$did&cid=$cid" alt="$altSanitized" />
+      <div class="alt">$embed->alt</div>
+    </div>
+EOD;
+        }
+        $ret .= <<<EOD
+  </div>    
+EOD;
+      } else if ($type === 'app.bsky.embed.video') {
+        $thumb = $embeds[0]->thumb;
+        $vid = $embeds[0]->videoCid;
+        $author = $post->author->did;
+        $pds = $post->pds;
+        $ret .= <<<EOD
+  <div class="postEmbeds">
+    <div class="video">
+      <video
+        src="$pds/xrpc/com.atproto.sync.getBlob?did=$author&cid=$vid"
+        controls
+      ></video>
+    </div>
+  </div>
+EOD;
+      } else if ($type === 'app.bsky.embed.external') {
+        $title = $embeds[0]->title;
+        $uri = $embeds[0]->uri;
+        $thumb = $embeds[0]->thumb;
+        $desc = $embeds[0]->description;
+        $ret .= <<<EOD
+  <div class="postEmbeds">
+    <div class="externalLink">
+      <a href="$uri" rel="external" target="_blank">
+        <div class="externalLinkImage">
+          <img src="$thumb" alt="$title" />
+        </div>
+        <div class="externalLinkInfo">
+          <div class="externalLinkTitle">$title</div>
+          <div class="externalLinkDesc">$desc</div>
+          <div class="externalLinkUri">$uri</div>
+        </div>
+      </a>
+    </div>
+  </div>
+EOD;
+      } else if ($type === 'app.bsky.embed.record') {
+        /*preg_match('/at:\/\/(did:plc:[a-z0-9]+)\/([a-zA-Z0-9\.])\/([a-z0-9]+)/', $embeds[0], $recComponents);
+        $recDid = $recComponents[1];
+        $recRkey = $recComponents[2];
+        $uri = getEnv('SERVER_URL').'/?p=post&handle='.$recDid.'&postId='.$recRkey;
+        $rec = $this->getSlingshotData($recDid, 'app.bsky.feed.post', $recRkey);
+        $ret .= <<<EOD
+  <div class="embeds">
+    <div class="record">
+      <a href="$uri">
+      idk
+      </a>
+    </div>
+  </div>    
+EOD;*/
+      }
+    }
+    return $ret;
+  }
+}

lib/bskyToucher.php

···
 namespace Smallnest\Bsky;
 
 require_once('config.php');
-require_once('helpers.php');
 require_once('vendor/autoload.php');
 require_once('bskyProvider.php');
 
 use Smallnest\Bsky\BskyProvider;
-use Smallnest\Helpers;
+use Smallnest\Bsky\BskyRenderer;
 use GuzzleHttp\Client;
 use GuzzleHttp\Query;
 use Firebase\JWT\JWT;
···
     return $ret;
   }
   
-  function renderPost($post, $prettyUrls = false) {
-    $author = $post->author;
-    $profileLink = $prettyUrls ? "/profile/".$author->handle : "/?p=profile&handle=".$author->handle;
-    preg_match('/([a-zA-Z0-9]+)$/', $post->uri, $uriParts);
-    $postId = $uriParts[1];
-    $postLink = $prettyUrls ? $profileLink."/post/".$postId : $profileLink."&post=".$postId;
-    $postCopyUrl = "https://".getEnv('SERVER_URL').$postLink;
-    $embeds = $this->renderEmbeds($post->embedType, $post->embeds, $post);
-    $imageEmbedClass = $post->embedType === "images" ? " img-".count($post->embeds) : "";
-    echo <<<EOD
-<div class="post" data-uri="$post->uri">
-  <div class="postHeader">
-    <div class="avatar">
-      <a href="$profileLink"><img src="$author->avatar" /></a>
-    </div>
-    <div class="displayName"><a href="$profileLink">$author->displayName</a></div>
-    <div class="handle"><a href="$profileLink">$author->handle</a></div>
-    <div class="timeAgo"><a href="$postLink">$post->createdAt</a></div>
-  </div>
-  <div class="postContent">$post->text</div>
-  $embeds
-  <div class="postFooter">
-    <div class="postInteraction">
-      <a href="#like">like ($post->likeCount)</a>
-      <a href="#reply">reply ($post->replyCount)</a>
-      <a href="#quote">quote ($post->quoteCount)</a>
-      <a href="#repost">repost ($post->repostCount)</a>
-    </div>
-    <div class="postSharing">
-      <a href="#" data-share="$postCopyUrl">copy link</a>
-    </div>
-  </div>
-</div>
-EOD;
-  }
-
-  function renderEmbeds($type, $embeds, $context) {
-    $ret = "";
-    if ($type === 'images') {
-      $imageCount = count($embeds);
-      foreach ($embeds as $embed) {
-        $altSanitized = addslashes(htmlspecialchars($embed->alt));
-        $ret .= <<<EOD
-<div class="postEmbeds img-$post->embeds">
-  <div class="img" id="img-$context->postId-small">
-    <button type="button" class="btn-invis" popovertarget="img-full-$context->postId"><img src="$embed->thumb" alt="$altSanitized" /></button>
-    <div id="img-full-$context->postId" popover>
-      <img src="$embed->fullsize" alt="$altSanitized" />
-      <div class="alt">$embed->alt</div>
-    </div>
-  </div>
-</div>
-EOD;
-      }
-    } else if ($type === 'video') {
-      $thumb = $embeds[0]->thumb;
-      $vid = $embeds[0]->video;
-      $author = $context->did;
-      $pds = DEFAULT_PDS;
-      $ret .= <<<EOD
-<div class="embeds">
-  <div class="video">
-    <video
-      src="$pds/xrpc/com.atproto.sync.getBlob?did=$author&cid=$vid"
-      controls
-    ></video>
-  </div>
-</div>
-EOD;
-    } else if ($type === 'external') {
-      $title = $embeds[0]->title;
-      $uri = $embeds[0]->uri;
-      $thumb = $embeds[0]->thumb;
-      $desc = $embeds[0]->description;
-      $ret .= <<<EOD
-<div class="embeds">
-  <div class="externalLink">
-    <a href="$uri" rel="external" target="_blank">
-      <div class="externalLinkImage">
-        <img src="$thumb" alt="$title" />
-      </div>
-      <div class="externalLinkInfo">
-        <div class="externalLinkTitle">$title</div>
-        <div class="externalLinkDesc">$desc</div>
-        <div class="externalLinkUri">$uri</div>
-      </div>
-    </a>
-  </div>
-</div>
-EOD;
-    } else if ($type === 'record') {
-      preg_match('/at:\/\/(did:plc:[a-z0-9]+)\/([a-zA-Z0-9\.])\/([a-z0-9]+)/', $embeds[0], $recComponents);
-      print_r($recComponents);
-      $recDid = $recComponents[1];
-      $recRkey = $recComponents[2];
-      $uri = SERVER_URL.'/?p=post&handle='.$recDid.'&postId='.$recRkey;
-      $rec = $this->getSlingshotData($recDid, 'app.bsky.feed.post', $recRkey);
-      print_r($rec);
-      $ret .= <<<EOD
-<div class="embeds">
-  <div class="record">
-    <a href="$uri">
-    idk
-    </a>
-  </div>
-</div>    
-EOD;
-    }
-    return $ret;
-  }
-  
   /* POSTS */
   
   function getPost(string $did, string $rkey, $userAuth = null) {
     if ($userAuth) {
       
     }
-    $authorInfo = $this->getUserInfo($did);
     $ret = $this->getSlingshotData($did, "app.bsky.feed.post", $rkey);
+    $userInfo = $this->getSlingshotData($did, "app.bsky.actor.profile", "self");
+    $author = (object) [
+      'displayName' => $userInfo->value->displayName,
+      'handle' => $userInfo->value->handle,
+      'did' => $did,
+      'avatar' => getImage($userInfo->value->avatar->ref->{'$link'})
+    ];
+    $ret['author'] = $author;
     if ($ret) {
-      return $this->tidyPost($ret, $authorInfo);
+      return $this->sanitizePost($ret);
     }
     return false;
   }
···
     return [];
   }
   
-  function tidyPost($ret, $authorInfo) {
-    $uri = $ret->uri;
-    $post = $ret->value;
-    $embeds = [];
-    $embedType = null;
-    $replyTo = null;
-    
-    if (property_exists($post, 'reply') && property_exists($post->reply, 'parent')) {
-      preg_match('/^at:\/\/(did:plc:[a-z0-9]+)\/app.bsky.feed.post\/([a-z0-9]+)$/', $post->reply->parent->uri, $atUriSplit);
-      $replyUserInfo = $this->getUserInfo($atUriSplit[1]);
-      $replyTo = $post->reply->parent->uri;/*(object) [
-        'uri' => \Smallnest\Helpers\getUrl(SERVER_URL, PRETTY_URLS, [
-          'p' => $replyUserInfo->handle,
-          'post' => $atUriSplit[2]
-        ]),
-        'author' => $this->getUserInfo($atUriSplit[1])
-      ];*/
-    }
-  
-    if (property_exists($post, 'embed') && property_exists($post->embed, '$type')) {
-      if ($post->embed->{'$type'} === 'app.bsky.embed.images#view') {
-        $embeds = $post->embed->images;
-        $embedType = 'images';
-      } elseif ($post->embed->{'$type'} === 'app.bsky.embed.video#view') {
-        $embeds = [(object) [
-          "video" => $post->embed->cid,
-          "thumb" => $post->embed->thumbnail
-        ]];
-        $embedType = 'video';
-      } elseif ($post->embed->{'$type'} === 'app.bsky.embed.external#view') {
-        $embeds = [$post->embed->external];
-        $embedtype = 'external';
-      } elseif ($post->embed->{'$type'} === 'app.bsky.embed.record') {
-        $embedtype = 'record';
-        $embeds = [$post->embed->record->uri];
-      }
-    }
-  
-    return (object) [
-      'uri' => $ret->uri,
-      "author" => $authorInfo,
-      "createdAt" => $post->createdAt,
-      "text" => $post->text,
-      'replyCount' => $this->getReplies($uri),
-      'repostCount' => $this->getReposts($uri),
-      'likeCount' => $this->getLikes($uri),
-      'quoteCount' => $this->getQuotes($uri),
-      'embedType' => $embedType,
-      'embeds' => $embeds,
-      'reply' => $replyTo
-    ];
-  }
-  
   function getUserPosts($user, $cursor = null, $newer = false) {
     [$provider, $did, $handle] = $this->getUserDidAndProvider($user);
     $didInfo = $this->getUserInfo($did);
···
     
     $newCursor = $pdsData->cursor;
     $feed = array_map(function($post) use ($user) {
-      $authorInfo = $this->getUserInfo($user);
-      return $this->tidyPost($post, $authorInfo);
+      return $this->sanitizePost($post);
     }, $pdsData->records);
       //$feed = $pdsData->records;
     return $feed;
     //$this->sanitizeFeed($feed, $newCursor, $cursor, $newer);
   }
   
-  function getFeed(string $atUri, ?string $cursor = null, ?string $userAuth = null, ?bool $newer = false, int $limit = 100):array|bool {
+  function getFeed(string $atUri, ?string $cursor = null, ?string $userAuth = null, ?bool $newer = false, int $limit = 15):array|bool {
     $httpClient = new Client([
       'timeout'  => 2.0,
     ]);
···
     return false;
   }
   
+  function sanitizePost(object $post, ?bool $auth = null):object {
+    if ($auth) {
+      return $this->sanitizeAuthedPost($post);
+    }
+    return $this->sanitizePublicApiPost($post);
+  }
+  
+  function sanitizeAuthedPost(object $post):object {
+    return (object) [];
+  }
+  
+  function sanitizePublicApiPost(object $post):object {
+    preg_match('/at:\/\/(did:plc:[a-z0-9]+)\/[a-zA-Z\.]+\/([a-z0-9]+)/', $post->uri, $rkeyMatch);
+    if (!$rkeyMatch) return null;
+    print_r($post);
+    $authorInfo = $this->getSlingshotIdentityMiniDoc($post->author->did);
+    return (object) [
+      'author' => $post->author,
+      'uri' => $post->uri,
+      'pds' => $authorInfo->pds,
+      'postId' => $rkeyMatch[2],
+      'content' => $post->record->text,
+      'facets' => property_exists($post->record, 'facets') ? $post->record->facets : [],
+      'replyCount' => $post->replyCount,
+      'repostCount' => $post->repostCount,
+      'likeCount' => $post->likeCount,
+      'quoteCount' => $post->quoteCount,
+      'createdAt' => $post->record->createdAt,
+      'embedType' => property_exists($post->record, 'embed') ? $post->record->embed->{'$type'} : null,
+      'embeds' => property_exists($post->record, 'embed') ? $this->sanitizeEmbeds($post->record->embed) : [],
+      'cursor' => $newCursor
+    ];
+  }
+  
   function sanitizePublicApiPosts(array $posts, string $newCursor, ?string $cursor = null, ?bool $newer = false):array {
     $feed = array_filter(array_map(function($p) use ($newCursor, $cursor) {
       $post = $p->post;
-      return (object) [
-        'author' => $post->author,
-        'postId' => $pid,
-        'content' => $post->record->text,
-        'facets' => $post->record->facets,
-        'replyCount' => $post->replyCount,
-        'repostCount' => $post->repostCount,
-        'likeCount' => $post->likeCount,
-        'quoteCount' => $post->quoteCount,
-        'createdAt' => $post->record->createdAt,
-        'embedType' => $post->record->embed->{'$type'},
-        'embeds' => '',
-        'cursor' => $newCursor
-      ];
+      return $this->sanitizePublicApiPost($post);
     }, $posts), function ($p) use ($newer, $newCursor, $cursor) {
+      if (!$p) return false;
       if (!$newer) return true;
       return strtotime($feedItem->createdAt) > strtotime($cursor);
     });
···
         ];
       }, $post->record->facets) : [];
       
-      if (count($facetsList) > 0) {
+      if ($facetsList && count($facetsList) > 0) {
         $processedText = $this->applyFacets($post->record->text, $facetsList);
       }
-      $embeds = [];
-      $embedType = null;
-      //print_r($post);
-      if (property_exists($post, 'embed') && property_exists($post->embed, '$type')) {
-        if ($post->embed->{'$type'} === 'app.bsky.embed.images#view') {
-          $embeds = $post->embed->images;
-          $embedType = 'images';
-        } elseif ($post->embed->{'$type'} === 'app.bsky.embed.video#view') {
-          $embeds = [(object) [
-            "video" => $post->embed->cid,
-            "thumb" => $post->embed->thumbnail
-          ]];
-          $embedType = 'video';
-        } elseif ($post->embed->{'$type'} === 'app.bsky.embed.external#view') {
-          $embeds = [$post->embed->external];
-          $embedtype = 'external';
-        }
-      }
+      $embeds = property_exists($post, 'embed') ? $this->sanitizeEmbeds($post->embed) : [];
+      $embedType = property_exists($post, 'embed') ? $post->embed->{'$type'} : null;
       
       return (object) [
         'author' => $this->getUserInfo($post->author->handle),
···
         'embeds' => $embeds,
         'cursor' => $newCursor
       ];
-    }, $posts), function($feedItem) use ($newer, $cursor) {
+    }, $posts), function (object $feedItem) use ($newer, $cursor) {
       if (!$newer) return true;
       return strtotime($feedItem->createdAt) > strtotime($cursor);
     });
     return $feed;
+  }
+  
+  function sanitizeEmbeds(object $embeds):array|bool {
+    if ($embeds->{'$type'} === 'app.bsky.embed.images') {
+      return array_map(function ($im) {
+        return (object) [
+          'cid' => $im->image->ref->{'$link'},
+          'alt' => $im->alt,
+          'width' => $im->aspectRatio->width,
+          'height' => $im->aspectRatio->height
+        ];
+      }, $embeds->images);
+    } else if ($embeds->{'$type'} === 'app.bsky.embed.video') {
+      return [
+        (object) [
+          'thumb' => $embeds->video->thumbnail,
+          'videoCid' => $embeds->video->ref->{'$link'},
+          'width' => $embeds->aspectRatio->width,
+          'height' => $embeds->aspectRatio->height
+        ]
+      ];
+    } else if ($embeds->{'$type'} === 'app.bsky.embed.record') {
+      return [
+        (object) [
+          'uri' => $embeds->record->uri/*,
+          'author' => (object) [
+            'displayName' => $embeds->record->author->displayName,
+            'handle' => $embeds->record->author->handle,
+            'did' => $embeds->record->author->did,
+            'avatar' => $embeds->record->author->avatar
+          ],
+          'post' => (object) [
+            'text' => $embeds->record->value->text,
+            'createdAt' => $embeds->record->value->createdAt,
+            'facets' => $embeds->record->value->facets,
+            'embeds' => $this->sanitizeEmbeds($embeds->record->value->$embeds)
+          ]*/
+        ]
+      ];
+    } else if ($embeds->{'$type'} === 'app.bsky.something.external') {
+      
+    }
+    return false;
   }
 }
 

lib/helpers.php

···
 namespace Smallnest\Helpers;
 
 function getUrl($base, $prettyUrls = false, $params = []) {
-  $paramString = join(($prettyUrls ? "/" : "&"), array_map(function ($k, $p) {
+  $paramString = join(($prettyUrls ? "/" : "&"), array_map(function ($k, $p) use ($prettyUrls) {
     return $prettyUrls ? $k."/".$p : $k."=".$p;
   }, array_keys($params), array_values($params)));
-  return $prettyUrls ? "/".$base.(count($params) > 0 ? "/".$paramString : "") : "/?p=".$base.(count($params) > 0 ? "&".$paramString : "");
+  return $prettyUrls ? "/".$base.(count($params) > 0 ? "/".$paramString : "") : $base.(count($params) > 0 ? "?".$paramString : "");
 }
 
 function renderLogo() {

pages/home.php

···
 <?php
 require_once('config.php');
 use Smallnest\Bsky\BskyToucher;
+use Smallnest\Bsky\BskyRenderer;
 
 $bskyToucher = new BskyToucher();
+$bskyRenderer = new BskyRenderer();
 $defaultFeed = "at://did:plc:ffkgesg3jsv2j7aagkzrtcvt/app.bsky.feed.generator/aaagllxbcbsje";
 $feedContents = $bskyToucher->getFeed(FRONTPAGE_FEED ? FRONTPAGE_FEED : $defaultFeed);
 echo <<<EOF
   <a href="#" class="refreshBar" data-feed="$defaultFeed">check for new posts</a>
 EOF;
 foreach($feedContents as $post) {
-  $bskyToucher->renderPost($post, PRETTY_URLS);
+  $bskyRenderer->renderPost($post, PRETTY_URLS);
 }
 ?>

pages/post.php

···
 <?php
 require_once('config.php');
 require_once('lib/bskyToucher.php');
+require_once('lib/bskyRenderer.php');
 
 use Smallnest\Bsky\BskyToucher;
+use Smallnest\Bsky\BskyRenderer;
 
 $bskyToucher = new BskyToucher();
+$bskyRenderer = new BskyRenderer();
 [$provider, $did, $handle] = $bskyToucher->getUserDidAndProvider($_GET['handle']);
 $post = $bskyToucher->getPost($did, $_GET['postId']);
-$bskyToucher->renderPost($post);
+$sanitizedPost = $bskyToucher->sanitizePost($post);
+$bskyRenderer->renderPost($sanitizedPost);
 $replies = $bskyToucher->getReplyRecords($post);
 $quotes = $bskyToucher->getQuoteRecords($post);
 $likes = $bskyToucher->getLikeUsers($post);
 $reposts = $bskyToucher->getRepostUsers($post);
 ?>
 <div id="replies">
-  
+  <h2>Replies</h2>
+  <?php
+  foreach ($replies as $reply) {
+    $bskyRenderer->renderPost($reply);
+  }
+  ?>
 </div>
 <div id="quotes" popover>
   
 </div>
 <div id="likes" popover>
-  <?php if ($likes) : ?>
-    <?php foreach($likes as $like) : ?>
-      
-    <?php endforeach; ?>
-  <?php endif; ?>
+  <?php if ($likes) {
+    foreach($likes as $like) {
+      //echo $bskyRenderer->renderMiniPost($);
+    }
+  }
+  ?>
 </div>
 <div id="reposts" popover>
   

vite.config.js

···
     usePHP({
       entry: [
         'index.php',
+        '.env',
         'jwks.json',
         'client-metadata.json',
         'config.php',