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

16160 Commits (627158805650335d5cd4edf98b91055b209c6186)

Author SHA1 Message Date
Aevann1 e99aa6fd0e same as last commit 2022-10-23 18:24:22 +02:00
Aevann1 a040b6779b same as last commit 2022-10-23 18:24:21 +02:00
Snakes ab194a6ad2
Add more shit emoji. 2022-10-23 12:14:24 -04:00
Aevann1 9b47ad166b small refactor to approving psots and comments 2022-10-23 17:51:49 +02:00
justcool393 ff84f32e45 make stats charts tight 2022-10-23 10:46:03 -05:00
Aevann1 096828dc1c add some padding to admin tools 2022-10-23 17:24:41 +02:00
justcool393 c8324f87ff Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-23 10:07:14 -05:00
justcool393 09e5bb6b03 ping me with jc and off site mention update 2022-10-23 10:06:59 -05:00
Aevann1 14b0d77f7a reduce normal cosmetic awards from 500 back to 300 2022-10-23 16:41:57 +02:00
Aevann1 834f70fd2d only check duplicates for banners, sidebar images, and badges 2022-10-23 11:27:40 +02:00
Aevann1 77e5da55ef fix behavior that would replace marsey tags with "none" if we didn't specify them on update 2022-10-23 11:27:20 +02:00
Aevann1 c8f24eab1b fix videos 2022-10-23 10:57:13 +02:00
Aevann1 0f4462ca5b increase pin limit to 4 on WPD 2022-10-23 10:48:24 +02:00
justcool393 a2c16534a4 admin pings: truescore requirement and exclude shadowban and make a permission 2022-10-22 19:45:15 -05:00
justcool393 cc3fb59ccd html head: fix default theme 2022-10-22 19:11:07 -05:00
Aevann1 c4103cfaf4 add @jannies to notify all jannies 2022-10-23 01:50:56 +02:00
Aevann1 27c1970575 add a "!" in PCM welcome message 2022-10-23 01:02:31 +02:00
Aevann1 b83f9bcfb1 fix prev commit 2022-10-23 00:12:46 +02:00
Aevann1 78e1bf9784 clear message field after submitting it 2022-10-23 00:10:36 +02:00
Aevann1 c2bb3303e1 fix prev commit 2022-10-22 23:13:37 +02:00
Aevann1 fb6825ab58 add the redbubble megathread to the index 2022-10-22 23:12:23 +02:00
justcool393 a5799b222e hats: fix 2 500s (SQL errors) 2022-10-22 15:37:22 -05:00
justcool393 60dd29bc6b Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-22 12:26:52 -05:00
justcool393 db95ff7f43 head: temporarily use userpage's head tags instead of overwriting our own 2022-10-22 12:25:44 -05:00
Aevann1 888e552283 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2937807?context=8#context 2022-10-22 18:40:52 +02:00
Aevann1 1b00b172e4 reduce frames on 3 hats 2022-10-22 18:32:19 +02:00
Aevann1 07228a2708 fix cookies on localhost 2022-10-22 17:26:39 +02:00
Aevann1 2dcf6bcb0f make sure all images with resize parameter are under 500KB 2022-10-22 17:24:07 +02:00
justcool393 49b12f220c sessions: set cookie domain properly 2022-10-21 23:39:23 -05:00
justcool393 62e9ef7009 hats: massively raise ratelimit 2022-10-21 22:31:58 -05:00
Aevann1 411a92f8f4 sneed 2022-10-21 23:58:32 +00:00
Snakes 333c36f6b7
Update homoween badges, cachebust badges. 2022-10-21 19:57:59 -04:00
Snakes e9b648dcb5
Support for multiple WPD sites on one master. 2022-10-21 19:33:43 -04:00
Snakes 45ff9d80e5
Permit serving multiple hosts from one instance. 
In service of tidying up WPD application servers. Also includes a
closely related change of letting nginx do the redirects to root.
 2022-10-21 19:12:36 -04:00
