diff --git a/files/assets/images/WPD/sidebar/1.webp b/files/assets/images/WPD/sidebar/1.webp new file mode 100644 index 000000000..fd3160f3c Binary files /dev/null and b/files/assets/images/WPD/sidebar/1.webp differ diff --git a/files/assets/images/WPD/sidebar/10.webp b/files/assets/images/WPD/sidebar/10.webp new file mode 100644 index 000000000..45b0e0110 Binary files /dev/null and b/files/assets/images/WPD/sidebar/10.webp differ diff --git a/files/assets/images/WPD/sidebar/11.webp b/files/assets/images/WPD/sidebar/11.webp new file mode 100644 index 000000000..5f9a3a340 Binary files /dev/null and b/files/assets/images/WPD/sidebar/11.webp differ diff --git a/files/assets/images/WPD/sidebar/12.webp b/files/assets/images/WPD/sidebar/12.webp new file mode 100644 index 000000000..d714aa40d Binary files /dev/null and b/files/assets/images/WPD/sidebar/12.webp differ diff --git a/files/assets/images/WPD/sidebar/13.webp b/files/assets/images/WPD/sidebar/13.webp new file mode 100644 index 000000000..40404b597 Binary files /dev/null and b/files/assets/images/WPD/sidebar/13.webp differ diff --git a/files/assets/images/WPD/sidebar/14.webp b/files/assets/images/WPD/sidebar/14.webp new file mode 100644 index 000000000..4c85f06d0 Binary files /dev/null and b/files/assets/images/WPD/sidebar/14.webp differ diff --git a/files/assets/images/WPD/sidebar/15.webp b/files/assets/images/WPD/sidebar/15.webp new file mode 100644 index 000000000..0a0fde549 Binary files /dev/null and b/files/assets/images/WPD/sidebar/15.webp differ diff --git a/files/assets/images/WPD/sidebar/16.webp b/files/assets/images/WPD/sidebar/16.webp new file mode 100644 index 000000000..c5781a155 Binary files /dev/null and b/files/assets/images/WPD/sidebar/16.webp differ diff --git a/files/assets/images/WPD/sidebar/17.webp b/files/assets/images/WPD/sidebar/17.webp new file mode 100644 index 000000000..31f97ec5b Binary files /dev/null and b/files/assets/images/WPD/sidebar/17.webp differ diff --git a/files/assets/images/WPD/sidebar/18.webp b/files/assets/images/WPD/sidebar/18.webp new file mode 100644 index 000000000..266152e76 Binary files /dev/null and b/files/assets/images/WPD/sidebar/18.webp differ diff --git a/files/assets/images/WPD/sidebar/19.webp b/files/assets/images/WPD/sidebar/19.webp new file mode 100644 index 000000000..f84768e30 Binary files /dev/null and b/files/assets/images/WPD/sidebar/19.webp differ diff --git a/files/assets/images/WPD/sidebar/2.webp b/files/assets/images/WPD/sidebar/2.webp new file mode 100644 index 000000000..e87296f63 Binary files /dev/null and b/files/assets/images/WPD/sidebar/2.webp differ diff --git a/files/assets/images/WPD/sidebar/21.webp b/files/assets/images/WPD/sidebar/21.webp new file mode 100644 index 000000000..fdf7f8c25 Binary files /dev/null and b/files/assets/images/WPD/sidebar/21.webp differ diff --git a/files/assets/images/WPD/sidebar/22.webp b/files/assets/images/WPD/sidebar/22.webp new file mode 100644 index 000000000..58684c3b8 Binary files /dev/null and b/files/assets/images/WPD/sidebar/22.webp differ diff --git a/files/assets/images/WPD/sidebar/23.webp b/files/assets/images/WPD/sidebar/23.webp new file mode 100644 index 000000000..ead11f58b Binary files /dev/null and b/files/assets/images/WPD/sidebar/23.webp differ diff --git a/files/assets/images/WPD/sidebar/24.webp b/files/assets/images/WPD/sidebar/24.webp new file mode 100644 index 000000000..1fa7fb3d3 Binary files /dev/null and b/files/assets/images/WPD/sidebar/24.webp differ diff --git a/files/assets/images/WPD/sidebar/25.webp b/files/assets/images/WPD/sidebar/25.webp new file mode 100644 index 000000000..dac7657d9 Binary files /dev/null and b/files/assets/images/WPD/sidebar/25.webp differ diff --git a/files/assets/images/WPD/sidebar/26.webp b/files/assets/images/WPD/sidebar/26.webp new file mode 100644 index 000000000..6ba4b6acd Binary files /dev/null and b/files/assets/images/WPD/sidebar/26.webp differ diff --git a/files/assets/images/WPD/sidebar/27.webp b/files/assets/images/WPD/sidebar/27.webp new file mode 100644 index 000000000..db6c52a47 Binary files /dev/null and b/files/assets/images/WPD/sidebar/27.webp differ diff --git a/files/assets/images/WPD/sidebar/28.webp b/files/assets/images/WPD/sidebar/28.webp new file mode 100644 index 000000000..e0a8d0cac Binary files /dev/null and b/files/assets/images/WPD/sidebar/28.webp differ diff --git a/files/assets/images/WPD/sidebar/29.webp b/files/assets/images/WPD/sidebar/29.webp new file mode 100644 index 000000000..803e936c2 Binary files /dev/null and b/files/assets/images/WPD/sidebar/29.webp differ diff --git a/files/assets/images/WPD/sidebar/30.webp b/files/assets/images/WPD/sidebar/30.webp new file mode 100644 index 000000000..c60c7381e Binary files /dev/null and b/files/assets/images/WPD/sidebar/30.webp differ diff --git a/files/assets/images/WPD/sidebar/31.webp b/files/assets/images/WPD/sidebar/31.webp new file mode 100644 index 000000000..f6126c91a Binary files /dev/null and b/files/assets/images/WPD/sidebar/31.webp differ diff --git a/files/assets/images/WPD/sidebar/32.webp b/files/assets/images/WPD/sidebar/32.webp new file mode 100644 index 000000000..48cf2d969 Binary files /dev/null and b/files/assets/images/WPD/sidebar/32.webp differ diff --git a/files/assets/images/WPD/sidebar/33.webp b/files/assets/images/WPD/sidebar/33.webp new file mode 100644 index 000000000..431103a62 Binary files /dev/null and b/files/assets/images/WPD/sidebar/33.webp differ diff --git a/files/assets/images/WPD/sidebar/34.webp b/files/assets/images/WPD/sidebar/34.webp new file mode 100644 index 000000000..146d74578 Binary files /dev/null and b/files/assets/images/WPD/sidebar/34.webp differ diff --git a/files/assets/images/WPD/sidebar/35.webp b/files/assets/images/WPD/sidebar/35.webp new file mode 100644 index 000000000..f89b168c3 Binary files /dev/null and b/files/assets/images/WPD/sidebar/35.webp differ diff --git a/files/assets/images/WPD/sidebar/36.webp b/files/assets/images/WPD/sidebar/36.webp new file mode 100644 index 000000000..7028361e9 Binary files /dev/null and b/files/assets/images/WPD/sidebar/36.webp differ diff --git a/files/assets/images/WPD/sidebar/6.webp b/files/assets/images/WPD/sidebar/6.webp new file mode 100644 index 000000000..d9df9f999 Binary files /dev/null and b/files/assets/images/WPD/sidebar/6.webp differ diff --git a/files/assets/images/WPD/sidebar/7.webp b/files/assets/images/WPD/sidebar/7.webp new file mode 100644 index 000000000..e02552d79 Binary files /dev/null and b/files/assets/images/WPD/sidebar/7.webp differ diff --git a/files/assets/images/WPD/sidebar/8.webp b/files/assets/images/WPD/sidebar/8.webp new file mode 100644 index 000000000..f564d3a17 Binary files /dev/null and b/files/assets/images/WPD/sidebar/8.webp differ diff --git a/files/assets/images/WPD/sidebar/9.webp b/files/assets/images/WPD/sidebar/9.webp new file mode 100644 index 000000000..b24daca79 Binary files /dev/null and b/files/assets/images/WPD/sidebar/9.webp differ diff --git a/files/assets/images/emojis/marseymanifestdestiny.webp b/files/assets/images/emojis/marseymanifestdestiny.webp new file mode 100644 index 000000000..921774d5e Binary files /dev/null and b/files/assets/images/emojis/marseymanifestdestiny.webp differ diff --git a/files/helpers/awards.py b/files/helpers/awards.py index aacab719e..e82a256b9 100644 --- a/files/helpers/awards.py +++ b/files/helpers/awards.py @@ -78,7 +78,7 @@ def award_timers(v, bot=False): v.earlylife = None notify_if_not_bot("Your earlylife status has expired!") badge = v.has_badge(169) - if v.marsify and v.marsify < now: + if v.marsify and v.marsify < now and v.marsify != 1: v.marsify = 0 if SITE_NAME != 'rDrama': notify_if_not_bot("Your marsify status has expired!") badge = v.has_badge(170) diff --git a/files/helpers/const.py b/files/helpers/const.py index 37f0de0f3..9f6bf912f 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -308,6 +308,8 @@ elif SITE == 'watchpeopledie.co': SNAKES_ID = 32 GIFT_NOTIF_ID = CARP_ID + + SIDEBAR_THREAD = 5403 else: # localhost or testing environment implied FEATURES['PRONOUNS'] = True FEATURES['HOUSES'] = True diff --git a/files/routes/awards.py b/files/routes/awards.py index 5c3b9873f..e2fa12dbb 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -382,8 +382,9 @@ def award_thing(v, thing_type, id): author.verified = "Verified" badge_grant(user=author, badge_id=150) elif kind == 'marsify': - if author.marsify: author.marsify += 21600 - else: author.marsify = int(time.time()) + 21600 + if not author.marsify or author.marsify != 1: + if author.marsify: author.marsify += 21600 + else: author.marsify = int(time.time()) + 21600 badge_grant(user=author, badge_id=170) if thing_type == 'comment' and (not author.deflector or v.id == AEVANN_ID): diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index 2fbf60784..3080f4f2e 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -1,10 +1,15 @@
- {% set image='/i/' + SITE_NAME + '/sidebar.webp?v=3000' %} + {%- if v -%} + {%- set art_path = 'assets/images/WPD/sidebar' -%} + {%- set art_image = '/' + art_path + '/' + listdir('files/' + art_path)|random() + '?v=45' -%} + {%- else -%} + {%- set art_image = '/i/' + SITE_NAME + '/sidebar.webp?v=3000' -%} + {%- endif -%} {% if request.path != '/sidebar' %} - - sidebar image + + sidebar image {% endif %} diff --git a/seed-db.sql b/seed-db.sql index c75b48aad..03281884a 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -1815,6 +1815,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseymajorgeneral',2,'jeffthespammer pirates of penzance safari muttonchops mutton chops army military soldier officer',NULL), ('marseymalding',2,'dilate seethe scrote mad moid cope',NULL), ('marseymancer',2,'dead undead horror lich halloween necromancer zombies zombie holiday evil',NULL), +('marseymanifestdestiny',2,'manifest usa american imperialism history expansion territory exploration',1664172279), ('marseymanlet',2,'llm short midget dwarf little king',NULL), ('marseymanysuchcases',2,'animated many such cases airport luggage suitcase conveyor',NULL), ('marseymao',2,'zedong ccp chinese communist communism china',NULL), diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index 3336dfcce..f5c7d91e5 100644 --- a/snappy_rDrama.txt +++ b/snappy_rDrama.txt @@ -3090,4 +3090,6 @@ are reading your FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF comments and pleasuring t No, you twerp, putting women in prison because they accidentally miscarried is gross. Denying rape victims autonomy over their bodies is gross. Mobilising lynch mobs to hunt down doctors treating trans kids is gross. literal gun-toting TOTENKOPF NAZIS WALKING THE STREETS is gross. -Get. a GODSDAMNED. Grip. \ No newline at end of file +Get. a GODSDAMNED. Grip. +{[para]} +aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa \ No newline at end of file