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

15556 Commits (a4ca9fc1aabcbc43a434a1a77cfd34386ae48b2a)

Author SHA1 Message Date
Aevann1 a4ca9fc1aa fds 2022-05-22 18:19:57 +02:00
Aevann1 10723940d1 sfd 2022-05-22 18:19:49 +02:00
Aevann1 ee9b5f2bcd g 2022-05-22 18:15:40 +02:00
Aevann1 236ce22c52 fsd 2022-05-22 18:14:32 +02:00
Aevann1 6633de2dd5 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-22 18:13:22 +02:00
Aevann1 969d1898b5 vid refactor 2022-05-22 18:13:19 +02:00
Aevann1 defc7ad944 sneed 2022-05-22 16:00:02 +00:00
Aevann1 d377ad4b99 sneed 2022-05-22 11:00:01 +00:00
Aevann1 fca3249706 fd 2022-05-22 10:29:24 +00:00
Aevann1 0af46237f6 stripper 2022-05-22 12:26:59 +02:00
Aevann1 7f41ddcd58 fd 2022-05-22 10:24:25 +00:00
Aevann1 8744252edb fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-22 10:23:08 +00:00
Aevann1 53dd9056b8 fsd 2022-05-22 12:23:02 +02:00
Aevann1 37a6ce39f5 fixing https://rdrama.net/post/69817/tfw-you-will-never-troll-harder/1961118?context=8#context 2022-05-22 12:20:11 +02:00
Aevann1 59b3ddd6ae sneed 2022-05-22 10:00:01 +00:00
Aevann1 c5faa991b5 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-22 11:05:25 +02:00
Aevann1 f0d3f35a29 fsd 2022-05-22 11:05:23 +02:00
Aevann1 1e471759df fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-22 09:02:40 +00:00
Aevann1 37850cbf6c sneed 2022-05-22 09:00:01 +00:00
Aevann1 8807ed0d13 fds 2022-05-22 10:58:42 +02:00
Aevann1 f892b18d76 sneed 2022-05-22 08:00:01 +00:00
Snakes 23d93b2f19 Fix Snappy post pinning condition. 
Recently, caa81452f4 relaxed the condition for Snappy pinning a post
from `body.startswith(':#marseypin:')` to the same sans trailing colon.
I believe this was intended to allow :marseypin2: to also lead to post
pinning. However, the amusing, though incorrect, side effect is that
:marseypinkcat: and :marseypinochet: can now also lead to Snappy pins.
This has been remedied by explicitly defining the two conditions we
want rather than hoping all :marseypin [sic] are about pinning.
 2022-05-22 00:36:45 -04:00
Aevann1 a3683099ff fds 2022-05-21 17:35:50 +02:00
Aevann1 00ac6ea29b fds 2022-05-21 17:35:36 +02:00
Aevann1 8019613ae7 fsd 2022-05-21 17:08:33 +02:00
Aevann1 b9316c0073 fsd 2022-05-21 15:19:02 +02:00
Aevann1 cad9952f2b Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-21 14:36:24 +02:00
Aevann1 20cc20d806 fsd 2022-05-21 14:36:22 +02:00
scitzocel 6e96f71396 Add files via upload (#281) 2022-05-20 23:24:46 -04:00
Snakes 3d9c302fae Blackjack: add five card charlie rule. 2022-05-20 23:08:20 -04:00
Aevann1 15f811f2fc sneed 2022-05-21 00:00:01 +00:00
Snakes 6fbaf2f15f Partially revert: cb1bb4e43b, 2737a6ca47. 
cb1bb4e43b40: Server cleaned out schema.sql for some reason and
it was autocommitted by the sneed cron. This is why the tests fail.

2737a6ca479b: Originally pulled from themotte/rDrama @ 309bf44f12ba.
In light of the fact this is breaking comment previews right now and
the actual XSS threat is unclear, given we sanitize serverside,
this is reverted until I find time to look at it.
 2022-05-20 19:15:44 -04:00
Snakes 9a23c195ed Fix overpermissive email regex. 2022-05-20 18:49:00 -04:00
Aevann1 cb1bb4e43b sneed 2022-05-20 22:00:01 +00:00
Aevann1 2737a6ca47 sfd 2022-05-20 23:41:08 +02:00
Aevann1 8af9096c7b Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-20 23:28:23 +02:00
Aevann1 4f3eb7f79e fsd 2022-05-20 23:28:20 +02:00
Snakes 76fd1342f3 Fix @mention replacement. 
Comments of the style e.g. "@TLSM / @TLSM2" would mistakenly be
`sanitize`d to have identical links only on "@TLSM", the latter
instance having a dangling 2 on the end. It seems this is purely an
issue with text formatting; alerts.py @ NOTIF_USERS had no such
issues. The root cause appears to be partly an optimization and
partly the use of str.replace without a count limit.
 2022-05-20 17:04:36 -04:00
Aevann1 75d4f0d3aa Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-20 22:57:53 +02:00
Aevann1 663e61f36f fsd 2022-05-20 22:57:52 +02:00
Aevann1 3870aea654 fMerge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-20 20:50:55 +00:00
Aevann1 2bcca0f1f1 fsd 2022-05-20 22:50:43 +02:00
Aevann1 bc65983e9e sneed 2022-05-20 20:00:02 +00:00
Aevann1 2cfd7c74a0 fds 2022-05-20 21:00:13 +02:00
Aevann1 aed84df4ad fsd 2022-05-20 20:45:12 +02:00
Aevann1 9c978a13ac fsd 2022-05-20 20:42:18 +02:00
Aevann1 028e6217c6 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-20 20:32:40 +02:00
Aevann1 4f9df8c5bf sdf 2022-05-20 20:32:36 +02:00
Aevann1 183bedf522 sneed 2022-05-20 17:00:01 +00:00
Aevann1 8ced6bee9e Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-05-20 18:02:29 +02:00