MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity
22,103 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

717 Commits (ec228f269f4c2f875353b2520213c10614a5d27c)

Author SHA1 Message Date
justcool393 aa508fc076 remove discord 2022-10-16 05:42:52 -07:00
justcool393 32a4693da9 fix a couple of potentially rare 500s 2022-10-15 14:35:24 -07:00
Aevann1 c29b7e0871 remove chud rotating pfps 2022-10-15 08:57:28 +02:00
Aevann1 77312317f3 get rid of Boolean columns for permenant awards 2022-10-14 18:59:49 +02:00
Aevann1 89a0ff4a4b remove username reservation system 2022-10-14 14:01:06 +02:00
Snakes e5af46c4ae
Fix shadow visibility logic. 2022-10-13 00:10:34 -04:00
Snakes 166e33dc38
Clarify architecture of sort_objects. 2022-10-12 04:05:26 -04:00
Aevann1 d18e247513 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-12 09:03:30 +02:00
Aevann1 2aa281e8c8 refactor sorting again (untested) 2022-10-12 09:03:28 +02:00
Aevann1 925ec12141 more shadowban refactor 2022-10-12 08:53:32 +02:00
justcool393 941b5fa82d vote realness is in user model 2022-10-11 23:47:47 -07:00
Aevann1 e1ee9a69e4 refactor seeing shadowbanned shit (untested) 2022-10-12 08:24:30 +02:00
Aevann1 b1abd33835 refactor sorting 2022-10-12 08:10:11 +02:00
Aevann1 e3a3cbd358 add "hot" comment sorting 2022-10-11 18:41:09 +02:00
Aevann1 d9253ddd67 change default for "Controversial" value in user class 2022-10-11 16:43:50 +02:00
Snakes 10921331fa
Move user hat properties for userpage to model. 2022-10-08 16:30:27 -04:00
Aevann1 aa8e7055fb rework env vars a bit 2022-10-08 02:43:04 +02:00
justcool393 48384ba8e5 convert a couple of the old constantified permissions to the new system 
i don't want to break something so i'm keeping one of them for now but it just links
 2022-10-07 01:50:20 -07:00
