From 981d8350df40ef213e380fb980342ab9da06fb68 Mon Sep 17 00:00:00 2001
From: Jason Morris <jasonmorris@fastmail.com>
Date: Tue, 6 Feb 2024 20:40:17 -0500
Subject: [PATCH 1/2] Convert thumbnails to webp, remove jpg

---
 app/Helpers/aggro_helper.php | 5 +++--
 app/Models/AggroModels.php   | 4 ++--
 app/Views/videos.php         | 2 +-
 public/.htaccess             | 4 ++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Helpers/aggro_helper.php b/app/Helpers/aggro_helper.php
index 4a519a0..c0ea834 100644
--- a/app/Helpers/aggro_helper.php
+++ b/app/Helpers/aggro_helper.php
@@ -119,7 +119,7 @@ function clean_feed_cache()
      */
     function clean_thumbnail($videoid)
     {
-        $path = ROOTPATH . 'public/thumbs/' . $videoid . '.jpg';
+        $path = ROOTPATH . 'public/thumbs/' . $videoid . 'webp';
         if (file_exists($path)) {
             unlink($path);
         }
@@ -208,7 +208,7 @@ function fetch_feed($feed, $spoof, $cache = 1800)
     function fetch_thumbnail($videoid, $thumbnail)
     {
         helper('aggro');
-        $path   = ROOTPATH . 'public/thumbs/' . $videoid . '.jpg';
+        $path   = ROOTPATH . 'public/thumbs/' . $videoid . '.webp';
         $buffer = fetch_url($thumbnail);
 
         if (! empty($buffer)) {
@@ -219,6 +219,7 @@ function fetch_thumbnail($videoid, $thumbnail)
             Config\Services::image()
                 ->withFile($path)
                 ->resize(600, 338, false, 'width')
+                ->convert(IMAGETYPE_WEBP)
                 ->save($path, 40);
 
             return true;
diff --git a/app/Models/AggroModels.php b/app/Models/AggroModels.php
index 3ed7208..8d8c745 100644
--- a/app/Models/AggroModels.php
+++ b/app/Models/AggroModels.php
@@ -82,7 +82,7 @@ public function checkThumbs()
         $thumbs = $query->getResult();
 
         foreach ($thumbs as $thumb) {
-            $path = ROOTPATH . 'public/thumbs/' . $thumb->video_id . '.jpg';
+            $path = ROOTPATH . 'public/thumbs/' . $thumb->video_id . '.webp';
 
             if (! file_exists($path)) {
                 $message = $thumb->video_id . ' missing thumbnail';
@@ -129,7 +129,7 @@ public function checkVideo($videoid)
     public function cleanThumbs()
     {
         $utilityModel = new UtilityModels();
-        $thumbs       = ROOTPATH . 'public/thumbs/*.jpg';
+        $thumbs       = ROOTPATH . 'public/thumbs/*.webp';
 
         $files = glob($thumbs);
         $now   = time();
diff --git a/app/Views/videos.php b/app/Views/videos.php
index 227eb45..d3b76da 100644
--- a/app/Views/videos.php
+++ b/app/Views/videos.php
@@ -18,7 +18,7 @@
 <?php foreach ($build as $row) :?>
     <div class="box box--video">
       <a href="/video/<?= $row->video_id; ?>">
-        <img src="/thumbs/<?= $row->video_id; ?>.jpg" width="340" height="192" alt="">
+        <img src="/thumbs/<?= $row->video_id; ?>.webp" width="340" height="192" alt="">
         <p><?= htmlspecialchars_decode($row->video_title ?? ''); ?></p>
       </a>
     </div>
diff --git a/public/.htaccess b/public/.htaccess
index 38c4728..cc05933 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,6 +1,10 @@
 # Disable directory browsing
 Options All -Indexes
 
+# Add webp and avif image format support
+AddType image/webp .webp
+AddType image/avif .avif
+
 # ----------------------------------------------------------------------
 # Rewrite engine
 # ----------------------------------------------------------------------

From 1fb10f4db1237caa477832642820fea154703c24 Mon Sep 17 00:00:00 2001
From: Jason Morris <jasonmorris@fastmail.com>
Date: Tue, 6 Feb 2024 20:47:49 -0500
Subject: [PATCH 2/2] Add webp placeholder, remove jpg version

---
 public/placeholder.jpg  | Bin 3181 -> 0 bytes
 public/placeholder.webp | Bin 0 -> 1418 bytes
 public/thumbs/.htaccess |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 public/placeholder.jpg
 create mode 100644 public/placeholder.webp

diff --git a/public/placeholder.jpg b/public/placeholder.jpg
deleted file mode 100644
index 0cc96e390e13e0edd7c3765bd5c20833ec5865f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3181
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
MYX9E|7->iU35)d2cK`qY

diff --git a/public/placeholder.webp b/public/placeholder.webp
new file mode 100644
index 0000000000000000000000000000000000000000..285541b0067eead8fb5ab6f1a8cb21d2e2e683e9
GIT binary patch
literal 1418
zcmWIYbaQKBWnc(*bqWXzuuv!ivJG4q<}zwUFa<H%&GlRAr@BOWnZl<N5(k7kGxHvn
zCra7<zgcv9;`cNA%a`okw`TRO<K~Am%acA`Vt-z8L%uEa2#0`zLn9LlgyQV|$|qw{
z@bGXul#)B5_v|OzF4nnLB`+^8_nT|A){<H45mYsZax~nx5Uv_kFJ7MX=Y4ObU+;eM
z(20lX&#E187XZza5xQ)`eXfp&`(nvvrasv%nmaeKpUhu@<SL%2@gga8|4w^yh}>Ss
zBN_Gh@sfMI#ztaZt|g4IoX5W@mYbh2y`Tejv9-pj6%nQpOt+tiWp^CVW%WAV?RcT5
zM36g{=^V^gP8puYEC<_XDZhHS;k3o)11|2Ln!=I7h3gLEB>%S^&)*$>b3MWBVRY{&
z-V$zDh*<N66;GMVzKQ4iFNa5SR!?&>x@dHV`(F3YO%sgPA;NayxhqfWHq8$}ge~6i
zL5T%wsGPvS@b7<<|NlI8`JVs(|18*_Z_oeh)Aop)LJW>^am@@2>^B7VGD$c!3j`!_
z1-Ki{=CJpf^6*lw2CK6L_oP69Ia6on{l3BK|Mh_8#7Ob*<4@+zVqYt&9Ao_DTyFmJ
zFb=`O(#~@`_pf;y(RF#_xgFn)R`To<>kBfO{`uk(cQ>8rWkEZ(9^&SIef3ohv-kDd
zw}s#Qch*)P+#>gqeaD=R18dWwtCW?D&lYh!6R28YWGRra;p&9d7yia`$FTkmS^9_d
z&X<S0cfZ-|=fwO7Grq;A{~+Ou^yxme3w%K?{;F|Gn@X=pi(k6swfcua!|}+QEA}i8
z-P>rk{$+@JlA_4810Q$S9#!jW;J4A#n{uy4BlW+q>;;Z_clnZ2_uaf*S&=22Fm;3P
zBaaTYKYb_smtH=U<=&FKX2Q<@)7X!NWVg+*n6#2#nCnqe;LCHXKk2gnx{<<MF}Z7#
z+QUS@&iZ*9BrYTrd)<?ecW;k>`+u={>YmM8w{9=&`EZBR!{N|jHtBtvr&_dTudeWC
ze{ikiemtA%_j-XT8+7;dPCd{sQrI?I;?>QACiZ<gp8g)uxnZ}Ktd(Bk_V?i;L&@6B
zDSB@+1egQ`_1o@ce4OmJ_3^!bJMwmh&wMx`Q)TXFnSR@gmw$h)d73}*cYN)NSgSiq
zo^8Lh&PuuI_n9Uhx$K!;sJi)G?BZ4~i<lqcTrc$N|KD7>FF#aHOmgNUR--ju;#xOs
z9v;28lV4<4es1t3^QR^6u4(ZUStMD`SQPN&XVKzto+qwLuk7=2&u9Iiz*Uwz)nI{0
z%wcXT&WC0UbCWXDJ|5`4H0@9DhmTWTkIL8Zs&T9^njmCq|1@Coz2>I*UB0<nMPzh;
zG#<MlU~}zM)Q_|A)k}XK+MM;8{dL9S=(YJN*Kcn*zeOf@qPdZh$>W=f^>RyJAC%k9
z`}vXJR`IAeD%G2q7)z5Bo@^~Wxyv?B(%DP@&(2tuR?mvF$CjF}KYshKTzuo)Ia9Xv
zU)Xm25MxT?uMUj`{^y@8WILhF)NddqSoAcCapK!MHFuv+d)%jzbXEJp^S-zhv98^L
z$KRiwxF<yQpUML#S6=b1v};q&oUdmnp5|-iEp#bBNlk8j)Q^<OUR?|fEg}+4;9SAu
N=-8oQ2rP3M7yywQjQ#)s

literal 0
HcmV?d00001

diff --git a/public/thumbs/.htaccess b/public/thumbs/.htaccess
index 12a23aa..75ae708 100644
--- a/public/thumbs/.htaccess
+++ b/public/thumbs/.htaccess
@@ -3,5 +3,5 @@
   RewriteEngine on
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteRule ^.*(\.gif|\.jpe?g|\.png)$ /placeholder.jpg [L]
+  RewriteRule ^.*(\.jpe?g|\.png|\.webp)$ /placeholder.webp [L]
 </IfModule>