mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
fastapi: Jinja contextfilter renamed to pass_context
Closes: #23 Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
This commit is contained in:
parent
4f928b4577
commit
32abdbafae
3 changed files with 7 additions and 8 deletions
|
@ -1,7 +1,7 @@
|
||||||
""" This module consists of aurweb's CAPTCHA utility functions and filters. """
|
""" This module consists of aurweb's CAPTCHA utility functions and filters. """
|
||||||
import hashlib
|
import hashlib
|
||||||
|
|
||||||
import jinja2
|
from jinja2 import pass_context
|
||||||
|
|
||||||
from aurweb.db import query
|
from aurweb.db import query
|
||||||
from aurweb.models.user import User
|
from aurweb.models.user import User
|
||||||
|
@ -41,14 +41,14 @@ def get_captcha_answer(token):
|
||||||
return hashlib.md5((text + "\n").encode()).hexdigest()[:6]
|
return hashlib.md5((text + "\n").encode()).hexdigest()[:6]
|
||||||
|
|
||||||
|
|
||||||
@jinja2.contextfilter
|
@pass_context
|
||||||
def captcha_salt_filter(context):
|
def captcha_salt_filter(context):
|
||||||
""" Returns the most recent CAPTCHA salt in the list of salts. """
|
""" Returns the most recent CAPTCHA salt in the list of salts. """
|
||||||
salts = get_captcha_salts()
|
salts = get_captcha_salts()
|
||||||
return salts[0]
|
return salts[0]
|
||||||
|
|
||||||
|
|
||||||
@jinja2.contextfilter
|
@pass_context
|
||||||
def captcha_cmdline_filter(context, salt):
|
def captcha_cmdline_filter(context, salt):
|
||||||
""" Returns a CAPTCHA challenge for a given salt. """
|
""" Returns a CAPTCHA challenge for a given salt. """
|
||||||
return get_captcha_challenge(salt)
|
return get_captcha_challenge(salt)
|
||||||
|
|
|
@ -4,7 +4,7 @@ import typing
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
|
||||||
from fastapi import Request
|
from fastapi import Request
|
||||||
from jinja2 import contextfilter
|
from jinja2 import pass_context
|
||||||
|
|
||||||
import aurweb.config
|
import aurweb.config
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ def get_translator_for_request(request: Request):
|
||||||
return translate
|
return translate
|
||||||
|
|
||||||
|
|
||||||
@contextfilter
|
@pass_context
|
||||||
def tr(context: typing.Any, value: str):
|
def tr(context: typing.Any, value: str):
|
||||||
""" A translation filter; example: {{ "Hello" | tr("de") }}. """
|
""" A translation filter; example: {{ "Hello" | tr("de") }}. """
|
||||||
_ = get_translator_for_request(context.get("request"))
|
_ = get_translator_for_request(context.get("request"))
|
||||||
|
|
|
@ -5,9 +5,8 @@ import string
|
||||||
|
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
import jinja2
|
|
||||||
|
|
||||||
from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
|
from email_validator import EmailNotValidError, EmailUndeliverableError, validate_email
|
||||||
|
from jinja2 import pass_context
|
||||||
|
|
||||||
import aurweb.config
|
import aurweb.config
|
||||||
|
|
||||||
|
@ -88,7 +87,7 @@ def migrate_cookies(request, response):
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
@jinja2.contextfilter
|
@pass_context
|
||||||
def account_url(context, user):
|
def account_url(context, user):
|
||||||
request = context.get("request")
|
request = context.get("request")
|
||||||
base = f"{request.url.scheme}://{request.url.hostname}"
|
base = f"{request.url.scheme}://{request.url.hostname}"
|
||||||
|
|
Loading…
Add table
Reference in a new issue