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

527 Commits (92f0154e670a33bcb978b5cac2d75f9cd59854a1)

Author SHA1 Message Date
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
Aevann1 eb12464d43 make award immunity only in rdrama 2022-09-22 00:30:12 +02:00
Aevann1 955cee3f83 revise award immunity 2022-09-22 00:28:58 +02:00
Aevann1 201208e673 make deflector not stack 2022-09-22 00:28:35 +02:00
Aevann1 f17bce610d make chud award generate a mod log item when used by JL3 2022-09-21 22:55:34 +02:00
Aevann1 302a852de3 make carp immune to awards 2022-09-21 22:38:59 +02:00
Aevann1 61739b765e made spider award not give any notifs 2022-09-21 22:27:12 +02:00
Aevann1 f79d65973c fix 500 error on granting awards 2022-09-21 20:53:42 +02:00
Aevann1 272e39ebf2 add spider award 2022-09-20 19:52:52 +02:00
Aevann1 2026a1a9c7 restore the 10 award limit for me 2022-09-19 19:10:52 +02:00
Aevann1 e5da38d19c change bite award back to 24 hrs 2022-09-18 23:25:58 +02:00
justcool393 50f60a5b5c
don't allow flairlocks on ghost posts (#358) 
flairlocks can expose ghosts
 2022-09-18 02:09:01 +02:00
Aevann1 2c33b09bbc add vaporizing 2022-09-16 22:39:19 +02:00
Aevann1 2fb4ebdcb0 minor sanitize refactor 2022-09-16 18:30:34 +02:00
Aevann1 e19b2caf7d make marsify award get deflected 2022-09-16 15:18:19 +02:00
Snakes f1153031cc
Apply double-spend fix to hats. 2022-09-16 04:58:12 -04:00
Snakes 54cae4b570
Fix shop double-spend exploit. 2022-09-16 04:43:55 -04:00
Aevann1 9f231e096f award printing change in WPD 2022-09-16 10:41:30 +02:00
Aevann1 4abf75edc0 add error codes 2022-09-12 11:52:07 +02:00
Aevann1 cc0f2059c3 more descriptive success messages 2022-09-12 07:23:08 +02:00
Aevann1 fbe7089d2a more detailed success message description 2022-09-11 16:32:00 +02:00
Aevann1 021c74aaa5 nerf vamp award again 2022-09-10 02:31:45 +02:00
Aevann1 77128f54f8 adjust bite award logic 2022-09-09 08:49:05 +02:00
Aevann1 485c30ec3c relax ratelimit on buying awards 2022-09-08 21:14:02 +02:00
Aevann1 4d3a76f686 vamp award adjust 2022-09-08 17:46:01 +02:00
Aevann1 9475aa27e4 award badges shit 2022-09-07 05:31:55 +02:00
Aevann1 043a235082 buff vamp house award again 2022-09-07 00:35:05 +02:00
Aevann1 71f3a2c24c buff vamp house award 2022-09-07 00:25:29 +02:00
Aevann1 d930141dc5 same as last commit 2022-09-06 06:54:59 +02:00
Aevann1 1d419640a3 make deflector unaffect me 2022-09-06 06:53:49 +02:00
Aevann1 d0cfd8a8c1 change house femboy award 2022-09-06 06:16:41 +02:00
Aevann1 959e08bb83 make marsify not count towards /marseys 2022-09-05 10:49:34 +02:00
Aevann1 88e96988a9 more marsify/owoify shit 2022-09-04 21:43:02 +02:00
Aevann1 2201745c93 add owoify and marsify to offsites 2022-09-02 20:10:35 +02:00
Aevann1 57d7e2c125 fix owoify and marsify getting wasted when awarded on a post 2022-09-02 00:11:30 +02:00
Aevann1 1706b15ce6 fix deflector not working for house awards 2022-08-30 20:35:03 +02:00
Aevann1 2806634199 show the real base price for house awards when ur founder 2022-08-30 07:08:04 +02:00
Aevann1 8229425598 fix dict oopsie I did when adding house awards 2022-08-30 07:06:59 +02:00
Snakes 9c03ab2d5e
Fix owoify award affecting links, emoji, markup. 2022-08-27 00:48:44 -04:00
Aevann1 c497c589c9 make deflector work on house awards 2022-08-27 05:29:07 +02:00
Aevann1 df022bd003 make marsify and owoify user-level 2022-08-27 05:22:57 +02:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 6a21dd347b Revert "Revert "Revert "restore autoflush""" 
This reverts commit d84b26fc77.
 2022-08-25 17:04:33 +02:00
