Commit Graph

271 Commits (32f88aba549d5f363ebbcc3728d274ff236d1a54)

Author SHA1 Message Date
Aevann 619bdba5b2 fix this https://rdrama.net/post/168774/marseynull-jershs-manifesto-just-dropped-marseyveryworriedtrans/4111081#context 2023-05-07 22:44:34 +03:00
Aevann b69a4c10e4 make hole and sub links appear when inside parantheses 2023-05-03 22:05:10 +03:00
Aevann 53247cec7e remove unnecessary regex part to accomodate d04992c712 2023-05-01 20:08:14 +03:00
Aevann 0cfdd6fdb6 dont generate pings inside polls (cuz it breaks them) 2023-04-27 15:45:20 +02:00
Aevann 002351a4e3 Revert "make the "https://" optional to embed a youtube video (I rly hope i dont regret this)"
This reverts commit 5ad46f3e53.
2023-04-25 10:01:51 +02:00
Aevann 5ad46f3e53 make the "https://" optional to embed a youtube video (I rly hope i dont regret this) 2023-04-25 09:35:01 +02:00
Aevann f279509b76 use \w instead of a-zA-Z0-9_ 2023-04-23 15:22:41 +02:00
Aevann 62b9cb6ae2 fix patting users with "_" and "-" in their username 2023-04-23 15:18:25 +02:00
Aevann 2edb56638c delete leftover line of code 2023-04-23 15:10:20 +02:00
Aevann ba28e84138 refactor torturing and also replace "my" and "mine" 2023-03-25 20:18:48 +02:00
Aevann f834514e1a fix deleting media 2023-03-25 17:07:12 +02:00
Aevann 00654156a0 remove @ from torture_ap 2023-03-23 20:35:06 +02:00
Aevann a28c79ba87 make R/ and U/ and H/ work (for phone posters) 2023-03-22 16:08:42 +02:00
Aevann 89fe9cbc20 marsey -> emoji 2023-03-18 16:53:00 +02:00
Aevann dd54413cf3 convert marsey submission form to include all emojis 2023-03-18 15:34:04 +02:00
Aevann da19ef96d1 fix images again 2023-03-15 04:46:54 +02:00
Aevann 35c0b5c1eb mention adjustment to mention_regex 2023-03-15 03:51:11 +02:00
Aevann a7a104348d fix polls 2023-03-12 20:40:18 +02:00
Aevann 314880fb1b fix bad regex 2023-03-12 19:43:43 +02:00
Aevann 84f0c2896e make the regex for options less sensitive 2023-03-12 19:41:56 +02:00
Aevann d85d813889 change bet syntax 2023-03-12 19:00:02 +02:00
Aevann 96457e4998 fix pinging 2023-03-12 16:54:03 +02:00
Aevann 48dd721feb mentions - try consolidating regex 2023-03-12 12:27:22 +02:00
Aevann fb57d433cd make alerts more forgiving 2023-03-11 07:07:10 +02:00
Aevann 02c9f446a5 fix regex 2023-03-11 07:04:01 +02:00
Aevann af620ac05e make linking to link groups case insensitive 2023-03-10 23:49:03 +02:00
Aevann 3c67275056 consistency in regex.py 2023-03-10 03:39:02 +02:00
Aevann 0ae7c0c26f make badge_name_regex more permissive 2023-03-10 00:35:45 +02:00
Aevann 2a9bfad610 minor syntax change 2023-03-07 03:40:48 +02:00
Aevann 4a52246111 add !everyone 2023-03-01 07:32:19 +02:00
Aevann 55c8a51a1d make it possible to position poll options 2023-03-01 00:09:16 +02:00
Aevann 668499846b try to fix mbux bug 2023-02-27 17:02:45 +02:00
Aevann ae26306846 Revert "improve the showmore algo"
This reverts commit 9529cbbd61.
2023-02-24 09:29:46 +02:00
Aevann a90744145a add ping groups 2023-02-24 08:31:06 +02:00
Aevann 9529cbbd61 improve the showmore algo 2023-02-24 03:24:50 +02:00
Aevann 19482f4205 Revert "fix this https://stupidpol.site/post/149214/food-wars-ii-marseychingchong-strikes-back/3642965#context"
This reverts commit afd6949998.
2023-02-24 01:38:00 +02:00
Aevann afd6949998 fix this https://stupidpol.site/post/149214/food-wars-ii-marseychingchong-strikes-back/3642965#context 2023-02-22 19:38:17 +02:00
Aevann ce52c59e4f more exclusion for torture_regex 2023-02-20 20:42:21 +02:00
Aevann e7141796bc dont apply torture_regex when blockquote 2023-02-20 20:40:31 +02:00
Aevann 288fcde832 add /admin/delete_media 2023-02-19 21:31:26 +02:00
Aevann 4dfb21cd0a fix comment jumping 2023-02-18 23:03:23 +02:00
Aevann 7d926e56c9 keep twitter params for search 2023-02-17 20:27:41 +02:00
Aevann 95938ee3ec make sure all comment links have #context 2023-02-07 04:34:11 +02:00
Aevann 2890630064 remove leftover regex dependancy 2023-02-07 02:29:18 +02:00
Aevann 59ee320584 remove underscore_in_link_regex 2023-02-02 18:53:35 +02:00
Aevann 4ea5dd6d54 disable numbered lists 2023-02-01 17:59:10 +02:00
mummified-corroding-granny 950f4dde28 roll comment command fix to include 9999 (#104)
roll comment command fix to include 9999. Changed to meet the documentation in the formatting page instead of doing the reverse

Reviewed-on: rDrama/rDrama#104
Co-authored-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
Co-committed-by: mummified-corroding-granny <mummified-corroding-granny@noreply.fsdfsd.net>
2023-01-29 09:34:06 +00:00
Aevann df132627e6 fix underscores inside links 2023-01-27 11:11:13 +02:00
Aevann 83b22560eb dont use abort in chat 2023-01-27 09:07:58 +02:00
Aevann 3e4558e0cb fix twitter regex 2023-01-25 18:57:23 +02:00
Aevann 2a0e288e12 remove twitter tracking 2023-01-25 15:54:58 +02:00
Aevann 12274b858f ban discord ids 2023-01-23 09:38:16 +02:00
Aevann f7e2c21ae9 add 2 slurs filter items 2023-01-23 08:22:01 +02:00
Aevann a560958c3a fix youtube timestamps 2023-01-23 04:06:56 +02:00
official-techsupport 5902fa5822 showmore on too many newlines (works now) (#90)
At this point I think we should stop abusing regexes to implement the showmore logic.

I also reduced the character constant to 3000/2500 and increased the line constant to 20 but I don't have any strong feelings about them.

Co-authored-by: official-techsupport <official_techsupport@protonmail.com>
Reviewed-on: rDrama/rDrama#90
Co-authored-by: official-techsupport <official-techsupport@noreply.fsdfsd.net>
Co-committed-by: official-techsupport <official-techsupport@noreply.fsdfsd.net>
2023-01-22 23:27:24 +00:00
Aevann e8323127f9 fix this https://stupidpol.site/post/141309/marseyxdmarseywall-twitter-influencer-seethemaxxing-after-being/3453484#context 2023-01-22 11:04:09 +02:00
Aevann 51808b6f40 make it possible to mute without @ 2023-01-22 02:15:07 +02:00
Aevann c380572c13 fix posting 2023-01-21 02:21:51 +02:00
Aevann c560d1d9fe improve the "show more" button 2023-01-21 01:47:27 +02:00
Aevann 61202cb5aa dont replace "cool it" with "fetch it" 2023-01-20 07:23:19 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann 9490f1796c check badge names 2022-12-30 18:28:24 +02:00
Aevann e0e8eb3dd6 fix mod log links 2022-12-30 18:10:29 +02:00
Aevann 2805ecbfca improve fishylinks_regex 2022-12-30 15:20:42 +02:00
Aevann1 3ae5292ce4 remove pcm from code 2022-12-21 14:42:41 +02:00
Aevann1 8cf4e49a5b fix #roll comand (JC broke it 2 weeks ago) 2022-12-17 17:33:29 +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 2e09951716 fix this https://stupidpol.site/h/programming/post/129962/advent-of-code-2022-day-9/3219293?context=8#context 2022-12-11 20:33:44 +02:00
Aevann1 b89f9103d3 the advent of fixing codeblocks 2022-12-08 15:02:51 +02:00
Aevann1 a3f1b85e16 fix this https://stupidpol.site/h/programming/post/129189/advent-of-code-day-6/3195992?context=8#context 2022-12-07 09:58:46 +02:00
Snakes be2b210df4
Remove superfluous #disablepoll command.
Already resolved by 29070c78a9.
2022-12-04 17:15:52 -05: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
Aevann1 29070c78a9 fix this and related stuff https://stupidpol.site/h/programming/post/128394/advent-of-code-day-3-i/3182179?context=8#context 2022-12-04 17:53:41 +02:00
Aevann1 8d218c28e2 fix this https://stupidpol.site/h/programming/post/128511/nostalgia-post-heres-a-shitty-tictactoe/3179456?context=8#context 2022-12-03 22:09:12 +02:00
Aevann1 a193952c5e fix this https://stupidpol.site/h/slackernews/post/128394/advent-of-code-day-3-i/3177263?context=8#context 2022-12-03 10:02:26 +02: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 2b81c4b03c Revert "Revert "sneed" (this is supposed to be like this)"
This reverts commit 5e773f9e75.
2022-11-19 14:49:10 +02:00
justcool393 5e773f9e75 Revert "sneed" (this is supposed to be like this)
This reverts commit b5aefda124.
2022-11-19 06:45:54 -06:00
Aevann1 b5aefda124 sneed 2022-11-19 06:44:07 -06: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 0cf37cfe5f fix for worker timeout 2022-11-11 04:19:44 -06:00
justcool393 f5912bb4cc we don't need bloody bs4 to get a bloody title 2022-11-11 04:19:43 -06:00
justcool393 ffd9c73566 reduce slur filter down to necessary ones and partially implement what fish wants (closes #432)
signed off by snekfriend
2022-11-09 00:05:56 -06:00
Aevann1 09d14aca47 revert linefeed change on fish's request 2022-11-07 22:49:54 +02:00
Aevann1 9b939b30a4 Revert "fixed 500"
This reverts commit ee4c534a92.
2022-11-07 08:09:04 +02:00
justcool393 ee4c534a92 fixed 500 2022-11-06 23:59:49 -06:00
Aevann1 a66add3897 make profanity filter actually usable 2022-11-07 07:35:20 +02:00
justcool393 502314ad3c colors: filter properly 2022-11-06 20:06:37 -08:00
Aevann1 d76fe63c7f constantify image extensions and fix imgur .gif bug 2022-11-05 23:01:23 +02:00
justcool393 3f457333b5 profanity: per fish request disable profanity filter everywhere but rdrama
feel free to revert this or whatever if discussed
2022-11-04 08:43:59 -05:00
justcool393 12fbe686d5 don't use regex in the slur filters for now
it doesn't work
2022-11-03 18:33:56 -05:00
justcool393 bf448a557e fix *another* 500 2022-11-03 18:22:47 -05:00
justcool393 bed478276d fix carp 500 2022-11-03 18:21:24 -05:00
justcool393 23c5a2ddb5 handle case where is None 2022-11-03 18:14:55 -05:00
justcool393 118a58c104 fix matches (PCRE uses weird 1 indexing) 2022-11-03 18:11:22 -05:00
justcool393 c6b1d90dd8 fix 500... again 2022-11-03 18:05:11 -05:00
justcool393 731c0cc83c fix 500 and add r*pe to the bad words filter 2022-11-03 18:03:30 -05:00
justcool393 5f8a27636e fix prev commit 2022-11-03 18:01:12 -05:00
justcool393 339d5fe8f1 users: add profanity filter to censor our gosh darned potty mouthes 2022-11-03 17:59:18 -05:00
Aevann1 972578e74a allow poetrysperg to skip the linefeeds thing 2022-11-01 02:04:37 +02:00
Aevann1 b9c482712a constantify file extensions 2022-10-30 16:55:43 +02:00
justcool393 578e1896fd sanitize: strip out html comments
they're unnecessary and never get rendered
2022-10-20 18:06:55 -05:00
Aevann1 9efc0f0a68 unify email regex 2022-10-19 12:39:03 +02:00
official-techsupport 4e23161f11
Re-enable showmore_regex for Snappy (#389)
* Re-enable showmore_regex for Snappy

* showmore a bit more aggressively
2022-10-06 02:17:28 -04:00
Aevann1 9134a91481 add jigsaw tier 2022-10-06 00:47:12 +02:00
justcool393 b0da0ac604 fix regex capturing groups 2022-10-04 17:58:51 -07:00
justcool393 d564592276 revert per aevann. (why are we replacing www.reddit.com) 2022-10-04 17:32:08 -07:00
justcool393 775686028b
use reddit regex from snapshillbot
reference: https://github.com/justcool393/SnapshillBot/blob/master/snapshill.py#L30
2022-10-04 16:05:14 -07:00
Aevann1 0039f3a217 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-18 16:55:39 +02:00
Aevann1 b7c65c333b replace "np.reddit.com" (yikes) 2022-09-18 16:55:37 +02:00
justcool393 e00bf1f9a8
fix images in slur replacer (#359)
doesn't work with ALL CAPS TEXT, there's prolly a better way for this
2022-09-18 12:19:37 +02:00
justcool393 87c30bd1ee
fix utm regex (#357) 2022-09-17 23:13:14 +02:00
Aevann1 1a64ba3db8 hat submission UI 2022-09-10 07:37:11 +02:00
Aevann1 fbbb2c2ceb marsey submission stuff 2022-09-10 01:41:54 +02:00
Aevann1 5076859817 marsey UI stuff 2022-09-09 11:39:03 +02:00
Aevann1 0f232b264c refactor torture_ap 2022-09-05 22:05:04 +02:00
Aevann1 515526f9cb fix hat name regex 2022-09-03 03:57:03 +02:00
Aevann1 f221af76f2 allow capital letters in hat names 2022-09-03 03:51:24 +02:00
Aevann1 88a2c69659
Hats (#348)
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
2022-09-03 01:58:55 +02:00
Aevann1 52dd53f1d6 add :#trumpjaktalking: to the bottom of chudded comments and posts 2022-09-02 00:49:07 +02:00
official-techsupport d00d685c77
fix showmore regex (yet again) (#347) 2022-09-01 00:37:08 -04:00
official-techsupport 948972945a
fix showmore regex (again) (#346) 2022-08-31 17:08:27 +02:00
official-techsupport 643ea8b429
rewrite regex nonsense (#345) 2022-08-31 00:40:15 +02:00
official-techsupport 36c3cd60e8
showmore works in the presence of pre tags (#344) 2022-08-30 18:11:45 -04:00
official-techsupport a9eeb29b9b
fix showmore quadratic behavior (#343) 2022-08-30 23:19:53 +02:00
Aevann1 2dcd1288d7 Revert "adjust audio and video embedding"
This reverts commit e9d98e158c.
2022-08-26 20:15:26 +02:00
Aevann1 7084e71c57 fix pinging 2022-08-20 23:39:01 +02:00
Aevann1 e9d98e158c adjust audio and video embedding 2022-08-20 22:32:28 +02:00
Aevann1 d8c6b575de fix pinging 2022-08-19 15:10:39 +02:00
Aevann1 0715ab3e64 fix multipinging (hopefully this doesnt break other shit) 2022-08-17 21:41:09 +02:00
Aevann1 7edd569090 refactor nitter 2022-08-16 18:53:24 +02:00
Aevann1 0880694abd fix reddit replacing (fr this time) 2022-08-14 05:14:36 +02:00
Aevann1 2aa046c58a fix reddit replacing 2022-08-14 05:12:33 +02:00
Aevann1 b01aae3d43 fix muting 2022-08-13 11:48:55 +02:00
Aevann1 b59056fd16 fix muting 2022-08-13 11:24:56 +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
Aevann1 517d419f0b fix twitter.com/i/ links being switched to nitter 2022-08-13 10:00:35 +02:00
Aevann1 67f223536c increase hole max char limit from 20 to 25 2022-08-11 15:34:56 +02:00
Snakes 8b241a765a
Check URI approved embed in all CSS contexts. 2022-08-05 13:09:41 -04:00
Snakes 59344a28cd
Fix safe_url bypass for profilecss external embeds. 2022-08-05 12:32:56 -04:00
Aevann1 59faca9892 refine pronouns 2022-07-23 15:35:45 +02:00
Aevann1 ed36803842 allow uppercase on pronouns 2022-07-23 14:41:49 +02:00
Aevann1 aa644fd208 allow a third pronoun if total character count is 11 or lower 2022-07-23 08:48:32 +02:00
Snakes 001caf0c98
LGB: Add static /kb/ route; two static pages. 2022-07-18 04:39:21 -04:00
Aevann1 4058e2adce revert what I did with the slur regex 2022-07-17 21:17:46 +02:00
Aevann1 5703425418 improve slur regex 2022-07-17 07:24:53 +02:00
Aevann1 8bd7bd0ff8 fix nitter regex 2022-07-15 15:45:57 +02:00
Aevann1 c56f3951e1 make roll command neater 2022-07-14 16:43:05 +02:00
Aevann1 7243ed408f allow "I" as the first pronoun 2022-07-13 23:43:46 +02:00
Aevann1 df096e7cc4 add #roll 2022-07-13 15:06:59 +02:00