Compare commits
69 commits
Author | SHA1 | Date | |
---|---|---|---|
Danielle McLean | 5348dc9f82 | ||
Danielle McLean | e36ad27d49 | ||
Danielle McLean | d21d4bda83 | ||
Danielle McLean | 8d8aa4749b | ||
Danielle McLean | 3baf75e59e | ||
Danielle McLean | 880b899e81 | ||
Danielle McLean | 6061d6f600 | ||
Danielle McLean | a680a6501c | ||
Danielle McLean | 625b5d963a | ||
Danielle McLean | 9d11cc7576 | ||
Danielle McLean | c49e17db90 | ||
Danielle McLean | 7696ff45db | ||
Danielle McLean | 731f177d18 | ||
Danielle McLean | 0061111ad8 | ||
Danielle McLean | 6b53c00d7c | ||
Danielle McLean | 1490a95735 | ||
Danielle McLean | c398b0d3f4 | ||
Danielle McLean | 95cca433bc | ||
Danielle McLean | 4f081c8d34 | ||
Danielle McLean | 8386f77d72 | ||
Danielle McLean | 03956637be | ||
Danielle McLean | 60bdaa27a0 | ||
Danielle McLean | a6fa7ebb3a | ||
Danielle McLean | d0bd6c1231 | ||
Danielle McLean | 960e64963f | ||
Danielle McLean | 0b1a548ee4 | ||
Danielle McLean | 04bd6dd35d | ||
Danielle McLean | 2e7d12b3e6 | ||
Danielle McLean | cd990e4e2f | ||
Danielle McLean | fe187da491 | ||
Danielle McLean | 636b470001 | ||
Danielle McLean | e5cf94d488 | ||
Danielle McLean | c5458c2d06 | ||
Danielle McLean | 7af8636687 | ||
Danielle McLean | 5ac46dad63 | ||
Danielle McLean | d4c814c79a | ||
Danielle McLean | db0d6e28a3 | ||
Danielle McLean | 2f8d62649e | ||
Danielle McLean | 683adc1b46 | ||
Danielle McLean | cfeb206154 | ||
Danielle McLean | c5c0f4258b | ||
Danielle McLean | 73addc2f75 | ||
Danielle McLean | 0ca50252dd | ||
Danielle McLean | 8d79be07da | ||
Danielle McLean | 37d5a7a20d | ||
Danielle McLean | 76496e7169 | ||
Danielle McLean | 7fcc3c8788 | ||
Danielle McLean | 4436db7d83 | ||
Danielle McLean | d017c642eb | ||
Danielle McLean | 7c5f311af9 | ||
Ben Lubar | 73155f399b | ||
Danielle McLean | e540f7b784 | ||
Danielle McLean | 0e8f816d0e | ||
Danielle McLean | 1bf0d8478a | ||
Danielle McLean | 594947852f | ||
Danielle McLean | b318ed5b06 | ||
Danielle McLean | 012aed42b1 | ||
Danielle McLean | 5c10bafb7d | ||
Danielle McLean | e660221265 | ||
Danielle McLean | e23ca7d215 | ||
Danielle McLean | 95b02269bb | ||
Danielle McLean | ce07ba8cdc | ||
Danielle McLean | 17e5c2c1b4 | ||
Danielle McLean | 4fd2ff826a | ||
Danielle McLean | 6efcc450a3 | ||
Danielle McLean | dc7442cfb6 | ||
Danielle McLean | 9c708b8c89 | ||
Danielle McLean | 40f0bd858b | ||
Danielle McLean | 639e1ec9c6 |
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -1,4 +1,3 @@
|
|||
|
||||
# Created by https://www.gitignore.io/api/django
|
||||
|
||||
### Django ###
|
||||
|
@ -15,8 +14,10 @@ media
|
|||
# <django-project-name>/staticfiles/
|
||||
|
||||
# End of https://www.gitignore.io/api/django
|
||||
|
||||
/.pdm-python
|
||||
/.env
|
||||
/.mypy_cache
|
||||
/.pytest_cache
|
||||
/static
|
||||
node_modules
|
||||
/node_modules
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
image: python:3.6
|
||||
services:
|
||||
- postgres:latest
|
||||
variables:
|
||||
GIT_SUBMODULE_STRATEGY: normal
|
||||
PIP_CACHE_DIR: $CI_PROJECT_DIR/.cache/pip
|
||||
PIPENV_CACHE_DIR: $CI_PROJECT_DIR/.cache/pipenv
|
||||
POSTGRES_HOST: postgres
|
||||
POSTGRES_DB: nice_marmot
|
||||
POSTGRES_USER: runner
|
||||
POSTGRES_PASSWORD: ''
|
||||
|
||||
cache:
|
||||
paths:
|
||||
- .cache
|
||||
|
||||
test:
|
||||
script:
|
||||
- pip install pipenv
|
||||
- pipenv sync --dev
|
||||
- pipenv run pytest
|
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,3 +1,3 @@
|
|||
[submodule "lemoncurry/static/base16-materialtheme-scheme"]
|
||||
path = lemoncurry/static/base16-materialtheme-scheme
|
||||
url = git://github.com/ntpeters/base16-materialtheme-scheme.git
|
||||
url = https://github.com/ntpeters/base16-materialtheme-scheme
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
repos:
|
||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||
rev: v1.3.0
|
||||
hooks:
|
||||
- id: autopep8-wrapper
|
||||
- id: check-byte-order-marker
|
||||
- id: check-case-conflict
|
||||
- id: check-executables-have-shebangs
|
||||
- id: check-json
|
||||
- id: check-merge-conflict
|
||||
- id: check-yaml
|
||||
- id: end-of-file-fixer
|
||||
- id: flake8
|
||||
- id: mixed-line-ending
|
||||
args:
|
||||
- --fix=lf
|
||||
- id: trailing-whitespace
|
||||
- repo: local
|
||||
hooks:
|
||||
- id: pytest
|
||||
name: Check pytest unit tests pass
|
||||
entry: pipenv run pytest
|
||||
pass_filenames: false
|
||||
language: system
|
||||
types: [python]
|
||||
- id: mypy
|
||||
name: Check mypy static types match
|
||||
entry: pipenv run mypy . --ignore-missing-imports
|
||||
pass_filenames: false
|
||||
language: system
|
||||
types: [python]
|
16
.travis.yml
16
.travis.yml
|
@ -1,16 +0,0 @@
|
|||
language: python
|
||||
cache:
|
||||
directories:
|
||||
- $PIP_CACHE_DIR
|
||||
- $PIPENV_CACHE_DIR
|
||||
env:
|
||||
global:
|
||||
- PIP_CACHE_DIR=$HOME/.cache/pip
|
||||
- PIPENV_CACHE_DIR=$HOME/.cache/pipenv
|
||||
python:
|
||||
- '3.6'
|
||||
install:
|
||||
- pip install pipenv
|
||||
- pipenv install --dev
|
||||
script:
|
||||
- pipenv run pytest
|
|
@ -1,4 +0,0 @@
|
|||
# vim: set ft=yaml :
|
||||
host: 00dani.dev
|
||||
port: 443
|
||||
cname: dev.00dani.me
|
2
LICENSE
2
LICENSE
|
@ -1,6 +1,6 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2017 - 2018 Danielle McLean
|
||||
Copyright (c) 2017 - 2024 Danielle McLean
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
58
Pipfile
58
Pipfile
|
@ -1,58 +0,0 @@
|
|||
[[source]]
|
||||
url = "https://pypi.python.org/simple"
|
||||
verify_ssl = true
|
||||
name = "pypi"
|
||||
|
||||
[requires]
|
||||
python_version = '3.6'
|
||||
|
||||
[packages]
|
||||
django = "*"
|
||||
django-compressor = "*"
|
||||
gunicorn = {extras = ["gevent"]}
|
||||
"psycopg2-binary" = "*"
|
||||
pillow = "*"
|
||||
django-meta = "*"
|
||||
django-activeurl = "*"
|
||||
django-otp = "*"
|
||||
qrcode = "*"
|
||||
django-otp-agents = "*"
|
||||
python-slugify = "*"
|
||||
"mf2py" = "*"
|
||||
markdown = "*"
|
||||
bleach = "*"
|
||||
django-debug-toolbar = "*"
|
||||
xrd = "*"
|
||||
django-push = "*"
|
||||
pyyaml = "*"
|
||||
django-annoying = "*"
|
||||
accept-types = "*"
|
||||
django-analytical = "*"
|
||||
django-model-utils = "*"
|
||||
django-rq = "*"
|
||||
ronkyuu = "*"
|
||||
cachecontrol = "*"
|
||||
hiredis = "*"
|
||||
"mf2util" = "*"
|
||||
django-cors-headers = "*"
|
||||
"argon2-cffi" = "*"
|
||||
python-baseconv = "*"
|
||||
django-computed-property = "*"
|
||||
docutils = "*"
|
||||
django-super-favicon = "*"
|
||||
django-redis = "*"
|
||||
gevent = "*"
|
||||
django-extensions = "*"
|
||||
python-magic = "*"
|
||||
pyup-django = "*"
|
||||
"jinja2" = "*"
|
||||
msgpack = "*"
|
||||
django-randomslugfield = "*"
|
||||
ago = "*"
|
||||
|
||||
[dev-packages]
|
||||
ptpython = "*"
|
||||
pytest-django = "*"
|
||||
werkzeug = "*"
|
||||
watchdog = "*"
|
||||
mypy = "*"
|
908
Pipfile.lock
generated
908
Pipfile.lock
generated
|
@ -1,908 +0,0 @@
|
|||
{
|
||||
"_meta": {
|
||||
"hash": {
|
||||
"sha256": "64691d8ff1af1c678ce146dc2801ade76d3b44f364baeef46b8e956a8776d259"
|
||||
},
|
||||
"pipfile-spec": 6,
|
||||
"requires": {
|
||||
"python_version": "3.6"
|
||||
},
|
||||
"sources": [
|
||||
{
|
||||
"name": "pypi",
|
||||
"url": "https://pypi.python.org/simple",
|
||||
"verify_ssl": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"default": {
|
||||
"accept-types": {
|
||||
"hashes": [
|
||||
"sha256:9ae86512bf3a3eaad6a2793617a34eb15b384593e6c28697bef9b15ac237017a"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.3.0"
|
||||
},
|
||||
"ago": {
|
||||
"hashes": [
|
||||
"sha256:81e838ef978a19f8a263e72e4ae75345b639943e9853b33c4572b04b1d6f01f9"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.0.92"
|
||||
},
|
||||
"argon2-cffi": {
|
||||
"hashes": [
|
||||
"sha256:05dd15949be3a7d9f65807fe58fad70526023a319747054bb89da209c4071a33",
|
||||
"sha256:07480018d77f4c7447924e6c44c5ba1789a918413fe3efaa391a097958bbd9f6",
|
||||
"sha256:10e702dbd98a2148d22de9524a605021bdc55d05304beb90ea801ba58c4a4f1e",
|
||||
"sha256:131effd5eabbe08649bc672b5d602fd6e2772b03cfec2ddb2795f9d9babe3fba",
|
||||
"sha256:3f3b48b4802e98bb9692d72108ecad2fecea969c254c17660b70ce5730bbe4a6",
|
||||
"sha256:4c510232a96e991079a743a9310d3c9a014856cdbca644fccc496db2a1ff0e17",
|
||||
"sha256:5f1099b0f5ee4a7148bbd323503983aa4387ab16769ff9b5c51d26f6b0f1719e",
|
||||
"sha256:67452b1f10e873ececcea657c25d063e4bb4007e115227a53157369de5848992",
|
||||
"sha256:77a3d50e6325df79499e1220b7c38adbd30588c2f6d7c2d764fddb2d3b02e650",
|
||||
"sha256:7e4b75611b73f53012117ad21cdde7a17b32d1e99ff6799f22d827eb83a2a59b",
|
||||
"sha256:7f4b6d7c38258e76c1db293a6cf55b7e31701927fc773c5108e57578c7f8e09a",
|
||||
"sha256:82db759b8a495aaed51aec4762b0f44e5e7ad80256e8baf512ae70cdb3b28c50",
|
||||
"sha256:92b3f8f93b19081d520d911f1ce5902693edeeab2181c08aa0bb4130adba51aa",
|
||||
"sha256:93f631fa567dbf948f26874476c9e9afb51e0a835372bf1a319df0c5aa071bfb",
|
||||
"sha256:9befaa6d9798d9771b8176174ba82160beaf1dcdbcc63cd2dc5212f723e5e2a3",
|
||||
"sha256:a14e6d99787a2972d3802615911770fcba9c904401fb0dfb60bdeb250b4c5110",
|
||||
"sha256:c60764fe7f62cc52a74f326e366c60f7aa33a1586c8d02107394a01ae9db6e91",
|
||||
"sha256:cba2c8c539bed691513ae1bcd5a7da632d2aa2410d8b8ebdf56026eac7e2193f",
|
||||
"sha256:d79c918cf8bf981cd23b43a1a547cd1eececb77f3607ba9fa7c0ec01bf1f05a5",
|
||||
"sha256:dc3028ec541146924e3c45973b458a7acf390b9e9ee0b64a13ac0853109a69bc",
|
||||
"sha256:eb3fcb55224a47b8d50830561977c64761eaad9e349af0b2241eab089af44a14",
|
||||
"sha256:f732ca584e81491cc11e3d12e18cbd8c63e137b3f461f378426a6fdaaef47fb0",
|
||||
"sha256:fcd5681388d1f18e4a7ee3ff7a9b68650bc04db044b5a0a832728cbce182806d"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==18.1.0"
|
||||
},
|
||||
"beautifulsoup4": {
|
||||
"hashes": [
|
||||
"sha256:11a9a27b7d3bddc6d86f59fb76afb70e921a25ac2d6cc55b40d072bd68435a76",
|
||||
"sha256:7015e76bf32f1f574636c4288399a6de66ce08fb7b2457f628a8d70c0fbabb11",
|
||||
"sha256:808b6ac932dccb0a4126558f7dfdcf41710dd44a4ef497a0bb59a77f9f078e89"
|
||||
],
|
||||
"version": "==4.6.0"
|
||||
},
|
||||
"bleach": {
|
||||
"hashes": [
|
||||
"sha256:b8fa79e91f96c2c2cd9fd1f9eda906efb1b88b483048978ba62fef680e962b34",
|
||||
"sha256:eb7386f632349d10d9ce9d4a838b134d4731571851149f9cc2c05a9a837a9a44"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.1.3"
|
||||
},
|
||||
"cachecontrol": {
|
||||
"hashes": [
|
||||
"sha256:cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.12.5"
|
||||
},
|
||||
"certifi": {
|
||||
"hashes": [
|
||||
"sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7",
|
||||
"sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0"
|
||||
],
|
||||
"version": "==2018.4.16"
|
||||
},
|
||||
"cffi": {
|
||||
"hashes": [
|
||||
"sha256:11d30fc490bbe4d110fb7bfead0f10208275978ced3bce77f202224a0a9b448c",
|
||||
"sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743",
|
||||
"sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef",
|
||||
"sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50",
|
||||
"sha256:2ba8a45822b7aee805ab49abfe7eec16b90587f7f26df20c71dd89e45a97076f",
|
||||
"sha256:3bb6bd7266598f318063e584378b8e27c67de998a43362e8fce664c54ee52d30",
|
||||
"sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93",
|
||||
"sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257",
|
||||
"sha256:495c5c2d43bf6cebe0178eb3e88f9c4aa48d8934aa6e3cddb865c058da76756b",
|
||||
"sha256:4b3d70782d55aa38949e4b66d51c461c053b729baa53d94bb8a3a92c1d1d5b88",
|
||||
"sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3",
|
||||
"sha256:57b2533356cb2d8fac1555815929f7f5f14d68ac77b085d2326b571310f34f6e",
|
||||
"sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc",
|
||||
"sha256:79f9b6f7c46ae1f8ded75f68cf8ad50e5729ed4d590c74840471fc2823457d04",
|
||||
"sha256:7a33145e04d44ce95bcd71e522b478d282ad0eafaf34fe1ec5bbd73e662f22b6",
|
||||
"sha256:857959354ae3a6fa3da6651b966d13b0a8bed6bbc87a0de7b38a549db1d2a359",
|
||||
"sha256:87f37fe5130574ff76c17cab61e7d2538a16f843bb7bca8ebbc4b12de3078596",
|
||||
"sha256:95d5251e4b5ca00061f9d9f3d6fe537247e145a8524ae9fd30a2f8fbce993b5b",
|
||||
"sha256:9d1d3e63a4afdc29bd76ce6aa9d58c771cd1599fbba8cf5057e7860b203710dd",
|
||||
"sha256:a36c5c154f9d42ec176e6e620cb0dd275744aa1d804786a71ac37dc3661a5e95",
|
||||
"sha256:a6a5cb8809091ec9ac03edde9304b3ad82ad4466333432b16d78ef40e0cce0d5",
|
||||
"sha256:ae5e35a2c189d397b91034642cb0eab0e346f776ec2eb44a49a459e6615d6e2e",
|
||||
"sha256:b0f7d4a3df8f06cf49f9f121bead236e328074de6449866515cea4907bbc63d6",
|
||||
"sha256:b75110fb114fa366b29a027d0c9be3709579602ae111ff61674d28c93606acca",
|
||||
"sha256:ba5e697569f84b13640c9e193170e89c13c6244c24400fc57e88724ef610cd31",
|
||||
"sha256:be2a9b390f77fd7676d80bc3cdc4f8edb940d8c198ed2d8c0be1319018c778e1",
|
||||
"sha256:ca1bd81f40adc59011f58159e4aa6445fc585a32bb8ac9badf7a2c1aa23822f2",
|
||||
"sha256:d5d8555d9bfc3f02385c1c37e9f998e2011f0db4f90e250e5bc0c0a85a813085",
|
||||
"sha256:e55e22ac0a30023426564b1059b035973ec82186ddddbac867078435801c7801",
|
||||
"sha256:e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4",
|
||||
"sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184",
|
||||
"sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917",
|
||||
"sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f",
|
||||
"sha256:facc52ea162864a51556925bfa09d8c8c131349aeabfce2da4a43198e36fba5c",
|
||||
"sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb"
|
||||
],
|
||||
"version": "==1.11.5"
|
||||
},
|
||||
"chardet": {
|
||||
"hashes": [
|
||||
"sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
|
||||
"sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
|
||||
],
|
||||
"version": "==3.0.4"
|
||||
},
|
||||
"click": {
|
||||
"hashes": [
|
||||
"sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d",
|
||||
"sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"
|
||||
],
|
||||
"version": "==6.7"
|
||||
},
|
||||
"django": {
|
||||
"hashes": [
|
||||
"sha256:3eb25c99df1523446ec2dc1b00e25eb2ecbdf42c9d8b0b8b32a204a8db9011f8",
|
||||
"sha256:69ff89fa3c3a8337015478a1a0744f52a9fef5d12c1efa01a01f99bcce9bf10c"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.0.6"
|
||||
},
|
||||
"django-activeurl": {
|
||||
"hashes": [
|
||||
"sha256:ad5498bf589afaa117fe1c80d1a4fdbef29185cee47517254cd8f273b8a0140d",
|
||||
"sha256:ebb3f2746fdc76fee2095b75cad713e746378393c6c2b8e36455919a780acd50"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.1.12"
|
||||
},
|
||||
"django-agent-trust": {
|
||||
"hashes": [
|
||||
"sha256:f0ded1c2e1e8b06ea050f48c8db931ab7d2f85c566065dceb8e827d0690d87c5",
|
||||
"sha256:f7e24d3f50a0727c6a70d671778de3cca23a0c87bedc6e3dae1f61af7e759fc1"
|
||||
],
|
||||
"version": "==0.3.1"
|
||||
},
|
||||
"django-analytical": {
|
||||
"hashes": [
|
||||
"sha256:44dd65e30a3f11519852d5f5e50556c0f88cabb5720a2fd3637621952048abef",
|
||||
"sha256:cf7b4c0b368139a090da2b0b45741bdd28b54daa0cb2b83ef801021c8eb2c050"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.4.0"
|
||||
},
|
||||
"django-annoying": {
|
||||
"hashes": [
|
||||
"sha256:93f54d244d453cba28d6cfb9deae7bba27e859762adee9ff7de4706017940931",
|
||||
"sha256:ee620f9bfe439061010c7d5ccc8c69514844d95c370c130c61938205fcfc4cc9"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.10.4"
|
||||
},
|
||||
"django-appconf": {
|
||||
"hashes": [
|
||||
"sha256:6a4d9aea683b4c224d97ab8ee11ad2d29a37072c0c6c509896dd9857466fb261",
|
||||
"sha256:ddab987d14b26731352c01ee69c090a4ebfc9141ed223bef039d79587f22acd9"
|
||||
],
|
||||
"version": "==1.0.2"
|
||||
},
|
||||
"django-classy-tags": {
|
||||
"hashes": [
|
||||
"sha256:792f9161d0e22d55b4fab6fc297bab8ab072ffaa3075b227613a6d8473624db8",
|
||||
"sha256:f6d12f5a4df3e387795a0d9ef2836af389cae9a1fbebda035dac043d4722b1f7"
|
||||
],
|
||||
"version": "==0.8.0"
|
||||
},
|
||||
"django-compressor": {
|
||||
"hashes": [
|
||||
"sha256:7732676cfb9d58498dfb522b036f75f3f253f72ea1345ac036434fdc418c2e57",
|
||||
"sha256:9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.2"
|
||||
},
|
||||
"django-computed-property": {
|
||||
"hashes": [
|
||||
"sha256:31aa6453a5c504ce196ba9ae3bacbe0557cadf7ae89e25431b90bf206febd3b3"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.2.1"
|
||||
},
|
||||
"django-cors-headers": {
|
||||
"hashes": [
|
||||
"sha256:1460b67c51706307e3f66515e86b10181badd66448a2fc44278f47bf402c6fd3",
|
||||
"sha256:3c618a964e3034ae4dad8bbb902e625daa6c894444ddeaf7b24125299add54f0"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.3.0"
|
||||
},
|
||||
"django-debug-toolbar": {
|
||||
"hashes": [
|
||||
"sha256:4af2a4e1e932dadbda197b18585962d4fc20172b4e5a479490bc659fe998864d",
|
||||
"sha256:d9ea75659f76d8f1e3eb8f390b47fc5bad0908d949c34a8a3c4c87978eb40a0f"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.9.1"
|
||||
},
|
||||
"django-extensions": {
|
||||
"hashes": [
|
||||
"sha256:3be3debf53c77ca795bdf713726c923aa3c3f895e1a42e2e31a68c1a562346a4",
|
||||
"sha256:94bfac99eb262c5ac27e53eda96925e2e53fe0b331af7dde37012d07639a649c"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.0.7"
|
||||
},
|
||||
"django-meta": {
|
||||
"hashes": [
|
||||
"sha256:21fc5d0d5fcacda5d038af0babd08afaa4d5bed1b746edb6522c4d3435da8db6",
|
||||
"sha256:dd4a440223cc6243a7815c183b6ada1f11b99b4d672471e67f8db4d8b48a5674"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.4.1"
|
||||
},
|
||||
"django-model-utils": {
|
||||
"hashes": [
|
||||
"sha256:2c057f3bf0859aba27f04389f0cedd2d48f8c9b3848acb86fd9970794e58f477",
|
||||
"sha256:8cd377744aa45f9f131d652ec460c57d1aaa88d3e9b586c8e27eb709341b9084"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==3.1.2"
|
||||
},
|
||||
"django-otp": {
|
||||
"hashes": [
|
||||
"sha256:0016baa0f11544aa3a709d1b4fca13d607397ae41025bdc4fdb8a7e80a39973c",
|
||||
"sha256:fd9e787779c053ba77e47a6907539c01e8db41b09f99722793317ed9a4183b32"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.4.3"
|
||||
},
|
||||
"django-otp-agents": {
|
||||
"hashes": [
|
||||
"sha256:4ca8fae30418e0a813840cee5068d2fb96e3759787a5820d54921b90c7beaa7a",
|
||||
"sha256:8d9f26d5a186b059251bd03e1ab509b5861a678e463c49de9b0766080b2c16a5"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.3.0"
|
||||
},
|
||||
"django-push": {
|
||||
"hashes": [
|
||||
"sha256:9d73a27f147ea46f5e92d6ab36c19640b11214b43b378693c8961aaf8bea5b60",
|
||||
"sha256:d5442fcb6d8254a7e837383ce766a72e8fb921f3bcfc2355440c2da8fbcf07b4"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.1"
|
||||
},
|
||||
"django-randomslugfield": {
|
||||
"hashes": [
|
||||
"sha256:8f5866d9383f020fb7f270a218ddc65b6a33d3833633a0c995c68f28cac59efb"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.3.0"
|
||||
},
|
||||
"django-redis": {
|
||||
"hashes": [
|
||||
"sha256:15b47faef6aefaa3f47135a2aeb67372da300e4a4cf06809c66ab392686a2155",
|
||||
"sha256:a90343c33a816073b735f0bed878eaeec4f83b75fcc0dce2432189b8ea130424"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==4.9.0"
|
||||
},
|
||||
"django-rq": {
|
||||
"hashes": [
|
||||
"sha256:413df6e5789775b287b4b187ea09ff27f5f1d8205e999650ba9e52c34d58d252",
|
||||
"sha256:71a604d4bfc18029c2f64da86bfadb803143f5784b3a340e3767202ced93245a"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.1.0"
|
||||
},
|
||||
"django-super-favicon": {
|
||||
"hashes": [
|
||||
"sha256:56cb5268ea73ef3cbde5cb01fef02fea2ec00739cdae0566d3102009f052f683"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.6.1"
|
||||
},
|
||||
"docutils": {
|
||||
"hashes": [
|
||||
"sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6",
|
||||
"sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274",
|
||||
"sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.14"
|
||||
},
|
||||
"gevent": {
|
||||
"hashes": [
|
||||
"sha256:00a45774ad6e7a8641af5db011807f53c1f0e0bc62cbdcab83e4db18e6201b6e",
|
||||
"sha256:15dbcc07cdd09f87b9814ee26483ec49e0d71fdc65d7a61b21c2c56bbb550168",
|
||||
"sha256:16143db7b760d9b512edfaf4d0bbef01cf0391e773362c43084901e3ecb892d5",
|
||||
"sha256:1a0d422d6c960c36088201d4bbc925dfde87dc4a4e442bf2e4d36ae455f24a96",
|
||||
"sha256:22187d0aba6506b57075dd05d0df495b04bfd4b047bbf776eeaac93117a6e9d2",
|
||||
"sha256:33320f60be19a865396a7f5e10c15b14e338790ae807c97c90edc990d644dc1c",
|
||||
"sha256:3498fec10e3695f3ad31253857c624435378c6a47969babb54a83ac0101615d3",
|
||||
"sha256:3c9fbc0dac62e552dc5d03bb67ceaefc5f74d7b4ac04a4bf797cdb0a4438b1db",
|
||||
"sha256:53c4dc705886d028f5d81e698b1d1479994a421498cd6529cb9711b5e2a84f74",
|
||||
"sha256:57729118fbcf0f39ecf721ae9b318a4a738eb5d9b972af6c6c8c96303e30f011",
|
||||
"sha256:6c41413e1eb0b7bf77dcea42ff276e62903bfdc62cb936d71458d338b9edc9a6",
|
||||
"sha256:72f7cab120e2af89d3a9d6c526e49da5c0b6c94d47e23ab7a26ae8471ee97ffb",
|
||||
"sha256:7ac5a4945fc47e3824d55bb50b6dd65823868e87fac841bea5762f79b9d22019",
|
||||
"sha256:7bb0e1ef3adfea008688617fedb1741009856f98e26133983646203c718f7f39",
|
||||
"sha256:8c41ef269bc743b5bb88a4553627cd4611be5c59589d5390e29956a8d3ab8623",
|
||||
"sha256:a1f32f0b01ceb15f93b2914b7057acb008c5173181813424621dc444f73c00e2",
|
||||
"sha256:a51456f842f7de83fff473a0230e313e44ac6fa83e492412e696924f417088b8",
|
||||
"sha256:a72a23829ce8eb18086ec6f855715c3f52d3c1e12b83fd040d9fb854e77c0565",
|
||||
"sha256:c7e5f8a6bf865ef507db27f85376808991d3189df185864a5ee326d97e144ec4",
|
||||
"sha256:cf707886b9b45e56114c6f5522fc556058de5b5bf8674b609e82dfa2f9633c41",
|
||||
"sha256:d83370528327364354cfb54c96ca401853599bd7a15f382e6962fd8318cede50",
|
||||
"sha256:e9d64081e419eb8a268edaa90bba95fb4c78a6278d2105dcc080b24b42679535"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.3.4"
|
||||
},
|
||||
"greenlet": {
|
||||
"hashes": [
|
||||
"sha256:09ef2636ea35782364c830f07127d6c7a70542b178268714a9a9ba16318e7e8b",
|
||||
"sha256:0fef83d43bf87a5196c91e73cb9772f945a4caaff91242766c5916d1dd1381e4",
|
||||
"sha256:1b7df09c6598f5cfb40f843ade14ed1eb40596e75cd79b6fa2efc750ba01bb01",
|
||||
"sha256:1fff21a2da5f9e03ddc5bd99131a6b8edf3d7f9d6bc29ba21784323d17806ed7",
|
||||
"sha256:42118bf608e0288e35304b449a2d87e2ba77d1e373e8aa221ccdea073de026fa",
|
||||
"sha256:50643fd6d54fd919f9a0a577c5f7b71f5d21f0959ab48767bd4bb73ae0839500",
|
||||
"sha256:58798b5d30054bb4f6cf0f712f08e6092df23a718b69000786634a265e8911a9",
|
||||
"sha256:5b49b3049697aeae17ef7bf21267e69972d9e04917658b4e788986ea5cc518e8",
|
||||
"sha256:75c413551a436b462d5929255b6dc9c0c3c2b25cbeaee5271a56c7fda8ca49c0",
|
||||
"sha256:769b740aeebd584cd59232be84fdcaf6270b8adc356596cdea5b2152c82caaac",
|
||||
"sha256:a1852b51b06d1367e2d70321f6801844f5122852c9e5169bdfdff3f4d81aae30",
|
||||
"sha256:ad2383d39f13534f3ca5c48fe1fc0975676846dc39c2cece78c0f1f9891418e0",
|
||||
"sha256:b417bb7ff680d43e7bd7a13e2e08956fa6acb11fd432f74c97b7664f8bdb6ec1",
|
||||
"sha256:b6ef0cabaf5a6ecb5ac122e689d25ba12433a90c7b067b12e5f28bdb7fb78254",
|
||||
"sha256:c2de19c88bdb0366c976cc125dca1002ec1b346989d59524178adfd395e62421",
|
||||
"sha256:c7b04a6dc74087b1598de8d713198de4718fa30ec6cbb84959b26426c198e041",
|
||||
"sha256:f8f2a0ae8de0b49c7b5b2daca4f150fdd9c1173e854df2cce3b04123244f9f45",
|
||||
"sha256:fcfadaf4bf68a27e5dc2f42cbb2f4b4ceea9f05d1d0b8f7787e640bed2801634"
|
||||
],
|
||||
"markers": "platform_python_implementation == 'CPython'",
|
||||
"version": "==0.4.13"
|
||||
},
|
||||
"gunicorn": {
|
||||
"hashes": [
|
||||
"sha256:7ef2b828b335ed58e3b64ffa84caceb0a7dd7c5ca12f217241350dec36a1d5dc",
|
||||
"sha256:bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==19.8.1"
|
||||
},
|
||||
"hiredis": {
|
||||
"hashes": [
|
||||
"sha256:ca958e13128e49674aa4a96f02746f5de5973f39b57297b84d59fd44d314d5b5"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.2.0"
|
||||
},
|
||||
"html5lib": {
|
||||
"hashes": [
|
||||
"sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3",
|
||||
"sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"
|
||||
],
|
||||
"version": "==1.0.1"
|
||||
},
|
||||
"idna": {
|
||||
"hashes": [
|
||||
"sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e",
|
||||
"sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16"
|
||||
],
|
||||
"version": "==2.7"
|
||||
},
|
||||
"isodate": {
|
||||
"hashes": [
|
||||
"sha256:2e364a3d5759479cdb2d37cce6b9376ea504db2ff90252a2e5b7cc89cc9ff2d8",
|
||||
"sha256:aa4d33c06640f5352aca96e4b81afd8ab3b47337cc12089822d6f322ac772c81"
|
||||
],
|
||||
"version": "==0.6.0"
|
||||
},
|
||||
"jinja2": {
|
||||
"hashes": [
|
||||
"sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd",
|
||||
"sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.10"
|
||||
},
|
||||
"lxml": {
|
||||
"hashes": [
|
||||
"sha256:0941f4313208c07734410414d8308812b044fd3fb98573454e3d3a0d2e201f3d",
|
||||
"sha256:0b18890aa5730f9d847bc5469e8820f782d72af9985a15a7552109a86b01c113",
|
||||
"sha256:21f427945f612ac75576632b1bb8c21233393c961f2da890d7be3927a4b6085f",
|
||||
"sha256:24cf6f622a4d49851afcf63ac4f0f3419754d4e98a7a548ab48dd03c635d9bd3",
|
||||
"sha256:2dc6705486b8abee1af9e2a3761e30a3cb19e8276f20ca7e137ee6611b93707c",
|
||||
"sha256:2e43b2e5b7d2b9abe6e0301eef2c2c122ab45152b968910eae68bdee2c4cfae0",
|
||||
"sha256:329a6d8b6d36f7d6f8b6c6a1db3b2c40f7e30a19d3caf62023c9d6a677c1b5e1",
|
||||
"sha256:423cde55430a348bda6f1021faad7235c2a95a6bdb749e34824e5758f755817a",
|
||||
"sha256:4651ea05939374cfb5fe87aab5271ed38c31ea47997e17ec3834b75b94bd9f15",
|
||||
"sha256:4be3bbfb2968d7da6e5c2cd4104fc5ec1caf9c0794f6cae724da5a53b4d9f5a3",
|
||||
"sha256:622f7e40faef13d232fb52003661f2764ce6cdef3edb0a59af7c1559e4cc36d1",
|
||||
"sha256:664dfd4384d886b239ef0d7ee5cff2b463831079d250528b10e394a322f141f9",
|
||||
"sha256:697c0f58ac637b11991a1bc92e07c34da4a72e2eda34d317d2c1c47e2f24c1b3",
|
||||
"sha256:6ec908b4c8a4faa7fe1a0080768e2ce733f268b287dfefb723273fb34141475f",
|
||||
"sha256:7ec3fe795582b75bb49bb1685ffc462dbe38d74312dac07ce386671a28b5316b",
|
||||
"sha256:8c39babd923c431dcf1e5874c0f778d3a5c745a62c3a9b6bd755efd489ee8a1d",
|
||||
"sha256:949ca5bc56d6cb73d956f4862ba06ad3c5d2808eac76304284f53ae0c8b2334a",
|
||||
"sha256:9f0daddeefb0791a600e6195441910bdf01eac470be596b9467e6122b51239a6",
|
||||
"sha256:a359893b01c30e949eae0e8a85671a593364c9f0b8162afe0cb97317af0953bf",
|
||||
"sha256:ad5d5d8efed59e6b1d4c50c1eac59fb6ecec91b2073676af1e15fc4d43e9b6c5",
|
||||
"sha256:bc1a36f95a6b3667c09b34995fc3a46a82e4cf0dc3e7ab281e4c77b15bd7af05",
|
||||
"sha256:be37b3f55b6d7d923f43bf74c356fc1878eb36e28505f38e198cb432c19c7b1a",
|
||||
"sha256:c45bca5e544eb75f7500ffd730df72922eb878a2f0213b0dc5a5f357ded3a85d",
|
||||
"sha256:ccee7ebbb4735ebc341d347fca9ee09f2fa6c0580528c1414bc4e1d31372835c",
|
||||
"sha256:dc62c0840b2fc7753550b40405532a3e125c0d3761f34af948873393aa688160",
|
||||
"sha256:f7d9d5aa1c7e54167f1a3cba36b5c52c7c540f30952c9bd7d9302a1eda318424"
|
||||
],
|
||||
"version": "==4.2.3"
|
||||
},
|
||||
"markdown": {
|
||||
"hashes": [
|
||||
"sha256:9ba587db9daee7ec761cfc656272be6aabe2ed300fece21208e4aab2e457bc8f",
|
||||
"sha256:a856869c7ff079ad84a3e19cd87a64998350c2b94e9e08e44270faef33400f81"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.6.11"
|
||||
},
|
||||
"markupsafe": {
|
||||
"hashes": [
|
||||
"sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"
|
||||
],
|
||||
"version": "==1.0"
|
||||
},
|
||||
"mf2py": {
|
||||
"hashes": [
|
||||
"sha256:9231bc1317dd5d01973b78a60e52ecd76dd84089c132540e799e4a62aeff3436",
|
||||
"sha256:bdc3f65ab8a1319b763012dfa8def6ce33214f19e1c53fc2844ed9e7afaf1413"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.1.0"
|
||||
},
|
||||
"mf2util": {
|
||||
"hashes": [
|
||||
"sha256:efb8ea1a275f16396993a3fbe32331b74a8f6985d3f7f47503641cf522f1f614"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.5.0"
|
||||
},
|
||||
"msgpack": {
|
||||
"hashes": [
|
||||
"sha256:0b3b1773d2693c70598585a34ca2715873ba899565f0a7c9a1545baef7e7fbdc",
|
||||
"sha256:0bae5d1538c5c6a75642f75a1781f3ac2275d744a92af1a453c150da3446138b",
|
||||
"sha256:0ee8c8c85aa651be3aa0cd005b5931769eaa658c948ce79428766f1bd46ae2c3",
|
||||
"sha256:1369f9edba9500c7a6489b70fdfac773e925342f4531f1e3d4c20ac3173b1ae0",
|
||||
"sha256:22d9c929d1d539f37da3d1b0e16270fa9d46107beab8c0d4d2bddffffe895cee",
|
||||
"sha256:2ff43e3247a1e11d544017bb26f580a68306cec7a6257d8818893c1fda665f42",
|
||||
"sha256:31a98047355d34d047fcdb55b09cb19f633cf214c705a765bd745456c142130c",
|
||||
"sha256:8767eb0032732c3a0da92cbec5ac186ef89a3258c6edca09161472ca0206c45f",
|
||||
"sha256:8acc8910218555044e23826980b950e96685dc48124a290c86f6f41a296ea172",
|
||||
"sha256:ab189a6365be1860a5ecf8159c248f12d33f79ea799ae9695fa6a29896dcf1d4",
|
||||
"sha256:cfd6535feb0f1cf1c7cdb25773e965cc9f92928244a8c3ef6f8f8a8e1f7ae5c4",
|
||||
"sha256:e274cd4480d8c76ec467a85a9c6635bbf2258f0649040560382ab58cabb44bcf",
|
||||
"sha256:f86642d60dca13e93260187d56c2bef2487aa4d574a669e8ceefcf9f4c26fd00",
|
||||
"sha256:f8a57cbda46a94ed0db55b73e6ab0c15e78b4ede8690fa491a0e55128d552bb0",
|
||||
"sha256:fcea97a352416afcbccd7af9625159d80704a25c519c251c734527329bb20d0e"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.5.6"
|
||||
},
|
||||
"packaging": {
|
||||
"hashes": [
|
||||
"sha256:e9215d2d2535d3ae866c3d6efc77d5b24a0192cce0ff20e42896cc0664f889c0",
|
||||
"sha256:f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b"
|
||||
],
|
||||
"version": "==17.1"
|
||||
},
|
||||
"pillow": {
|
||||
"hashes": [
|
||||
"sha256:00633bc2ec40313f4daf351855e506d296ec3c553f21b66720d0f1225ca84c6f",
|
||||
"sha256:040144ba422216aecf7577484865ade90e1a475f867301c48bf9fbd7579efd76",
|
||||
"sha256:16246261ff22368e5e32ad74d5ef40403ab6895171a7fc6d34f6c17cfc0f1943",
|
||||
"sha256:1cb38df69362af35c14d4a50123b63c7ff18ec9a6d4d5da629a6f19d05e16ba8",
|
||||
"sha256:3b4560c3891b05022c464b09121bd507c477505a4e19d703e1027a3a7c68d896",
|
||||
"sha256:438a3faf5f702c8d0f80b9f9f9b8382cfa048ca6a0d64ef71b86b563b0ee0359",
|
||||
"sha256:4d32c8e3623a61d6e29ccd024066cd1ba556555abfb4cd714155020e00107e3f",
|
||||
"sha256:4d8077fd649ac40a5c4165f2c22fa2a4ad18c668e271ecb2f9d849d1017a9313",
|
||||
"sha256:62ec7ae98357fcd46002c110bb7cad15fce532776f0cbe7ca1d44c49b837d49d",
|
||||
"sha256:6eca36905444c4b91fe61f1b9933a47a30480738a1dd26501ff67d94fc2bc112",
|
||||
"sha256:7673e7473a13107059377c96c563aa36f73184c29d2926882e0a0210b779a1e7",
|
||||
"sha256:81762cf5fca9a82b53b7b2d0e6b420e0f3b06167b97678c81d00470daa622d58",
|
||||
"sha256:9b66e968da9c4393f5795285528bc862c7b97b91251f31a08004a3c626d18114",
|
||||
"sha256:b48401752496757e95304a46213c3155bc911ac884bed2e9b275ce1c1df3e293",
|
||||
"sha256:b6cf18f9e653a8077522bb3aa753a776b117e3e0cc872c25811cfdf1459491c2",
|
||||
"sha256:bb8adab1877e9213385cbb1adc297ed8337e01872c42a30cfaa66ff8c422779c",
|
||||
"sha256:cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef",
|
||||
"sha256:d0dc1313dff48af64517cbbd85e046d6b477fbe5e9d69712801f024dcb08c62b",
|
||||
"sha256:e52e8f675ba0b2b417fa98579e7286a41a8e23871f17f4793772f5aa884fea79",
|
||||
"sha256:e87cc1acbebf263f308a8494272c2d42016aa33c32bf14d209c81e1f65e11868",
|
||||
"sha256:ea0091cd4100519cedfeea2c659f52291f535ac6725e2368bcf59e874f270efa",
|
||||
"sha256:eeb247f4f4d962942b3b555530b0c63b77473c7bfe475e51c6b75b7344b49ce3",
|
||||
"sha256:f0d4433adce6075efd24fc0285135248b0b50f5a58129c7e552030e04fe45c7f",
|
||||
"sha256:f1f3bd92f8e12dc22884935a73c9f94c4d9bd0d34410c456540713d6b7832b8c",
|
||||
"sha256:f5f302db65e2e0ae96e26670818157640d3ca83a3054c290eff3631598dcf819",
|
||||
"sha256:f7634d534662bbb08976db801ba27a112aee23e597eeaf09267b4575341e45bf",
|
||||
"sha256:fe6931db24716a0845bd8c8915bd096b77c2a7043e6fc59ae9ca364fe816f08b"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==5.1.0"
|
||||
},
|
||||
"psycopg2-binary": {
|
||||
"hashes": [
|
||||
"sha256:04afb59bbbd2eab3148e6816beddc74348078b8c02a1113ea7f7822f5be4afe3",
|
||||
"sha256:098b18f4d8857a8f9b206d1dc54db56c2255d5d26458917e7bcad61ebfe4338f",
|
||||
"sha256:0bf855d4a7083e20ead961fda4923887094eaeace0ab2d76eb4aa300f4bbf5bd",
|
||||
"sha256:197dda3ffd02057820be83fe4d84529ea70bf39a9a4daee1d20ffc74eb3d042e",
|
||||
"sha256:278ef63afb4b3d842b4609f2c05ffbfb76795cf6a184deeb8707cd5ed3c981a5",
|
||||
"sha256:3cbf8c4fc8f22f0817220891cf405831559f4d4c12c4f73913730a2ea6c47a47",
|
||||
"sha256:4305aed922c4d9d6163ab3a41d80b5a1cfab54917467da8168552c42cad84d32",
|
||||
"sha256:47ee296f704fb8b2a616dec691cdcfd5fa0f11943955e88faa98cbd1dc3b3e3d",
|
||||
"sha256:4a0e38cb30457e70580903367161173d4a7d1381eb2f2cfe4e69b7806623f484",
|
||||
"sha256:4d6c294c6638a71cafb82a37f182f24321f1163b08b5d5ca076e11fe838a3086",
|
||||
"sha256:4f3233c366500730f839f92833194fd8f9a5c4529c8cd8040aa162c3740de8e5",
|
||||
"sha256:5221f5a3f4ca2ddf0d58e8b8a32ca50948be9a43351fda797eb4e72d7a7aa34d",
|
||||
"sha256:5c6ca0b507540a11eaf9e77dee4f07c131c2ec80ca0cffa146671bf690bc1c02",
|
||||
"sha256:789bd89d71d704db2b3d5e67d6d518b158985d791d3b2dec5ab85457cfc9677b",
|
||||
"sha256:89bc65ef3301c74cf32db25334421ea6adbe8f65601ea45dcaaf095abed910bb",
|
||||
"sha256:97521704ac7127d7d8ba22877da3c7bf4a40366587d238ec679ff38e33177498",
|
||||
"sha256:a6d32c37f714c3f34158f3fa659f3a8f2658d5f53c4297d45579b9677cc4d852",
|
||||
"sha256:a89ee5c26f72f2d0d74b991ce49e42ddeb4ac0dc2d8c06a0f2770a1ab48f4fe0",
|
||||
"sha256:b4c8b0ef3608e59317bfc501df84a61e48b5445d45f24d0391a24802de5f2d84",
|
||||
"sha256:b5fcf07140219a1f71e18486b8dc28e2e1b76a441c19374805c617aa6d9a9d55",
|
||||
"sha256:b86f527f00956ecebad6ab3bb30e3a75fedf1160a8716978dd8ce7adddedd86f",
|
||||
"sha256:be4c4aa22ba22f70de36c98b06480e2f1697972d49eb20d525f400d204a6d272",
|
||||
"sha256:c2ac7aa1a144d4e0e613ac7286dae85671e99fe7a1353954d4905629c36b811c",
|
||||
"sha256:de26ef4787b5e778e8223913a3e50368b44e7480f83c76df1f51d23bd21cea16",
|
||||
"sha256:e70ebcfc5372dc7b699c0110454fc4263967f30c55454397e5769eb72c0eb0ce",
|
||||
"sha256:eadbd32b6bc48b67b0457fccc94c86f7ccc8178ab839f684eb285bb592dc143e",
|
||||
"sha256:ecbc6dfff6db06b8b72ae8a2f25ff20fbdcb83cb543811a08f7cb555042aa729"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.7.5"
|
||||
},
|
||||
"pycparser": {
|
||||
"hashes": [
|
||||
"sha256:99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226"
|
||||
],
|
||||
"version": "==2.18"
|
||||
},
|
||||
"pyparsing": {
|
||||
"hashes": [
|
||||
"sha256:0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04",
|
||||
"sha256:fee43f17a9c4087e7ed1605bd6df994c6173c1e977d7ade7b651292fab2bd010"
|
||||
],
|
||||
"version": "==2.2.0"
|
||||
},
|
||||
"python-baseconv": {
|
||||
"hashes": [
|
||||
"sha256:1b98b11d0d1c00bf1165d62b0d183c8d2d496ae5baaa0991c0d4ffef079772d6"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.2.1"
|
||||
},
|
||||
"python-magic": {
|
||||
"hashes": [
|
||||
"sha256:f2674dcfad52ae6c49d4803fa027809540b130db1dec928cfbb9240316831375",
|
||||
"sha256:f3765c0f582d2dfc72c15f3b5a82aecfae9498bd29ca840d72f37d7bd38bfcd5"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.4.15"
|
||||
},
|
||||
"python-slugify": {
|
||||
"hashes": [
|
||||
"sha256:5dbb360b882b2dabe0471a1a92f604504d83c2a73c71f2098d004ab62e695534"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==1.2.5"
|
||||
},
|
||||
"pytz": {
|
||||
"hashes": [
|
||||
"sha256:a061aa0a9e06881eb8b3b2b43f05b9439d6583c206d0a6c340ff72a7b6669053",
|
||||
"sha256:ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277"
|
||||
],
|
||||
"version": "==2018.5"
|
||||
},
|
||||
"pyup-django": {
|
||||
"hashes": [
|
||||
"sha256:f02242b4c7a8926bf9118054429dcaf84e5708a050548abcd3b2b9de4a7570b9",
|
||||
"sha256:fe84cef39c41d5feb24e307d6c8a55454db50df4c6955fa6a890a42b6e58650e"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.4.0"
|
||||
},
|
||||
"pyyaml": {
|
||||
"hashes": [
|
||||
"sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736",
|
||||
"sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f",
|
||||
"sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab",
|
||||
"sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7",
|
||||
"sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1",
|
||||
"sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8",
|
||||
"sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4",
|
||||
"sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==3.12"
|
||||
},
|
||||
"qrcode": {
|
||||
"hashes": [
|
||||
"sha256:037b0db4c93f44586e37f84c3da3f763874fcac85b2974a69a98e399ac78e1bf",
|
||||
"sha256:de4ffc15065e6ff20a551ad32b6b41264f3c75275675406ddfa8e3530d154be3"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==6.0"
|
||||
},
|
||||
"rcssmin": {
|
||||
"hashes": [
|
||||
"sha256:ca87b695d3d7864157773a61263e5abb96006e9ff0e021eff90cbe0e1ba18270"
|
||||
],
|
||||
"version": "==1.0.6"
|
||||
},
|
||||
"redis": {
|
||||
"hashes": [
|
||||
"sha256:8a1900a9f2a0a44ecf6e8b5eb3e967a9909dfed219ad66df094f27f7d6f330fb",
|
||||
"sha256:a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f"
|
||||
],
|
||||
"version": "==2.10.6"
|
||||
},
|
||||
"requests": {
|
||||
"hashes": [
|
||||
"sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1",
|
||||
"sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a"
|
||||
],
|
||||
"version": "==2.19.1"
|
||||
},
|
||||
"rjsmin": {
|
||||
"hashes": [
|
||||
"sha256:dd9591aa73500b08b7db24367f8d32c6470021f39d5ab4e50c7c02e4401386f1"
|
||||
],
|
||||
"version": "==1.0.12"
|
||||
},
|
||||
"ronkyuu": {
|
||||
"hashes": [
|
||||
"sha256:5aa77b39d301bc174ab99ba8a53954627771cb501651a12103c58f51b32e84bf",
|
||||
"sha256:85b25fef7f5fb0c93afd5377ea35b5ff72b2458f926bafdf10f0c9a1e19cab10"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.6"
|
||||
},
|
||||
"rq": {
|
||||
"hashes": [
|
||||
"sha256:4f494d8554d45748b8fb91454a18e2293f305230eaec45b740c94a280aeaa682",
|
||||
"sha256:f997d28c5e69aef38e9162572f78c424a7deff4cd00efae125085d4c1fbcc15b"
|
||||
],
|
||||
"version": "==0.11.0"
|
||||
},
|
||||
"six": {
|
||||
"hashes": [
|
||||
"sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",
|
||||
"sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"
|
||||
],
|
||||
"version": "==1.11.0"
|
||||
},
|
||||
"sqlparse": {
|
||||
"hashes": [
|
||||
"sha256:ce028444cfab83be538752a2ffdb56bc417b7784ff35bb9a3062413717807dec",
|
||||
"sha256:d9cf190f51cbb26da0412247dfe4fb5f4098edb73db84e02f9fc21fdca31fed4"
|
||||
],
|
||||
"version": "==0.2.4"
|
||||
},
|
||||
"unidecode": {
|
||||
"hashes": [
|
||||
"sha256:72f49d3729f3d8f5799f710b97c1451c5163102e76d64d20e170aedbbd923582",
|
||||
"sha256:8c33dd588e0c9bc22a76eaa0c715a5434851f726131bd44a6c26471746efabf5"
|
||||
],
|
||||
"version": "==1.0.22"
|
||||
},
|
||||
"urllib3": {
|
||||
"hashes": [
|
||||
"sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf",
|
||||
"sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5"
|
||||
],
|
||||
"version": "==1.23"
|
||||
},
|
||||
"webencodings": {
|
||||
"hashes": [
|
||||
"sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
|
||||
"sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
|
||||
],
|
||||
"version": "==0.5.1"
|
||||
},
|
||||
"xrd": {
|
||||
"hashes": [
|
||||
"sha256:51d01f732b5b5b7983c5179ffaed864408d95a667b3a6630fe27aa7528274089"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.1"
|
||||
}
|
||||
},
|
||||
"develop": {
|
||||
"argh": {
|
||||
"hashes": [
|
||||
"sha256:a9b3aaa1904eeb78e32394cd46c6f37ac0fb4af6dc488daa58971bdc7d7fcaf3",
|
||||
"sha256:e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65"
|
||||
],
|
||||
"version": "==0.26.2"
|
||||
},
|
||||
"atomicwrites": {
|
||||
"hashes": [
|
||||
"sha256:240831ea22da9ab882b551b31d4225591e5e447a68c5e188db5b89ca1d487585",
|
||||
"sha256:a24da68318b08ac9c9c45029f4a10371ab5b20e4226738e150e6e7c571630ae6"
|
||||
],
|
||||
"version": "==1.1.5"
|
||||
},
|
||||
"attrs": {
|
||||
"hashes": [
|
||||
"sha256:4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265",
|
||||
"sha256:e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b"
|
||||
],
|
||||
"version": "==18.1.0"
|
||||
},
|
||||
"docopt": {
|
||||
"hashes": [
|
||||
"sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
|
||||
],
|
||||
"version": "==0.6.2"
|
||||
},
|
||||
"jedi": {
|
||||
"hashes": [
|
||||
"sha256:b409ed0f6913a701ed474a614a3bb46e6953639033e31f769ca7581da5bd1ec1",
|
||||
"sha256:c254b135fb39ad76e78d4d8f92765ebc9bf92cbc76f49e97ade1d5f5121e1f6f"
|
||||
],
|
||||
"version": "==0.12.1"
|
||||
},
|
||||
"more-itertools": {
|
||||
"hashes": [
|
||||
"sha256:2b6b9893337bfd9166bee6a62c2b0c9fe7735dcf85948b387ec8cba30e85d8e8",
|
||||
"sha256:6703844a52d3588f951883005efcf555e49566a48afd4db4e965d69b883980d3",
|
||||
"sha256:a18d870ef2ffca2b8463c0070ad17b5978056f403fb64e3f15fe62a52db21cc0"
|
||||
],
|
||||
"version": "==4.2.0"
|
||||
},
|
||||
"mypy": {
|
||||
"hashes": [
|
||||
"sha256:1b899802a89b67bb68f30d788bba49b61b1f28779436f06b75c03495f9d6ea5c",
|
||||
"sha256:f472645347430282d62d1f97d12ccb8741f19f1572b7cf30b58280e4e0818739"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.610"
|
||||
},
|
||||
"parso": {
|
||||
"hashes": [
|
||||
"sha256:8105449d86d858e53ce3e0044ede9dd3a395b1c9716c696af8aa3787158ab806",
|
||||
"sha256:d250235e52e8f9fc5a80cc2a5f804c9fefd886b2e67a2b1099cf085f403f8e33"
|
||||
],
|
||||
"version": "==0.3.0"
|
||||
},
|
||||
"pathtools": {
|
||||
"hashes": [
|
||||
"sha256:7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0"
|
||||
],
|
||||
"version": "==0.1.2"
|
||||
},
|
||||
"pluggy": {
|
||||
"hashes": [
|
||||
"sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff",
|
||||
"sha256:d345c8fe681115900d6da8d048ba67c25df42973bda370783cd58826442dcd7c",
|
||||
"sha256:e160a7fcf25762bb60efc7e171d4497ff1d8d2d75a3d0df7a21b76821ecbf5c5"
|
||||
],
|
||||
"version": "==0.6.0"
|
||||
},
|
||||
"prompt-toolkit": {
|
||||
"hashes": [
|
||||
"sha256:1df952620eccb399c53ebb359cc7d9a8d3a9538cb34c5a1344bdbeb29fbcc381",
|
||||
"sha256:3f473ae040ddaa52b52f97f6b4a493cfa9f5920c255a12dc56a7d34397a398a4",
|
||||
"sha256:858588f1983ca497f1cf4ffde01d978a3ea02b01c8a26a8bbc5cd2e66d816917"
|
||||
],
|
||||
"version": "==1.0.15"
|
||||
},
|
||||
"ptpython": {
|
||||
"hashes": [
|
||||
"sha256:55d7cfad50a096f5922c4fdf8cea068a7ec9257418064b437c617ff2f120f81a",
|
||||
"sha256:816da300f620fb88ba97c7962062c8c178d6693b1db19c184660156b1af91bdc",
|
||||
"sha256:a78b27a85c5dbe9d89376e7f3aa70a9d8fa15cb45ee5f73a3cc3963b9b528ac1"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.41"
|
||||
},
|
||||
"py": {
|
||||
"hashes": [
|
||||
"sha256:3fd59af7435864e1a243790d322d763925431213b6b8529c6ca71081ace3bbf7",
|
||||
"sha256:e31fb2767eb657cbde86c454f02e99cb846d3cd9d61b318525140214fdc0e98e"
|
||||
],
|
||||
"version": "==1.5.4"
|
||||
},
|
||||
"pygments": {
|
||||
"hashes": [
|
||||
"sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d",
|
||||
"sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc"
|
||||
],
|
||||
"version": "==2.2.0"
|
||||
},
|
||||
"pytest": {
|
||||
"hashes": [
|
||||
"sha256:8ea01fc4fcc8e1b1e305252b4bc80a1528019ab99fd3b88666c9dc38d754406c",
|
||||
"sha256:90898786b3d0b880b47645bae7b51aa9bbf1e9d1e4510c2cfd15dd65c70ea0cd"
|
||||
],
|
||||
"version": "==3.6.2"
|
||||
},
|
||||
"pytest-django": {
|
||||
"hashes": [
|
||||
"sha256:088b66211c57972e7bd072ba73ccec1c3b6f6185f894b3b8eb966d2f3b7d46cb",
|
||||
"sha256:3fea4d0a84bf3af1f1e82448b9a91b3ddb22b659d802e026ae843040da0c3220"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==3.3.2"
|
||||
},
|
||||
"pyyaml": {
|
||||
"hashes": [
|
||||
"sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736",
|
||||
"sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f",
|
||||
"sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab",
|
||||
"sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7",
|
||||
"sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1",
|
||||
"sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8",
|
||||
"sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4",
|
||||
"sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==3.12"
|
||||
},
|
||||
"six": {
|
||||
"hashes": [
|
||||
"sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",
|
||||
"sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb"
|
||||
],
|
||||
"version": "==1.11.0"
|
||||
},
|
||||
"typed-ast": {
|
||||
"hashes": [
|
||||
"sha256:0948004fa228ae071054f5208840a1e88747a357ec1101c17217bfe99b299d58",
|
||||
"sha256:25d8feefe27eb0303b73545416b13d108c6067b846b543738a25ff304824ed9a",
|
||||
"sha256:29464a177d56e4e055b5f7b629935af7f49c196be47528cc94e0a7bf83fbc2b9",
|
||||
"sha256:2e214b72168ea0275efd6c884b114ab42e316de3ffa125b267e732ed2abda892",
|
||||
"sha256:3e0d5e48e3a23e9a4d1a9f698e32a542a4a288c871d33ed8df1b092a40f3a0f9",
|
||||
"sha256:519425deca5c2b2bdac49f77b2c5625781abbaf9a809d727d3a5596b30bb4ded",
|
||||
"sha256:57fe287f0cdd9ceaf69e7b71a2e94a24b5d268b35df251a88fef5cc241bf73aa",
|
||||
"sha256:668d0cec391d9aed1c6a388b0d5b97cd22e6073eaa5fbaa6d2946603b4871efe",
|
||||
"sha256:68ba70684990f59497680ff90d18e756a47bf4863c604098f10de9716b2c0bdd",
|
||||
"sha256:6de012d2b166fe7a4cdf505eee3aaa12192f7ba365beeefaca4ec10e31241a85",
|
||||
"sha256:79b91ebe5a28d349b6d0d323023350133e927b4de5b651a8aa2db69c761420c6",
|
||||
"sha256:8550177fa5d4c1f09b5e5f524411c44633c80ec69b24e0e98906dd761941ca46",
|
||||
"sha256:a8034021801bc0440f2e027c354b4eafd95891b573e12ff0418dec385c76785c",
|
||||
"sha256:bc978ac17468fe868ee589c795d06777f75496b1ed576d308002c8a5756fb9ea",
|
||||
"sha256:c05b41bc1deade9f90ddc5d988fe506208019ebba9f2578c622516fd201f5863",
|
||||
"sha256:c9b060bd1e5a26ab6e8267fd46fc9e02b54eb15fffb16d112d4c7b1c12987559",
|
||||
"sha256:edb04bdd45bfd76c8292c4d9654568efaedf76fe78eb246dde69bdb13b2dad87",
|
||||
"sha256:f19f2a4f547505fe9072e15f6f4ae714af51b5a681a97f187971f50c283193b6"
|
||||
],
|
||||
"version": "==1.1.0"
|
||||
},
|
||||
"watchdog": {
|
||||
"hashes": [
|
||||
"sha256:7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.8.3"
|
||||
},
|
||||
"wcwidth": {
|
||||
"hashes": [
|
||||
"sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e",
|
||||
"sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"
|
||||
],
|
||||
"version": "==0.1.7"
|
||||
},
|
||||
"werkzeug": {
|
||||
"hashes": [
|
||||
"sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c",
|
||||
"sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==0.14.1"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1 +0,0 @@
|
|||
default_app_config = 'entries.apps.EntriesConfig'
|
|
@ -8,12 +8,10 @@ class SyndicationInline(admin.TabularInline):
|
|||
|
||||
|
||||
class EntryAdmin(admin.ModelAdmin):
|
||||
date_hierarchy = 'created'
|
||||
list_display = ('title', 'id', 'kind', 'created')
|
||||
list_filter = ('kind',)
|
||||
inlines = (
|
||||
SyndicationInline,
|
||||
)
|
||||
date_hierarchy = "created"
|
||||
list_display = ("title", "id", "kind", "created")
|
||||
list_filter = ("kind",)
|
||||
inlines = (SyndicationInline,)
|
||||
|
||||
|
||||
admin.site.register(Cat)
|
||||
|
|
|
@ -2,4 +2,4 @@ from django.apps import AppConfig
|
|||
|
||||
|
||||
class EntriesConfig(AppConfig):
|
||||
name = 'entries'
|
||||
name = "entries"
|
||||
|
|
|
@ -11,24 +11,24 @@ from .models import Entry
|
|||
def from_url(url: str) -> Entry:
|
||||
domain = Site.objects.get_current().domain
|
||||
if not url:
|
||||
raise error.bad_req('url parameter required')
|
||||
if '//' not in url:
|
||||
url = '//' + url
|
||||
parts = urlparse(url, scheme='https')
|
||||
if parts.scheme not in ('http', 'https') or parts.netloc != domain:
|
||||
raise error.bad_req('url does not point to this site')
|
||||
raise error.bad_req("url parameter required")
|
||||
if "//" not in url:
|
||||
url = "//" + url
|
||||
parts = urlparse(url, scheme="https")
|
||||
if parts.scheme not in ("http", "https") or parts.netloc != domain:
|
||||
raise error.bad_req("url does not point to this site")
|
||||
|
||||
try:
|
||||
match = resolve(parts.path)
|
||||
except Resolver404:
|
||||
raise error.bad_req('url does not point to a valid page on this site')
|
||||
raise error.bad_req("url does not point to a valid page on this site")
|
||||
|
||||
if match.view_name != 'entries:entry':
|
||||
raise error.bad_req('url does not point to an entry on this site')
|
||||
if match.view_name != "entries:entry":
|
||||
raise error.bad_req("url does not point to an entry on this site")
|
||||
|
||||
try:
|
||||
entry = Entry.objects.get(pk=match.kwargs['id'])
|
||||
entry = Entry.objects.get(pk=match.kwargs["id"])
|
||||
except Entry.DoesNotExist:
|
||||
raise error.bad_req('url does not point to an existing entry')
|
||||
raise error.bad_req("url does not point to an existing entry")
|
||||
|
||||
return entry
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{% extends 'lemoncurry/layout.html' %}
|
||||
{% block head %}
|
||||
<link rel="shortlink" href="{{ entry.short_url }}" />
|
||||
<link rel="alternate" type="application/json+oembed" href="https://wirres.net/oembed/oembed/php?url={{ entry.absolute_url | urlencode }}" />
|
||||
{% endblock %}
|
||||
|
||||
{% block styles %}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<article class="h-entry media">
|
||||
{{i}}<aside class="info">
|
||||
{{i}}<a class="p-author h-card" href="{{ entry.author.url }}">
|
||||
{{i}}<img class="u-photo img-fluid" src="{{ entry.author.avatar.url }}" alt="{{ entry.author.name }}" />
|
||||
{{i}}{% if entry.author.avatar %}<img class="u-photo img-fluid" src="{{ entry.author.avatar.url }}" alt="{{ entry.author.name }}" />{% endif %}
|
||||
{{i}}<span class="p-name sr-only">{{ entry.author.name }}</span>
|
||||
{{i}}</a>
|
||||
{{i}}<a class="u-uid u-url" href="{{ entry.url }}">
|
||||
|
|
|
@ -7,16 +7,19 @@ from ronkyuu import webmention
|
|||
@job
|
||||
def ping_hub(*urls):
|
||||
for url in urls:
|
||||
requests.post(settings.PUSH_HUB, data={
|
||||
'hub.mode': 'publish',
|
||||
'hub.url': url,
|
||||
})
|
||||
requests.post(
|
||||
settings.PUSH_HUB,
|
||||
data={
|
||||
"hub.mode": "publish",
|
||||
"hub.url": url,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
@job
|
||||
def send_mentions(source, targets=None):
|
||||
if targets is None:
|
||||
targets = webmention.findMentions(source)['refs']
|
||||
targets = webmention.findMentions(source)["refs"]
|
||||
for target in targets:
|
||||
status, endpoint = webmention.discoverEndpoint(target)
|
||||
if endpoint is not None and status == 200:
|
||||
|
|
|
@ -14,62 +14,62 @@ class Entry:
|
|||
return self.index_page()
|
||||
|
||||
def index_page(self, page=0):
|
||||
kwargs = {'kind': self}
|
||||
kwargs = {"kind": self}
|
||||
if page > 1:
|
||||
kwargs['page'] = page
|
||||
return reverse('entries:index', kwargs=kwargs)
|
||||
kwargs["page"] = page
|
||||
return reverse("entries:index", kwargs=kwargs)
|
||||
|
||||
@property
|
||||
def entry(self):
|
||||
return self.plural + '_entry'
|
||||
return self.plural + "_entry"
|
||||
|
||||
@property
|
||||
def atom(self):
|
||||
return reverse('entries:atom_by_kind', kwargs={'kind': self})
|
||||
return reverse("entries:atom_by_kind", kwargs={"kind": self})
|
||||
|
||||
@property
|
||||
def rss(self):
|
||||
return reverse('entries:rss_by_kind', kwargs={'kind': self})
|
||||
return reverse("entries:rss_by_kind", kwargs={"kind": self})
|
||||
|
||||
|
||||
Note = Entry(
|
||||
id='note',
|
||||
icon='fas fa-paper-plane',
|
||||
plural='notes',
|
||||
id="note",
|
||||
icon="fas fa-paper-plane",
|
||||
plural="notes",
|
||||
)
|
||||
|
||||
|
||||
Article = Entry(
|
||||
id='article',
|
||||
icon='fas fa-file-alt',
|
||||
plural='articles',
|
||||
id="article",
|
||||
icon="fas fa-file-alt",
|
||||
plural="articles",
|
||||
slug=True,
|
||||
)
|
||||
|
||||
Photo = Entry(
|
||||
id='photo',
|
||||
icon='fas fa-camera',
|
||||
plural='photos',
|
||||
id="photo",
|
||||
icon="fas fa-camera",
|
||||
plural="photos",
|
||||
)
|
||||
|
||||
Reply = Entry(
|
||||
id='reply',
|
||||
icon='fas fa-comment',
|
||||
plural='replies',
|
||||
id="reply",
|
||||
icon="fas fa-comment",
|
||||
plural="replies",
|
||||
on_home=False,
|
||||
)
|
||||
|
||||
Like = Entry(
|
||||
id='like',
|
||||
icon='fas fa-heart',
|
||||
plural='likes',
|
||||
id="like",
|
||||
icon="fas fa-heart",
|
||||
plural="likes",
|
||||
on_home=False,
|
||||
)
|
||||
|
||||
Repost = Entry(
|
||||
id='repost',
|
||||
icon='fas fa-retweet',
|
||||
plural='reposts',
|
||||
id="repost",
|
||||
icon="fas fa-retweet",
|
||||
plural="reposts",
|
||||
)
|
||||
|
||||
all = (Note, Article, Photo)
|
||||
|
@ -79,7 +79,7 @@ from_plural = {k.plural: k for k in all}
|
|||
|
||||
|
||||
class EntryKindConverter:
|
||||
regex = '|'.join(k.plural for k in all)
|
||||
regex = "|".join(k.plural for k in all)
|
||||
|
||||
def to_python(self, plural):
|
||||
return from_plural[plural]
|
||||
|
|
|
@ -8,7 +8,6 @@ import django.db.models.deletion
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
|
@ -17,20 +16,41 @@ class Migration(migrations.Migration):
|
|||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Entry',
|
||||
name="Entry",
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('kind', models.CharField(choices=[('note', 'Note'), ('article', 'Article')], default='note', max_length=30)),
|
||||
('name', models.CharField(blank=True, max_length=100)),
|
||||
('summary', models.TextField(blank=True)),
|
||||
('content', models.TextField()),
|
||||
('published', models.DateTimeField()),
|
||||
('updated', models.DateTimeField()),
|
||||
('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
(
|
||||
"kind",
|
||||
models.CharField(
|
||||
choices=[("note", "Note"), ("article", "Article")],
|
||||
default="note",
|
||||
max_length=30,
|
||||
),
|
||||
),
|
||||
("name", models.CharField(blank=True, max_length=100)),
|
||||
("summary", models.TextField(blank=True)),
|
||||
("content", models.TextField()),
|
||||
("published", models.DateTimeField()),
|
||||
("updated", models.DateTimeField()),
|
||||
(
|
||||
"author",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
'verbose_name_plural': 'entries',
|
||||
'ordering': ['-published'],
|
||||
"verbose_name_plural": "entries",
|
||||
"ordering": ["-published"],
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
|
@ -7,23 +7,42 @@ import django.db.models.deletion
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('users', '0005_auto_20171023_0158'),
|
||||
('entries', '0001_initial'),
|
||||
("users", "0005_auto_20171023_0158"),
|
||||
("entries", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Syndication',
|
||||
name="Syndication",
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('url', models.CharField(max_length=255)),
|
||||
('entry', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='syndications', to='entries.Entry')),
|
||||
('profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.Profile')),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
("url", models.CharField(max_length=255)),
|
||||
(
|
||||
"entry",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="syndications",
|
||||
to="entries.Entry",
|
||||
),
|
||||
),
|
||||
(
|
||||
"profile",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE, to="users.Profile"
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
'ordering': ['profile'],
|
||||
"ordering": ["profile"],
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
|
@ -6,14 +6,13 @@ from django.db import migrations
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0002_syndication'),
|
||||
("entries", "0002_syndication"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RemoveField(
|
||||
model_name='entry',
|
||||
name='summary',
|
||||
model_name="entry",
|
||||
name="summary",
|
||||
),
|
||||
]
|
||||
|
|
|
@ -8,20 +8,28 @@ import django.db.models.deletion
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0003_remove_entry_summary'),
|
||||
("entries", "0003_remove_entry_summary"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='entry',
|
||||
name='author',
|
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='entries', to=settings.AUTH_USER_MODEL),
|
||||
model_name="entry",
|
||||
name="author",
|
||||
field=models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="entries",
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='entry',
|
||||
name='kind',
|
||||
field=models.CharField(choices=[('note', 'note'), ('article', 'article')], db_index=True, default='note', max_length=30),
|
||||
model_name="entry",
|
||||
name="kind",
|
||||
field=models.CharField(
|
||||
choices=[("note", "note"), ("article", "article")],
|
||||
db_index=True,
|
||||
default="note",
|
||||
max_length=30,
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
|
@ -6,20 +6,24 @@ from django.db import migrations, models
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0004_auto_20171027_0846'),
|
||||
("entries", "0004_auto_20171027_0846"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='entry',
|
||||
name='photo',
|
||||
field=models.ImageField(blank=True, upload_to=''),
|
||||
model_name="entry",
|
||||
name="photo",
|
||||
field=models.ImageField(blank=True, upload_to=""),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='entry',
|
||||
name='kind',
|
||||
field=models.CharField(choices=[('note', 'note'), ('article', 'article'), ('photo', 'photo')], db_index=True, default='note', max_length=30),
|
||||
model_name="entry",
|
||||
name="kind",
|
||||
field=models.CharField(
|
||||
choices=[("note", "note"), ("article", "article"), ("photo", "photo")],
|
||||
db_index=True,
|
||||
default="note",
|
||||
max_length=30,
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
|
@ -8,34 +8,41 @@ import model_utils.fields
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0005_auto_20171027_1557'),
|
||||
("entries", "0005_auto_20171027_1557"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='entry',
|
||||
options={'ordering': ['-created'], 'verbose_name_plural': 'entries'},
|
||||
name="entry",
|
||||
options={"ordering": ["-created"], "verbose_name_plural": "entries"},
|
||||
),
|
||||
migrations.RenameField(
|
||||
model_name='entry',
|
||||
old_name='published',
|
||||
new_name='created',
|
||||
model_name="entry",
|
||||
old_name="published",
|
||||
new_name="created",
|
||||
),
|
||||
migrations.RenameField(
|
||||
model_name='entry',
|
||||
old_name='updated',
|
||||
new_name='modified',
|
||||
model_name="entry",
|
||||
old_name="updated",
|
||||
new_name="modified",
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='entry',
|
||||
name='created',
|
||||
field=model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created'),
|
||||
model_name="entry",
|
||||
name="created",
|
||||
field=model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now,
|
||||
editable=False,
|
||||
verbose_name="created",
|
||||
),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='entry',
|
||||
name='modified',
|
||||
field=model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified'),
|
||||
model_name="entry",
|
||||
name="modified",
|
||||
field=model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now,
|
||||
editable=False,
|
||||
verbose_name="modified",
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
|
@ -6,20 +6,31 @@ from django.db import migrations, models
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0006_auto_20171102_1200'),
|
||||
("entries", "0006_auto_20171102_1200"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='entry',
|
||||
name='cite',
|
||||
model_name="entry",
|
||||
name="cite",
|
||||
field=models.CharField(blank=True, max_length=255),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='entry',
|
||||
name='kind',
|
||||
field=models.CharField(choices=[('note', 'note'), ('article', 'article'), ('photo', 'photo'), ('reply', 'reply'), ('like', 'like'), ('repost', 'repost')], db_index=True, default='note', max_length=30),
|
||||
model_name="entry",
|
||||
name="kind",
|
||||
field=models.CharField(
|
||||
choices=[
|
||||
("note", "note"),
|
||||
("article", "article"),
|
||||
("photo", "photo"),
|
||||
("reply", "reply"),
|
||||
("like", "like"),
|
||||
("repost", "repost"),
|
||||
],
|
||||
db_index=True,
|
||||
default="note",
|
||||
max_length=30,
|
||||
),
|
||||
),
|
||||
]
|
||||
|
|
|
@ -6,25 +6,24 @@ from django.db import migrations, models
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0007_auto_20171113_0841'),
|
||||
("entries", "0007_auto_20171113_0841"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameField(
|
||||
model_name='entry',
|
||||
old_name='cite',
|
||||
new_name='in_reply_to',
|
||||
model_name="entry",
|
||||
old_name="cite",
|
||||
new_name="in_reply_to",
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='entry',
|
||||
name='like_of',
|
||||
model_name="entry",
|
||||
name="like_of",
|
||||
field=models.CharField(blank=True, max_length=255),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='entry',
|
||||
name='repost_of',
|
||||
model_name="entry",
|
||||
name="repost_of",
|
||||
field=models.CharField(blank=True, max_length=255),
|
||||
),
|
||||
]
|
||||
|
|
|
@ -6,21 +6,28 @@ from django.db import migrations, models
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0008_auto_20171116_2116'),
|
||||
("entries", "0008_auto_20171116_2116"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Tag',
|
||||
name="Tag",
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('name', models.CharField(max_length=255, unique=True)),
|
||||
('slug', models.CharField(max_length=255, unique=True)),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
("name", models.CharField(max_length=255, unique=True)),
|
||||
("slug", models.CharField(max_length=255, unique=True)),
|
||||
],
|
||||
options={
|
||||
'ordering': ('name',),
|
||||
"ordering": ("name",),
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
|
@ -6,15 +6,14 @@ from django.db import migrations, models
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0009_tag'),
|
||||
("entries", "0009_tag"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='entry',
|
||||
name='tags',
|
||||
field=models.ManyToManyField(related_name='entries', to='entries.Tag'),
|
||||
model_name="entry",
|
||||
name="tags",
|
||||
field=models.ManyToManyField(related_name="entries", to="entries.Tag"),
|
||||
),
|
||||
]
|
||||
|
|
|
@ -9,17 +9,17 @@ class Migration(migrations.Migration):
|
|||
atomic = False
|
||||
|
||||
dependencies = [
|
||||
('entries', '0010_entry_tags'),
|
||||
("entries", "0010_entry_tags"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RenameModel(
|
||||
old_name='Tag',
|
||||
new_name='Cat',
|
||||
old_name="Tag",
|
||||
new_name="Cat",
|
||||
),
|
||||
migrations.RenameField(
|
||||
model_name='entry',
|
||||
old_name='tags',
|
||||
new_name='cats',
|
||||
model_name="entry",
|
||||
old_name="tags",
|
||||
new_name="cats",
|
||||
),
|
||||
]
|
||||
|
|
|
@ -5,25 +5,25 @@ from django.db import migrations
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('entries', '0011_auto_20171120_1108'),
|
||||
("entries", "0011_auto_20171120_1108"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterModelOptions(
|
||||
name='syndication',
|
||||
options={'ordering': ['domain']},
|
||||
name="syndication",
|
||||
options={"ordering": ["domain"]},
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='syndication',
|
||||
name='profile',
|
||||
model_name="syndication",
|
||||
name="profile",
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='syndication',
|
||||
name='domain',
|
||||
model_name="syndication",
|
||||
name="domain",
|
||||
field=computed_property.fields.ComputedCharField(
|
||||
compute_from='calc_domain', default='', editable=False, max_length=255),
|
||||
compute_from="calc_domain", default="", editable=False, max_length=255
|
||||
),
|
||||
preserve_default=False,
|
||||
),
|
||||
]
|
||||
|
|
22
entries/migrations/0013_alter_entry_kind.py
Normal file
22
entries/migrations/0013_alter_entry_kind.py
Normal file
|
@ -0,0 +1,22 @@
|
|||
# Generated by Django 3.2.12 on 2022-03-12 04:24
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("entries", "0012_auto_20180628_2044"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="entry",
|
||||
name="kind",
|
||||
field=models.CharField(
|
||||
choices=[("note", "note"), ("article", "article"), ("photo", "photo")],
|
||||
db_index=True,
|
||||
default="note",
|
||||
max_length=30,
|
||||
),
|
||||
),
|
||||
]
|
|
@ -17,6 +17,7 @@ from users.models import Site
|
|||
|
||||
from . import kinds
|
||||
from lemoncurry import requests, utils
|
||||
|
||||
ENTRY_KINDS = [(k.id, k.id) for k in kinds.all]
|
||||
|
||||
|
||||
|
@ -32,38 +33,33 @@ class Cat(models.Model):
|
|||
slug = models.CharField(max_length=255, unique=True)
|
||||
|
||||
def __str__(self):
|
||||
return '#' + self.name
|
||||
return "#" + self.name
|
||||
|
||||
@property
|
||||
def url(self):
|
||||
return reverse('entries:cat', args=(self.slug,))
|
||||
return reverse("entries:cat", args=(self.slug,))
|
||||
|
||||
class Meta:
|
||||
ordering = ('name',)
|
||||
ordering = ("name",)
|
||||
|
||||
|
||||
class EntryManager(models.Manager):
|
||||
def get_queryset(self):
|
||||
qs = super(EntryManager, self).get_queryset()
|
||||
return (qs
|
||||
.select_related('author')
|
||||
.prefetch_related('cats', 'syndications'))
|
||||
return qs.select_related("author").prefetch_related("cats", "syndications")
|
||||
|
||||
|
||||
class Entry(ModelMeta, TimeStampedModel):
|
||||
objects = EntryManager()
|
||||
kind = models.CharField(
|
||||
max_length=30,
|
||||
choices=ENTRY_KINDS,
|
||||
db_index=True,
|
||||
default=ENTRY_KINDS[0][0]
|
||||
max_length=30, choices=ENTRY_KINDS, db_index=True, default=ENTRY_KINDS[0][0]
|
||||
)
|
||||
|
||||
name = models.CharField(max_length=100, blank=True)
|
||||
photo = models.ImageField(blank=True)
|
||||
content = models.TextField()
|
||||
|
||||
cats = models.ManyToManyField(Cat, related_name='entries')
|
||||
cats = models.ManyToManyField(Cat, related_name="entries")
|
||||
|
||||
in_reply_to = models.CharField(max_length=255, blank=True)
|
||||
like_of = models.CharField(max_length=255, blank=True)
|
||||
|
@ -71,7 +67,7 @@ class Entry(ModelMeta, TimeStampedModel):
|
|||
|
||||
author = models.ForeignKey(
|
||||
get_user_model(),
|
||||
related_name='entries',
|
||||
related_name="entries",
|
||||
on_delete=models.CASCADE,
|
||||
)
|
||||
|
||||
|
@ -79,10 +75,7 @@ class Entry(ModelMeta, TimeStampedModel):
|
|||
def reply_context(self):
|
||||
if not self.in_reply_to:
|
||||
return None
|
||||
return interpret(
|
||||
requests.mf2(self.in_reply_to).to_dict(),
|
||||
self.in_reply_to
|
||||
)
|
||||
return interpret(requests.mf2(self.in_reply_to).to_dict(), self.in_reply_to)
|
||||
|
||||
@property
|
||||
def published(self):
|
||||
|
@ -93,35 +86,29 @@ class Entry(ModelMeta, TimeStampedModel):
|
|||
return self.modified
|
||||
|
||||
_metadata = {
|
||||
'description': 'excerpt',
|
||||
'image': 'image_url',
|
||||
'twitter_creator': 'twitter_creator',
|
||||
'og_profile_id': 'og_profile_id',
|
||||
"description": "excerpt",
|
||||
"image": "image_url",
|
||||
"twitter_creator": "twitter_creator",
|
||||
"og_profile_id": "og_profile_id",
|
||||
}
|
||||
|
||||
@property
|
||||
def title(self):
|
||||
if self.name:
|
||||
return self.name
|
||||
return shorten(
|
||||
utils.to_plain(self.paragraphs[0]),
|
||||
width=100,
|
||||
placeholder='…'
|
||||
)
|
||||
return shorten(utils.to_plain(self.paragraphs[0]), width=100, placeholder="…")
|
||||
|
||||
@property
|
||||
def excerpt(self):
|
||||
try:
|
||||
return utils.to_plain(self.paragraphs[0 if self.name else 1])
|
||||
except IndexError:
|
||||
return ' '
|
||||
return " "
|
||||
|
||||
@property
|
||||
def paragraphs(self):
|
||||
lines = self.content.splitlines()
|
||||
return [
|
||||
"\n".join(para) for k, para in groupby(lines, key=bool) if k
|
||||
]
|
||||
return ["\n".join(para) for k, para in groupby(lines, key=bool) if k]
|
||||
|
||||
@property
|
||||
def twitter_creator(self):
|
||||
|
@ -136,31 +123,31 @@ class Entry(ModelMeta, TimeStampedModel):
|
|||
return self.photo.url if self.photo else self.author.avatar_url
|
||||
|
||||
def __str__(self):
|
||||
return '{0} {1}: {2}'.format(self.kind, self.id, self.title)
|
||||
return "{0} {1}: {2}".format(self.kind, self.id, self.title)
|
||||
|
||||
def get_absolute_url(self):
|
||||
return self.absolute_url
|
||||
|
||||
@property
|
||||
def absolute_url(self):
|
||||
base = 'https://' + DjangoSite.objects.get_current().domain
|
||||
base = "https://" + DjangoSite.objects.get_current().domain
|
||||
return urljoin(base, self.url)
|
||||
|
||||
@property
|
||||
def affected_urls(self):
|
||||
base = 'https://' + DjangoSite.objects.get_current().domain
|
||||
base = "https://" + DjangoSite.objects.get_current().domain
|
||||
kind = kinds.from_id[self.kind]
|
||||
urls = {
|
||||
self.url,
|
||||
reverse('entries:index', kwargs={'kind': kind}),
|
||||
reverse('entries:atom_by_kind', kwargs={'kind': kind}),
|
||||
reverse('entries:rss_by_kind', kwargs={'kind': kind}),
|
||||
reverse("entries:index", kwargs={"kind": kind}),
|
||||
reverse("entries:atom_by_kind", kwargs={"kind": kind}),
|
||||
reverse("entries:rss_by_kind", kwargs={"kind": kind}),
|
||||
} | {cat.url for cat in self.cats.all()}
|
||||
if kind.on_home:
|
||||
urls |= {
|
||||
reverse('home:index'),
|
||||
reverse('entries:atom'),
|
||||
reverse('entries:rss')
|
||||
reverse("home:index"),
|
||||
reverse("entries:atom"),
|
||||
reverse("entries:rss"),
|
||||
}
|
||||
return {urljoin(base, u) for u in urls}
|
||||
|
||||
|
@ -170,7 +157,7 @@ class Entry(ModelMeta, TimeStampedModel):
|
|||
args = [kind, self.id]
|
||||
if kind.slug:
|
||||
args.append(self.slug)
|
||||
return reverse('entries:entry', args=args)
|
||||
return reverse("entries:entry", args=args)
|
||||
|
||||
@property
|
||||
def short_url(self):
|
||||
|
@ -182,49 +169,48 @@ class Entry(ModelMeta, TimeStampedModel):
|
|||
|
||||
@property
|
||||
def json_ld(self):
|
||||
base = 'https://' + DjangoSite.objects.get_current().domain
|
||||
base = "https://" + DjangoSite.objects.get_current().domain
|
||||
url = urljoin(base, self.url)
|
||||
|
||||
posting = {
|
||||
'@context': 'http://schema.org',
|
||||
'@type': 'BlogPosting',
|
||||
'@id': url,
|
||||
'url': url,
|
||||
'mainEntityOfPage': url,
|
||||
'author': {
|
||||
'@type': 'Person',
|
||||
'url': urljoin(base, self.author.url),
|
||||
'name': self.author.name,
|
||||
"@context": "http://schema.org",
|
||||
"@type": "BlogPosting",
|
||||
"@id": url,
|
||||
"url": url,
|
||||
"mainEntityOfPage": url,
|
||||
"author": {
|
||||
"@type": "Person",
|
||||
"url": urljoin(base, self.author.url),
|
||||
"name": self.author.name,
|
||||
},
|
||||
'headline': self.title,
|
||||
'description': self.excerpt,
|
||||
'datePublished': self.created.isoformat(),
|
||||
'dateModified': self.modified.isoformat(),
|
||||
"headline": self.title,
|
||||
"description": self.excerpt,
|
||||
"datePublished": self.created.isoformat(),
|
||||
"dateModified": self.modified.isoformat(),
|
||||
}
|
||||
if self.photo:
|
||||
posting['image'] = (urljoin(base, self.photo.url), )
|
||||
posting["image"] = (urljoin(base, self.photo.url),)
|
||||
return posting
|
||||
|
||||
class Meta:
|
||||
verbose_name_plural = 'entries'
|
||||
ordering = ['-created']
|
||||
verbose_name_plural = "entries"
|
||||
ordering = ["-created"]
|
||||
|
||||
|
||||
class Syndication(models.Model):
|
||||
entry = models.ForeignKey(
|
||||
Entry,
|
||||
related_name='syndications',
|
||||
on_delete=models.CASCADE
|
||||
Entry, related_name="syndications", on_delete=models.CASCADE
|
||||
)
|
||||
url = models.CharField(max_length=255)
|
||||
|
||||
domain = ComputedCharField(
|
||||
compute_from='calc_domain', max_length=255,
|
||||
compute_from="calc_domain",
|
||||
max_length=255,
|
||||
)
|
||||
|
||||
def calc_domain(self):
|
||||
domain = urlparse(self.url).netloc
|
||||
if domain.startswith('www.'):
|
||||
if domain.startswith("www."):
|
||||
domain = domain[4:]
|
||||
return domain
|
||||
|
||||
|
@ -234,7 +220,7 @@ class Syndication(models.Model):
|
|||
try:
|
||||
return Site.objects.get(domain=d)
|
||||
except Site.DoesNotExist:
|
||||
return Site(name=d, domain=d, icon='fas fa-newspaper')
|
||||
return Site(name=d, domain=d, icon="fas fa-newspaper")
|
||||
|
||||
class Meta:
|
||||
ordering = ['domain']
|
||||
ordering = ["domain"]
|
||||
|
|
|
@ -1,35 +1,32 @@
|
|||
from django.core.paginator import Paginator
|
||||
from typing import Callable
|
||||
|
||||
from django.core.paginator import Page, Paginator
|
||||
from django.shortcuts import redirect
|
||||
|
||||
from lemoncurry.middleware import ResponseException
|
||||
|
||||
|
||||
def paginate(queryset, reverse, page):
|
||||
class Page:
|
||||
def __init__(self, i):
|
||||
self.i = i
|
||||
def paginate(queryset, reverse: Callable[[int], str], page: int | None) -> Page:
|
||||
def redirect_to_page(i: int):
|
||||
raise ResponseException(redirect(reverse(i)))
|
||||
|
||||
@property
|
||||
def url(self):
|
||||
return reverse(self.i)
|
||||
|
||||
@property
|
||||
def current(self):
|
||||
return self.i == entries.number
|
||||
|
||||
# If the first page was requested, redirect to the clean version of the URL
|
||||
# with no page suffix.
|
||||
if page == 1:
|
||||
raise ResponseException(redirect(Page(1).url))
|
||||
def reversible(p: Page) -> Page:
|
||||
p.reverse = reverse
|
||||
return p
|
||||
|
||||
paginator = Paginator(queryset, 10)
|
||||
entries = paginator.page(page or 1)
|
||||
|
||||
entries.pages = tuple(Page(i) for i in paginator.page_range)
|
||||
# If no page number was specified, return page one.
|
||||
if page is None:
|
||||
return reversible(paginator.page(1))
|
||||
|
||||
if entries.has_previous():
|
||||
entries.prev = Page(entries.previous_page_number())
|
||||
if entries.has_next():
|
||||
entries.next = Page(entries.next_page_number())
|
||||
# If the first page was explicitly requested, or the page number was negative, redirect to page one with no URL suffix.
|
||||
if page <= 1:
|
||||
redirect_to_page(1)
|
||||
|
||||
return entries
|
||||
# If the page requested is larger than the last page, then redirect to the last page.
|
||||
if page > paginator.num_pages:
|
||||
redirect_to_page(paginator.num_pages)
|
||||
|
||||
# Just return the current page! Hooray!
|
||||
return reversible(paginator.page(page))
|
||||
|
|
|
@ -3,27 +3,27 @@ import pytest
|
|||
|
||||
@pytest.mark.django_db
|
||||
def test_atom(client):
|
||||
res = client.get('/atom')
|
||||
res = client.get("/atom")
|
||||
assert res.status_code == 200
|
||||
assert res['Content-Type'] == 'application/atom+xml; charset=utf-8'
|
||||
assert res["Content-Type"] == "application/atom+xml; charset=utf-8"
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_rss(client):
|
||||
res = client.get('/rss')
|
||||
res = client.get("/rss")
|
||||
assert res.status_code == 200
|
||||
assert res['Content-Type'] == 'application/rss+xml; charset=utf-8'
|
||||
assert res["Content-Type"] == "application/rss+xml; charset=utf-8"
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_atom_by_kind(client):
|
||||
res = client.get('/notes/atom')
|
||||
res = client.get("/notes/atom")
|
||||
assert res.status_code == 200
|
||||
assert res['Content-Type'] == 'application/atom+xml; charset=utf-8'
|
||||
assert res["Content-Type"] == "application/atom+xml; charset=utf-8"
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_rss_by_kind(client):
|
||||
res = client.get('/notes/rss')
|
||||
res = client.get("/notes/rss")
|
||||
assert res.status_code == 200
|
||||
assert res['Content-Type'] == 'application/rss+xml; charset=utf-8'
|
||||
assert res["Content-Type"] == "application/rss+xml; charset=utf-8"
|
||||
|
|
|
@ -3,47 +3,46 @@ from . import kinds
|
|||
from .views import feeds, lists, perma
|
||||
from lemoncurry import breadcrumbs as crumbs
|
||||
|
||||
register_converter(kinds.EntryKindConverter, 'kind')
|
||||
register_converter(kinds.EntryKindConverter, "kind")
|
||||
|
||||
|
||||
def to_pat(*args):
|
||||
return '^{0}$'.format(''.join(args))
|
||||
return "^{0}$".format("".join(args))
|
||||
|
||||
|
||||
def prefix(route):
|
||||
return app_name + ':' + route
|
||||
return app_name + ":" + route
|
||||
|
||||
|
||||
id = r'/(?P<id>\d+)'
|
||||
kind = r'(?P<kind>{0})'.format('|'.join(k.plural for k in kinds.all))
|
||||
page = r'(?:/page/(?P<page>\d+))?'
|
||||
slug = r'/(?P<slug>[^/]+)'
|
||||
id = r"/(?P<id>\d+)"
|
||||
kind = r"(?P<kind>{0})".format("|".join(k.plural for k in kinds.all))
|
||||
page = r"(?:/page/(?P<page>\d+))?"
|
||||
slug = r"/(?P<slug>[^/]+)"
|
||||
|
||||
slug_opt = '(?:' + slug + ')?'
|
||||
slug_opt = "(?:" + slug + ")?"
|
||||
|
||||
app_name = 'entries'
|
||||
app_name = "entries"
|
||||
urlpatterns = (
|
||||
path('atom', feeds.AtomHomeEntries(), name='atom'),
|
||||
path('rss', feeds.RssHomeEntries(), name='rss'),
|
||||
path('cats/<slug:slug>', lists.by_cat, name='cat'),
|
||||
path('cats/<slug:slug>/page/<int:page>', lists.by_cat, name='cat'),
|
||||
path('<kind:kind>', lists.by_kind, name='index'),
|
||||
path('<kind:kind>/page/<int:page>', lists.by_kind, name='index'),
|
||||
path('<kind:kind>/atom', feeds.AtomByKind(), name='atom_by_kind'),
|
||||
path('<kind:kind>/rss', feeds.RssByKind(), name='rss_by_kind'),
|
||||
|
||||
path('<kind:kind>/<int:id>', perma.entry, name='entry'),
|
||||
path('<kind:kind>/<int:id>/<slug:slug>', perma.entry, name='entry'),
|
||||
path("atom", feeds.AtomHomeEntries(), name="atom"),
|
||||
path("rss", feeds.RssHomeEntries(), name="rss"),
|
||||
path("cats/<slug:slug>", lists.by_cat, name="cat"),
|
||||
path("cats/<slug:slug>/page/<int:page>", lists.by_cat, name="cat"),
|
||||
path("<kind:kind>", lists.by_kind, name="index"),
|
||||
path("<kind:kind>/page/<int:page>", lists.by_kind, name="index"),
|
||||
path("<kind:kind>/atom", feeds.AtomByKind(), name="atom_by_kind"),
|
||||
path("<kind:kind>/rss", feeds.RssByKind(), name="rss_by_kind"),
|
||||
path("<kind:kind>/<int:id>", perma.entry, name="entry"),
|
||||
path("<kind:kind>/<int:id>/<slug:slug>", perma.entry, name="entry"),
|
||||
)
|
||||
|
||||
|
||||
class IndexCrumb(crumbs.Crumb):
|
||||
def __init__(self):
|
||||
super().__init__(prefix('index'), parent='home:index')
|
||||
super().__init__(prefix("index"), parent="home:index")
|
||||
|
||||
@property
|
||||
def kind(self):
|
||||
return self.match.kwargs['kind']
|
||||
return self.match.kwargs["kind"]
|
||||
|
||||
@property
|
||||
def label(self):
|
||||
|
@ -51,9 +50,9 @@ class IndexCrumb(crumbs.Crumb):
|
|||
|
||||
@property
|
||||
def url(self):
|
||||
return reverse(prefix('index'), kwargs={'kind': self.kind})
|
||||
return reverse(prefix("index"), kwargs={"kind": self.kind})
|
||||
|
||||
|
||||
crumbs.add(prefix('cat'), parent='home:index')
|
||||
crumbs.add(prefix("cat"), parent="home:index")
|
||||
crumbs.add(IndexCrumb())
|
||||
crumbs.add(prefix('entry'), parent=prefix('index'))
|
||||
crumbs.add(prefix("entry"), parent=prefix("index"))
|
||||
|
|
|
@ -11,8 +11,8 @@ from ..models import Entry
|
|||
class Atom1FeedWithHub(Atom1Feed):
|
||||
def add_root_elements(self, handler):
|
||||
super().add_root_elements(handler)
|
||||
handler.startElement('link', {'rel': 'hub', 'href': settings.PUSH_HUB})
|
||||
handler.endElement('link')
|
||||
handler.startElement("link", {"rel": "hub", "href": settings.PUSH_HUB})
|
||||
handler.endElement("link")
|
||||
|
||||
|
||||
class EntriesFeed(Feed):
|
||||
|
@ -79,7 +79,7 @@ class RssHomeEntries(EntriesFeed):
|
|||
return Site.objects.get_current().name
|
||||
|
||||
def link(self):
|
||||
return reverse('home:index')
|
||||
return reverse("home:index")
|
||||
|
||||
def description(self):
|
||||
return "content from {0}".format(
|
||||
|
|
|
@ -5,32 +5,32 @@ from ..models import Entry, Cat
|
|||
from ..pagination import paginate
|
||||
|
||||
|
||||
@render_to('entries/index.html')
|
||||
@render_to("entries/index.html")
|
||||
def by_kind(request, kind, page=None):
|
||||
entries = Entry.objects.filter(kind=kind.id)
|
||||
entries = paginate(queryset=entries, reverse=kind.index_page, page=page)
|
||||
|
||||
return {
|
||||
'entries': entries,
|
||||
'atom': kind.atom,
|
||||
'rss': kind.rss,
|
||||
'title': kind.plural,
|
||||
"entries": entries,
|
||||
"atom": kind.atom,
|
||||
"rss": kind.rss,
|
||||
"title": kind.plural,
|
||||
}
|
||||
|
||||
|
||||
@render_to('entries/index.html')
|
||||
@render_to("entries/index.html")
|
||||
def by_cat(request, slug, page=None):
|
||||
def url(page):
|
||||
kwargs = {'slug': slug}
|
||||
kwargs = {"slug": slug}
|
||||
if page > 1:
|
||||
kwargs['page'] = page
|
||||
return reverse('entries:cat', kwargs=kwargs)
|
||||
kwargs["page"] = page
|
||||
return reverse("entries:cat", kwargs=kwargs)
|
||||
|
||||
cat = get_object_or_404(Cat, slug=slug)
|
||||
entries = cat.entries.all()
|
||||
entries = paginate(queryset=entries, reverse=url, page=page)
|
||||
|
||||
return {
|
||||
'entries': entries,
|
||||
'title': '#' + cat.name,
|
||||
"entries": entries,
|
||||
"title": "#" + cat.name,
|
||||
}
|
||||
|
|
|
@ -3,13 +3,12 @@ from django.shortcuts import redirect, get_object_or_404
|
|||
from ..models import Entry
|
||||
|
||||
|
||||
@render_to('entries/entry.html')
|
||||
@render_to("entries/entry.html")
|
||||
def entry(request, kind, id, slug=None):
|
||||
entry = get_object_or_404(Entry, pk=id)
|
||||
if request.path != entry.url:
|
||||
return redirect(entry.url, permanent=True)
|
||||
return {
|
||||
'entry': entry,
|
||||
'title': entry.title,
|
||||
'meta': entry.as_meta(request)
|
||||
"entry": entry,
|
||||
"title": entry.title,
|
||||
}
|
||||
|
|
5
gunicorn.py
Normal file
5
gunicorn.py
Normal file
|
@ -0,0 +1,5 @@
|
|||
import multiprocessing
|
||||
|
||||
proc_name = "lemoncurry"
|
||||
worker_class = "gevent"
|
||||
workers = multiprocessing.cpu_count() * 2 + 1
|
|
@ -97,6 +97,11 @@
|
|||
|
||||
{% block foot %}
|
||||
<script type="text/javascript">
|
||||
tippy('.profiles [title]', {arrow: true});
|
||||
tippy('.profiles [title]', {
|
||||
arrow: true,
|
||||
content: function(element) {
|
||||
return element.getAttribute('title');
|
||||
}
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
|
|
@ -3,10 +3,10 @@ from django.urls import reverse
|
|||
|
||||
|
||||
class HomeSitemap(sitemaps.Sitemap):
|
||||
changefreq = 'daily'
|
||||
changefreq = "daily"
|
||||
|
||||
def items(self):
|
||||
return ('home:index',)
|
||||
return ("home:index",)
|
||||
|
||||
def location(self, item):
|
||||
return reverse(item)
|
||||
|
|
|
@ -2,9 +2,9 @@ from django.urls import path
|
|||
|
||||
from . import views
|
||||
|
||||
app_name = 'home'
|
||||
app_name = "home"
|
||||
urlpatterns = [
|
||||
path('', views.index, name='index'),
|
||||
path('page/<int:page>', views.index, name='index'),
|
||||
path('robots.txt', views.robots, name='robots.txt'),
|
||||
path("", views.index, name="index"),
|
||||
path("page/<int:page>", views.index, name="index"),
|
||||
path("robots.txt", views.robots, name="robots.txt"),
|
||||
]
|
||||
|
|
|
@ -8,35 +8,31 @@ from urllib.parse import urljoin
|
|||
from entries import kinds, pagination
|
||||
from lemoncurry import breadcrumbs, utils
|
||||
|
||||
breadcrumbs.add('home:index', 'home')
|
||||
breadcrumbs.add("home:index", "home")
|
||||
|
||||
|
||||
@render_to('home/index.html')
|
||||
@render_to("home/index.html")
|
||||
def index(request, page=None):
|
||||
def url(page):
|
||||
kwargs = {'page': page} if page != 1 else {}
|
||||
return reverse('home:index', kwargs=kwargs)
|
||||
kwargs = {"page": page} if page != 1 else {}
|
||||
return reverse("home:index", kwargs=kwargs)
|
||||
|
||||
user = request.user
|
||||
if not hasattr(user, 'entries'):
|
||||
if not hasattr(user, "entries"):
|
||||
user = get_object_or_404(User, pk=1)
|
||||
|
||||
entries = user.entries.filter(kind__in=kinds.on_home)
|
||||
entries = pagination.paginate(queryset=entries, reverse=url, page=page)
|
||||
|
||||
return {
|
||||
'user': user,
|
||||
'entries': entries,
|
||||
'atom': reverse('entries:atom'),
|
||||
'rss': reverse('entries:rss'),
|
||||
'meta': user.as_meta(request),
|
||||
"user": user,
|
||||
"entries": entries,
|
||||
"atom": reverse("entries:atom"),
|
||||
"rss": reverse("entries:rss"),
|
||||
}
|
||||
|
||||
|
||||
def robots(request):
|
||||
base = utils.origin(request)
|
||||
lines = (
|
||||
'User-agent: *',
|
||||
'Sitemap: {0}'.format(urljoin(base, reverse('sitemap')))
|
||||
)
|
||||
return HttpResponse("\n".join(lines) + "\n", content_type='text/plain')
|
||||
lines = ("User-agent: *", "Sitemap: {0}".format(urljoin(base, reverse("sitemap"))))
|
||||
return HttpResponse("\n".join(lines) + "\n", content_type="text/plain")
|
||||
|
|
|
@ -62,15 +62,22 @@
|
|||
</div>
|
||||
|
||||
<div id="verified-success" hidden>
|
||||
this client has been <strong>verified</strong> using <code>{{ '<link rel="redirect_uri">' | escape }}</code> - they are who they claim to be!
|
||||
this client has been <strong>verified</strong> using <code>{{ '<link rel="redirect_uri">' | escape }}</code> <br/>- they are who they claim to be!
|
||||
</div>
|
||||
<div id="verified-warning" hidden>
|
||||
this client could <strong>not</strong> be verified using <code>{{ '<link rel="redirect_uri">' | escape }}</code> - check the redirect uri carefully yourself!
|
||||
this client could <strong>not</strong> be verified using <code>{{ '<link rel="redirect_uri">' | escape }}</code> <br/>- check the redirect uri carefully yourself!
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block foot %}
|
||||
<script type="text/javascript">
|
||||
tippy('[data-tippy-theme]', {arrow: true});
|
||||
tippy('[data-tippy-html]', {
|
||||
arrow: true,
|
||||
allowHTML: true,
|
||||
maxWidth: 500,
|
||||
content: function(element) {
|
||||
return document.querySelector(element.getAttribute('data-tippy-html')).innerHTML;
|
||||
}
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
|
|
@ -7,25 +7,36 @@ from django.db import migrations, models
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
] # type: List[Tuple[str, str]]
|
||||
dependencies = [] # type: List[Tuple[str, str]]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='IndieAuthCode',
|
||||
name="IndieAuthCode",
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True,
|
||||
primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('code', models.CharField(max_length=64, unique=True)),
|
||||
('me', models.CharField(max_length=255)),
|
||||
('client_id', models.CharField(max_length=255)),
|
||||
('redirect_uri', models.CharField(max_length=255)),
|
||||
('response_type', models.CharField(choices=[
|
||||
('id', 'id'), ('code', 'code')], default='id', max_length=4)),
|
||||
('scope', models.CharField(blank=True, max_length=200)),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
("code", models.CharField(max_length=64, unique=True)),
|
||||
("me", models.CharField(max_length=255)),
|
||||
("client_id", models.CharField(max_length=255)),
|
||||
("redirect_uri", models.CharField(max_length=255)),
|
||||
(
|
||||
"response_type",
|
||||
models.CharField(
|
||||
choices=[("id", "id"), ("code", "code")],
|
||||
default="id",
|
||||
max_length=4,
|
||||
),
|
||||
),
|
||||
("scope", models.CharField(blank=True, max_length=200)),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
|
|
@ -6,13 +6,12 @@ from django.db import migrations
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('lemonauth', '0001_initial'),
|
||||
("lemonauth", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.DeleteModel(
|
||||
name='IndieAuthCode',
|
||||
name="IndieAuthCode",
|
||||
),
|
||||
]
|
||||
|
|
|
@ -9,43 +9,112 @@ import randomslugfield.fields
|
|||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('lemonauth', '0002_delete_indieauthcode'),
|
||||
("lemonauth", "0002_delete_indieauthcode"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='IndieAuthCode',
|
||||
name="IndieAuthCode",
|
||||
fields=[
|
||||
('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
|
||||
('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
|
||||
('id', randomslugfield.fields.RandomSlugField(blank=True, editable=False, length=30, max_length=30, primary_key=True, serialize=False, unique=True)),
|
||||
('client_id', models.URLField()),
|
||||
('scope', models.TextField(blank=True)),
|
||||
('redirect_uri', models.URLField()),
|
||||
('response_type', model_utils.fields.StatusField(choices=[('id', 'id'), ('code', 'code')], default='id', max_length=100, no_check_for_status=True)),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||
(
|
||||
"created",
|
||||
model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now,
|
||||
editable=False,
|
||||
verbose_name="created",
|
||||
),
|
||||
),
|
||||
(
|
||||
"modified",
|
||||
model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now,
|
||||
editable=False,
|
||||
verbose_name="modified",
|
||||
),
|
||||
),
|
||||
(
|
||||
"id",
|
||||
randomslugfield.fields.RandomSlugField(
|
||||
blank=True,
|
||||
editable=False,
|
||||
length=30,
|
||||
max_length=30,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
unique=True,
|
||||
),
|
||||
),
|
||||
("client_id", models.URLField()),
|
||||
("scope", models.TextField(blank=True)),
|
||||
("redirect_uri", models.URLField()),
|
||||
(
|
||||
"response_type",
|
||||
model_utils.fields.StatusField(
|
||||
choices=[("id", "id"), ("code", "code")],
|
||||
default="id",
|
||||
max_length=100,
|
||||
no_check_for_status=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
"abstract": False,
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Token',
|
||||
name="Token",
|
||||
fields=[
|
||||
('created', model_utils.fields.AutoCreatedField(default=django.utils.timezone.now, editable=False, verbose_name='created')),
|
||||
('modified', model_utils.fields.AutoLastModifiedField(default=django.utils.timezone.now, editable=False, verbose_name='modified')),
|
||||
('id', randomslugfield.fields.RandomSlugField(blank=True, editable=False, length=30, max_length=30, primary_key=True, serialize=False, unique=True)),
|
||||
('client_id', models.URLField()),
|
||||
('scope', models.TextField(blank=True)),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||
(
|
||||
"created",
|
||||
model_utils.fields.AutoCreatedField(
|
||||
default=django.utils.timezone.now,
|
||||
editable=False,
|
||||
verbose_name="created",
|
||||
),
|
||||
),
|
||||
(
|
||||
"modified",
|
||||
model_utils.fields.AutoLastModifiedField(
|
||||
default=django.utils.timezone.now,
|
||||
editable=False,
|
||||
verbose_name="modified",
|
||||
),
|
||||
),
|
||||
(
|
||||
"id",
|
||||
randomslugfield.fields.RandomSlugField(
|
||||
blank=True,
|
||||
editable=False,
|
||||
length=30,
|
||||
max_length=30,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
unique=True,
|
||||
),
|
||||
),
|
||||
("client_id", models.URLField()),
|
||||
("scope", models.TextField(blank=True)),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
"abstract": False,
|
||||
},
|
||||
),
|
||||
]
|
||||
|
|
|
@ -17,6 +17,7 @@ class AuthSecret(TimeStampedModel):
|
|||
authorisation codes and tokens in IndieAuth - the two contain many
|
||||
identical fields, but just a few differences.
|
||||
"""
|
||||
|
||||
id = RandomSlugField(primary_key=True, length=30)
|
||||
client_id = models.URLField()
|
||||
user = models.ForeignKey(get_user_model(), on_delete=models.CASCADE)
|
||||
|
@ -27,7 +28,7 @@ class AuthSecret(TimeStampedModel):
|
|||
return self.user.full_url
|
||||
|
||||
def __contains__(self, scope):
|
||||
return scope in self.scope.split(' ')
|
||||
return scope in self.scope.split(" ")
|
||||
|
||||
class Meta:
|
||||
abstract = True
|
||||
|
@ -41,10 +42,11 @@ class IndieAuthCode(AuthSecret):
|
|||
Codes are single-use, and if unused will be expired automatically after
|
||||
thirty seconds.
|
||||
"""
|
||||
|
||||
redirect_uri = models.URLField()
|
||||
|
||||
RESPONSE_TYPE = Choices('id', 'code')
|
||||
response_type = StatusField(choices_name='RESPONSE_TYPE')
|
||||
RESPONSE_TYPE = Choices("id", "code")
|
||||
response_type = StatusField(choices_name="RESPONSE_TYPE")
|
||||
|
||||
@property
|
||||
def expired(self):
|
||||
|
@ -56,4 +58,5 @@ class Token(AuthSecret):
|
|||
A Token grants a client long-term authorisation - it will not expire unless
|
||||
explicitly revoked by the user.
|
||||
"""
|
||||
|
||||
pass
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
img
|
||||
height 2em
|
||||
margin-right .5em
|
||||
.tippy-tooltip
|
||||
&.success-theme
|
||||
.tippy-box
|
||||
&[data-theme~='success']
|
||||
color $base0B
|
||||
&.warning-theme
|
||||
&[data-theme~='warning']
|
||||
color $base0A
|
||||
.verified-success
|
||||
color $base0B
|
||||
|
|
|
@ -3,17 +3,17 @@ from .models import IndieAuthCode, Token
|
|||
|
||||
|
||||
def auth(request) -> Token:
|
||||
if 'HTTP_AUTHORIZATION' in request.META:
|
||||
auth = request.META.get('HTTP_AUTHORIZATION').split(' ')
|
||||
if auth[0] != 'Bearer':
|
||||
raise error.bad_req('auth type {0} not supported'.format(auth[0]))
|
||||
if "HTTP_AUTHORIZATION" in request.META:
|
||||
auth = request.META.get("HTTP_AUTHORIZATION").split(" ")
|
||||
if auth[0] != "Bearer":
|
||||
raise error.bad_req("auth type {0} not supported".format(auth[0]))
|
||||
if len(auth) != 2:
|
||||
raise error.bad_req('invalid Bearer auth format, must be Bearer <token>')
|
||||
raise error.bad_req("invalid Bearer auth format, must be Bearer <token>")
|
||||
token = auth[1]
|
||||
elif 'access_token' in request.POST:
|
||||
token = request.POST.get('access_token')
|
||||
elif 'access_token' in request.GET:
|
||||
token = request.GET.get('access_token')
|
||||
elif "access_token" in request.POST:
|
||||
token = request.POST.get("access_token")
|
||||
elif "access_token" in request.GET:
|
||||
token = request.GET.get("access_token")
|
||||
else:
|
||||
raise error.unauthorized()
|
||||
|
||||
|
@ -28,11 +28,11 @@ def auth(request) -> Token:
|
|||
def gen_auth_code(req):
|
||||
code = IndieAuthCode()
|
||||
code.user = req.user
|
||||
code.client_id = req.POST['client_id']
|
||||
code.redirect_uri = req.POST['redirect_uri']
|
||||
code.response_type = req.POST.get('response_type', 'id')
|
||||
if 'scope' in req.POST:
|
||||
code.scope = ' '.join(req.POST.getlist('scope'))
|
||||
code.client_id = req.POST["client_id"]
|
||||
code.redirect_uri = req.POST["redirect_uri"]
|
||||
code.response_type = req.POST.get("response_type", "id")
|
||||
if "scope" in req.POST:
|
||||
code.scope = " ".join(req.POST.getlist("scope"))
|
||||
code.save()
|
||||
return code.id
|
||||
|
||||
|
|
|
@ -1,13 +1,17 @@
|
|||
from django.urls import path
|
||||
from . import views
|
||||
|
||||
app_name = 'lemonauth'
|
||||
app_name = "lemonauth"
|
||||
urlpatterns = [
|
||||
path('login', views.login, name='login'),
|
||||
path('logout', views.logout, name='logout'),
|
||||
path('indie', views.IndieView.as_view(), name='indie'),
|
||||
path('indie/approve', views.indie_approve, name='indie_approve'),
|
||||
path('token', views.TokenView.as_view(), name='token'),
|
||||
path('tokens', views.TokensListView.as_view(), name='tokens'),
|
||||
path('tokens/<path:client_id>', views.TokensRevokeView.as_view(), name='tokens_revoke'),
|
||||
path("login", views.login, name="login"),
|
||||
path("logout", views.logout, name="logout"),
|
||||
path("indie", views.IndieView.as_view(), name="indie"),
|
||||
path("indie/approve", views.indie_approve, name="indie_approve"),
|
||||
path("token", views.TokenView.as_view(), name="token"),
|
||||
path("tokens", views.TokensListView.as_view(), name="tokens"),
|
||||
path(
|
||||
"tokens/<path:client_id>",
|
||||
views.TokensRevokeView.as_view(),
|
||||
name="tokens_revoke",
|
||||
),
|
||||
]
|
||||
|
|
|
@ -12,120 +12,114 @@ from urllib.parse import urlencode, urljoin, urlunparse, urlparse
|
|||
from .. import tokens
|
||||
from ..models import IndieAuthCode
|
||||
|
||||
breadcrumbs.add('lemonauth:indie', parent='home:index')
|
||||
breadcrumbs.add("lemonauth:indie", parent="home:index")
|
||||
|
||||
|
||||
def canonical(url):
|
||||
if '//' not in url:
|
||||
url = '//' + url
|
||||
if "//" not in url:
|
||||
url = "//" + url
|
||||
(scheme, netloc, path, params, query, fragment) = urlparse(url)
|
||||
if not scheme or scheme == 'http':
|
||||
scheme = 'https'
|
||||
if not scheme or scheme == "http":
|
||||
scheme = "https"
|
||||
if not path:
|
||||
path = '/'
|
||||
path = "/"
|
||||
return urlunparse((scheme, netloc, path, params, query, fragment))
|
||||
|
||||
|
||||
@method_decorator(csrf_exempt, name='dispatch')
|
||||
@method_decorator(csrf_exempt, name="dispatch")
|
||||
class IndieView(TemplateView):
|
||||
template_name = 'lemonauth/indie.html'
|
||||
required_params = ('client_id', 'redirect_uri')
|
||||
template_name = "lemonauth/indie.html"
|
||||
required_params = ("client_id", "redirect_uri")
|
||||
|
||||
@method_decorator(login_required)
|
||||
@method_decorator(render_to(template_name))
|
||||
def get(self, request):
|
||||
params = request.GET.dict()
|
||||
params.setdefault('response_type', 'id')
|
||||
params.setdefault("response_type", "id")
|
||||
|
||||
for param in self.required_params:
|
||||
if param not in params:
|
||||
return utils.bad_req(
|
||||
'parameter {0} is required'.format(param)
|
||||
)
|
||||
return utils.bad_req("parameter {0} is required".format(param))
|
||||
|
||||
me = request.user.full_url
|
||||
if 'me' in params:
|
||||
param_me = canonical(params['me'])
|
||||
if "me" in params:
|
||||
param_me = canonical(params["me"])
|
||||
if me != param_me:
|
||||
return utils.forbid(
|
||||
'you are logged in as {}, not as {}'.format(me, param_me)
|
||||
"you are logged in as {}, not as {}".format(me, param_me)
|
||||
)
|
||||
|
||||
redirect_uri = urljoin(params['client_id'], params['redirect_uri'])
|
||||
redirect_uri = urljoin(params["client_id"], params["redirect_uri"])
|
||||
|
||||
type = params['response_type']
|
||||
if type not in ('id', 'code'):
|
||||
return utils.bad_req(
|
||||
'unknown response_type: {0}'.format(type)
|
||||
)
|
||||
type = params["response_type"]
|
||||
if type not in ("id", "code"):
|
||||
return utils.bad_req("unknown response_type: {0}".format(type))
|
||||
|
||||
scopes = ()
|
||||
if type == 'code':
|
||||
if 'scope' not in params:
|
||||
return utils.bad_req(
|
||||
'scopes required for code type'
|
||||
)
|
||||
scopes = params['scope'].split(' ')
|
||||
if type == "code":
|
||||
if "scope" not in params:
|
||||
return utils.bad_req("scopes required for code type")
|
||||
scopes = params["scope"].split(" ")
|
||||
|
||||
client = requests.mf2(params['client_id'])
|
||||
rels = (client.to_dict()['rel-urls']
|
||||
.get(redirect_uri, {})
|
||||
.get('rels', ()))
|
||||
verified = 'redirect_uri' in rels
|
||||
client = requests.mf2(params["client_id"])
|
||||
rels = client.to_dict()["rel-urls"].get(redirect_uri, {}).get("rels", ())
|
||||
verified = "redirect_uri" in rels
|
||||
|
||||
try:
|
||||
app = client.to_dict(filter_by_type='h-x-app')[0]['properties']
|
||||
app = client.to_dict(filter_by_type="h-x-app")[0]["properties"]
|
||||
except IndexError:
|
||||
app = None
|
||||
|
||||
return {
|
||||
'app': app,
|
||||
'me': me,
|
||||
'redirect_uri': redirect_uri,
|
||||
'verified': verified,
|
||||
'params': params,
|
||||
'scopes': scopes,
|
||||
'title': 'indieauth from {client_id}'.format(**params),
|
||||
"app": app,
|
||||
"me": me,
|
||||
"redirect_uri": redirect_uri,
|
||||
"verified": verified,
|
||||
"params": params,
|
||||
"scopes": scopes,
|
||||
"title": "indieauth from {client_id}".format(**params),
|
||||
}
|
||||
|
||||
def post(self, request):
|
||||
post = request.POST.dict()
|
||||
try:
|
||||
code = IndieAuthCode.objects.get(pk=post.get('code'))
|
||||
code = IndieAuthCode.objects.get(pk=post.get("code"))
|
||||
except IndieAuthCode.DoesNotExist:
|
||||
# if anything at all goes wrong when decoding the auth code, bail
|
||||
# out immediately.
|
||||
return utils.forbid('invalid auth code')
|
||||
return utils.forbid("invalid auth code")
|
||||
code.delete()
|
||||
if code.expired:
|
||||
return utils.forbid('invalid auth code')
|
||||
return utils.forbid("invalid auth code")
|
||||
|
||||
if code.response_type != 'id':
|
||||
return utils.bad_req(
|
||||
'this endpoint only supports response_type=id'
|
||||
)
|
||||
if code.client_id != post.get('client_id'):
|
||||
return utils.forbid('client id did not match')
|
||||
if code.redirect_uri != post.get('redirect_uri'):
|
||||
return utils.forbid('redirect uri did not match')
|
||||
if code.response_type != "id":
|
||||
return utils.bad_req("this endpoint only supports response_type=id")
|
||||
if code.client_id != post.get("client_id"):
|
||||
return utils.forbid("client id did not match")
|
||||
if code.redirect_uri != post.get("redirect_uri"):
|
||||
return utils.forbid("redirect uri did not match")
|
||||
|
||||
# If we got here, it's valid! Yay!
|
||||
return utils.choose_type(request, {'me': code.me}, {
|
||||
'application/x-www-form-urlencoded': utils.form_encoded_response,
|
||||
'application/json': JsonResponse,
|
||||
})
|
||||
return utils.choose_type(
|
||||
request,
|
||||
{"me": code.me},
|
||||
{
|
||||
"application/x-www-form-urlencoded": utils.form_encoded_response,
|
||||
"application/json": JsonResponse,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def approve(request):
|
||||
params = {
|
||||
'me': urljoin(utils.origin(request), request.user.url),
|
||||
'code': tokens.gen_auth_code(request),
|
||||
"me": urljoin(utils.origin(request), request.user.url),
|
||||
"code": tokens.gen_auth_code(request),
|
||||
}
|
||||
if 'state' in request.POST:
|
||||
params['state'] = request.POST['state']
|
||||
if "state" in request.POST:
|
||||
params["state"] = request.POST["state"]
|
||||
|
||||
uri = request.POST['redirect_uri']
|
||||
sep = '&' if '?' in uri else '?'
|
||||
uri = request.POST["redirect_uri"]
|
||||
sep = "&" if "?" in uri else "?"
|
||||
return redirect(uri + sep + urlencode(params))
|
||||
|
|
|
@ -2,11 +2,11 @@ import django.contrib.auth.views
|
|||
from otp_agents.forms import OTPAuthenticationForm
|
||||
from lemoncurry import breadcrumbs
|
||||
|
||||
breadcrumbs.add(route='lemonauth:login', label='log in', parent='home:index')
|
||||
breadcrumbs.add(route="lemonauth:login", label="log in", parent="home:index")
|
||||
|
||||
login = django.contrib.auth.views.LoginView.as_view(
|
||||
authentication_form=OTPAuthenticationForm,
|
||||
extra_context={'title': 'log in'},
|
||||
template_name='lemonauth/login.html',
|
||||
extra_context={"title": "log in"},
|
||||
template_name="lemonauth/login.html",
|
||||
redirect_authenticated_user=True,
|
||||
)
|
||||
|
|
|
@ -7,41 +7,42 @@ from ..models import IndieAuthCode
|
|||
from lemoncurry import utils
|
||||
|
||||
|
||||
@method_decorator(csrf_exempt, name='dispatch')
|
||||
@method_decorator(csrf_exempt, name="dispatch")
|
||||
class TokenView(View):
|
||||
def get(self, req):
|
||||
token = tokens.auth(req)
|
||||
res = {
|
||||
'me': token.me,
|
||||
'client_id': token.client_id,
|
||||
'scope': token.scope,
|
||||
"me": token.me,
|
||||
"client_id": token.client_id,
|
||||
"scope": token.scope,
|
||||
}
|
||||
return utils.choose_type(req, res)
|
||||
|
||||
def post(self, req):
|
||||
post = req.POST
|
||||
try:
|
||||
code = IndieAuthCode.objects.get(pk=post.get('code'))
|
||||
code = IndieAuthCode.objects.get(pk=post.get("code"))
|
||||
except IndieAuthCode.DoesNotExist:
|
||||
return utils.forbid('invalid auth code')
|
||||
return utils.forbid("invalid auth code")
|
||||
code.delete()
|
||||
if code.expired:
|
||||
return utils.forbid('invalid auth code')
|
||||
return utils.forbid("invalid auth code")
|
||||
|
||||
if code.response_type != 'code':
|
||||
return utils.bad_req(
|
||||
'this endpoint only supports response_type=code'
|
||||
if code.response_type != "code":
|
||||
return utils.bad_req("this endpoint only supports response_type=code")
|
||||
if "client_id" in post and code.client_id != post["client_id"]:
|
||||
return utils.forbid("client id did not match")
|
||||
if code.redirect_uri != post.get("redirect_uri"):
|
||||
return utils.forbid("redirect uri did not match")
|
||||
|
||||
if "me" in post and code.me != post["me"]:
|
||||
return utils.forbid("me did not match")
|
||||
|
||||
return utils.choose_type(
|
||||
req,
|
||||
{
|
||||
"access_token": tokens.gen_token(code),
|
||||
"me": code.me,
|
||||
"scope": code.scope,
|
||||
},
|
||||
)
|
||||
if 'client_id' in post and code.client_id != post['client_id']:
|
||||
return utils.forbid('client id did not match')
|
||||
if code.redirect_uri != post.get('redirect_uri'):
|
||||
return utils.forbid('redirect uri did not match')
|
||||
|
||||
if 'me' in post and code.me != post['me']:
|
||||
return utils.forbid('me did not match')
|
||||
|
||||
return utils.choose_type(req, {
|
||||
'access_token': tokens.gen_token(code),
|
||||
'me': code.me,
|
||||
'scope': code.scope,
|
||||
})
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
from requests.exceptions import RequestException
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.views.generic import TemplateView
|
||||
from typing import Dict, Optional, Set
|
||||
|
@ -20,15 +21,15 @@ class Client:
|
|||
self.id = client_id
|
||||
self.count = 0
|
||||
self.scopes = set()
|
||||
apps = mf2(self.id).to_dict(filter_by_type='h-x-app')
|
||||
try:
|
||||
self.app = apps[0]['properties']
|
||||
except IndexError:
|
||||
apps = mf2(self.id).to_dict(filter_by_type="h-x-app")
|
||||
self.app = apps[0]["properties"]
|
||||
except (RequestException, IndexError):
|
||||
self.app = None
|
||||
|
||||
|
||||
class TokensListView(LoginRequiredMixin, TemplateView):
|
||||
template_name = 'lemonauth/tokens.html'
|
||||
template_name = "lemonauth/tokens.html"
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
|
@ -36,6 +37,6 @@ class TokensListView(LoginRequiredMixin, TemplateView):
|
|||
for token in self.request.user.token_set.all():
|
||||
client = clients[token.client_id]
|
||||
client.count += 1
|
||||
client.scopes |= set(token.scope.split(' '))
|
||||
context.update({'clients': clients, 'title': 'tokens'})
|
||||
client.scopes |= set(token.scope.split(" "))
|
||||
context.update({"clients": clients, "title": "tokens"})
|
||||
return context
|
||||
|
|
|
@ -14,7 +14,7 @@ class Crumb:
|
|||
return self._label
|
||||
|
||||
def __eq__(self, other):
|
||||
if hasattr(other, 'route'):
|
||||
if hasattr(other, "route"):
|
||||
return self.route == other.route
|
||||
return self.route == other
|
||||
|
||||
|
|
|
@ -2,6 +2,6 @@ from debug_toolbar.middleware import show_toolbar as core_show_toolbar
|
|||
|
||||
|
||||
def show_toolbar(request):
|
||||
if request.path.endswith('/amp'):
|
||||
if request.path.endswith("/amp"):
|
||||
return False
|
||||
return core_show_toolbar(request)
|
||||
|
|
|
@ -22,18 +22,22 @@ def environment(**options):
|
|||
lstrip_blocks=True,
|
||||
**options
|
||||
)
|
||||
env.filters.update({
|
||||
'ago': ago,
|
||||
'friendly_url': friendly_url,
|
||||
'markdown': markdown,
|
||||
})
|
||||
env.globals.update({
|
||||
'entry_kinds': entry_kinds,
|
||||
'favicons': favicons,
|
||||
'package': load_package_json(),
|
||||
'settings': settings,
|
||||
'static': staticfiles_storage.url,
|
||||
'theme_color': theme_color,
|
||||
'url': reverse,
|
||||
})
|
||||
env.filters.update(
|
||||
{
|
||||
"ago": ago,
|
||||
"friendly_url": friendly_url,
|
||||
"markdown": markdown,
|
||||
}
|
||||
)
|
||||
env.globals.update(
|
||||
{
|
||||
"entry_kinds": entry_kinds,
|
||||
"favicons": favicons,
|
||||
"package": load_package_json(),
|
||||
"settings": settings,
|
||||
"static": staticfiles_storage.url,
|
||||
"theme_color": theme_color,
|
||||
"url": reverse,
|
||||
}
|
||||
)
|
||||
return env
|
||||
|
|
|
@ -6,4 +6,4 @@ def ago(dt: datetime) -> str:
|
|||
# We have to convert the datetime we get to local time first, because ago
|
||||
# just strips the timezone from a timezone-aware datetime.
|
||||
dt = dt.astimezone()
|
||||
return human(dt, precision=1, past_tense='{}', abbreviate=True)
|
||||
return human(dt, precision=1, past_tense="{}", abbreviate=True)
|
||||
|
|
|
@ -1,19 +1,21 @@
|
|||
from bleach.sanitizer import Cleaner, ALLOWED_TAGS
|
||||
from bleach.linkifier import LinkifyFilter
|
||||
from jinja2 import evalcontextfilter, Markup
|
||||
from jinja2 import pass_eval_context
|
||||
from markupsafe import Markup
|
||||
|
||||
TAGS = ['cite', 'code', 'p', 'pre', 'img', 'span']
|
||||
TAGS = ["cite", "code", "details", "p", "pre", "img", "span", "summary"]
|
||||
TAGS.extend(ALLOWED_TAGS)
|
||||
ATTRIBUTES = {
|
||||
'a': ('href', 'title', 'class'),
|
||||
'img': ('alt', 'src', 'title'),
|
||||
'span': ('class',),
|
||||
"a": ["href", "title", "class"],
|
||||
"details": ["open"],
|
||||
"img": ["alt", "src", "title"],
|
||||
"span": ["class"],
|
||||
}
|
||||
|
||||
cleaner = Cleaner(tags=TAGS, attributes=ATTRIBUTES, filters=(LinkifyFilter,))
|
||||
|
||||
|
||||
@evalcontextfilter
|
||||
@pass_eval_context
|
||||
def bleach(ctx, html):
|
||||
res = cleaner.clean(html)
|
||||
if ctx.autoescape:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<!doctype html>
|
||||
<html{% block html_attr %} dir="ltr" lang="en"{% endblock %}>
|
||||
<html{% block html_attr %} dir="ltr" lang="en" data-bs-theme="dark"{% endblock %}>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
|
@ -27,25 +27,24 @@
|
|||
<link rel="{{ i.rel }}" type="{{ i.mime }}" sizes="{{ i.sizes }}" href="{{ i.url }}" />
|
||||
{% endfor %}
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css"
|
||||
integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
|
||||
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/monokai.min.css"
|
||||
integrity="sha384-bHqbpRh/XW+phptvH9nQvMKHwPH1ZbOxpIeAB2D2OIEL4Ni7aZzZgMFpsRra+v1g" crossorigin="anonymous">
|
||||
<link rel="stylesheet" type="text/css" href="https://unpkg.com/openwebicons@1.4.3/css/openwebicons.min.css"
|
||||
integrity="sha384-Ljk0G9f8GyEhAzrdHNkQc89A/Kpq+sy09gejdAPyMyTDnPe4aDfS/ppZ/rDGM0Y9" crossorigin="anonymous">
|
||||
<link rel="stylesheet" type="text/css" href="https://unpkg.com/tippy.js@2.5.3/dist/tippy.css"
|
||||
integrity="sha384-JsezPuW/bNd38848K5/8rIEbB+23QGQ8faCF8xEmjFT3i1qujgGiewfYevzMO3J1" crossorigin="anonymous">
|
||||
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
|
||||
integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
|
||||
<link rel="stylesheet" type="text/css" href="https://unpkg.com/@highlightjs/cdn-assets@11.9.0/styles/monokai.min.css"
|
||||
integrity="sha384-88Jvj9Q2LiBDwL7w3yciRTcH5q2zzvMFYIm4xX9/evqxJsxA33Xk9XYKcvUlPITo" crossorigin="anonymous">
|
||||
<link rel="stylesheet" type="text/css" href="https://unpkg.com/openwebicons@1.6.0/css/openwebicons.min.css"
|
||||
integrity="sha384-NkRWM9o4Kfak7GwS+un+sProBBpj02vc/e1EoXvdCUSdRk0muOfkKJ5NtpueAuka" crossorigin="anonymous">
|
||||
<link rel="stylesheet" type="text/css" href="https://unpkg.com/tippy.js@3.4.1/dist/tippy.css"
|
||||
integrity="sha384-hm3Wtrva6FibonAOqHHXSpMxvGbz2g7l5FK5avbuNviir5MK6Ap4o3EOohztzHHm" crossorigin="anonymous">
|
||||
{% compress css %}
|
||||
<link rel="stylesheet" type="text/stylus" href="{{ static('lemoncurry/css/layout.styl') }}">
|
||||
{% block styles %}{% endblock %}
|
||||
{% endcompress %}
|
||||
|
||||
<script type="text/javascript" defer src="https://use.fontawesome.com/releases/v5.1.0/js/all.js"
|
||||
integrity="sha384-3LK/3kTpDE/Pkp8gTNp2gR/2gOiwQ6QaO7Td0zV76UFJVhqLl4Vl3KL1We6q6wR9" crossorigin="anonymous"></script>
|
||||
<script type="text/javascript" defer src="https://kit.fontawesome.com/a3aade9b41.js" crossorigin="anonymous"></script>
|
||||
</head>
|
||||
<body{% block body_attr %}{% endblock %}>
|
||||
<header>
|
||||
<nav class="navbar navbar-expand-md navbar-dark">
|
||||
<nav class="navbar navbar-expand-md"><div class="container-fluid">
|
||||
<a class="navbar-brand" rel="home" href="{{ url('home:index') }}">{{ request.site.name }}</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
|
||||
aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
|
||||
|
@ -97,7 +96,7 @@
|
|||
</div>
|
||||
{% endactiveurl %}
|
||||
|
||||
</nav>
|
||||
</div></nav>
|
||||
</header>
|
||||
|
||||
<main>
|
||||
|
@ -111,29 +110,29 @@
|
|||
|
||||
<nav>
|
||||
<ul class="pagination">
|
||||
{% if entries.prev %}
|
||||
{% if entries.has_previous() %}
|
||||
<li class="page-item">
|
||||
<a class="page-link" rel="prev" href="{{ entries.prev.url }}">
|
||||
<a class="page-link" rel="prev" href="{{ entries.reverse(entries.previous_page_number()) }}">
|
||||
<i class="fas fa-step-backward" aria-hidden="true"></i> <span class="sr-only">previous page</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
{% endif %}
|
||||
{% for page in entries.pages %}
|
||||
{% if page.current %}
|
||||
{% for i in entries.paginator.page_range %}
|
||||
{% if i == entries.number %}
|
||||
<li class="page-item active">
|
||||
<span class="page-link">{{ page.i }} <span class="sr-only">(current page)</span></span>
|
||||
<span class="page-link">{{ i }} <span class="sr-only">(current page)</span></span>
|
||||
</li>
|
||||
{% else %}
|
||||
<li class="page-item">
|
||||
<a class="page-link" href="{{ page.url }}">{{ page.i }}</a>
|
||||
<a class="page-link" href="{{ entries.reverse(i) }}">{{ i }}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% if entries.next %}
|
||||
{% if entries.has_next() %}
|
||||
|
||||
<li class="page-item">
|
||||
<a class="page-link" rel="next" href="{{ entries.next.url }}">
|
||||
<a class="page-link" rel="next" href="{{ entries.reverse(entries.next_page_number()) }}">
|
||||
<i class="fas fa-step-forward" aria-hidden="true"></i> <span class="sr-only">next page</span>
|
||||
</a>
|
||||
</li>
|
||||
|
@ -147,14 +146,14 @@
|
|||
|
||||
<script src="https://code.jquery.com/jquery-3.3.1.min.js" crossorigin="anonymous"
|
||||
integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" crossorigin="anonymous"
|
||||
integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"></script>
|
||||
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" crossorigin="anonymous"
|
||||
integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" crossorigin="anonymous"
|
||||
integrity="sha384-ZeLYJ2PNSQjvogWP559CDAf02Qb8FE5OyQicqtz/+UhZutbrwyr87Be7NPH/RgyC"></script>
|
||||
<script src="https://unpkg.com/tippy.js@2.5.3/dist/tippy.standalone.min.js" crossorigin="anonymous"
|
||||
integrity="sha384-gjyGiD2dtEQTRXgwpz7EwD4qe9PW4bLA9/z+J1zD8BV+clxUHXiyAZWqkzce2qYV"></script>
|
||||
<script src="https://unpkg.com/@highlightjs/cdn-assets@11.9.0/highlight.min.js" crossorigin="anonymous"
|
||||
integrity="sha384-F/bZzf7p3Joyp5psL90p/p89AZJsndkSoGwRpXcZhleCWhd8SnRuoYo4d0yirjJp"></script>
|
||||
<script src="https://unpkg.com/@popperjs/core@2.11.8/dist/umd/popper.min.js" crossorigin="anonymous"
|
||||
integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js" crossorigin="anonymous"
|
||||
integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy"></script>
|
||||
<script src="https://unpkg.com/tippy.js@6.3.7/dist/tippy-bundle.umd.js" crossorigin="anonymous"
|
||||
integrity="sha384-dtMr4wkcxQWUqsJFgElu4AttgIhOsjr2vYIzP2mv0MZbD/uJ6OHxFdbgE3MOKabN"></script>
|
||||
{% compress js %}
|
||||
<script type="text/javascript">
|
||||
hljs.initHighlightingOnLoad();
|
||||
|
|
|
@ -1,16 +1,18 @@
|
|||
from jinja2 import evalcontextfilter
|
||||
from jinja2 import pass_eval_context
|
||||
from markdown import Markdown
|
||||
|
||||
from .bleach import bleach
|
||||
|
||||
md = Markdown(extensions=(
|
||||
'markdown.extensions.extra',
|
||||
'markdown.extensions.headerid',
|
||||
'markdown.extensions.sane_lists',
|
||||
'markdown.extensions.smarty',
|
||||
))
|
||||
md = Markdown(
|
||||
extensions=(
|
||||
"extra",
|
||||
"sane_lists",
|
||||
"smarty",
|
||||
"toc",
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
@evalcontextfilter
|
||||
@pass_eval_context
|
||||
def markdown(ctx, source):
|
||||
return bleach(ctx, md.reset().convert(source))
|
||||
|
|
|
@ -8,7 +8,9 @@ class ResponseException(Exception):
|
|||
|
||||
|
||||
class ResponseExceptionMiddleware(MiddlewareMixin):
|
||||
def process_exception(self, request: HttpRequest, exception: Exception) -> HttpResponse:
|
||||
def process_exception(
|
||||
self, request: HttpRequest, exception: Exception
|
||||
) -> HttpResponse:
|
||||
if isinstance(exception, ResponseException):
|
||||
return exception.response
|
||||
raise exception
|
||||
|
|
|
@ -11,7 +11,7 @@ from mf2py import Parser
|
|||
class DjangoCache(BaseCache):
|
||||
@classmethod
|
||||
def key(cls, url):
|
||||
return 'req:' + sha256(url.encode('utf-8')).hexdigest()
|
||||
return "req:" + sha256(url.encode("utf-8")).hexdigest()
|
||||
|
||||
def get(self, url):
|
||||
key = self.key(url)
|
||||
|
@ -45,4 +45,4 @@ def get(url):
|
|||
|
||||
def mf2(url):
|
||||
r = get(url)
|
||||
return Parser(doc=r.text, url=url, html_parser='html5lib')
|
||||
return Parser(doc=r.text, url=url, html_parser="html5lib")
|
||||
|
|
|
@ -16,7 +16,7 @@ from typing import List
|
|||
APPEND_SLASH = False
|
||||
|
||||
ADMINS = [
|
||||
('dani', 'dani@00dani.me'),
|
||||
("dani", "dani@00dani.me"),
|
||||
]
|
||||
|
||||
BASE_DIR = path.dirname(path.dirname(path.dirname(path.abspath(__file__))))
|
||||
|
@ -26,13 +26,13 @@ BASE_DIR = path.dirname(path.dirname(path.dirname(path.abspath(__file__))))
|
|||
# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
|
||||
|
||||
# SECURITY WARNING: keep the secret key used in production secret!
|
||||
SECRET_KEY = '6riil57g@r^wprf7mdy((+bs&(6l*phcn9&fd$l0@t-kzj+xww'
|
||||
SECRET_KEY = "6riil57g@r^wprf7mdy((+bs&(6l*phcn9&fd$l0@t-kzj+xww"
|
||||
|
||||
# SECURITY WARNING: don't run with debug turned on in production!
|
||||
DEBUG = True
|
||||
|
||||
ALLOWED_HOSTS = [] # type: List[str]
|
||||
INTERNAL_IPS = ['127.0.0.1', '::1']
|
||||
ALLOWED_HOSTS: List[str] = []
|
||||
INTERNAL_IPS = ["127.0.0.1", "::1"]
|
||||
|
||||
# Settings to tighten up security - these can safely be on in dev mode too,
|
||||
# since I dev using a local HTTPS server.
|
||||
|
@ -50,7 +50,7 @@ CSRF_COOKIE_SECURE = True
|
|||
# Miscellanous headers to protect against attacks.
|
||||
SECURE_CONTENT_TYPE_NOSNIFF = True
|
||||
SECURE_BROWSER_XSS_FILTER = True
|
||||
X_FRAME_OPTIONS = 'DENY'
|
||||
X_FRAME_OPTIONS = "DENY"
|
||||
|
||||
# This technically isn't needed, since nginx doesn't let the app be accessed
|
||||
# over insecure HTTP anyway. Just for completeness!
|
||||
|
@ -58,110 +58,104 @@ SECURE_SSL_REDIRECT = True
|
|||
|
||||
# We run behind nginx, so we need nginx to tell us whether we're using HTTPS or
|
||||
# not.
|
||||
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
|
||||
SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
|
||||
|
||||
# Application definition
|
||||
|
||||
INSTALLED_APPS = [
|
||||
'lemoncurry',
|
||||
'pyup_django',
|
||||
|
||||
'django.contrib.admin',
|
||||
'django.contrib.admindocs',
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
'django.contrib.humanize',
|
||||
'django.contrib.sessions',
|
||||
'django.contrib.sites',
|
||||
'django.contrib.sitemaps',
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
|
||||
'analytical',
|
||||
'annoying',
|
||||
'compressor',
|
||||
'computed_property',
|
||||
'corsheaders',
|
||||
'debug_toolbar',
|
||||
'django_activeurl',
|
||||
'django_agent_trust',
|
||||
'django_extensions',
|
||||
'django_otp',
|
||||
'django_otp.plugins.otp_static',
|
||||
'django_otp.plugins.otp_totp',
|
||||
'django_rq',
|
||||
'favicon',
|
||||
'meta',
|
||||
|
||||
'entries',
|
||||
'home',
|
||||
'lemonauth',
|
||||
'lemonshort',
|
||||
'micropub',
|
||||
'users',
|
||||
'webmention',
|
||||
'wellknowns',
|
||||
"lemoncurry",
|
||||
"pyup_django",
|
||||
"django.contrib.admin",
|
||||
"django.contrib.admindocs",
|
||||
"django.contrib.auth",
|
||||
"django.contrib.contenttypes",
|
||||
"django.contrib.humanize",
|
||||
"django.contrib.sessions",
|
||||
"django.contrib.sites",
|
||||
"django.contrib.sitemaps",
|
||||
"django.contrib.messages",
|
||||
"django.contrib.staticfiles",
|
||||
"annoying",
|
||||
"compressor",
|
||||
"computed_property",
|
||||
"corsheaders",
|
||||
"debug_toolbar",
|
||||
"django_activeurl",
|
||||
"django_agent_trust",
|
||||
"django_extensions",
|
||||
"django_otp",
|
||||
"django_otp.plugins.otp_static",
|
||||
"django_otp.plugins.otp_totp",
|
||||
"django_rq",
|
||||
"meta",
|
||||
"entries",
|
||||
"home",
|
||||
"lemonauth",
|
||||
"lemonshort",
|
||||
"micropub",
|
||||
"users",
|
||||
"webmention",
|
||||
"wellknowns",
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
'debug_toolbar.middleware.DebugToolbarMiddleware',
|
||||
'django.middleware.http.ConditionalGetMiddleware',
|
||||
'django.middleware.security.SecurityMiddleware',
|
||||
'django.contrib.admindocs.middleware.XViewMiddleware',
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'corsheaders.middleware.CorsMiddleware',
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.middleware.csrf.CsrfViewMiddleware',
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
'django_otp.middleware.OTPMiddleware',
|
||||
'django_agent_trust.middleware.AgentMiddleware',
|
||||
'django.contrib.messages.middleware.MessageMiddleware',
|
||||
'django.contrib.sites.middleware.CurrentSiteMiddleware',
|
||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
'lemoncurry.middleware.ResponseExceptionMiddleware',
|
||||
"debug_toolbar.middleware.DebugToolbarMiddleware",
|
||||
"django.middleware.http.ConditionalGetMiddleware",
|
||||
"django.middleware.security.SecurityMiddleware",
|
||||
"django.contrib.admindocs.middleware.XViewMiddleware",
|
||||
"django.contrib.sessions.middleware.SessionMiddleware",
|
||||
"corsheaders.middleware.CorsMiddleware",
|
||||
"django.middleware.common.CommonMiddleware",
|
||||
"django.middleware.csrf.CsrfViewMiddleware",
|
||||
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
||||
"django_otp.middleware.OTPMiddleware",
|
||||
"django_agent_trust.middleware.AgentMiddleware",
|
||||
"django.contrib.messages.middleware.MessageMiddleware",
|
||||
"django.contrib.sites.middleware.CurrentSiteMiddleware",
|
||||
"django.middleware.clickjacking.XFrameOptionsMiddleware",
|
||||
"lemoncurry.middleware.ResponseExceptionMiddleware",
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'lemoncurry.urls'
|
||||
ROOT_URLCONF = "lemoncurry.urls"
|
||||
|
||||
SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
|
||||
SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django.template.backends.jinja2.Jinja2',
|
||||
'APP_DIRS': True,
|
||||
'OPTIONS': {
|
||||
'environment': 'lemoncurry.jinja2.environment',
|
||||
"BACKEND": "django.template.backends.jinja2.Jinja2",
|
||||
"APP_DIRS": True,
|
||||
"OPTIONS": {
|
||||
"environment": "lemoncurry.jinja2.environment",
|
||||
},
|
||||
},
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'APP_DIRS': True,
|
||||
'OPTIONS': {
|
||||
'context_processors': [
|
||||
'django.template.context_processors.debug',
|
||||
'django.template.context_processors.request',
|
||||
'django.contrib.auth.context_processors.auth',
|
||||
'django.contrib.messages.context_processors.messages',
|
||||
"BACKEND": "django.template.backends.django.DjangoTemplates",
|
||||
"APP_DIRS": True,
|
||||
"OPTIONS": {
|
||||
"context_processors": [
|
||||
"django.template.context_processors.debug",
|
||||
"django.template.context_processors.request",
|
||||
"django.contrib.auth.context_processors.auth",
|
||||
"django.contrib.messages.context_processors.messages",
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'lemoncurry.wsgi.application'
|
||||
WSGI_APPLICATION = "lemoncurry.wsgi.application"
|
||||
|
||||
# Cache
|
||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#std:setting-CACHES
|
||||
|
||||
CACHES = {
|
||||
'default': {
|
||||
'BACKEND': 'django_redis.cache.RedisCache',
|
||||
'LOCATION': 'redis://127.0.0.1:6380/0',
|
||||
'KEY_PREFIX': 'lemoncurry',
|
||||
'OPTIONS': {
|
||||
'PARSER_CLASS': 'redis.connection.HiredisParser',
|
||||
'SERIALIZER': 'lemoncurry.msgpack.MSGPackModernSerializer',
|
||||
"default": {
|
||||
"BACKEND": "django_redis.cache.RedisCache",
|
||||
"LOCATION": "redis://127.0.0.1:6380/0",
|
||||
"KEY_PREFIX": "lemoncurry",
|
||||
"OPTIONS": {
|
||||
"SERIALIZER": "lemoncurry.msgpack.MSGPackModernSerializer",
|
||||
},
|
||||
'VERSION': 2,
|
||||
"VERSION": 2,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -169,51 +163,51 @@ CACHES = {
|
|||
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql',
|
||||
'NAME': environ.get('POSTGRES_DB', 'lemoncurry'),
|
||||
'USER': environ.get('POSTGRES_USER'),
|
||||
'PASSWORD': environ.get('POSTGRES_PASSWORD'),
|
||||
'HOST': environ.get('POSTGRES_HOST', 'localhost'),
|
||||
'CONN_MAX_AGE': 3600
|
||||
"default": {
|
||||
"ENGINE": "django.db.backends.postgresql",
|
||||
"NAME": environ.get("POSTGRES_DB", "lemoncurry"),
|
||||
"USER": environ.get("POSTGRES_USER"),
|
||||
"PASSWORD": environ.get("POSTGRES_PASSWORD"),
|
||||
"HOST": environ.get("POSTGRES_HOST", "localhost"),
|
||||
}
|
||||
}
|
||||
|
||||
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
|
||||
|
||||
AUTH_USER_MODEL = 'users.User'
|
||||
AUTH_USER_MODEL = "users.User"
|
||||
|
||||
# Password hashers
|
||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
|
||||
PASSWORD_HASHERS = [
|
||||
'django.contrib.auth.hashers.Argon2PasswordHasher',
|
||||
'django.contrib.auth.hashers.PBKDF2PasswordHasher',
|
||||
'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
|
||||
'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
|
||||
'django.contrib.auth.hashers.BCryptPasswordHasher',
|
||||
"django.contrib.auth.hashers.Argon2PasswordHasher",
|
||||
"django.contrib.auth.hashers.PBKDF2PasswordHasher",
|
||||
"django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher",
|
||||
"django.contrib.auth.hashers.BCryptSHA256PasswordHasher",
|
||||
"django.contrib.auth.hashers.BCryptPasswordHasher",
|
||||
]
|
||||
|
||||
# Password validation
|
||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
|
||||
|
||||
PW_VALIDATOR_MODULE = 'django.contrib.auth.password_validation'
|
||||
PW_VALIDATOR_MODULE = "django.contrib.auth.password_validation"
|
||||
AUTH_PASSWORD_VALIDATORS = [
|
||||
{'NAME': PW_VALIDATOR_MODULE + '.UserAttributeSimilarityValidator'},
|
||||
{'NAME': PW_VALIDATOR_MODULE + '.MinimumLengthValidator'},
|
||||
{'NAME': PW_VALIDATOR_MODULE + '.CommonPasswordValidator'},
|
||||
{'NAME': PW_VALIDATOR_MODULE + '.NumericPasswordValidator'},
|
||||
{"NAME": PW_VALIDATOR_MODULE + ".UserAttributeSimilarityValidator"},
|
||||
{"NAME": PW_VALIDATOR_MODULE + ".MinimumLengthValidator"},
|
||||
{"NAME": PW_VALIDATOR_MODULE + ".CommonPasswordValidator"},
|
||||
{"NAME": PW_VALIDATOR_MODULE + ".NumericPasswordValidator"},
|
||||
]
|
||||
|
||||
LOGIN_URL = 'lemonauth:login'
|
||||
LOGIN_REDIRECT_URL = 'home:index'
|
||||
LOGIN_URL = "lemonauth:login"
|
||||
LOGIN_REDIRECT_URL = "home:index"
|
||||
LOGOUT_REDIRECT_URL = LOGIN_REDIRECT_URL
|
||||
|
||||
|
||||
# Internationalization
|
||||
# https://docs.djangoproject.com/en/1.11/topics/i18n/
|
||||
|
||||
LANGUAGE_CODE = 'en-au'
|
||||
LANGUAGE_CODE = "en-au"
|
||||
|
||||
TIME_ZONE = 'Australia/Sydney'
|
||||
TIME_ZONE = "Australia/Sydney"
|
||||
|
||||
USE_I18N = True
|
||||
|
||||
|
@ -225,21 +219,21 @@ USE_TZ = True
|
|||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/1.11/howto/static-files/
|
||||
|
||||
STATIC_URL = '/static/'
|
||||
STATIC_ROOT = path.join(BASE_DIR, 'static')
|
||||
STATIC_URL = "/static/"
|
||||
STATIC_ROOT = path.join(BASE_DIR, "static")
|
||||
STATICFILES_FINDERS = (
|
||||
'django.contrib.staticfiles.finders.FileSystemFinder',
|
||||
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
|
||||
'compressor.finders.CompressorFinder',
|
||||
"django.contrib.staticfiles.finders.FileSystemFinder",
|
||||
"django.contrib.staticfiles.finders.AppDirectoriesFinder",
|
||||
"compressor.finders.CompressorFinder",
|
||||
)
|
||||
STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage'
|
||||
STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
|
||||
|
||||
COMPRESS_PRECOMPILERS = (
|
||||
('text/stylus', 'npx stylus -u ./lemoncurry/static/lemoncurry/css/theme'),
|
||||
("text/stylus", "npx stylus -u ./lemoncurry/static/lemoncurry/css/theme"),
|
||||
)
|
||||
|
||||
MEDIA_URL = STATIC_URL + 'media/'
|
||||
MEDIA_ROOT = path.join(STATIC_ROOT, 'media')
|
||||
MEDIA_URL = STATIC_URL + "media/"
|
||||
MEDIA_ROOT = path.join(STATIC_ROOT, "media")
|
||||
|
||||
# django-contrib-sites
|
||||
# https://docs.djangoproject.com/en/dev/ref/contrib/sites/
|
||||
|
@ -251,28 +245,25 @@ AGENT_COOKIE_SECURE = True
|
|||
|
||||
# django-cors-headers
|
||||
CORS_ORIGIN_ALLOW_ALL = True
|
||||
CORS_URLS_REGEX = r'^/(?!admin|auth/(?:login|logout|indie)).*$'
|
||||
CORS_URLS_REGEX = r"^/(?!admin|auth/(?:login|logout|indie)).*$"
|
||||
|
||||
# lemonshort
|
||||
SHORT_BASE_URL = '/s/'
|
||||
SHORT_BASE_URL = "/s/"
|
||||
SHORTEN_MODELS = {
|
||||
'e': 'entries.entry',
|
||||
"e": "entries.entry",
|
||||
}
|
||||
|
||||
# django-meta
|
||||
# https://django-meta.readthedocs.io/en/latest/settings.html
|
||||
META_SITE_PROTOCOL = 'https'
|
||||
META_SITE_PROTOCOL = "https"
|
||||
META_USE_SITES = True
|
||||
META_USE_OG_PROPERTIES = True
|
||||
META_USE_TWITTER_PROPERTIES = True
|
||||
|
||||
# django-push
|
||||
# https://django-push.readthedocs.io/en/latest/publisher.html
|
||||
PUSH_HUB = 'https://00dani.superfeedr.com/'
|
||||
PUSH_HUB = "https://00dani.superfeedr.com/"
|
||||
|
||||
# django-rq
|
||||
# https://github.com/ui/django-rq
|
||||
RQ_QUEUES = {'default': {'USE_REDIS_CACHE': 'default'}}
|
||||
|
||||
# django-super-favicon
|
||||
FAVICON_STORAGE = 'django.core.files.storage.DefaultStorage'
|
||||
RQ_QUEUES = {"default": {"USE_REDIS_CACHE": "default"}}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
from .base import *
|
||||
|
||||
ALLOWED_HOSTS = ['*']
|
||||
META_SITE_DOMAIN = '00dani.dev'
|
||||
META_FB_APPID = '142105433189339'
|
||||
STATIC_URL = 'https://static.00dani.dev/'
|
||||
MEDIA_URL = STATIC_URL + 'media/'
|
||||
ALLOWED_HOSTS = ["*"]
|
||||
META_SITE_DOMAIN = "00dani.lo"
|
||||
META_FB_APPID = "142105433189339"
|
||||
STATIC_URL = "https://static.00dani.lo/"
|
||||
MEDIA_URL = "https://media.00dani.lo/"
|
||||
|
|
|
@ -4,19 +4,19 @@ from os.path import join
|
|||
from .base import *
|
||||
from .base import BASE_DIR, DATABASES
|
||||
|
||||
ALLOWED_HOSTS = ['00dani.me']
|
||||
ALLOWED_HOSTS = ["00dani.me"]
|
||||
DEBUG = False
|
||||
SECRET_KEY = environ['DJANGO_SECRET_KEY']
|
||||
SERVER_EMAIL = 'lemoncurry@00dani.me'
|
||||
SECRET_KEY = environ["DJANGO_SECRET_KEY"]
|
||||
SERVER_EMAIL = "lemoncurry@00dani.me"
|
||||
|
||||
# Authenticate as an app-specific Postgres user in production.
|
||||
DATABASES['default']['USER'] = 'lemoncurry'
|
||||
DATABASES["default"]["USER"] = "lemoncurry"
|
||||
|
||||
SHORT_BASE_URL = 'https://nya.as/'
|
||||
SHORT_BASE_URL = "https://nya.as/"
|
||||
|
||||
STATIC_ROOT = join(BASE_DIR, '..', 'static')
|
||||
MEDIA_ROOT = join(BASE_DIR, '..', 'media')
|
||||
STATIC_URL = 'https://cdn.00dani.me/'
|
||||
MEDIA_URL = STATIC_URL + 'm/'
|
||||
META_SITE_DOMAIN = '00dani.me'
|
||||
META_FB_APPID = '145311792869199'
|
||||
STATIC_ROOT = join(BASE_DIR, "..", "static")
|
||||
MEDIA_ROOT = join(BASE_DIR, "..", "media")
|
||||
STATIC_URL = "https://cdn.00dani.me/"
|
||||
MEDIA_URL = STATIC_URL + "m/"
|
||||
META_SITE_DOMAIN = "00dani.me"
|
||||
META_FB_APPID = "145311792869199"
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
from .base import *
|
||||
|
||||
ALLOWED_HOSTS = ['*']
|
||||
ALLOWED_HOSTS = ["*"]
|
||||
SECURE_SSL_REDIRECT = False
|
||||
STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStorage'
|
||||
STATICFILES_STORAGE = "django.contrib.staticfiles.storage.StaticFilesStorage"
|
||||
|
||||
MEDIA_URL = "/media/"
|
||||
STATIC_ROOT = path.join(BASE_DIR, "media")
|
||||
|
|
|
@ -5,6 +5,7 @@ html
|
|||
|
||||
a
|
||||
color $base0D
|
||||
text-decoration none
|
||||
&:hover
|
||||
color $base0C
|
||||
|
||||
|
@ -31,13 +32,13 @@ code, pre, .code, .pre
|
|||
text-decoration none
|
||||
line-height 1
|
||||
|
||||
for placement in top bottom left right
|
||||
.tippy-popper[x-placement^={placement}] .tippy-tooltip.dark-theme .tippy-arrow
|
||||
border-{placement}-color $base03
|
||||
|
||||
.tippy-tooltip.dark-theme
|
||||
.tippy-box[data-theme~='dark']
|
||||
background-color $base03
|
||||
color $base04
|
||||
text-align center
|
||||
for placement in top bottom left right
|
||||
&[data-placement^={placement}] > .tippy-arrow::before
|
||||
border-{placement}-color $base03
|
||||
|
||||
body
|
||||
display flex
|
||||
|
@ -103,6 +104,12 @@ ul.pagination
|
|||
background-color $base02
|
||||
border 1px solid rgba(0,0,0,.125)
|
||||
|
||||
.media
|
||||
display flex
|
||||
> .media-body
|
||||
flex-grow 1
|
||||
margin-left 3px
|
||||
|
||||
.card
|
||||
background-color $base02
|
||||
|
||||
|
|
|
@ -8,5 +8,5 @@ register = template.Library()
|
|||
@register.simple_tag
|
||||
@register.filter(is_safe=True)
|
||||
def absolute_url(url):
|
||||
base = 'https://' + Site.objects.get_current().domain
|
||||
base = "https://" + Site.objects.get_current().domain
|
||||
return urljoin(base, url)
|
||||
|
|
|
@ -5,12 +5,13 @@ from django.utils.safestring import mark_safe
|
|||
from bleach.sanitizer import Cleaner, ALLOWED_TAGS
|
||||
from bleach.linkifier import LinkifyFilter
|
||||
|
||||
tags = ['cite', 'code', 'p', 'pre', 'img', 'span']
|
||||
tags = ["cite", "code", "details", "p", "pre", "img", "span", "summary"]
|
||||
tags.extend(ALLOWED_TAGS)
|
||||
attributes = {
|
||||
'a': ('href', 'title', 'class'),
|
||||
'img': ('alt', 'src', 'title'),
|
||||
'span': ('class',),
|
||||
"a": ["href", "title", "class"],
|
||||
"details": ["open"],
|
||||
"img": ["alt", "src", "title"],
|
||||
"span": ["class"],
|
||||
}
|
||||
|
||||
register = template.Library()
|
||||
|
|
|
@ -11,5 +11,5 @@ register = template.Library()
|
|||
@register.filter
|
||||
def jsonify(value):
|
||||
if isinstance(value, QuerySet):
|
||||
return mark_safe(serialize('json', value))
|
||||
return mark_safe(serialize("json", value))
|
||||
return mark_safe(json.dumps(value, cls=DjangoJSONEncoder))
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
from django import template
|
||||
from django.conf import settings
|
||||
from django.contrib.sites.models import Site
|
||||
|
@ -40,67 +39,71 @@ def site_name():
|
|||
return Site.objects.get_current().name
|
||||
|
||||
|
||||
@register.inclusion_tag('lemoncurry/tags/nav.html')
|
||||
@register.inclusion_tag("lemoncurry/tags/nav.html")
|
||||
def nav_left(request):
|
||||
items = (MenuItem(
|
||||
label=k.plural,
|
||||
icon=k.icon,
|
||||
url=('entries:index', (k,))
|
||||
) for k in kinds.all)
|
||||
return {'items': items, 'request': request}
|
||||
items = (
|
||||
MenuItem(label=k.plural, icon=k.icon, url=("entries:index", (k,)))
|
||||
for k in kinds.all
|
||||
)
|
||||
return {"items": items, "request": request}
|
||||
|
||||
|
||||
@register.inclusion_tag('lemoncurry/tags/nav.html')
|
||||
@register.inclusion_tag("lemoncurry/tags/nav.html")
|
||||
def nav_right(request):
|
||||
if request.user.is_authenticated:
|
||||
items = (
|
||||
MenuItem(label='admin', icon='fas fa-cog', url='admin:index'),
|
||||
MenuItem(label='log out', icon='fas fa-sign-out-alt',
|
||||
url='lemonauth:logout'),
|
||||
MenuItem(label="admin", icon="fas fa-cog", url="admin:index"),
|
||||
MenuItem(
|
||||
label="log out", icon="fas fa-sign-out-alt", url="lemonauth:logout"
|
||||
),
|
||||
)
|
||||
else:
|
||||
items = (
|
||||
MenuItem(label='log in', icon='fas fa-sign-in-alt',
|
||||
url='lemonauth:login'),
|
||||
MenuItem(label="log in", icon="fas fa-sign-in-alt", url="lemonauth:login"),
|
||||
)
|
||||
return {'items': items, 'request': request}
|
||||
return {"items": items, "request": request}
|
||||
|
||||
|
||||
@register.inclusion_tag('lemoncurry/tags/breadcrumbs.html', takes_context=True)
|
||||
@register.inclusion_tag("lemoncurry/tags/breadcrumbs.html", takes_context=True)
|
||||
def nav_crumbs(context, route):
|
||||
crumbs = breadcrumbs.find(route)
|
||||
current = crumbs.pop()
|
||||
|
||||
item_list_element = [{
|
||||
'@type': 'ListItem',
|
||||
'position': i + 1,
|
||||
'item': {
|
||||
'@id': context['origin'] + crumb.url,
|
||||
'@type': 'WebPage',
|
||||
'name': crumb.label
|
||||
item_list_element = [
|
||||
{
|
||||
"@type": "ListItem",
|
||||
"position": i + 1,
|
||||
"item": {
|
||||
"@id": context["origin"] + crumb.url,
|
||||
"@type": "WebPage",
|
||||
"name": crumb.label,
|
||||
},
|
||||
}
|
||||
} for i, crumb in enumerate(crumbs)]
|
||||
item_list_element.append({
|
||||
'@type': 'ListItem',
|
||||
'position': len(item_list_element) + 1,
|
||||
'item': {
|
||||
'id': context['uri'],
|
||||
'@type': 'WebPage',
|
||||
'name': current.label or context.get('title'),
|
||||
for i, crumb in enumerate(crumbs)
|
||||
]
|
||||
item_list_element.append(
|
||||
{
|
||||
"@type": "ListItem",
|
||||
"position": len(item_list_element) + 1,
|
||||
"item": {
|
||||
"id": context["uri"],
|
||||
"@type": "WebPage",
|
||||
"name": current.label or context.get("title"),
|
||||
},
|
||||
}
|
||||
})
|
||||
)
|
||||
|
||||
breadcrumb_list = {
|
||||
'@context': 'http://schema.org',
|
||||
'@type': 'BreadcrumbList',
|
||||
'itemListElement': item_list_element
|
||||
"@context": "http://schema.org",
|
||||
"@type": "BreadcrumbList",
|
||||
"itemListElement": item_list_element,
|
||||
}
|
||||
|
||||
return {
|
||||
'breadcrumb_list': breadcrumb_list,
|
||||
'crumbs': crumbs,
|
||||
'current': current,
|
||||
'title': context.get('title'),
|
||||
"breadcrumb_list": breadcrumb_list,
|
||||
"crumbs": crumbs,
|
||||
"current": current,
|
||||
"title": context.get("title"),
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -3,12 +3,14 @@ from django import template
|
|||
from markdown import Markdown
|
||||
from .bleach import bleach
|
||||
|
||||
md = Markdown(extensions=(
|
||||
'markdown.extensions.extra',
|
||||
'markdown.extensions.headerid',
|
||||
'markdown.extensions.sane_lists',
|
||||
'markdown.extensions.smarty',
|
||||
))
|
||||
md = Markdown(
|
||||
extensions=(
|
||||
"extra",
|
||||
"sane_lists",
|
||||
"smarty",
|
||||
"toc",
|
||||
)
|
||||
)
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
|
|
@ -6,43 +6,43 @@ from .. import breadcrumbs as b
|
|||
|
||||
@pytest.fixture
|
||||
def nested_crumbs():
|
||||
x = b.Crumb('nc.x', label='x')
|
||||
y = b.Crumb('nc.y', label='y', parent='nc.x')
|
||||
z = b.Crumb('nc.z', label='z', parent='nc.y')
|
||||
x = b.Crumb("nc.x", label="x")
|
||||
y = b.Crumb("nc.y", label="y", parent="nc.x")
|
||||
z = b.Crumb("nc.z", label="z", parent="nc.y")
|
||||
crumbs = (x, y, z)
|
||||
|
||||
for crumb in crumbs:
|
||||
b.breadcrumbs[crumb.route] = crumb
|
||||
yield namedtuple('NestedCrumbs', 'x y z')(*crumbs)
|
||||
yield namedtuple("NestedCrumbs", "x y z")(*crumbs)
|
||||
for crumb in crumbs:
|
||||
del b.breadcrumbs[crumb.route]
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def crumb_match(nested_crumbs):
|
||||
return namedtuple('Match', 'view_name')(nested_crumbs.z.route)
|
||||
return namedtuple("Match", "view_name")(nested_crumbs.z.route)
|
||||
|
||||
|
||||
class TestAdd:
|
||||
def test_inserts_a_breadcrumb_without_parent(self):
|
||||
route = 'tests.add.insert'
|
||||
route = "tests.add.insert"
|
||||
assert route not in b.breadcrumbs
|
||||
b.add(route, 'some label')
|
||||
b.add(route, "some label")
|
||||
assert route in b.breadcrumbs
|
||||
assert b.breadcrumbs[route] == route
|
||||
route = b.breadcrumbs[route]
|
||||
assert route.label == 'some label'
|
||||
assert route.label == "some label"
|
||||
assert route.parent is None
|
||||
|
||||
def test_inserts_a_breadcrumb_with_parent(self):
|
||||
route = 'tests.add.with_parent'
|
||||
parent = 'tests.add.insert'
|
||||
route = "tests.add.with_parent"
|
||||
parent = "tests.add.insert"
|
||||
assert route not in b.breadcrumbs
|
||||
b.add(route, 'child label', parent)
|
||||
b.add(route, "child label", parent)
|
||||
assert route in b.breadcrumbs
|
||||
assert b.breadcrumbs[route] == route
|
||||
route = b.breadcrumbs[route]
|
||||
assert route.label == 'child label'
|
||||
assert route.label == "child label"
|
||||
assert route.parent == parent
|
||||
|
||||
|
||||
|
|
|
@ -5,22 +5,22 @@ from .. import utils
|
|||
class TestOrigin:
|
||||
def test_simple_http(self):
|
||||
"""should return the correct origin for a vanilla HTTP site"""
|
||||
req = Mock(scheme='http', site=Mock(domain='lemoncurry.test'))
|
||||
assert utils.origin(req) == 'http://lemoncurry.test'
|
||||
req = Mock(scheme="http", site=Mock(domain="lemoncurry.test"))
|
||||
assert utils.origin(req) == "http://lemoncurry.test"
|
||||
|
||||
def test_simple_https(self):
|
||||
"""should return the correct origin for a vanilla HTTPS site"""
|
||||
req = Mock(scheme='https', site=Mock(domain='secure.lemoncurry.test'))
|
||||
assert utils.origin(req) == 'https://secure.lemoncurry.test'
|
||||
req = Mock(scheme="https", site=Mock(domain="secure.lemoncurry.test"))
|
||||
assert utils.origin(req) == "https://secure.lemoncurry.test"
|
||||
|
||||
|
||||
class TestUri:
|
||||
def test_siteroot(self):
|
||||
"""should return correct full URI for requests to the site root"""
|
||||
req = Mock(scheme='https', path='/', site=Mock(domain='l.test'))
|
||||
assert utils.uri(req) == 'https://l.test/'
|
||||
req = Mock(scheme="https", path="/", site=Mock(domain="l.test"))
|
||||
assert utils.uri(req) == "https://l.test/"
|
||||
|
||||
def test_path(self):
|
||||
"""should return correct full URI for requests with a path"""
|
||||
req = Mock(scheme='https', path='/notes/23', site=Mock(domain='l.tst'))
|
||||
assert utils.uri(req) == 'https://l.tst/notes/23'
|
||||
req = Mock(scheme="https", path="/notes/23", site=Mock(domain="l.tst"))
|
||||
assert utils.uri(req) == "https://l.tst/notes/23"
|
||||
|
|
|
@ -4,12 +4,14 @@ from yaml import safe_load
|
|||
|
||||
path = join(
|
||||
settings.BASE_DIR,
|
||||
'lemoncurry', 'static',
|
||||
'base16-materialtheme-scheme', 'material-darker.yaml',
|
||||
"lemoncurry",
|
||||
"static",
|
||||
"base16-materialtheme-scheme",
|
||||
"material-darker.yaml",
|
||||
)
|
||||
with open(path, 'r') as f:
|
||||
with open(path, "r") as f:
|
||||
theme = safe_load(f)
|
||||
|
||||
|
||||
def color(i):
|
||||
return '#' + theme['base0' + format(i, '1X')]
|
||||
return "#" + theme["base0" + format(i, "1X")]
|
||||
|
|
|
@ -27,33 +27,37 @@ from entries.sitemaps import EntriesSitemap
|
|||
from home.sitemaps import HomeSitemap
|
||||
|
||||
sections = {
|
||||
'entries': EntriesSitemap,
|
||||
'home': HomeSitemap,
|
||||
"entries": EntriesSitemap,
|
||||
"home": HomeSitemap,
|
||||
}
|
||||
maps = {'sitemaps': sections}
|
||||
maps = {"sitemaps": sections}
|
||||
|
||||
urlpatterns = (
|
||||
path('', include('home.urls')),
|
||||
path('', include('entries.urls')),
|
||||
path('', include('users.urls')),
|
||||
path('.well-known/', include('wellknowns.urls')),
|
||||
path('admin/doc/', include('django.contrib.admindocs.urls')),
|
||||
path('admin/', admin.site.urls),
|
||||
path('auth/', include('lemonauth.urls')),
|
||||
path('favicon.ico', RedirectView.as_view(
|
||||
url=settings.MEDIA_URL + 'favicon/favicon.ico')),
|
||||
path('micropub', include('micropub.urls')),
|
||||
path('s/', include('lemonshort.urls')),
|
||||
path('webmention', include('webmention.urls')),
|
||||
|
||||
path('django-rq/', include('django_rq.urls')),
|
||||
path('sitemap.xml', sitemap.index, maps, name='sitemap'),
|
||||
path('sitemaps/<section>.xml', sitemap.sitemap, maps,
|
||||
name='django.contrib.sitemaps.views.sitemap'),
|
||||
path("", include("home.urls")),
|
||||
path("", include("entries.urls")),
|
||||
path("", include("users.urls")),
|
||||
path(".well-known/", include("wellknowns.urls")),
|
||||
path("admin/doc/", include("django.contrib.admindocs.urls")),
|
||||
path("admin/", admin.site.urls),
|
||||
path("auth/", include("lemonauth.urls")),
|
||||
path(
|
||||
"favicon.ico",
|
||||
RedirectView.as_view(url=settings.MEDIA_URL + "favicon/favicon.ico"),
|
||||
),
|
||||
path("micropub", include("micropub.urls")),
|
||||
path("s/", include("lemonshort.urls")),
|
||||
path("webmention", include("webmention.urls")),
|
||||
path("django-rq/", include("django_rq.urls")),
|
||||
path("sitemap.xml", sitemap.index, maps, name="sitemap"),
|
||||
path(
|
||||
"sitemaps/<section>.xml",
|
||||
sitemap.sitemap,
|
||||
maps,
|
||||
name="django.contrib.sitemaps.views.sitemap",
|
||||
),
|
||||
) # type: Tuple[URLPattern, ...]
|
||||
|
||||
if settings.DEBUG:
|
||||
import debug_toolbar
|
||||
urlpatterns += (
|
||||
path('__debug__/', include(debug_toolbar.urls)),
|
||||
)
|
||||
|
||||
urlpatterns += (path("__debug__/", include(debug_toolbar.urls)),)
|
||||
|
|
|
@ -20,7 +20,7 @@ class PackageJson:
|
|||
|
||||
def load(self) -> Dict[str, Any]:
|
||||
if self.data is None:
|
||||
with open(join(settings.BASE_DIR, 'package.json')) as f:
|
||||
with open(join(settings.BASE_DIR, "package.json")) as f:
|
||||
self.data = json.load(f)
|
||||
assert self.data is not None
|
||||
return self.data
|
||||
|
@ -30,10 +30,10 @@ PACKAGE = PackageJson()
|
|||
|
||||
|
||||
def friendly_url(url):
|
||||
if '//' not in url:
|
||||
url = '//' + url
|
||||
if "//" not in url:
|
||||
url = "//" + url
|
||||
(scheme, netloc, path, params, q, fragment) = urlparse(url)
|
||||
if path == '/':
|
||||
if path == "/":
|
||||
return netloc
|
||||
return "{}\u200B{}".format(netloc, path)
|
||||
|
||||
|
@ -43,7 +43,7 @@ def load_package_json() -> Dict[str, Any]:
|
|||
|
||||
|
||||
def origin(request):
|
||||
return '{0}://{1}'.format(request.scheme, request.site.domain)
|
||||
return "{0}://{1}".format(request.scheme, request.site.domain)
|
||||
|
||||
|
||||
def absolute_url(request, url):
|
||||
|
@ -56,19 +56,18 @@ def uri(request):
|
|||
|
||||
def form_encoded_response(content):
|
||||
return HttpResponse(
|
||||
urlencode(content),
|
||||
content_type='application/x-www-form-urlencoded'
|
||||
urlencode(content), content_type="application/x-www-form-urlencoded"
|
||||
)
|
||||
|
||||
|
||||
REPS = {
|
||||
'application/x-www-form-urlencoded': form_encoded_response,
|
||||
'application/json': JsonResponse,
|
||||
"application/x-www-form-urlencoded": form_encoded_response,
|
||||
"application/json": JsonResponse,
|
||||
}
|
||||
|
||||
|
||||
def choose_type(request, content, reps=REPS):
|
||||
accept = request.META.get('HTTP_ACCEPT', '*/*')
|
||||
accept = request.META.get("HTTP_ACCEPT", "*/*")
|
||||
type = get_best_match(accept, reps.keys())
|
||||
if type:
|
||||
return reps[type](content)
|
||||
|
@ -76,11 +75,11 @@ def choose_type(request, content, reps=REPS):
|
|||
|
||||
|
||||
def bad_req(message):
|
||||
return HttpResponseBadRequest(message, content_type='text/plain')
|
||||
return HttpResponseBadRequest(message, content_type="text/plain")
|
||||
|
||||
|
||||
def forbid(message):
|
||||
return HttpResponseForbidden(message, content_type='text/plain')
|
||||
return HttpResponseForbidden(message, content_type="text/plain")
|
||||
|
||||
|
||||
def to_plain(md):
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
default_app_config = 'lemonshort.apps.LemonshortConfig'
|
|
@ -2,4 +2,4 @@ from django.apps import AppConfig
|
|||
|
||||
|
||||
class LemonshortConfig(AppConfig):
|
||||
name = 'lemonshort'
|
||||
name = "lemonshort"
|
||||
|
|
|
@ -7,9 +7,11 @@ chars = ascii_uppercase + ascii_lowercase
|
|||
conv = BaseConverter(chars)
|
||||
|
||||
|
||||
def abc_to_id(abc):
|
||||
return int(conv.decode(abc))
|
||||
class AbcIdConverter:
|
||||
regex = "[a-zA-Z]+"
|
||||
|
||||
def to_python(self, value: str) -> int:
|
||||
return int(conv.decode(value))
|
||||
|
||||
def id_to_abc(id):
|
||||
return conv.encode(id)
|
||||
def to_url(self, value: int) -> str:
|
||||
return conv.encode(value)
|
||||
|
|
|
@ -2,7 +2,7 @@ from django.apps import apps
|
|||
from django.conf import settings
|
||||
from typing import Any, Dict, Type
|
||||
|
||||
from .convert import id_to_abc
|
||||
from .convert import AbcIdConverter
|
||||
|
||||
prefixes = {} # type: Dict[Type[Any], str]
|
||||
|
||||
|
@ -11,7 +11,7 @@ def short_url(entity):
|
|||
if not prefixes:
|
||||
for k, m in settings.SHORTEN_MODELS.items():
|
||||
prefixes[apps.get_model(m)] = k
|
||||
base = '/'
|
||||
if hasattr(settings, 'SHORT_BASE_URL'):
|
||||
base = "/"
|
||||
if hasattr(settings, "SHORT_BASE_URL"):
|
||||
base = settings.SHORT_BASE_URL
|
||||
return base + prefixes[type(entity)] + id_to_abc(entity.id)
|
||||
return base + prefixes[type(entity)] + AbcIdConverter().to_url(entity.id)
|
||||
|
|
|
@ -1,30 +1,32 @@
|
|||
from .. import convert
|
||||
|
||||
|
||||
def test_abc_to_id():
|
||||
def test_to_python():
|
||||
samples = {
|
||||
'A': 0,
|
||||
'B': 1,
|
||||
'Y': 24,
|
||||
'a': 26,
|
||||
'b': 27,
|
||||
'y': 50,
|
||||
'BA': 52,
|
||||
'BAB': 2705,
|
||||
"A": 0,
|
||||
"B": 1,
|
||||
"Y": 24,
|
||||
"a": 26,
|
||||
"b": 27,
|
||||
"y": 50,
|
||||
"BA": 52,
|
||||
"BAB": 2705,
|
||||
}
|
||||
converter = convert.AbcIdConverter()
|
||||
for abc, id in samples.items():
|
||||
assert convert.abc_to_id(abc) == id
|
||||
assert converter.to_python(abc) == id
|
||||
|
||||
|
||||
def test_id_to_abc():
|
||||
samples = {
|
||||
1: 'B',
|
||||
24: 'Y',
|
||||
26: 'a',
|
||||
52: 'BA',
|
||||
78: 'Ba',
|
||||
104: 'CA',
|
||||
130: 'Ca',
|
||||
1: "B",
|
||||
24: "Y",
|
||||
26: "a",
|
||||
52: "BA",
|
||||
78: "Ba",
|
||||
104: "CA",
|
||||
130: "Ca",
|
||||
}
|
||||
converter = convert.AbcIdConverter()
|
||||
for id, abc in samples.items():
|
||||
assert convert.id_to_abc(id) == abc
|
||||
assert converter.to_url(id) == abc
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
from django.conf import settings
|
||||
from django.urls import path
|
||||
from django.urls import path, register_converter
|
||||
|
||||
from .convert import AbcIdConverter
|
||||
from .views import unshort
|
||||
|
||||
app_name = 'lemonshort'
|
||||
register_converter(AbcIdConverter, "abc_id")
|
||||
|
||||
app_name = "lemonshort"
|
||||
urlpatterns = tuple(
|
||||
path('{0!s}<tiny>'.format(k), unshort, name=m, kwargs={'model': m})
|
||||
path("{0!s}<abc_id:tiny>".format(k), unshort, name=m, kwargs={"model": m})
|
||||
for k, m in settings.SHORTEN_MODELS.items()
|
||||
)
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
from django.apps import apps
|
||||
from django.shortcuts import get_object_or_404, redirect
|
||||
|
||||
from .convert import abc_to_id
|
||||
from .convert import AbcIdConverter
|
||||
|
||||
|
||||
def unshort(request, model, tiny):
|
||||
entity = get_object_or_404(apps.get_model(model), pk=abc_to_id(tiny))
|
||||
entity = get_object_or_404(apps.get_model(model), pk=tiny)
|
||||
return redirect(entity, permanent=True)
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
default_app_config = 'micropub.apps.MicropubConfig'
|
|
@ -2,4 +2,4 @@ from django.apps import AppConfig
|
|||
|
||||
|
||||
class MicropubConfig(AppConfig):
|
||||
name = 'micropub'
|
||||
name = "micropub"
|
||||
|
|
|
@ -4,33 +4,35 @@ from typing import Optional
|
|||
|
||||
|
||||
def forbidden() -> ResponseException:
|
||||
return res('forbidden', 403)
|
||||
return res("forbidden", 403)
|
||||
|
||||
|
||||
def unauthorized() -> ResponseException:
|
||||
return res('unauthorized', 401)
|
||||
return res("unauthorized", 401)
|
||||
|
||||
|
||||
def bad_req(msg: str) -> ResponseException:
|
||||
return res('invalid_request', msg=msg)
|
||||
return res("invalid_request", msg=msg)
|
||||
|
||||
|
||||
def bad_type(type: str) -> ResponseException:
|
||||
msg = 'unsupported request type {0}'.format(type)
|
||||
return res('invalid_request', 415, msg)
|
||||
msg = "unsupported request type {0}".format(type)
|
||||
return res("invalid_request", 415, msg)
|
||||
|
||||
|
||||
def bad_scope(scope: str) -> ResponseException:
|
||||
return res('insufficient_scope', 401, scope=scope)
|
||||
return res("insufficient_scope", 401, scope=scope)
|
||||
|
||||
|
||||
def res(error: str,
|
||||
status: Optional[int]=400,
|
||||
msg: Optional[str]=None,
|
||||
scope: Optional[str]=None):
|
||||
content = {'error': error}
|
||||
def res(
|
||||
error: str,
|
||||
status: Optional[int] = 400,
|
||||
msg: Optional[str] = None,
|
||||
scope: Optional[str] = None,
|
||||
):
|
||||
content = {"error": error}
|
||||
if msg is not None:
|
||||
content['error_description'] = msg
|
||||
content["error_description"] = msg
|
||||
if scope:
|
||||
content['scope'] = scope
|
||||
content["scope"] = scope
|
||||
return ResponseException(JsonResponse(content, status=status))
|
||||
|
|
|
@ -2,8 +2,8 @@ from django.urls import path
|
|||
from .views import micropub
|
||||
from .views.media import media
|
||||
|
||||
app_name = 'micropub'
|
||||
app_name = "micropub"
|
||||
urlpatterns = (
|
||||
path('', micropub, name='micropub'),
|
||||
path('/media', media, name='media'),
|
||||
path("", micropub, name="micropub"),
|
||||
path("/media", media, name="media"),
|
||||
)
|
||||
|
|
|
@ -10,22 +10,22 @@ from .delete import delete
|
|||
from .query import query
|
||||
|
||||
actions = {
|
||||
'create': create,
|
||||
'delete': delete,
|
||||
"create": create,
|
||||
"delete": delete,
|
||||
}
|
||||
|
||||
|
||||
@csrf_exempt
|
||||
@require_http_methods(['GET', 'HEAD', 'POST'])
|
||||
@require_http_methods(["GET", "HEAD", "POST"])
|
||||
def micropub(request):
|
||||
request.token = tokens.auth(request)
|
||||
if request.method in ('GET', 'HEAD'):
|
||||
if request.method in ("GET", "HEAD"):
|
||||
return query(request)
|
||||
|
||||
action = request.POST.get('action', 'create')
|
||||
if request.content_type == 'application/json':
|
||||
action = request.POST.get("action", "create")
|
||||
if request.content_type == "application/json":
|
||||
request.json = json.load(request)
|
||||
action = request.json.get('action', 'create')
|
||||
action = request.json.get("action", "create")
|
||||
if action not in actions:
|
||||
raise error.bad_req('unknown action: {}'.format(action))
|
||||
raise error.bad_req("unknown action: {}".format(action))
|
||||
return actions[action](request)
|
||||
|
|
|
@ -14,63 +14,62 @@ def form_to_mf2(request):
|
|||
properties = {}
|
||||
post = request.POST
|
||||
for key in post.keys():
|
||||
if key.endswith('[]'):
|
||||
if key.endswith("[]"):
|
||||
key = key[:-2]
|
||||
if key == 'access_token':
|
||||
if key == "access_token":
|
||||
continue
|
||||
properties[key] = post.getlist(key) + post.getlist(key + '[]')
|
||||
properties[key] = post.getlist(key) + post.getlist(key + "[]")
|
||||
|
||||
type = []
|
||||
if 'h' in properties:
|
||||
type = ['h-' + p for p in properties['h']]
|
||||
del properties['h']
|
||||
return {'type': type, 'properties': properties}
|
||||
if "h" in properties:
|
||||
type = ["h-" + p for p in properties["h"]]
|
||||
del properties["h"]
|
||||
return {"type": type, "properties": properties}
|
||||
|
||||
|
||||
def create(request):
|
||||
normalise = {
|
||||
'application/json': lambda r: r.json,
|
||||
'application/x-www-form-urlencoded': form_to_mf2,
|
||||
"application/json": lambda r: r.json,
|
||||
"application/x-www-form-urlencoded": form_to_mf2,
|
||||
}
|
||||
if 'create' not in request.token:
|
||||
raise error.bad_scope('create')
|
||||
if "create" not in request.token:
|
||||
raise error.bad_scope("create")
|
||||
if request.content_type not in normalise:
|
||||
raise error.unsupported_type(request.content_type)
|
||||
body = normalise[request.content_type](request)
|
||||
if 'type' not in body:
|
||||
raise error.bad_req('mf2 object type required')
|
||||
if body['type'] != ['h-entry']:
|
||||
raise error.bad_req('only h-entry supported')
|
||||
if "type" not in body:
|
||||
raise error.bad_req("mf2 object type required")
|
||||
if body["type"] != ["h-entry"]:
|
||||
raise error.bad_req("only h-entry supported")
|
||||
|
||||
entry = Entry(author=request.token.user)
|
||||
props = body.get('properties', {})
|
||||
props = body.get("properties", {})
|
||||
kind = Note
|
||||
if 'name' in props:
|
||||
entry.name = '\n'.join(props['name'])
|
||||
if "name" in props:
|
||||
entry.name = "\n".join(props["name"])
|
||||
kind = Article
|
||||
if 'content' in props:
|
||||
entry.content = '\n'.join(
|
||||
c if isinstance(c, str) else c['html']
|
||||
for c in props['content']
|
||||
if "content" in props:
|
||||
entry.content = "\n".join(
|
||||
c if isinstance(c, str) else c["html"] for c in props["content"]
|
||||
)
|
||||
if 'in-reply-to' in props:
|
||||
entry.in_reply_to = props['in-reply-to']
|
||||
if "in-reply-to" in props:
|
||||
entry.in_reply_to = props["in-reply-to"]
|
||||
kind = Reply
|
||||
if 'like-of' in props:
|
||||
entry.like_of = props['like-of']
|
||||
if "like-of" in props:
|
||||
entry.like_of = props["like-of"]
|
||||
kind = Like
|
||||
if 'repost-of' in props:
|
||||
entry.repost_of = props['repost-of']
|
||||
if "repost-of" in props:
|
||||
entry.repost_of = props["repost-of"]
|
||||
kind = Repost
|
||||
|
||||
cats = [Cat.objects.from_name(c) for c in props.get('category', [])]
|
||||
cats = [Cat.objects.from_name(c) for c in props.get("category", [])]
|
||||
|
||||
entry.kind = kind.id
|
||||
entry.save()
|
||||
entry.cats.set(cats)
|
||||
entry.save()
|
||||
|
||||
for url in props.get('syndication', []):
|
||||
for url in props.get("syndication", []):
|
||||
entry.syndications.create(url=url)
|
||||
|
||||
base = utils.origin(request)
|
||||
|
@ -80,6 +79,6 @@ def create(request):
|
|||
send_mentions.delay(perma)
|
||||
|
||||
res = HttpResponse(status=201)
|
||||
res['Location'] = perma
|
||||
res['Link'] = '<{}>; rel="shortlink"'.format(short)
|
||||
res["Location"] = perma
|
||||
res["Link"] = '<{}>; rel="shortlink"'.format(short)
|
||||
return res
|
||||
|
|
|
@ -6,24 +6,25 @@ from entries.jobs import ping_hub, send_mentions
|
|||
|
||||
from .. import error
|
||||
|
||||
|
||||
def delete(request):
|
||||
normalise = {
|
||||
'application/json': lambda r: r.json.get('url'),
|
||||
'application/x-www-form-urlencoded': lambda r: r.POST.get('url'),
|
||||
"application/json": lambda r: r.json.get("url"),
|
||||
"application/x-www-form-urlencoded": lambda r: r.POST.get("url"),
|
||||
}
|
||||
if 'delete' not in request.token:
|
||||
raise error.bad_scope('delete')
|
||||
if "delete" not in request.token:
|
||||
raise error.bad_scope("delete")
|
||||
if request.content_type not in normalise:
|
||||
raise error.unsupported_type(request.content_type)
|
||||
url = normalise[request.content_type](request)
|
||||
entry = from_url(url)
|
||||
|
||||
if entry.author != request.token.user:
|
||||
raise error.forbid('entry belongs to another user')
|
||||
raise error.forbid("entry belongs to another user")
|
||||
|
||||
perma = entry.absolute_url
|
||||
pings = entry.affected_urls
|
||||
mentions = webmention.findMentions(perma)['refs']
|
||||
mentions = webmention.findMentions(perma)["refs"]
|
||||
|
||||
entry.delete()
|
||||
|
||||
|
|
|
@ -11,9 +11,9 @@ from lemoncurry.utils import absolute_url
|
|||
from .. import error
|
||||
|
||||
ACCEPTED_MEDIA_TYPES = (
|
||||
'image/gif',
|
||||
'image/jpeg',
|
||||
'image/png',
|
||||
"image/gif",
|
||||
"image/jpeg",
|
||||
"image/png",
|
||||
)
|
||||
|
||||
|
||||
|
@ -21,15 +21,13 @@ ACCEPTED_MEDIA_TYPES = (
|
|||
@require_POST
|
||||
def media(request):
|
||||
token = tokens.auth(request)
|
||||
if 'file' not in request.FILES:
|
||||
if "file" not in request.FILES:
|
||||
raise error.bad_req(
|
||||
"a file named 'file' must be provided to the media endpoint"
|
||||
)
|
||||
file = request.FILES['file']
|
||||
file = request.FILES["file"]
|
||||
if file.content_type not in ACCEPTED_MEDIA_TYPES:
|
||||
raise error.bad_req(
|
||||
'unacceptable file type {0}'.format(file.content_type)
|
||||
)
|
||||
raise error.bad_req("unacceptable file type {0}".format(file.content_type))
|
||||
|
||||
mime = None
|
||||
sha = hashlib.sha256()
|
||||
|
@ -40,14 +38,15 @@ def media(request):
|
|||
|
||||
if mime != file.content_type:
|
||||
raise error.bad_req(
|
||||
'detected file type {0} did not match specified file type {1}'
|
||||
.format(mime, file.content_type)
|
||||
"detected file type {0} did not match specified file type {1}".format(
|
||||
mime, file.content_type
|
||||
)
|
||||
)
|
||||
|
||||
path = 'mp/{0[0]}/{2}.{1}'.format(*mime.split('/'), sha.hexdigest())
|
||||
path = "mp/{0[0]}/{2}.{1}".format(*mime.split("/"), sha.hexdigest())
|
||||
path = store.save(path, file)
|
||||
url = absolute_url(request, store.url(path))
|
||||
|
||||
res = HttpResponse(status=201)
|
||||
res['Location'] = url
|
||||
res["Location"] = url
|
||||
return res
|
||||
|
|
|
@ -7,48 +7,47 @@ from lemoncurry.utils import absolute_url
|
|||
from .. import error
|
||||
|
||||
|
||||
|
||||
def config(request):
|
||||
config = syndicate_to(request)
|
||||
config['media-endpoint'] = absolute_url(request, reverse('micropub:media'))
|
||||
config["media-endpoint"] = absolute_url(request, reverse("micropub:media"))
|
||||
return config
|
||||
|
||||
|
||||
def source(request):
|
||||
if 'url' not in request.GET:
|
||||
raise error.bad_req('must specify url parameter for source query')
|
||||
entry = from_url(request.GET['url'])
|
||||
if "url" not in request.GET:
|
||||
raise error.bad_req("must specify url parameter for source query")
|
||||
entry = from_url(request.GET["url"])
|
||||
props = {}
|
||||
|
||||
keys = set(request.GET.getlist('properties') + request.GET.getlist('properties[]'))
|
||||
if not keys or 'content' in keys:
|
||||
props['content'] = [entry.content]
|
||||
if (not keys or 'category' in keys) and entry.cats.exists():
|
||||
props['category'] = [cat.name for cat in entry.cats.all()]
|
||||
if (not keys or 'name' in keys) and entry.name:
|
||||
props['name'] = [entry.name]
|
||||
if (not keys or 'syndication' in keys) and entry.syndications.exists():
|
||||
props['syndication'] = [synd.url for synd in entry.syndications.all()]
|
||||
keys = set(request.GET.getlist("properties") + request.GET.getlist("properties[]"))
|
||||
if not keys or "content" in keys:
|
||||
props["content"] = [entry.content]
|
||||
if (not keys or "category" in keys) and entry.cats.exists():
|
||||
props["category"] = [cat.name for cat in entry.cats.all()]
|
||||
if (not keys or "name" in keys) and entry.name:
|
||||
props["name"] = [entry.name]
|
||||
if (not keys or "syndication" in keys) and entry.syndications.exists():
|
||||
props["syndication"] = [synd.url for synd in entry.syndications.all()]
|
||||
|
||||
return {'type': ['h-entry'], 'properties': props}
|
||||
return {"type": ["h-entry"], "properties": props}
|
||||
|
||||
|
||||
def syndicate_to(request):
|
||||
return {'syndicate-to': []}
|
||||
return {"syndicate-to": []}
|
||||
|
||||
|
||||
queries = {
|
||||
'config': config,
|
||||
'source': source,
|
||||
'syndicate-to': syndicate_to,
|
||||
"config": config,
|
||||
"source": source,
|
||||
"syndicate-to": syndicate_to,
|
||||
}
|
||||
|
||||
|
||||
def query(request):
|
||||
if 'q' not in request.GET:
|
||||
raise error.bad_req('must specify q parameter')
|
||||
q = request.GET['q']
|
||||
if "q" not in request.GET:
|
||||
raise error.bad_req("must specify q parameter")
|
||||
q = request.GET["q"]
|
||||
if q not in queries:
|
||||
raise error.bad_req('unsupported query {0}'.format(q))
|
||||
raise error.bad_req("unsupported query {0}".format(q))
|
||||
res = queries[q](request)
|
||||
return JsonResponse(res)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "lemoncurry",
|
||||
"version": "1.10.0",
|
||||
"version": "1.12.4",
|
||||
"repository": "https://git.00dani.me/00dani/lemoncurry",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
|
|
78
pyproject.toml
Normal file
78
pyproject.toml
Normal file
|
@ -0,0 +1,78 @@
|
|||
[project]
|
||||
name = "lemoncurry"
|
||||
version = "1.12.5"
|
||||
description = "Indieweb-compatible personal website"
|
||||
|
||||
authors = [
|
||||
{name = "Danielle McLean", email = "dani@00dani.me"},
|
||||
]
|
||||
license = {text = "MIT"}
|
||||
requires-python = "<4.0,>=3.12"
|
||||
|
||||
dependencies = [
|
||||
"accept-types",
|
||||
"ago",
|
||||
"argon2-cffi",
|
||||
"bleach",
|
||||
"cachecontrol",
|
||||
"django<4,>=3",
|
||||
"django-activeurl",
|
||||
"django-annoying",
|
||||
"django-compressor",
|
||||
"django-computed-property",
|
||||
"django-cors-headers",
|
||||
"django-debug-toolbar",
|
||||
"django-extensions",
|
||||
"django-meta",
|
||||
"django-model-utils",
|
||||
"django-otp",
|
||||
"django-otp-agents",
|
||||
"django-push",
|
||||
"django-randomslugfield",
|
||||
"django-redis",
|
||||
"django-rq",
|
||||
"docutils",
|
||||
"gevent",
|
||||
"gunicorn[gevent]",
|
||||
"hiredis",
|
||||
"jinja2",
|
||||
"markdown",
|
||||
"mf2py",
|
||||
"mf2util",
|
||||
"msgpack",
|
||||
"pillow",
|
||||
"psycopg2-binary",
|
||||
"python-baseconv",
|
||||
"python-magic",
|
||||
"python-slugify",
|
||||
"pyup-django",
|
||||
"pyyaml",
|
||||
"qrcode",
|
||||
"ronkyuu",
|
||||
"xrd",
|
||||
"greenlet",
|
||||
]
|
||||
|
||||
[tool.pdm.dev-dependencies]
|
||||
dev = [
|
||||
"mypy",
|
||||
"ptpython",
|
||||
"pytest-django",
|
||||
"types-bleach",
|
||||
"types-markdown",
|
||||
"types-python-slugify",
|
||||
"types-pyyaml",
|
||||
"types-requests",
|
||||
"watchdog",
|
||||
"werkzeug",
|
||||
]
|
||||
|
||||
[tool.pdm.build]
|
||||
includes = []
|
||||
|
||||
[tool.ruff.lint]
|
||||
select = ["E4", "E7", "E9", "F", "I"]
|
||||
|
||||
[build-system]
|
||||
requires = ["pdm-backend"]
|
||||
build-backend = "pdm.backend"
|
|
@ -1,3 +1,3 @@
|
|||
[pytest]
|
||||
DJANGO_SETTINGS_MODULE = lemoncurry.settings.test
|
||||
addopts = --ds=lemoncurry.settings.test
|
||||
python_files = tests/*.py
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
default_app_config = 'users.apps.UsersConfig'
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue