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

631 Commits (eb98740f972fe3e87e1b7d6757a0afa6792031a6)

Author SHA1 Message Date
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
Aevann1 2a8b7bf281 undefer css (1 less query) 2022-06-26 07:39:46 +02:00
Aevann1 e36adb5bf4 reduce query volume, badge edition 2022-06-26 07:11:25 +02:00
Aevann1 3b8188fd67 fixed version of d83d47e280 2022-06-26 03:22:05 +02:00
Aevann1 a1b137447e Revert "reduce query volume #1" 
This reverts commit d83d47e280.
 2022-06-26 03:12:31 +02:00
Aevann1 cff34fb3a4 reducing query volume, #2 2022-06-26 03:11:02 +02:00
Aevann1 cd4b3b7d3b Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-06-26 02:50:49 +02:00
Aevann1 d83d47e280 reduce query volume #1 2022-06-26 02:50:47 +02:00
Snakes 7b38be0101 Reduce query volume in user.user_awards. 
The User model class method user_awards previously made one query
per type of award. This has been replaced with a new query that
retrieves all owned award quantities at once using GROUP BY.
 2022-06-25 20:22:56 -04:00
Aevann1 ceb72a470c add more @lazy to functions 2022-06-23 18:36:39 +02:00
Aevann1 3023a45d75 fix posts refactor 2022-06-22 22:03:10 +02:00
Aevann1 10a47ca837 refactor sorting posts 2022-06-22 21:57:57 +02:00
Aevann1 8ecb4582d0 refactor sorting comments 2022-06-22 21:50:20 +02:00
Aevann1 d704592bdd cache-bust all previously broken images 2022-06-22 17:59:47 +02:00
Aevann1 20585ca543 add a shortened endpoint for static images and rename loading.webp to l.webp (to save bytes) 2022-06-22 17:51:19 +02:00
Snakes e2cd25db67 WPD: limit hole creation to JL2+. 2022-06-21 01:20:21 -04:00
Snakes f6b6997f61 Persist activity timestamp to users. 2022-06-20 16:25:03 -04:00
Snakes dee8eb5154 Replace loading.webp with new marseyloading. 2022-06-19 22:15:33 -04:00
Aevann1 f1f30635b2 hide deleted posts and comments from userpages (frequently requested) 2022-06-19 01:55:45 +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
Snakes 564f5b38f1 Clarify notif color logic, extend to modaction. 
Previously, notification bell linking & color logic was interspersed
between templates and the user model. It doesn't _really_ belong in
the user model, but it's been moved out of the templates to there to
at least centralize it. This was also used as an opportunity to make
the modactions inbox color the bell appropriately.
 2022-06-15 01:43:34 -04:00
Snakes acde2c856b Enable JL2 viewing shadowbanned comments. 2022-06-12 05:48:27 -04:00
Aevann1 545f276940 add created_utc column to badges for ordering them on userpages 2022-06-10 23:40:43 +02:00
Aevann1 2db414f12d Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-06-10 14:48:14 +02:00
Aevann1 2b82f95a98 Make hole cost constant instead of variable 2022-06-10 14:48:11 +02:00
Snakes 4db48a6ec9 Separate modaction notifs from inbox. 2022-06-10 08:28:46 -04: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 dc7f13304e Add following holes for notifications. 2022-06-09 16:24:24 -04:00
Snakes 81e19b1aed Add can_gamble user setting. 
Users now have a toggleable can_gamble setting which disables their
ability to use all chance-based gains on the site: viz. slots,
blackjack, the lottery, and treasure chests.

This only applies on invocation of commands that start gambling
games, so it should cause no bugs when toggled with e.g. active
blackjack games.

This was added for the benefit of users with actual problems with
gambling, be they past addiction or religious conviction. All future
gambling features are humbly requested to respect it.
 2022-05-30 05:32:45 -04:00
Snakes 5b6ba1ac82 Merge remote-tracking branch 'mccoxmaul/add-lottershe' into frost 2022-05-29 23:52:04 -04:00
Aevann1 aff30db1fe make sure the post/comment for which someone was banned is linked everywhere (for convenience) 2022-05-30 04:55:51 +02:00
Snakes 0a73083e8a Add settings toggle for UI animations. 2022-05-29 03:08:28 -04:00
Outrun Colors, LLC 469c39dca6 Configure admin section and purchasing a ticket full flow 2022-05-28 22:33:44 -05:00
Aevann1 f823396239 sdf 2022-05-27 02:08:28 +02:00
Aevann1 2a9df987b3 fsd 2022-05-27 02:03:04 +02:00
Aevann1 de40b074ac yes 2022-05-26 03:30:25 +02:00
Aevann1 163267c88c Revert "Add Y'all Seein' Eye award." 
This reverts commit a0f441a67d.
 2022-05-26 02:51:42 +02:00
Aevann1 65388d3e57 sfd 2022-05-26 01:50:13 +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 50b995d3a0 fds 2022-05-25 22:16:26 +02:00
Aevann1 3706d3d22c sdf 2022-05-25 20:36:09 +02:00
Aevann1 5b1477acfc certified good commit 2022-05-25 19:01:29 +02:00
Aevann1 b08d374b4b fds 2022-05-25 17:47:15 +02:00
Snakes 53a80af241 Restore old agendaposter pfps system, add more. 
Restores agendaposter pfps from 1576fcd57d and adds 52-57.
Also restores code in classes/user.py which implements them.
 2022-05-25 00:41:23 -04:00
