forked from rDrama/rDrama
Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost
commit
50794022f6
Binary file not shown.
After Width: | Height: | Size: 12 KiB |
Binary file not shown.
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
After Width: | Height: | Size: 8.2 KiB |
|
@ -28,3 +28,16 @@ def worker_abort(worker):
|
||||||
import os
|
import os
|
||||||
os.abort()
|
os.abort()
|
||||||
|
|
||||||
|
def config_reload_extra_files():
|
||||||
|
import os
|
||||||
|
extra_files = []
|
||||||
|
asset_dirs = ['files/assets/css/', 'files/assets/js/']
|
||||||
|
|
||||||
|
for dir in asset_dirs:
|
||||||
|
fnames = os.listdir(dir)
|
||||||
|
paths = map(lambda x: dir + x, fnames)
|
||||||
|
extra_files.extend(paths)
|
||||||
|
|
||||||
|
return extra_files
|
||||||
|
|
||||||
|
reload_extra_files = config_reload_extra_files()
|
||||||
|
|
|
@ -1193,7 +1193,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
|
||||||
('marseycarphug2',2,'fish love bottomfeeder carpathianflorist heart blow admin cute',NULL),
|
('marseycarphug2',2,'fish love bottomfeeder carpathianflorist heart blow admin cute',NULL),
|
||||||
('marseycarpina',2,'carpathianflorist drag transgender admin jannie',NULL),
|
('marseycarpina',2,'carpathianflorist drag transgender admin jannie',NULL),
|
||||||
('marseycarplazy',2,'carpathianflorist fish couch sleeping slacker idc antiwork janitor',NULL),
|
('marseycarplazy',2,'carpathianflorist fish couch sleeping slacker idc antiwork janitor',NULL),
|
||||||
('marseycarpler',2,'carp hitler nazi',1664137088),
|
('marseycarpler',2,'carpathianflorist administrator fascist mustache fish salute jannie nazi armband swastika',1664137088),
|
||||||
('marseycarpmerchant',2,'jewish money redbubble merch carpathianflorist money yid heeb sheeny sheenie greedy handrubbery rubbing hands kike israeli',1663465891),
|
('marseycarpmerchant',2,'jewish money redbubble merch carpathianflorist money yid heeb sheeny sheenie greedy handrubbery rubbing hands kike israeli',1663465891),
|
||||||
('marseycarpmerchant2',2,'jew fish greedy',1663548215),
|
('marseycarpmerchant2',2,'jew fish greedy',1663548215),
|
||||||
('marseycarpmermaid',2,'carp mermaid merman mercarp siren sexy legs temptress',NULL),
|
('marseycarpmermaid',2,'carp mermaid merman mercarp siren sexy legs temptress',NULL),
|
||||||
|
@ -1807,6 +1807,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
|
||||||
('marseyloveyou',2,'hearts ilu reaction adoration loving ily love adore animated',NULL),
|
('marseyloveyou',2,'hearts ilu reaction adoration loving ily love adore animated',NULL),
|
||||||
('marseylowpoly',2,'polygonal spinning 3d lopoly animated',NULL),
|
('marseylowpoly',2,'polygonal spinning 3d lopoly animated',NULL),
|
||||||
('marseyluckycat',2,'lucky fortune gambling gambler goombler goombling animated weeb azn asian slots japanese money cash coin rich',NULL),
|
('marseyluckycat',2,'lucky fortune gambling gambler goombler goombling animated weeb azn asian slots japanese money cash coin rich',NULL),
|
||||||
|
('marseylueshi',2,'super mario nintendo snes retro vidya dinosaur italian plumber pipes 42',1664142051),
|
||||||
('marseyluther',2,'heretic lutheran theses martin luther',NULL),
|
('marseyluther',2,'heretic lutheran theses martin luther',NULL),
|
||||||
('marseymacarthur',2,'nuke missile nuclear bomb history',NULL),
|
('marseymacarthur',2,'nuke missile nuclear bomb history',NULL),
|
||||||
('marseymad',2,'pissed annoyed furious reaction angry irritated livid',NULL),
|
('marseymad',2,'pissed annoyed furious reaction angry irritated livid',NULL),
|
||||||
|
@ -2326,7 +2327,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
|
||||||
('marseyspa',2,'spa towel cucumber facial relax calm selfcare foid hygiene beauty',NULL),
|
('marseyspa',2,'spa towel cucumber facial relax calm selfcare foid hygiene beauty',NULL),
|
||||||
('marseyspecial',2,'retard reaction slow special needs sped',NULL),
|
('marseyspecial',2,'retard reaction slow special needs sped',NULL),
|
||||||
('marseysperm',2,'cum swim vasectomy jizz semen spunk penis sex pregnant coom animated',NULL),
|
('marseysperm',2,'cum swim vasectomy jizz semen spunk penis sex pregnant coom animated',NULL),
|
||||||
('marseysphericalcow',2,'sphere science moo physics',1664131121),
|
('marseysphericalcow',2,'sphere science moo physics nope',1664131121),
|
||||||
('marseysphinx',2,'sphinx egypt ancient antiquity wonder pharaoh myth riddle puzzle',NULL),
|
('marseysphinx',2,'sphinx egypt ancient antiquity wonder pharaoh myth riddle puzzle',NULL),
|
||||||
('marseyspider',2,'insect halloween arachnid holiday bug',NULL),
|
('marseyspider',2,'insect halloween arachnid holiday bug',NULL),
|
||||||
('marseyspider2',2,'insect halloween spiderweb arachnid holiday bug',NULL),
|
('marseyspider2',2,'insect halloween spiderweb arachnid holiday bug',NULL),
|
||||||
|
@ -2545,7 +2546,6 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
|
||||||
('marseyyeti',2,'scary monster myth winter ice mountain himalaya asia predator giant',NULL),
|
('marseyyeti',2,'scary monster myth winter ice mountain himalaya asia predator giant',NULL),
|
||||||
('marseyyikes',2,'reaction judgment disgust oof cringe',NULL),
|
('marseyyikes',2,'reaction judgment disgust oof cringe',NULL),
|
||||||
('marseyyinzer',2,'pittsburgh pennsylvania pens penguins steelers stillers pirates buccos buckos terrible towel pierogo yuengling beer city hat baseball football hockey nfl mlb nhl happy',NULL),
|
('marseyyinzer',2,'pittsburgh pennsylvania pens penguins steelers stillers pirates buccos buckos terrible towel pierogo yuengling beer city hat baseball football hockey nfl mlb nhl happy',NULL),
|
||||||
('marseyyoshi',2,'super mario nintendo snes retro video game dinosaur italian plumber pipes',1664142051),
|
|
||||||
('marseyyugi',2,'yugioh yu-gi-oh! cards trap anime',NULL),
|
('marseyyugi',2,'yugioh yu-gi-oh! cards trap anime',NULL),
|
||||||
('marseyza',2,'antlers flowers',NULL),
|
('marseyza',2,'antlers flowers',NULL),
|
||||||
('marseyzaku',2,'gundam mecha robot helmet mask',NULL),
|
('marseyzaku',2,'gundam mecha robot helmet mask',NULL),
|
||||||
|
|
Loading…
Reference in New Issue