Add own 88x31

(and rename icon->img, btw...)

blueprints/risdeveau/templates/contacts.pug

@@ -2,29 +2,29 @@
   h3 Development
   .blocks.badges
     a.block(href="//g.lair.moe/Sweetbread")
-      img.icon(src="/static/img/service/gitea.webp")
+      img.img(src="/static/img/service/gitea.webp")
       |  Gitea
 
     a.block(href="https://github.com/VerySweetBread")
-      img.icon(src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png")
+      img.img(src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png")
       |  GitHub
 
     a.block(href="https://git.kolibrios.org/Sweetbread")
-      img.icon(src="https://git.kolibrios.org/assets/img/logo.svg")
+      img.img(src="https://git.kolibrios.org/assets/img/logo.svg")
       |  KolibriOS Git
 
   h3 Contacts
   .blocks.badges
     a.block(href="https://matrix.to/#/@risdeveau:lair.moe")
-      img.icon(src="https://matrix.org/assets/favicon.ico")
+      img.img(src="https://matrix.org/assets/favimg.ico")
       |  Matrix
 
     a.block(href="//b.lair.moe/@risdeveau")
-      img.icon(src="/static/img/service/sharkey.webp")
+      img.img(src="/static/img/service/sharkey.webp")
       |  Fediverse
 
     a.block(href="https://discord.com/users/459823895256498186")
-      img.icon(src="https://cdn.prod.website-files.com/6257adef93867e50d84d30e2/66e3d80db9971f10a9757c99_Symbol.svg")
+      img.img(src="https://cdn.prod.website-files.com/6257adef93867e50d84d30e2/66e3d80db9971f10a9757c99_Symbol.svg")
       |  Discord
 
     a.block(href="mailto:risdeveau@lair.moe") Mail
@@ -32,9 +32,9 @@
   h3 Game accounts
   .blocks.badges
     a.block(href="https://steamcommunity.com/id/risdeveau")
-      img.icon(src="https://store.steampowered.com/favicon.ico")
+      img.img(src="https://store.steampowered.com/favimg.ico")
       |  Steam
 
     a.block(href="https://gamebanana.com/members/3899828")
-      img.icon(src="https://images.gamebanana.com/static/img/favicon/favicon.ico")
+      img.img(src="https://images.gamebanana.com/static/img/favimg/favimg.ico")
       |  GameBanana

blueprints/risdeveau/templates/index.pug

@@ -7,15 +7,14 @@ html(lang="en")
     each f in ('tw', 'main', 'risdeveau')
       link(rel="stylesheet", href="/static/style/#{f}.css")
 
-    link(rel="icon" type="image/webp" href="/static/img/us/risdeveau.webp")
+    link(rel="img" type="image/webp" href="/static/img/us/risdeveau.webp")
 
     script(src="/static/script/rtime.js")
-    if request.headers.get('DNT') != "1":
+    script(
-      script(
+      src="https://track.lair.moe/api/script.js"
-        src="https://track.lair.moe/api/script.js"
+      data-site-id="1"
-        data-site-id="1"
+      defer
-        defer
+    )
-      )
     script(
       src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.8/dist/htmx.min.js"
       integrity="sha384-/TgkGk7p307TH7EXJDuUlgG3Ce1UVolAOFopFekQkkXihi5u/6OCvVKyz1W+idaz"

blueprints/root/__init__.py

@@ -1,8 +1,6 @@
 from htmlmin import minify
 from flask import Blueprint, render_template, request, jsonify
 
-from .modules.euroring import data as euroring_data, refresh_cache as euroring_refresh
-
 bp = Blueprint(
     "root",
     __name__,
@@ -11,9 +9,8 @@ bp = Blueprint(
 )
 
 def render_tmpl(filename: str) -> str:
-    euroring_refresh()
     return minify(
-        render_template(filename, euroring=euroring_data),
+        render_template(filename),
         remove_empty_space=True
     )
 

blueprints/root/modules/euroring.py

@@ -1,188 +0,0 @@
-from __future__ import annotations
-
-import atexit
-import os
-import re
-from time import time
-from urllib.parse import urlsplit
-
-import requests
-from apscheduler.schedulers.background import BackgroundScheduler
-from apscheduler.triggers.interval import IntervalTrigger
-
-from blueprints.risdeveau.modules.api.scheduler_guard import should_start_scheduler
-from blueprints.risdeveau.modules.api.shared_cache import (
-    atomic_write_json,
-    cache_file,
-    load_json_if_newer,
-)
-
-
-EURORING_SOURCE_URL = os.environ.get(
-    "EURORING_SOURCE_URL",
-    "https://euroring.neocities.org/scripts/onionring-variables.js",
-)
-EURORING_SITE_URL = os.environ.get("EURORING_SITE_URL", "https://lair.moe")
-EURORING_TIMEOUT = float(os.environ.get("EURORING_TIMEOUT", "10"))
-
-
-data = {
-    "enabled": bool(EURORING_SOURCE_URL and EURORING_SITE_URL),
-    "status": "disabled",
-    "source_url": EURORING_SOURCE_URL,
-    "site_url": EURORING_SITE_URL,
-    "ring_name": "",
-    "index_url": None,
-    "prev_url": None,
-    "next_url": None,
-    "count": 0,
-    "last_updated": 0,
-}
-
-_IS_WRITER = should_start_scheduler() if data["enabled"] else False
-_CACHE_PATH = cache_file("webring")
-_CACHE_MTIME = 0.0
-
-
-def _site_key(url: str) -> tuple[str, int | None, str, str]:
-    parts = urlsplit(url.strip())
-    hostname = (parts.hostname or "").lower()
-    port = parts.port
-    path = re.sub(r"/+$", "", parts.path or "")
-    query = parts.query or ""
-    return hostname, port, path, query
-
-
-def _parse_js_string_value(text: str, variable: str) -> str | None:
-    match = re.search(
-        rf"var\s+{re.escape(variable)}\s*=\s*(['\"])(.*?)\1\s*;",
-        text,
-        re.S,
-    )
-    if not match:
-        return None
-    return match.group(2).strip()
-
-
-def _parse_sites(text: str) -> list[str]:
-    match = re.search(r"var\s+sites\s*=\s*\[(.*?)\]\s*;", text, re.S)
-    if not match:
-        raise ValueError("sites array not found")
-
-    sites_block = match.group(1)
-    sites: list[str] = []
-
-    for raw_line in sites_block.splitlines():
-        line = raw_line.strip()
-        if not line or line.startswith("//"):
-            continue
-
-        site_match = re.match(
-            r"(?P<quote>['\"])(?P<url>.*?)(?P=quote)\s*,?\s*(?://.*)?$",
-            line,
-        )
-        if site_match:
-            sites.append(site_match.group("url").strip())
-
-    if not sites:
-        raise ValueError("sites array is empty")
-
-    return sites
-
-
-def _compute_ring_payload(text: str) -> dict:
-    sites = _parse_sites(text)
-    target_key = _site_key(EURORING_SITE_URL)
-
-    current_index = None
-    for i, site in enumerate(sites):
-        if _site_key(site) == target_key:
-            current_index = i
-            break
-
-    if current_index is None:
-        raise ValueError(f"site not found in ring: {EURORING_SITE_URL}")
-
-    ring_name = _parse_js_string_value(text, "ringName") or "Webring"
-    index_url = _parse_js_string_value(text, "indexPage")
-
-    return {
-        "enabled": True,
-        "status": "success",
-        "source_url": EURORING_SOURCE_URL,
-        "site_url": EURORING_SITE_URL,
-        "ring_name": ring_name,
-        "index_url": index_url,
-        "prev_url": sites[(current_index - 1) % len(sites)],
-        "next_url": sites[(current_index + 1) % len(sites)],
-        "count": len(sites),
-        "last_updated": time(),
-    }
-
-
-def refresh_cache() -> None:
-    global _CACHE_MTIME
-    if _IS_WRITER:
-        return
-
-    payload, mtime = load_json_if_newer(_CACHE_PATH, _CACHE_MTIME)
-    if payload is None:
-        return
-
-    data.update(payload)
-    _CACHE_MTIME = mtime
-
-
-
-def _persist_cache() -> None:
-    if not _IS_WRITER:
-        return
-    atomic_write_json(_CACHE_PATH, data)
-
-
-
-def fetch_webring() -> None:
-    if not data["enabled"]:
-        return
-
-    previous_state = dict(data)
-
-    try:
-        response = requests.get(EURORING_SOURCE_URL, timeout=EURORING_TIMEOUT)
-        response.raise_for_status()
-        payload = _compute_ring_payload(response.text)
-        data.update(payload)
-    except Exception as exc:
-        data.update({
-            "enabled": True,
-            "status": f"error: {exc}",
-            "source_url": EURORING_SOURCE_URL,
-            "site_url": EURORING_SITE_URL,
-            "ring_name": data.get("ring_name") or "Webring",
-            "index_url": data.get("index_url"),
-            "prev_url": data.get("prev_url"),
-            "next_url": data.get("next_url"),
-            "count": data.get("count", 0),
-            "last_updated": data.get("last_updated", 0),
-        })
-
-    if data != previous_state:
-        _persist_cache()
-
-
-if data["enabled"]:
-    scheduler = BackgroundScheduler()
-
-    if _IS_WRITER:
-        scheduler.add_job(
-            func=fetch_webring,
-            trigger=IntervalTrigger(days=1),
-            id="root.webring.refresh",
-            replace_existing=True,
-        )
-        _persist_cache()
-        scheduler.start()
-        fetch_webring()
-        atexit.register(lambda: scheduler.shutdown())
-    else:
-        refresh_cache()

blueprints/root/static/style/main.scss

@@ -138,7 +138,7 @@ footer {
     align-items: center;
     font-size: x-large;
 
-    .icon {
+    .img {
       margin-right: .5ch;
     }
   }
@@ -174,7 +174,7 @@ footer {
   }
 }
 
-.icon {
+.img {
   width: 1.5em;
   vertical-align: middle;
   border-radius: .2em;
@@ -185,8 +185,6 @@ footer {
   display: flex;
   justify-content: center;
 
-  & + & { margin-top: .25rem; }
-
   a {
     padding: .5rem 1rem;
     margin: .1rem !important;

blueprints/root/templates/base.pug

@@ -4,36 +4,14 @@ html(lang=g.locale)
     title Lair
 
     link(rel="stylesheet" href="/static/style/main.css")
-    link(rel="icon" type="image/webp" href="/static/img/lair.webp")
+    link(rel="img" type="image/webp" href="/static/img/lair.webp")
-
-    //- Yggdrasil links
-    link(rel="ygg-banner" href="/static/img/88x31/lair.gif")
-
-    link(
-      rel="alternate"
-      data-ygg-type="clearnet"
-      href="https://lair.moe"
-      title="Clearnet address")
-    link(
-      rel="alternate"
-      data-ygg-type="alfis"
-      href="http://lair.ygg"
-      title="Alfis domain")
-    link(
-      rel="alternate"
-      data-ygg-type="ygg-ipv6"
-      href="http://[201:96:5188::a690:7908:da7a]"
-      title="Direct IPv6")
 
     script(src="/static/script/copy-mono.js")
-
+    script(
-    if request.headers.get('DNT') != "1":
+      src="https://track.lair.moe/api/script.js"
-      script(
+      data-site-id="1"
-        src="https://track.lair.moe/api/script.js"
+      defer
-        data-site-id="1"
+    )
-        defer
-      )
-
     meta(name="viewport" content="width=device-width, initial-scale=1.0")
     meta(name="mock-email" content="admin@example.com")
 
@@ -43,16 +21,6 @@ html(lang=g.locale)
     meta(property="og:image" value="https://lair.moe/static/img/lair.webp")
     meta(property="og:description" value=_("description"))
 
-    //- Yggdrasil meta
-    meta(name="ygg-category" content="service")
-    meta(name="ygg-topic" content="federation")
-    meta(name="ygg-topic" content="tools")
-
-    meta(name="ygg-language" content="ru")
-    meta(name="ygg-language" content="en")
-    meta(name="ygg-language" content="de")
-    meta(name="ygg-language" content="fr")
-    meta(name="ygg-language" content="jp")
   body
     include root/templates/header.pug
 

blueprints/root/templates/index.pug

@@ -1,19 +1,19 @@
 extends root/templates/base.pug
 
 block title
-  img.icon(src="/static/img/lair.webp")
+  img.img(src="/static/img/lair.webp")
   |  Lair
 
 block content
   a.block(href="https://b.lair.moe" target="_blank")
     .header
-      img.icon(src="/static/img/service/sharkey.webp")
+      img.img(src="/static/img/service/sharkey.webp")
       strong Sharkey
     p= _('index.descr:sharkey')
 
   a.block(href="https://g.lair.moe" target="_blank")
     .header
-      img.icon(src="/static/img/service/gitea.webp")
+      img.img(src="/static/img/service/gitea.webp")
       strong Gitea
     p= _('index.descr:gitea')
 
@@ -67,28 +67,4 @@ block content
     p
       strong Yggdrasil
       | : 
-      ul
+      span.mono 200:ee1:bad2:1732:4b91:c3e3:2f08:29b3
-        li
-          = "IPv6: "
-          span.mono 201:96:5188::a690:7908:da7a
-        li
-          = "DNS: "
-          span.mono ygg.lair.moe
-        li
-          = "Alfis: "
-          span.mono lair.ygg
-
-  .webring
-    a.block(href="https://nixwebr.ing/prev/lair" rel="external prev") ←
-    a.block(href="https://nixwebr.ing/" rel="external") Nix webring
-    a.block(href="https://nixwebr.ing/next/lair" rel="external next") →
-
-  .webring
-    a.block(href="https://ctp-webr.ing/lair/previous" rel="external prev") ←
-    a.block(href="https://ctp-webr.ing/" rel="external") Catppuccin webring
-    a.block(href="https://ctp-webr.ing/lair/next" rel="external next") →
-
-  .webring
-    a.block(href=euroring.prev_url rel="external prev") ←
-    a.block(href=euroring.index_url rel="external") Euroring
-    a.block(href=euroring.next_url rel="external next") →

blueprints/root/templates/us.pug

@@ -6,12 +6,12 @@ block title
 block content
   a.block.green(href=url_for('risdeveau.index'))
     .header
-      img.icon(src="/static/img/us/risdeveau.webp")
+      img.img(src="/static/img/us/risdeveau.webp")
       | Sweetbread
     | Главный админ, занимается почти всеми сервисами. Создал этот сайт
 
   .block.orange.disabled
     .header
-      img.icon(src="/static/img/us/chest.webp")
+      img.img(src="/static/img/us/chest.webp")
       | Chest
     | Должна была помогать делать этот сайт