justcool393 d9cc95dd71 fix global hole mod and template error 2022-10-06 20:06:22 -07: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
Aevann1 9d6dcca07a remove duplicate function 2022-10-07 00:59:50 +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
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
Aevann1 dda49fdd70 the @Wieoaka question 2022-10-02 13:22:18 +02:00
Aevann1 186616728b allow tempbanned nibbas to mod holes 2022-10-01 19:23:09 +02:00
Aevann1 09cc43060d
add hole mod logs (#380) 2022-09-29 11:39: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 ba19830075 fix last commit 2022-09-25 04:47:05 +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 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 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 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 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 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 d7c3ddf474 add created_utc column to all tables 2022-09-12 12:19:35 +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
Snakes ad31fe854b
DMs: add unread indicator, sort by recent reply. 2022-09-09 20:30:56 -04:00
Aevann1 ff575c9eea JL3 no longer mod holes 2022-09-09 08:37:25 +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 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 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 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 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
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 ac98f54902 remove .can_gamble 2022-08-26 23:00:17 +02:00
Aevann1 9032e23182 add patron icons for WPD 2022-08-25 22:34:05 +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 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 9e5ddcbd92 large commit: stealth mode, SubJoin, chudtopia 
dont read if u value ur sanity
 2022-08-19 23:31:26 +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 2957db79ce site_preview change for rdrama 2022-08-12 00:56:33 +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
Aevann1 0429da4493 mod action notifs rework 2022-08-05 23:50:30 +02:00
Aevann1 1afb1ea76f sneed 2022-08-04 17:14:59 +02:00
Aevann1 f0816853da make ban_reason logic a little better 2022-07-30 00:43:25 +02:00
Aevann1 73e26f1946 fix phantom notifications 2022-07-30 00:32:26 +02:00
Aevann1 527bae24f9 make user object include username when printed 2022-07-30 00:28:07 +02:00
Snakes eb55a6cc01
LGB: disable country club. 2022-07-19 21:50:08 -04:00
Snakes b4fdf248ef LGB: disable profile bio, banner, song. 2022-07-19 21:20:52 -04:00
Snakes d8d1fa3213
Show 'Remove Mod' to JL3. 
Initially requested by LGB. However, extended to all sites for
consistency: JL3s can add mods to any hole, so removal of mods seems
symmetrically permitted.

The one expansion of privilege regards removal of early mods on the
mod list. However, I believe this to be minimally destructive because
there is no logic to e.g. delete unmodded holes. Tools that can be
used imprudently, though without catastrophic consequences, are
generally extended to all JL3.
 2022-07-18 03:53:50 -04:00
Aevann1 81b762fbc2 add a discord server for api users to help eachother 2022-07-18 02:46:46 +02:00
Aevann1 3ecde34fef hide blocked users from post notifs 2022-07-18 01:00:51 +02:00
Aevann1 1088e38f34 order saved posts, comments and subscribed post by newest to oldest 2022-07-16 20:51:48 +02:00
Aevann1 0b77e3f039 sneed 2022-07-16 20:37:07 +02:00
Aevann1 86717e37b2 refactor changelog 2022-07-13 23:03:11 +02:00
Aevann1 077353c1f4 hide ghost posts from post notifications 2022-07-12 21:42:23 +02:00
Aevann1 334c5d449b change deux assets 2022-07-12 02:35:40 +02:00
Aevann1 ae45b45bfb refactor json again 2022-07-11 19:33:26 +02:00
Aevann1 6428dd08c5 add pronouns 2022-07-11 18:46:08 +02:00
Aevann1 27b1ed83cc refactor json a little bit and fix https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2278188?context=8#context 2022-07-11 15:14:34 +02:00
Aevann1 0f5b04ad7a dont surprise new users on rdrama with 835 notifications 2022-07-11 12:04:13 +02:00
Aevann1 4c2cb82f48 change deux' assets 2022-07-10 22:27:56 +02:00
Aevann1 0b7a5208e9 fix reddit mention bugs 2022-07-10 16:09:41 +02:00
Aevann1 8590456eaa Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-07-09 12:32:52 +02:00
Aevann1 ec3b4357cf refactor sorting and time filter 2022-07-09 12:32:49 +02:00
Snakes 0fbb102929 Propagate shadows to new alts on signup. 2022-07-09 05:25:15 -04:00
Aevann1 65a98cd9fc dont show notifications for posts the user himself makes in a hole they follow 2022-07-08 21:14:04 +02:00
Aevann1 a8fe49f232 kitchen sink commit, all over the place 2022-07-08 21:03:04 +02:00
Aevann1 9abd2cc508 dont show deleted and removed posts in /notifications/posts 2022-07-08 20:27:42 +02:00
Aevann1 ad1273995d notifications rework 2022-07-08 20:06:54 +02:00
Aevann1 b617321529 move all env-getting to .const 2022-07-08 18:21:13 +02:00
Snakes 6ad935e12a Permission flags UI visibility; start PERMS dict. 
Original work started for WPD and LGB, who wish to restrict flags
visibility in the UI based on admin_level. To support this change and
upcoming changes, `const.PERMS: string -> int` was created.
Potentially targetting a future design where Permissions is a proper
business object integrated with the User model; however, for now just
looking toward getting admin_level magic numbers centralized.

This commit applies PERMS to: create_hole, flags visibility in UI,
flag removal in UI & backend. Flag visibility in Comment & Submission
json_raw methods is unaffected to avoid needing a user object to
build the JSON.
 2022-07-06 23:45:33 -04:00
Aevann1 72013dcb43 fix 500 error 2022-07-04 03:05:26 +02:00
Snakes 9e1a3be278 Fix DMs improperly treating all users as blocked. 
The changes to helpers/get.py @ get_user(...) in a6b7fed2fc resulted
in `is_blocking` no longer being present on all User objects retrieved
via `get_user`. This triggered a latent identifier shadow where the
property method `User.is_blocking` on the User model caused checks for
blocks on objects retrieved via `get_user` to always return True.

Notably: when the get_user return value left `is_blocking` unset and
thus implied False, the following expression yielded True due to the
presence of the first-class function at the same identifier:

    hasattr(user, 'is_blocking') and user.is_blocking
 2022-07-03 13:55:25 -04:00
Aevann1 ed86ec1c14 more query optimization v3 2022-07-03 13:56:40 +02:00
Aevann1 3245656787 show timestamps in the user timezone 2022-07-03 09:41:25 +02:00
Aevann1 1f0f0ef0be messing with joins 2022-07-03 08:12:53 +02:00
Aevann1 6c5b5a5314 add a "subscribed" tab in ur profile page to show posts u subscribed to 2022-07-03 04:43:49 +02:00
Aevann1 d0d15c319a Poll rework (#312) 
* poll rework

* forgot to do joinedload on comments

* Fix logic errors with voting, SQL syntax.

Kitchen sink commit from review of poll-rework changes:
  1. Fix seed-db.sql syntax error.
  2. Fix SQL patch file duplication of *submissions* tables rather
     than one set of submissions and one for comments.
  3. Start makeshift SQL patch folder, since this is a large change
     that contributors may wish to apply to their local instances.
  4. Fix checkbox (non-`exclusive`) polls being unable to be
     unchecked. For consistency with `exclusive` polls, they should.
  5. Fix changing the option of an `exclusive` poll when both
     exclusive and non-exclusive options are present in one comment/
     post causing the non-exclusive options to become unchecked.
     (which, by my reading of SQLAlchemy `Query.one_or_none()`
     really could break quite badly in some cases).

* link relationships with their counterparts

* small modification to poll unchecking

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-07-02 08:48:04 +02:00
Aevann1 5661cdb271 Revert "try to cut down on number of db queries" 
This reverts commit c674c6a056.
 2022-06-29 08:43:20 +02:00
Aevann1 c674c6a056 try to cut down on number of db queries 2022-06-29 08:14:25 +02:00
Aevann1 c341be2866 show posts by users who block you 2022-06-29 05:07:00 +02:00
Aevann1 b1ef8e4c62 add poorcel mode 2022-06-27 04:14:53 +02:00