rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

assetcache: change asset_siteimg macro to filter.

remotes/1693176582716663532/tmp_refs/heads/watchparty
Snakes 2022-09-24 03:14:20 -04:00
parent 98936efe60
commit a3664e252c
Signed by: Snakes
GPG Key ID: E745A82778055C7E
18 changed files with 75 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/helpers/jinja2.py
View File

@ -22,6 +22,12 @@ def template_asset(asset_path):
return assetcache_path(asset_path) return assetcache_path(asset_path)
@app.template_filter("asset_siteimg")
def template_asset_siteimg(asset_path):
# TODO: Add hashing for these using files.helpers.assetcache
return f'/i/{SITE_NAME}/{asset_path}?v=3010'
@app.template_filter("timestamp") @app.template_filter("timestamp")
def timestamp(timestamp): def timestamp(timestamp):

5
files/templates/authforms.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -12,7 +11,7 @@
<meta name="author" content=""> <meta name="author" content="">
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
<title>{% block pagetitle %}{{SITE_NAME}}{% endblock %}</title> <title>{% block pagetitle %}{{SITE_NAME}}{% endblock %}</title>
@ -107,7 +106,7 @@
<div class="splash-overlay"></div> <div class="splash-overlay"></div>
<img alt="cover" loading="lazy" class="splash-img" src="{{asset_siteimg('cover.webp')}}"></img> <img alt="cover" loading="lazy" class="splash-img" src="{{'cover.webp' | asset_siteimg}}"></img>
</div> </div>
</div> </div>

3
files/templates/chat.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -10,7 +9,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="author" content=""> <meta name="author" content="">
<link id="favicon" rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link id="favicon" rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
<title>Chat</title> <title>Chat</title>
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>

1
files/templates/comments.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
{% if not request.headers.get("xhr") %} {% if not request.headers.get("xhr") %}
{% if comment_info %} {% if comment_info %}

