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

802 Commits (759c90fdf8f23ca31fe7191d5122dc4463d3a90b)

Author SHA1 Message Date
Aevann 7367043cdd trim too long visitor text 2023-04-26 08:52:26 +02:00
Aevann e3834f3fe3 fix logo url 2023-04-25 18:37:39 +02:00
Aevann 4e81325cb7 fix flavor text 2023-04-25 18:24:13 +02:00
Aevann 93422e2be9 cache-bust all 2023-04-25 18:24:12 +02:00
Aevann 28d74b5c7d make event folder 2023-04-25 17:47:46 +02:00
Aevann 16766981bc DKD 2023-04-25 16:34:09 +02:00
Aevann a5d7cc63ed cachebust all assets 2023-03-21 15:58:14 +02:00
Aevann df1ebf7cad use SITE_FULL_IMAGES in more places 2023-03-19 18:30:22 +02:00
Aevann 884d450746 remove weird visitor flavor 2023-03-17 09:18:55 +02:00
Aevann 17bc4243bf restore old donate button for loggedout cels 2023-03-12 10:47:13 +02:00
Aevann 6489d2140c add forgotten class 2023-03-12 10:36:59 +02:00
Aevann 2c2edabf5c only show visitor count to users with >1000 TS 2023-03-12 01:07:35 +02:00
Aevann 16e02832f4 fix donate btn on mobile 2023-03-11 23:32:29 +02:00
Aevann 1d6f901725 fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3763160#context 2023-03-11 14:54:32 +02:00
Aevann 03c0f5c31c restore two removed donate buttons and add donate-link class 2023-03-11 08:45:14 +02:00
Aevann 90e2fe8469 fix this https://stupidpol.site/h/changelog/post/153683/did-this/3759380#context 2023-03-10 23:43:48 +02:00
Aevann dcdf24d95d make donate button look better 2023-03-10 23:17:35 +02:00
Aevann f3541dec54 fix prev commit 2023-03-10 23:05:35 +02:00
Aevann 5bbb95968e only show it to non-paypigs 2023-03-10 23:03:16 +02:00
Aevann 341035896c do this https://stupidpol.site/post/153615/the-badmins-told-me-that-paypigs/3758089#context 2023-03-10 23:02:13 +02:00
Aevann 9f66e33061 Revert "convert IS_FISTMAS and IS_HOMOWEEN from functions to variables" 
This reverts commit b45d845630.
 2023-03-08 08:51:40 +02:00
