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

15963 Commits (4a1e6cc726d3aed3dc35f11a40be7d3147783ea5)

Author SHA1 Message Date
Aevann1 4a1e6cc726 a 500 error is much better than an XSS, bro 2022-06-07 12:03:51 +02:00
Snakes cb5f9d05c6 templates: Fix improper plurals, create helpers. 
Previously, the three instances of 'Report[s]' and one instance of
'Coin[s]' in the UI templates were always pluralized, even when they
referred to a singular instance. This has been corrected by creating
a `plural` helper macro.

Additionally, this was used as impetus to create `utils/helpers.html`
to eventually move more recurring template logic into macros.
 2022-06-07 05:26:22 -04:00
Aevann1 f966262b97 Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-06-07 11:18:12 +02:00
Aevann1 d761fc27cd Revert "Make CARP_ID's flair uneditable by others." 
This reverts commit c2266985b7.
 2022-06-07 11:18:09 +02:00
Aevann1 ccb20fe714 sneed 2022-06-07 04:00:01 +00:00
Snakes 70b96162a7 Fix banned domain info leak in modlog. 2022-06-06 22:18:56 -04:00
Aevann1 22427d7209 sneed 2022-06-06 23:06:47 +00:00
Aevann1 aab7a49517 sneed 2022-06-06 23:06:37 +00:00
Snakes dece3fd460 Add user title coin cost parameter. 2022-06-06 19:02:23 -04:00
Aevann1 4aeb438c6b extend removal notifs from only me to all Lvl3 jannies 2022-06-06 07:50:38 +02:00
Aevann1 282f8d885c Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-06-06 07:42:21 +02:00
Aevann1 b2ec368a7e give me a better discord role 2022-06-06 07:42:19 +02:00
Snakes 7556fe8988 Add lottershe badge logic, badge helper. 2022-06-06 00:07:38 -04:00
Aevann1 43dbcadc6b add me into jannycord 2022-06-05 17:05:43 +02:00
Aevann1 0587120575 sneed 2022-06-05 07:00:01 +00:00
Aevann1 ec7b53f7a4 sneed 2022-06-05 04:00:02 +00:00
Snakes 0e0a8d391b Amend 20b136909: string comparison bug. 
Fixes logic which failed because user_id was a string which I
improperly treated as an integer for comparisons.
 2022-06-04 23:58:03 -04:00
Snakes c2266985b7 Make CARP_ID's flair uneditable by others. 
This is a kludge solution that sticks special case logic in places
it shouldn't be. However, community management demands necessitate it
quickly. Of the three ways to change a flair (customtitle), this
prevents using flairlocks and admin flair editing on the user with
CARP_ID. Only the user himself may change his flair through settings.
 2022-06-04 23:34:44 -04:00
Aevann1 b6059201c0 sneed 2022-06-04 18:00:02 +00:00
Snakes 5fb358a32a Add more TLDs to sanitize. 2022-06-03 17:01:32 -04:00
Aevann1 9939054b4b sneed 2022-06-03 21:00:01 +00:00
Aevann1 81aa543a7f sneed 2022-06-03 14:00:02 +00:00
Snakes 998a8f462e Add links to orphan endpoints. 2022-06-03 06:29:35 -04:00
Aevann1 79fc0110fb sneed 2022-06-03 07:00:02 +00:00
Snakes b306d113ad Lottery: Fix treasure adding coins to manager. 
It was observed in prod that the lottery prize as tracked by the DB
had diverged from the amount held in the Lottershe manager account.
This appears to be the result of grant_lottery_tickets_to_user
adding the # of _tickets_ rather than the value of those tickets to
the manager.
 2022-06-03 02:24:32 -04:00
Aevann1 3dc9027f7c sneed 2022-06-03 06:00:02 +00:00
Snakes 843ff51ace Make post rate limit site-specific. 2022-06-02 22:10:59 -04:00
Aevann1 692a9adb99 sneed 2022-06-03 02:00:02 +00:00
Aevann1 0a97bb2fe8 sneed 2022-06-03 01:00:01 +00:00
Aevann1 9956ffcb19 sneed 2022-06-03 00:29:01 +00:00
Snakes 379ae664a3 Make PIN_LIMIT a per-site constant. 2022-06-02 19:45:33 -04:00
Snakes 6b9a133204 Kitchen sink commit, misc. content updates. 
- Increment cache version on popover badges.
- Add comments+submission_listing.js to assetcache to support ^.
- Append new words to wordle list.
- Cache bust assorted assets for recent PRs.
 2022-06-02 19:32:13 -04:00
outruncolors dfd521b652 Add quantity field to purchasing tickets / Make Chapose the beneficiary (#302) 
* Add quantity field to purchasing tickets

* Remove height requirement for div (manlets  seething)
 2022-06-02 19:19:49 -04:00
float-trip 58c4b62163 Some fixes (#300) 
* Narrow emoji_regex

* Fix mirrored pat emojis

* Fix ban icon on posts/comments
 2022-06-02 19:18:10 -04:00
Aevann1 c839dd5103 sneed 2022-06-02 23:00:01 +00:00
Aevann1 738ab0bb5d sneed 2022-06-02 13:00:02 +00:00
Snakes 2008c09136 Add 'filter' to allowed_styles. 2022-06-02 06:14:20 -04:00
Snakes 71b0022d5c Fix df3127785a9: broke JSON syntax. 2022-06-02 05:28:12 -04:00
Snakes df3127785a Rename 'shit emojis.json' for sanity. 2022-06-02 05:15:41 -04:00
Snakes f799612b66 emoji content: hard wrap json, add 4 more. 2022-06-02 05:13:30 -04:00
Aevann1 e6f05da9c2 sneed 2022-06-02 08:55:47 +00:00
Aevann1 007a1110fb sneed 2022-06-02 08:28:10 +00:00
Aevann1 64e6c91d21 sneed 2022-06-02 08:27:50 +00:00
Snakes 793e580ed3 Move badge_defs SQL from seed-db to sneed. 
The recent commit 9168676f78 expanded schema.sql to contain the
badge_defs table contents. Because seed-db.sql was never properly
maintained, I see it as more desirable to have it exported by our
(slightly janky) server auto-commit pipeline.

Additionally, seed-db.sql had badge_defs INSERTs removed.
While working on the file, the bulk `INSERT INTO marseys...` line was
hard-wrapped for clarity and sanity.
 2022-06-01 22:38:59 -04:00
Aevann1 9168676f78 sneed 2022-06-02 02:32:38 +00:00
Aevann1 659818c978 sneed 2022-06-02 02:00:02 +00:00
Aevann1 12f51a33cf sneed 2022-06-02 00:38:34 +00:00
Snakes 9bb84baf61 theme: Fix dramblr readability. 2022-06-01 20:01:26 -04:00
Snakes aa9b59e1cb Improve lottery UI theme compat. 2022-06-01 18:07:02 -04:00
Snakes fd1429a82f PCM content: swap banner. 2022-06-01 16:08:33 -04:00