75
files/templates/default.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -78,16 +77,16 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="thumbnail" content="{{asset_siteimg('site_preview.webp')}}"> <meta name="thumbnail" content="{{'site_preview.webp' | asset_siteimg}}">
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
{% block title %} {% block title %}
<title>{{SITE_NAME}}</title> <title>{{SITE_NAME}}</title>
<meta property="og:type" content="article"> <meta property="og:type" content="article">
<meta property="og:title" content="{{SITE_NAME}}"> <meta property="og:title" content="{{SITE_NAME}}">
<meta property="og:site_name" content="{{SITE}}"> <meta property="og:site_name" content="{{SITE}}">
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta property="og:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta property="og:url" content="{{request.full_path}}"> <meta property="og:url" content="{{request.full_path}}">
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta property="og:author" name="author" content="{{SITE_FULL}}"> <meta property="og:author" name="author" content="{{SITE_FULL}}">
@ -97,7 +96,7 @@
<meta name="twitter:title" content="{{SITE_NAME}}"> <meta name="twitter:title" content="{{SITE_NAME}}">
<meta name="twitter:creator" content="{{SITE_FULL}}"> <meta name="twitter:creator" content="{{SITE_FULL}}">
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta name="twitter:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta name="twitter:url" content="{{request.full_path}}"> <meta name="twitter:url" content="{{request.full_path}}">
{% endblock %} {% endblock %}
@ -106,10 +105,10 @@
<meta name="format-detection" content="telephone=no"> <meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width,initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="apple-touch-icon" sizes="180x180" href="{{asset_siteimg('icon.webp')}}"> <link rel="apple-touch-icon" sizes="180x180" href="{{'icon.webp' | asset_siteimg}}">
<link rel="manifest" href="/assets/manifest_{{SITE_NAME}}.json?v=6"> <link rel="manifest" href="/assets/manifest_{{SITE_NAME}}.json?v=6">
<link rel="mask-icon" href="{{asset_siteimg('icon.webp')}}"> <link rel="mask-icon" href="{{'icon.webp' | asset_siteimg}}">
<link rel="shortcut icon" href="{{asset_siteimg('icon.webp')}}"> <link rel="shortcut icon" href="{{'icon.webp' | asset_siteimg}}">
<meta name="apple-mobile-web-app-title" content="{{SITE_NAME}}"> <meta name="apple-mobile-web-app-title" content="{{SITE_NAME}}">
<meta name="application-name" content="{{SITE_NAME}}"> <meta name="application-name" content="{{SITE_NAME}}">
<meta name="msapplication-TileColor" content="#{% if v %}{{v.themecolor}}{% else %}{{DEFAULT_COLOR}}{% endif %}"> <meta name="msapplication-TileColor" content="#{% if v %}{{v.themecolor}}{% else %}{{DEFAULT_COLOR}}{% endif %}">
@ -121,127 +120,127 @@
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="320x480" sizes="320x480"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="640x960" sizes="640x960"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="640x1136" sizes="640x1136"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="750x1334" sizes="750x1334"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="768x1004" sizes="768x1004"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="768x1024" sizes="768x1024"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="828x1792" sizes="828x1792"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1024x748" sizes="1024x748"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1024x768" sizes="1024x768"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1125x2436" sizes="1125x2436"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1242x2208" sizes="1242x2208"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1242x2688" sizes="1242x2688"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1334x750" sizes="1334x750"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1536x2008" sizes="1536x2008"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1536x2048" sizes="1536x2048"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1668x2224" sizes="1668x2224"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="1792x828" sizes="1792x828"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="2048x1496" sizes="2048x1496"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="2048x1536" sizes="2048x1536"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="2048x2732" sizes="2048x2732"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="2208x1242" sizes="2208x1242"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="2224x1668" sizes="2224x1668"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="2436x1125" sizes="2436x1125"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="2668x1242" sizes="2668x1242"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
<link <link
rel="apple-touch-startup-image" rel="apple-touch-startup-image"
sizes="2737x2048" sizes="2737x2048"
href="{{asset_siteimg('icon.webp')}}" href="{{'icon.webp' | asset_siteimg}}"
> >
{% block fixedMobileBarJS %} {% block fixedMobileBarJS %}
@ -277,20 +276,20 @@
{% else %} {% else %}
{% set path = "assets/images/" + SITE_NAME + "/banners" %} {% set path = "assets/images/" + SITE_NAME + "/banners" %}
{% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=25' %} {% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=25' %}
<img alt="site banner" src="{% if v %}{{image}}{% else %}{{asset_siteimg('cached.webp')}}{% endif %}" width="100%"> <img alt="site banner" src="{% if v %}{{image}}{% else %}{{'cached.webp' | asset_siteimg}}{% endif %}" width="100%">
{% endif %} {% endif %}
</a> </a>
{% else %} {% else %}
{% if SITE_NAME == 'WPD' %} {% if SITE_NAME == 'WPD' %}
{% if v %} {% if v %}
{% set banner = asset_siteimg('banner.webp') %} {% set banner = 'banner.webp' | asset_siteimg %}
{% else %} {% else %}
{% set banner = asset_siteimg('cached.webp') %} {% set banner = 'cached.webp' | asset_siteimg %}
{% endif %} {% endif %}
{% elif SITE_NAME == 'PCM' %} {% elif SITE_NAME == 'PCM' %}
{% set banner = asset_siteimg('banners/great-value-v2.webp') %} {% set banner = 'banners/great-value-v2.webp' | asset_siteimg %}
{% else %} {% else %}
{% set banner = asset_siteimg('banner.webp') %} {% set banner = 'banner.webp' | asset_siteimg %}
{% endif %} {% endif %}
<a href="{{banner}}"> <a href="{{banner}}">

6
files/templates/header.html
View File

