carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
30,530 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

259 Commits (759c90fdf8f23ca31fe7191d5122dc4463d3a90b)

Author SHA1 Message Date
Aevann 3eabcdb950 dont use remove_media in media.py 2023-03-17 12:25:31 +02:00
Aevann 1190c9d063 wrap all subprocess commands we use in media.py in try except to delete old files 2023-03-17 12:23:06 +02:00
Aevann 3365e933df only use audio/video extensions that CF caches by default 2023-03-17 11:39:01 +02:00
Aevann 57765f0776 revert sqlalchemy changes 2023-03-16 08:27:58 +02:00
Aevann 3de34c9a65 Merge branch 'keep-session-open' of https://fsdfsd.net/rDrama/rDrama 2023-03-15 08:02:47 +02:00
Aevann f5682dd483 fix video and audio links 2023-03-15 08:00:02 +02:00
Aevann f768d81103 keep db sessions open 2023-03-15 05:58:00 +02:00
Aevann 903fb21961 fix images again 2023-03-15 05:07:43 +02:00
Aevann bc9eeba998 same as last commit 2023-03-15 04:53:37 +02:00
Aevann 77d8dd8737 print debugging 2023-03-15 04:53:15 +02:00
Aevann 59159ee79b fix last commit 2023-03-15 04:49:26 +02:00
Aevann da19ef96d1 fix images again 2023-03-15 04:46:54 +02:00
Aevann b48a7dd129 fix images 2023-03-14 15:35:31 +02:00
Aevann 60c2f7e628 same as last commit 2023-03-14 10:19:02 +02:00
Aevann 4644e62c99 fix last commit 2023-03-14 10:11:45 +02:00
Aevann 5ce067ed70 remove file size alerts 2023-03-14 08:19:01 +02:00
Aevann 97608ea0a9 test getting rid of ![]( on devrama 2023-03-12 15:02:31 +02:00
Aevann 349d1975d7 fucking 2023-03-07 22:38:22 +02:00
Aevann 3afecb326b fix videos and image on WPD 2023-03-07 22:33:12 +02:00
Aevann 042e779ca3 increase threshold for size printing 2023-03-07 12:20:42 +02:00
Aevann 92ac8d1dcc convert KB values to int 2023-03-07 07:19:47 +02:00
Aevann 4909db3e1e print sizes in KB 2023-03-07 03:53:05 +02:00
Aevann 57908aabf2 exclude jannoids with USE_ADMIGGER_THREADS perm from 50 files ratelimit 2023-03-07 02:46:51 +02:00
Aevann 1738f11f9c put the abort after the printing in media_ratelimit 2023-03-07 02:46:09 +02:00
Aevann e3fbc1a965 restrict printing to only large size difference 2023-03-07 02:21:12 +02:00
Aevann d3b14c3f30 use the i subdomain in rdrama only 2023-03-06 23:48:31 +02:00
Aevann 5d266835d0 print to console when size after conversion is higher than size before 2023-03-06 22:49:34 +02:00
Aevann 2ac830467b use STARS const 2023-03-06 22:49:01 +02:00
Aevann 873292d60d make remove_media() to fix 500 error 2023-03-06 21:32:08 +02:00
Aevann 4b6384d71d stop auto-apppending ![](, pointless now 2023-03-06 20:48:31 +02:00
Aevann 9117fd21cc fix all videos on wpd 2023-03-06 19:24:49 +02:00
Aevann a6121849d4 make image on localhost work 2023-03-06 19:20:06 +02:00
Aevann da806fbf4d fix cutoff 2023-03-06 18:58:27 +02:00
Aevann 5d9f9ef414 give the url of the existing image in the error 2023-03-06 18:37:43 +02:00
Aevann 9939614711 use i. subdomain for images 2023-03-05 21:33:18 +02:00
Aevann 0084de4273 add print statement to duplicate detection 2023-03-05 12:11:50 +02:00
Aevann 2d9580c30c print to console when 50 limit is hit 2023-02-27 18:25:58 +02:00
Aevann 8342e8b7c3 increase the limit from 8 files to 20 files 2023-02-27 18:05:28 +02:00
Aevann 5b71b0a81a refactor file upload 2023-02-27 17:02:35 +02:00
Aevann 6e200d332e use [file] instead of <file> 2023-02-27 07:24:26 +02:00
Aevann 1125d4e0e3 fix text-only messages not working 2023-02-26 14:54:36 +02:00
Aevann aec0bbc7bd dont give error when body is missing <file> 2023-02-26 14:46:38 +02:00
Aevann 663cdde1f4 increase the limit for concurrent file uploads from 4 to 8 2023-02-26 14:19:30 +02:00
Aevann 6ac9b32834 allow positioning of files 2023-02-26 14:08:37 +02:00
Aevann a395c18955 remove unnecessary tabs 2023-02-22 19:27:33 +02:00
Aevann b0fdd78d8b log timestamp in dm_images 2023-02-22 19:21:16 +02:00
Aevann cd573133a9 fix images in modmail 2023-01-28 10:47:52 +02:00
Aevann c45cd0fde8 make a UI for /admin/dm_images 2023-01-27 14:24:39 +02:00
Aevann f8822ac14d add a ratelimit to media uploads 2023-01-25 17:13:24 +02:00
Aevann 8396126606 add dm images 2023-01-23 11:58:38 +02:00
Aevann 561b14cfd6 make post thumbnails not animated 2022-12-26 04:16:46 +02:00
Aevann a63b02470d use sets with in statements 2022-12-24 00:22:41 +02:00
Aevann1 e1fdd64d31 try to fix weird error 2022-12-21 19:05:50 +02:00
Aevann1 6df9ac1b53 stop using exiv2 2022-12-21 18:59:16 +02:00
Aevann1 46225890ef fix this https://stupidpol.site/h/classified/post/133139/sweet-sasquatch-statue/3279824 2022-12-21 18:47:13 +02:00
Aevann1 3627889b60 use magick command 2022-12-16 23:21:47 +02:00
Aevann1 6a65a15852 fix 2022-12-16 22:11:38 +02:00
Aevann1 e5aa3c3e92 Revert "retvrn to imagemagick 6.9 as an experiment" 
This reverts commit dcc087f6fd.
 2022-12-16 20:13:58 +02:00
Aevann1 e85eb63fa3 end my misery 2022-12-16 19:58:20 +02:00
Aevann1 8dcc5ba0bb end my misery 2022-12-16 19:45:24 +02:00
Aevann1 8400cade0a try fix for imagemagick 2022-12-15 23:56:09 +02:00
Aevann1 c9bfd1ca33 addendum to last commit 2022-12-13 20:13:25 +02:00
Aevann1 dcc087f6fd retvrn to imagemagick 6.9 as an experiment 2022-12-13 20:05:13 +02:00
justcool393 ab41db22b7 [DO NOT MERGE] multiple sub banners (#59) 
allows multiple sub banners

Snakes note: By request of Carp, especially for WPD.

Co-authored-by: justcool393 <justcool393@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#59
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-11 23:44:34 +00:00
Aevann1 84b1d2a7d7 dont check badges for duplicate images 2022-12-10 10:26:55 +02:00
Aevann1 9f8d2fc8a0 increase max size for site assets from 500kb to 1MB 2022-12-07 22:53:52 +02:00
Aevann1 1a4600bd95 imagemagick is really cringe 2022-12-07 10:42:23 +02:00
Aevann1 ab51e97e09 better error message 2022-12-07 10:28:01 +02:00
Aevann1 94f788ffe9 use exiv2 to remove metadata instead of imagemagick, much much much faster 2022-11-28 05:49:17 +02:00
Aevann1 5f628d7c41 move purge_files_in_cache to the bottom 2022-11-22 17:49:15 +02:00
Aevann1 35f6b39d27 build imagemagick from source again 2022-11-20 23:35:09 +02:00
Aevann1 6b5a71c62e use imagemagick 7.1.0-52 instead of 6.9.11-60 (seems to have fixed the issues of images doubling in size) + don't recompress images that are already webp -- WARNING I HAVE NO IDEA WHAT IM DOING 2022-11-19 21:55:07 +02:00
Snakes b50a815eb0
Fix DB session for webm_to_mp4. 2022-11-15 06:24:17 -05:00
justcool393 8f2f48d6d1
[DO NOT MERGE] import detanglation (#442) 
* move Base definition to files.classes.__init__.py

* fix ImportError

* move userpage listing to users.py

* don't import the app from classes

* consts: set default values to avoid crashes
consts: warn if the secret key is the default config value

* card view: sneed (user db schema)

* cloudflare: use DEFAULT_CONFIG_VALUE

* const: set default values

* decouple media.py from __main__

* pass database to avoid imports

* import cleanup and import request not in const, but in the requests mega import

* move asset_submissions site check to __init__

* asset submissions feature flag

* flag

* g.is_tor

* don't import request where it's not needed

* i think this is fine

* mail: move to own routes and helper

* wrappers

* required wrappers move

* unfuck wrappers a bit

* move snappy quotes and marseys to stateful consts

* marsify

* :pepodrool:

* fix missing import

* import cache

* ...and settings.py

* and static.py

* static needs cache

* route

* lmao all of the jinja shit was in feeds.py amazing

* classes should only import what they need from flask

* import Response

* hdjbjdhbhjf

* ...

* dfdfdfdf

* make get a non-required import

* isort imports (mostly)

* but actually

* configs

* reload config on import

* fgfgfgfg

* config

* config

* initialize snappy and test

* cookie of doom debug

* edfjnkf

* xikscdfd

* debug config

* set session cookie domain, i think this fixes the can't login bug

* sdfbgnhvfdsghbnjfbdvvfghnn

* hrsfxgf

* dump the entire config on a request

* kyskyskyskyskyskyskyskyskys

* duifhdskfjdfd

* dfdfdfdfdfdfdfdfdfdfdfdf

* dfdfdfdf

* imoprt all of the consts beacuse fuck it

* 😭

* dfdfdfdfdfdfsdasdf

* print the entire session

* rffdfdfjkfksj

* fgbhffh

* not the secret keys

* minor bug fixes

* be helpful in the warning

* gfgfgfg

* move warning lower

* isort main imports (i hope this doesn't fuck something up)

* test

* session cookie domain redux

* dfdfdfd

* try only importing Flask

* formkeys fix

* y

* :pepodrool:

* route helper

* remove before flight

* dfdfdfdfdf

* isort classes

* isort helpers

* move check_for_alts to routehelpers and also sort imports and get rid of unused ones

* that previous commit but actkally

* readd the cache in a dozen places they were implicitly imported

* use g.is_tor instead of request.headers. bla bla bla

* upgrade streamers to their own route file

* get rid of unused imports in __main__

* fgfgf

* don't pull in the entire ORM where we don't need it

* features

* explicit imports for the get helper

* explicit imports for the get helper redux

* testing allroutes

* remove unused import

* decouple flask from classes

* syntax fix also remember these have side fx for some reason (why?)

* move side effects out of the class

* posts

* testing on devrama

* settings

* reloading

* settingssdsdsds

* streamer features

* site settings

* testing settings on devrama

* import

* fix modlog

* remove debug stuff

* revert commit 67275b21ab6e2f2520819e84d10bfc1c746a15b6

* archiveorg to _archiveorg

* skhudkfkjfd

* fix cron for PCM

* fix bugs that snekky wants me to

* Fix call to realbody passing db, standardize kwarg

* test

* import check_for_alts from the right place

* cloudflare

* testing on devrama

* fix cron i think

* shadow properly

* tasks

* Remove print which will surely be annoying in prod.

* v and create new session

* use files.classes

* make errors import little and fix rare 500 in /allow_nsfw

* Revert "use files.classes"

This reverts commit 98c10b876cf86ce058b7fb955cf1ec0bfb9996c6.

* pass v to media functions rather than using g

* fix

* dfdfdfdfd

* cleanup, py type checking is dumb so don't use it where it causes issues

* Fix some merge bugs, add DEFAULT_RATELIMIT to main.

* Fix imports on sqlalchemy expressions.

* `from random import random` is an error.

* Fix replies db param.

* errors: fix missing import

* fix rare 500: only send to GIFT_NOTIF_ID if it exists, and send them the right text

* Fix signup formkey.

* fix 2 500s

* propagate db to submissions

* fix replies

* dfdfdfdf

* Fix verifiedcolor.

* is_manual

* can't use getters outside of an app context

* don't attempt to do gumroad on sites where it's not enabled

* don't attempt to do gumraod on sites's where it's unnecessary

* Revert "don't attempt to do gumroad on sites where it's not enabled"

This reverts commit 6f8a6331878655492dfaf1907b27f8be513c14d3.

* fix 500

* validate media type

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-15 03:19:08 -06:00
Snakes 803ce06712
Sanitize more intermediate values. 
Frankly, this is almost entirely speculative. I don't see any viable
exploits through either of these codepaths. But automated tooling
doesn't see the implicit constraints on these values, so might as well
do more sanitization.
 2022-11-10 23:17:25 -05:00
Snakes 9f7adb2614
Fix recent CPU spikes from image encoding. 
Certain animated images take an exceedingly long time (~minutes) to
encode to WEBP using method=6. Such a file was obtained, and it
encoded significantly faster using method=5 and somehow turned out
smaller than the result generated with method=6. We switch now to
use method=5 so we stop getting occasional massive increases in
CPU load when multiple users upload animations at the same time.

Additionally, a timeout was added to the ImageMagick subprocess just
in case there are even more pathological files in the future. Better
to error out than have to get someone to kill the process.
 2022-11-06 00:48:54 -04:00
Aevann1 e182ddc738 fix orientation (thx sneks my love) 2022-10-25 22:19:16 +02:00
Aevann1 16c7c07e7d stop changing extension 2022-10-25 22:01:38 +02:00
Aevann1 100f546f67 strip metadata 2022-10-25 21:58:02 +02:00
Aevann1 3eb364b143 restore -coalesce 2022-10-25 21:00:09 +02:00
Aevann1 75ee126b61 specify method in imagemagick 2022-10-25 20:48:45 +02:00
Aevann1 0119c2b424 specify quality in imagemagick 2022-10-25 20:45:32 +02:00
Aevann1 b9d998bdbe use imagemagick in all cases 2022-10-25 17:41:23 +02:00
Aevann1 3b16c8f3e3 close image files after ur done 2022-10-25 17:41:23 +02:00
Aevann1 834f70fd2d only check duplicates for banners, sidebar images, and badges 2022-10-23 11:27:40 +02:00
Aevann1 2dcf6bcb0f make sure all images with resize parameter are under 500KB 2022-10-22 17:24:07 +02:00
Snakes 94e130febd
Fix video filesize check for patrons. 2022-10-18 22:15:57 -04:00
Aevann1 465160dbe6 dont include SITE_FULL in post urls 2022-10-18 13:09:53 +02:00
Aevann1 f2225e700a change MAX_IMAGE_SIZE_BANNER_RESIZED_MB into MAX_IMAGE_SIZE_BANNER_RESIZED_KB 2022-10-15 12:37:55 +02:00
justcool393 c56e45aa57 create cloudflare helper 2022-10-13 00:55:15 -07:00
justcool393 c67406b84b use site specific patron name 2022-10-12 03:45:45 -07:00
justcool393 96879894af remove 417 (use 409) and reword 418 msg 2022-10-12 02:00:18 -07:00
justcool393 5377472146 show correct max video size 2022-10-12 01:53:23 -07:00
justcool393 ca7fa50419 remove 414 and change 413 msgs 
* use 413 for videos and put explanatory text there
* add style text for 413 as well
 2022-10-12 01:52:08 -07:00
justcool393 dcd875c40c max image and video size are constants now 
* the error pages still need to be fixed
 2022-10-11 23:27:17 -07:00
Aevann1 0cb2a56f5c fix last commit 2022-10-11 19:28:08 +02:00
Aevann1 a9dd6bf1e7 add a media check 2022-10-11 19:26:38 +02:00
Aevann1 b544171449 store the fullpath in the media table 2022-10-11 19:20:15 +02:00
Snakes 60e4e92e90
Suppress ffmpeg progress output, fix trailing flag. 2022-10-06 15:17:36 -04:00
Aevann1 3cf838af29 fix thumbnails and add opera-proxy to docker 2022-10-06 21:07:45 +02:00
Snakes 24167b1d09
Fix thumbnail_thread passing uploader to media. 2022-10-06 05:15:21 -04:00
Aevann1 96f4f8499f fix 500 errors 2022-10-06 09:30:38 +02:00
Aevann1 3a4aa3f3af fix bugs 2022-10-06 08:00:41 +02:00
Aevann1 42344cb76f add media table 2022-10-06 07:54:04 +02:00
Aevann1 1d666b3569 fix prev commit 2022-10-06 07:23:05 +02:00
Aevann1 4563a2b18a fix prev commit 2022-10-06 07:16:24 +02:00
Aevann1 f52d6258ae fix prev commit 2022-10-06 07:07:24 +02:00
Aevann1 d832e195a7 same as last commit 2022-10-06 07:05:03 +02:00
Aevann1 304c65d303 convert webm to mp4 2022-10-06 06:54:05 +02:00
Aevann1 0c8ead2e7d stop using lain.la 2022-10-06 06:31:08 +02:00
Aevann1 2cf9c7560f remove unused legacy function 2022-10-01 18:29:16 +02:00
Snakes 4a54c6219a
Add trailing final newlines to source files. 
Touched a ton of files to finally standardize on having trailing
final newlines, as best practice recommends and so our devs stop
accidentally fighting each other over it.

This was performed automatically with the following:
git ls-files -z '*.py' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
git ls-files -z '*.css' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
 2022-09-29 01:43:29 -04:00
Aevann1 faf4403e26 check for duplicate images when admigger threads for banners/sidebar/badges are used 2022-09-27 03:24:20 +02:00
Aevann1 37e1f25624 make using proxies only happen in 3 circumstances again 2022-09-26 06:01:25 +02:00
Aevann1 0a83feb966 add proxies on lain.la requests 2022-09-26 04:40:21 +02:00
Aevann1 05079a40f4 limit banners to 1MB 2022-09-26 03:41:03 +02:00
Aevann1 4c26a7cd02 limit sidebar and badge images to 1MB 2022-09-26 03:27:31 +02:00
Aevann1 0739358e3f same as last commit 2022-09-18 22:39:40 +02:00
Aevann1 253d72b3ba fix webm 2022-09-18 22:38:28 +02:00
Aevann1 7ec5072e34 remove the webm code 2022-09-16 21:16:47 +02:00
Aevann1 14961d856f trim non-animated marseys and increase width to 300px 2022-09-11 10:49:46 +02:00
Aevann1 744f847c73 I dont remember the purpose of this line 2022-09-10 02:38:06 +02:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 6e2a7aa99e increase webp quality 2022-08-13 01:40:59 +02:00
Aevann1 e1d0269a81 fix 413 error for patrons 2022-06-22 21:12:12 +02:00
Aevann1 71d892a8a9 get file extension 2022-06-22 19:44:43 +02:00
Aevann1 d9cdbd0015 return to only allowing images/videos/audio 2022-06-19 18:56:45 +02:00
Aevann1 06677d269e refactor process_video 2022-06-19 16:49:44 +02:00
Aevann1 5d74693c22 try converting webm to mp4 2022-06-19 15:03:14 +02:00
Aevann1 193615a441 make sure thumbnails are always lower than 8 MB 2022-06-18 23:11:53 +02:00
Aevann1 eba4452d79 fix 500 error 2022-06-18 22:41:00 +02:00
Aevann1 b34dd88560 remove legacy code in video upload (thx @everyone) 2022-06-18 18:23:10 +02:00
Aevann1 ccdabcba29 allow uploading of all types of files (using lain.la) 
+ allow multiple file upload in bios and messaging admins
 2022-06-18 17:53:34 +02:00
Aevann1 a771596d25 videos bullshit 2022-06-17 22:23:04 +02:00
Aevann1 38c12209fb move from os.sytem to subprocess.run, and fix bug 2022-06-17 22:16:22 +02:00
Snakes a0d923e759 Use subprocess.check_call in media.py 2022-06-17 16:15:42 -04:00
Aevann1 30ed6daa26 fix RCE, thank you @Camas 2022-06-17 20:36:34 +02:00
Aevann1 db98b4e140 sfd 2022-05-27 19:19:12 +02:00
Aevann1 4f02a72d29 fd 2022-05-25 00:43:49 +02:00
Aevann1 1734137dcd sfddsa 2022-05-25 00:29:15 +02:00
Aevann1 ca18dc8bdd webm2 2022-05-24 22:09:45 +02:00
Aevann1 67b4f13d98 webm 2022-05-24 22:07:04 +02:00
Aevann1 bbd851210e fds 2022-05-24 17:32:49 +02:00
Aevann1 9599a7e96d fds 2022-05-23 21:13:33 +02:00
Aevann1 0bd15d3914 burgers? 2022-05-23 21:00:14 +02:00
Aevann1 89c27efd79 booba 2022-05-23 20:03:59 +02:00
Aevann1 c5413e9e53 sdf 2022-05-23 17:28:23 +02:00
Aevann1 649f8d5323 vdffsd 2022-05-23 00:45:04 +02:00
Aevann1 0805b41394 fds 2022-05-23 00:37:59 +02:00
Aevann1 0a74a98ec5 big ass commit 2022-05-23 00:15:29 +02:00