Aevann b45d845630 convert IS_FISTMAS and IS_HOMOWEEN from functions to variables 2023-03-08 08:10:18 +02:00
Aevann 611cf4ba95 merge header.css into main.css 2023-02-24 05:50:40 +02:00
Aevann 59c2c169e4 remove refresh button for applenigs 2023-02-19 23:26:08 +02:00
Aevann 338033df2b use href attribute for refreshing instead of js 2023-02-19 14:22:19 +02:00
Aevann cb9ffefb7f rename /shop to /shop/awards and /hats to /shop/hats 2023-02-19 11:34:10 +02:00
Aevann 7c01b13adf add margins to searchbar in mobile dropdown 2023-02-18 20:49:07 +02:00
Aevann 52907b4a2e remove UI animations 2023-02-17 19:11:23 +02:00
mummified-corroding-granny 0c670299c0 chat: update header chat count on websocket update message (#122) 
Kindly,

Just a small lil PR to make sure the chat counts keep synchronized in /chat as users come and go

Thanks,
granny

Reviewed-on: rDrama/rDrama#122
Co-authored-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
Co-committed-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
 2023-02-16 13:41:43 +00:00
Aevann a9ce706ff6 minor css fix 2023-02-06 08:05:37 +02:00
Aevann 12f6da902d add https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3492541#context 2023-01-28 12:43:07 +02:00
Aevann 1e30acc5a8 make all images have loading="lazy" 2023-01-27 19:55:25 +02:00
Aevann d8634af3f1 change settings link to /settings/personal to avoid unnecessary redirecting 2023-01-27 13:49:15 +02:00
Aevann d7004abaac fix users online in chat 2023-01-24 12:13:05 +02:00
Aevann 7e47c0b9cc fix /log_out 2023-01-24 12:02:08 +02:00
Aevann ca3bbaf209 add bottom margin to "Users Online" 2023-01-23 03:18:33 +02:00
Aevann f2fdefa8cd chat overhaul 2023-01-21 12:36:21 +02:00
Aevann 28e4d4be14 remove cause of posts going to the wrong hole 2023-01-20 23:49:29 +02:00
Aevann 5235d0f31f remove all aria attributes 2023-01-20 09:10:54 +02:00
Aevann 75bf0fca91 what the fuck 2023-01-01 15:01:24 +02:00
Aevann 24a30b912b fix WPD icon 2023-01-01 13:46:31 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann 8a1343e739 Revert "remove all accessibility attributes" 
This reverts commit e3a8fe85e3.
 2023-01-01 13:12:35 +02:00
Aevann e3a8fe85e3 remove all accessibility attributes 2023-01-01 13:05:39 +02:00
Aevann 6ed5a03a66 fix searchbar alignment 2023-01-01 12:57:21 +02:00
Aevann e30d3649f1 setting fixes 2023-01-01 11:42:23 +02:00
Aevann 802ce75b2d minor css fixes 2023-01-01 07:55:16 +02:00
Aevann db6db63836 change event structure 2023-01-01 07:33:09 +02:00
Aevann f65f714b94 fix reload_page btn 2023-01-01 04:53:35 +02:00
Aevann 03fb84e618 fix HOLIDAY_EVENT check 2023-01-01 04:50:11 +02:00
Aevann 5f2568a06b fix extra } 2022-12-30 20:00:12 +02:00
Aevann c17b18b21f minor cosmetic fix 2022-12-30 19:15:50 +02:00
Aevann f0b20cad55 the worst fucking code you'll ever see 2022-12-30 14:14:18 +02:00
Aevann 76cc5d2354 change "App" to "Mobile app" 2022-12-30 05:31:18 +02:00
Aevann 93e9a42fa3 stop using inline style/script elements 2022-12-29 16:20:27 +02:00
Aevann 6114111654 tighten CSP 2022-12-27 03:22:39 +02:00
Aevann 205ca3dc6f same as last commit 2022-12-25 22:41:36 +02:00
Aevann f255a6d8c8 move more env vars to const.py 2022-12-25 05:28:57 +02:00
Aevann 070a22d02e remove accessiblity shit 2022-12-25 04:10:56 +02:00
Aevann 0a1effeaf7 dedup sidebars 2022-12-25 00:59:43 +02:00
Aevann ecfcbaf3df make hat_active return a tuple 2022-12-25 00:21:49 +02:00
Aevann1 3ae5292ce4 remove pcm from code 2022-12-21 14:42:41 +02:00
Aevann1 98afe7d2c3 don't use linux symlinks so the site works in windows 2022-12-19 19:12:05 +02:00
geese_suck 1574b4da63 fistmas (#79) 
Co-authored-by: justcool393 <justcool393@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Co-authored-by: Nekobit Bitneko <me@ow.nekobit.net>
Reviewed-on: rDrama/rDrama#79
Co-authored-by: geese_suck <deandre.williams@geese-suck.us>
Co-committed-by: geese_suck <deandre.williams@geese-suck.us>
 2022-12-19 01:20:14 +00:00
Snakes 7778e6078d
WPD: temporary Christmas header logo swap. 2022-12-11 17:53:43 -05:00
Snakes f366504bdd
WPD: temporary Christmas headericon swap. 2022-12-11 17:22:48 -05:00
Aevann1 485698e53e remove chat icon i added on the top on mobile 2022-12-09 08:00:32 +02:00
Aevann1 082d56788d move random user button on mobile and replace it with chat button under certain circumstances 2022-12-08 14:15:21 +02:00
Aevann1 fee6e7150b same as last commit 2022-12-07 11:03:02 +02:00
Aevann1 bae24fe92e add reload button to ioscels 2022-12-05 01:22:22 +02:00
Aevann 3eecec0a51 downloadable videos on apple devices (#42) 
![image](/attachments/bd1b3e1e-c0a9-4eee-9b1c-a03e1e8a8cbd)

Co-authored-by: Aevann1 <randomname42029@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Co-authored-by: Snakes <snakes@noreply.fsdfsd.net>
Reviewed-on: rDrama/rDrama#42
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-04 19:02:22 +00:00
Aevann1 49263fdd86 Revert "stop using background css property and use its parts instead" 
This reverts commit e4e67a4424.
 2022-12-04 00:17:35 +02:00
Aevann1 e4e67a4424 stop using background css property and use its parts instead 2022-12-04 00:11:02 +02:00
Aevann1 ecc32382b2 Revert "https://www.youtube.com/watch?v=_904EvOUQ_M" 
This reverts commit 6d0277adc8.
 2022-12-02 00:37:50 +02:00
Aevann1 6d0277adc8 https://www.youtube.com/watch?v=_904EvOUQ_M 2022-12-01 19:07:14 +02:00
justcool393 fe55c2383c fix 500 on 500 2022-12-01 10:10:05 -06:00
Aevann1 48ba0bfa98 fix hole names in header 2022-12-01 14:28:35 +02:00
Aevann1 836d3bfd98 include v in errors if possible 2022-11-30 15:21:12 +02:00
Aevann1 2561fc4c4e fix prev commit 2022-11-30 13:24:51 +02:00
Aevann1 4f1c016fc3 fix long hole names in header 2022-11-30 13:24:03 +02:00
justcool393 11059d1665 move calc users to context processor (#31) 
jinja more like i can't think of anything witty

Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#31
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-11-29 23:50:32 +00:00
Aevann1 cf8ffac192 grammar ocd 2022-11-30 00:42:01 +02:00
justcool393 5056f09380 chat: fix 500 on some... weird... state... i think? 
cache: get out of jinja templates
chat: threshold is now a const
 2022-11-29 15:49:23 -06:00
Aevann1 c68cb400b9 Revert "fix /h/femaledatingstrategy being too big in the header" 
This reverts commit 3c3cd8f873.
 2022-11-29 04:05:58 +02:00
Aevann1 5994ec7729 same ast last commit 2022-11-29 00:20:18 +02:00
Aevann1 3c3cd8f873 fix /h/femaledatingstrategy being too big in the header 2022-11-29 00:15:39 +02:00
Aevann1 323061bc86 add missing space 2022-11-28 06:43:15 +02:00
Snakes 654da03435
De-Githubify repo. 
- Remove Github-specific tooling.
 - Add fsdfsd.net to approved embed hosts.
 - Switch link in navigation menu.
 2022-11-23 12:24:13 -05:00
Aevann1 9e89166e2f restore reload icon for legacy app users 2022-11-22 23:34:33 +02:00
justcool393 272e2ee936
sneed (rename procoins to marseybux) (#472) 
* sneed (rename procoins to marseybux)

* literally unusable

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 18:08:29 -05:00
Aevann1 eb83389530 fix mobile app icon 2022-11-20 00:46:19 +02:00
Aevann1 5288d7a7dc remove android app and replace with instructions on how to install PWA 2022-11-20 00:04:08 +02:00
Aevann1 44aa666a4d fix improper redirect URLs 2022-11-19 23:33:59 +02:00
Aevann1 d2ac8348dc update app to v2.8 2022-11-19 23:18:25 +02:00
Aevann1 fe154554c6 make sure all /login and /signup link have redirect 2022-11-18 22:13:06 +02:00
Snakes 7feddc42f0 Unify template helpers and macros, fix header. 
The need for sidebars to have access to macros.random_image means
all templates that include header.html (most templates) need to have
access to `macros`, because header.html includes sidebar_{SITE_NAME}.

Because of how sparse helpers was, we instead unify the two and
replace it since I know we had helpers in every top-level template.
 2022-11-16 12:07:23 -05:00
justcool393 3d7737387c use default config vlaue const everywhere 2022-11-15 10:55:00 -06: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
Aevann1 dc23016f17 fix capitlization 2022-11-14 07:49:23 +02:00
Aevann1 983e8b21d1 update android app 2022-11-12 19:56:54 +02:00
Aevann1 eca45ecf16 update app url 2022-11-12 16:47:12 +02:00
Aevann1 bac4745164 remove repeated ":not" from the css 2022-11-11 16:06:28 +02:00
Aevann1 208a5829bd make pcm circle appear to poorcels 2022-11-11 16:03:21 +02:00
gooseman 739ea81ca2 Update header.html 2022-11-09 13:13:26 -08:00
gooseman 0c48d4c7e2 hide duplicate buttons in tablet mode 2022-11-09 12:29:04 -08:00
Aevann1 380e91e9c4 remove chat stuff not used anymore 2022-11-09 21:06:43 +02:00
justcool393 26549a6e66
remove logged out routes (#433) 
* remove /logged_out/ routes

* update sitemap, remove users route, and update header

* cloudflare cookie

* only mess with the cookie whenever we desire auth

* sitemap: (small) improvements
sitemap: fix little bug i introduced
sitemap: fix login redirects for /id/ routes

* sitemap: remove duplicate entry

* contact is auth desired

* imports: don't import what we don't need and bind late to the db

* praying to god this works

* keep yourself safe

* oh i actually need to commit and push lol

* import Sub

* t

* refix cache purger
 2022-11-09 00:35:24 -05:00
Aevann1 d76fe63c7f constantify image extensions and fix imgur .gif bug 2022-11-05 23:01:23 +02:00
Aevann1 995d3cbc98 add postToastReload 2022-11-04 23:44:44 +02:00
Aevann1 40a6ed5155 add the subsidiary to the random blurbs 2022-11-04 20:30:56 +02:00
Aevann1 d4a99c05e9 rename postToast -> postToastSwitch and postToastCallback -> postToast for clarity 2022-11-03 21:08:22 +02:00
Aevann1 410575a02f make the subsidary blurp occur 100% of the time instead of 50% 2022-11-01 22:18:16 +02:00
Aevann1 aec5f96a7b changes to donation flow 2022-10-30 20:43:06 +02:00
Aevann1 2ba1a1e86e remove postToast compatability function 2022-10-30 17:10:07 +02:00
Aevann1 23883c530b constantify TRUESCORE_DONATE_LIMIT 2022-10-30 16:18:42 +02:00
justcool393 ef4fc4dd99 remove redundant noreferrer tags 
note: skipping on 502.html file as those are served by nginx
 2022-10-29 16:46:22 -05:00
Aevann1 06314f92b1 remove referrer from html tags 2022-10-29 23:42:30 +02:00
Aevann1 6451572139 remove refererrs from profile images 2022-10-29 23:16:43 +02:00
Aevann1 de8be8dd0e get rid of <pre> being used as vertical spacing 2022-10-29 02:47:48 +02:00
Aevann1 fdd608532b add type="button" to all <button> tags 2022-10-29 01:35:14 +02:00
Aevann1 5eb2eb5035 remove role="button" from all <a> tags 2022-10-29 01:32:31 +02:00
Aevann1 2019f68217 same as last commit 2022-10-29 01:31:39 +02:00
Aevann1 582a29232b convert all <a> tags without a href, except 2 in award_modal.html 2022-10-29 01:27:38 +02:00
Aevann1 a33680dc22 convert more <a> tags to <button> tags 2022-10-29 01:09:06 +02:00
Aevann1 b9d7b4e027 sneed 2022-10-26 16:33:50 +02:00
Aevann1 b563b7af30 stop using "d-none d-md-block" 2022-10-23 19:57:38 +02:00
Aevann1 e4fb158125 update the WPD app 2022-10-19 23:42:27 +02: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 d7012e141a replace telegram link with preview version 2022-10-18 13:38:56 +02:00
Aevann1 eff2d35a00 remove telegram chat link 2022-10-18 12:23:22 +02:00
Aevann1 bf859b0e3a sneed 2022-10-17 18:58:15 +02:00
Aevann1 3150714c2e only calc_users when we need to show them 2022-10-16 19:08:38 +02:00
justcool393 aa508fc076 remove discord 2022-10-16 05:42:52 -07:00
Aevann1 c24851dbb3 only calculate users when we actually need them 2022-10-15 09:31:24 +02:00
Aevann1 998b966f2b remove unnecessary shit in wrappers 2022-10-11 15:19:55 +02:00
Aevann1 83aa914865 more consistency in templates 2022-10-10 07:23:02 +02:00
Aevann1 a20f5723bf make sure all external urls have rel="nofollow noopener noreferrer" 2022-10-10 07:22:18 +02:00
Snakes 7ea61f423d
PCM: disable gambling; extend FEATURES['GAMBLING']. 2022-10-07 20:31:46 -04:00
justcool393 e372158729
Merge branch 'frost' into permissions-refactor 2022-10-06 19:05:42 -07:00
Aevann1 4d15d76dfa show the earlylife parantheses in more places 2022-10-07 01:31:09 +02:00
justcool393 98397e7d3f admin home and user last active viewing 2022-10-05 23:27:34 -07:00
Snakes 7f81f62bb3
Amend ebf83687948: that was r-slurred. 2022-10-05 23:17:09 -04:00
Snakes ebf8368794
WPD: fix mobile header logo sizing. 2022-10-05 23:11:59 -04:00
Snakes a3664e252c
assetcache: change asset_siteimg macro to filter. 2022-09-24 03:14:20 -04:00
Aevann1 227810dec9 add /live icon 2022-09-22 06:34:16 +02:00
Aevann1 88137c848e make it easier to change notif colors with custom css 2022-09-22 01:22:59 +02:00
Aevann1 97dc727e22 cachebust 2022-09-20 23:22:58 +02:00
Aevann1 696423d174 add /donate page 2022-09-20 01:59:24 +02:00
Aevann1 bb28d2d2a3 delete /order 2022-09-19 19:13:24 +02:00