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

682 Commits (25198a845e7c354d09d367db83c7ffbb8867030f)

Author SHA1 Message Date
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
Aevann1 67d1b05d14 fix header image 2022-09-17 16:45:46 +02:00
Aevann1 65d396a499 kofi 2022-09-14 10:28:01 +02:00
outruncolors 3ebccf35d1
Add order page (#353) 
* Add order page route

* Initial backend post route

* Move to static and prevent logged in users

* Update files/routes/static.py

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>

* Make requested changes

* Last snake changes

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-13 21:21:25 -05:00
Aevann1 df2de5f087 rearrange 2022-09-13 21:44:06 +02:00
Aevann1 39dfd05a27 move "donate" up 2022-09-13 12:31:26 +02:00
Aevann1 2e31b52366 for consistency's sake, don't use {sub.name} inside strings anymore 2022-09-12 07:25:04 +02:00
Aevann1 41dac65e9c fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2702071?context=8#context 2022-09-12 07:05:11 +02:00
Aevann1 bd7c0e71bf forgot to cachebust 2022-09-10 11:34:48 +02:00
Aevann1 770e818d67 add telegram links 2022-09-10 05:52:56 +02:00
Aevann1 4791e7b14b revert icon change 2022-09-08 19:24:00 +02:00
Aevann1 f4e4ff3839 comsetic shit 2022-09-08 17:38:27 +02:00
Aevann1 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 34c6842018 make the tooltip be "hat - description" 2022-09-05 05:55:41 +02:00
Aevann1 970cf6dccd update Sparkles and Emo Hair II 2022-09-05 03:58:05 +02:00
Aevann1 1242a2d009 change casino icon and more cachebusting 2022-09-05 02:10:44 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
outruncolors 5e1d98a3bf
WIP: Add Casino (Do Not Merge) (#341) 
* Add new /casino route and template

* Consolidate lottery into casino and add initial template for slots

* Change /lottery route to /casino and replace icon with usd symbol and change sitewide const to reflect change

* Hook up new slots method to casino

* Enable Marseybux spending in casino slots

* Add UI for playing blackjack in casino

* First connection of blackjack UI to backend

* Add protective clause thanks to help from carpathianflorist.

* Create new Casino_Game relation and persist inside of blackjack

* Connect new slots behavior to Casino_Game table

* Create UI action management logic

* Add blackjack game status checker which adds persistence for blackjack

* Gonna handle this better, hold on

* Reorganize blackjack helper methods

* Reorganize casino.js to account for new changes

* Connect up to frontend

* Little changes ya know

* Display a message when winning in Blackjack

* Fix some issues with double down and insure

* Revert "remove owoify-py from requirements"

This reverts commit 4454648ea2.

* A little casino styling change

* Reorganize into a casino block

* Smallenize the card'

* Remove references to old game data on comments

* Add sql migration file

* Remove logic to drop old columns

* Fix two forgotten conflicts
 2022-09-04 22:53:34 +02:00
Aevann1 7a3a1a883c update nervous sweating hat 2022-09-04 20:59:50 +02:00
Aevann1 d9a9d6bd0e /hats never reloads now, don't read code if u value ur sanity 2022-09-03 22:45:06 +02:00