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

216 Commits (53e96f9b4325c7487915ba409e3d45ef25ed4281)

Author SHA1 Message Date
Aevann a63b02470d use sets with in statements 2022-12-24 00:22:41 +02:00
Aevann 9a49b66940 fix 500 error 2022-12-23 23:42:12 +02:00
Aevann 0e6b144ed7 alt graph 2022-12-22 22:03:40 +02:00
Aevann1 3ae5292ce4 remove pcm from code 2022-12-21 14:42:41 +02:00
Aevann1 4b5647993c fix modmail I hope 2022-12-20 02:51:09 +02:00
Aevann1 e386caf581 Revert "generate mod log item for removals" 
This reverts commit e4d4c4798d.
 2022-12-19 23:52:06 +02:00
Aevann1 e4d4c4798d generate mod log item for removals 2022-12-19 23:48:50 +02:00
Aevann1 e4734f4ec4 fix 2 notifs on same comment 2022-12-19 23:44:46 +02:00
Aevann1 3fa6e4d020 fix 2022-12-19 23:36:41 +02:00
Aevann1 9ceca862d9 notify me too 2022-12-19 23:32:52 +02:00
Aevann1 c99f4bd2c5 blackjack rework 2022-12-19 23:29:21 +02:00
Aevann1 248c7ef50d fix errors 2022-12-19 23:00:48 +02:00
Aevann1 c842d44384 minor css change 2022-12-19 22:54:45 +02:00
Aevann1 2028216c45 do this https://stupidpol.site/h/slackernews/post/132440/ml-engineer-analyzes-what-chatgpt-marks/3265102#context 2022-12-19 19:12:07 +02:00
geese_suck 1574b4da63 fistmas (#79) 
Co-authored-by: justcool393 <justcool393@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Co-authored-by: Nekobit Bitneko <me@ow.nekobit.net>
Reviewed-on: rDrama/rDrama#79
Co-authored-by: geese_suck <deandre.williams@geese-suck.us>
Co-committed-by: geese_suck <deandre.williams@geese-suck.us>
 2022-12-19 01:20:14 +00:00
Aevann1 e0bc8a22e2 generate modlog items for autojanny 2022-12-18 16:25:28 +02:00
Aevann1 cafe3c47d3 overwrite ban reason 2022-12-18 16:25:28 +02:00
Aevann1 36fca9caab minor bugfix 2022-12-13 20:50:38 +02:00
Aevann1 c4b2e5fc4b do this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3233481?context=8#context 2022-12-13 18:36:16 +02:00
justcool393 ab41db22b7 [DO NOT MERGE] multiple sub banners (#59) 
allows multiple sub banners

Snakes note: By request of Carp, especially for WPD.

Co-authored-by: justcool393 <justcool393@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#59
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-11 23:44:34 +00:00
Aevann1 d59543891f add BAN_EVASION_FULL constant 2022-12-11 20:56:04 +02:00
Snakes 0d580b8b4f
Fix post comment count logic not activating. 
Also standardize parameter list order for comment games.
 2022-12-09 00:56:08 -05:00
Snakes 25b5675ac4
Amend PR 52, 53: standardize style, basedbot bug 2022-12-08 22:48:40 -05:00
justcool393 f848f68799 walls: remove duplication among routes/templates (#52) 
removes a bunch of duplicated code in commenting and userpages

Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#52
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-09 03:35:28 +00:00
justcool393 ed0981cbdb add functionality to disable poll formatting (#35) 
Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#35
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-04 21:46:27 +00:00
Snakes d79465517d
Rename siege log filename. 2022-12-02 17:50:48 -05:00
Aevann1 845e13b4ae minor bug fix 2022-12-01 14:27:15 +02:00
justcool393 d395bcab69 logging: create somewhat sane logging 2022-11-30 12:09:31 -06:00
justcool393 0106a4e340 antispam: under siege mode 2022-11-30 11:37:35 -06:00
justcool393 67bfe5a5bd remove unnecessary `str()` 2022-11-29 14:29:27 -06:00
SneedBot a7614a5dd2 sneed 2022-11-29 14:11:34 +00:00
SneedBot c494f006f2 sneed 2022-11-28 06:05:21 +00:00
Aevann1 4656fa0b8d pin posts by pizza/impassionata/TGTW automatically for 1 hour 2022-11-28 04:07:06 +02:00
Aevann1 6a94ac3aa9 since lawlz got demopped, make his automatic mod actions be executed by autojanny instead 2022-11-26 03:56:04 +02:00
justcool393 042edf15bd make antispam a bit less :marseyshook: 2022-11-23 14:45:09 -06:00
Snakes 00880ccadc
zoz 
zle
zozzle
 2022-11-22 19:09:42 -05:00
Aevann1 8776cbca53 do this https://rdrama.net/post/125190/gamingcirclejerk-marseygamer-plays-themselves/3115522?context=8#context 2022-11-22 23:45:50 +02:00
Snakes adeb7acb38
archive_url: suppress errors on remote failure. 
ghostarchive has been giving us 500 backs lately. They are making
an absolute mess of the log for a non-central, opportunistic feature,
and we already eat exceptions for archive.org. We merely extend that
to ghostarchive.
 2022-11-21 18:52:21 -05:00
Snakes db329f487f
User.pay_account everywhere, fix lottery payout. 2022-11-20 05:50:02 -05:00
justcool393 8f2f48d6d1
[DO NOT MERGE] import detanglation (#442) 
* move Base definition to files.classes.__init__.py

* fix ImportError

* move userpage listing to users.py

* don't import the app from classes

* consts: set default values to avoid crashes
consts: warn if the secret key is the default config value

* card view: sneed (user db schema)

* cloudflare: use DEFAULT_CONFIG_VALUE

* const: set default values

* decouple media.py from __main__

* pass database to avoid imports

* import cleanup and import request not in const, but in the requests mega import

* move asset_submissions site check to __init__

* asset submissions feature flag

* flag

* g.is_tor

* don't import request where it's not needed

* i think this is fine

* mail: move to own routes and helper

* wrappers

* required wrappers move

* unfuck wrappers a bit

* move snappy quotes and marseys to stateful consts

* marsify

* :pepodrool:

* fix missing import

* import cache

* ...and settings.py

* and static.py

* static needs cache

* route

* lmao all of the jinja shit was in feeds.py amazing

* classes should only import what they need from flask

* import Response

* hdjbjdhbhjf

* ...

* dfdfdfdf

* make get a non-required import

* isort imports (mostly)

* but actually

* configs

* reload config on import

* fgfgfgfg

* config

* config

* initialize snappy and test

* cookie of doom debug

* edfjnkf

* xikscdfd

* debug config

* set session cookie domain, i think this fixes the can't login bug

* sdfbgnhvfdsghbnjfbdvvfghnn

* hrsfxgf

* dump the entire config on a request

* kyskyskyskyskyskyskyskyskys

* duifhdskfjdfd

* dfdfdfdfdfdfdfdfdfdfdfdf

* dfdfdfdf

* imoprt all of the consts beacuse fuck it

* 😭

* dfdfdfdfdfdfsdasdf

* print the entire session

* rffdfdfjkfksj

* fgbhffh

* not the secret keys

* minor bug fixes

* be helpful in the warning

* gfgfgfg

* move warning lower

* isort main imports (i hope this doesn't fuck something up)

* test

* session cookie domain redux

* dfdfdfd

* try only importing Flask

* formkeys fix

* y

* :pepodrool:

* route helper

* remove before flight

* dfdfdfdfdf

* isort classes

* isort helpers

* move check_for_alts to routehelpers and also sort imports and get rid of unused ones

* that previous commit but actkally

* readd the cache in a dozen places they were implicitly imported

* use g.is_tor instead of request.headers. bla bla bla

* upgrade streamers to their own route file

* get rid of unused imports in __main__

* fgfgf

* don't pull in the entire ORM where we don't need it

* features

* explicit imports for the get helper

* explicit imports for the get helper redux

* testing allroutes

* remove unused import

* decouple flask from classes

* syntax fix also remember these have side fx for some reason (why?)

* move side effects out of the class

* posts

* testing on devrama

* settings

* reloading

* settingssdsdsds

* streamer features

* site settings

* testing settings on devrama

* import

* fix modlog

* remove debug stuff

* revert commit 67275b21ab6e2f2520819e84d10bfc1c746a15b6

* archiveorg to _archiveorg

* skhudkfkjfd

* fix cron for PCM

* fix bugs that snekky wants me to

* Fix call to realbody passing db, standardize kwarg

* test

* import check_for_alts from the right place

* cloudflare

* testing on devrama

* fix cron i think

* shadow properly

* tasks

* Remove print which will surely be annoying in prod.

* v and create new session

* use files.classes

* make errors import little and fix rare 500 in /allow_nsfw

* Revert "use files.classes"

This reverts commit 98c10b876cf86ce058b7fb955cf1ec0bfb9996c6.

* pass v to media functions rather than using g

* fix

* dfdfdfdfd

* cleanup, py type checking is dumb so don't use it where it causes issues

* Fix some merge bugs, add DEFAULT_RATELIMIT to main.

* Fix imports on sqlalchemy expressions.

* `from random import random` is an error.

* Fix replies db param.

* errors: fix missing import

* fix rare 500: only send to GIFT_NOTIF_ID if it exists, and send them the right text

* Fix signup formkey.

* fix 2 500s

* propagate db to submissions

* fix replies

* dfdfdfdf

* Fix verifiedcolor.

* is_manual

* can't use getters outside of an app context

* don't attempt to do gumroad on sites where it's not enabled

* don't attempt to do gumraod on sites's where it's unnecessary

* Revert "don't attempt to do gumroad on sites where it's not enabled"

This reverts commit 6f8a6331878655492dfaf1907b27f8be513c14d3.

* fix 500

* validate media type

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-15 03:19:08 -06:00
justcool393 84d9ed6655 antispam: sanity check 2022-11-13 21:48:52 -06:00
Snakes b5b8b2927c
Expand blackjack handling pipeline. 2022-11-13 21:43:26 -05:00
justcool393 7c0763d81f blackjack fixes 2022-11-13 20:07:13 -06:00
Aevann1 3ff9cd448f adjust babe97e6d8 2022-11-12 11:29:08 +02:00
official-techsupport babe97e6d8
Add Carp's quote to Snappy on CC posts (#443) 2022-11-11 03:45:28 -05:00
Aevann1 c066227d2b remove pizza autovote 2022-11-09 23:27:16 +02:00
justcool393 26549a6e66
remove logged out routes (#433) 
* remove /logged_out/ routes

* update sitemap, remove users route, and update header

* cloudflare cookie

* only mess with the cookie whenever we desire auth

* sitemap: (small) improvements
sitemap: fix little bug i introduced
sitemap: fix login redirects for /id/ routes

* sitemap: remove duplicate entry

* contact is auth desired

* imports: don't import what we don't need and bind late to the db

* praying to god this works

* keep yourself safe

* oh i actually need to commit and push lol

* import Sub

* t

* refix cache purger
 2022-11-09 00:35:24 -05:00
justcool393 0fffa7efc0 rename truecoins to truescore 2022-11-06 23:04:34 -08:00
Aevann1 fbddf3e59c fix snappy gambling 2022-11-07 02:08:50 +02:00
justcool393 927e5a7cee snappy: fix weird missing line 2022-11-05 02:19:57 -05:00
Aevann1 299dbceeeb only add reason if there's a reason 2022-11-05 04:48:04 +02:00
Aevann1 f37707805e fix lawlz flair 2022-11-05 04:24:33 +02:00
justcool393 6caebac946 actions: move user-only actions to useractions, which gets rid of a circular dependency 2022-11-01 18:46:56 -05:00
justcool393 cd33fa9046 slots: fix numerous bugs with slots 
slots: fix missing imports (x2)
slots: fix other user errors being returned to a potentially completely unrelated user

for example if Snappy was under the rehab effect and it pulled the slot, it'd abort and potentially cause other bugs down the chain, which makes no sense to a user or could leave a post in a wonky state
 2022-11-01 18:03:53 -05:00
Aevann1 da5cc4093f make snappy gamble again 2022-11-02 00:40:22 +02:00
Aevann1 df559c6af5 run archival through proxy 2022-10-31 02:05:53 +02:00
Aevann1 c80e92f434 archive ghostarchive.org automatically 2022-10-31 00:39:37 +02:00
justcool393 d61eda8427 merge i think 2022-10-30 15:08:20 -05:00
Aevann1 915967ddd0 constantify BAN_EVASION_DOMAIN 2022-10-30 20:01:01 +02:00
justcool393 b9f2a7123e actions: move pizzashill autovotes to actions 2022-10-30 01:03:23 -05:00
justcool393 0f8ecd48dc antispam: add antispam bypass 2022-10-24 12:27:25 -05:00
justcool393 0a9e7b3ef4 lawlzposts: don't allow unpin awards 
lawlzposts: disable if pins feature flag is off
 2022-10-23 12:14:27 -05:00
justcool393 ec1affcf85 posts: add MasterLawlz specific actions 2022-10-23 12:01:00 -05:00
justcool393 37af363a47 remove duplicate message 2022-10-20 19:31:03 -05:00
justcool393 790a569072 don't check if body is empty 2022-10-20 19:29:20 -05:00
justcool393 8fe73cb68e refactor blackjack a bit 2022-10-20 19:28:05 -05:00
justcool393 32a4693da9 fix a couple of potentially rare 500s 2022-10-15 14:35:24 -07:00
justcool393 36b370dd14 use comment length for snappy, not post 2022-10-14 06:19:47 -07:00
justcool393 501fbbf5d3 move antispam code to actions 2022-10-11 22:34:55 -07:00
justcool393 1111932b8c remove weird random check if it's an issue we can readd it 2022-10-09 13:13:55 -07:00
justcool393 6d5dcaec9a fix long post bot lol 2022-10-09 09:40:20 -07:00
justcool393 a9064e7828 newline at eof 2022-10-09 06:52:41 -07:00
justcool393 56e800fd9d move basedbot to actions as well 2022-10-09 06:49:08 -07:00
justcool393 64cd774390 ree 2022-10-09 06:29:58 -07:00
justcool393 63c7fe0c29 move zozbot and longpostbot into the actions helpers 2022-10-09 06:28:18 -07:00
justcool393 d58351637c use constants 2022-10-05 16:35:44 -07:00
Aevann1 fbaa3984a0 small adjustment to prev commit, making it an "elif" 2022-10-01 19:37:59 +02:00
Aevann1 15e0447826 ban ppl for 14 minutes if snappy comments ":marseyban:" on their post 2022-10-01 19:37:25 +02:00
Aevann1 b9d3336a9e nitter shit 2022-09-29 07:53:37 +02:00
Snakes f05ec93b95
Add gambling wager badge logic. 
This commit touches more files than it ought to because this change
required untangling some circular imports, notably a lingering import
of files.helpers.slots in helpers.actions (presumably from old Snappy
gambling logic) and the User.active_blackjack_game accessor. Otherwise,
the logic is fairly straightforward.
 2022-09-29 00:26:50 -04:00
Aevann1 37e1f25624 make using proxies only happen in 3 circumstances again 2022-09-26 06:01:25 +02:00
Aevann1 dd0f8fbed7 proxy all requests we make 2022-09-25 05:23:50 +02:00
Aevann1 08e4d04c92 minor change to silence warnings 2022-09-23 14:01:42 +02:00
Aevann1 cd5d0c7c92 dont archive rdrama.org 2022-09-22 22:45:26 +02:00
Aevann1 61739b765e made spider award not give any notifs 2022-09-21 22:27:12 +02:00
Aevann1 6e1b454d1c fix last commit 2022-09-08 19:57:20 +02:00
Aevann1 40b4aff0e8 same as last commit 2022-09-08 19:51:03 +02:00
Aevann1 e382334c53 add description to new badge messages 2022-09-08 19:48:56 +02:00
Aevann1 57dcd0ddef remove snappy gambling 2022-09-05 00:13:23 +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 3e4216c78e fix my whoopsie 2022-09-03 21:37:20 +02:00
Aevann1 5fa854afd6 dont archive site urls 2022-09-03 20:05:00 +02:00
Aevann1 284dfbc30e ignore archiveorg errors 2022-09-03 16:24:16 +02:00
Aevann1 2398cf45f7 refactor archive.org 2022-09-03 05:10:14 +02: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 03f37e4972 print archive.org exceptions 2022-09-02 19:43:16 +02:00
Aevann1 4bb6eecb17 new rare carp snappy reply (idea by tax) 2022-08-26 01:40:57 +02:00
Aevann1 05689c87f6 fix previous commit 2022-08-17 19:57:32 +02:00
Aevann1 687cd766b9 restore autoflush 2022-08-17 18:36:59 +02:00
Aevann1 8e48728614 add imginn toggle 2022-08-15 19:45:43 +02:00
Aevann1 9176a7746a make the chance of snappy marseys and snappy quotes even 
instead of being dependant on the number of each
 2022-08-15 07:10:15 +02:00
Aevann1 2d9b42237e fix https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2497656?context=8#context 2022-08-13 10:26:33 +02: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 18ac7981ed fix snappy gambling 2022-07-16 03:54:50 +02:00
Aevann1 8da96d40f7 replace search.marsey.cat with camas.unddit.com 2022-07-15 15:00:51 +02:00
Aevann1 bab105223b make snappy archive youtube videos too 2022-07-11 19:45:07 +02:00
Snakes 16125b419b LGB: Disable Snappy Marseys; Snappy empty behavior. 2022-07-09 07:11:05 -04:00
Aevann1 c23366843e fix 500 error on posting 2022-07-08 14:40:07 +02:00
Aevann1 18385f80a1 make snappy only comment on drafts when they're published 2022-07-08 13:44:17 +02:00
Snakes a8155d964a Kitchen sink: emoji content, assert, assetcache. 
These are all minor and uncontroversial enough it just felt gross
making multiple commits.
  - Adds marseymummified.
  - Changes the new `raise ValueError(...)` in badge_grant to
    an `assert`.
  - Expands assetcache to a convenient grab bag of JS files.
 2022-06-15 17:17:31 -04:00
Snakes 7e54f858d3 Amend f8ae2a3d17c6: revert >= logic, fail loudly. 
First, the apparent errors with >= 9 and 99 in the Marseys and
referrals code after the refactor are not actually bugs: they were
bug fixes mixed in with the refactor to fix an off-by-one.

Next, instead of failing silently on the `not user` branch in
badge_grant, we throw a ValueError. This retains the current
behavior where users get 500s to report while also enforcing the
assertion near the edge of the function.
 2022-06-15 16:32:25 -04:00
Snakes f8ae2a3d17 Amend 3bc98f0a6b84: minor logic, style. 2022-06-15 16:08:26 -04:00
Aevann1 3bc98f0a6b extend TLSM's badge_grant() to almost all instanes where badges are granted 2022-06-15 21:33:21 +02:00
Aevann1 0f49c8e32f replace spaces with tabs 2022-06-13 20:33:25 +02:00
Snakes 8709ca816d Add Y'all Seein' Eye award v2 for offsitementions. 
Reusing the assets and design for the ill-fated YSE in a0f441a67d.
This time, the award provides access to our offsite mentions (reddit
notifs).
 2022-06-10 07:12:19 -04:00
Snakes 7556fe8988 Add lottershe badge logic, badge helper. 2022-06-06 00:07:38 -04:00