@ -59,7 +59,7 @@
<div class="navbar navbar-expand-md navbar-light" id="navbar"> <div class="navbar navbar-expand-md navbar-light" id="navbar">
<div class="container-fluid" style="padding:0;"> <div class="container-fluid" style="padding:0;">
<a href="/" class="navbar-brand mr-auto {% if not has_logo and not sub %}flex-grow-1{% endif %}"> <a href="/" class="navbar-brand mr-auto {% if not has_logo and not sub %}flex-grow-1{% endif %}">
<img id="header--icon" alt="header icon" {% if sub %}src="{{sub.marsey_url}}"{% else %}src="{{asset_siteimg('headericon.webp')}}"{% endif %}> <img id="header--icon" alt="header icon" {% if sub %}src="{{sub.marsey_url}}"{% else %}src="{{'headericon.webp' | asset_siteimg}}"{% endif %}>
</a> </a>
{% if sub %} {% if sub %}
@ -79,7 +79,7 @@
</style> </style>
<div id="logo-container" class="flex-grow-1 logo-container"> <div id="logo-container" class="flex-grow-1 logo-container">
<a href="/"> <a href="/">
<img class="ml-1" id="logo" alt="logo" src="{{asset_siteimg('logo.webp')}}" width=70> <img class="ml-1" id="logo" alt="logo" src="{{'logo.webp' | asset_siteimg}}" width=70>
</a> </a>
</div> </div>
{% endif %} {% endif %}
@ -223,7 +223,7 @@
</div> </div>
<div class="text-left pl-2"> <div class="text-left pl-2">
<div style="color: #{{v.name_color}}" class="text-small font-weight-bold"><span id="header--username" {% if v.patron %}class="patron" style="background-color:#{{v.name_color}}"{% endif %}>{{v.username}}</span></div> <div style="color: #{{v.name_color}}" class="text-small font-weight-bold"><span id="header--username" {% if v.patron %}class="patron" style="background-color:#{{v.name_color}}"{% endif %}>{{v.username}}</span></div>
<div class="header--currency"><img alt="coins" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" src="{{asset_siteimg('coins.webp')}}" title="coins" aria-label="coins"><span id="user-coins-amount">{{v.coins}}</span>{% if not FEATURES['PROCOINS'] %} Coin{{ help.plural(v.coins) }}{% endif %}</div> <div class="header--currency"><img alt="coins" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" src="{{'coins.webp' | asset_siteimg}}" title="coins" aria-label="coins"><span id="user-coins-amount">{{v.coins}}</span>{% if not FEATURES['PROCOINS'] %} Coin{{ help.plural(v.coins) }}{% endif %}</div>
{% if FEATURES['PROCOINS'] %} {% if FEATURES['PROCOINS'] %}
<div class="header--currency"><img alt="marseybux" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" src="/i/marseybux.webp?v=2000" title="Marseybux" aria-label="Marseybux"><span id="user-bux-amount">{{v.procoins}}</span></div> <div class="header--currency"><img alt="marseybux" class="mr-1 ml-1" data-bs-toggle="tooltip" data-bs-placement="bottom" src="/i/marseybux.webp?v=2000" title="Marseybux" aria-label="Marseybux"><span id="user-bux-amount">{{v.procoins}}</span></div>
{% endif %} {% endif %}

5
files/templates/login.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -6,7 +5,7 @@
<head> <head>
<script defer src="{{'js/bootstrap.js' | asset}}"></script> <script defer src="{{'js/bootstrap.js' | asset}}"></script>
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
<meta name="description" content="{{DESCRIPTION}}"> <meta name="description" content="{{DESCRIPTION}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';"> <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
@ -92,7 +91,7 @@
<div class="col-12 col-md-6 d-none d-md-block"> <div class="col-12 col-md-6 d-none d-md-block">
<div class="splash-wrapper"> <div class="splash-wrapper">
<div class="splash-overlay"></div> <div class="splash-overlay"></div>
<img alt="cover" loading="lazy" class="splash-img" src="{{asset_siteimg('cover.webp')}}"></img> <img alt="cover" loading="lazy" class="splash-img" src="{{'cover.webp' | asset_siteimg}}"></img>
</div> </div>
</div> </div>
</div> </div>

