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

1356 Commits (eb98740f972fe3e87e1b7d6757a0afa6792031a6)

Author SHA1 Message Date
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
Aevann1 6077f09ca9 make bets better 2022-09-08 20:25:45 +02:00
Aevann1 9475aa27e4 award badges shit 2022-09-07 05:31:55 +02:00
Aevann1 66d3e18263 do this https://rdrama.org/h/femboy/post/101152/re-marsify-award/2670658?context=8#context 2022-09-07 00:39:34 +02:00
Aevann1 d0cfd8a8c1 change house femboy award 2022-09-06 06:16:41 +02:00
Aevann1 f8cd1bea03 make the poll code much worse 2022-09-06 01:33:58 +02:00
Aevann1 ed60cafb24 make the poll code make a little more sense 2022-09-06 00:56:21 +02:00
Aevann1 da52d00ad3 fix 500 errors 2022-09-06 00:55:26 +02:00
Aevann1 ef5c3c89ee deduplicate polls 2022-09-06 00:55:01 +02:00
Aevann1 62d077576f change poll- and choice- and -bet to -option 2022-09-06 00:54:05 +02:00
Aevann1 73dbb2dd7e change t2_ and t3_ to p_ and c_ 2022-09-06 00:52:22 +02:00
Aevann1 8085de14e4 make only house members able to vote on polls in their house hole 2022-09-06 00:30:44 +02:00
Aevann1 6d37838f45 fix 500 error 2022-09-05 10:57:21 +02:00
Aevann1 7785f049ec fix 500 error 2022-09-05 10:00:12 +02:00
Aevann1 8fb22a397c dont use g.db.execute 2022-09-05 09:37:20 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 15732114d9 try making hats work in popover 2022-09-05 06:21:06 +02:00
Aevann1 34c6842018 make the tooltip be "hat - description" 2022-09-05 05:55:41 +02:00
Aevann1 1816ce09f7 make it possible to equip multiple hats 2022-09-05 05:44:24 +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 10efc700d1 make chadmins have access to /h/chudrama 2022-09-04 22:27:37 +02:00
Aevann1 1acfb0a2cd fix 500 error 2022-09-04 20:50:59 +02:00
Aevann1 865723470b show owners of hats 2022-09-03 21:36:50 +02:00
Aevann1 b295af02f4 mute SQLalchemy warnings 2022-09-03 21:28:49 +02:00
Aevann1 9381763753 fix 500 errors 2022-09-03 21:27:17 +02:00
Aevann1 5feb479cd2 apply slur filter to hat descriptions 2022-09-03 20:55:03 +02:00
Aevann1 256b384e69 add 2 leaderboard tables for hats 2022-09-03 20:50:20 +02:00
Aevann1 48affb53e6 more hat shit 2022-09-03 05:04:51 +02:00
Aevann1 db9a995032 more hats 2022-09-03 03:11:10 +02:00
Aevann1 de9f9ab11c display owned hats at the top 2022-09-03 02:27:19 +02:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Snakes c506ff0c40 Add admin mute for user reports and modmail. 2022-09-01 17:30:15 -04:00
Snakes ba05430a80 Prevent permabanned users from replying to DMs. 
Permabanning already prevents users from initiating new DMs, and we
complete this by preventing replying to existing DM chains.
New modmails may still be initiated, and existing modmails may still
be replied to.
 2022-09-01 17:30:15 -04:00
