From 5bbd14ebd6a3374ed8ef7f7ab8a24717ba424366 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 1 Jul 2022 15:11:41 +0200 Subject: [PATCH] testing --- files/helpers/get.py | 2 +- files/routes/feeds.py | 98 +++++++++++++++++++++---------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/files/helpers/get.py b/files/helpers/get.py index 47eaf4475..4b12c8aef 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -190,7 +190,7 @@ def get_posts(pids, v=None): blocked, blocked.c.user_id == Submission.author_id, isouter=True - ).all() + ).options(joinedload(Submission.flags), joinedload(Submission.awards), joinedload(Submission.author), joinedload(Submission.author, User.badges)).all() output = [p[0] for p in query] for i in range(len(output)): diff --git a/files/routes/feeds.py b/files/routes/feeds.py index 14c17c7d0..5ff98d0fe 100644 --- a/files/routes/feeds.py +++ b/files/routes/feeds.py @@ -8,69 +8,69 @@ from files.helpers.jinja2 import * from files.__main__ import app -@app.get('/rss') -@app.get('/feed') -@app.get('/rss//') -def feeds_user(sort='hot', t='all'): +# @app.get('/rss') +# @app.get('/feed') +# @app.get('/rss//') +# def feeds_user(sort='hot', t='all'): - try: page = max(int(request.values.get("page", 1)), 1) - except: page = 1 +# try: page = max(int(request.values.get("page", 1)), 1) +# except: page = 1 - ids, next_exists = frontlist( - sort=sort, - page=page, - t=t, - v=None, - ) +# ids, next_exists = frontlist( +# sort=sort, +# page=page, +# t=t, +# v=None, +# ) - posts = get_posts(ids) +# posts = get_posts(ids) - domain = environ.get("DOMAIN").strip() +# domain = environ.get("DOMAIN").strip() - doc, tag, text = Doc().tagtext() +# doc, tag, text = Doc().tagtext() - with tag("feed", ("xmlns:media","http://search.yahoo.com/mrss/"), xmlns="http://www.w3.org/2005/Atom",): - with tag("title", type="text"): - text(f"{sort} posts from {domain}") +# with tag("feed", ("xmlns:media","http://search.yahoo.com/mrss/"), xmlns="http://www.w3.org/2005/Atom",): +# with tag("title", type="text"): +# text(f"{sort} posts from {domain}") - with tag("id"): - text(SITE_FULL + request.full_path) - with tag("updated"): - text(datetime.now().isoformat()+"Z") - doc.stag("link", rel="self", type="application/atom+xml", href=SITE_FULL + request.full_path) - doc.stag("link", rel="alternate", type="text/html", href=SITE_FULL) +# with tag("id"): +# text(SITE_FULL + request.full_path) +# with tag("updated"): +# text(datetime.now().isoformat()+"Z") +# doc.stag("link", rel="self", type="application/atom+xml", href=SITE_FULL + request.full_path) +# doc.stag("link", rel="alternate", type="text/html", href=SITE_FULL) - for post in posts: - with tag("entry", ("xml:base", SITE_FULL + request.full_path)): - with tag("title", type="html"): - text(post.realtitle(None)) +# for post in posts: +# with tag("entry", ("xml:base", SITE_FULL + request.full_path)): +# with tag("title", type="html"): +# text(post.realtitle(None)) - with tag("id"): - text(post.permalink) +# with tag("id"): +# text(post.permalink) - with tag("updated"): - if (post.edited_utc): - text(datetime.utcfromtimestamp(post.edited_utc).isoformat()+"Z") - else: - text(datetime.utcfromtimestamp(post.created_utc).isoformat()+"Z") +# with tag("updated"): +# if (post.edited_utc): +# text(datetime.utcfromtimestamp(post.edited_utc).isoformat()+"Z") +# else: +# text(datetime.utcfromtimestamp(post.created_utc).isoformat()+"Z") - with tag("published"): - text(datetime.utcfromtimestamp(post.created_utc).isoformat()+"Z") +# with tag("published"): +# text(datetime.utcfromtimestamp(post.created_utc).isoformat()+"Z") - with tag("author"): - with tag("name"): - text(post.author_name) - with tag("uri"): - text(f'/@{post.author_name}') +# with tag("author"): +# with tag("name"): +# text(post.author_name) +# with tag("uri"): +# text(f'/@{post.author_name}') - doc.stag("link", href=post.permalink) +# doc.stag("link", href=post.permalink) - image_url = post.thumb_url or post.embed_url or post.url +# image_url = post.thumb_url or post.embed_url or post.url - doc.stag("media:thumbnail", url=image_url) +# doc.stag("media:thumbnail", url=image_url) - if len(post.body_html): - with tag("content", type="html"): - doc.cdata(f'''{post.realtitle(None)}
{post.realbody(None)}''') +# if len(post.body_html): +# with tag("content", type="html"): +# doc.cdata(f'''{post.realtitle(None)}
{post.realbody(None)}''') - return Response( ""+ doc.getvalue(), mimetype="application/xml") +# return Response( ""+ doc.getvalue(), mimetype="application/xml")