fdfd
This commit is contained in:
Aevann1
parent
a8f12eadb0
commit
83defbe2e0
6 changed files with 29 additions and 180 deletions
|
|
@ -1,9 +1,6 @@
|
|||
from files.classes import *
|
||||
from flask import g
|
||||
from sqlalchemy.orm import joinedload, aliased
|
||||
|
||||
import re
|
||||
|
||||
from sqlalchemy.orm import joinedload
|
||||
|
||||
def get_user(username, v=None, graceful=False):
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
from files.__main__ import app
|
||||
from .get import *
|
||||
|
||||
|
||||
@app.template_filter("full_link")
|
||||
|
|
@ -9,4 +10,14 @@ def full_link(url):
|
|||
|
||||
@app.template_filter("app_config")
|
||||
def app_config(x):
|
||||
return app.config.get(x)
|
||||
return app.config.get(x)
|
||||
|
||||
@app.template_filter("post_embed")
|
||||
def crosspost_embed(id):
|
||||
|
||||
p = get_post(id, graceful=True)
|
||||
|
||||
return render_template(
|
||||
"submission_listing.html",
|
||||
listing=[p]
|
||||
)
|
||||
|
|
@ -495,29 +495,6 @@ def archiveorg(url):
|
|||
try: requests.get(f'https://web.archive.org/save/{url}', headers={'User-Agent': 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)'}, timeout=100)
|
||||
except Exception as e: print(e)
|
||||
|
||||
|
||||
@app.route("/embed/post/<pid>", methods=["GET"])
|
||||
def embed_post_pid(pid):
|
||||
|
||||
try: pid = int(pid)
|
||||
except: abort(400)
|
||||
|
||||
post = get_post(pid)
|
||||
|
||||
return render_template("embeds/post.html", p=post)
|
||||
|
||||
|
||||
@app.route("/embed/comment/<cid>", methods=["GET"])
|
||||
def embed_comment_cid(cid, pid=None):
|
||||
|
||||
try: cid = int(cid)
|
||||
except: abort(400)
|
||||
|
||||
comment = get_comment(cid)
|
||||
|
||||
return render_template("embeds/comment.html", c=comment)
|
||||
|
||||
|
||||
@app.post("/submit")
|
||||
@limiter.limit("6/minute")
|
||||
@is_not_banned
|
||||
|
|
@ -629,15 +606,10 @@ def submit_post(v):
|
|||
elif "instagram.com" in domain:
|
||||
embed = requests.get("https://graph.facebook.com/v9.0/instagram_oembed", params={"url":url,"access_token":environ.get("FACEBOOK_TOKEN","").strip(),"omitscript":'true'}, headers={"User-Agent": app.config["UserAgent"]}).json()["html"]
|
||||
|
||||
elif app.config['SERVER_NAME'] in domain:
|
||||
try:
|
||||
if "/?context=" in url:
|
||||
id = url.split("/?context=")[0].split("/")[1]
|
||||
embed = f"https://{app.config['SERVER_NAME']}/embed/comment/{id}"
|
||||
elif "/post/" in url:
|
||||
id = url.split("/post/")[1].split("/")[0]
|
||||
embed = f"https://{app.config['SERVER_NAME']}/embed/post/{id}"
|
||||
except: embed = None
|
||||
elif app.config['SERVER_NAME'] in domain and "/post/" in url:
|
||||
id = url.split("/post/")[1]
|
||||
if "/" in id: id = id.split("/")[0]
|
||||
embed = id
|
||||
|
||||
else: embed = None
|
||||
|
||||
|
|
|
|||
|
|
@ -1,122 +0,0 @@
|
|||
{% extends "embeds/embed_default.html" %}
|
||||
|
||||
{% set score=c.score_fuzzed %}
|
||||
|
||||
{% block title %}
|
||||
<title>@{{c.author.username}} comments on "{{c.post.title}}"</title>
|
||||
<meta name="description" content="{{c.body}}">
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<div class="post-info font-weight-bold">
|
||||
<span class="align-top"><a href="{{c.permalink}}?context=1">{{c.post.title | safe}}</a></span>
|
||||
</div>
|
||||
|
||||
<div id="comment-{{c.base36id}}" class="comment rounded">
|
||||
|
||||
<span class="mr-2 d-block d-md-none"><a {% if v %}href="{{c.author.url}}"{% else %}href="/logged_out{{c.author.url}}"{% endif %}><img src="{{c.author.profile_url}}" class="profile-pic-25"></a></span>
|
||||
|
||||
<span class="comment-collapse d-md-block d-none" onclick="collapse_comment('{{c.base36id}}')"></span>
|
||||
|
||||
<div class="comment-body">
|
||||
|
||||
<div id="comment-{{c.base36id}}-only">
|
||||
|
||||
<div class="user-info">{% if c.over_18 %}<span class="badge badge-danger">nsfw</span> {% endif %}{% if c.author.title and c.author.title.is_before %}<span style="color:#{{c.author.title.color}}">{{c.author.title.text}}</span> {% endif %}<a {% if v %}href="{{c.author.url}}"{% else %}href="/logged_out{{c.author.url}}"{% endif %} class="user-name {% if c.post.author_id==c.author_id %}text-info{% endif %}">{{c.author.username}}</a>{% if c.author.title and not c.author.title.is_before %}<span style="color:#{{c.author.title.color}}">{{c.author.title.text}}</span>{% endif %}
|
||||
{% if c.distinguish_level or c.author_id==c.post.author_id %}
|
||||
<span> </span>
|
||||
{% if c.distinguish_level %}
|
||||
<i class="fas fa-shield text-admin" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Administrator, speaking officially"></i>
|
||||
{% endif %}
|
||||
{% if c.post.author_id==c.author_id %}
|
||||
<i class="fas fa-microphone-stand text-info" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Submitter"></i>
|
||||
{% endif %}
|
||||
<span> </span>
|
||||
{% endif %}
|
||||
<span class="time-stamp" data-toggle="tooltip" data-placement="bottom" data-delay='{"show":"700", "hide":"300"}' title="{{c.created_datetime}}"><span>·</span> {{c.age_string}}</span>
|
||||
{% if c.edited_utc %}
|
||||
<span class="time-edited" data-toggle="tooltip" data-placement="bottom" data-delay='{"show":"700", "hide":"300"}' title="{{p.edited_datetime}}"><span>·</span> <span class="font-italic">Edited {{c.edited_string}}</span></span>
|
||||
{% endif %}
|
||||
|
||||
<span class="comment-collapse d-md-none" onclick="collapse_comment('{{c.base36id}}')"></span>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="comment-text-{{c.base36id}}" class="comment-text">
|
||||
{{c.body_html | safe}}
|
||||
</div>
|
||||
|
||||
|
||||
<div id="comment-{{c.base36id}}-actions" class="comment-actions">
|
||||
<ul class="list-inline text-right text-md-left">
|
||||
|
||||
|
||||
|
||||
<li id="comment-{{c.base36id}}-up" class="list-inline-item arrow-up d-none d-md-inline-block mr-2">
|
||||
</li>
|
||||
|
||||
|
||||
<li class="list-inline-item d-none d-md-inline-block mr-2">
|
||||
<span id="comment-{{c.base36id}}-score-none"class="d-none text-black">{{score}}</span> </li>
|
||||
|
||||
<li class="list-inline-item text-muted d-none d-md-inline-block"><a href="javascript:void(0);" role="button" class="copy-link" data-clipboard-text="{{c.permalink | full_link}}"><i class="fas fa-link"></i><span>Copy link</span></a>
|
||||
</li>
|
||||
<li class="list-inline-item d-none d-md-inline-block">
|
||||
<div class="dropdown show">
|
||||
<a href="#" role="button" id="dropdownMoreLink" data-toggle="dropdown" aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<i class="fas fa-ellipsis-h"></i>
|
||||
</a>
|
||||
|
||||
<div class="dropdown-menu border-0 shadow" aria-labelledby="dropdownMoreLink">
|
||||
<a class="dropdown-item" href="{{c.parent.permalink}}"><i class="fas fa-dna"></i>Parent</a>
|
||||
<a class="dropdown-item d-none" href="#"><i class="fas fa-save"></i>Save</a>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="list-inline-item d-inline-block d-md-none">
|
||||
<a href="#" data-toggle="modal" data-target="#actionsModal-{{c.base36id}}" data-focus="false"><i class="fas fa-ellipsis-h"></i></a>
|
||||
</li>
|
||||
|
||||
<li id="comment-{{c.base36id}}-up" class="list-inline-item arrow-up d-inline-block d-md-none mr-2">
|
||||
</li>
|
||||
<li class="list-inline-item d-inline-block d-md-none mr-2">
|
||||
<span id="comment-{{c.base36id}}-score-none" class="d-none text-black">{{score}}</span>
|
||||
</li>
|
||||
|
||||
<li id="comment-{{c.base36id}}-down" class="list-inline-item arrow-down d-inline-block d-md-none">
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Comment Actions Modal -->
|
||||
<div class="modal fade d-md-none" id="actionsModal-{{c.base36id}}" tabindex="-1" role="dialog" aria-labelledby="actionsModalTitle" aria-hidden="true">
|
||||
<div class="modal-dialog modal-dialog-centered" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title h6">More options</h5>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true"><i class="far fa-times"></i></span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<ul class="list-group comment-actions">
|
||||
<li class="list-group-item"><a href="javascript:void(0);" role="button" class="d-block copy-link" data-dismiss="modal" data-clipboard-text="{{c.permalink | full_link}}"><i class="fas fa-link"></i><span>Share</span></a>
|
||||
<li class="list-group-item"><a class="d-block" href="{{c.parent.permalink}}"><i class="fas fa-dna"></i>Parent</a></li>
|
||||
<li class="list-group-item d-none"><a href="#" class="d-block"><i class="fas fa-save"></i>Save</a></li>
|
||||
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
{% extends "embeds/embed_default.html" %}
|
||||
|
||||
{% block title %}
|
||||
<title>{{p.title | safe}}</title>
|
||||
<meta name="description" content="posted {{p.age_string}} by @{{p.author.username}}">
|
||||
{% endblock %}
|
||||
|
||||
{% block pagetype %}thread{% endblock %}
|
||||
|
||||
|
||||
{% block content %}
|
||||
<div class="row no-gutters mt-md-3">
|
||||
<div class="col-12">
|
||||
<div class="posts" id="posts">
|
||||
{% with listing = [p] %}
|
||||
{% include "submission_listing.html" %}
|
||||
{% endwith %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
|
@ -298,6 +298,18 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if p.embed_url and "http" not in p.embed_url %}
|
||||
<div id="crosspost-embed">
|
||||
<div class="row no-gutters">
|
||||
<div id="frontpage" class="col-12 pt-0">
|
||||
<div class="posts" id="posts">
|
||||
{{ p.embed_url | post_embed | safe }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="d-none d-md-flex justify-content-between align-items-center mt-2">
|
||||
<div class="post-actions mt-2">
|
||||
<ul class="list-inline text-right d-flex">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue