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

1339 Commits (b9f2a7123ef39fc83ba9a985858cadf6d1daa803)

Author SHA1 Message Date
justcool393 d9cc95dd71 fix global hole mod and template error 2022-10-06 20:06:22 -07:00
justcool393 c4c3d6cf49
Merge branch 'frost' into permissions-refactor 2022-10-06 19:55:36 -07:00
Aevann1 3ecb1b4f9a generate a mod log for CCing or unCCing posts and notify OP 2022-10-07 04:48:31 +02:00
justcool393 e372158729
Merge branch 'frost' into permissions-refactor 2022-10-06 19:05:42 -07:00
justcool393 dd7e0abd6a fix some conflicts 2022-10-06 19:04:27 -07:00
Aevann1 4d15d76dfa show the earlylife parantheses in more places 2022-10-07 01:31:09 +02:00
Aevann1 9d6dcca07a remove duplicate function 2022-10-07 00:59:50 +02:00
Aevann1 3ffac6f0f6 fix tranny slur replacement in plainbody and plaintitle 2022-10-07 00:34:25 +02:00
Aevann1 8b1cf50965 fix misplaced ")" resulting in 500 error 2022-10-06 23:17:35 +02:00
justcool393 a30edea43d resolve conflict 2022-10-06 03:37:00 -07:00
justcool393 8bed8c64e8 rearrange and rename a couple of permissions 2022-10-06 00:55:54 -07:00
justcool393 f1275b90eb filter properly per poll: https://rdrama.net/post/79285/-/2845495 2022-10-06 00:04:46 -07:00
Aevann1 fea0ce115f do the result of this poll https://rdrama.org/post/79285/-/2845495?context=8#context 2022-10-06 08:41:48 +02:00
Aevann1 d73990d5b2 delete granted_by column 2022-10-06 08:35:42 +02:00
Aevann1 3a4aa3f3af fix bugs 2022-10-06 08:00:41 +02:00
justcool393 6911101e29 post bet distributions 2022-10-05 22:59:27 -07:00
Aevann1 42344cb76f add media table 2022-10-06 07:54:04 +02:00
Aevann1 e77a117339 add created_utc column to streamers 2022-10-06 07:37:50 +02:00
justcool393 dc5a132583 mop visibility, WPD notifications, and a fix with shadowbans 2022-10-05 22:25:45 -07:00
justcool393 68851ed986 profile views and modmail/hole creation notifications 2022-10-05 22:07:38 -07:00
justcool393 5739f128cf club and chudrama permissions 2022-10-05 21:52:15 -07:00
justcool393 35c294b421 shadowban perms and some more fixes 2022-10-05 19:24:27 -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
justcool393 4b78ed176a global moderation perm and add some more checks for const perm 2022-10-05 18:16:52 -07:00
justcool393 04f24cd8fd content moderation permission level 
holy crap there's a lot
 2022-10-05 17:57:08 -07:00