5
files/templates/login_2fa.html
View File

@ -1,10 +1,9 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
<meta name="description" content="{{DESCRIPTION}}"> <meta name="description" content="{{DESCRIPTION}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';"> <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
@ -87,7 +86,7 @@
<div class="splash-overlay"></div> <div class="splash-overlay"></div>
<img alt="cover" loading="lazy" class="splash-img" src="{{asset_siteimg('cover.webp')}}"></img> <img alt="cover" loading="lazy" class="splash-img" src="{{'cover.webp' | asset_siteimg}}"></img>
</div> </div>
</div> </div>

4
files/templates/lottery.html
View File

@ -62,7 +62,7 @@
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
data-bs-placement="bottom" data-bs-placement="bottom"
height="13" height="13"
src="{{asset_siteimg('coins.webp')}}" src="{{'coins.webp' | asset_siteimg}}"
aria-label="coins" aria-label="coins"
title="coins" title="coins"
style="display: none; position: relative; top: -2px" style="display: none; position: relative; top: -2px"
@ -122,7 +122,7 @@
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
data-bs-placement="bottom" data-bs-placement="bottom"
height="13" height="13"
src="{{asset_siteimg('coins.webp')}}" src="{{'coins.webp' | asset_siteimg}}"
aria-label="coins" aria-label="coins"
title="coins" title="coins"
/> />

7
files/templates/settings.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -13,13 +12,13 @@
<meta name="author" content=""> <meta name="author" content="">
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
<title>{% block pagetitle %}Settings - {{SITE_NAME}}{% endblock %}</title> <title>{% block pagetitle %}Settings - {{SITE_NAME}}{% endblock %}</title>
<meta property="og:type" content="article"> <meta property="og:type" content="article">
<meta property="og:title" content="{{SITE_NAME}}"> <meta property="og:title" content="{{SITE_NAME}}">
<meta property="og:site_name" content="{{SITE}}"> <meta property="og:site_name" content="{{SITE}}">
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta property="og:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta property="og:url" content="{{SITE_FULL}}"> <meta property="og:url" content="{{SITE_FULL}}">
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta property="og:author" name="author" content="{{SITE_FULL}}"> <meta property="og:author" name="author" content="{{SITE_FULL}}">
@ -29,7 +28,7 @@
<meta name="twitter:title" content="{{SITE_NAME}}"> <meta name="twitter:title" content="{{SITE_NAME}}">
<meta name="twitter:creator" content="{{SITE_FULL}}"> <meta name="twitter:creator" content="{{SITE_FULL}}">
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta name="twitter:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta name="twitter:url" content="{{SITE_FULL}}"> <meta name="twitter:url" content="{{SITE_FULL}}">

9
files/templates/settings2.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -13,13 +12,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="author" content=""> <meta name="author" content="">
<meta name="thumbnail" content="{{asset_siteimg('site_preview.webp')}}"> <meta name="thumbnail" content="{{'site_preview.webp' | asset_siteimg}}">
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
<meta property="og:type" content="article"> <meta property="og:type" content="article">
<meta property="og:title" content="{{SITE_NAME}}"> <meta property="og:title" content="{{SITE_NAME}}">
<meta property="og:site_name" content="{{SITE}}"> <meta property="og:site_name" content="{{SITE}}">
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta property="og:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta property="og:url" content="{{request.full_path}}"> <meta property="og:url" content="{{request.full_path}}">
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta property="og:author" name="author" content="{{SITE_FULL}}"> <meta property="og:author" name="author" content="{{SITE_FULL}}">
@ -29,7 +28,7 @@
<meta name="twitter:title" content="{{SITE_NAME}}"> <meta name="twitter:title" content="{{SITE_NAME}}">
<meta name="twitter:creator" content="{{SITE_FULL}}"> <meta name="twitter:creator" content="{{SITE_FULL}}">
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta name="twitter:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta name="twitter:url" content="{{request.full_path}}"> <meta name="twitter:url" content="{{request.full_path}}">

