From db3977940f302f7a18a0e6377ee3f3673762eb4c Mon Sep 17 00:00:00 2001
From: CJ_Clippy <cj@futureporn.net>
Date: Tue, 12 Aug 2025 00:23:47 -0800
Subject: [PATCH] improve formatting

---
 services/our/src/app.ts        |   1 +
 services/our/src/views/vod.hbs | 225 +++++++++++++++++----------------
 2 files changed, 117 insertions(+), 109 deletions(-)

diff --git a/services/our/src/app.ts b/services/our/src/app.ts
index 706f868..2ece56c 100644
--- a/services/our/src/app.ts
+++ b/services/our/src/app.ts
@@ -180,6 +180,7 @@ export function buildApp() {
         }
     })
 
+    // @todo we are going to need to use redis or similar https://github.com/fastify/fastify-caching
     app.register(fastifyCaching, {
         expiresIn: 300,
         privacy: 'private',
diff --git a/services/our/src/views/vod.hbs b/services/our/src/views/vod.hbs
index 3c0deab..6dd7d89 100644
--- a/services/our/src/views/vod.hbs
+++ b/services/our/src/views/vod.hbs
@@ -123,66 +123,70 @@
 
 
       <h3>VOD</h3>
-      {{#if vod.sourceVideo}}
-
-      {{#if (hasRole "supporterTier1" user)}}
-      <p><a data-source-video="{{getCdnUrl vod.sourceVideo}}" data-file-name="{{basename vod.sourceVideo}}"
-          x-on:click.prevent="download($el.dataset.sourceVideo, $el.dataset.fileName)"
-          href="{{getCdnUrl vod.sourceVideo}}" download="{{basename vod.sourceVideo}}"
-          target="_blank">{{icon "download" 24}} Download</a>
-      </p>
-      {{else}}
-      <p>
-        <a href="/perks">{{icon "patreon" 24}}</a>
-        <del>
-          CDN Download
-        </del>
-      </p>
-      {{/if}}
-
-      <p>{{#if vod.sha256sum}}<span><b>sha256sum</b> {{vod.sha256sum}}</span>{{/if}}</p>
-      {{#if vod.cidv1}}
-      <p><b>IPFS cidv1</b> {{vod.cidv1}}</p>
-      {{else}}
       <article>
-        IPFS CID is processing.
+        {{#if vod.sourceVideo}}
+
+        {{#if (hasRole "supporterTier1" user)}}
+        <p><a data-source-video="{{getCdnUrl vod.sourceVideo}}" data-file-name="{{basename vod.sourceVideo}}"
+            x-on:click.prevent="download($el.dataset.sourceVideo, $el.dataset.fileName)"
+            href="{{getCdnUrl vod.sourceVideo}}" download="{{basename vod.sourceVideo}}"
+            target="_blank">{{icon "download" 24}} Download</a>
+        </p>
+        {{else}}
+        <p>
+          <a href="/perks">{{icon "patreon" 24}}</a>
+          <del>
+            CDN Download
+          </del>
+        </p>
+        {{/if}}
+
+        <p>{{#if vod.sha256sum}}<span><b>sha256sum</b> {{vod.sha256sum}}</span>{{/if}}</p>
+        {{#if vod.cidv1}}
+        <p><b>IPFS cidv1</b> {{vod.cidv1}}</p>
+        {{else}}
+        <article>
+          IPFS CID is processing.
+        </article>
+        {{/if}}
+        {{#if vod.magnetLink}}
+        <p><a href="{{vod.magnetLink}}">{{icon "magnet" 24}} Magnet Link</a></p>
+        {{else}}
+        <article>
+          Magnet Link is processing.
+        </article>
+        {{/if}}
       </article>
-      {{/if}}
-      {{#if vod.magnetLink}}
-      <p><a href="{{vod.magnetLink}}">{{icon "magnet" 24}} Magnet Link</a></p>
-      {{else}}
-      <article>
-        Magnet Link is processing.
-      </article>
-      {{/if}}
 
 
       <h4>Raw Segments</h4>
-      {{#if vod.segmentKeys}}
-      {{#if (hasRole "supporterTier1" user)}}
-      <ul>
-        {{#each vod.segmentKeys}}
-        <li><a data-source-video="{{getCdnUrl this.key}}" data-file-name="{{this.name}}" target="_blank"
-            download="{{this.name}}" x-on:click.prevent="download($el.dataset.sourceVideo, $el.dataset.fileName)"
-            href="{{getCdnUrl this.key}}">{{icon "download" 24}} {{this.name}}</a>
-        </li>
-        {{/each}}
-      </ul>
-      {{else}}
-      <p>
-        <a href="/perks">{{icon "patreon" 24}}</a>
-        <del>
-          Raw Segments CDN Download
-        </del>
-      </p>
-      {{/if}}
-      {{else}}
-
       <article>
-        This VOD has no file segments.
-      </article>
-      {{/if}} {{!-- end of raw segments --}}
+        {{#if vod.segmentKeys}}
+        {{#if (hasRole "supporterTier1" user)}}
+        <ul>
+          {{#each vod.segmentKeys}}
+          <li><a data-source-video="{{getCdnUrl this.key}}" data-file-name="{{this.name}}" target="_blank"
+              download="{{this.name}}" x-on:click.prevent="download($el.dataset.sourceVideo, $el.dataset.fileName)"
+              href="{{getCdnUrl this.key}}">{{icon "download" 24}} {{this.name}}</a>
+          </li>
+          {{/each}}
+        </ul>
+        {{else}}
+        <p>
+          <a href="/perks">{{icon "patreon" 24}}</a>
+          <del>
+            Raw Segments CDN Download
+          </del>
+        </p>
+        {{/if}}
+        {{else}}
 
+        <article>
+          This VOD has no file segments.
+        </article>
+
+        {{/if}} {{!-- end of raw segments --}}
+      </article>
 
 
 
@@ -198,22 +202,24 @@
 
 
       <h4>HLS Playlist</h4>
-      {{#if vod.hlsPlaylist}}
-      {{#if (hasRole "supporterTier1" user)}}
-      <a href="{{signedHlsUrl vod.hlsPlaylist}}">{{signedHlsUrl vod.hlsPlaylist}}</a>
-      {{else}}
-      <p>
-        <a href="/perks">{{icon "patreon" 24}}</a>
-        <del>
-          HLS Playlist CDN Download
-        </del>
-      </p>
-      {{/if}}
-      {{else}}
       <article>
-        HLS Playlist is processing.
+        {{#if vod.hlsPlaylist}}
+        {{#if (hasRole "supporterTier1" user)}}
+        <a href="{{signedHlsUrl vod.hlsPlaylist}}">{{signedHlsUrl vod.hlsPlaylist}}</a>
+        {{else}}
+        <p>
+          <a href="/perks">{{icon "patreon" 24}}</a>
+          <del>
+            HLS Playlist CDN Download
+          </del>
+        </p>
+        {{/if}}
+        {{else}}
+        <article>
+          HLS Playlist is processing.
+        </article>
+        {{/if}}
       </article>
-      {{/if}}
 
       <h4>Thumbnail Image</h4>
       {{#if vod.thumbnail}}
@@ -228,53 +234,54 @@
 
 
       <h4>Funscripts (sex toy sync)</h4>
-      {{#if vod.funscript}}
-
-      {{#if (hasRole "supporterTier1" user)}}
-      <p>
-        {{!-- @todo change this id to funscript-vibrate --}}
-        <a id="funscript" data-url="{{getCdnUrl vod.funscript}}" data-file-name="{{basename vod.funscript}}"
-          x-on:click.prevent="download($el.dataset.url, $el.dataset.fileName)" href="{{getCdnUrl vod.funscript}}"
-          alt="{{this.vtuber.displayName}} funscript file">{{icon "download" 24}}
-          {{this.vtuber.displayName}}
-          vibrate.funscript</a>
-      </p>
-      <p>
-        <s><a id="funscript-thrust">{{icon "download" 24}} thrust.funscript</a></s> (coming soon)
-      </p>
-      {{else}}
-      <p>
-        <a href="/perks">{{icon "patreon" 24}}</a>
-        <del>
-          Funscripts
-        </del>
-      </p>
-      {{/if}}
-      <div class="mx-5"></div>
-      {{else}}
       <article>
-        Funscript file is processing.
-      </article>
-      {{/if}}
+        {{#if vod.funscript}}
 
+        {{#if (hasRole "supporterTier1" user)}}
+        <p>
+          {{!-- @todo change this id to funscript-vibrate --}}
+          <a id="funscript" data-url="{{getCdnUrl vod.funscript}}" data-file-name="{{basename vod.funscript}}"
+            x-on:click.prevent="download($el.dataset.url, $el.dataset.fileName)" href="{{getCdnUrl vod.funscript}}"
+            alt="{{this.vtuber.displayName}} funscript file">{{icon "download" 24}}
+            {{this.vtuber.displayName}}
+            vibrate.funscript</a>
+        </p>
+        <p>
+          <s><a id="funscript-thrust">{{icon "download" 24}} thrust.funscript</a></s> (coming soon)
+        </p>
+        {{else}}
+        <p>
+          <a href="/perks">{{icon "patreon" 24}}</a>
+          <del>
+            Funscripts
+          </del>
+        </p>
+        {{/if}}
+        <div class="mx-5"></div>
+        {{else}}
+        <article>
+          Funscript file is processing.
+        </article>
+        {{/if}}
+      </article>
 
       <h4>Closed Captions / Subtitles</h4>
+      <article>
 
-
-      {{#if vod.asrVttKey}}
-      {{#if (hasRole "supporterTier1" user)}}
-      <a id="asr-vtt" data-url="{{getCdnUrl vod.asrVttKey}}" data-file-name="{{basename vod.asrVttKey}}"
-        x-on:click.prevent="download($el.dataset.url, $el.dataset.fileName)" href="{{getCdnUrl vod.asrVttKey}}"
-        alt="Closed Captions VTT file">{{icon "download" 24}} Closed Captions</a>
-      {{else}}
-      <p>
-        <a href="/perks">{{icon "patreon" 24}}</a>
-        <del>
-          Closed Captions / Subtitles
-        </del>
-      </p>
-      {{/if}}
-
+        {{#if vod.asrVttKey}}
+        {{#if (hasRole "supporterTier1" user)}}
+        <a id="asr-vtt" data-url="{{getCdnUrl vod.asrVttKey}}" data-file-name="{{basename vod.asrVttKey}}"
+          x-on:click.prevent="download($el.dataset.url, $el.dataset.fileName)" href="{{getCdnUrl vod.asrVttKey}}"
+          alt="Closed Captions VTT file">{{icon "download" 24}} Closed Captions</a>
+        {{else}}
+        <p>
+          <a href="/perks">{{icon "patreon" 24}}</a>
+          <del>
+            Closed Captions / Subtitles
+          </del>
+        </p>
+        {{/if}}
+      </article>
 
 
       {{else}}