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

608 Commits (cfa6c13eaa58a15c5c132e8c852b9fe7666fbdde)

Author SHA1 Message Date
Aevann1 09be0394cd fix this https://chapotraphouse.club/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2244925?context=8#context 2022-07-04 06:07:51 +02:00
Aevann1 1136683a14 actually fix the followers pages 2022-07-04 05:41:44 +02:00
Aevann1 9d0b53ad54 fix /followers and /following being empty 2022-07-04 04:59:24 +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 a6b7fed2fc minor logic change in /@username 2022-07-03 14:12:33 +02:00
Aevann1 ed86ec1c14 more query optimization v3 2022-07-03 13:56:40 +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 d9844231c7 fix replies to modmail not notifying the sender 2022-07-01 00:41:11 +02:00
Aevann1 b602a66dd6 fix issue with text exceeding character count despite not exceeding it 2022-06-29 03:13:11 +02:00
Aevann1 a0cb5874cc refactor push notifs 2022-06-27 21:02:24 +02:00
Aevann1 d31d6b8617 restore push notifs 2022-06-27 20:42:41 +02:00
Aevann1 6ff420e338 add a public list of poorcels 2022-06-27 04:21:34 +02:00
Aevann1 58867084af temporarily disable push notifs to get rid of console spam 2022-06-26 23:04:11 +02:00
Aevann1 e022b29ef6 rework custom css a little 2022-06-26 07:26:45 +02:00
Aevann1 74978bfbf7 Revert "put custom CSS into HTML templates" 
This reverts commit 19c82b7ea1.
 2022-06-26 07:07:28 +02:00
Aevann1 19c82b7ea1 put custom CSS into HTML templates 2022-06-26 06:33:41 +02:00
Aevann1 cff34fb3a4 reducing query volume, #2 2022-06-26 03:11:02 +02:00
Aevann1 c1d227e2b6 exclude poll bots from "simps for" lists 2022-06-25 22:24:47 +02:00
Aevann1 f415b469de Revert "Exclude self-votes from user vote summaries totals." 
This reverts commit 69482aed3a.
 2022-06-25 17:41:36 +02:00
Snakes 69482aed3a Exclude self-votes from user vote summaries totals. 
The user routes upvoters, downvoters, upvoting, and downvoting
now exclude self-votes from the summary totals.

Also, the diff touches a number of other lines where the local
variable `id` was renamed to `uid` for semantic clarity.
 2022-06-25 02:00:09 -04:00
Aevann1 56a317bb56 "Bux" to "Marseybux" 2022-06-25 03:54:23 +02:00
Aevann1 d59a80245d add total counter for simps, haters, simping for, hates 2022-06-25 01:22:20 +02:00
Aevann1 f34c4e1196 stop using app.config for our own stuff 2022-06-24 17:08:57 +02:00
Aevann1 5d98f1095d actually use the get functions, v2 2022-06-24 15:21:05 +02:00
Aevann1 b3980660c1 fix leaderboard bug for badges 2022-06-24 02:29:13 +02:00
Aevann1 0f0a07204c fix 500 errors 2022-06-22 22:42:19 +02:00
Aevann1 8ecb4582d0 refactor sorting comments 2022-06-22 21:50:20 +02:00
Aevann1 f1f30635b2 hide deleted posts and comments from userpages (frequently requested) 2022-06-19 01:55:45 +02:00
Aevann1 dc8f230ae4 fix 500 error 2022-06-18 22:11:50 +02:00
Aevann1 dde19f7d85 fix 500 error related to variables 2022-06-18 19:50:03 +02:00
Aevann1 5520447d55 make modmail messages use the files refactor 2022-06-18 19:41:24 +02:00
Aevann1 b34dd88560 remove legacy code in video upload (thx @everyone) 2022-06-18 18:23:10 +02:00
Aevann1 ccdabcba29 allow uploading of all types of files (using lain.la) 
+ allow multiple file upload in bios and messaging admins
 2022-06-18 17:53:34 +02:00
Aevann1 e072e15819 cache profile pics for 1 day to prevent DDOS 2022-06-17 21:21:26 +02:00
Snakes b995b4ddfb Amend 9b17bb1cfe78: fix userpage for logged-out. 
The previous fix to shadowbanned users not being able to view their
own profile broke userpages for logged out users (and filled the log
up with 500s) due to sloppy logic around accessing v.id. This has
been remedied.
 2022-06-17 02:30:20 -04:00
Snakes 9b17bb1cfe Fix shadowbanned 404 on own profile. 2022-06-16 20:06:00 -04:00
Aevann1 7ec994d4b3 show gift reason in public transfer log 2022-06-15 15:36:33 +02:00
Snakes 3ebba0465a Close more shadowbanned user info leaks. 
1. Missed the notif for unfollowing a non-fish'd user in fb52003404.
2. "Get Them Help" button showed username.
3. Gift coins/mbux showed username and allowed a message.
4. Global block list showed username.
5. User profile appeared to logged-out and non-jannies.
 2022-06-12 23:03:36 -04:00
Snakes fb52003404 Hide block & follow notifs from shadowed. 2022-06-12 22:11:55 -04:00
Aevann1 4a1e6cc726 a 500 error is much better than an XSS, bro 2022-06-07 12:03:51 +02:00
Snakes 1d49012c16 Revise 16587cdf7cf5, expand assetcache. 
Assetcache: now supports js/userpage.js & js/userpage_v.js.
The three userpage*.html templates now implement it.

Revising gift messages 16587cdf7cf5:
  - routes/users.py: Deduplicate code, more descriptive var name.
  - templates/userpage.html: Move post-tax gift line below reasons
    box. Ultimately just an aesthetic change.
 2022-06-01 00:11:23 -04:00
Ubuntu 453d5f57a3 added a gift message to go with coin and bux transfers 2022-06-01 00:10:33 -04:00
Aevann1 cd2380fb33 fds 2022-05-28 04:20:31 +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 50b995d3a0 fds 2022-05-25 22:16:26 +02:00
Snakes 42d810a5e7 Leaderboard: fix user join for ea48c46b0f. 
After ea48c46b0f adds the leaderboard table for most blocked user,
it appeared that the user profile links did not appear correctly.
As such, it was necessary to join on the appropriate information.
This has been (mostly) resolved, excluding the removal of profile
picture because profile_url has logic in Python.

If someone knows SQLAlchemy better than I do, please redo this and
add the profile pictures back into the template. However, I got tired
of fighting with the ORM when I already knew the damn query.
 2022-05-25 06:09:13 -04:00
Snakes ea48c46b0f Leaderboard: add 'Most Blocked' hiscores. 2022-05-25 05:24:31 -04:00