9
files/templates/sign_up.html
View File

@ -1,11 +1,10 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<script defer src="{{'js/bootstrap.js' | asset}}"></script> <script defer src="{{'js/bootstrap.js' | asset}}"></script>
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
<meta name="description" content="{{DESCRIPTION}}"> <meta name="description" content="{{DESCRIPTION}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';"> <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
@ -17,7 +16,7 @@
<meta property="og:type" content="article"> <meta property="og:type" content="article">
<meta property="og:title" content="{{SITE_NAME}}"> <meta property="og:title" content="{{SITE_NAME}}">
<meta property="og:site_name" content="{{SITE}}"> <meta property="og:site_name" content="{{SITE}}">
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta property="og:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta property="og:url" content="{{SITE_FULL}}"> <meta property="og:url" content="{{SITE_FULL}}">
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta property="og:author" name="author" content="{{SITE_FULL}}"> <meta property="og:author" name="author" content="{{SITE_FULL}}">
@ -27,7 +26,7 @@
<meta name="twitter:title" content="{{SITE_NAME}}"> <meta name="twitter:title" content="{{SITE_NAME}}">
<meta name="twitter:creator" content="{{SITE_FULL}}"> <meta name="twitter:creator" content="{{SITE_FULL}}">
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta name="twitter:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta name="twitter:url" content="{{SITE_FULL}}"> <meta name="twitter:url" content="{{SITE_FULL}}">
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title>
@ -132,7 +131,7 @@
<div class="splash-overlay"></div> <div class="splash-overlay"></div>
<img alt="cover" loading="lazy" class="splash-img" src="{{asset_siteimg('cover.webp')}}"></img> <img alt="cover" loading="lazy" class="splash-img" src="{{'cover.webp' | asset_siteimg}}"></img>
</div> </div>
</div> </div>

9
files/templates/sign_up_failed_ref.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -6,7 +5,7 @@
<head> <head>
<script defer src="{{'js/bootstrap.js' | asset}}"></script> <script defer src="{{'js/bootstrap.js' | asset}}"></script>
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
<meta name="description" content="{{DESCRIPTION}}"> <meta name="description" content="{{DESCRIPTION}}">
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';"> <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
@ -18,7 +17,7 @@
<meta property="og:type" content="article"> <meta property="og:type" content="article">
<meta property="og:title" content="{{SITE_NAME}}"> <meta property="og:title" content="{{SITE_NAME}}">
<meta property="og:site_name" content="{{SITE}}"> <meta property="og:site_name" content="{{SITE}}">
<meta property="og:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta property="og:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta property="og:url" content="{{SITE_FULL}}"> <meta property="og:url" content="{{SITE_FULL}}">
<meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta property="og:description" name="description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta property="og:author" name="author" content="{{SITE_FULL}}"> <meta property="og:author" name="author" content="{{SITE_FULL}}">
@ -28,7 +27,7 @@
<meta name="twitter:title" content="{{SITE_NAME}}"> <meta name="twitter:title" content="{{SITE_NAME}}">
<meta name="twitter:creator" content="{{SITE_FULL}}"> <meta name="twitter:creator" content="{{SITE_FULL}}">
<meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}"> <meta name="twitter:description" content="{{SITE_NAME}} - {{DESCRIPTION}}">
<meta name="twitter:image" content="{{asset_siteimg('site_preview.webp')}}"> <meta name="twitter:image" content="{{'site_preview.webp' | asset_siteimg}}">
<meta name="twitter:url" content="{{SITE_FULL}}"> <meta name="twitter:url" content="{{SITE_FULL}}">
<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title> <title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title>
@ -75,7 +74,7 @@
<div class="splash-overlay"></div> <div class="splash-overlay"></div>
<img alt="cover" loading="lazy" class="splash-img" src="{{asset_siteimg('cover.webp')}}"></img> <img alt="cover" loading="lazy" class="splash-img" src="{{'cover.webp' | asset_siteimg}}"></img>
</div> </div>
</div> </div>