Aevann1 d84b26fc77 Revert "Revert "restore autoflush"" 
This reverts commit 5aa03d87bb.
 2022-08-24 16:36:44 +02:00
Aevann1 5aa03d87bb Revert "restore autoflush" 
This reverts commit 687cd766b9.
 2022-08-23 17:17:37 +02:00
Aevann1 e02756669b track awards granted by jannies 2022-08-18 22:10:58 +02:00
Aevann1 687cd766b9 restore autoflush 2022-08-17 18:36:59 +02:00
Aevann1 a571ab3e69 limit my awards number to 100 2022-08-17 08:26:07 +02:00
Aevann1 c2ea38ec68 allow me to give more than 10 awards at a time 2022-08-17 08:24:59 +02:00
Aevann1 0429da4493 mod action notifs rework 2022-08-05 23:50:30 +02:00
Snakes 3225a2a3d4
LGB: disable awards, badges. 2022-07-19 19:59:39 -04:00
Snakes 8f7d05d62d
Refactor feature flags to dict. 
In anticipation of adding about a dozen more features flags to support
work for LGB, PIN_ENABLED and PROCOINS_ENABLED have been moved to the
FEATURES dict in const.py. More generally looking to create a unified
interface for logically-related constants, perhaps to support e.g.
later moving these settings from hardcoded constants to data.
 2022-07-18 01:10:01 -04:00
Aevann1 2d21863e19 replace "request.host" with "SITE" 2022-07-13 20:14:37 +02:00
Aevann1 a088a6ec7b censor slurs on flairs 2022-07-12 22:09:59 +02:00
Aevann1 bf1fec7918 remove ban_reason when unbanning users 2022-07-11 14:35:28 +02:00
Aevann1 c380848d47 remove leftover code from ill-fated joinedload attempt 2022-07-08 20:28:56 +02:00
Snakes 33815d8365 Add badge for Checkmark award users. 2022-07-02 21:34:32 -04:00
Aevann1 e8f5827c5e more testing 2022-07-01 15:34:11 +02:00
Snakes 08c2ec7223 Make pin disabling site-specific. 2022-06-28 02:27:25 -04:00
Aevann1 cbbd361197 fix rehab award 2022-06-28 03:39:55 +02:00
Aevann1 bb9d842f81 disable progressive stack too 2022-06-28 02:28:59 +02:00
Aevann1 d10a1c8693 disable pinning for 3 days 2022-06-28 02:24:16 +02:00
Aevann1 cff34fb3a4 reducing query volume, #2 2022-06-26 03:11:02 +02:00
Aevann1 bc7185b5af order awards by the time they were awarded 2022-06-25 22:33:51 +02:00
Aevann1 6f6d01c1c6 actually use the get functions 2022-06-24 15:19:53 +02:00
Aevann1 f60db1598d replace "g.db.query" on pkeys with the much more efficient "g.db.get" 2022-06-18 02:57:23 +02:00
Aevann1 3bc98f0a6b extend TLSM's badge_grant() to almost all instanes where badges are granted 2022-06-15 21:33:21 +02:00
Aevann1 f8c60e61f9 expand modaction notifications to ban, unban, and grass awards 
(but only if used by JL3, since they can print awards willy nilly)
 2022-06-13 19:22:30 +02:00
Aevann1 87ba1ba50e fix benefactor exploit (thx sneks my beloved) 2022-06-10 22:40:04 +02:00
Snakes 8709ca816d Add Y'all Seein' Eye award v2 for offsitementions. 
Reusing the assets and design for the ill-fated YSE in a0f441a67d.
This time, the award provides access to our offsite mentions (reddit
notifs).
 2022-06-10 07:12:19 -04:00