justcool393 a96bf4f81e favicon: add back to all pages properly 2022-10-21 17:46:17 -05:00
justcool393 b6ad3555b2 chat: add favicon to HTML 2022-10-21 17:42:28 -05:00
justcool393 2792a06c21 CSP: content security policies are safe 2022-10-21 17:31:31 -05:00
justcool393 0495d00629 chat fix i think? 2022-10-21 17:24:17 -05:00
justcool393 347a751481 WPD: redirect unlogged users to new site 2022-10-21 16:10:06 -05:00
Aevann1 570f72563f sneed 2022-10-21 19:01:16 +00:00
justcool393 2e087dc09f set session cookie domain to SITE 2022-10-21 14:00:41 -05:00
justcool393 c4b2c6f3f5
html head refactor (#412) 
* start html head refactor
this is a bit of a doozy tbh and will probably take a while. the templates are very highly duplicated but not duplicated enough to be an easy little thing

oh well, so it goes.

* some easier html head ones

* add chat, html_head, sign_up_failed_ref, sign_up, submit

* CSP: put it in const.py instead of this weird thing we did before

* fix syntax error

* better call the actual macros

* fix prev commit

* import into settings2

* fix prev commit

* set CSP properly if localhost

* some title fixes i think

* login page

* fix prev commit

* hacky thing to get titles to work i think

* {{stylesheets()}}

* fix prev commit

* title stuff

* cries uncontrollably

* submission fixes i think

* fix prev commit i think

* submission fixes ekfjdhfkdjf

* submission fixes 4

* this may fix submissions idk tbh

* default template: make it a little better on post pages

* default template: some efficiency
 2022-10-21 13:39:45 -05:00
Aevann1 360aa99fe1 small adjustments 2022-10-21 17:11:12 +02:00
Aevann1 5ba33396d5 add tags 2022-10-21 16:51:39 +02:00
Aevann1 04aa88f71f fix jigsaw WPD tier 2022-10-21 16:44:31 +02:00
Aevann1 26e2143514 marsey.world 2022-10-21 16:32:23 +02:00
Aevann1 824cc1ba81 sneed 2022-10-21 12:00:05 +00:00
Aevann1 2a2141a41f sneed 2022-10-21 11:32:29 +00:00
Aevann1 81a929c2e1 on harpooner's request, allow hole jannies to exile JL3 2022-10-21 13:32:21 +02:00
Aevann1 7733449169 fix 500 error 2022-10-21 13:30:32 +02:00
Aevann1 05e8dec716 allow multiple hosts (thanks JC I love you) 2022-10-21 13:15:29 +02:00
justcool393 37af363a47 remove duplicate message 2022-10-20 19:31:03 -05:00
justcool393 790a569072 don't check if body is empty 2022-10-20 19:29:20 -05:00
justcool393 8fe73cb68e refactor blackjack a bit 2022-10-20 19:28:05 -05:00
justcool393 c0fe4d03c0 message: sanitize replies too 2022-10-20 18:24:03 -05:00
justcool393 52b8a22917 messages: use sanitize_raw_body 2022-10-20 18:18:47 -05:00
justcool393 578e1896fd sanitize: strip out html comments 
they're unnecessary and never get rendered
 2022-10-20 18:06:55 -05:00
justcool393 360cff7e8f add post bypass checking perm 2022-10-20 17:51:29 -05:00
Aevann1 c78579ec5a refactor banned domains a little bit 2022-10-21 00:14:28 +02:00
Aevann1 25c5c8fb7d better js for follower pages 2022-10-21 00:14:28 +02:00
justcool393 981256eb00 kippyprinter: change check to only allow pcmemes.net instead of disallowing rdrama.net 2022-10-20 15:53:52 -05:00
justcool393 5f16356d7a use showToast in some areas where we weren't before 2022-10-20 15:45:56 -05:00
Aevann1 3c3950adb0 change video tags 2022-10-20 22:26:43 +02:00
Aevann1 2d41118f39 sneed 2022-10-20 20:00:05 +00:00
Snakes 75a1a9c6c8
Fix profile viewers last visit timestamp. 2022-10-20 14:29:58 -04:00
Snakes 496d7ba6c6
WPD: update sidebar post flairs. 2022-10-20 14:25:53 -04:00
justcool393 4f35819fee assets: use .get where we can instead of .query 2022-10-20 13:00:14 -05:00
justcool393 05ba34973f log: update_marsey actions aren't always updating the image itself 2022-10-20 11:45:25 -05:00
justcool393 fc4e9866eb fix the fix 2022-10-20 09:59:14 -05:00
justcool393 cb35480ee6 sanitize: replace cuneiform ban with an overline ban 2022-10-20 09:44:32 -05:00
Snakes 9b81bc8a9d
WPD: expand post title editing to JL2+. 2022-10-20 10:42:52 -04:00
justcool393 d14eb65056 fix name bug with hats 2022-10-20 09:14:18 -05:00
Aevann1 5efb51ca57 sneed 2022-10-20 12:00:03 +00:00
Aevann1 c6daf73054 sneed 2022-10-20 08:00:03 +00:00
Aevann1 df1ae154bf sneed 2022-10-20 04:00:06 +00:00
justcool393 546883dcd5
fix fish's 500 
im commiting this on my phone lol
 2022-10-19 18:03:56 -07:00
Aevann1 cbfb2c2c99 sneed 2022-10-20 00:00:05 +00:00
justcool393 6fca874acf only show tags field on marsey update page 2022-10-19 18:45:44 -05:00
justcool393 ffdf810aa9 fix 500 and populate page on error 2022-10-19 18:38:25 -05:00
justcool393 9627c6db01 don't pass for no reason and also marsey -> existing 2022-10-19 18:38:25 -05:00
justcool393 62bd5a34e8 g.db.query not g.db.get 2022-10-19 18:38:25 -05:00
justcool393 99f66c8d31 Add UI for updating marsey tags and also allow me to do it 2022-10-19 18:38:25 -05:00
Aevann1 e16ebf8749 fix 500 error 2022-10-20 00:28:07 +02:00
Aevann1 e4fb158125 update the WPD app 2022-10-19 23:42:27 +02:00
justcool393 2386a2e04b fix ban and delete modals 2022-10-19 13:00:33 -05:00
Aevann1 457acd43cb decrease the number of owned awards when u give one 2022-10-19 19:54:18 +02:00
Aevann1 8daa066622 remove duplicate sidebar image 2022-10-19 19:13:26 +02:00
Aevann1 2c2128fc60 sneed 2022-10-19 16:00:02 +00:00
Snakes 3209ccc67e
Fix brooksannoyed emoji format. 
A tacit assumption in many parts of the emoji code is that valid
emoji end with .webp. This has led to some absurdities like GIFs with
.webp extensions. However, here we run `gif2webp` over the GIF, which
also reduces its size substantially.
 2022-10-19 10:49:32 -04:00
justcool393 68e1a51869 add brooksannoyed emoji 2022-10-19 09:39:38 -05:00
Aevann1 9efc0f0a68 unify email regex 2022-10-19 12:39:03 +02:00
Aevann1 d91827028b fix hcaptcha in localhost 2022-10-19 12:11:27 +02:00
Aevann1 887ab766a5 fix 500 error when resetting password 2022-10-19 11:36:13 +02:00
Snakes 94e130febd
Fix video filesize check for patrons. 2022-10-18 22:15:57 -04:00
Aevann1 b81eceead5 fix prev commit 2022-10-18 19:25:28 +02:00
Aevann1 8c2a41b868 put telegram link in WPD 2022-10-18 19:16:49 +02:00
Aevann1 df4540d367 sneed 2022-10-18 16:00:03 +00:00
Aevann1 b7ef01d4fc revert the voting thing i did for myself 2022-10-18 17:16:16 +02:00
Aevann1 50fda2356d Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-18 15:58:03 +02:00
Aevann1 3e45e9da67 add a bigger margin between "reply" and "mute" 2022-10-18 15:57:56 +02:00
Snakes 7443ea04e4
WPD: add image-only migration asset. 2022-10-18 08:53:07 -04:00
Aevann1 408cb72baa small css change for patting 2022-10-18 14:51:58 +02:00
Aevann1 e79049d9df Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-18 13:57:03 +02:00
Aevann1 7d6f7c9a5e re-add 2 sidebar images (with less frames) 2022-10-18 13:57:00 +02:00
justcool393 8a8efeaf75 ratelimiting: add 1/second to post ratelimit 2022-10-18 06:51:08 -05:00
justcool393 174bce037f WPD migration: don't include AutoJanny, Snappy, or other bots 2022-10-18 06:42:43 -05:00
Aevann1 d7012e141a replace telegram link with preview version 2022-10-18 13:38:56 +02:00
Snakes 3b185a3844
Fix incorrect site-specific award modal procoins. 2022-10-18 07:34:26 -04:00
justcool393 45e40fe61c WPD: revert partially and add WPD temp stuff (leak host for WPD) 2022-10-18 06:23:59 -05:00
Aevann1 d32341e7b9 add a bottom margin to post embeds 2022-10-18 13:18:06 +02:00
Aevann1 f9841bf049 remove 2 vestigal if statements 2022-10-18 13:17:54 +02:00
Aevann1 465160dbe6 dont include SITE_FULL in post urls 2022-10-18 13:09:53 +02:00
Aevann1 5d550d4c7a redirect to proper host instead of giving an error 2022-10-18 12:56:06 +02:00
Aevann1 cdfece62cf decrease y'all seeing eye's price from 10k to 1k 2022-10-18 12:31:50 +02:00
Aevann1 3e7b37ec35 dont redirect to a repost for chadmins 2022-10-18 12:26:44 +02:00
Aevann1 eff2d35a00 remove telegram chat link 2022-10-18 12:23:22 +02:00
Aevann1 001ff55980 small change to post_rate_limit (cuz it catches failed submissions) 2022-10-18 12:21:10 +02:00
Aevann1 6e65a0c198 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-18 12:20:35 +02:00
Aevann1 3490f3d74d cosmetic change 2022-10-18 12:20:33 +02:00
Aevann1 9e6fe3063f sneed 2022-10-18 08:00:02 +00:00
Snakes 984d8675b5
Fix rainbow award on non-rDrama sites. 2022-10-17 23:10:40 -04:00
Snakes 599cab7365
PCM: temporarily re-enable awards; some cleanup. 2022-10-17 21:55:07 -04:00
justcool393 33c6edba58 import error i think also make graceful 2022-10-17 20:49:13 -05:00
justcool393 1446bf582f user validation logic fix 2022-10-17 20:37:09 -05:00
Snakes efee8b89e7
WPD migration: update to reflect env var fix. 2022-10-17 20:40:09 -04:00
Snakes 1fc7e748e0
Revert "fix error with 500 page" 
This reverts commit 3901b2c379.

Was just debugging code which is now unneeded.
 2022-10-17 20:35:47 -04:00
justcool393 4d0e2013dc g.db fix 2022-10-17 19:28:46 -05:00
justcool393 3901b2c379 fix error with 500 page 2022-10-17 19:16:28 -05:00
justcool393 39545e556f WPD: disable /logged_out on .co, fixing infinite loop 
WPD: fix bad asset link
WPD: redirect on migration login and failed migration login
 2022-10-17 19:11:50 -05:00
Snakes 41fd13602f
Fix broken import in WPD migration. 2022-10-17 19:47:28 -04:00
justcool393 be6fa59e13 fix host bug, do a absolute redirect instead of a relative one, and make wpdco page essentially static 2022-10-17 18:40:09 -05:00
justcool393 96d63ed5de banner text and also rename variable 2022-10-17 18:40:09 -05:00
justcool393 4cb02189cf WPD: request path fixes 2022-10-17 18:40:09 -05:00
justcool393 6d538e2cd3 WPD migration code 2022-10-17 18:40:09 -05:00
justcool393 d07a6cbc08 remove bot mentions 2022-10-17 14:44:44 -05:00
justcool393 95f4f42ed2 syntax 2022-10-17 14:34:23 -05:00
justcool393 30b51135c4 another one 2022-10-17 14:32:47 -05:00
justcool393 edc3b0c84e co to tv 2022-10-17 14:32:05 -05:00
Aevann1 44fca7f086 ripbozo 2022-10-17 21:13:33 +02:00
Aevann1 9358b75027 fix prev commit 2022-10-17 20:22:29 +02:00
Aevann1 e514b86eb6 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-17 20:20:44 +02:00
Aevann1 4a2c5e3392 cosmetic change 2022-10-17 20:20:42 +02:00
justcool393 0e840a4ddb add r/Drama to reddit notifications 2022-10-17 12:46:30 -05:00
Aevann1 80c5ed8428 fix slur filter 2022-10-17 19:18:51 +02:00
Aevann1 bf859b0e3a sneed 2022-10-17 18:58:15 +02:00
Aevann1 24d6a03c14 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-17 18:46:45 +02:00
Aevann1 ae7bc6dd9f change name 2022-10-17 18:46:42 +02:00
justcool393 cc0c767877 static data as one function which is referenced 2022-10-17 05:08:09 -05:00
Aevann1 cbbc0ea2e5 limit size of images in preview 2022-10-17 10:51:22 +02:00
Aevann1 3ee85d524b limit height of bio in popover to 50vh 2022-10-17 10:51:16 +02:00