From 1de72f5ab46fbecbf7160f34a64edf53ddaa5657 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Mon, 22 Jan 2024 21:14:40 +1300
Subject: [PATCH] screencast link
---
README.md | 10 +++-------
app/auth/routes.py | 8 ++------
app/main/routes.py | 5 +++--
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 5c4b77bb..dceb3769 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,8 @@ A lemmy/kbin clone written in Python with Flask.
- AGPL.
- First class moderation tools.
+[Screencast: overview of the PieFed codebase](https://join.piefed.social/2024/01/22/an-introduction-to-the-piefed-codebase/)
+
## Project goals
-To build a federated discussion and link aggregation platform, similar to Reddit, Lemmy, Mbin.
-
-
-## Differences from other federated systems
-
-...
-
+To build a federated discussion and link aggregation platform, similar to Reddit, Lemmy, Mbin.
\ No newline at end of file
diff --git a/app/auth/routes.py b/app/auth/routes.py
index 54b7da52..5e644f59 100644
--- a/app/auth/routes.py
+++ b/app/auth/routes.py
@@ -31,12 +31,8 @@ def login():
return redirect(url_for('auth.login'))
if not user.check_password(form.password.data):
if user.password_hash is None:
- if "@gmail.com" in user.email:
- message = Markup(_('Invalid password. Please click the "Login using Google" button or reset your password.'))
- flash(message, 'warning')
- else:
- message = Markup(_('Invalid password. Please reset your password.'))
- flash(message, 'error')
+ message = Markup(_('Invalid password. Please reset your password.'))
+ flash(message, 'error')
return redirect(url_for('auth.login'))
flash(_('Invalid password'))
return redirect(url_for('auth.login'))
diff --git a/app/main/routes.py b/app/main/routes.py
index 74c7786a..08cb26d7 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -135,7 +135,8 @@ def list_topics():
topics = Topic.query.order_by(Topic.name).all()
return render_template('list_topics.html', topics=topics, title=_('Browse by topic'),
- low_bandwidth=request.cookies.get('low_bandwidth', '0') == '1', moderating_communities=moderating_communities(current_user.get_id()),
+ low_bandwidth=request.cookies.get('low_bandwidth', '0') == '1',
+ moderating_communities=moderating_communities(current_user.get_id()),
joined_communities=joined_communities(current_user.get_id()))
@@ -222,8 +223,8 @@ def keyboard_shortcuts():
@bp.route('/test')
def test():
- return pytesseract.image_to_string(Image.open('test.png').convert('L'))
+ return current_app.config['SERVER_NAME']
#ip = request.headers.get('X-Forwarded-For') or request.remote_addr
#if ',' in ip: # Remove all but first ip addresses