justcool393 651355afdf should be no semicolon there 2022-10-05 16:37:16 -07:00
Aevann1 2f979b859b generate modlogs when a hole janny toggles nsfw 2022-10-06 01:24:54 +02:00
Aevann1 55b08c3c47 remove "grant_awards" mod action 2022-10-06 01:15:26 +02:00
justcool393 4037eed228 use constant instead of literal 200 for poll bets 2022-10-04 23:07:53 -07:00
justcool393 635e35204e i'm an idiot 2022-10-04 17:08:15 -07:00
justcool393 93fb4f40d6
security: don't leak comment contents for removed/deleted comments 2022-10-04 16:51:42 -07:00
justcool393 31725a0684
security: don't leak post contents to embeds and other stuff for removed/deleted posts 2022-10-04 16:48:01 -07:00
Aevann1 947e362c00 fix 3e58cf64ce 2022-10-05 00:28:48 +02:00
Aevann1 3e58cf64ce let ppl see the replies if they participated in the thread before it got CC'd 2022-10-04 22:36:16 +02:00
Snakes 247318d67b
Sanitize /casino/<game> parameter input. 2022-10-03 16:40:33 -04:00
Aevann1 dda49fdd70 the @Wieoaka question 2022-10-02 13:22:18 +02:00
Snakes d28281bf8f
Fix ORM trying to INSERT/UPDATE into body_ts. 2022-10-02 05:12:04 -04:00
Snakes 701f64c91b
Change comment search to use tsvector. 2022-10-02 04:55:39 -04:00
Aevann1 186616728b allow tempbanned nibbas to mod holes 2022-10-01 19:23:09 +02:00
Aevann1 2a316301e2 fix prev commit (im retarded) 2022-09-29 14:43:14 +02:00
Aevann1 f073e2e167 fix this https://rdrama.org/h/changelog/post/108741/added-hole-mod-logs-marseyjanny2/2809340?context=8#context 2022-09-29 14:41:39 +02:00
Aevann1 51d7cd6d7e fix shit with hole logs 2022-09-29 12:18:27 +02:00
Aevann1 2f5ae40574 delete legacy modactions 2022-09-29 12:05:14 +02:00
Aevann1 09cc43060d
add hole mod logs (#380) 2022-09-29 11:39:37 +02:00
Aevann1 7201d55f69 Revert "prem version" 
This reverts commit 858715b496.
 2022-09-29 07:58:11 +02:00
Aevann1 858715b496 prem version 2022-09-29 07:53:37 +02:00
Aevann1 b9d3336a9e nitter shit 2022-09-29 07:53:37 +02:00
Snakes 4a54c6219a
Add trailing final newlines to source files. 
Touched a ton of files to finally standardize on having trailing
final newlines, as best practice recommends and so our devs stop
accidentally fighting each other over it.

This was performed automatically with the following:
git ls-files -z '*.py' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
git ls-files -z '*.css' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
 2022-09-29 01:43:29 -04:00
Snakes f05ec93b95
Add gambling wager badge logic. 
This commit touches more files than it ought to because this change
required untangling some circular imports, notably a lingering import
of files.helpers.slots in helpers.actions (presumably from old Snappy
gambling logic) and the User.active_blackjack_game accessor. Otherwise,
the logic is fairly straightforward.
 2022-09-29 00:26:50 -04:00
Aevann1 4212cfa0b2 testing on pcm 2022-09-25 06:11:06 +02:00
Aevann1 9eeb77073f fix prev commit 2022-09-25 05:10:32 +02:00
Aevann1 ba19830075 fix last commit 2022-09-25 04:47:05 +02:00
Aevann1 c0c45d9e9a same as last commit 2022-09-25 04:45:22 +02:00
Aevann1 08f9045818 remove linefeed at the end 2022-09-23 17:02:09 +02:00
Aevann1 5740ed3f00 fix capitalization 2022-09-23 16:56:01 +02:00
Aevann1 340f9e31fe limit asset perms and generate modlog for updating 2022-09-23 14:51:57 +02:00
Aevann1 d1bc2f3468 integrate check_ban_evade into check_for_alts 2022-09-23 14:33:58 +02:00
Snakes 3efaedbbec
Temporarily fix permas propagating as shadows. 2022-09-22 20:45:59 -04:00
Aevann1 2ef91698f4
allow PCM chadmins to add or remove channels (#365) 
* testing on devrama

* fix for devrama

* fix

* fix

* fix

* fix

* fix

* fix

* test

* fix

* test

* test

* commit
 2022-09-22 23:40:32 +02:00
Aevann1 618572e413 reload on declaring winner 2022-09-22 22:24:22 +02:00
Aevann1 d80a2f2331 add "are you sure?" to "declare winner" 2022-09-22 22:11:56 +02:00
Aevann1 6eea792b00 if ur reading this, fuck you 2022-09-22 21:54:42 +02:00
Aevann1 8a8a67a059 remove ban_evade logic 2022-09-22 21:40:14 +02:00
Aevann1 a775a03035 add "granted_by" column to awards instead of "granted" 2022-09-20 23:30:04 +02:00
Aevann1 272e39ebf2 add spider award 2022-09-20 19:52:52 +02:00
Aevann1 b980c63d1b Revert "created_utc refactor" 
This reverts commit 791aececbb.
 2022-09-19 22:40:33 +02:00
Aevann1 b6df126012 stop me from getting modaction notifs 2022-09-19 22:13:23 +02:00
Aevann1 483a2f2241 fix 500 error 2022-09-19 21:39:00 +02:00
Aevann1 be9dc81455 remove bite award pfp 2022-09-19 21:29:29 +02:00
Aevann1 791aececbb created_utc refactor 2022-09-19 21:24:16 +02:00
Aevann1 14ae9600cf fix 500 error (whoops) 2022-09-19 20:57:03 +02:00
Aevann1 45ba326222 add forced hats 2022-09-19 20:52:50 +02:00
Aevann1 f54791cc4c remove categories 2022-09-19 20:04:30 +02:00
Aevann1 f7727f1029 refactor sigs 2022-09-19 19:51:40 +02:00
Aevann1 4519db0e57 make me get notifs for modmail again 2022-09-19 19:10:37 +02:00
Aevann1 c42ff2788e fix awards receieved for house awards 2022-09-19 01:10:00 +02:00
Aevann1 3b8d025f57 fix kofi 2022-09-18 02:28:09 +02:00
Aevann1 dc6f4f8e10 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2723089?context=8#context 2022-09-17 23:45:17 +02:00
Aevann1 a186064465 fix 2022-09-17 14:15:22 +02:00
Snakes fdc8a78472
Fix leaderboard for winnings change. 2022-09-16 15:28:24 -04:00
outruncolors 7dbbb27228
Remove winnings column from user and replace with a calculated value (#356) 
* Remove winnings column from user and replace with a calculated value

* Handle case for no games played

* Idiomatic
 2022-09-16 14:10:45 -05:00
outruncolors a0c75ab677
Introduce user payment methods (#355) 
* Add pay and charge methods into user class

* Replace casino charges/payments with new user methods

* Also refund wager on winning slots bets

* Unblock casino routes
 2022-09-15 17:16:35 -05:00
Aevann1 42f0ce8844 make jl3 mod holes again 2022-09-14 16:11:55 +02:00
Aevann1 73ae8f6e65 give a badge to permenantly marsified users 2022-09-13 20:02:08 +02:00
Aevann1 2fa71a252b kofi integration 2022-09-13 18:53:19 +02:00
Aevann1 e69827e6e0 kofi integration (testing on devrama) 2022-09-13 17:22:18 +02:00
Aevann1 7c1b6eac77 same as last commit 2022-09-12 13:51:56 +02:00
Aevann1 a4f2260787 fix "until" missing from badge description 2022-09-12 13:51:26 +02:00
Aevann1 d7c3ddf474 add created_utc column to all tables 2022-09-12 12:19:35 +02:00
Aevann1 4fd3ebc967 useless commit 2022-09-11 16:32:04 +02:00
Aevann1 ae90eb1cf2 simplify house checking logic 2022-09-11 03:53:16 +02:00
outruncolors d57a569125
[DO NOT MERGE] Casino changes (#350) 
* Merge up

* Create composable template for casino games

* Big changerinos

* Only allow double down sometimes

* Add drawing capability

* Make everything pretty

* Add leaderboard

* Update files/routes/casino.py

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

* Update files/helpers/casino.py

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

* Update files/helpers/twentyone.py

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

* Update files/helpers/twentyone.py

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

* Update files/helpers/twentyone.py

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

* Add some stuff

* Rehab screen

* Default sets for no games

* Stupid revert

Co-authored-by: code-review-doctor[bot] <72320148+code-review-doctor[bot]@users.noreply.github.com>
 2022-09-10 16:01:34 -05:00
Snakes 1b3c042552
Change notification bell colors for messages. 
Messages bell is now an orange-ish gold. To avoid confusion with the
yellowish-goldish modactions bell, modactions are now green.
 2022-09-10 03:56:37 -04:00
Aevann1 c1aae95d16 restore "notify followers" checkbox 2022-09-10 09:00:45 +02:00
Aevann1 1a64ba3db8 hat submission UI 2022-09-10 07:37:11 +02:00
Aevann1 e058643f01 remove unnecessary import, thx @everyone 2022-09-10 02:34:15 +02:00
Snakes ad31fe854b
DMs: add unread indicator, sort by recent reply. 2022-09-09 20:30:56 -04:00
Aevann1 47890d771d add Marsey Submission UI 2022-09-09 11:13:50 +02:00
Aevann1 ff575c9eea JL3 no longer mod holes 2022-09-09 08:37:25 +02:00
Aevann1 66bf74b444 fix whoopsie 2022-09-08 21:16:57 +02:00