Aevann1 083371f20f keep_blank_values 2022-09-01 22:46:57 +02:00
Aevann1 17fd089870 refactor pinning child comments 2022-09-01 22:31:08 +02:00
Aevann1 8e74171d9d exclude authorized bots from hole restrictions 2022-09-01 22:01:03 +02:00
Aevann1 768a2eda24 clarify CC function in WPD and PCM 2022-09-01 21:12:05 +02:00
Aevann1 04e47017c1 fix chudrama for paypigs 2022-08-31 18:49:31 +02:00
Snakes 6acf4ff569
WPD: disable cosmetic awards on distinguished posts. 2022-08-30 23:18:59 -04:00
Aevann1 66aa4c5c35 make the parantheses stack work for comments too 2022-08-30 14:18:35 +02:00
Aevann1 fc01eb6c1d make the ((( in earlylife award stack along with the time 2022-08-30 13:54:43 +02:00
Aevann1 254c85c8ef if statement instead of try-except 2022-08-30 03:13:43 +02:00
Aevann1 c3ac43aa92 fix missing User attribute 2022-08-28 17:34:53 +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 45d5f52388 restore betting 2022-08-26 23:53:17 +02:00
Aevann1 ac98f54902 remove .can_gamble 2022-08-26 23:00:17 +02:00
Aevann1 1ed41d80c0 fix rdrama.org thumbnails 2022-08-26 00:55:30 +02:00
Aevann1 9032e23182 add patron icons for WPD 2022-08-25 22:34:05 +02:00
Aevann1 c8ed20cd9c add patron badges for WPD 2022-08-25 19:29:31 +02:00
Aevann1 11d7f34ad0 allow hole jannies to change the hole marsey + cachebust all site assets 2022-08-25 00:22:44 +02:00
Snakes 6df72a8be8
End temporary flower crown event. 
Started in d96320e7d7.
 2022-08-23 23:05:31 -04:00
Aevann1 9456fa1aa6 fix 500 error i introduced 2022-08-23 20:05:11 +02:00
Aevann1 be251e7756 give paypigs access to chudrama 2022-08-22 22:52:00 +02:00
Aevann1 f7356c0843 censor post titles in /log 2022-08-21 19:08:48 +02:00
Aevann1 797cf61d3f let chuds into /h/chudrama 2022-08-21 15:57:56 +02:00
Aevann1 a36c0f9dd3 trying to fix exiling 2022-08-20 22:24:20 +02:00
Aevann1 3140adfbdb small change to can_see logic 2022-08-20 15:05:02 +02:00
Aevann1 725179dc6c add exception in can_see for offsites 2022-08-20 02:10:13 +02:00
Aevann1 da4070b62a reduce chudrama requirement from 20k to 5k 2022-08-20 00:45:21 +02:00
Aevann1 e1e7258e7a add def can_see(v) 2022-08-20 00:36:28 +02:00
Aevann1 9e5ddcbd92 large commit: stealth mode, SubJoin, chudtopia 
dont read if u value ur sanity
 2022-08-19 23:31:26 +02:00
Aevann1 1883d60f4e fix nitter and imginn 2022-08-18 23:58:02 +02:00
Aevann1 e02756669b track awards granted by jannies 2022-08-18 22:10:58 +02:00
Aevann1 7ee7868185 restore the ability to permachud someone, apparently that stings less than being chudded for a month/year (fascinating) 2022-08-17 21:17:34 +02:00
Aevann1 7edd569090 refactor nitter 2022-08-16 18:53:24 +02:00
Aevann1 5d39c9dfbb hide braincels too 2022-08-15 20:48:02 +02:00
Aevann1 8e48728614 add imginn toggle 2022-08-15 19:45:43 +02:00
Aevann1 bac6e31be8 hide smuggies for now until I add opt-in system 2022-08-15 17:17:58 +02:00
Aevann1 05133f611b dont show me modaction notifs 2022-08-15 16:26:48 +02:00
Snakes 86bea72484
Refactor profile views condition to deduplicate. 2022-08-15 05:32:29 -04:00
Aevann1 b033b518b8 exclude me from modaction notifs on all sites 2022-08-15 08:24:31 +02:00
Aevann1 8ef20b2427 exclude me from modaction notifs on offsites 2022-08-15 08:09:33 +02:00
Snakes d96320e7d7
Hats: temporary flower-crown event. 2022-08-14 17:39:47 -04:00
Aevann1 a1b295d084 remove default patron for WPD 2022-08-14 14:41:08 +02:00
Aevann1 484cac64f0 fix 500 errors 2022-08-13 10:35:44 +02:00
Aevann1 2d9b42237e fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2497656?context=8#context 2022-08-13 10:26:33 +02:00
Aevann1 2957db79ce site_preview change for rdrama 2022-08-12 00:56:33 +02:00
Aevann1 ce9c4a1a41 fix https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2480694?context=8#context 2022-08-11 10:29:56 +02:00
Snakes 249c593379 Hats: frontend interface, migrate cakeday. 
Getting the basic hats frontend changes into master so my branch stops
diverging from the templates. Migrates the existing cakeday partyhat
functionality to the new system also.

Establishes a (hopefully) static interface for PFP hat display:
  - Hat image assets are 100px w x 130px h and anchored to the bottom-
    left corner of pfps.
  - User.hat_active provides either empty string or the internal
    string identifier for active user hat.
  - User.hat_tooltip provides mouseover text. Likely only to be used
    for cakeday hats on one's cakeday.

Additionally, per discussion with Carp, PFPs in comments and posts
increased from 25px diameter to 30px.
 2022-08-11 03:30:43 -04:00
Snakes 1411018f8d Add post categories. 
Implemented for LGB but can likely be used for WPD and other future
sites. Similar to a reddit post flair. Provides:
  - Admin panel for Category management.
  - Category selection on post submission.
  - 'Recategorize' post action.
 2022-08-07 02:57:30 -04:00
Aevann1 0429da4493 mod action notifs rework 2022-08-05 23:50:30 +02:00
Snakes 2845e0961b Turn login-gate of 1568ec0162 into admin toggle. 2022-08-05 16:42:22 -04:00