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

723 Commits (998b966f2bcf7589c1524cd2f374e3a1df4fcd53)

Author SHA1 Message Date
Maximilian Ballard 3c506d768c
Redirect cuts off end of url for username redirect (#326) 
* Redirect cuts off end of url for username redirect

username redirect cuts off end of url, For example:

Username: faygo_sucks
Old_username: geese_suck
Behavior:                 "https://rdrama.net/@geese_suck" -> "https://rdrama.net/@faygo_suck"
Expected Behavior: "https://rdrama.net/@geese_suck" -> "https://rdrama.net/@faygo_sucks"

* Update users.py
 2022-08-03 01:09:35 +02:00
Aevann1 e5a2980d1b normalizing request.full_path 2022-08-01 20:03:29 +02:00
DrTransmisia 856f155b41
Errorcodejihad (#323) 
* formatmaxxing brained formatting

* formatmaxxing brained formatting: EPISODE 2

* Start implementing a .json interface for all logged users reddit-like

PROs:
- easier to debugmaxx applications
- good faith actors can scrap the site more easly :gigachadglow:
CONs:
- bad faith actors can scrap the site more easly :gigachadglow:
- jannitors lose a little of their power of allowlisting applications (they do it for free though)

anyways. I make this commit a separate commit so that Snakes can esclude it from the PR if he doesn't like it (cringe)

* /<username>/comments route now returns appropriate [citation needed] HTTP codes when called in JSON mode so that stupid JSON clients can crashmaxx

* More error codes (sorry I don't know how to squash)

* json endpoint. see other commit. I don't know how to squash
 2022-07-24 11:03:19 -04:00
Aevann1 ddeba62aeb fixing infinite redirections 2022-07-23 09:22:17 +02:00
Snakes eef6c25b0b
LGB: Permission block, follow, voters visibility. 2022-07-18 03:17:45 -04:00
Snakes 0c43deeee6
FEATURES: pronouns, kys, chat, house, /vote perm. 2022-07-18 02:43:20 -04:00
Aevann1 1088e38f34 order saved posts, comments and subscribed post by newest to oldest 2022-07-16 20:51:48 +02:00
Aevann1 c4499968ad make pins toggle sort-specific 2022-07-13 21:32:28 +02:00
Aevann1 2d21863e19 replace "request.host" with "SITE" 2022-07-13 20:14:37 +02:00
Aevann1 b2de11cb1a add "pins" toggle to the frontpage 2022-07-13 19:31:35 +02:00
Aevann1 aa4ab5b217 sneed 2022-07-13 17:16:53 +02:00
Aevann1 ec3b4357cf refactor sorting and time filter 2022-07-09 12:32:49 +02:00
Aevann1 a8fe49f232 kitchen sink commit, all over the place 2022-07-08 21:03:04 +02:00
Aevann1 c380848d47 remove leftover code from ill-fated joinedload attempt 2022-07-08 20:28:56 +02:00
Aevann1 ad1273995d notifications rework 2022-07-08 20:06:54 +02:00
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
Aevann1 0bd15d3914 burgers? 2022-05-23 21:00:14 +02:00
Aevann1 649f8d5323 vdffsd 2022-05-23 00:45:04 +02:00
Aevann1 0a74a98ec5 big ass commit 2022-05-23 00:15:29 +02:00
Aevann1 9bc310a6a4 sfd 2022-05-22 19:23:52 +02:00
Aevann1 969d1898b5 vid refactor 2022-05-22 18:13:19 +02:00
Aevann1 a83a72ca95 fsd 2022-05-20 16:51:14 +02:00
Aevann1 f4ac063354 sfd 2022-05-20 16:48:13 +02:00
Aevann1 b3740dca14 gf 2022-05-20 00:00:24 +02:00
Aevann1 db3ed7961f idk 2022-05-19 20:36:26 +02:00
Aevann1 ef0046f091 fsd 2022-05-18 21:29:07 +02:00
Aevann1 709e6b75e6 fsd 2022-05-14 16:04:14 +02:00
float-trip 9be2264a65 Fix profile CSS on localhost (#260) 2022-05-12 16:21:55 +02:00
Aevann1 b71ae6cc74 sf 2022-05-09 13:21:49 +02:00
Aevann1 71890a2dd1 sfd 2022-05-09 10:47:35 +02:00
Aevann1 9ac5dc6462 fsd 2022-05-07 08:09:51 +02:00
Aevann1 028563ad7d bgd 2022-05-07 08:04:14 +02:00
Aevann1 1b86af8def fg 2022-05-07 07:28:51 +02:00
Aevann1 ca61569b44 nv 2022-05-06 06:55:15 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
Aevann1 08f3c88b86 fds 2022-05-03 23:19:24 +02:00
Aevann1 47d01ed00b vb 2022-05-03 04:15:35 +02:00
Aevann1 bc2a20cd4b sfd 2022-05-01 23:44:38 +02:00
Aevann1 394402c0c1 fsd 2022-05-01 02:53:24 +02:00
Aevann1 2d4cf226e4 fds 2022-04-29 16:52:00 +02:00
Aevann1 b7ba495555 sfd 2022-04-29 16:48:13 +02:00
Aevann1 08ed7b044b fds 2022-04-29 16:47:34 +02:00
Aevann1 4ee8d15e2a fds 2022-04-29 16:47:03 +02:00
Aevann1 6856eb0dd0 sdf 2022-04-29 16:44:21 +02:00
Aevann1 49751bc6d8 fsd 2022-04-29 16:43:21 +02:00
Aevann1 9ba2593f4f fsd 2022-04-29 16:39:56 +02:00
Aevann1 d961ffc913 fds 2022-04-28 02:04:01 +02:00
Aevann1 9499cde2aa fsd 2022-04-28 00:38:03 +02:00
Aevann1 5a49be1d47 fsd 2022-04-26 15:40:37 +02:00
Aevann1 0f05bf3f94 fsd 2022-04-26 00:28:20 +02:00
Aevann1 4a782549c8 dfs 2022-04-24 23:09:21 +02:00
Aevann1 457a717075 fds 2022-04-24 00:09:25 +02:00
Aevann1 d026174472 fds 2022-04-23 00:48:01 +02:00
Aevann1 bc762ff06c fsd 2022-04-22 17:05:34 +02:00
Aevann1 bd6349d448 Revert "RESTORE CACHE" 
This reverts commit 3d193357ef.
 2022-04-19 22:22:24 +02:00
Aevann1 3d193357ef RESTORE CACHE 2022-04-19 22:21:47 +02:00
Aevann1 cf886f13d1 fds 2022-04-18 20:38:26 +02:00
Aevann1 78ea56837f fds 2022-04-17 22:20:40 +02:00
Aevann1 99cb01d9fc fdsfds 2022-04-15 18:28:08 +02:00
Aevann1 43006ba440 fds 2022-04-15 17:03:02 +02:00
Aevann1 348d698239 fds 2022-04-14 18:26:41 +02:00
Aevann1 3b513d0841 gfd 2022-04-10 01:41:36 +02:00
Aevann1 1dd380e864 gdf 2022-04-07 00:37:25 +02:00
Aevann1 889a8948c4 fsd 2022-04-04 03:41:20 +02:00
Aevann1 6647457a4b dg 2022-04-03 17:53:20 +02:00
Aevann1 c9b3e8528d fsd 2022-04-02 21:42:21 +02:00
Aevann1 3ef2e36eec sfd 2022-04-02 21:40:45 +02:00
Aevann1 063f3111bd fsd 2022-04-02 21:40:18 +02:00
Aevann1 7713fd891d fsd 2022-04-02 19:11:35 +02:00
Aevann1 ae82ada424 fsd 2022-04-02 18:54:27 +02:00
Aevann1 b538d2a24c gdfg 2022-03-31 18:28:53 +02:00
Aevann1 78dc8746ca fsd 2022-03-28 00:13:15 +02:00
Aevann1 066ae95921 fsd 2022-03-28 00:11:26 +02:00
Aevann1 c837d5f724 fsdfsd 2022-03-28 00:07:17 +02:00
Aevann1 bdbfbd2d20 gh 2022-03-25 00:26:18 +02:00
Aevann1 f65ff6a353 fsd 2022-03-22 17:45:52 +02:00
Aevann1 30c8410500 fds 2022-03-22 02:56:41 +02:00
Aevann1 b36f085a51 vote relationships 2022-03-22 02:01:21 +02:00
Aevann1 762f5c5acc gf 2022-03-21 23:46:10 +02:00
Aevann1 ec80510e4b fds 2022-03-21 22:56:43 +02:00
Aevann1 762b93df76 fh 2022-03-17 17:14:22 +02:00
Aevann1 514d6ec126 right 2022-03-09 03:44:53 +02:00
Aevann1 b2c5cd93a5 fsd 2022-03-06 21:18:01 +02:00
Aevann1 af801c395a sfd 2022-03-06 20:27:43 +02:00
Aevann1 bf391394a8 bad PR 2022-03-05 22:53:39 +02:00
Aevann1 67d807f5b4 fdsfsd 2022-03-05 02:28:47 +02:00
Aevann1 35ec2a7712 fart 2022-03-05 00:46:20 +02:00
Aevann1 b7ab468ae0 jesus christ im an idiot 2022-03-03 22:22:23 +02:00
Aevann1 b6ad0da4b9 carp 2022-03-02 02:05:30 +02:00
Aevann1 1576fcd57d farts on u 2022-02-28 04:06:15 +02:00
Aevann1 ddbb610142 regex 2022-02-27 23:57:44 +02:00
Aevann1 e0dfe332c2 cope 2022-02-26 20:53:17 +02:00
Aevann1 6cc9cddef0 fug 2022-02-26 16:21:07 +02:00
Aevann1 06e496bc8f annoying 2022-02-26 15:31:49 +02:00
Aevann1 36a01f05c9 vc 2022-02-25 12:54:00 +02:00
Aevann1 d5216dd65b vc 2022-02-24 18:48:24 +02:00
Aevann1 9590e73b5d farin 2022-02-24 11:24:22 +02:00
Aevann1 14c7148eed fd 2022-02-24 10:28:13 +02:00
Aevann1 15aa2bfc0a vc 2022-02-22 11:15:45 +02:00
Aevann1 790eb5019a dfs 2022-02-22 06:43:37 +02:00
Aevann1 bf31533fcb cvb 2022-02-21 06:04:29 +02:00