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

775 Commits (eb98740f972fe3e87e1b7d6757a0afa6792031a6)

Author SHA1 Message Date
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
Aevann1 6b96c284e4 vc 2022-02-21 05:16:57 +02:00
Aevann1 2b69077960 vc 2022-02-21 04:35:02 +02:00
Aevann1 915d36d319 dfs 2022-02-21 04:29:06 +02:00
Aevann1 b48cc5314f bv 2022-02-21 03:35:01 +02:00
Aevann1 aa6a4623a7 gh 2022-02-21 02:16:20 +02:00
Aevann1 c3ddb28307 fds 2022-02-20 04:16:19 +02:00
Aevann1 20a8730e12 dg 2022-02-20 04:15:42 +02:00
Aevann1 e6f94a5920 hg 2022-02-20 04:14:53 +02:00
Aevann1 2d80760df3 fd 2022-02-20 04:07:47 +02:00
Aevann1 b7b584e539 bcv 2022-02-20 04:07:20 +02:00
Aevann1 46a9091c17 fd 2022-02-20 04:06:00 +02:00
Aevann1 c15905363b cvb 2022-02-20 04:05:15 +02:00
Aevann1 a67bacbd81 bn 2022-02-20 04:00:03 +02:00
Aevann1 127466fdbc gdf 2022-02-20 03:56:33 +02:00
Aevann1 8544781ee1 bcv 2022-02-20 03:54:56 +02:00
Aevann1 13e575a6b5 fgh 2022-02-19 23:42:55 +02:00
Aevann1 d5a0b4afc1 xvc 2022-02-18 21:42:23 +02:00
Aevann1 7811a4f6e4 xcv 2022-02-18 21:40:23 +02:00
Aevann1 05b75940da xcv 2022-02-18 21:39:48 +02:00
Aevann1 9fcb1f0164 zxc 2022-02-18 21:39:06 +02:00
Aevann1 bf6aff7344 xcv 2022-02-18 21:38:45 +02:00
Aevann1 ce2a4e9d6b vxc 2022-02-18 21:37:03 +02:00
Aevann1 903d729b4c fbd 2022-02-18 21:35:52 +02:00
Aevann1 98394b3e6d cvx 2022-02-18 21:33:08 +02:00
Aevann1 3595ef758b fsd 2022-02-18 21:29:08 +02:00
Aevann1 e322213a3b vxc 2022-02-18 21:28:05 +02:00
Aevann1 55b3935604 vxc 2022-02-18 21:27:28 +02:00
Aevann1 0d6ff91355 fds 2022-02-18 21:26:19 +02:00
Aevann1 904144a3bb dfs 2022-02-18 21:25:48 +02:00
Aevann1 f306d0b18c sfd 2022-02-18 21:25:30 +02:00
Aevann1 6c80e92672 xvc 2022-02-18 21:24:45 +02:00
Aevann1 0b304b778e , 2022-02-18 21:20:43 +02:00
Aevann1 e48e294b95 vxc 2022-02-18 21:18:44 +02:00
Aevann1 8ff1acffef xcv 2022-02-18 21:18:10 +02:00
Aevann1 919123d009 fd 2022-02-18 21:17:09 +02:00
Aevann1 0885132257 xcv 2022-02-18 21:16:58 +02:00
Aevann1 e380b58bcb vcx 2022-02-18 21:15:59 +02:00
Aevann1 74af0cc459 cv 2022-02-18 21:15:49 +02:00
Aevann1 beb018fd3d xcv 2022-02-18 21:13:21 +02:00
Aevann1 2875f28b82 xvc 2022-02-18 21:12:14 +02:00
Aevann1 45f30dc403 xvc 2022-02-17 05:18:54 +02:00
Aevann1 729e4a4c62 g 2022-02-16 03:16:01 +02:00
Aevann1 b9f50d42f6 gf 2022-02-16 02:23:46 +02:00
Aevann1 ec9797ff18 f 2022-02-16 00:54:17 +02:00
Aevann1 ee7bcfb491 sdf 2022-02-15 00:54:05 +02:00
Aevann1 8db4b363f8 nb 2022-02-14 00:35:55 +02:00
Aevann1 de4e019abc sfd 2022-02-13 23:25:09 +02:00
bAWario fa926d2e23 added endpoint for getting user data by user_id (#208) 
Co-authored-by: Captain <Captain@PC>
 2022-02-13 11:50:39 -08:00
Aevann1 22eaa9e7f8 xvc 2022-02-13 01:10:29 +02:00
Aevann1 97febe0080 big chungus commit 2022-02-12 01:32:14 +02:00
Aevann1 8d77d0e982 gdf 2022-02-11 20:44:12 +02:00
Aevann1 90fc18bcb8 xvc 2022-02-10 01:29:34 +02:00
Aevann1 8a37c6d118 vxc 2022-02-10 01:12:17 +02:00
Aevann1 c810421821 bv 2022-02-10 01:08:55 +02:00
Aevann1 ad89b83304 bv 2022-02-08 10:58:35 +02:00
Aevann1 bcb66c6f72 vb 2022-02-07 17:07:46 +02:00
Aevann1 022e300d2f SDF 2022-02-06 12:54:05 +02:00
Aevann1 5098d30b57 sdf 2022-02-06 01:24:54 +02:00
Aevann1 f122f289b9 fsd 2022-02-04 18:33:50 +02:00
Aevann1 feae0725b7 fsd 2022-02-04 18:13:03 +02:00
Aevann1 5ade054494 sd 2022-02-04 10:59:12 +02:00
Aevann1 27766290a9 vxc 2022-02-03 08:39:02 +02:00
Aevann1 26bfdd4f33 sfd 2022-02-01 01:10:24 +02:00
Aevann1 b0cd33dcf7 biggest money 2022-01-31 03:41:04 +02:00
Aevann1 1a362d29a3 c 2022-01-30 23:37:46 +02:00
Aevann1 381f295998 vcx 2022-01-30 23:19:59 +02:00
Aevann1 01711e6990 c 2022-01-30 22:01:50 +02:00
Aevann1 c831ca7d2e zxc 2022-01-29 15:57:55 +02:00
Aevann1 38e853250e fsd 2022-01-29 04:01:16 +02:00
Aevann1 70813c686a dfs 2022-01-29 03:20:02 +02:00
Aevann1 0b3ddaf921 vcx 2022-01-28 22:55:59 +02:00
Aevann1 716b4ee2ea czx 2022-01-28 22:02:35 +02:00
Aevann1 c9890feb4a fsd 2022-01-28 08:34:09 +02:00
Aevann1 1f4414330e xvc 2022-01-25 05:37:55 +02:00
Aevann1 0bd1afc70e fsd 2022-01-25 03:59:58 +02:00
Aevann1 c26b0cc2d8 xc 2022-01-24 23:49:12 +02:00
Aevann1 0d5b819b33 cvcv 2022-01-24 23:41:13 +02:00
Aevann1 e493592a23 vc 2022-01-24 22:26:15 +02:00
Aevann1 dedb9bbaa0 vc 2022-01-24 22:04:23 +02:00
Aevann1 15cc5c612e vc 2022-01-24 21:40:58 +02:00
Aevann1 25d9419388 vcvc 2022-01-24 19:37:37 +02:00
Aevann1 b094e976dc cvvc 2022-01-24 18:49:23 +02:00
Aevann1 c2272b9264 cxv 2022-01-24 17:44:27 +02:00
Aevann1 8b381284c6 yolo 2022-01-24 01:06:34 +02:00
Aevann1 594fbfd41c vcxxcv 2022-01-23 18:54:57 +02:00
Aevann1 527c9da071 fdssfd 2022-01-23 17:29:13 +02:00
Aevann1 65daa0d82c cvxcvx 2022-01-22 21:49:12 +02:00
Aevann1 0b93902c2b cxzzcx 2022-01-22 21:21:16 +02:00
Aevann1 9b4bd19c74 cxvxc 2022-01-22 18:37:58 +02:00
Aevann1 04f64d494d fdsfd 2022-01-22 18:36:01 +02:00
Aevann1 5cc18bef1e chaos unfolds 2022-01-22 16:08:14 +02:00
Aevann1 9c1c225ed9 cxzxzc 2022-01-22 12:14:15 +02:00
Aevann1 4ff0f6ea99 cxcxc 2022-01-22 11:15:18 +02:00
Aevann1 050bea7f96 fsd 2022-01-22 03:13:54 +02:00
Aevann1 4a234e0121 fdsfds 2022-01-22 03:13:41 +02:00
Aevann1 775b378de2 cxvcvx 2022-01-21 19:21:46 +02:00
Aevann1 83b2ec51f6 gfd 2022-01-21 14:30:29 +02:00
Aevann1 79456fc7d1 bc 2022-01-21 14:28:25 +02:00
Aevann1 1e22d766f9 testing 2022-01-21 13:14:24 +02:00
Aevann1 4aa0774197 fdsfds 2022-01-19 16:16:17 +02:00
Aevann1 dc17917cb1 fds 2022-01-19 16:14:38 +02:00
Aevann1 23a85eab1f dfs 2022-01-19 14:44:05 +02:00
Aevann1 a60bc5e578 sfsf 2022-01-19 14:21:20 +02:00
Aevann1 e201235f49 sfd 2022-01-19 13:47:13 +02:00
Aevann1 a8eadb6f63 dfs 2022-01-19 13:47:00 +02:00
Aevann1 cbbdac776f fds 2022-01-19 13:45:12 +02:00
Aevann1 b23d672af1 fds 2022-01-19 12:39:22 +02:00
Aevann1 16823faeb5 fds 2022-01-19 12:08:30 +02:00
Aevann1 8bfa11b021 fds 2022-01-19 12:08:19 +02:00
Aevann1 3bce2fe5b3 fds 2022-01-19 12:03:11 +02:00
Aevann1 7e13965111 fsd 2022-01-19 11:55:55 +02:00
Aevann1 3cb523625f fds 2022-01-19 10:14:33 +02:00
Aevann1 4cc6f66f17 fds 2022-01-19 09:33:21 +02:00
Aevann1 111756019b fds 2022-01-19 09:31:04 +02:00
Aevann1 b0765b29ff fsd 2022-01-19 09:05:16 +02:00
Aevann1 279284c819 fsd 2022-01-19 09:02:53 +02:00
Aevann1 6a40271e5d loserboard 2022-01-19 08:59:46 +02:00
Aevann1 bb89f191e8 fds 2022-01-19 08:55:10 +02:00
Aevann1 e968024ff2 fds 2022-01-19 08:43:15 +02:00
Aevann1 a75fb0fcdf fds 2022-01-19 08:32:50 +02:00
Aevann1 0f58d70cce 100000000k 2022-01-19 08:20:05 +02:00
Aevann1 a0941a7f15 fdsfs 2022-01-18 19:07:45 +02:00
Aevann1 2b45f400d0 fsd 2022-01-18 18:56:22 +02:00
Aevann1 2d972f1a6c fds 2022-01-18 18:55:05 +02:00
Aevann1 2c8191f925 fds 2022-01-18 18:47:32 +02:00
Aevann1 606369e6a5 fds 2022-01-18 18:46:04 +02:00
Aevann1 3c5899eb59 fsd 2022-01-18 18:43:24 +02:00
Aevann1 1df5675f3a fds 2022-01-18 18:42:32 +02:00
Aevann1 21a14ef660 fds 2022-01-18 18:37:45 +02:00
Aevann1 877682b968 fsd 2022-01-18 18:31:29 +02:00
Aevann1 8bde3beba3 werre 2022-01-18 18:28:33 +02:00
Aevann1 6cd3c421f2 sdf 2022-01-18 18:24:33 +02:00
Aevann1 02f9de3a47 fsd 2022-01-18 18:22:59 +02:00
Aevann1 d7da85049d fd 2022-01-18 18:19:49 +02:00
Aevann1 f1aa747657 vcx 2022-01-18 18:17:02 +02:00
Aevann1 5171085426 fds 2022-01-18 18:07:05 +02:00
Aevann1 13c67dad7e fds 2022-01-18 18:05:30 +02:00
Aevann1 2ee3903980 fds 2022-01-18 18:04:42 +02:00
Aevann1 2dd37d0ac5 fsd 2022-01-18 17:58:12 +02:00
Aevann1 d1c1e67836 dev 2022-01-18 17:56:42 +02:00
Aevann1 209fc1e6ef fds 2022-01-18 15:46:11 +02:00
Aevann1 cdac52ca8d dfs 2022-01-18 14:51:33 +02:00
Aevann1 7f06386cc3 fds 2022-01-18 14:49:55 +02:00
Aevann1 7ecd8f1cfd fsd 2022-01-18 14:31:56 +02:00
Aevann1 49bf847f87 fds 2022-01-18 14:29:59 +02:00
Aevann1 373fd7f1ce fds 2022-01-18 14:29:20 +02:00
Aevann1 2ba1e252b8 test2 2022-01-18 14:24:16 +02:00
Aevann1 0bdf051b41 test 2022-01-18 14:23:09 +02:00