Snakes cc75375c82 Un-deploy Birthgay event. 
Removes temporary changes for the Birthgay 2022 event, ending
approximately at 2022-05-23 0600Z. Changes:
 - Double XP disabled.
 - Lootboxes disabled.
 - Three event awards given real descriptions and colors.
 - Partyhats: restored to cakeday-only condition and tooltip.
 - Header UI: balloons removed, text visibility outline removed,
   journoid banner reverted, marseyjam as header icon.
 - Birthgay banners: removed from template, moved to new storage dir.

Confetti, though remaining as a permanent award, has been temporarily
removed pending a less performance-intensive implementation and one
that doesn't require maintaining a third-party package in the codebase.
 2022-05-23 01:48:25 -04:00
Aevann1 969d1898b5 vid refactor 2022-05-22 18:13:19 +02:00
Aevann1 20cc20d806 fsd 2022-05-21 14:36:22 +02:00
Aevann1 aed84df4ad fsd 2022-05-20 20:45:12 +02:00
Snakes c789f6923e Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 17:59:35 -04:00
Snakes 69dec16f55 Shop badge discount: fix Spender, add Roller disc. 
The shop discount from Big Spender badges was incorrectly implemented:
intended behavior was for 2pp per badge. However, the values in
const.py were set as if a user could only have one Spender badge at
once, while user.py @ discount was implemented as if they were
additive. Since users factually do have multiple big spender badges,
the values in const were adjusted to reflect this fact.

Also, lootbox Roller badges now each offer a 1pp discount.
users.py @ discount was improved to check against the `discounts`
keys for appropriate badges, rather than a hardcoded list.
 2022-05-19 13:41:04 -04:00
Aevann1 45da8f0f35 sdf 2022-05-09 14:15:23 +02:00
Aevann1 b71ae6cc74 sf 2022-05-09 13:21:49 +02:00
Aevann1 f2039d7713 sfd 2022-05-07 06:13:19 +02:00
Aevann1 c5f5342373 sdf 2022-05-06 00:55:34 +02:00
Aevann1 2008bc76c1 cakedays 2022-05-05 01:31:11 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
Aevann1 5e2da5673c fsd 2022-05-03 06:28:42 +02:00
Aevann1 9eeb214a24 fsd 2022-05-02 03:45:22 +02:00
Aevann1 ccfbbba09a fsd 2022-05-02 03:42:59 +02:00
Aevann1 f59286b202 fsd 2022-05-02 03:41:08 +02:00
Aevann1 bc2a20cd4b sfd 2022-05-01 23:44:38 +02:00
Aevann1 a6b26ece67 fsd 2022-04-29 17:19:50 +02:00
Aevann1 d961ffc913 fds 2022-04-28 02:04:01 +02:00
Aevann1 957c97f2c7 sfd 2022-04-26 15:33:39 +02:00
Aevann1 0f05bf3f94 fsd 2022-04-26 00:28:20 +02:00
Aevann1 5c21180705 Revert "vxc" 
This reverts commit 4d0c7ba456.
 2022-04-25 23:59:12 +02:00
Aevann1 4d0c7ba456 vxc 2022-04-25 18:38:06 +02:00
Aevann1 c7d3401b62 fds 2022-04-18 00:47:30 +02:00
Aevann1 ee7063f70e fds 2022-04-16 01:28:02 +02:00
Aevann1 2e07356b3e vdvg 2022-04-16 01:21:30 +02:00
Aevann1 6a8eff8393 fds 2022-04-16 01:19:27 +02:00
Aevann1 99cb01d9fc fdsfds 2022-04-15 18:28:08 +02:00
Aevann1 a158c2b4ea fds 2022-04-14 19:29:53 +02:00
Aevann1 543b9a73cb rfds 2022-04-14 19:20:00 +02:00
Aevann1 b15786fb2b fds 2022-04-11 12:23:52 +02:00
Aevann1 51ebba5bca gf 2022-04-10 20:42:58 +02:00
Aevann1 30833f8130 fsd 2022-04-10 01:12:59 +02:00
Aevann1 16c16e28b2 fsd 2022-04-06 23:54:07 +02:00
Aevann1 3af80e37e9 fsd 2022-04-06 23:53:14 +02:00
Aevann1 cc2b6eb006 fsd 2022-04-05 21:08:06 +02:00
Aevann1 67d9629eac fds 2022-04-04 01:21:06 +02:00
Aevann1 724ef551fd dgf 2022-04-03 20:12:37 +02:00
Aevann1 2dd4e6a573 sfd 2022-04-03 20:08:59 +02:00
Aevann1 73af57f141 fsd 2022-04-03 20:05:11 +02:00
Aevann1 2d177ed1d8 spaghetti 2022-04-03 20:01:11 +02:00
Aevann1 2cb4d68267 fsd 2022-04-03 19:37:20 +02:00
Aevann1 7d9b0867c1 fds 2022-04-03 18:20:31 +02:00