Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

master
Aevann1 2022-09-26 10:58:46 +02:00
commit 72e605eabb
39 changed files with 18 additions and 7 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

View File

@ -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)

View File

@ -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

View File

@ -382,6 +382,7 @@ def award_thing(v, thing_type, id):
author.verified = "Verified"
badge_grant(user=author, badge_id=150)
elif kind == 'marsify':
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)

View File

@ -1,10 +1,15 @@
<div class="col sidebar text-left {% if '/sidebar' not in request.path %}d-none d-lg-block{% endif %} pt-3 pb-5" {% if request.path != '/sidebar' %}id="sidebar-content"{% endif %}>
{% 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' %}
<a href="{{image}}">
<img class="mb-4" alt="sidebar image" onclick="expandDesktopImage()" loading="lazy" src="{{image}}" width=100%>
<a href="{{art_image}}">
<img class="mb-4" alt="sidebar image" onclick="expandDesktopImage()" loading="lazy" src="{{art_image}}" width=100%>
</a>
{% endif %}

View File

@ -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),

File diff suppressed because one or more lines are too long