forked from rDrama/rDrama
Merge branch 'frost' into blitzen
kek7198
commit
18bb676e23
|
|
@ -50,9 +50,9 @@ def sex(v):
|
|||
email=f"{email}@gmail.com"
|
||||
emails.append(email.lower())
|
||||
|
||||
users = g.db.query(User).filter(User.patron > 0, User.patron < 5, User.email != None).all()
|
||||
users = g.db.query(User).filter(User.patron > 0, User.patron < 5).all()
|
||||
for u in users:
|
||||
if u.email.lower() not in emails: print(u.username)
|
||||
if not u.email or u.email.lower() not in emails: print(u.username)
|
||||
|
||||
return "sex"
|
||||
|
||||
|
|
|
|||
|
|
@ -180,12 +180,12 @@ def admins(v):
|
|||
@auth_desired
|
||||
def log(v):
|
||||
|
||||
page = int(request.args.get("page",1))
|
||||
admin = request.args.get("admin")
|
||||
page = int(request.values.get("page",1))
|
||||
admin = request.values.get("admin")
|
||||
if admin: admin_id = get_id(admin)
|
||||
else: admin_id = 0
|
||||
|
||||
kind = request.args.get("kind")
|
||||
kind = request.values.get("kind")
|
||||
|
||||
if v and v.admin_level > 1: types = ACTIONTYPES
|
||||
else: types = ACTIONTYPES2
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
{% endif %}
|
||||
|
||||
<li class="hidden md:block">
|
||||
<button class="copy-link hover:text-gray-400" data-clipboard-text="{% if 'rama' in request.host %}https://dogpill.life{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}">
|
||||
<button class="copy-link hover:text-gray-400" data-clipboard-text="{% if 'rama' in request.host %}https://freeghettohoes.biz{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}">
|
||||
<i class="fas fa-link fa-fw mr-2"></i>Copy link
|
||||
</button>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
</div>
|
||||
<div class="relative hidden sm:flex flex-shrink-0 items-center sm:ml-6">
|
||||
<form action="/search/posts/" method="get" class="relative mb-0">
|
||||
<input placeholder="Search" class="w-full text-gray-500 focus:text-black rounded border border-gray-800 bg-black/20 focus:bg-white hover:bg-black/30 shadow-inner w-full px-2 py-1.5 pr-7" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
|
||||
<input placeholder="Search" class="w-full text-gray-500 focus:text-black rounded border border-gray-800 bg-black/20 focus:bg-white hover:bg-black/30 shadow-inner w-full px-2 py-1.5 pr-7" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
|
||||
<i class="fas fa-search text-gray-600 absolute top-3 right-2"></i>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
<div class="offcanvas-body">
|
||||
<!-- Search box -->
|
||||
<form action="/search/posts/" method="get" class="relative mb-4">
|
||||
<input placeholder="Search" class="block w-full rounded shadow-inner py-2 pl-2 pr-7 bg-white border border-gray-300 hover:border-gray-400 focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
|
||||
<input placeholder="Search" class="block w-full rounded shadow-inner py-2 pl-2 pr-7 bg-white border border-gray-300 hover:border-gray-400 focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
|
||||
<i class="fas fa-search text-gray-400 absolute top-3 right-3"></i>
|
||||
</form>
|
||||
{% if v %}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</div>
|
||||
<div class="flex-grow-1 d-fl d-none d-md-block">
|
||||
<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" action="/search/posts/" method="get">
|
||||
<input class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
|
||||
<input class="form-control w-100" type="search" placeholder="Search" 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;">
|
||||
<i class="fa fa-search" aria-hidden="true"></i>
|
||||
|
|
|
|||
|
|
@ -34,12 +34,12 @@
|
|||
</li>
|
||||
{% endif %}
|
||||
<li>
|
||||
<button class="btn btn-gray w-full text-left copy-link" data-bs-dismiss="modal" data-clipboard-text="{% if 'rama' in request.host %}https://dogpill.life{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}?context=10#context">
|
||||
<button class="btn btn-gray w-full text-left copy-link" data-bs-dismiss="modal" data-clipboard-text="{% if 'rama' in request.host %}https://freeghettohoes.biz{{c.permalink}}{% else %}{{c.permalink | full_link}}{% endif %}">
|
||||
<i class="fas fa-copy fa-fw mr-4"></i>Copy link
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-gray w-full text-left" href="{{c.permalink}}?context=10#context">
|
||||
<a class="btn btn-gray w-full text-left" href="{{c.permalink}}">
|
||||
<i class="fas fa-dna fa-fw mr-4"></i>Context
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
</a>
|
||||
</li>
|
||||
<li class="hidden md:inline-block">
|
||||
<button class="copy-link hover:text-gray-400" data-clipboard-text="{% if 'rama' in request.host %}https://dogpill.life{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}">
|
||||
<button class="copy-link hover:text-gray-400" data-clipboard-text="{% if 'rama' in request.host %}https://freeghettohoes.biz{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}">
|
||||
<i class="fas fa-link fa-fw mr-2"></i>Copy link
|
||||
</button>
|
||||
</li>
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
<ul class="dropdown-menu w-56 bg-gray-900 rounded-md shadow-lg" aria-labelledby="dropdownPostActions">
|
||||
<!-- Does not require auth -->
|
||||
<li class="hidden">
|
||||
<button class="copy-link dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" role="button" data-clipboard-text="{% if 'rama' in request.host %}https://dogpill.life{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}">
|
||||
<button class="copy-link dropdown-item block w-full text-left px-4 py-2 text-sm text-gray-200 bg-gradient-to-t hover:from-red-800 hover:to-red-700 hover:shadow-inner focus:shadow-inner focus:bg-gradient-to-t focus:from-red-800 focus:to-red-700" role="button" data-clipboard-text="{% if 'rama' in request.host %}https://freeghettohoes.biz{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}">
|
||||
<i class="fas fa-link fa-sm fa-fw mr-4"></i>Copy link
|
||||
</button>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</span>
|
||||
</li>
|
||||
<li class="mr-5">
|
||||
<button class="copy-link" data-clipboard-text="{% if 'rama' in request.host %}https://dogpill.life{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}">
|
||||
<button class="copy-link" data-clipboard-text="{% if 'rama' in request.host %}https://freeghettohoes.biz{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}">
|
||||
<i class="fas fa-link fa-fw"></i>
|
||||
</button>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<a class="list-inline-item text-muted d-none d-md-inline-block" href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#awardModal" onclick="awardModal('/post/{{p.id}}/awards')"><i class="fas fa-gift fa-fw"></i>Give Award</a>
|
||||
{% endif %}
|
||||
|
||||
<a class="list-inline-item copy-link" href="javascript:void(0);" role="button" data-clipboard-text="{% if 'rama' in request.host %}https://dogpill.life{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}"><i class="fas fa-copy"></i>Copy link</a>
|
||||
<a class="list-inline-item copy-link" href="javascript:void(0);" role="button" data-clipboard-text="{% if 'rama' in request.host %}https://freeghettohoes.biz{{p.permalink}}{% else %}{{p.permalink | full_link}}{% endif %}"><i class="fas fa-copy"></i>Copy link</a>
|
||||
|
||||
{% if v %}
|
||||
<a id="subscribe-{{p.id}}" class="{% if p.id in v.subscribed_idlist() %}d-none{% endif %} list-inline-item" href="javascript:void(0)" onclick="post_toast2('/subscribe/{{p.id}}','subscribe-{{p.id}}','unsubscribe-{{p.id}}')"><i class="fas fa-eye"></i>Subscribe</a>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</div>
|
||||
<div class="flex-grow-1 d-fl d-none d-md-block">
|
||||
<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" action="/search/posts/" method="get">
|
||||
<input class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
|
||||
<input class="form-control w-100" type="search" placeholder="Search" 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;">
|
||||
<i class="fa fa-search" aria-hidden="true"></i>
|
||||
|
|
|
|||
Loading…
Reference in New Issue