4
files/templates/submission.html
View File

@ -511,13 +511,13 @@
<meta name="twitter:site" content="{{SITE_FULL}}"> <meta name="twitter:site" content="{{SITE_FULL}}">
{% if not v_forbid_deleted -%} {% if not v_forbid_deleted -%}
<meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE_FULL}}{{asset_siteimg('site_preview.webp')}}{% endif %}"> <meta property="og:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE_FULL}}{{'site_preview.webp' | asset_siteimg}}{% endif %}">
{% if p.is_video %} {% if p.is_video %}
<meta property="og:video" content="{{p.realurl(v)}}"> <meta property="og:video" content="{{p.realurl(v)}}">
{% elif p.is_audio %} {% elif p.is_audio %}
<meta property="og:audio" content="{{p.realurl(v)}}"> <meta property="og:audio" content="{{p.realurl(v)}}">
{% endif %} {% endif %}
<meta name="twitter:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE_FULL}}{{asset_siteimg('site_preview.webp')}}{% endif %}"> <meta name="twitter:image" content="{% if p.is_image %}{{p.realurl(v)}}{% elif p.has_thumb%}{{p.thumb_url}}{% else %}{{SITE_FULL}}{{'site_preview.webp' | asset_siteimg}}{% endif %}">
{% endif %} {% endif %}

1
files/templates/submission_listing.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
{% if v %} {% if v %}

3
files/templates/submit.html
View File

@ -1,4 +1,3 @@
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
{%- import 'util/helpers.html' as help -%} {%- import 'util/helpers.html' as help -%}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -12,7 +11,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="author" content=""> <meta name="author" content="">
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}"> <link rel="icon" type="image/webp" href="{{'icon.webp' | asset_siteimg}}">
{% if SITE == 'pcmemes.net' %} {% if SITE == 'pcmemes.net' %}
{% set cc='Splash Mountain' %} {% set cc='Splash Mountain' %}

4
files/templates/userpage.html
View File

@ -130,7 +130,7 @@
<div class="font-weight-bolder"> <div class="font-weight-bolder">
<span id="profile-coins-amount">{{u.coins}}</span> <span id="profile-coins-amount">{{u.coins}}</span>
<img alt="coins" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="coins" height="20" src="{{asset_siteimg('coins.webp')}}">&nbsp;&nbsp; <img alt="coins" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="coins" height="20" src="{{'coins.webp' | asset_siteimg}}">&nbsp;&nbsp;
{% if FEATURES['PROCOINS'] %} {% if FEATURES['PROCOINS'] %}
<span id="profile-bux-amount">{{u.procoins}}</span> <span id="profile-bux-amount">{{u.procoins}}</span>
@ -465,7 +465,7 @@
<div class="font-weight-normal"> <div class="font-weight-normal">
<span id="profile-coins-amount-mobile" class="font-weight-bold">{{u.coins}}</span> <span id="profile-coins-amount-mobile" class="font-weight-bold">{{u.coins}}</span>
<img alt="coins" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="coins" height="15" src="{{asset_siteimg('coins.webp')}}">&nbsp;&nbsp; <img alt="coins" class="ml-1 mb-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="coins" height="15" src="{{'coins.webp' | asset_siteimg}}">&nbsp;&nbsp;
{% if FEATURES['PROCOINS'] %} {% if FEATURES['PROCOINS'] %}
<span id="profile-bux-amount-mobile" class="font-weight-bold">{{u.procoins}}</span> <span id="profile-bux-amount-mobile" class="font-weight-bold">{{u.procoins}}</span>

3
files/templates/util/assetcache.html
View File

@ -1,3 +0,0 @@
{%- macro asset_siteimg(name) -%}
/i/{{SITE_NAME}}/{{name}}?v=3009
{%- endmacro -%}