Merge pull request 'dev' (#23) from dev into master

Reviewed-on: #23
2022-05-06 17:01:49 +02:00 · 2022-05-06 17:01:49 +02:00 · 06813a87d4
commit 06813a87d4
parent 4a1caac228 f5737e6f49
8 changed files with 120 additions and 52 deletions
--- a/public/s/css/f0ck.css
+++ b/public/s/css/f0ck.css
@ -474,6 +474,12 @@ html, body {
  overscroll-behavior-y: contain;
  overflow: overlay;
  font-size: 14px;
+  height: 100%;
+}
+@supports (-moz-appearance:none) {
+  html, body {
+    height: auto !important;
+  }
 }

 .noscript-badge {
@ -570,6 +576,7 @@ div#posts > a:hover::after {
 }

 .navbar {
+  position: -webkit-sticky;
  position: sticky;
  top: 0;
  padding: 0;
@ -1532,7 +1539,6 @@ table.table {
  min-width: max-content;
 }
 table.table thead tr {
-  text-align: left;
  font-weight: bolder;
  border-bottom: 1px solid var(--accent);
 }
@ -1541,6 +1547,7 @@ table.table tr {
 }
 table.table th, table.table td {
  padding: 7px 15px;
+  text-align: center;
 }
 table.table tbody tr:nth-of-type(odd) {
  background-color: var(--badge-tag);
--- a/src/inc/lib.mjs
+++ b/src/inc/lib.mjs
@ -64,8 +64,17 @@ export default new class {
    if(env.tag) link.push("tag", env.tag);
    if(env.user) link.push("user", env.user, env.type ?? 'f0cks');
    if(env.mime.length > 2) link.push(env.mime);
-    if(env.page) link.push("p", env.page);
-    return link.join("/");
+
+    let tmp = link.length === 0 ? '/' : link.join('/');
+    if(!tmp.endsWith('/'))
+      tmp = tmp + '/';
+    if(!tmp.startsWith('/'))
+      tmp = '/' + tmp;
+
+    return {
+      main: tmp,
+      path: env.path ? env.path : ''
+    };
  };
  parseTag(tag) {
    if(!tag)
--- a/src/inc/routeinc/f0cklib.mjs
+++ b/src/inc/routeinc/f0cklib.mjs
@ -161,7 +161,7 @@ export default {
    for(let i = Math.max(1, act_page - 3); i <= Math.min(act_page + 3, pages); i++)
      cheat.push(i);
  
-    const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks' });
+    const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks', path: 'p/' });
  
    data = {
      success: true,
@ -172,11 +172,10 @@ export default {
        prev: (act_page > 1) ? act_page - 1 : null,
        next: (act_page < pages) ? act_page + 1 : null,
        page: act_page,
-        cheat: cheat,
-        uff: false
+        cheat: cheat
      },
-      link: link,
-      tmp: tmp
+      link,
+      tmp
    };
    return data;
  },
@ -279,7 +278,7 @@ export default {
  
    const tags = await lib.getTags(itemid);
    const cheat = [...new Set(items.slice(Math.max(0, item - 3), item + 4).map(i => i.id))];
-    const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks' });
+    const link = lib.genLink({ user, tag, mime, type: o.fav ? 'favs' : 'f0cks', path: '' });
    const favorites = await db`
      select "user".user, "user_options".avatar
      from "favorites"
@ -327,12 +326,11 @@ export default {
        next: items[item + 1]?.id,
        prev: items[item - 1]?.id,
        page: actitem.id,
-        cheat: cheat,
-        uff: true
+        cheat: cheat
      },
      phrase: cfg.websrv.phrases[~~(Math.random() * cfg.websrv.phrases.length)],
-      link: link,
-      tmp: tmp
+      link,
+      tmp
    };
    return data;
  },
--- a/src/inc/routes/search.mjs
+++ b/src/inc/routes/search.mjs
@ -2,42 +2,92 @@ import db from "../sql.mjs";
 import lib from "../lib.mjs";
 import search from "../routeinc/search.mjs";

+const _eps = 20;
+
 export default (router, tpl) => {
  router.get(/^\/search(\/)?$/, lib.auth, async (req, res) => {
    let ret;
-    let tag = req.url.qs?.tag;
-    if(Object.keys(req.url.qs).length > 0) {
-      let rows;
+    let tag = req.url.qs.tag ?? [];
+    let page = req.url.qs.page ?? 1;
+    let total = 0;
+    let pagination, link;
+
+    if(tag.length > 1) {
+      if(tag.startsWith('src:')) {
+        total = (await db`
+          select count(*) as total
+          from "items"
+          where src ilike ${'%' + tag.substring(4) + '%'}
+          group by "items".id, "tags".tag
+        `).length;
+      }
+      else {
+        total = (await db`
+          select count(*) as total
+          from "tags"
+          left join "tags_assign" on "tags_assign".tag_id = "tags".id
+          left join "items" on "items".id = "tags_assign".item_id
+          where "tags".tag ilike ${'%' + tag + '%'}
+          group by "items".id, "tags".tag
+        `).length;
+      }
+
+      const pages = +Math.ceil(total / _eps);
+      const act_page = Math.min(pages, page || 1);
+      const offset = Math.max(0, (act_page - 1) * _eps);

      if(tag.startsWith('src:')) {
-        tag = tag.substring(4);
        ret = await db`
          select *
          from "items"
-          where src ilike ${'%' + tag + '%'}
-          limit 500
+          where src ilike ${'%' + tag.substring(4) + '%'}
+          group by "items".id, "tags".tag
+          offset ${offset}
+          limit ${_eps}
        `;
      }
      else {
-        rows = await db`
+        const rows = await db`
          select "items".id, "items".username, "items".mime, "tags".tag
          from "tags"
          left join "tags_assign" on "tags_assign".tag_id = "tags".id
          left join "items" on "items".id = "tags_assign".item_id
          where "tags".tag ilike ${'%' + tag + '%'}
-          limit 500
+          group by "items".id, "tags".tag
+          offset ${offset}
+          limit ${_eps}
        `;
        ret = search(rows, tag);
      }
+
+      const cheat = [];
+      for(let i = Math.max(1, act_page - 3); i <= Math.min(act_page + 3, pages); i++)
+        cheat.push(i);
+
+      pagination = {
+        start: 1,
+        end: pages,
+        prev: (act_page > 1) ? act_page - 1 : null,
+        next: (act_page < pages) ? act_page + 1 : null,
+        page: act_page,
+        cheat: cheat,
+        uff: false
+      };
+      link = {
+        main: `/search/?tag=${tag}`,
+        path: '&page='
+      };
    }
-  
+
    res.reply({
      body: tpl.render("search", {
        result: ret,
        totals: await lib.countf0cks(),
        searchstring: tag,
-        session: req.session,
-        tmp: null
+        count: total,
+        tmp: null,
+        pagination,
+        link
      }, req)
    });
  });
--- a/views/index.html
+++ b/views/index.html
@ -1,10 +1,10 @@
@include(snippets/header)
  <div class="index-container">
    @if(tmp.user)<h2>user: {!! tmp.user.toLowerCase() !!}@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
-    @if(tmp.tag)<h2>tag: @if(session)<a href="/admin/test?tag={!! tmp.tag.toLowerCase() !!}" target="_blank">{!! tmp.tag.toLowerCase() !!}</a>@else{!! tmp.tag.toLowerCase() !!}@endif@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
+    @if(tmp.tag)<h2>tag: @if(session)<a href="/search?tag={!! tmp.tag.toLowerCase() !!}" target="_blank">{!! tmp.tag.toLowerCase() !!}</a>@else{!! tmp.tag.toLowerCase() !!}@endif@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
    <div id="posts">
      @each(items as item)
-      <a href="/{{ link }}@if(link.length != 0)/@endif{{ item.id }}" data-mime="{{ item.mime }}" data-mode="{{ item.tag_id ? ['','sfw','nsfw'][item.tag_id] : 'null' }}" style="background-image: url('/t/{{ item.id }}.webp')"><p></p></a>
+      <a href="{{ link.main }}{{ item.id }}" data-mime="{{ item.mime }}" data-mode="{{ item.tag_id ? ['','sfw','nsfw'][item.tag_id] : 'null' }}" style="background-image: url('/t/{{ item.id }}.webp')"><p></p></a>
      @endeach
    </div>
    <div id="footbar">
--- a/views/item.html
+++ b/views/item.html
@ -4,7 +4,7 @@
      <div class="next-post">
        @if(pagination.prev)
        <div class="arrow-next">
-          <a id="next" href="/{{ link }}@if(link.length != 0)/@endif{{ pagination.prev }}"></a>
+          <a id="next" href="{{ link.main }}{{ pagination.prev }}"></a>
        </div>
        @else
        <div class="arrow-next">
@ -34,7 +34,7 @@
      <div class="previous-post">
        @if(pagination.next)
        <div class="arrow-prev">
-          <a id="prev" href="/{{ link }}@if(link.length != 0)/@endif{{ pagination.next }}"></a>
+          <a id="prev" href="{{ link.main }}{{ pagination.next }}"></a>
        </div>
        @else
        <div class="arrow-prev">
--- a/views/search.html
+++ b/views/search.html
@ -1,30 +1,34 @@
@include(snippets/header)
 <h1 style="text-align: center">f0ckgle</h1>
 <form action="/search" class="admin-search">
-  <input type="text" name="tag" value="{!! searchstring !!}" /><button type="submit"><b>f0ck</b></button>
+  <input type="text" name="tag" value="{!! searchstring || '' !!}" /><button type="submit"><b>f0ck</b></button>
 </form>
 <div class="results">
  @if(result)
-  <h1>{{ result.length }} f0cks given:</h1>
-  <table style="width: 100%;" class="table">
-    <tr>
-      <th>Thumbnail</th>
-      <th>ID</th>
-      <th>Tag</th>
-      <th>Mime</th>
-      <th>Username</th>
-      <th>Score</th>
-    </tr>
+  <h1>{{ count }} f0cks given (page {{ pagination.page }} of {{ pagination.end }}):</h1>
+  <table style="width: 100%" class="table">
+    <thead>
+      <tr>
+        <th>Thumbnail</th>
+        <th>ID</th>
+        <th>Tag</th>
+        <th>Mime</th>
+        <th>Username</th>
+        <th>Score</th>
+      </tr>
+    </thead>
+    <tbody>
  @each(result as line)
-    <tr>
-      <td style="width: 128px;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank"><img src="/t/{{ line.id }}.webp" /></a></td>
-      <td style="text-align: center;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank">{{ line.id }}</a></td>
-      <td style="text-align: center;"><a href="/tag/{!! line.tag !!}">{!! line.tag !!}</a></td>
-      <td style="text-align: center;">{{ line.mime }}</td>
-      <td style="text-align: center;"><a href="/user/{!! line.username !!}/f0cks/{{ line.id }}">{!! line.username !!}</a></td>
-      <td style="text-align: center;">{{ line.score.toFixed(2) }}</td>
-    </tr>
+      <tr>
+        <td style="width: 128px;"><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank"><img src="/t/{{ line.id }}.webp" /></a></td>
+        <td><a href="/tag/{!! line.tag !!}/{{ line.id }}" target="_blank">{{ line.id }}</a></td>
+        <td><a href="/tag/{!! line.tag !!}">{!! line.tag !!}</a></td>
+        <td>{{ line.mime }}</td>
+        <td><a href="/user/{!! line.username !!}/f0cks/{{ line.id }}">{!! line.username !!}</a></td>
+        <td>{{ line.score.toFixed(2) }}</td>
+      </tr>
  @endeach
+    </tbody>
  </table>
  @endif
 </div>
--- a/views/snippets/navbar.html
+++ b/views/snippets/navbar.html
@ -64,17 +64,17 @@
      <div class="pagination-wrapper">
        @if(typeof pagination !== "undefined")
        <nav class="pagination">
-          <a href="/{{ link }}@if(link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.start }}" class="page-item-1 btn start@if(!pagination.prev) disabled@endif">&laquo;</a>
-          <a href="/{{ link }}@if(link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.prev }}" class="page-item-2 btn prev@if(!pagination.prev) disabled@endif">&lsaquo;</a>
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.start }}" class="page-item-1 btn start@if(!pagination.prev) disabled@endif">&laquo;</a>
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.prev }}" class="page-item-2 btn prev@if(!pagination.prev) disabled@endif">&lsaquo;</a>
          @each(pagination.cheat as i)
            @if(i == pagination.page)
              <span class="btn disabled">{{ i }}</span>
            @else
-              <a href="/{{ link }}@if(link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ i }}" class="pagination-int-item btn">{{ i }}</a>
+              <a href="{{ link.main }}{{ link.path }}{{ i }}" class="pagination-int-item btn">{{ i }}</a>
            @endif
          @endeach
-          <a href="/{{ link }}@if(link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.next }}" class="page-item-3 btn next@if(!pagination.next) disabled@endif">&rsaquo;</a>
-          <a href="/{{ link }}@if(link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.end }}" class="page-item-4 btn start@if(!pagination.next) disabled@endif">&raquo;</a>
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.next }}" class="page-item-3 btn next@if(!pagination.next) disabled@endif">&rsaquo;</a>
+          <a href="{{ link.main }}{{ link.path }}{{ pagination.end }}" class="page-item-4 btn start@if(!pagination.next) disabled@endif">&raquo;</a>
        </nav>
        @endif
      </div>