Merge branch 'master' into sort-by-new-btn
commit
c678629f48
|
|
@ -3925,7 +3925,7 @@ ul.comment-section {
|
|||
border-left: none;
|
||||
top: -0.1px;
|
||||
left: -3px;
|
||||
font-size: 10px;
|
||||
font-size: 14px;
|
||||
}
|
||||
.comment.collapsed .comment-collapse-icon:hover::before {
|
||||
color: var(--primary);
|
||||
|
|
@ -4774,7 +4774,7 @@ video {
|
|||
width: 10px;
|
||||
content: "\f056";
|
||||
position: static;
|
||||
font-size: 10px;
|
||||
font-size: 14px;
|
||||
font-weight: 900;
|
||||
border: none;
|
||||
margin-left: 0.25rem;
|
||||
|
|
|
|||
|
|
@ -569,6 +569,7 @@ if SITE == 'rdrama.net':
|
|||
29, #QuadNarca
|
||||
JOAN_ID,
|
||||
4389, #WorldAroundEwe
|
||||
5526, #Dramarama
|
||||
}
|
||||
|
||||
GIFT_NOTIF_ID = CARP_ID
|
||||
|
|
|
|||
|
|
@ -36,7 +36,9 @@ def error(e):
|
|||
if request.headers.get("Authorization") or request.headers.get("xhr"):
|
||||
return {"error": title, "code": e.code, "description": msg, "details": details}, e.code
|
||||
img = ERROR_MARSEYS.get(e.code, 'marseyl')
|
||||
return render_template('errors/error.html', err=True, title=title, msg=msg, details=details, img=img), e.code
|
||||
if hasattr(g, "v"): v = g.v
|
||||
else: v = None
|
||||
return render_template('errors/error.html', title=title, msg=msg, details=details, img=img, v=v), e.code
|
||||
|
||||
@app.errorhandler(401)
|
||||
def error_401(e):
|
||||
|
|
|
|||
|
|
@ -923,7 +923,7 @@ def submit_post(v:User, sub=None):
|
|||
|
||||
execute_lawlz_actions(v, post)
|
||||
|
||||
if SITE == 'rdrama.net' and v.id in (IMPASSIONATA_ID, PIZZASHILL_ID, 2008):
|
||||
if SITE == 'rdrama.net' and not post.sub.stealth and v.id in (IMPASSIONATA_ID, PIZZASHILL_ID, 2008):
|
||||
post.stickied_utc = int(time.time()) + 3600
|
||||
post.stickied = "AutoJanny"
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
</div>
|
||||
<script defer src="{{'js/vendor/lozad.js' | asset}}"></script>
|
||||
<script defer src="{{'js/vendor/lite-youtube.js' | asset}}"></script>
|
||||
{% if not err and v and v.spider %}
|
||||
{% if v and v.spider %}
|
||||
<script defer src="{{'js/vendor/critters.js' | asset}}"></script>
|
||||
<script defer src="{{'js/spider.js' | asset}}"></script>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@
|
|||
}
|
||||
</style>
|
||||
|
||||
{% if not err %}
|
||||
<div class="srd">
|
||||
{% if SITE_NAME == 'rDrama' %}
|
||||
{% if range(1,5) | random == 1 %}
|
||||
|
|
@ -46,17 +45,8 @@
|
|||
{{loggedin_counter+loggedout_counter}} people here now ({{loggedin_counter}} logged in)
|
||||
{% endif %}
|
||||
</div>
|
||||
{% else %}
|
||||
<style>
|
||||
body {padding-top: 54px !important}
|
||||
@media (max-width: 767.98px) {
|
||||
body {
|
||||
padding-top: 44px !important
|
||||
}
|
||||
}
|
||||
</style>
|
||||
{% endif %}
|
||||
<div class="navbar navbar-expand-md navbar-light" id="navbar">
|
||||
|
||||
<div class="navbar navbar-expand-md navbar-light" id="navbar">
|
||||
<div class="container-fluid" style="padding:0;">
|
||||
<a href="/" class="navbar-brand mr-auto {% if not has_logo and not sub %}flex-grow-1{% endif %}">
|
||||
<img id="header--icon" alt="header icon" {% if sub %}src="{{sub.marsey_url}}"{% else %}src="{{'headericon.webp' | asset_siteimg}}"{% endif %}>
|
||||
|
|
@ -86,7 +76,7 @@
|
|||
|
||||
{% if not request.path.startswith('/search/') %}
|
||||
<div class="flex-grow-1 d-fl d-mob-none {% if not v %}pad{% endif %}">
|
||||
<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" {% if err %}style="margin-right:40rem!important"{% endif %} action="{% if request.path.startswith('/search') %}{{request.path}}{% else %}/search/posts/{% endif %}" method="get">
|
||||
<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" action="{% if request.path.startswith('/search') %}{{request.path}}{% else %}/search/posts/{% endif %}" method="get">
|
||||
<input autocomplete="off" class="form-control w-100" type="search" placeholder="{{search_placeholder}}" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
|
||||
<span class="input-group-append">
|
||||
<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem;">
|
||||
|
|
@ -113,7 +103,6 @@
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if not err %}
|
||||
{% if v and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
|
||||
<a class="mobile-nav-icon d-md-none" href="/admin"><i class="fas fa-crown align-middle text-gray-500 black"></i></a>
|
||||
{% endif %}
|
||||
|
|
@ -346,12 +335,11 @@
|
|||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
{% if v and not err %}
|
||||
{% if v %}
|
||||
<div id="formkey" class="d-none">{{v|formkey}}</div>
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -3115,10 +3115,7 @@ Mashallah, a few more russian chimpouts and we will finally get the mandate by p
|
|||
{[para]}
|
||||
|
||||
{[para]}
|
||||
OP is streaming on YouTube lmao look at this loser
|
||||
|
||||
https://youtu.be/0alzveKoS2I
|
||||
|
||||
OP is streaming on YouTube lmao look at [this loser](https://youtu.be/0alzveKoS2I)
|
||||
{[para]}
|
||||
**Hi,**
|
||||
<span style="color:#33b8f3">**I was going through your website & I personally see a lot of potential in your website & business**</span>
|
||||
|
|
@ -3182,4 +3179,4 @@ just want to know. Who hurt you so badly that you have to act like a grade schoo
|
|||
{[para]}
|
||||
I want to fuck the conservative out of you. I can't help myself. Every time you come into my office with your low cut shirt and cross necklace subtly splayed across your immaculate breasts I think about taking you, right there, as a man (with your consent, of course, rape culture is not okay). I want to pull off your panties and eat your pussy until your juices trickle down to the lower classes. I want you to moan so hard and so loud that you can't form coherent words, let alone talk about what Rush Limbaugh said about immigrants the other day. Each time 'those people' crosses your lips I think about your mouth wrapped around my prodigious cock as my little people spill out of it. I want to make an anchor baby with you. I want to throw all the papers off my desk and ride you until gay marriage is legal in a majority of States or until you've come enough times to admit that maybe universal health care makes sense. And I mean all this respectfully, of course. I'm a feminist. Why do you do this to me. Why. Do you know what you're doing? Every time you come into my office and sit across from me and cross and recross your legs and talk about the weather and then (somehow) about how unemployment insurance is actually bad for poor people do you know that I'm wondering if your panties are equally as conservative? That I'm curious what you'd look like on top of me, my hands tweaking your nipples like doing so would be tweaking taxes on the top one percent? That I'm thinking about you looking back at me as I fuck you from behind, your Jesus necklace swaying back and forth as you scream "Drill, baby, drill!" You're not crazy, just politically hypocritical. Social conservatism is selfish and untenable. Your adherence to laws written when people owned slaves and the largest city was 1/10th of what it is now is ruining this god damn country. And I want you so bad. I want you so so bad. Ugh. Be my Monica Lewinsky. I'll be your Bill Clinton. Let's reach across the aisle... and into each other's pants.
|
||||
{[para]}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue