From 5a38b70972654b25e79f0035ac2f7a2919ec18ca Mon Sep 17 00:00:00 2001 From: Khakers <22665282+khakers@users.noreply.github.com> Date: Mon, 14 Aug 2023 16:16:00 -0700 Subject: [PATCH 1/2] partially reverts 2f762025 which added lottie sticker support and updates dependency lock --- Pipfile | 2 - Pipfile.lock | 238 ++++++++--------------------------------------- core/thread.py | 55 ++--------- requirements.txt | 71 +++----------- 4 files changed, 61 insertions(+), 305 deletions(-) diff --git a/Pipfile b/Pipfile index 215956c00e..224a8d8682 100644 --- a/Pipfile +++ b/Pipfile @@ -24,12 +24,10 @@ pymongo = {extras = ["srv"], version = "*"} # Required by motor python-dateutil = "~=2.8.1" python-dotenv = "~=1.0.0" uvloop = {version = "~=0.17.0", markers = "sys_platform != 'win32'"} -lottie = {version = "~=0.6.11", extras = ["pdf"]} requests = "~=2.31.0" attrs = "~=23.1.0" cairocffi = "~=1.3.0" cffi = "~=1.15.0" -pillow = "~=9.5.0" strenum = "*" "discord.py" = "==2.3.0" diff --git a/Pipfile.lock b/Pipfile.lock index e097bf5e74..58822f2c59 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "793670bef3651b3891a0acd97d4ca624b5dc44b2a5e5eccecf9ca025d4e5e0c0" + "sha256": "01beb34705dea9d2687141839da4aaae9f81635633db908ca3dd2a5cc868f3e6" }, "pipfile-spec": 6, "requires": {}, @@ -115,21 +115,13 @@ "markers": "python_version >= '3.7'", "version": "==1.3.1" }, - "anyio": { - "hashes": [ - "sha256:44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780", - "sha256:91dee416e570e92c64041bd18b900d1d6fa78dff7048769ce5ac5ddad004fbb5" - ], - "markers": "python_version >= '3.7'", - "version": "==3.7.1" - }, "async-timeout": { "hashes": [ - "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15", - "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c" + "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f", + "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028" ], - "markers": "python_version >= '3.6'", - "version": "==4.0.2" + "markers": "python_version >= '3.7'", + "version": "==4.0.3" }, "attrs": { "hashes": [ @@ -146,13 +138,6 @@ "index": "pypi", "version": "==1.3.0" }, - "cairosvg": { - "hashes": [ - "sha256:17cb96423a896258848322a95c80160e714a58f1af3dd73b8e1750994519b9f9", - "sha256:ac4dc7c1d38b3a15717db2633a3a383012e0be664c727c911637e6af6a49293c" - ], - "version": "==2.7.0" - }, "certifi": { "hashes": [ "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082", @@ -320,22 +305,6 @@ "index": "pypi", "version": "==0.4.6" }, - "cssselect2": { - "hashes": [ - "sha256:1ccd984dab89fc68955043aca4e1b03e0cf29cad9880f6e28e3ba7a74b14aa5a", - "sha256:fd23a65bfd444595913f02fc71f6b286c29261e354c41d722ca7a261a49b5969" - ], - "markers": "python_version >= '3.7'", - "version": "==0.7.0" - }, - "defusedxml": { - "hashes": [ - "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", - "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", - "version": "==0.7.1" - }, "discord.py": { "hashes": [ "sha256:3e9498967822ad4499f8f72deb9173f942d9827d92b6e4e4e7732d24f78f300c", @@ -346,11 +315,11 @@ }, "dnspython": { "hashes": [ - "sha256:46b4052a55b56beea3a3bdd7b30295c292bd6827dd442348bc116f2d35b17f0a", - "sha256:758e691dbb454d5ccf4e1b154a19e52847f79e21a42fef17b969144af29a4e6c" + "sha256:57c6fbaaeaaf39c891292012060beb141791735dbb4004798328fc2c467402d8", + "sha256:8dcfae8c7460a2f84b4072e26f1c9f4101ca20c071649cb7c34e8b6a93d58984" ], "markers": "python_version >= '3.8' and python_version < '4.0'", - "version": "==2.4.0" + "version": "==2.4.2" }, "emoji": { "hashes": [ @@ -359,14 +328,6 @@ "index": "pypi", "version": "==1.7.0" }, - "exceptiongroup": { - "hashes": [ - "sha256:12c3e887d6485d16943a309616de20ae5582633e0a2eda17f4e10fd61c1e8af5", - "sha256:e346e69d186172ca7cf029c8c1d16235aa0e04035e5750b4b95039e65204328f" - ], - "markers": "python_version < '3.11'", - "version": "==1.1.2" - }, "frozenlist": { "hashes": [ "sha256:007df07a6e3eb3e33e9a1fe6a9db7af152bbd8a185f9aaa6ece10a3529e3e1c6", @@ -434,22 +395,6 @@ "markers": "python_version >= '3.8'", "version": "==1.4.0" }, - "h11": { - "hashes": [ - "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d", - "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761" - ], - "markers": "python_version >= '3.7'", - "version": "==0.14.0" - }, - "httpcore": { - "hashes": [ - "sha256:a6f30213335e34c1ade7be6ec7c47f19f50c56db36abef1a9dfa3815b1cb3888", - "sha256:c2789b767ddddfa2a5782e3199b2b7f6894540b17b16ec26b2c4d8e103510b87" - ], - "markers": "python_version >= '3.8'", - "version": "==0.17.3" - }, "idna": { "hashes": [ "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4", @@ -466,16 +411,6 @@ "index": "pypi", "version": "==0.6.1" }, - "lottie": { - "extras": [ - "pdf" - ], - "hashes": [ - "sha256:d53e96265887aa9187c7c707fd612b3d52f38da64c81ea82297783efb47f7e3f" - ], - "index": "pypi", - "version": "==0.6.11" - }, "motor": { "hashes": [ "sha256:4bfc65230853ad61af447088527c1197f91c20ee957cfaea3144226907335716", @@ -579,78 +514,6 @@ "index": "pypi", "version": "==2.6" }, - "pillow": { - "hashes": [ - "sha256:07999f5834bdc404c442146942a2ecadd1cb6292f5229f4ed3b31e0a108746b1", - "sha256:0852ddb76d85f127c135b6dd1f0bb88dbb9ee990d2cd9aa9e28526c93e794fba", - "sha256:1781a624c229cb35a2ac31cc4a77e28cafc8900733a864870c49bfeedacd106a", - "sha256:1e7723bd90ef94eda669a3c2c19d549874dd5badaeefabefd26053304abe5799", - "sha256:229e2c79c00e85989a34b5981a2b67aa079fd08c903f0aaead522a1d68d79e51", - "sha256:22baf0c3cf0c7f26e82d6e1adf118027afb325e703922c8dfc1d5d0156bb2eeb", - "sha256:252a03f1bdddce077eff2354c3861bf437c892fb1832f75ce813ee94347aa9b5", - "sha256:2dfaaf10b6172697b9bceb9a3bd7b951819d1ca339a5ef294d1f1ac6d7f63270", - "sha256:322724c0032af6692456cd6ed554bb85f8149214d97398bb80613b04e33769f6", - "sha256:35f6e77122a0c0762268216315bf239cf52b88865bba522999dc38f1c52b9b47", - "sha256:375f6e5ee9620a271acb6820b3d1e94ffa8e741c0601db4c0c4d3cb0a9c224bf", - "sha256:3ded42b9ad70e5f1754fb7c2e2d6465a9c842e41d178f262e08b8c85ed8a1d8e", - "sha256:432b975c009cf649420615388561c0ce7cc31ce9b2e374db659ee4f7d57a1f8b", - "sha256:482877592e927fd263028c105b36272398e3e1be3269efda09f6ba21fd83ec66", - "sha256:489f8389261e5ed43ac8ff7b453162af39c3e8abd730af8363587ba64bb2e865", - "sha256:54f7102ad31a3de5666827526e248c3530b3a33539dbda27c6843d19d72644ec", - "sha256:560737e70cb9c6255d6dcba3de6578a9e2ec4b573659943a5e7e4af13f298f5c", - "sha256:5671583eab84af046a397d6d0ba25343c00cd50bce03787948e0fff01d4fd9b1", - "sha256:5ba1b81ee69573fe7124881762bb4cd2e4b6ed9dd28c9c60a632902fe8db8b38", - "sha256:5d4ebf8e1db4441a55c509c4baa7a0587a0210f7cd25fcfe74dbbce7a4bd1906", - "sha256:60037a8db8750e474af7ffc9faa9b5859e6c6d0a50e55c45576bf28be7419705", - "sha256:608488bdcbdb4ba7837461442b90ea6f3079397ddc968c31265c1e056964f1ef", - "sha256:6608ff3bf781eee0cd14d0901a2b9cc3d3834516532e3bd673a0a204dc8615fc", - "sha256:662da1f3f89a302cc22faa9f14a262c2e3951f9dbc9617609a47521c69dd9f8f", - "sha256:7002d0797a3e4193c7cdee3198d7c14f92c0836d6b4a3f3046a64bd1ce8df2bf", - "sha256:763782b2e03e45e2c77d7779875f4432e25121ef002a41829d8868700d119392", - "sha256:77165c4a5e7d5a284f10a6efaa39a0ae8ba839da344f20b111d62cc932fa4e5d", - "sha256:7c9af5a3b406a50e313467e3565fc99929717f780164fe6fbb7704edba0cebbe", - "sha256:7ec6f6ce99dab90b52da21cf0dc519e21095e332ff3b399a357c187b1a5eee32", - "sha256:833b86a98e0ede388fa29363159c9b1a294b0905b5128baf01db683672f230f5", - "sha256:84a6f19ce086c1bf894644b43cd129702f781ba5751ca8572f08aa40ef0ab7b7", - "sha256:8507eda3cd0608a1f94f58c64817e83ec12fa93a9436938b191b80d9e4c0fc44", - "sha256:85ec677246533e27770b0de5cf0f9d6e4ec0c212a1f89dfc941b64b21226009d", - "sha256:8aca1152d93dcc27dc55395604dcfc55bed5f25ef4c98716a928bacba90d33a3", - "sha256:8d935f924bbab8f0a9a28404422da8af4904e36d5c33fc6f677e4c4485515625", - "sha256:8f36397bf3f7d7c6a3abdea815ecf6fd14e7fcd4418ab24bae01008d8d8ca15e", - "sha256:91ec6fe47b5eb5a9968c79ad9ed78c342b1f97a091677ba0e012701add857829", - "sha256:965e4a05ef364e7b973dd17fc765f42233415974d773e82144c9bbaaaea5d089", - "sha256:96e88745a55b88a7c64fa49bceff363a1a27d9a64e04019c2281049444a571e3", - "sha256:99eb6cafb6ba90e436684e08dad8be1637efb71c4f2180ee6b8f940739406e78", - "sha256:9adf58f5d64e474bed00d69bcd86ec4bcaa4123bfa70a65ce72e424bfb88ed96", - "sha256:9b1af95c3a967bf1da94f253e56b6286b50af23392a886720f563c547e48e964", - "sha256:a0aa9417994d91301056f3d0038af1199eb7adc86e646a36b9e050b06f526597", - "sha256:a0f9bb6c80e6efcde93ffc51256d5cfb2155ff8f78292f074f60f9e70b942d99", - "sha256:a127ae76092974abfbfa38ca2d12cbeddcdeac0fb71f9627cc1135bedaf9d51a", - "sha256:aaf305d6d40bd9632198c766fb64f0c1a83ca5b667f16c1e79e1661ab5060140", - "sha256:aca1c196f407ec7cf04dcbb15d19a43c507a81f7ffc45b690899d6a76ac9fda7", - "sha256:ace6ca218308447b9077c14ea4ef381ba0b67ee78d64046b3f19cf4e1139ad16", - "sha256:b416f03d37d27290cb93597335a2f85ed446731200705b22bb927405320de903", - "sha256:bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1", - "sha256:c1170d6b195555644f0616fd6ed929dfcf6333b8675fcca044ae5ab110ded296", - "sha256:c380b27d041209b849ed246b111b7c166ba36d7933ec6e41175fd15ab9eb1572", - "sha256:c446d2245ba29820d405315083d55299a796695d747efceb5717a8b450324115", - "sha256:c830a02caeb789633863b466b9de10c015bded434deb3ec87c768e53752ad22a", - "sha256:cb841572862f629b99725ebaec3287fc6d275be9b14443ea746c1dd325053cbd", - "sha256:cfa4561277f677ecf651e2b22dc43e8f5368b74a25a8f7d1d4a3a243e573f2d4", - "sha256:cfcc2c53c06f2ccb8976fb5c71d448bdd0a07d26d8e07e321c103416444c7ad1", - "sha256:d3c6b54e304c60c4181da1c9dadf83e4a54fd266a99c70ba646a9baa626819eb", - "sha256:d3d403753c9d5adc04d4694d35cf0391f0f3d57c8e0030aac09d7678fa8030aa", - "sha256:d9c206c29b46cfd343ea7cdfe1232443072bbb270d6a46f59c259460db76779a", - "sha256:e49eb4e95ff6fd7c0c402508894b1ef0e01b99a44320ba7d8ecbabefddcc5569", - "sha256:f8286396b351785801a976b1e85ea88e937712ee2c3ac653710a4a57a8da5d9c", - "sha256:f8fc330c3370a81bbf3f88557097d1ea26cd8b019d6433aa59f71195f5ddebbf", - "sha256:fbd359831c1657d69bb81f0db962905ee05e5e9451913b18b831febfe0519082", - "sha256:fe7e1c262d3392afcf5071df9afa574544f28eac825284596ac6db56e6d11062", - "sha256:fed1e1cf6a42577953abbe8e6cf2fe2f566daebde7c34724ec8803c4c0cda579" - ], - "index": "pypi", - "version": "==9.5.0" - }, "pycparser": { "hashes": [ "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9", @@ -773,14 +636,6 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, - "sniffio": { - "hashes": [ - "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101", - "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384" - ], - "markers": "python_version >= '3.7'", - "version": "==1.3.0" - }, "strenum": { "hashes": [ "sha256:878fb5ab705442070e4dd1929bb5e2249511c0bcf2b0eeacf3bcd80875c82eff", @@ -789,14 +644,6 @@ "index": "pypi", "version": "==0.4.15" }, - "tinycss2": { - "hashes": [ - "sha256:2b80a96d41e7c3914b8cda8bc7f705a4d9c49275616e886103dd839dfc847847", - "sha256:8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627" - ], - "markers": "python_version >= '3.7'", - "version": "==1.2.1" - }, "urllib3": { "hashes": [ "sha256:8d22f86aae8ef5e410d4f539fde9ce6b2113a001bb4d189e0aed70642d602b11", @@ -841,13 +688,6 @@ "markers": "sys_platform != 'win32'", "version": "==0.17.0" }, - "webencodings": { - "hashes": [ - "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", - "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923" - ], - "version": "==0.5.1" - }, "yarl": { "hashes": [ "sha256:04ab9d4b9f587c06d801c2abfe9317b77cdf996c65a90d5e84ecc45010823571", @@ -960,11 +800,11 @@ }, "cfgv": { "hashes": [ - "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426", - "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736" + "sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9", + "sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560" ], - "markers": "python_full_version >= '3.6.1'", - "version": "==3.3.1" + "markers": "python_version >= '3.8'", + "version": "==3.4.0" }, "click": { "hashes": [ @@ -1031,19 +871,19 @@ }, "pathspec": { "hashes": [ - "sha256:2798de800fa92780e33acca925945e9a19a133b715067cf165b8866c15a31687", - "sha256:d8af70af76652554bd134c22b3e8a1cc46ed7d91edcdd721ef1a0c51a84a5293" + "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20", + "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3" ], "markers": "python_version >= '3.7'", - "version": "==0.11.1" + "version": "==0.11.2" }, "platformdirs": { "hashes": [ - "sha256:1b42b450ad933e981d56e59f1b97495428c9bd60698baab9f3eb3d00d5822421", - "sha256:ad8291ae0ae5072f66c16945166cb11c63394c7a3ad1b1bc9828ca3162da8c2f" + "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d", + "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d" ], "markers": "python_version >= '3.7'", - "version": "==3.9.1" + "version": "==3.10.0" }, "pre-commit": { "hashes": [ @@ -1101,26 +941,26 @@ }, "ruff": { "hashes": [ - "sha256:2dae8f2d9c44c5c49af01733c2f7956f808db682a4193180dedb29dd718d7bbe", - "sha256:2e7c15828d09f90e97bea8feefcd2907e8c8ce3a1f959c99f9b4b3469679f33c", - "sha256:37359cd67d2af8e09110a546507c302cbea11c66a52d2a9b6d841d465f9962d4", - "sha256:48ed5aca381050a4e2f6d232db912d2e4e98e61648b513c350990c351125aaec", - "sha256:4a7d52457b5dfcd3ab24b0b38eefaead8e2dca62b4fbf10de4cd0938cf20ce30", - "sha256:581c43e4ac5e5a7117ad7da2120d960a4a99e68ec4021ec3cd47fe1cf78f8380", - "sha256:5f972567163a20fb8c2d6afc60c2ea5ef8b68d69505760a8bd0377de8984b4f6", - "sha256:7008fc6ca1df18b21fa98bdcfc711dad5f94d0fc3c11791f65e460c48ef27c82", - "sha256:7784e3606352fcfb193f3cd22b2e2117c444cb879ef6609ec69deabd662b0763", - "sha256:7a37dab70114671d273f203268f6c3366c035fe0c8056614069e90a65e614bfc", - "sha256:83e8f372fa5627eeda5b83b5a9632d2f9c88fc6d78cead7e2a1f6fb05728d137", - "sha256:8ffa7347ad11643f29de100977c055e47c988cd6d9f5f5ff83027600b11b9189", - "sha256:b7de5b8689575918e130e4384ed9f539ce91d067c0a332aedef6ca7188adac2d", - "sha256:bd58af46b0221efb95966f1f0f7576df711cb53e50d2fdb0e83c2f33360116a4", - "sha256:d878370f7e9463ac40c253724229314ff6ebe4508cdb96cb536e1af4d5a9cd4f", - "sha256:ef6ee3e429fd29d6a5ceed295809e376e6ece5b0f13c7e703efaf3d3bcb30b96", - "sha256:fe7118c1eae3fda17ceb409629c7f3b5a22dffa7caf1f6796776936dca1fe653" + "sha256:0a3218458b140ea794da72b20ea09cbe13c4c1cdb7ac35e797370354628f4c05", + "sha256:1292cfc764eeec3cde35b3a31eae3f661d86418b5e220f5d5dba1c27a6eccbb6", + "sha256:1d1f7096038961d8bc3b956ee69d73826843eb5b39a5fa4ee717ed473ed69c95", + "sha256:735cd62fccc577032a367c31f6a9de7c1eb4c01fa9a2e60775067f44f3fc3091", + "sha256:88295fd649d0aa1f1271441df75bf06266a199497afd239fd392abcfd75acd7e", + "sha256:8b949084941232e2c27f8d12c78c5a6a010927d712ecff17231ee1a8371c205b", + "sha256:a3930d66b35e4dc96197422381dff2a4e965e9278b5533e71ae8474ef202fab0", + "sha256:b2fe880cff13fffd735387efbcad54ba0ff1272bceea07f86852a33ca71276f4", + "sha256:b3660b85a9d84162a055f1add334623ae2d8022a84dcd605d61c30a57b436c32", + "sha256:bcaf85907fc905d838f46490ee15f04031927bbea44c478394b0bfdeadc27362", + "sha256:c4c79ae3308e308b94635cd57a369d1e6f146d85019da2fbc63f55da183ee29b", + "sha256:d1d098ea74d0ce31478765d1f8b4fbdbba2efc532397b5c5e8e5ea0c13d7e5ae", + "sha256:d29dfbe314e1131aa53df213fdfea7ee874dd96ea0dd1471093d93b59498384d", + "sha256:e37e086f4d623c05cd45a6fe5006e77a2b37d57773aad96b7802a6b8ecf9c910", + "sha256:ebd3cc55cd499d326aac17a331deaea29bea206e01c08862f9b5c6e93d77a491", + "sha256:f67ed868d79fbcc61ad0fa034fe6eed2e8d438d32abce9c04b7c4c1464b2cf8e", + "sha256:f86b2b1e7033c00de45cc176cf26778650fb8804073a0495aca2f674797becbb" ], "index": "pypi", - "version": "==0.0.280" + "version": "==0.0.284" }, "setuptools": { "hashes": [ @@ -1148,11 +988,11 @@ }, "virtualenv": { "hashes": [ - "sha256:01aacf8decd346cf9a865ae85c0cdc7f64c8caa07ff0d8b1dfc1733d10677442", - "sha256:2ef6a237c31629da6442b0bcaa3999748108c7166318d1f55cc9f8d7294e97bd" + "sha256:95a6e9398b4967fbcb5fef2acec5efaf9aa4972049d9ae41f95e0972a683fd02", + "sha256:e5c3b4ce817b0b328af041506a2a299418c98747c4b1e68cb7527e74ced23efc" ], "markers": "python_version >= '3.7'", - "version": "==20.24.1" + "version": "==20.24.3" } } } diff --git a/core/thread.py b/core/thread.py index 27e7697d94..60a23c8c31 100644 --- a/core/thread.py +++ b/core/thread.py @@ -15,8 +15,6 @@ import isodate from discord.ext.commands import CommandError, MissingRequiredArgument from discord.types.user import PartialUser as PartialUserPayload, User as UserPayload -from lottie.exporters import exporters as l_exporters -from lottie.importers import importers as l_importers from core.models import DMDisabled, DummyMessage, getLogger from core.utils import ( @@ -1022,51 +1020,14 @@ async def send( if is_image_url(url, convert_size=False) ] images.extend(image_urls) - - def lottie_to_png(data): - importer = l_importers.get("lottie") - exporter = l_exporters.get("png") - with io.BytesIO() as stream: - stream.write(data) - stream.seek(0) - an = importer.process(stream) - - with io.BytesIO() as stream: - exporter.process(an, stream) - stream.seek(0) - return stream.read() - - for i in message.stickers: - if i.format in (discord.StickerFormatType.png, discord.StickerFormatType.apng): - images.append((i.url, i.name, True)) - elif i.format == discord.StickerFormatType.lottie: - # save the json lottie representation - try: - async with self.bot.session.get(i.url) as resp: - data = await resp.read() - - # convert to a png - img_data = await self.bot.loop.run_in_executor( - None, functools.partial(lottie_to_png, data) - ) - b64_data = base64.b64encode(img_data).decode() - - # upload to imgur - async with self.bot.session.post( - "https://api.imgur.com/3/image", - headers={"Authorization": "Client-ID 50e96145ac5e085"}, - data={"image": b64_data}, - ) as resp: - result = await resp.json() - url = result["data"]["link"] - - except Exception: - traceback.print_exc() - images.append((None, i.name, True)) - else: - images.append((url, i.name, True)) - else: - images.append((None, i.name, True)) + images.extend( + ( + i.url if i.format in (discord.StickerFormatType.png, discord.StickerFormatType.apng) else None, + i.name, + True, + ) + for i in message.stickers + ) embedded_image = False diff --git a/requirements.txt b/requirements.txt index bad033c0ce..6589e89bd6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,70 +1,27 @@ -aiohttp==3.8.5 -aiosignal==1.3.1 -anyio==3.7.1 -astroid==2.6.6 -async-timeout==4.0.2 +aiosignal==1.3.1 ; python_version >= '3.7' +async-timeout==4.0.3 ; python_version >= '3.7' attrs==23.1.0 -bandit==1.7.4 -black==23.3.0 cairocffi==1.3.0 -CairoSVG==2.7.0 -certifi==2023.7.22 +certifi==2023.7.22 ; python_version >= '3.6' cffi==1.15.1 -cfgv==3.3.1 -charset-normalizer==3.2.0 -click==8.1.3 +charset-normalizer==3.2.0 ; python_full_version >= '3.7.0' colorama==0.4.6 -cssselect2==0.7.0 -defusedxml==0.7.1 discord.py==2.3.0 -distlib==0.3.6 -dnspython==2.4.0 +dnspython==2.4.2 ; python_version >= '3.8' and python_version < '4.0' emoji==1.7.0 -exceptiongroup==1.1.2 -filelock==3.12.2 -frozenlist==1.4.0 -gitdb==4.0.10 -GitPython==3.1.30 -h11==0.14.0 -httpcore==0.17.3 -identify==2.5.24 -idna==3.4 +frozenlist==1.4.0 ; python_version >= '3.8' +idna==3.4 ; python_version >= '3.5' isodate==0.6.1 -isort==5.11.4 -lazy-object-proxy==1.9.0 -lottie==0.6.11 -mccabe==0.6.1 motor==3.1.2 -multidict==6.0.4 -mypy-extensions==1.0.0 +multidict==6.0.4 ; python_version >= '3.7' natural==0.2.0 -nodeenv==1.8.0 -packaging==23.1 parsedatetime==2.6 -pathspec==0.11.1 -pbr==5.11.1 -Pillow==9.5.0 -platformdirs==3.5.3 -pre-commit==3.3.2 -pycparser==2.21 -pylint==2.9.6 -pymongo==4.4.1 +pymongo[srv]==4.4.1 python-dateutil==2.8.2 python-dotenv==1.0.0 -PyYAML==6.0.1 requests==2.31.0 -ruff==0.0.272 -six==1.16.0 -smmap==5.0.0 -sniffio==1.3.0 -stevedore==4.1.1 -StrEnum==0.4.15 -tinycss2==1.2.1 -toml==0.10.2 -tomli==2.0.1 -typing_extensions==4.6.3 -urllib3==2.0.4 -virtualenv==20.23.0 -webencodings==0.5.1 -wrapt==1.12.1 -yarl==1.9.2 +six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' +strenum==0.4.15 +urllib3==2.0.4 ; python_version >= '3.7' +uvloop==0.17.0 ; sys_platform != 'win32' +yarl==1.9.2 ; python_version >= '3.7' From d8cf51b232445cd73fcfa3e8d7c38a257a22befd Mon Sep 17 00:00:00 2001 From: Raiden Sakura Date: Fri, 18 Aug 2023 21:15:55 +0800 Subject: [PATCH 2/2] Lint --- core/migrations.py | 2 +- core/thread.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/migrations.py b/core/migrations.py index c51521abab..9ffe467197 100644 --- a/core/migrations.py +++ b/core/migrations.py @@ -1,6 +1,6 @@ import datetime import re -from typing import Optional, List +from typing import List, Optional from core import blocklist from core.models import getLogger diff --git a/core/thread.py b/core/thread.py index 60a23c8c31..9ca5180fb6 100644 --- a/core/thread.py +++ b/core/thread.py @@ -1,11 +1,7 @@ import asyncio -import base64 import copy -import functools -import io import re import time -import traceback import typing import warnings from datetime import timedelta @@ -1022,7 +1018,9 @@ async def send( images.extend(image_urls) images.extend( ( - i.url if i.format in (discord.StickerFormatType.png, discord.StickerFormatType.apng) else None, + i.url + if i.format in (discord.StickerFormatType.png, discord.StickerFormatType.apng) + else None, i.name, True, )