Merge branch 'master' into copyedit

2021-03-08 22:35:22 +01:00 · 2021-03-08 22:35:22 +01:00 · 3f7f0f7f2f
parent 57c0752994 2672f17d73
commit 3f7f0f7f2f
6 changed files with 124 additions and 100 deletions
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@ -1,5 +1,7 @@
 ## vNEXT

+* fix: lowered database impact of a background task
+  <https://github.com/codl/forget/issue/166>
 * fix: wording on "favourited posts" is unclear
  <https://github.com/codl/forget/pull/366>

--- a/Pipfile.lock
+++ b/Pipfile.lock
@ -23,10 +23,10 @@
        },
        "amqp": {
            "hashes": [
-                "sha256:24dbaff8ce4f30566bb88976b398e8c4e77637171af3af6f1b9650f48890e60b",
-                "sha256:bb68f8d2bced8f93ccfd07d96c689b716b3227720add971be980accfc2952139"
+                "sha256:70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21",
+                "sha256:aa7f313fb887c91f15474c1229907a04dac0b8135822d6603437803424c0aa59"
            ],
-            "version": "==2.6.0"
+            "version": "==2.6.1"
        },
        "billiard": {
            "hashes": [
@ -56,6 +56,7 @@
                "sha256:113f51658e6fe548dce4b3749f6ef6c24de4184ba9c10a909cbee4261c2a5da0",
                "sha256:1e1aa9c4d1558889f42749c8baf846007953bfd32c8209230cf1cd1f5ef33495",
                "sha256:2f2f4f78f29ac4a45d15b3d9fc3fd9705e0ad313a44b129f6e1d0c6916bad0e2",
+                "sha256:315fbb0d1294594a3701d735c44a2a059219b82fc59aa02cd9c827c38b0980c4",
                "sha256:3269f6de1dd150fd0cce1c158b61ff5ac06d627fd3ae9c6ea03aed26fbbff7ea",
                "sha256:3f4a1f6240916c7984c7f2542786710f622992508dafee0b1714e6d340fb9ffd",
                "sha256:50dd9ad2a2bb12da4e9002a438672d182f98e546e99952de80280a1e1729664f",
@ -66,11 +67,13 @@
                "sha256:72848d25a5f9e736db4af4512e0c3feecc094d57d241f8f1ae959115a2c39756",
                "sha256:743001bca75f4a6b4454be3510feca46f9d61a0c782a9bc2bc684bdb245e279e",
                "sha256:7ac98c71a15648fd11bc1f32608b6110e396121280790082e32b9a3109048bc6",
+                "sha256:92ae753b9cc13d9d91f5636607afbca961fa7ca9e9770ac2a849b38424bf5bea",
                "sha256:9d1c2dd27a1083fefd05b1b2f8df4a6bc2aaa6c21dd82cd41c8ae5e7c23a87f8",
                "sha256:a13ce9b419fe9f277c63f700efb0e444331509d1881b5610d2ba7e9080606967",
                "sha256:a19ef0952b9d2803df88dff07f45a6c92d5676afb9b8d69cf32232d684036d11",
                "sha256:ad766ca8b8c1419b71a22756b45264f45725c86133dc80a7cbe30b6b78c75620",
                "sha256:ad7963f261988ee0883816b6b9f206f11461c9b3cb5cfbca0c9ab5adc406d395",
+                "sha256:aeaae3d60ecd72f04a54f4e7d4fccf2f83aab8e6362c625e003651bebf4347ba",
                "sha256:af0451e23016631a2f52925a10d738ac4a0f794ac315c30380b22efc0c90cbc6",
                "sha256:c16201060c5a3f8742e3deae759014251ac92f382f82bc2a41dc079ff18c3f24",
                "sha256:c43b202f65891861a9a336984a103de25de235f756de69e32db893156f767013",
@ -83,6 +86,7 @@
                "sha256:f969ec7f56ba9636679e69ca07fba548312ccaca37412ee823c7f413541ad7e0",
                "sha256:f9dc52cd70907aafb99a773b66b156f2f995c7a0d284397c487c8b71ddbef2f9",
                "sha256:f9ee88bb52352588ceb811d045b5c9bb1dc38927bc150fd156244f60ff3f59f1",
+                "sha256:fb7fd630e6096112d9f159cb19516e8eccb9daa1c258608c2cbe21686dea36e8",
                "sha256:fc7212e36ebeb81aebf7949c92897b622490d7c0e333a479c0395591e7994600"
            ],
            "index": "pypi",
@ -98,10 +102,10 @@
        },
        "certifi": {
            "hashes": [
-                "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304",
-                "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519"
+                "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c",
+                "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"
            ],
-            "version": "==2020.4.5.1"
+            "version": "==2020.12.5"
        },
        "chardet": {
            "hashes": [
@ -119,10 +123,10 @@
        },
        "cloudpickle": {
            "hashes": [
-                "sha256:0b6258a20a143603d53b037a20983016d4e978f554ec4f36b3d0895b947099ae",
-                "sha256:ff31298eca781315e097bc1f222d8045208c14063a0102cc89bd5899adb4abef"
+                "sha256:3a32d0eb0bc6f4d0c57fbc4f3e3780f7a81e6fee0fa935072884d58ae8e1cc7c",
+                "sha256:9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32"
            ],
-            "version": "==1.4.1"
+            "version": "==1.6.0"
        },
        "csscompressor": {
            "hashes": [
@ -187,10 +191,10 @@
        },
        "idna": {
            "hashes": [
-                "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb",
-                "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"
+                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
            ],
-            "version": "==2.9"
+            "version": "==2.10"
        },
        "itsdangerous": {
            "hashes": [
@ -208,17 +212,16 @@
        },
        "kombu": {
            "hashes": [
-                "sha256:ab0afaa5388dd2979cbc439d3623b86a4f7a58d41f621096bef7767c37bc2505",
-                "sha256:aece08f48706743aaa1b9d607fee300559481eafcc5ee56451aa0ef867a3be07"
+                "sha256:be48cdffb54a2194d93ad6533d73f69408486483d189fe9f5990ee24255b0e0a",
+                "sha256:ca1b45faac8c0b18493d02a8571792f3c40291cf2bcf1f55afed3d8f3aa7ba74"
            ],
-            "version": "==4.6.9"
+            "version": "==4.6.11"
        },
        "mako": {
            "hashes": [
-                "sha256:8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27",
-                "sha256:93729a258e4ff0747c876bd9e20df1b9758028946e976324ccd2d68245c7b6a9"
+                "sha256:17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab"
            ],
-            "version": "==1.1.3"
+            "version": "==1.1.4"
        },
        "markupsafe": {
            "hashes": [
@ -336,17 +339,17 @@
        },
        "python-magic": {
            "hashes": [
-                "sha256:356efa93c8899047d1eb7d3eb91e871ba2f5b1376edbaf4cc305e3c872207355",
-                "sha256:b757db2a5289ea3f1ced9e60f072965243ea43a2221430048fd8cacab17be0ce"
+                "sha256:0cc52ccad086c377b9194014e3dbf98d94b194344630172510a6a3e716b47801",
+                "sha256:33ce94d9395aa269a9c5fac10ae124a5fb328ebe248f36efc5a43922edee662e"
            ],
-            "version": "==0.4.18"
+            "version": "==0.4.20"
        },
        "pytz": {
            "hashes": [
-                "sha256:a494d53b6d39c3c6e44c3bec237336e14305e4f29bbf800b599253057fbb79ed",
-                "sha256:c35965d010ce31b23eeb663ed3cc8c906275d6be1a34393a1d73a41febf4a048"
+                "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4",
+                "sha256:180befebb1927b16f6b57101720075a984c019ac16b1b7575673bea42c6c3da5"
            ],
-            "version": "==2020.1"
+            "version": "==2020.5"
        },
        "raven": {
            "hashes": [
@ -423,10 +426,10 @@
        },
        "urllib3": {
            "hashes": [
-                "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527",
-                "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115"
+                "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2",
+                "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"
            ],
-            "version": "==1.25.9"
+            "version": "==1.25.11"
        },
        "vine": {
            "hashes": [
@ -446,17 +449,17 @@
    "develop": {
        "attrs": {
            "hashes": [
-                "sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c",
-                "sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72"
+                "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
+                "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700"
            ],
-            "version": "==19.3.0"
+            "version": "==20.3.0"
        },
        "certifi": {
            "hashes": [
-                "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304",
-                "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519"
+                "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c",
+                "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830"
            ],
-            "version": "==2020.4.5.1"
+            "version": "==2020.12.5"
        },
        "chardet": {
            "hashes": [
@ -467,10 +470,11 @@
        },
        "codecov": {
            "hashes": [
-                "sha256:2ebd639d8f621aabcce399e475b0302e436cb7e00e7724d1b2224bbf3f215a0c"
+                "sha256:6cde272454009d27355f9434f4e49f238c0273b216beda8472a65dc4957f473b",
+                "sha256:ba8553a82942ce37d4da92b70ffd6d54cf635fc1793ab0a7dc3fecd6ebfb3df8"
            ],
            "index": "pypi",
-            "version": "==2.1.3"
+            "version": "==2.1.11"
        },
        "coverage": {
            "hashes": [
@ -511,10 +515,10 @@
        },
        "idna": {
            "hashes": [
-                "sha256:7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb",
-                "sha256:a068a21ceac8a4d63dbfd964670474107f541babbd2250d61922f029858365fa"
+                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
            ],
-            "version": "==2.9"
+            "version": "==2.10"
        },
        "mirakuru": {
            "hashes": [
@ -525,17 +529,17 @@
        },
        "more-itertools": {
            "hashes": [
-                "sha256:558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be",
-                "sha256:7818f596b1e87be009031c7653d01acc46ed422e6656b394b0f765ce66ed4982"
+                "sha256:8e1a2a43b2f2727425f2b5839587ae37093f19153dc26c0927d1048ff6557330",
+                "sha256:b3a9005928e5bed54076e6e549c792b306fddfe72b2d1d22dd63d42d5d3899cf"
            ],
-            "version": "==8.3.0"
+            "version": "==8.6.0"
        },
        "packaging": {
            "hashes": [
-                "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8",
-                "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"
+                "sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858",
+                "sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093"
            ],
-            "version": "==20.4"
+            "version": "==20.8"
        },
        "pluggy": {
            "hashes": [
@ -553,27 +557,44 @@
        },
        "psutil": {
            "hashes": [
-                "sha256:1413f4158eb50e110777c4f15d7c759521703bd6beb58926f1d562da40180058",
-                "sha256:298af2f14b635c3c7118fd9183843f4e73e681bb6f01e12284d4d70d48a60953",
-                "sha256:60b86f327c198561f101a92be1995f9ae0399736b6eced8f24af41ec64fb88d4",
-                "sha256:685ec16ca14d079455892f25bd124df26ff9137664af445563c1bd36629b5e0e",
-                "sha256:73f35ab66c6c7a9ce82ba44b1e9b1050be2a80cd4dcc3352cc108656b115c74f",
-                "sha256:75e22717d4dbc7ca529ec5063000b2b294fc9a367f9c9ede1f65846c7955fd38",
-                "sha256:a02f4ac50d4a23253b68233b07e7cdb567bd025b982d5cf0ee78296990c22d9e",
-                "sha256:d008ddc00c6906ec80040d26dc2d3e3962109e40ad07fd8a12d0284ce5e0e4f8",
-                "sha256:d84029b190c8a66a946e28b4d3934d2ca1528ec94764b180f7d6ea57b0e75e26",
-                "sha256:e2d0c5b07c6fe5a87fa27b7855017edb0d52ee73b71e6ee368fae268605cc3f5",
-                "sha256:f344ca230dd8e8d5eee16827596f1c22ec0876127c28e800d7ae20ed44c4b310"
+                "sha256:0066a82f7b1b37d334e68697faba68e5ad5e858279fd6351c8ca6024e8d6ba64",
+                "sha256:02b8292609b1f7fcb34173b25e48d0da8667bc85f81d7476584d889c6e0f2131",
+                "sha256:0ae6f386d8d297177fd288be6e8d1afc05966878704dad9847719650e44fc49c",
+                "sha256:0c9ccb99ab76025f2f0bbecf341d4656e9c1351db8cc8a03ccd62e318ab4b5c6",
+                "sha256:0dd4465a039d343925cdc29023bb6960ccf4e74a65ad53e768403746a9207023",
+                "sha256:12d844996d6c2b1d3881cfa6fa201fd635971869a9da945cf6756105af73d2df",
+                "sha256:1bff0d07e76114ec24ee32e7f7f8d0c4b0514b3fae93e3d2aaafd65d22502394",
+                "sha256:245b5509968ac0bd179287d91210cd3f37add77dad385ef238b275bad35fa1c4",
+                "sha256:28ff7c95293ae74bf1ca1a79e8805fcde005c18a122ca983abf676ea3466362b",
+                "sha256:36b3b6c9e2a34b7d7fbae330a85bf72c30b1c827a4366a07443fc4b6270449e2",
+                "sha256:52de075468cd394ac98c66f9ca33b2f54ae1d9bff1ef6b67a212ee8f639ec06d",
+                "sha256:5da29e394bdedd9144c7331192e20c1f79283fb03b06e6abd3a8ae45ffecee65",
+                "sha256:61f05864b42fedc0771d6d8e49c35f07efd209ade09a5afe6a5059e7bb7bf83d",
+                "sha256:6223d07a1ae93f86451d0198a0c361032c4c93ebd4bf6d25e2fb3edfad9571ef",
+                "sha256:6323d5d845c2785efb20aded4726636546b26d3b577aded22492908f7c1bdda7",
+                "sha256:6ffe81843131ee0ffa02c317186ed1e759a145267d54fdef1bc4ea5f5931ab60",
+                "sha256:74f2d0be88db96ada78756cb3a3e1b107ce8ab79f65aa885f76d7664e56928f6",
+                "sha256:74fb2557d1430fff18ff0d72613c5ca30c45cdbfcddd6a5773e9fc1fe9364be8",
+                "sha256:90d4091c2d30ddd0a03e0b97e6a33a48628469b99585e2ad6bf21f17423b112b",
+                "sha256:90f31c34d25b1b3ed6c40cdd34ff122b1887a825297c017e4cbd6796dd8b672d",
+                "sha256:99de3e8739258b3c3e8669cb9757c9a861b2a25ad0955f8e53ac662d66de61ac",
+                "sha256:c6a5fd10ce6b6344e616cf01cc5b849fa8103fbb5ba507b6b2dee4c11e84c935",
+                "sha256:ce8b867423291cb65cfc6d9c4955ee9bfc1e21fe03bb50e177f2b957f1c2469d",
+                "sha256:d225cd8319aa1d3c85bf195c4e07d17d3cd68636b8fc97e6cf198f782f99af28",
+                "sha256:ea313bb02e5e25224e518e4352af4bf5e062755160f77e4b1767dd5ccb65f876",
+                "sha256:ea372bcc129394485824ae3e3ddabe67dc0b118d262c568b4d2602a7070afdb0",
+                "sha256:f4634b033faf0d968bb9220dd1c793b897ab7f1189956e1aa9eae752527127d3",
+                "sha256:fcc01e900c1d7bee2a37e5d6e4f9194760a93597c97fee89c4ae51701de03563"
            ],
            "markers": "sys_platform != 'cygwin'",
-            "version": "==5.7.0"
+            "version": "==5.8.0"
        },
        "py": {
            "hashes": [
-                "sha256:5e27081401262157467ad6e7f851b7aa402c5852dbcb3dae06768434de5752aa",
-                "sha256:c20fdd83a5dbc0af9efd622bee9a5564e278f6380fffcacc43ba6f43db2813b0"
+                "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3",
+                "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a"
            ],
-            "version": "==1.8.1"
+            "version": "==1.10.0"
        },
        "pyparsing": {
            "hashes": [
@ -592,11 +613,11 @@
        },
        "pytest-cov": {
            "hashes": [
-                "sha256:b6a814b8ed6247bd81ff47f038511b57fe1ce7f4cc25b9106f1a4b106f1d9322",
-                "sha256:c87dfd8465d865655a8213859f1b4749b43448b5fae465cb981e16d52a811424"
+                "sha256:45ec2d5182f89a81fc3eb29e3d1ed3113b9e9a873bcddb2a71faaab066110191",
+                "sha256:47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"
            ],
            "index": "pypi",
-            "version": "==2.9.0"
+            "version": "==2.10.1"
        },
        "pytest-redis": {
            "hashes": [
@ -621,19 +642,12 @@
            "index": "pypi",
            "version": "==2.23.0"
        },
-        "six": {
-            "hashes": [
-                "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259",
-                "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"
-            ],
-            "version": "==1.15.0"
-        },
        "urllib3": {
            "hashes": [
-                "sha256:3018294ebefce6572a474f0604c2021e33b3fd8006ecd11d62107a5d2a963527",
-                "sha256:88206b0eb87e6d677d424843ac5209e3fb9d0190d0ee169599165ec25e9d9115"
+                "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2",
+                "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"
            ],
-            "version": "==1.25.9"
+            "version": "==1.25.11"
        },
        "versioneer": {
            "hashes": [
@ -645,10 +659,10 @@
        },
        "wcwidth": {
            "hashes": [
-                "sha256:3de2e41158cb650b91f9654cbf9a3e053cee0719c9df4ddc11e4b568669e9829",
-                "sha256:b651b6b081476420e4e9ae61239ac4c1b49d0c5ace42b2e81dc2ff49ed50c566"
+                "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784",
+                "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"
            ],
-            "version": "==0.2.2"
+            "version": "==0.2.5"
        }
    }
 }
--- a/app.py
+++ b/app.py
@ -7,6 +7,7 @@ from libforget.cachebust import cachebust
 import mimetypes
 import libforget.brotli
 import libforget.img_proxy
+from werkzeug.middleware.proxy_fix import ProxyFix

 app = Flask(__name__)

@ -94,3 +95,5 @@ libforget.brotli.brotli(app)

 imgproxy = (
    libforget.img_proxy.ImgProxyCache(redis_uri=app.config.get('REDIS_URI')))
+
+app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1, x_host=1)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@ -1,24 +1,23 @@
 -i https://pypi.python.org/simple/
-attrs==19.3.0
-certifi==2020.4.5.1
+attrs==20.3.0
+certifi==2020.12.5
 chardet==3.0.4
-codecov==2.1.3
+codecov==2.1.11
 coverage==5.1
-idna==2.9
+idna==2.10
 mirakuru==2.3.0
-more-itertools==8.3.0
-packaging==20.4
+more-itertools==8.6.0
+packaging==20.8
 pluggy==0.13.1
 port-for==0.4
-psutil==5.7.0 ; sys_platform != 'cygwin'
-py==1.8.1
+psutil==5.8.0 ; sys_platform != 'cygwin'
+py==1.10.0
 pyparsing==2.4.7
-pytest-cov==2.9.0
+pytest-cov==2.10.1
 pytest-redis==2.0.0
 pytest==5.4.2
 redis==3.4.1
 requests==2.23.0
-six==1.15.0
-urllib3==1.25.9
+urllib3==1.25.11
 versioneer==0.18
-wcwidth==0.2.2
+wcwidth==0.2.5
--- a/requirements.txt
+++ b/requirements.txt
@ -1,15 +1,15 @@
 -i https://pypi.python.org/simple/
 alembic==1.4.2
-amqp==2.6.0
+amqp==2.6.1
 billiard==3.6.3.0
 blinker==1.4
 blurhash==1.1.4
 brotli==1.0.7
 celery==4.4.2
-certifi==2020.4.5.1
+certifi==2020.12.5
 chardet==3.0.4
 click==7.1.2
-cloudpickle==1.4.1
+cloudpickle==1.6.0
 csscompressor==0.9.5
 decorator==4.4.2
 doit==0.32.0
@ -18,11 +18,11 @@ flask-sqlalchemy==2.4.1
 flask==1.1.2
 gunicorn==20.0.4
 honcho==1.0.1
-idna==2.9
+idna==2.10
 itsdangerous==1.1.0
 jinja2==2.11.2
-kombu==4.6.9
-mako==1.1.3
+kombu==4.6.11
+mako==1.1.4
 markupsafe==1.1.1
 mastodon.py==1.5.1
 pillow==7.1.2
@ -30,14 +30,14 @@ psycopg2==2.8.5
 pyinotify==0.9.6
 python-dateutil==2.8.1
 python-editor==1.0.4
-python-magic==0.4.18
-pytz==2020.1
+python-magic==0.4.20
+pytz==2020.5
 raven==6.10.0
 redis==3.4.1
 requests==2.23.0
 six==1.15.0
 sqlalchemy==1.3.17
 twitter==1.18.0
-urllib3==1.25.9
+urllib3==1.25.11
 vine==1.3.0
 werkzeug==1.0.1
--- a/tasks.py
+++ b/tasks.py
@ -419,10 +419,16 @@ def queue_deletes():
@unique
 def refresh_account_with_oldest_post():
    then = time()
-    post = (Post.query.outerjoin(Post.author).join(Account.tokens)
-            .filter(Account.backoff_until < db.func.now())
-            .filter(~Account.dormant).group_by(Post).order_by(
-                db.asc(Post.updated_at)).first())
+    post = db.session.query(Post).from_statement(db.text("""
+    SELECT posts.id, posts.author_id
+        FROM posts, accounts, oauth_tokens
+        WHERE accounts.id = posts.author_id
+        AND accounts.id = oauth_tokens.account_id
+        AND accounts.backoff_until < now()
+        AND NOT accounts.dormant
+        ORDER BY posts.updated_at ASC
+        LIMIT 1;
+    """).columns(Post.id, Post.author_id)).one()
    if post:
        aid = post.author_id
        refresh_account(aid)