Snakes 5f7b38b477 Refactor stat timers, award timers. 
Prior to this comment, the every-1d cron.py command was broken due
to lack of proper stats import. However, while refactoring this, it
was convenient to move other recurring tasks that had been stuffed in
odd places--not least `stats(...)`--into the new cron system. This
entailed a number of refactorings of other things.

1. Move stats(...) from static.py to helpers/stats.py.
2. Move hole inactivity purge task from stats(...) to routes/subs.py.
3. Move bot award timer checks from stats(...) to helpers/awards.py.
4. Unify award timer logic formerly in routes/front.py into the new
   helpers/awards.py.
 2022-06-10 05:47:41 -04:00
Aevann1 d761fc27cd Revert "Make CARP_ID's flair uneditable by others." 
This reverts commit c2266985b7.
 2022-06-07 11:18:09 +02:00
Snakes c2266985b7 Make CARP_ID's flair uneditable by others. 
This is a kludge solution that sticks special case logic in places
it shouldn't be. However, community management demands necessitate it
quickly. Of the three ways to change a flair (customtitle), this
prevents using flairlocks and admin flair editing on the user with
CARP_ID. Only the user himself may change his flair through settings.
 2022-06-04 23:34:44 -04:00
Aevann1 4c112b1edb dsf 2022-05-27 23:31:02 +02:00
Aevann1 66b3efab36 award refactor 2022-05-27 01:08:23 +02:00
Aevann1 957cf5ba8f dfs 2022-05-26 20:09:44 +02:00
Aevann1 163267c88c Revert "Add Y'all Seein' Eye award." 
This reverts commit a0f441a67d.
 2022-05-26 02:51:42 +02:00
Snakes a0f441a67d Add Y'all Seein' Eye award. 
Adds award to enable viewing profile visitors for non-mops and
non-patrons. This commit should encompass all frontend, backend, and
database changes necessary. Perhaps usable as a model for other
user upgrade flag awards.
 2022-05-25 19:44:34 -04:00
Aevann1 94151bf2d6 fsd 2022-05-25 21:45:03 +02:00
Aevann1 5548160912 fsd 2022-05-20 00:56:53 +02:00
Snakes c789f6923e Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 17:59:35 -04:00
Snakes 289a00c302 Lootboxes: remove notification to Carp. 2022-05-18 17:33:40 -04:00
Snakes b51ab09b27 Lootboxes: re-enable for birthgay, improve. 
Re-enable lootboxes in const.py, and update their contents in
awards.py. Additionally, improve appearance in shop.

Upon purchasing a lootbox, users now receive a message informing
them of the contents thereof.

Lootbox backend now properly uses CARP_ID (and checks for the
existence thereof correctly).

Also, minor changes to how const.py whitelists awards.
 2022-05-17 22:10:04 -04:00
Aevann1 9bd8fcbd1c sf 2022-05-10 09:20:49 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
Aevann1 47d01ed00b vb 2022-05-03 04:15:35 +02:00
Aevann1 ac4da7516d fsdfds 2022-04-22 15:23:56 +02:00
Aevann1 9c0441aef9 fsd 2022-04-17 23:46:29 +02:00
Aevann1 2abddddc30 fsd 2022-04-15 17:05:19 +02:00
Aevann1 752c974c72 fsd 2022-04-14 19:31:45 +02:00
Aevann1 e6c0044d35 fart 2022-04-10 02:37:45 +02:00
Aevann1 15a02cf3cd fds 2022-04-10 01:07:03 +02:00
Aevann1 77175051ac gd 2022-04-07 01:50:32 +02:00
Aevann1 cc2b6eb006 fsd 2022-04-05 21:08:06 +02:00
Aevann1 f1fdeb866c fsd 2022-04-05 20:41:54 +02:00
Aevann1 8baefa2572 fsd 2022-04-03 18:08:54 +02:00
Aevann1 322e87db72 fds 2022-04-01 15:27:01 +02:00