top
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity

sandshit and slavshit

master
Aevann 2023-12-25 01:05:02 +02:00
parent 0d1b2e0b38
commit 8f3be744e4
9 changed files with 121 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
files/assets/css/casino/game_screen.css
View File

@ -1,16 +1,3 @@
.game_screen-title {
display: flex;
align-items: center;
justify-content: center;
text-transform: uppercase;
opacity: 0.6;
}
.game_screen-title hr {
flex: 1;
margin-left: 0.5rem;
}
#casinoGameResult {
visibility: hidden;
}

17
files/assets/css/main.css
View File

@ -6249,8 +6249,8 @@ audio, video {
.sidebar-wpd--holes--3 {
grid-template-columns: repeat(3, 1fr);
}
.sidebar-wpd--holes--2 {
grid-template-columns: repeat(2, 1fr);
.sidebar-wpd--holes--1 {
grid-template-columns: repeat(1, 1fr);
}
.sidebar-wpd--holes a {
@ -7579,3 +7579,16 @@ ul, ol {
blink {
animation: blink 1s infinite;
}
.hr-title {
display: flex;
align-items: center;
justify-content: center;
text-transform: uppercase;
opacity: 0.6;
}
.hr-title hr {
flex: 1;
margin-left: 0.5rem;
}

3
files/routes/front.py
View File

@ -89,7 +89,8 @@ def front_all(v, hole=None):
LIMITED_WPD_HOLES = {'aftermath', 'fights', 'gore', 'medical', 'request', 'selfharm',
'discussion', 'meta', 'music', 'pets', 'social',
'countryclub', 'highrollerclub'}
'countryclub', 'highrollerclub',
'slavshit', 'sandshit'}
@cache.memoize()
def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='', gt=0, lt=0, hole=None, pins=True):

2
files/routes/votes.py
View File

@ -138,6 +138,8 @@ def vote_post_comment(target_id, new, v, cls, vote_cls):
if SITE_NAME == 'rDrama':
target.realupvotes = get_vote_count(0, True) # first arg is ignored here
elif target.hole in {'sandshit', 'slavshit'}:
target.realupvotes = target.upvotes + target.downvotes
else:
target.realupvotes = target.upvotes - target.downvotes

12
files/templates/casino/game_screen.html
View File

@ -8,7 +8,7 @@
<div id="casino-game-wrapper" data-game="{{game}}" class="container-fluid" style="max-width: 500px">
<div class="row row-cols-1">
<div class="col game_screen-title">
<div class="col hr-title">
<h3>{{game}}</h3>
<hr>
</div>
@ -27,14 +27,14 @@
<div class="col">
<div class="row row-cols-2">
<div class="col game_screen-col">
<div class="game_screen-title">
<div class="hr-title">
<h5>Wager</h5>
<hr>
</div>
<input id="wagerAmount" type="number" min="5" step="1" value="5" class="form-control">
</div>
<div class="col">
<div class="game_screen-title">
<div class="hr-title">
<h5>Currency</h5>
<hr>
</div>
@ -63,14 +63,14 @@
</div>
</div>
<div class="col">
<div class="game_screen-title">
<div class="hr-title">
<h5>{% block actiontext %}Actions{% endblock %}</h5>
<hr>
</div>
{% block actions %} {% endblock %}
</div>
<div id="casinoGameFeed" data-feed="{{feed}}" class="col">
<div class="game_screen-title">
<div class="hr-title">
<h5>Feed</h5>
<hr>
</div>
@ -80,7 +80,7 @@
</button>
</div>
<div class="col">
<div class="game_screen-title">
<div class="hr-title">
<h5>Leaders</h5>
<hr>
</div>

2
files/templates/casino/roulette_screen.html
View File

@ -36,7 +36,7 @@
</div>
</div>
<div class="game_screen-title">
<div class="hr-title">
<h5>How to Bet</h5>
<hr>
</div>

6
files/templates/home_comments.html
View File

@ -14,18 +14,12 @@
</div>
<div class="row no-gutters {% if listing %}mt-md-3{% elif not listing %}my-md-3{% endif %}">
<div class="col-12 px-3">
<div class="posts">
{% include "comments.html" %}
</div>
</div>
</div>
{% endblock %}
{% block pagenav %}

13
files/templates/post_actions.html
View File

@ -33,6 +33,15 @@
<button type="button" id="undelete2-{{p.id}}" class="{% if not p.deleted_utc %}d-none{% endif %} list-inline-item" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/undelete_post/{{p.id}}', 'delete2-{{p.id}}', 'undelete2-{{p.id}}','d-none')" data-toggleelement="#post-{{p.id}}" data-toggleattr="deleted"><i class="fas fa-trash-alt"></i>Undelete</button>
{% endif %}
{% if p.hole %}
{% if not v %}
<a id="block-hole-{{p.id}}" href="/login?redirect={{request.full_path | urlencode}}" class="list-inline-item text-danger"><i class="fas fa-eye-slash text-danger"></i>Block /h/{{p.hole}}</a>
{% elif v.id != p.author_id %}
<button type="button" id="block-hole-{{p.id}}" class="list-inline-item text-danger {% if v.blocks(p.hole) %}d-none{% endif %}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/h/{{p.hole}}/block','block-hole-{{p.id}}','unblock-hole-{{p.id}}','d-none')"><i class="fas fa-eye-slash text-danger"></i>Block /h/{{p.hole}}</button>
<button type="button" id="unblock-hole-{{p.id}}" class="text-success list-inline-item {% if not v.blocks(p.hole) %}d-none{% endif %}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/h/{{p.hole}}/unblock','block-hole-{{p.id}}','unblock-hole-{{p.id}}','d-none')"><i class="fas fa-eye text-success"></i>Unblock /h/{{p.hole}}</button>
{% endif %}
{% endif %}
{% if v %}
<button type="button" class="list-inline-item" data-bs-toggle="dropdown"><i class="fas fa-ellipsis-h fa-fw"></i></button>
<ul class="dropdown-menu">
@ -63,10 +72,6 @@
<button type="button" id="block-{{p.id}}" class="dropdown-item list-inline-item text-danger {% if p.is_blocking %}d-none{% endif %}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/block_user?username={{p.author_name}}','block-{{p.id}}','unblock-{{p.id}}','d-none')"><i class="fas fa-eye-slash text-danger"></i>Block user</button>
<button type="button" id="unblock-{{p.id}}" class="dropdown-item text-success list-inline-item {% if not p.is_blocking %}d-none{% endif %}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/unblock_user?username={{p.author_name}}','block-{{p.id}}','unblock-{{p.id}}','d-none')"><i class="fas fa-eye text-success"></i>Unblock user</button>
{% endif %}
{% if v.id != p.author_id and p.hole %}
<button type="button" id="block-hole-{{p.id}}" class="dropdown-item list-inline-item text-danger {% if v.blocks(p.hole) %}d-none{% endif %}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/h/{{p.hole}}/block','block-hole-{{p.id}}','unblock-hole-{{p.id}}','d-none')"><i class="fas fa-eye-slash text-danger"></i>Block /h/{{p.hole}}</button>
<button type="button" id="unblock-hole-{{p.id}}" class="dropdown-item text-success list-inline-item {% if not v.blocks(p.hole) %}d-none{% endif %}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/h/{{p.hole}}/unblock','block-hole-{{p.id}}','unblock-hole-{{p.id}}','d-none')"><i class="fas fa-eye text-success"></i>Unblock /h/{{p.hole}}</button>
{% endif %}
{% if p.hole and v.mods(p.hole) %}
<button type="button" class="dropdown-item list-inline-item text-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/kick/{{p.id}}')"><i class="fas fa-sign-out text-danger"></i>Kick</button>
{% if not p.author.mods(p.hole) %}

134
files/templates/sidebar_WPD.html
View File

@ -45,56 +45,94 @@
</div>
{% endif %}
<div class="sidebar-wpd--holes sidebar-wpd--holes--3">
<a href="/h/accident">Accident</a>
<a href="/h/animal">Animal</a>
<a href="/h/beating">Beating</a>
<a href="/h/beheading">Beheading</a>
<a href="/h/bladed">Bladed</a>
<a href="/h/burning">Burning</a>
<a href="/h/cartel">Cartel</a>
<a href="/h/combat">Combat</a>
<a href="/h/compilation">Compilation</a>
<a href="/h/disaster">Disaster</a>
<a href="/h/drowning">Drowning</a>
<a href="/h/electricity">Electricity</a>
<a href="/h/execution">Execution</a>
<a href="/h/explosions">Explosions</a>
<a href="/h/falling">Falling</a>
<a href="/h/industrial">Industrial</a>
<a href="/h/isis">ISIS</a>
<a href="/h/maiming">Maiming</a>
<a href="/h/police">Police</a>
<a href="/h/shooting">Shooting</a>
<a href="/h/suicide">Suicide</a>
<a href="/h/vehicle">Vehicle</a>
<a href="/h/other">Other</a>
</div>
{% if hole and hole.sidebar_html %}
<div class="mb-4">{{hole.sidebar_html|safe}}</div>
{% else %}
<div class="hr-title">
<hr>
<h5>DEATH</h5>
<hr>
</div>
<div class="sidebar-wpd--holes sidebar-wpd--holes--3">
<a href="/h/accident">Accident</a>
<a href="/h/animal">Animal</a>
<a href="/h/beating">Beating</a>
<a href="/h/beheading">Beheading</a>
<a href="/h/bladed">Bladed</a>
<a href="/h/burning">Burning</a>
<a href="/h/cartel">Cartel</a>
<a href="/h/combat">Combat</a>
<a href="/h/compilation">Compilation</a>
<a href="/h/disaster">Disaster</a>
<a href="/h/drowning">Drowning</a>
<a href="/h/electricity">Electricity</a>
<a href="/h/execution">Execution</a>
<a href="/h/explosions">Explosions</a>
<a href="/h/falling">Falling</a>
<a href="/h/industrial">Industrial</a>
<a href="/h/isis">ISIS</a>
<a href="/h/maiming">Maiming</a>
<a href="/h/police">Police</a>
<a href="/h/shooting">Shooting</a>
<a href="/h/suicide">Suicide</a>
<a href="/h/vehicle">Vehicle</a>
<a href="/h/other">Other</a>
</div>
<div class="sidebar-wpd--holes sidebar-wpd--holes--3 mt-4">
<a href="/h/aftermath">Aftermath</a>
<a href="/h/fights">Fights</a>
<a href="/h/gore">Gore</a>
<a href="/h/medical">Medical</a>
<a href="/h/request">Request</a>
<a href="/h/selfharm">Self-Harm</a>
</div>
<div class="hr-title mt-3">
<hr>
<h5>GORE</h5>
<hr>
</div>
<div class="sidebar-wpd--holes sidebar-wpd--holes--3">
<a href="/h/aftermath">Aftermath</a>
<a href="/h/fights">Fights</a>
<a href="/h/gore">Gore</a>
<a href="/h/medical">Medical</a>
<a href="/h/request">Request</a>
<a href="/h/selfharm">Self-Harm</a>
</div>
<div class="sidebar-wpd--holes sidebar-wpd--holes--3 mt-4 mb-3">
<a href="/h/discussion">Discussion</a>
<a href="/h/meta">Meta</a>
<a href="/h/music">Music</a>
<a href="/h/pets">Pets</a>
<a href="/h/social">Social</a>
</div>
<div class="hr-title mt-3">
<hr>
<h5>SOCIAL</h5>
<hr>
</div>
<div class="sidebar-wpd--holes sidebar-wpd--holes--3">
<a href="/h/discussion">Discussion</a>
<a href="/h/meta">Meta</a>
<a href="/h/music">Music</a>
<a href="/h/pets">Pets</a>
<a href="/h/social">Social</a>
</div>
<div class="sidebar--rules sidebar--rules--wpd pt-2">
{% set rules = "rules_" ~ SITE_NAME ~ ".html" %}
{% include rules %}
</div>
<div class="hr-title mt-3">
<hr>
<h5>ACTIVE CONFLICTS</h5>
<hr>
</div>
<div class="sidebar-wpd--holes sidebar-wpd--holes--1 mb-3">
<a href="/h/slavshit">
<img loading="lazy" class="emoji" src="{{SITE_FULL_IMAGES}}/e/marseyflagukraine.webp">
Slavshit
<img loading="lazy" class="emoji" src="{{SITE_FULL_IMAGES}}/e/marseyflagrussia.webp">
</a>
<hr>
<div class="mt-3">
Live commit: <a href="https://fsdfsd.net/rDrama/rDrama/commit/{{git_head()[0]}}">{{git_head()[0]}}</a>
</div>
<a href="/h/sandshit">
<img loading="lazy" class="emoji" src="{{SITE_FULL_IMAGES}}/e/marseyflagpalestine.webp">
Sandshit
<img loading="lazy" class="emoji mirrored" src="{{SITE_FULL_IMAGES}}/e/marseyisrael.webp">
</a>
</div>
<div class="sidebar--rules sidebar--rules--wpd pt-2">
{% set rules = "rules_" ~ SITE_NAME ~ ".html" %}
{% include rules %}
</div>
<hr>
<div class="mt-3">
Live commit: <a href="https://fsdfsd.net/rDrama/rDrama/commit/{{git_head()[0]}}">{{git_head()[0]}}</a>
</div>
{% endif %}
</div>