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

518 Commits (18ba6becd3470595c90494fd987b809469941b09)

Author SHA1 Message Date
SneedBot 8f4ba57b6f sneed 2023-02-19 12:00:11 +00:00
Aevann 8158b70c20 apparently cardview toggle got removed from the settings, so might as well remove it from the code 2023-02-19 11:20:16 +02:00
SneedBot aac781cd2c sneed 2023-02-18 20:00:11 +00:00
Aevann 4e9eb9b710 Merge branches 'master' and 'master' of https://fsdfsd.net/rDrama/rDrama 2023-02-18 18:33:21 +02:00
Aevann d4210c2710 renamed p.embed_url to p.embed 2023-02-18 18:33:19 +02:00
SneedBot 5944531ab9 sneed 2023-02-18 16:00:11 +00:00
SneedBot c852ad8adb sneed 2023-02-11 08:00:06 +00:00
SneedBot 2c7181896a sneed 2023-02-07 08:00:09 +00:00
SneedBot 40b3dbd29b sneed 2023-01-29 16:00:10 +00:00
SneedBot eb72692e2a sneed 2023-01-25 16:00:13 +00:00
SneedBot da5b89b30c sneed 2023-01-24 12:00:09 +00:00
SneedBot b2c8c36ba7 sneed 2023-01-20 08:00:09 +00:00
Aevann f17fade8a6 purge discord from site code 2023-01-20 07:31:53 +02:00
SneedBot 93aa16d535 sneed 2023-01-01 12:23:47 +00:00
Aevann 93e9a42fa3 stop using inline style/script elements 2022-12-29 16:20:27 +02:00
SneedBot 41467a4d11 sneed 2022-12-26 20:16:47 +00:00
SneedBot fc4e40c6a9 sneed 2022-12-26 02:38:58 +00:00
SneedBot 227b6ec5d3 sneed 2022-12-25 01:01:13 +00:00
SneedBot cef1227361 sneed 2022-12-23 00:00:11 +00:00
SneedBot 23d64fc691 sneed 2022-12-20 04:00:12 +00:00
SneedBot 0d0eed9d39 sneed 2022-12-19 01:32:50 +00:00
SneedBot 2153666d89 sneed 2022-12-14 00:00:11 +00:00
Aevann1 c10c00473a make is_banned fkey on user id 2022-12-14 00:02:53 +02:00
SneedBot 7ce7841fe6 sneed 2022-12-13 20:00:08 +00:00
SneedBot 6a8e36caef sneed 2022-12-11 23:59:59 +00:00
SneedBot c27f7df6d1 sneed 2022-12-10 20:00:06 +00:00
Aevann1 b2d457c028 increase css limit from 4000 to 10000 2022-12-10 20:30:19 +02:00
SneedBot 5b870f06af sneed 2022-12-07 08:16:11 +00:00
Aevann f8aa67fb9a add button on profile to upload profile background (#48) 
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Reviewed-on: rDrama/rDrama#48
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-05 04:16:45 +00:00
SneedBot 1bfa783023 sneed 2022-12-04 23:46:06 +00:00
Aevann e105035272 remove country club system and replace it with a 3 tier thing: (#41) 
- /h/masterbaiters: 1 TS - for gayops

- /h/countryclub: 1000 TS - for anything requiring secrecy and doesnt need critical mass - have to make it a rule that u cant post gayops in /h/countryclub

- /h/chudrama: 5000 TS - for chad+stud posts

EDIT: i removed the /h/masterbaiters gate, but u can bring it back if u want
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#41
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-04 18:39:06 +00:00
SneedBot e32f3d70bc sneed 2022-12-02 22:30:56 +00:00
SneedBot e4e9d613e4 sneed 2022-12-01 00:57:29 +00:00
SneedBot 23f94b3f5d sneed 2022-11-26 23:27:47 +00:00
justcool393 272e2ee936
sneed (rename procoins to marseybux) (#472) 
* sneed (rename procoins to marseybux)

* literally unusable

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 18:08:29 -05:00
Aevann1 2f31fdfdd7 Revert "remove User.newtab and see if anyone complains" 
This reverts commit 787c89961f.
 2022-11-21 18:55:13 +02:00
Aevann1 787c89961f remove User.newtab and see if anyone complains 2022-11-21 16:36:17 +02:00
SneedBot 377c31371f sneed 2022-11-14 07:43:53 +00:00
SneedBot 0eefc9803c sneed 2022-11-09 17:23:31 +00:00
SneedBot 6bca53d395 sneed 2022-11-07 07:09:27 +00:00
justcool393 8725a0cc55 fix .sql files 2022-11-07 01:08:26 -06:00
justcool393 2c532af1ce set defaults in user class and schema.sql 2022-11-06 20:06:37 -08:00
SneedBot 40e39caf4d sneed 2022-11-05 14:08:43 +00:00
justcool393 08d19c7e5a schema: update schema to add chuddedfor 2022-11-04 21:00:01 -05:00
SneedBot 0e9ac3fff4 sneed 2022-11-04 00:28:18 +00:00
justcool393 339d5fe8f1 users: add profanity filter to censor our gosh darned potty mouthes 2022-11-03 17:59:18 -05:00
Snakes 6f91e77338
Port sneeds from spooky-22. 2022-11-01 00:17:20 -04:00
Aevann1 fbeac461ca refactor poorcel mode 2022-10-25 18:07:44 +02:00
Aevann1 aabb762378 sneed 2022-10-19 20:01:37 +00:00
Aevann1 fe7b1f7aa0 sneed 2022-10-19 19:23:19 +00:00
Aevann1 50e80874b7 sneed 2022-10-19 04:00:06 +00:00
Aevann1 9e6fe3063f sneed 2022-10-18 08:00:02 +00:00
Aevann1 f9840d5c71 sneed 2022-10-14 16:00:08 +00:00
Aevann1 89a0ff4a4b remove username reservation system 2022-10-14 14:01:06 +02:00
Aevann1 677043827d sneed 2022-10-11 20:00:09 +00:00
Aevann1 b544171449 store the fullpath in the media table 2022-10-11 19:20:15 +02:00
Aevann1 e3a3cbd358 add "hot" comment sorting 2022-10-11 18:41:09 +02:00
Aevann1 fc1d56053d sneed 2022-10-06 08:14:32 +00:00
Aevann1 d73990d5b2 delete granted_by column 2022-10-06 08:35:42 +02:00
Aevann1 b2961c1d99 sneed 2022-10-06 06:10:21 +00:00
Aevann1 6d4fe3c355 sneed 2022-10-02 08:58:49 +00:00
Aevann1 de65d0a1a8 sneed 2022-09-29 10:00:03 +00:00
Aevann1 8a8a67a059 remove ban_evade logic 2022-09-22 21:40:14 +02:00
Aevann1 ac52ff8d6f sneed 2022-09-20 22:00:05 +00:00
Aevann1 b6e5b307f8 sneed 2022-09-20 17:53:18 +00:00
Aevann1 4066fc1cd6 sneed 2022-09-19 19:00:06 +00:00
Aevann1 4087f14d9c sneed 2022-09-18 18:00:05 +00:00
Aevann1 7e5ea67773 sneed 2022-09-18 01:00:05 +00:00
Aevann1 316332d100 sneed 2022-09-17 14:14:43 +00:00
Aevann1 978233edc4 sneed 2022-09-17 14:08:49 +00:00
Aevann1 8b4f0829f4 sneed 2022-09-17 14:02:56 +00:00
Aevann1 24cff654aa sneed 2022-09-17 13:59:28 +00:00
Aevann1 7557815676 sneed 2022-09-17 13:56:34 +00:00
Aevann1 fd9789ee79 sneed 2022-09-17 13:55:41 +00:00
Aevann1 e57c4e689c sneed 2022-09-17 13:51:31 +00:00
Aevann1 f6c6afca31 sneed 2022-09-17 13:49:18 +00:00
Aevann1 604ff9f401 sneed 2022-09-17 13:26:32 +00:00
Aevann1 938db9428d sneed 2022-09-16 20:00:04 +00:00
Aevann1 f915178c35 sneed 2022-09-16 16:00:04 +00:00
Aevann1 2efbb76a1c sneed 2022-09-14 09:00:02 +00:00
Aevann1 94e032c5fe sneed 2022-09-13 22:03:14 +00:00
Aevann1 b8e3706e0d sneed 2022-09-13 20:17:54 +00:00
Aevann1 4f290d1fab sneed 2022-09-13 20:17:28 +00:00
Aevann1 a8eda019f4 sneed 2022-09-13 20:00:05 +00:00
Aevann1 c86cf0881b sneed 2022-09-13 01:22:57 +00:00
Aevann1 5fbab96e8e sneed 2022-09-12 11:00:01 +00:00
Aevann1 f21848e4ff sneed 2022-09-12 01:00:02 +00:00
Aevann1 79c18850b5 sneed 2022-09-12 00:00:02 +00:00
Aevann1 ae3b3276c0 sneed 2022-09-10 10:00:04 +00:00
Aevann1 1a6fbd1f29 sneed 2022-09-10 08:04:59 +00:00
Aevann1 da5742e0bc sneed 2022-09-10 08:04:54 +00:00
Aevann1 d93d01f0b0 sneed 2022-09-09 10:00:04 +00:00
Aevann1 128400d259 sneed 2022-09-08 16:00:02 +00:00
Aevann1 871ce4564b sneed 2022-09-07 06:00:06 +00:00
Aevann1 2b4533e9b3 sneed 2022-09-07 04:00:04 +00:00
Aevann1 d695755aa2 sneed 2022-09-07 03:00:02 +00:00
Aevann1 a66cca98e1 sneed 2022-09-06 05:00:04 +00:00
Aevann1 4231c44269 sneed 2022-09-05 04:00:04 +00:00
Aevann1 ef5f88b14a sneed 2022-09-04 22:00:04 +00: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 3ff356b984 sneed 2022-09-03 03:00:04 +00:00
Aevann1 4ba9965dde sneed 2022-09-03 02:00:04 +00:00
Aevann1 c0b88437b5 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-03 01:13:30 +00:00
Aevann1 79b4e2c7dc
Hats (#349) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats

* replace weird iOS apostrophe ’

* print archiveorg response codes
 2022-09-03 02:10:15 +02:00
Aevann1 46351f72ee sneed 2022-09-03 00:00:02 +00:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 44183cc767 sneed 2022-09-02 18:00:03 +00:00
Aevann1 f08a399ef2 sneed 2022-09-01 22:00:04 +00:00
Aevann1 a7c01058bb sneed 2022-09-01 20:00:05 +00:00
Aevann1 40f6a88b1a sneed 2022-08-27 04:00:05 +00:00
Aevann1 05e82f6734 sneed 2022-08-27 03:00:04 +00:00
Aevann1 b505833b75 sneed 2022-08-27 01:00:04 +00:00
Aevann1 cd748bbda3 sneed 2022-08-27 00:00:02 +00:00
Aevann1 45d5f52388 restore betting 2022-08-26 23:53:17 +02:00
Aevann1 ac98f54902 remove .can_gamble 2022-08-26 23:00:17 +02:00
Aevann1 59909fe219 sneed 2022-08-25 18:00:04 +00:00
Aevann1 b0b056d556 sneed 2022-08-24 23:00:03 +00:00
Aevann1 e4d0563b66 sneed 2022-08-24 16:00:03 +00:00
Aevann1 ed037a486c sneed 2022-08-20 21:00:04 +00:00
Aevann1 984d773d57 sneed 2022-08-19 22:00:03 +00:00
Aevann1 0092044c94 sneed 2022-08-18 21:00:04 +00:00
Aevann1 82ccae57a7 sneed 2022-08-15 18:00:03 +00:00
Aevann1 cec08c9e55 increase charlimit for hole css 2022-08-13 01:07:49 +02:00
Aevann1 65526735cc addendum to previous commit 2022-08-11 15:50:07 +02:00
Aevann1 67f223536c increase hole max char limit from 20 to 25 2022-08-11 15:34:56 +02:00
Aevann1 105ba1b1ae sneed 2022-08-07 07:00:02 +00:00
Aevann1 7ff1dc0f7f sneed 2022-08-05 22:00:03 +00:00
Aevann1 0429da4493 mod action notifs rework 2022-08-05 23:50:30 +02:00
Aevann1 fe0d1beb6e sneed 2022-08-05 14:00:01 +00:00
Aevann1 034e8fa5eb increase max sidebar character count from 500 to 10k 2022-07-17 19:26:16 +02:00
Aevann1 4381116994 sneed 2022-07-16 19:00:04 +00:00
Aevann1 103b87a600 sneed 2022-07-15 04:00:01 +00:00
Aevann1 86717e37b2 refactor changelog 2022-07-13 23:03:11 +02:00
Aevann1 59deeb0f05 sneed 2022-07-12 20:00:03 +00:00
Aevann1 389699d05a sneed 2022-07-11 17:00:02 +00:00
Aevann1 c859b632e0 sneed 2022-07-08 19:00:02 +00:00
Aevann1 5c82f392ec sneed 2022-07-08 02:00:02 +00:00
Aevann1 e5a1d4205f sneed 2022-07-06 02:00:02 +00:00
Aevann1 0fc646967f sneed 2022-07-03 01:28:33 +00:00
Aevann1 8c3989e98a sneed 2022-07-02 07:00:02 +00:00
Aevann1 0f09ff00dd sneed 2022-07-01 23:00:02 +00:00
Aevann1 bf33581261 sneed 2022-06-29 21:00:01 +00:00
Aevann1 b50480e267 sneed 2022-06-29 07:00:01 +00:00
Aevann1 35ca0d15a1 sneed 2022-06-29 03:00:01 +00:00
Aevann1 2e9907df1b sneed 2022-06-27 22:41:57 +00:00
Aevann1 0cd105e0b8 sneed 2022-06-27 10:09:42 +00:00
Aevann1 76f54b3d27 sneed 2022-06-27 05:02:25 +00:00
Aevann1 f17372a96c sneed 2022-06-27 03:00:03 +00:00
Aevann1 ec366d8761 sneed 2022-06-26 06:00:02 +00:00
Aevann1 0f81e6f551 sneed 2022-06-26 00:41:28 +00:00
Aevann1 eb0f8397f0 sneed 2022-06-25 01:00:02 +00:00
Aevann1 ffd0d9ed31 show duration on ban icon tooltip 2022-06-25 02:11:00 +02:00
Aevann1 af03f8f3bf sneed 2022-06-23 08:00:02 +00:00
Snakes f6b6997f61 Persist activity timestamp to users. 2022-06-20 16:25:03 -04:00
Aevann1 6d129538ea sneed 2022-06-13 03:00:01 +00:00
Aevann1 dfa9c85947 sneed 2022-06-11 02:00:01 +00:00
Aevann1 239c6f0404 sneed 2022-06-10 14:00:02 +00:00
Aevann1 2db414f12d Merge branch 'frost' of https://github.com/Aevann1/Drama into frost 2022-06-10 14:48:14 +02:00
Aevann1 2b82f95a98 Make hole cost constant instead of variable 2022-06-10 14:48:11 +02:00
Aevann1 933f2a9a40 sneed 2022-06-10 10:36:10 +00:00
Aevann1 874082c16d sneed 2022-06-09 20:27:34 +00:00
Aevann1 d69b15659e sneed 2022-06-08 05:00:01 +00:00
Aevann1 0587120575 sneed 2022-06-05 07:00:01 +00:00
Aevann1 9168676f78 sneed 2022-06-02 02:32:38 +00:00
Aevann1 6b62f49456 sneed 2022-05-30 09:40:22 +00:00
Aevann1 4b53c23b86 sneed 2022-05-30 04:11:49 +00:00
Snakes 5b6ba1ac82 Merge remote-tracking branch 'mccoxmaul/add-lottershe' into frost 2022-05-29 23:52:04 -04:00
Outrun Colors, LLC ef7da60432 Remove new schema changes from file and replace account ids for lottery system 2022-05-29 22:17:31 -05:00
Outrun Colors, LLC b9dc28e6d1 Don't show lotteries on the sister sites 2022-05-29 20:43:16 -05:00
Outrun Colors, LLC a0cc7e1cf6 Move more stuff to proper location 2022-05-29 19:49:14 -05:00
Aevann1 e51fbb0827 sneed 2022-05-29 08:00:01 +00:00
Aevann1 66b3efab36 award refactor 2022-05-27 01:08:23 +02:00
Aevann1 957cf5ba8f dfs 2022-05-26 20:09:44 +02:00
Aevann1 9bfc697663 sneed 2022-05-26 02:00:01 +00:00
Aevann1 dbcc63ec04 sneed 2022-05-26 01:00:02 +00: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 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
Aevann1 cb1bb4e43b sneed 2022-05-20 22:00:01 +00:00
Aevann1 842bf671c9 sneed 2022-05-10 08:00:01 +00:00
Aevann1 f8d8e8682e sneed 2022-04-29 16:00:02 +00:00
Aevann1 e8612506ca sneed 2022-04-10 19:00:02 +00:00
Aevann1 51ebba5bca gf 2022-04-10 20:42:58 +02:00
Aevann1 7e578ae616 sneed 2022-03-23 23:00:02 +00:00
Aevann1 b578240592 sneed 2022-03-19 15:00:01 +00:00
Aevann1 2a4dd04089 sneed 2022-03-19 14:00:03 +00:00
Aevann1 95df0f59c3 sneed 2022-03-09 02:00:02 +00:00
Aevann1 8741964725 sneed 2022-03-07 06:00:02 +00:00
Aevann1 b2c5cd93a5 fsd 2022-03-06 21:18:01 +02:00
Aevann1 c962579e0f sneed 2022-03-06 00:00:02 +00:00
Aevann1 b5ee01fcee sneed 2022-03-05 23:00:02 +00:00
Aevann1 201cd60a78 sneed 2022-03-05 22:00:02 +00:00
Aevann1 bf391394a8 bad PR 2022-03-05 22:53:39 +02:00
Aevann1 baf45d2461 sneed 2022-03-04 17:00:01 +00:00
Aevann1 94f2a69167 N 2022-03-01 01:30:44 +02:00
Aevann1 d36457b83b sneed 2022-02-27 23:00:02 +00:00
Aevann1 6c04ea7a84 sneed 2022-02-22 13:00:01 +00:00
Aevann1 effa2d44a3 sneed 2022-02-22 07:56:34 +00:00
Aevann1 aaf7c0f02e sneed 2022-02-21 07:00:02 +00:00