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

623 Commits (1e76231e935c9e4a19653383b8089219b89785db)

Author SHA1 Message Date
Aevann ef56dd3f71 fix this https://rdrama.net/h/vampire/post/166260/psa-vampire-bites-now-make-people 2023-04-27 16:11:09 +02:00
Aevann 146ee51b05 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4000192#context 2023-04-25 09:26:55 +02:00
Aevann 92bf3f7134 same as last commit 2023-04-25 07:59:53 +02:00
Aevann 57d3badc9f fix this https://rdrama.net/h/changelog/post/165657/changelog-megathread-marseynotes/4042233#context 2023-04-25 07:54:16 +02:00
Aevann d136ae163c fix combined buy btn 2023-04-25 06:47:36 +02:00
Aevann a37fca393d combined buy button for awards and hats 2023-04-24 17:08:40 +02:00
Aevann 064918acd0 fix vamp bug 2023-04-23 04:42:28 +02:00
Aevann 5bc6597188 add 1/1 second ratelimiter for user ids to fix blackjack exploit 2023-04-02 08:52:26 +02:00
Aevann 0ce52ec78a make "marsify" and "chud" mutually exclusive again to prevent cheap ban 2023-04-02 08:17:21 +02:00
Aevann 69e33b671d decrease agendaposter phrase max length to 35 characters 2023-03-24 20:05:32 +02:00
Aevann d956431765 fix this https://rdrama.net/h/meta/post/157653/i-lost-my-house-vampire-founding 2023-03-24 17:22:17 +02:00
Aevann a93c5ed0e5 clearer chud message to chudded user 2023-03-24 13:51:25 +02:00
Aevann ac8fbae3c0 stop marsify and chud award from being mutually exclusive 2023-03-23 15:02:02 +02:00
Aevann 50680e0fa8 cut down on chud award evasion 2023-03-21 23:33:43 +02:00
Aevann d961433fb9 make sure agendaposter_phrase is lower case 2023-03-21 19:54:40 +02:00
Aevann 34744fb741 tell ppl who receive the chud award the phrase they'll have to say 2023-03-21 17:27:46 +02:00
Aevann 95d1b2c9ce add exclamation mark 2023-03-21 16:15:51 +02:00
Aevann 6cb43bb32c reduce max length of agendaposter_phrase to 50 2023-03-21 16:15:43 +02:00
Aevann f1a8db74b7 enforce length limit for chud phrase in the backend 2023-03-19 20:17:44 +02:00
Aevann 60e9175a63 make chud phrase lowercase 2023-03-19 19:28:07 +02:00
Aevann b004617695 customizable chud phrases 2023-03-19 19:13:45 +02:00
Aevann ab93c94bfc add IGNORE_AWARD_IMMUNITY perm 2023-03-18 18:11:25 +02:00
Aevann 95a0edf070 disable "GIVE AWARD" button on carp and pizzashill 2023-03-18 18:10:14 +02:00
Aevann 57765f0776 revert sqlalchemy changes 2023-03-16 08:27:58 +02:00
Aevann f768d81103 keep db sessions open 2023-03-15 05:58:00 +02:00
Aevann 904c2ab764 fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3771814#context 2023-03-12 17:02:25 +02:00
Aevann 1a200a975f redirect /shop to /shop/awards 2023-03-10 22:27:36 +02:00
Aevann b3f75b9beb always use author_name even if its not needed for consistency 2023-03-01 21:28:10 +02:00
Aevann 1769c762b0 support multiline award notes 2023-02-27 20:17:33 +02:00
Aevann 17bb6dad48 blackjack fix exploit 2023-02-27 07:33:45 +02:00
Aevann fe0b8887bc change 1/second ratelimit to 1/2 second 2023-02-26 12:26:26 +02:00
Aevann 82a73392a9 fix errors 2023-02-26 10:49:09 +02:00
Aevann 8c495c914a default ratelimit doesnt apply implicitly if theres other @limiter.limit before the function, so add it explicity before all functions 2023-02-26 10:41:04 +02:00
Aevann 4c35f0b07f remove unnecessary line 2023-02-26 08:35:59 +02:00
Aevann 7aaeedea36 better ratelimiting 2023-02-26 03:42:39 +02:00
Aevann 03a82a0d4f delete code irrelevant now 2023-02-23 15:04:33 +02:00
Aevann cb9ffefb7f rename /shop to /shop/awards and /hats to /shop/hats 2023-02-19 11:34:10 +02:00
Aevann 1754eeffe2 add a link to the post/comment in the grass ban reason 2023-02-19 00:44:16 +02:00
Aevann 5d0c3742b0 change the grass award message to be clearer 2023-02-19 00:43:51 +02:00
Aevann 95938ee3ec make sure all comment links have #context 2023-02-07 04:34:11 +02:00
Aevann 349fa17836 use exlamation marks instead of dots in responses to users 2023-01-27 13:57:29 +02:00
Aevann dc16683e18 use a set instead :marseyautism: 2023-01-25 07:03:30 +02:00
Aevann 569d76ab38 respect the dead 2023-01-25 07:02:57 +02:00
Aevann 24edb49f3b add jl5 (for me) 2023-01-22 10:04:49 +02:00
Aevann a40dee5bd8 improve user ratelimiting 2023-01-21 06:39:46 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann 8df7c59649 fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3333157#context 2023-01-01 11:02:39 +02:00
Aevann db6db63836 change event structure 2023-01-01 07:33:09 +02:00
Aevann 03fb84e618 fix HOLIDAY_EVENT check 2023-01-01 04:50:11 +02:00
Aevann 78351abc4c clean up legacy stuff 2023-01-01 03:17:07 +02:00
Aevann 8ee189022b seething hatred 2022-12-30 21:01:47 +02:00
Aevann c4872ecb07 Revert "attempt to fix ratelimiting user" 
This reverts commit 99597fc36c.
 2022-12-30 20:43:13 +02:00
