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

114 Commits (a76344f7d092182189c327c9d2ad704906203b1a)

Author SHA1 Message Date
Snakes c95f5a537a
Fix "Copy link" action not including domain. 2022-11-01 06:06:45 -04:00
Aevann1 23883c530b constantify TRUESCORE_DONATE_LIMIT 2022-10-30 16:18:42 +02:00
Aevann1 ad358650e1 remove retarded bullshit I wasn't consulted about 2022-10-27 19:53:08 +02:00
gooseman 67826a52e0 remove hw 2022-10-24 15:28:43 -07:00
gooseman 8b98eabbb9 simultaneous hosts 2022-10-24 15:28:43 -07:00
justcool393 c4b2c6f3f5
html head refactor (#412) 
* start html head refactor
this is a bit of a doozy tbh and will probably take a while. the templates are very highly duplicated but not duplicated enough to be an easy little thing

oh well, so it goes.

* some easier html head ones

* add chat, html_head, sign_up_failed_ref, sign_up, submit

* CSP: put it in const.py instead of this weird thing we did before

* fix syntax error

* better call the actual macros

* fix prev commit

* import into settings2

* fix prev commit

* set CSP properly if localhost

* some title fixes i think

* login page

* fix prev commit

* hacky thing to get titles to work i think

* {{stylesheets()}}

* fix prev commit

* title stuff

* cries uncontrollably

* submission fixes i think

* fix prev commit i think

* submission fixes ekfjdhfkdjf

* submission fixes 4

* this may fix submissions idk tbh

* default template: make it a little better on post pages

* default template: some efficiency
 2022-10-21 13:39:45 -05:00
Aevann1 9efc0f0a68 unify email regex 2022-10-19 12:39:03 +02:00
Aevann1 b81eceead5 fix prev commit 2022-10-18 19:25:28 +02:00
justcool393 60284daa8e replace all of the duplicated age strings with make_age_string 2022-10-15 11:11:43 -07:00
Aevann1 c24851dbb3 only calculate users when we actually need them 2022-10-15 09:31:24 +02:00
Aevann1 998b966f2b remove unnecessary shit in wrappers 2022-10-11 15:19:55 +02:00
Aevann1 cfd4b6399f use mailgun again 2022-10-08 02:44:02 +02:00
Aevann1 aa8e7055fb rework env vars a bit 2022-10-08 02:43:04 +02:00
Snakes 3f338fc3f2 WPD: add login required explanatory text. 2022-10-05 19:17:42 -04:00
Aevann1 a7acbe9831 show our email to loggedout visitors in /contact 2022-10-01 12:14:46 +02:00
justcool393 057bc360bf don't duplicate get checks for posts 2022-09-30 15:51:17 -07:00
Snakes d0d67085e3
Rebuild assetcache on inotify events. 2022-09-27 02:07:32 -04:00
Snakes a3664e252c
assetcache: change asset_siteimg macro to filter. 2022-09-24 03:14:20 -04:00
Snakes ac66eb07e9
Implement hash-based cachebusting module. 
Adds the files.helpers.assetcache module, which runs on worker startup
to compute CRC digests of files in given asset directories and provides
a Jinja filter to create cachebusted URLs based on those hashes.
This alleviates the need to increment cachebusting counters in query
strings entirely for files it is applied to.
 2022-09-24 02:40:26 -04:00
Aevann1 f7727f1029 refactor sigs 2022-09-19 19:51:40 +02:00
Aevann1 2fa71a252b kofi integration 2022-09-13 18:53:19 +02:00
Aevann1 b0057483c8 link the admigger upload threads in the admin panel for easier access 2022-09-11 09:11:10 +02:00
Aevann1 eec0a6a436 casino shit 2022-09-04 23:35:18 +02:00
outruncolors 5e1d98a3bf
WIP: Add Casino (Do Not Merge) (#341) 
* Add new /casino route and template

* Consolidate lottery into casino and add initial template for slots

* Change /lottery route to /casino and replace icon with usd symbol and change sitewide const to reflect change

* Hook up new slots method to casino

* Enable Marseybux spending in casino slots

* Add UI for playing blackjack in casino

* First connection of blackjack UI to backend

* Add protective clause thanks to help from carpathianflorist.

* Create new Casino_Game relation and persist inside of blackjack

* Connect new slots behavior to Casino_Game table

* Create UI action management logic

* Add blackjack game status checker which adds persistence for blackjack

* Gonna handle this better, hold on

* Reorganize blackjack helper methods

* Reorganize casino.js to account for new changes

* Connect up to frontend

* Little changes ya know

* Display a message when winning in Blackjack

* Fix some issues with double down and insure

* Revert "remove owoify-py from requirements"

This reverts commit 4454648ea2.

* A little casino styling change

* Reorganize into a casino block

* Smallenize the card'

* Remove references to old game data on comments

* Add sql migration file

* Remove logic to drop old columns

* Fix two forgotten conflicts
 2022-09-04 22:53:34 +02:00
Aevann1 768a2eda24 clarify CC function in WPD and PCM 2022-09-01 21:12:05 +02:00
Aevann1 8ee8a44256 add approved image hosts to /formatting 2022-08-26 17:20:20 +02:00
Aevann1 734844291c fix bug I introduced 2022-08-20 14:38:46 +02:00
Aevann1 6b72433ed2 change patron terminology for not rdrama-sites 2022-08-14 14:59:56 +02:00
Aevann1 9557553508 add chat users-online counter to chat icon on desktop header 2022-08-13 09:42:06 +02:00
Snakes 4fddb88c1a Hide Android app menu on sites without app. 2022-08-07 02:57:30 -04:00
Snakes 8f7d05d62d
Refactor feature flags to dict. 
In anticipation of adding about a dozen more features flags to support
work for LGB, PIN_ENABLED and PROCOINS_ENABLED have been moved to the
FEATURES dict in const.py. More generally looking to create a unified
interface for logically-related constants, perhaps to support e.g.
later moving these settings from hardcoded constants to data.
 2022-07-18 01:10:01 -04:00
Aevann1 f7c2befeed allow deux jannies to add badges 2022-07-13 14:56:30 +02:00
Aevann1 382df30e1f show ALL timestamps in user's timezone + move scripts to the bottom of HTML templates to mimic rocketloader's behavior on localhost (for testing) 2022-07-09 10:35:47 +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 b617321529 move all env-getting to .const 2022-07-08 18:21:13 +02:00
Snakes 6ad935e12a Permission flags UI visibility; start PERMS dict. 
Original work started for WPD and LGB, who wish to restrict flags
visibility in the UI based on admin_level. To support this change and
upcoming changes, `const.PERMS: string -> int` was created.
Potentially targetting a future design where Permissions is a proper
business object integrated with the User model; however, for now just
looking toward getting admin_level magic numbers centralized.

This commit applies PERMS to: create_hole, flags visibility in UI,
flag removal in UI & backend. Flag visibility in Comment & Submission
json_raw methods is unaffected to avoid needing a user object to
build the JSON.
 2022-07-06 23:45:33 -04:00
Aevann1 e8f5827c5e more testing 2022-07-01 15:34:11 +02:00
Snakes 1b9237ceaf Add assetcache.asset_siteimg, has_logo. 
Commit began by changing the duplicated SITE_NAME conditional in the
header to use a `has_logo` param, much like the recent `has_sidebar`.
From there, a need to include site-specific assets in assetcache was
revealed, adding the `asset_siteimg(...)` macro. This was applied
quite broadly, though not comprehensively.
 2022-07-01 01:55:53 -04:00
Aevann1 42a6b5731a sneed 2022-06-28 08:17:21 +02:00
Snakes 1d500917ad Improve header currency display style. 2022-06-27 00:09:32 -04:00
Snakes e0c3c79902 WPD: Require flairs on all posts. 2022-06-26 03:42:56 -04:00
Snakes 268c23e2f8 WPD: make holes more flair-like in UI. 2022-06-26 03:42:15 -04:00
Snakes cd556b6d8e Refactor UI name of hole/sub to constant. 2022-06-26 03:41:28 -04:00
Aevann1 f34c4e1196 stop using app.config for our own stuff 2022-06-24 17:08:57 +02:00
Aevann1 f4aa70cc74 Revert "Add user title coin cost parameter." 
This reverts commit dece3fd460.
 2022-06-13 20:10:53 +02:00
Snakes dece3fd460 Add user title coin cost parameter. 2022-06-06 19:02:23 -04:00
Outrun Colors, LLC b9dc28e6d1 Don't show lotteries on the sister sites 2022-05-29 20:43:16 -05:00
Aevann1 162bf9dad7 no more g.timestamp y'all couldn't behave 2022-05-25 17:42:04 +02:00