tmp

Dockerfile

@@ -14,7 +14,6 @@ FROM python:3.11-slim
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
     libmagic1 \
-    git \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

blueprints/risdeveau/__init__.py

@@ -15,8 +15,8 @@ import magic
 from htmlmin import minify
 from musicbrainzngs import get_image_front
 
-from .modules.api.lb import data as lb_data, refresh_cache as lb_refresh
+from .modules.api.lb import data as lb_data
-from .modules.api.steam import data as steam_data, refresh_cache as steam_refresh
+from .modules.api.steam import data as steam_data
 
 def tmsmp(sec: int) -> str:
     if sec == 0:
@@ -83,16 +83,10 @@ args = {
 
 @bp.route("/")
 def index():
-    lb_refresh()
-    steam_refresh()
     return render_tmpl('index.pug', **args)
 
 @bp.route("/m/<module>")
 def module(module):
-    if module == "listenbrainz":
-        lb_refresh()
-    elif module == "steam":
-        steam_refresh()
     if none_match := request.headers.get('if-none-match'):
         match module:
             case "listenbrainz":

blueprints/risdeveau/modules/api/lb.py

@@ -11,9 +11,6 @@ from apscheduler.triggers.interval import IntervalTrigger
 import requests
 from flask import Flask, jsonify
 
-from .scheduler_guard import should_start_scheduler
-from .shared_cache import atomic_write_json, cache_file, load_json_if_newer
-
 
 @dataclass
 class Cache:
@@ -21,7 +18,6 @@ class Cache:
     last_updated = time()
     status = None
 
-
 data = {
     "caches": {
         "now": Cache(),
@@ -31,55 +27,6 @@ data = {
     "etag": ""
 }
 
-_IS_WRITER = should_start_scheduler()
-_CACHE_PATH = cache_file("listenbrainz")
-_CACHE_MTIME = 0.0
-
-
-def refresh_cache() -> None:
-    """Refresh in-memory cache from the shared JSON file (for non-writer workers)."""
-    global _CACHE_MTIME
-    if _IS_WRITER:
-        return
-
-    payload, mtime = load_json_if_newer(_CACHE_PATH, _CACHE_MTIME)
-    if payload is None:
-        return
-
-    try:
-        data["etag"] = payload.get("etag", data.get("etag", ""))
-        data["last_updated"] = payload.get("last_updated", data.get("last_updated", time()))
-        caches = payload.get("caches", {})
-        for key, cache in data.get("caches", {}).items():
-            if isinstance(caches, dict) and key in caches and isinstance(caches[key], dict):
-                c = caches[key]
-                cache.data = c.get("data", cache.data)
-                cache.last_updated = c.get("last_updated", cache.last_updated)
-                cache.status = c.get("status", cache.status)
-    finally:
-        _CACHE_MTIME = mtime
-
-
-def _persist_cache() -> None:
-    """Persist current cache state to the shared JSON file (writer worker only)."""
-    if not _IS_WRITER:
-        return
-
-    payload = {
-        "etag": data.get("etag", ""),
-        "last_updated": data.get("last_updated", time()),
-        "caches": {
-            k: {
-                "data": v.data,
-                "last_updated": v.last_updated,
-                "status": v.status,
-            }
-            for k, v in data.get("caches", {}).items()
-        },
-    }
-    atomic_write_json(_CACHE_PATH, payload)
-
-
 def yt_cover(youtube_url):
     parsed_url = urlparse(youtube_url)
 
@@ -95,7 +42,6 @@ def yt_cover(youtube_url):
 
     return f"https://img.youtube.com/vi/{video_id}/2.jpg"
 
-
 def parse_listens(json: dict) -> dict:
     cover_replacing = {
         "1e699948-c7c8-4bb2-9f8b-62e14b882a5d": "ca464c1d-5848-45bb-b92d-b1e4b00f9d65",
@@ -140,11 +86,7 @@ def parse_listens(json: dict) -> dict:
 
     return new_json
 
-
 def api_request(url: str, cache: Cache):
-    changed = False
-    prev_status = cache.status
-
     try:
         response = requests.get(url, timeout=10)
         if response.status_code == 200:
@@ -158,36 +100,24 @@ def api_request(url: str, cache: Cache):
                 data['etag'] = md5(''.join(
                     ( dumps(data['caches'][x].data) for x in data['caches'] )
                 ).encode()).hexdigest()
-                changed = True
         else:
             cache.status = f'error: {response.status_code}'
     except Exception as e:
         cache.status = f'error: {str(e)}'
 
-    if prev_status != cache.status:
-        changed = True
-
-    if changed:
-        _persist_cache()
-
-
 scheduler = BackgroundScheduler()
+scheduler.add_job(
+    func=lambda: api_request("https://api.listenbrainz.org/1/user/risdeveau/listens?count=5", data['caches']['listens']),
+    trigger=IntervalTrigger(minutes=1),
+    id='risdeveau.listenbrainz.listens',
+    replace_existing=True
+)
+scheduler.add_job(
+    func=lambda: api_request("https://api.listenbrainz.org/1/user/risdeveau/playing-now", data['caches']['now']),
+    trigger=IntervalTrigger(seconds=15),
+    id='risdeveau.listenbrainz.playing-now',
+    replace_existing=True
+)
+scheduler.start()
 
-if _IS_WRITER:
+atexit.register(lambda: scheduler.shutdown())
-    scheduler.add_job(
-        func=lambda: api_request("https://api.listenbrainz.org/1/user/risdeveau/listens?count=5", data['caches']['listens']),
-        trigger=IntervalTrigger(minutes=1),
-        id='risdeveau.listenbrainz.listens',
-        replace_existing=True
-    )
-    scheduler.add_job(
-        func=lambda: api_request("https://api.listenbrainz.org/1/user/risdeveau/playing-now", data['caches']['now']),
-        trigger=IntervalTrigger(seconds=15),
-        id='risdeveau.listenbrainz.playing-now',
-        replace_existing=True
-    )
-    _persist_cache()
-    scheduler.start()
-    atexit.register(lambda: scheduler.shutdown())
-else:
-    refresh_cache()

blueprints/risdeveau/modules/api/scheduler_guard.py

@@ -1,35 +0,0 @@
-from __future__ import annotations
-
-import os
-import fcntl
-from typing import Optional
-
-_LOCK_FD: Optional[int] = None  # keep fd open for process lifetime
-
-
-def should_start_scheduler() -> bool:
-    """Return True in exactly one process (the scheduler owner).
-
-    Under gunicorn --workers N, code is imported in N processes. If APScheduler
-    starts at import time, you get N schedulers => N× API calls.
-
-    We prevent that by taking a non-blocking exclusive lock on a lockfile.
-    """
-    global _LOCK_FD
-    if _LOCK_FD is not None:
-        return True
-
-    lock_path = os.environ.get("LAIR_SCHED_LOCK", "/tmp/lair-scheduler.lock")
-    fd = os.open(lock_path, os.O_CREAT | os.O_RDWR, 0o644)
-    try:
-        fcntl.flock(fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-        _LOCK_FD = fd
-        return True
-    except BlockingIOError:
-        os.close(fd)
-        return False
-    except Exception:
-        try:
-            os.close(fd)
-        finally:
-            return False

blueprints/risdeveau/modules/api/shared_cache.py

@@ -1,53 +0,0 @@
-from __future__ import annotations
-
-import json
-import os
-import tempfile
-from typing import Any, Optional, Tuple
-
-
-def cache_dir() -> str:
-    """Directory where the scheduler owner writes shared cache JSON files."""
-    d = os.environ.get("LAIR_CACHE_DIR", "/tmp/lair-cache")
-    os.makedirs(d, exist_ok=True)
-    return d
-
-
-def cache_file(name: str) -> str:
-    return os.path.join(cache_dir(), f"{name}.json")
-
-
-def atomic_write_json(path: str, payload: dict) -> None:
-    """Write JSON atomically so readers never observe partial content."""
-    parent = os.path.dirname(path) or "."
-    fd, tmp = tempfile.mkstemp(prefix=".tmp-", dir=parent)
-    try:
-        with os.fdopen(fd, "w", encoding="utf-8") as f:
-            json.dump(payload, f, ensure_ascii=False, separators=(",", ":"))
-        os.replace(tmp, path)
-    finally:
-        try:
-            if os.path.exists(tmp):
-                os.unlink(tmp)
-        except Exception:
-            pass
-
-
-def load_json_if_newer(path: str, last_mtime: float) -> Tuple[Optional[dict], float]:
-    """Load JSON only if the file exists and has mtime newer than last_mtime."""
-    try:
-        st = os.stat(path)
-    except FileNotFoundError:
-        return None, last_mtime
-    except Exception:
-        return None, last_mtime
-
-    mtime = float(st.st_mtime)
-    if mtime <= float(last_mtime):
-        return None, last_mtime
-
-    try:
-        with open(path, "r", encoding="utf-8") as f:
-            return json.load(f), mtime
-    except Exception:
-        return None, last_mtime

blueprints/risdeveau/modules/api/steam.py

@@ -12,21 +12,16 @@ from apscheduler.triggers.interval import IntervalTrigger
 import requests
 from flask import Flask
 
-from .scheduler_guard import should_start_scheduler
-from .shared_cache import atomic_write_json, cache_file, load_json_if_newer
-
 
 TOKEN = environ.get("STEAM_TOKEN")
 MY_ID = 76561198826355942
 
-
 @dataclass
 class Cache:
     data = {}
     last_updated = time()
     status = None
 
-
 data = {
     "caches": {
         "recent": Cache(),
@@ -36,55 +31,6 @@ data = {
     "etag": ""
 }
 
-_IS_WRITER = should_start_scheduler()
-_CACHE_PATH = cache_file("steam")
-_CACHE_MTIME = 0.0
-
-
-def refresh_cache() -> None:
-    """Refresh in-memory cache from the shared JSON file (for non-writer workers)."""
-    global _CACHE_MTIME
-    if _IS_WRITER:
-        return
-
-    payload, mtime = load_json_if_newer(_CACHE_PATH, _CACHE_MTIME)
-    if payload is None:
-        return
-
-    try:
-        data["etag"] = payload.get("etag", data.get("etag", ""))
-        data["last_updated"] = payload.get("last_updated", data.get("last_updated", time()))
-        caches = payload.get("caches", {})
-        for key, cache in data.get("caches", {}).items():
-            if isinstance(caches, dict) and key in caches and isinstance(caches[key], dict):
-                c = caches[key]
-                cache.data = c.get("data", cache.data)
-                cache.last_updated = c.get("last_updated", cache.last_updated)
-                cache.status = c.get("status", cache.status)
-    finally:
-        _CACHE_MTIME = mtime
-
-
-def _persist_cache() -> None:
-    """Persist current cache state to the shared JSON file (writer worker only)."""
-    if not _IS_WRITER:
-        return
-
-    payload = {
-        "etag": data.get("etag", ""),
-        "last_updated": data.get("last_updated", time()),
-        "caches": {
-            k: {
-                "data": v.data,
-                "last_updated": v.last_updated,
-                "status": v.status,
-            }
-            for k, v in data.get("caches", {}).items()
-        },
-    }
-    atomic_write_json(_CACHE_PATH, payload)
-
-
 def modify_game_list(json: dict) -> dict:
     if 'games' in json.keys():
         apps = (3301060, 404790, 1281930, 1920960, 1325960, 431960)
@@ -97,7 +43,6 @@ def modify_game_list(json: dict) -> dict:
         json['games'] = new_games
     return json
 
-
 def steam_request(interface: str, method: str, v: int = 1, **kwargs) -> requests.Response:
     return requests.get(
         f"https://api.steampowered.com/{interface}/{method}/v{v:04}/",
@@ -105,11 +50,7 @@ def steam_request(interface: str, method: str, v: int = 1, **kwargs) -> requests
         timeout=10
     )
 
-
 def api_request(cache, *args, **kwargs):
-    changed = False
-    prev_status = cache.status
-
     try:
         response = steam_request(*args, **kwargs)
         if response.status_code == 200:
@@ -123,51 +64,31 @@ def api_request(cache, *args, **kwargs):
                 data['etag'] = md5(''.join(
                     ( dumps(data['caches'][x].data) for x in data['caches'] )
                 ).encode()).hexdigest()
-                changed = True
         else:
             cache.status = f'error: {response.status_code}'
+            print("x")
     except Exception as e:
         cache.status = f'error: {str(e)}'
 
-    if prev_status != cache.status:
-        changed = True
-
-    if changed:
-        _persist_cache()
-
-
 if TOKEN:
     scheduler = BackgroundScheduler()
+    scheduler.add_job(
+        func=lambda: api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=76561198826355942),
+        trigger=IntervalTrigger(minutes=15),
+        id='risdeveau.steam.recent',
+        replace_existing=True
+    )
+    scheduler.add_job(
+        func=lambda: api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=76561198826355942, include_appinfo=1, include_played_free_games=1),
+        trigger=IntervalTrigger(minutes=60),
+        id='risdeveau.steam.owned',
+        replace_existing=True
+    )
+    scheduler.start()
 
-    if _IS_WRITER:
+    api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=76561198826355942)
-        scheduler.add_job(
+    api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=76561198826355942, include_appinfo=1, include_played_free_games=1)
-            func=lambda: api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=MY_ID),
-            trigger=IntervalTrigger(minutes=15),
-            id='risdeveau.steam.recent',
-            replace_existing=True
-        )
-        scheduler.add_job(
-            func=lambda: api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=MY_ID, include_appinfo=1, include_played_free_games=1),
-            trigger=IntervalTrigger(minutes=60),
-            id='risdeveau.steam.owned',
-            replace_existing=True
-        )
 
-        _persist_cache()
+    atexit.register(lambda: scheduler.shutdown())
-        scheduler.start()
-
-        api_request(data['caches']['recent'], "IPlayerService", "GetRecentlyPlayedGames", steamid=MY_ID)
-        api_request(data['caches']['owned'], "IPlayerService", "GetOwnedGames", steamid=MY_ID, include_appinfo=1, include_played_free_games=1)
-
-        atexit.register(lambda: scheduler.shutdown())
-    else:
-        refresh_cache()
 else:
-    msg = "STEAM_TOKEN is not defined"
+    print("STEAM_TOKEN is not defined")
-    print(msg)
-    for c in data["caches"].values():
-        c.status = msg
-    if _IS_WRITER:
-        _persist_cache()
-    else:
-        refresh_cache()

blueprints/risdeveau/templates/88x31.pug

@@ -3,9 +3,6 @@ div
     a.disabled(href="https://chest.lair.moe")
       img(src="/static/img/88x31/gf.png")
 
-    a(href="//lair.moe")
-      img(src="/static/img/88x31/lair.gif")
-
     a#pie(href="https://preview.about.akarpov.ru")
       img(src="/static/img/88x31/withpie.gif")
 

blueprints/risdeveau/templates/contacts.pug

@@ -2,7 +2,7 @@
   h3 Development
   .blocks.badges
     a.block(href="//g.lair.moe/Sweetbread")
-      img.icon(src="/static/img/service/gitea.webp")
+      img.icon(src="/static/icon/service/gitea.webp")
       |  Gitea
 
     a.block(href="https://github.com/VerySweetBread")
@@ -20,7 +20,7 @@
       |  Matrix
 
     a.block(href="//b.lair.moe/@risdeveau")
-      img.icon(src="/static/img/service/sharkey.webp")
+      img.icon(src="/static/icon/service/sharkey.webp")
       |  Fediverse
 
     a.block(href="https://discord.com/users/459823895256498186")

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="icon" type="image/webp" href="/static/icon/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

@@ -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,55 +4,23 @@ 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="icon" type="image/webp" href="/static/icon/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")
 
     meta(property="og:type" value="website")
     meta(property="og:url" value="https://lair.moe")
     meta(property="og:title" value="Lair.moe")
-    meta(property="og:image" value="https://lair.moe/static/img/lair.webp")
+    meta(property="og:image" value="https://lair.moe/static/icon/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.icon(src="/static/icon/lair.webp")
   |  Lair
 
 block content
   a.block(href="https://b.lair.moe" target="_blank")
     .header
-      img.icon(src="/static/img/service/sharkey.webp")
+      img.icon(src="/static/icon/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.icon(src="/static/icon/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.icon(src="/static/icon/us/risdeveau.webp")
       | Sweetbread
     | Главный админ, занимается почти всеми сервисами. Создал этот сайт
 
   .block.orange.disabled
     .header
-      img.icon(src="/static/img/us/chest.webp")
+      img.icon(src="/static/icon/us/chest.webp")
       | Chest
     | Должна была помогать делать этот сайт