changing convert to magick command because of deprecation

debug/thumbnailer.mjs

@@ -32,7 +32,7 @@ for(let item of items) {
     if(mime.startsWith('video/') || mime == 'image/gif')
       await exec(`ffmpegthumbnailer -i./public/b/${filename} -s1024 -o./tmp/${itemid}.png`);
     else if(mime.startsWith('image/') && mime != 'image/gif')
-      await exec(`convert ./public/b/${filename} ./tmp/${itemid}.png`);
+      await exec(`magick ./public/b/${filename} ./tmp/${itemid}.png`);
     else if(mime.startsWith('audio/')) {
       if(link.match(/soundcloud/)) {
         let cover = (await exec(`yt-dlp --get-thumbnail "${link}"`)).stdout.trim();
@@ -42,8 +42,8 @@ for(let item of items) {
             await exec(`wget "${cover}" -O ./tmp/${itemid}.jpg`);
             const size = (await fs.promises.stat(`./tmp/${itemid}.jpg`)).size;
             if(size >= 0) {
-              await exec(`convert ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
-              await exec(`convert ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
+              await exec(`magick ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
+              await exec(`magick ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
             }
           } catch(err) {
             //console.log(err);
@@ -51,21 +51,21 @@ for(let item of items) {
         }
         else {
           await exec(`ffmpeg -i ./public/b/${filename} -update 1 -map 0:v -map 0:1 -c copy ./tmp/${itemid}.png`);
-          await exec(`convert ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
+          await exec(`magick ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
         }
       }
       else {
         await exec(`ffmpeg -i ./public/b/${filename} -update 1 -map 0:v -map 0:1 -c copy ./tmp/${itemid}.png`);
-        await exec(`convert ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
+        await exec(`magick ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
       }
     }
 
-    await exec(`convert "./tmp/${itemid}.png" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.webp`);
+    await exec(`magick "./tmp/${itemid}.png" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.webp`);
     await fs.promises.unlink(`./tmp/${itemid}.png`).catch(err => {});
     await fs.promises.unlink(`./tmp/${itemid}.jpg`).catch(err => {});
   } catch(err) {
     //console.log(err);
-    await exec(`convert ./mugge.png ./public/t/${itemid}.webp`);
+    await exec(`magick ./mugge.png ./public/t/${itemid}.webp`);
   }
   console.log(`current: ${itemid} (${count} / ${total})`);
   count++;
@@ -76,7 +76,7 @@ for(let item of items) {
     const itemid = item.id;
     const filename = item.dest;
     await exec(`ffmpegthumbnailer -i./public/b/${filename} -s1024 -o./debug/tmp/${itemid}`);
-    await exec(`convert "./debug/tmp/${itemid}" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.png`);
+    await exec(`magick "./debug/tmp/${itemid}" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.png`);
     await fs.unlink(`./debug/tmp/${itemid}`);
     console.log(`current: ${itemid} (${count} / ${total})`);
   } catch(err) {}

public/s/css/f0ck.css

@@ -72,7 +72,7 @@ html[theme='p1nk'] {
   --black: #000;
   --white: #fff;
   --gray: #262626;
-  --nav-bg: #2b2b2b;
+  --nav-bg: #201f1f;
   --nav-brand-border: inset 1px #242424;
   --nav-brand-bg: #171717;
   --navigation-links-bg: #201f1f;
@@ -1618,9 +1618,10 @@ span.placeholder {
 }
 
 @media (max-width: 1325px) {
-  .ranking {
+/* ranking page - idea */
+  /* .ranking {
     grid-template-columns: 1fr 1fr !important;
-  }
+  } */
 
   .by-user,
   .by-stats,
@@ -2401,7 +2402,7 @@ table.table tbody tr:nth-of-type(odd) {
 .ranking {
   display: grid;
   grid-template-columns: auto;
-  justify-content: center;
+  /* justify-content: center; */
 }
 
 .ranking div {
@@ -2414,15 +2415,15 @@ table.table tbody tr:nth-of-type(odd) {
 }
 
 .by-user {
-  grid-column: 1;
+  grid-row: 1;
 }
 
 .by-stats {
-  grid-column: 3;
+  grid-row: 3;
 }
 
 .by-hoster {
-  grid-column: 2;
+  grid-row: 2;
 }
 
 /* tags */
@@ -3016,3 +3017,7 @@ input#s_avatar {
 #s_avatar:hover {
   background: #ffffff0f;
 }
+.theforceofthree {
+  display: grid;
+  grid-template-columns: 0.4fr 1fr 0.4fr;
+}

src/inc/queue.mjs

@@ -62,7 +62,7 @@ export default new class queue {
     if(mime.startsWith('video/') || mime == 'image/gif')
       await this.exec(`ffmpegthumbnailer -i./public/b/${filename} -s1024 -o./tmp/${itemid}.png`);
     else if(mime.startsWith('image/') && mime != 'image/gif')
-      await this.exec(`convert "./public/b/${filename}[0]" ./tmp/${itemid}.png`);
+      await this.exec(`magick "./public/b/${filename}[0]" ./tmp/${itemid}.png`);
     else if(mime.startsWith('audio/')) {
       if(link.match(/soundcloud/)) {
         let cover = (await this.exec(`yt-dlp -f 'bv*[height<=720]+ba/b[height<=720] / wv*+ba/w' --get-thumbnail "${link}"`)).stdout.trim();
@@ -72,23 +72,23 @@ export default new class queue {
             await this.exec(`wget "${cover}" -O ./tmp/${itemid}.jpg`);
             const size = (await fs.promises.stat(`./tmp/${itemid}.jpg`)).size;
             if(size >= 0) {
-              await this.exec(`convert ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
-              await this.exec(`convert ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
+              await this.exec(`magick ./tmp/${itemid}.jpg ./tmp/${itemid}.png`);
+              await this.exec(`magick ./tmp/${itemid}.jpg ./public/ca/${itemid}.webp`);
             }
           } catch(err) {}
         }
         else {
           await this.exec(`ffmpeg -i ./public/b/${filename} -update 1 -map 0:v -map 0:1 -c copy ./tmp/${itemid}.png`);
-          await this.exec(`convert ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
+          await this.exec(`magick ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
         }
       }
       else {
         await this.exec(`ffmpeg -i ./public/b/${filename} -update 1 -map 0:v -map 0:1 -c copy ./tmp/${itemid}.png`);
-        await this.exec(`convert ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
+        await this.exec(`magick ./tmp/${itemid}.png ./public/ca/${itemid}.webp`);
       }
     }
 
-    await this.exec(`convert "./tmp/${itemid}.png" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.webp`);
+    await this.exec(`magick "./tmp/${itemid}.png" -resize "128x128^" -gravity center -crop 128x128+0+0 +repage ./public/t/${itemid}.webp`);
     await fs.promises.unlink(`./tmp/${itemid}.png`).catch(_=>{});
     await fs.promises.unlink(`./tmp/${itemid}.jpg`).catch(_=>{});
     return true;

src/inc/trigger/parser.mjs

@@ -247,7 +247,7 @@ export default async bot => {
         try {
           await queue.genThumbnail(filename, mime, itemid, link);
         } catch(err) {
-          await queue.exec(`convert ./mugge.png ./public/t/${itemid}.webp`);
+          await queue.exec(`magick ./mugge.png ./public/t/${itemid}.webp`);
         }
 
         let speed = lib.calcSpeed(size, end);

views/ranking.html

@@ -1,51 +1,63 @@
 @include(snippets/header)
 <div id="main">
   <div class="topf0ckers">
-    <h3>Top f0ckers of all time <br>- Ranking -</h3>
+    <h3>f0ck Rankings?</h3>
   </div>
-  <div class="ranking">
-    <div class="by-user">
-      <h3>Biggest taggers</h3>
-      <table class="table">
-        <tbody>
-        @for(let i = 0; i < list.length; i++)
+  <div class="theforceofthree">
+    <div class="triin">
+    </div>
+    <div class="ranking">
+      <div class="by-user">
+        <h3>Biggest taggers</h3>
+        <table class="table">
           <tr>
-            <td>{{ i + 1 }}</td>
-            <td><a href="/{{ list[i].avatar }}"><img class="avatar" src="/t/{{ list[i].avatar }}.webp"></a></td>
-            <td>@if(list[i].admin)&#11088;&nbsp;@endif<a href="/user/{!! list[i].user !!}">{!! list[i].user !!}</a></td>
-            <td>{{ list[i].count }}</td>
+            <th>Rank</th>
+            <th>Avatar</th>
+            <th>Username</th>
+            <th>Tagged</th>
           </tr>
-        @endfor
-        </tbody>
-      </table>
-    </div>
-    <div class="by-hoster">
-      <h3>Top {{ hoster.length }} hoster</h3>
-      <table class="table">
-        @each(hoster as host)
-        <tr><td>{{ host.part.length ? host.part : "Telegram" }}</td><td>{{ host.c }}</td></tr>
-        @endeach
-      </table>
-    </div>
-    <div class="by-stats">
-      <h3>Tag stats</h3>
-      <table class="table">
-        <tr><td>total</td><td>{{ stats.total }}</td></tr>
-        <tr><td>tagged</td><td>{{ stats.tagged }}</td></tr>
-        <tr><td>untagged</td><td>{{ stats.untagged }}</td></tr>
-        <tr><td>SFW</td><td>{{ stats.sfw }}</td></tr>
-        <tr><td>NSFW</td><td>{{ stats.nsfw }}</td></tr>
-        <tr><td>deleted</td><td>{{ stats.deleted }}</td></tr>
-        <tr><td>missing ids</td><td>{{ stats.untracked }}</td></tr>
-      </table>
+          <tbody>
+          @for(let i = 0; i < list.length; i++)
+            <tr>
+              <td>{{ i + 1 }}</td>
+              <td><a href="/{{ list[i].avatar }}"><img class="avatar" src="/t/{{ list[i].avatar }}.webp"></a></td>
+              <td>@if(list[i].admin)&#11088;&nbsp;@endif<a href="/user/{!! list[i].user !!}">{!! list[i].user !!}</a></td>
+              <td>{{ list[i].count }}</td>
+            </tr>
+          @endfor
+          </tbody>
+        </table>
+      </div>
+      <div class="by-hoster">
+        <h3>Top {{ hoster.length }} hoster</h3>
+        <table class="table">
+          @each(hoster as host)
+          <tr><td>{{ host.part.length ? host.part : "Telegram" }}</td><td>{{ host.c }}</td></tr>
+          @endeach
+        </table>
+      </div>
+      <div class="by-stats">
+        <h3>Tag stats</h3>
+        <table class="table">
+          <tr><td>total</td><td>{{ stats.total }}</td></tr>
+          <tr><td>tagged</td><td>{{ stats.tagged }}</td></tr>
+          <tr><td>untagged</td><td>{{ stats.untagged }}</td></tr>
+          <tr><td>SFW</td><td>{{ stats.sfw }}</td></tr>
+          <tr><td>NSFW</td><td>{{ stats.nsfw }}</td></tr>
+          <tr><td>deleted</td><td>{{ stats.deleted }}</td></tr>
+          <tr><td>missing ids</td><td>{{ stats.untracked }}</td></tr>
+        </table>
 
-      <h3>Top f0cks</h3>
-      <table class="table">
-        @each(favotop as favo)
-        <tr><td><a href="/{{ favo.item_id }}">{{ favo.item_id }}</a></td><td>{{ favo.favs }}</td></tr>
-        @endeach
-      </table>
+        <h3>Top f0cks</h3>
+        <table class="table">
+          @each(favotop as favo)
+          <tr><td><a href="/{{ favo.item_id }}">{{ favo.item_id }}</a></td><td>{{ favo.favs }}</td></tr>
+          @endeach
+        </table>
+      </div>
     </div>
-  </div>
+    <div class="triout">
+    </div>
+</div>
 </div>
 @include(snippets/footer)