Aevann 99597fc36c attempt to fix ratelimiting user 2022-12-30 20:40:58 +02:00
Aevann 9a8c986f93 attempt to fix ratelimiting user 2022-12-30 20:33:07 +02:00
Aevann 909e3f5f29 use a cool flask feature i didnt know about 2022-12-29 12:39:10 +02:00
Aevann 54b49d374c minor fix 2022-12-27 07:37:21 +02:00
Aevann d607e57c92 fixes 2022-12-27 06:24:25 +02:00
Aevann fc95e3741f fix this https://stupidpol.site/h/meta/post/134631/im-too-lazy-to-test-so/3311192#context 2022-12-27 06:08:45 +02:00
Aevann 0299a287ed Revert "remove #context in links" 
This reverts commit 169dc4ebef.
 2022-12-24 21:19:47 +02:00
Aevann a63b02470d use sets with in statements 2022-12-24 00:22:41 +02:00
Aevann 2ad04d472c stack benefactor awards 2022-12-23 02:44:52 +02:00
Aevann1 e6b7b23605 fix 500 error for chud award on profile wall 2022-12-22 17:19:31 +02:00
Aevann1 169dc4ebef remove #context in links 2022-12-20 05:05:13 +02:00
Aevann1 a7d9d2ed6a make event_music become False when receiving grinch award 2022-12-20 04:07:37 +02:00
Aevann1 373a6cf0db add grinch 2022-12-20 03:13:34 +02:00
Aevann1 29fa5bcf4d add lootboxes 2022-12-19 19:12:07 +02:00
Aevann1 481d0d7c6a remove carp award immunity 2022-12-19 16:43:52 +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
Aevann1 6cde4a040c make ?context=8 default 2022-12-18 16:48:48 +02:00
Aevann1 10dc8a37ac better ban_reason when using ban award 2022-12-14 22:37:47 +02:00
Aevann1 c491b5deb2 disable shit award 15 coins 2022-12-14 16:03:18 +02:00
Aevann1 c10c00473a make is_banned fkey on user id 2022-12-14 00:02:53 +02:00
Aevann1 6ad67b97c3 reduce all-seeing eye price to 5k 2022-12-13 21:51:07 +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 49ac549651 disallow ppl giving chud award in /h/chudrama 2022-12-11 18:22:44 +02:00
Aevann1 b5b3b9dcc3 fix pin awards 2022-12-05 18:01:13 +02:00
Aevann1 af3b028ca5 add links to individuals comments in walls + fix awards for wall comments 2022-12-05 05:01:50 +02:00
Aevann1 da643ea88b sneed 2022-12-04 21:30:33 +02:00
geese_suck a3fa96242c holiday event manager (actually works now edition) (#22) 
Co-authored-by: Snakes <duolsm@outlook.com>
Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#22
Co-authored-by: geese_suck <deandre.williams@geese-suck.us>
Co-committed-by: geese_suck <deandre.williams@geese-suck.us>
 2022-11-29 20:20:26 +00:00
justcool393 0ff034b01b add typing to a bunch of routes 2022-11-26 15:00:16 -06:00
Aevann1 5e2f449df7 fix prev commit lol 2022-11-26 01:52:39 +02:00
Aevann1 c470cb7516 make shit award not give DC 2022-11-26 01:50:25 +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 0c9ed95c55 allow me and sneks to award carp and pizzashill 2022-11-21 03:12:01 +02:00
Snakes db329f487f
User.pay_account everywhere, fix lottery payout. 2022-11-20 05:50:02 -05:00
justcool393 022a81a4b9 remove unnecessary feature_required flags, moving them to the routes import 2022-11-15 05:37:53 -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 41ab1f313c move feature_required wrappers up 2022-11-14 18:14:47 +02:00
Snakes d3f25739f0 Fix ratelimit_user on 3 routes, make proper dec. 2022-11-13 07:25:57 -05:00
Snakes 8fee66c894
Reorder decorators to support f63237a9a2. 
Ultimately necessary because otherwise all bots share rate limits
with each other. The somewhat haphazard ordering of decorators bothers
me, but it's functionally required.

Approaches using request context (like reading the Authorization
header in ratelimit_user) likely produce bugs all their own.
 2022-11-13 05:18:52 -05:00
justcool393 aa272729f1 default ratelimit and default ratelimit slower 2022-11-13 00:43:47 -06:00
justcool393 1e25421ac9 fixed deduplication and changed to 30/minute per @TLSM 2022-11-13 00:20:19 -06:00
justcool393 80d7d5281d ratelimit_user() wrapper 2022-11-13 00:07:15 -06:00
justcool393 1d063e39ab awards: move sb check to be earlier to avoid a query in rare cases 2022-11-12 04:33:47 -06:00
justcool393 1608b3168a awards: don't allow users to award messages 2022-11-12 04:29:07 -06:00
justcool393 e3cd6c73f5 use the name styling the @Aevann1 likes 2022-11-12 04:24:08 -06:00
justcool393 c4c4076560 spider: fix bug that would instantly eat a spider award if someone was permanently spidered 2022-11-12 04:21:17 -06:00
Aevann1 a9188f5dac "This user" -> "@username" 2022-11-12 12:08:43 +02:00
Aevann1 1b162fb049 prevent ppl from wasting their progressive stack on boosted users 2022-11-12 12:07:58 +02:00
Aevann1 05b7e79b76 remove the code i added for rdrama.com 2022-11-11 15:52:18 +02:00
Snakes 8ab77eb0ee Disable non-cosmetic awards on ghost posts. 
Per poll result: https://rdrama.net/post/79285/-/3049889
Permits cosmetics and pin/unpin to be used; disables all others.
 2022-11-09 18:07:23 -05:00
Aevann1 282762bef8 increase vamp award duration from 1 day to 2 days (but dont advertise that this time) 2022-11-09 21:09:38 +02:00
Aevann1 471147080f make award message better 2022-11-05 05:56:01 +02:00
justcool393 a84c6b6b24 fix text 2022-11-04 21:30:33 -05:00
justcool393 0943ee064c rename is_cosmetic to cosmetic 2022-11-04 21:22:30 -05:00
justcool393 81ed8cfc81 awards: make cosmetic awards give 10% of the price to the recipient 2022-11-04 21:16:23 -05:00
Aevann1 07a12380de accomodate alt domain 2022-11-03 17:29:14 +02:00
Aevann1 f73c6d46df accomodate rdrama.com users 2022-11-02 08:31:04 +02:00
Aevann1 111c9ab208 fix this https://rdrama.life/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3007141?context=8#context 2022-11-02 05:22:16 +02:00
justcool393 6caebac946 actions: move user-only actions to useractions, which gets rid of a circular dependency 2022-11-01 18:46:56 -05:00
justcool393 651cd60aa2 marsify: make marsify awards last a day 2022-11-01 15:33:00 -05:00
justcool393 6d636e4e42 use charge_account everywhere 2022-11-01 00:25:19 -05:00
justcool393 769f20852b features: use AWARDS feature for awarding, not badges 2022-10-31 23:53:27 -05:00
Aevann1 e7e667f56f fix undeflectable awards being vaporized 2022-11-01 02:11:44 +02:00
Aevann1 1032a3193f fix bug with deflection 2022-10-30 23:27:53 +02:00
Aevann1 ea2bd29a47 fix d9ef62b9c6 2022-10-30 00:16:58 +02:00
Aevann1 3bd8384c05 fix stray space 2022-10-29 23:37:01 +02:00
Aevann1 d9ef62b9c6 prevent ppl from wasting their chud awards 2022-10-29 23:34:40 +02:00
Aevann1 5230e8e7f8 remove code that excluded me from deflector effect 2022-10-29 22:19:50 +02:00
justcool393 548f2613c7 pinprovements 2022-10-25 17:48:10 -05:00
justcool393 dbb7296dd7 stickies: allow JL2 to sticky post 
stickies: unpin on removal
stickies: don't allow removed posts to be stickied
 2022-10-23 17:17:49 -05:00
justcool393 0a9e7b3ef4 lawlzposts: don't allow unpin awards 
lawlzposts: disable if pins feature flag is off
 2022-10-23 12:14:27 -05:00
Snakes 984d8675b5
Fix rainbow award on non-rDrama sites. 2022-10-17 23:10:40 -04:00
justcool393 aa508fc076 remove discord 2022-10-16 05:42:52 -07:00
Aevann1 77312317f3 get rid of Boolean columns for permenant awards 2022-10-14 18:59:49 +02:00
justcool393 c67406b84b use site specific patron name 2022-10-12 03:45:45 -07:00
justcool393 71759e6afa 400 -> 409 2022-10-11 09:55:24 -07:00
justcool393 c0acb1722b abort a bunch of stuff where we manually returned JSON 2022-10-11 08:40:19 -07:00
justcool393 456dd43bba replace "if not FEATURES" with wrapper 2022-10-11 00:33:23 -07:00
justcool393 75e593da00 Revert "feature required wrapper" 
This reverts commit 8700bcc5ee.
 2022-10-10 02:54:47 -07:00
justcool393 8700bcc5ee feature required wrapper 2022-10-09 23:16:05 -07:00
Aevann1 472aedb14e remove log items generated by awards for JL3 (since they cant print anymore) 2022-10-10 06:40:48 +02:00
Snakes f4a722d151
Fix lootbox purchasing identifier conflict. 2022-10-07 17:01:29 -04:00
Aevann1 b608a514e4 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-07 05:25:37 +02:00
Aevann1 2d2a35d7ca make giving awards not refresh the page 2022-10-07 05:25:34 +02:00
justcool393 f5996afc5a add some perm requirements and add agendaposter thing 2022-10-05 20:04:38 -07:00
justcool393 970a7adfbd buy ghost award permission 2022-10-05 19:57:31 -07:00
justcool393 2fc3044d5b shadowban perms and stuff 2022-10-05 19:24:37 -07:00
justcool393 d5a48871f8 user ban and also fix global hole mod a bit i hope i didn't screw up the templates 2022-10-05 18:58:43 -07:00
Aevann1 3cd21e8899 got rid of printi awards 2022-10-05 23:23:00 +02:00
justcool393 78b668a870 don't duplicate checks for users 2022-09-30 15:51:17 -07:00
justcool393 057bc360bf don't duplicate get checks for posts 2022-09-30 15:51:17 -07:00
justcool393 7e3f43c9ab
unperson shadowbanned users (#373) 
* unperson shadowbanned users
if a shadowbanned user copes, does anyone hear them seethe?

* unperson shadowbanned users (by id)

* don't import that

* Add include_blocks.
We don't always want to request blocks from the db when we have a user set

* block shadowbanned users from hole mod tools

* don't allow awarding shadowbanned things

* fix conflict

* gracefully use get_account when specified and also add include_blocks flag to get_account as well
 2022-09-30 14:00:58 -07:00
Aevann1 51d7cd6d7e fix shit with hole logs 2022-09-29 12:18:27 +02:00
Snakes 0b416dcf2c
Revise marsify logic. 2022-09-26 02:09:26 -04:00
Snakes aea590dda1
Fix syntax error in 8b722f2075. 2022-09-24 19:39:30 -04:00
justcool393 8b722f2075
don't leak usernames with deflectors (#372) 
cope marsey xd
 2022-09-24 19:34:33 -04:00
Aevann1 f9d1df54bf make pin and unpin award work on a basic of 6 hours (unlike posts which is 1 hour) 2022-09-23 16:41:56 +02:00
Aevann1 8a8a67a059 remove ban_evade logic 2022-09-22 21:40:14 +02:00
Aevann1 d22d60b5f7 fix typos 2022-09-22 01:52:39 +02:00