michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 11:26:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug fixes and tweaks after initial user testing

Browse source
This commit is contained in:
rimu 2024-01-05 14:09:46 +13:00
parent cb185648d2
commit 39ca00cb8e
27 changed files with 112 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ROADMAP.md
View file

@ -5,11 +5,11 @@ The following are the goals for a 1.0 release, good enough for production use. I
### Basic functionality ### Basic functionality
- ✅ log in, register, reset password - ✅ log in, register, reset password
- ✅ browse and subscribe to communities - ✅ browse and join communities
- ✅ post in local community - ✅ post in local community
- ✅ comment on posts in local community - ✅ comment on posts in local community
- ✅ vote - ✅ vote
- sort posts by hotness algo - ✅ sort posts by hotness algo
- ✅ markdown - ✅ markdown
- ✅ logging and debugging support - ✅ logging and debugging support
@ -30,7 +30,7 @@ The following are the goals for a 1.0 release, good enough for production use. I
### Moderation ### Moderation
- community moderation - community moderation
- blocking - users, communities, domains, instances. bi-directional. - ✅ blocking - users, communities, domains, instances. bi-directional.
- import/export of block lists - import/export of block lists
### Onboarding ### Onboarding

18
app/admin/routes.py
View file

@ -385,10 +385,11 @@ def admin_user_edit(user_id):
profile_file = request.files['profile_file'] profile_file = request.files['profile_file']
if profile_file and profile_file.filename != '': if profile_file and profile_file.filename != '':
# remove old avatar # remove old avatar
file = File.query.get(user.avatar_id) if user.avatar_id:
file.delete_from_disk() file = File.query.get(user.avatar_id)
user.avatar_id = None file.delete_from_disk()
db.session.delete(file) user.avatar_id = None
db.session.delete(file)
# add new avatar # add new avatar
file = save_icon_file(profile_file, 'users') file = save_icon_file(profile_file, 'users')
@ -397,10 +398,11 @@ def admin_user_edit(user_id):
banner_file = request.files['banner_file'] banner_file = request.files['banner_file']
if banner_file and banner_file.filename != '': if banner_file and banner_file.filename != '':
# remove old cover # remove old cover
file = File.query.get(user.cover_id) if user.cover_id:
file.delete_from_disk() file = File.query.get(user.cover_id)
user.cover_id = None file.delete_from_disk()
db.session.delete(file) user.cover_id = None
db.session.delete(file)
# add new cover # add new cover
file = save_banner_file(banner_file, 'users') file = save_banner_file(banner_file, 'users')

2
app/auth/routes.py
View file

@ -104,7 +104,7 @@ def register():
if current_app.config['MODE'] == 'development': if current_app.config['MODE'] == 'development':
current_app.logger.info('Verify account:' + url_for('auth.verify_email', token=user.verification_token, _external=True)) current_app.logger.info('Verify account:' + url_for('auth.verify_email', token=user.verification_token, _external=True))
flash(_('Great, you are now a registered user! Choose some communities to subscribe to. Use the topic filter to narrow things down.')) flash(_('Great, you are now a registered user! Choose some communities to join. Use the topic filter to narrow things down.'))
resp = make_response(redirect(url_for('main.list_communities'))) resp = make_response(redirect(url_for('main.list_communities')))
if user_ip_banned(): if user_ip_banned():

10
app/community/routes.py
View file

@ -222,9 +222,9 @@ def subscribe(actor):
success = post_request(community.ap_inbox_url, follow, current_user.private_key, success = post_request(community.ap_inbox_url, follow, current_user.private_key,
current_user.profile_id() + '#main-key') current_user.profile_id() + '#main-key')
if success: if success:
flash('Your request to subscribe has been sent to ' + community.title) flash('Your request to join has been sent to ' + community.title)
else: else:
flash('There was a problem while trying to subscribe.', 'error') flash('There was a problem while trying to join.', 'error')
else: # for local communities, joining is instant else: # for local communities, joining is instant
banned = CommunityBan.query.filter_by(user_id=current_user.id, community_id=community.id).first() banned = CommunityBan.query.filter_by(user_id=current_user.id, community_id=community.id).first()
if banned: if banned:
@ -232,7 +232,7 @@ def subscribe(actor):
member = CommunityMember(user_id=current_user.id, community_id=community.id) member = CommunityMember(user_id=current_user.id, community_id=community.id)
db.session.add(member) db.session.add(member)
db.session.commit() db.session.commit()
flash('You are subscribed to ' + community.title) flash('You joined ' + community.title)
referrer = request.headers.get('Referer', None) referrer = request.headers.get('Referer', None)
if referrer is not None: if referrer is not None:
return redirect(referrer) return redirect(referrer)
@ -278,14 +278,14 @@ def unsubscribe(actor):
activity.result = 'success' activity.result = 'success'
db.session.commit() db.session.commit()
if not success: if not success:
flash('There was a problem while trying to subscribe', 'error') flash('There was a problem while trying to join', 'error')
if proceed: if proceed:
db.session.query(CommunityMember).filter_by(user_id=current_user.id, community_id=community.id).delete() db.session.query(CommunityMember).filter_by(user_id=current_user.id, community_id=community.id).delete()
db.session.query(CommunityJoinRequest).filter_by(user_id=current_user.id, community_id=community.id).delete() db.session.query(CommunityJoinRequest).filter_by(user_id=current_user.id, community_id=community.id).delete()
db.session.commit() db.session.commit()
flash('You are unsubscribed from ' + community.title) flash('You are left ' + community.title)
cache.delete_memoized(community_membership, current_user, community) cache.delete_memoized(community_membership, current_user, community)
else: else:

7
app/main/routes.py
View file

@ -163,8 +163,11 @@ def list_local_communities():
@bp.route('/communities/subscribed', methods=['GET']) @bp.route('/communities/subscribed', methods=['GET'])
def list_subscribed_communities(): def list_subscribed_communities():
verification_warning() verification_warning()
communities = Community.query.filter_by(banned=False).join(CommunityMember).filter(CommunityMember.user_id == current_user.id).all() if current_user.is_authenticated:
return render_template('list_communities.html', communities=communities, title=_('Subscribed communities'), communities = Community.query.filter_by(banned=False).join(CommunityMember).filter(CommunityMember.user_id == current_user.id).all()
else:
communities = []
return render_template('list_communities.html', communities=communities, title=_('Joined communities'),
SUBSCRIPTION_PENDING=SUBSCRIPTION_PENDING, SUBSCRIPTION_MEMBER=SUBSCRIPTION_MEMBER) SUBSCRIPTION_PENDING=SUBSCRIPTION_PENDING, SUBSCRIPTION_MEMBER=SUBSCRIPTION_MEMBER)

9
app/static/js/scripts.js
View file

@ -87,6 +87,15 @@ function setupConfirmFirst() {
event.preventDefault(); // As the user clicked "Cancel" in the dialog, prevent the default action. event.preventDefault(); // As the user clicked "Cancel" in the dialog, prevent the default action.
} }
}); });
});
const go_back = document.querySelectorAll('.go_back');
go_back.forEach(element => {
element.addEventListener("click", function(event) {
history.back();
event.preventDefault();
return false;
});
}) })
} }

1
app/static/styles.css
View file

@ -454,6 +454,7 @@ nav.navbar {
max-height: 30px; max-height: 30px;
min-width: 20px; min-width: 20px;
min-height: 20px; min-height: 20px;
vertical-align: text-top;
} }
.community_icon_big { .community_icon_big {

1
app/static/styles.scss
View file

@ -120,6 +120,7 @@ nav.navbar {
max-height: 30px; max-height: 30px;
min-width: 20px; min-width: 20px;
min-height: 20px; min-height: 20px;
vertical-align: text-top;
} }
.community_icon_big { .community_icon_big {

2
app/templates/base.html
View file

@ -73,7 +73,7 @@
{% block navbar %} {% block navbar %}
<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top"> <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
<div class="container-lg"> <div class="container-lg">
<a class="navbar-brand" href="/" target="_blank"><img src="/static/images/logo2.png" alt="Logo" width="50" height="50" />{{ g.site.name }}</a> <a class="navbar-brand" href="/"><img src="/static/images/logo2.png" alt="Logo" width="50" height="50" />{{ g.site.name }}</a>
<button id="navbar-toggler" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button id="navbar-toggler" class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>

17
app/templates/community/add_post.html
View file

@ -75,8 +75,21 @@
<h2>{{ community.title }}</h2> <h2>{{ community.title }}</h2>
</div> </div>
<div class="card-body"> <div class="card-body">
<p>{{ community.description|safe }}</p> <p>{{ community.description_html|safe if community.description_html else '' }}</p>
<p>{{ community.rules|safe }}</p> <p>{{ community.rules_html|safe if community.rules_html else '' }}</p>
{% if len(mods) > 0 and not community.private_mods %}
<h3>Moderators</h3>
<ul class="moderator_list">
{% for mod in mods %}
<li>{{ render_username(mod) }}</li>
{% endfor %}
</ul>
{% endif %}
{% if rss_feed %}
<p class="mt-4">
<a class="no-underline" href="{{ rss_feed }}" rel="nofollow"><span class="fe fe-rss"></span> RSS feed</a>
</p>
{% endif %}
</div> </div>
</div> </div>
</div> </div>

4
app/templates/community/add_remote.html
View file

@ -25,9 +25,9 @@
<a href="/c/{{ new_community.link() }}">{{ new_community.title }}@{{ new_community.ap_domain }}</a> <a href="/c/{{ new_community.link() }}">{{ new_community.title }}@{{ new_community.ap_domain }}</a>
</p> </p>
<p> {% if subscribed %} <p> {% if subscribed %}
<a class="btn btn-primary mt-4" href="/community/{{ new_community.link() }}/unsubscribe">{{ _('Unsubscribe') }}</a> <a class="btn btn-primary mt-4" href="/community/{{ new_community.link() }}/unsubscribe">{{ _('Leave') }}</a>
{% else %} {% else %}
<a class="btn btn-primary mt-4" href="/community/{{ new_community.link() }}/subscribe">{{ _('Subscribe') }}</a> <a class="btn btn-primary mt-4" href="/community/{{ new_community.link() }}/subscribe">{{ _('Join') }}</a>
{% endif %} {% endif %}
</p> </p>
</div> </div>

4
app/templates/community/community.html
View file

@ -64,11 +64,11 @@
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
{% if current_user.is_authenticated and community_membership(current_user, community) == SUBSCRIPTION_MEMBER %} {% if current_user.is_authenticated and community_membership(current_user, community) == SUBSCRIPTION_MEMBER %}
<a class="w-100 btn btn-primary" href="/community/{{ community.link() }}/unsubscribe">{{ _('Unsubscribe') }}</a> <a class="w-100 btn btn-primary" href="/community/{{ community.link() }}/unsubscribe">{{ _('Leave') }}</a>
{% elif current_user.is_authenticated and community_membership(current_user, community) == SUBSCRIPTION_PENDING %} {% elif current_user.is_authenticated and community_membership(current_user, community) == SUBSCRIPTION_PENDING %}
<a class="w-100 btn btn-outline-secondary" href="/community/{{ community.link() }}/unsubscribe">{{ _('Pending') }}</a> <a class="w-100 btn btn-outline-secondary" href="/community/{{ community.link() }}/unsubscribe">{{ _('Pending') }}</a>
{% else %} {% else %}
<a class="w-100 btn btn-primary" href="/community/{{ community.link() }}/subscribe">{{ _('Subscribe') }}</a> <a class="w-100 btn btn-primary" href="/community/{{ community.link() }}/subscribe">{{ _('Join') }}</a>
{% endif %} {% endif %}
</div> </div>
<div class="col-6"> <div class="col-6">

1
app/templates/email/reset_password.html
View file

@ -1,3 +1,4 @@
<p><a href="https://piefed.social/"><img src="https://piefed.social/static/images/logo2.png" style="max-width: 100%; margin-bottom: 20px;" width="50" height="50" alt="PieFed logo" /></a></p>
<p>Hi {{ user.display_name() }},</p> <p>Hi {{ user.display_name() }},</p>
<p> <p>
To reset your password To reset your password

1
app/templates/email/verification.html
View file

@ -1,3 +1,4 @@
<p><a href="https://piefed.social/"><img src="https://piefed.social/static/images/logo2.png" style="max-width: 100%; margin-bottom: 20px;" width="50" height="50" alt="PieFed logo" /></a></p>
<p>Hi {{ user.display_name() }},</p> <p>Hi {{ user.display_name() }},</p>
<p> <p>
To verify your email address To verify your email address

2
app/templates/email/welcome.html
View file

@ -1,4 +1,4 @@
<p><a href="https://piefed.social/"><img src="https://piefed.social/images/PyFedi-logo.png" style="max-width: 100%; margin-bottom: 20px;" width="250" height="48" alt="PieFed logo" /></a></p> <p><a href="https://piefed.social/"><img src="https://piefed.social/static/images/logo2.png" style="max-width: 100%; margin-bottom: 20px;" width="50" height="50" alt="PieFed logo" /></a></p>
<p>Hello {{ first_name }} and welcome!</p> <p>Hello {{ first_name }} and welcome!</p>
<p>I'm Rimu, the founder of PieFed and I'd like to personally thank you for signing up.</p> <p>I'm Rimu, the founder of PieFed and I'd like to personally thank you for signing up.</p>
<p>As this software is still being developed I need your feedback and ideas for how to improve it. You will notice <p>As this software is still being developed I need your feedback and ideas for how to improve it. You will notice

2
app/templates/errors/404.html
View file

@ -9,7 +9,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<p>{{ _('The page your browser tried to load could not be found.') }}</p> <p>{{ _('The page your browser tried to load could not be found.') }}</p>
<p><a href="#">{{ _('Back') }}</a></p> <p><a href="#" class="go_back">{{ _('Back') }}</a></p>
</div> </div>
</div> </div>
</div> </div>

4
app/templates/errors/500.html
View file

@ -8,8 +8,8 @@
<h3 class="card-title">{{ _('An unexpected error has occurred') }}</h3> <h3 class="card-title">{{ _('An unexpected error has occurred') }}</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<p>{{ _('Sorry for the inconvenience! Please let us know about this, so we can repair it and make ChoreBuster better for everyone.') }}</p> <p>{{ _('Sorry for the inconvenience! Please let us know about this, so we can repair it and make PieFed better for everyone.') }}</p>
<p><a href="#">{{ _('Back') }}</a></p> <p><a href="#" class="go_back">{{ _('Back') }}</a></p>
</div> </div>
</div> </div>
</div> </div>

2
app/templates/index.html
View file

@ -9,7 +9,7 @@
{% for post in posts %} {% for post in posts %}
{% include 'post/_post_teaser.html' %} {% include 'post/_post_teaser.html' %}
{% else %} {% else %}
<p>{{ _('No posts yet. Subscribe to some communities to see more.') }}</p> <p>{{ _('No posts yet. Join some communities to see more.') }}</p>
<p><a class="btn btn-primary" href="/communities">{{ _('Explore communities') }}</a></p> <p><a class="btn btn-primary" href="/communities">{{ _('Explore communities') }}</a></p>
{% endfor %} {% endfor %}
</div> </div>

33
app/templates/list_communities.html
View file

@ -12,7 +12,7 @@
{{ _('Local') }} {{ _('Local') }}
</a> </a>
<a href="/communities/subscribed" class="btn {{ 'btn-primary' if request.path == '/communities/subscribed' else 'btn-outline-secondary' }}"> <a href="/communities/subscribed" class="btn {{ 'btn-primary' if request.path == '/communities/subscribed' else 'btn-outline-secondary' }}">
{{ _('Subscribed') }} {{ _('Joined') }}
</a> </a>
{% if topics %} {% if topics %}
<span class="mt-1 pl-4"> <span class="mt-1 pl-4">
@ -25,7 +25,7 @@
</select> </select>
</form> </form>
</span> </span>
{% endif %} {% endif %}
</div> </div>
</div> </div>
@ -34,41 +34,42 @@
<a href="{{ url_for('community.add_local') }}" class="btn btn-outline-secondary">{{ _('Create local') }}</a> <a href="{{ url_for('community.add_local') }}" class="btn btn-outline-secondary">{{ _('Create local') }}</a>
<a href="{{ url_for('community.add_remote') }}" class="btn btn-outline-secondary">{{ _('Add remote') }}</a> <a href="{{ url_for('community.add_remote') }}" class="btn btn-outline-secondary">{{ _('Add remote') }}</a>
</div> </div>
<form method="get" action="/communities"> <!-- <form method="get" action="/communities">
<input name='search' type="search" placeholder="Find a community" class="form-control" value="{{ search }}" /> <input name='search' type="search" placeholder="Find a community" class="form-control" value="{{ search }}" />
</form> </form> -->
</div> </div>
</div> </div>
{% if len(communities) > 0 %} {% if len(communities) > 0 %}
<div class="table-responsive-md"> <div class="table-responsive-md mt-4">
<table class="communities_table table table-striped table-hover w-100"> <table class="communities_table table table-striped table-hover w-100">
<thead> <thead>
<tr> <tr>
<th scope="col"> </th>
<th scope="col" colspan="2">{{ _('Community') }}</th> <th scope="col" colspan="2">{{ _('Community') }}</th>
<th scope="col">{{ _('Posts') }}</th> <th scope="col">{{ _('Posts') }}</th>
<th scope="col">{{ _('Comments') }}</th> <th scope="col">{{ _('Comments') }}</th>
<th scope="col">{{ _('Active') }}</th> <th scope="col">{{ _('Active') }}</th>
<th scope="col">{{ _('Actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for community in communities %} {% for community in communities %}
<tr class=""> <tr class="">
<td width="70">{% if current_user.is_authenticated %}
{% if community_membership(current_user, community) in [SUBSCRIPTION_MEMBER, SUBSCRIPTION_OWNER] %}
<a class="btn btn-primary btn-sm" href="/community/{{ community.link() }}/unsubscribe">{{ _('Leave') }}</a>
{% elif community_membership(current_user, community) == SUBSCRIPTION_PENDING %}
<a class="btn btn-outline-secondary btn-sm" href="/community/{{ community.link() }}/unsubscribe">{{ _('Pending') }}</a>
{% else %}
<a class="btn btn-primary btn-sm" href="/community/{{ community.link() }}/subscribe">{{ _('Join') }}</a>
{% endif %}
{% else %}
<a class="btn btn-primary btn-sm" href="/community/{{ community.link() }}/subscribe">{{ _('Join') }}</a>
{% endif %}</td>
<td width="46"><a href="/c/{{ community.link() }}"><img src="{{ community.icon_image('tiny') }}" class="community_icon rounded-circle" loading="lazy" /></a></td> <td width="46"><a href="/c/{{ community.link() }}"><img src="{{ community.icon_image('tiny') }}" class="community_icon rounded-circle" loading="lazy" /></a></td>
<td scope="row" class="pl-0"><a href="/c/{{ community.link() }}">{{ community.display_name() }}</a></td> <td scope="row" class="pl-0"><a href="/c/{{ community.link() }}">{{ community.display_name() }}</a></td>
<td>{{ community.post_count }}</td> <td>{{ community.post_count }}</td>
<td>{{ community.post_reply_count }}</td> <td>{{ community.post_reply_count }}</td>
<td>{{ moment(community.last_active).fromNow(refresh=True) }}</td> <td>{{ moment(community.last_active).fromNow(refresh=True) }}</td>
<td>{% if current_user.is_authenticated %}
{% if community_membership(current_user, community) in [SUBSCRIPTION_MEMBER, SUBSCRIPTION_OWNER] %}
<a class="btn btn-primary btn-sm" href="/community/{{ community.link() }}/unsubscribe">Unsubscribe</a>
{% elif community_membership(current_user, community) == SUBSCRIPTION_PENDING %}
<a class="btn btn-outline-secondary btn-sm" href="/community/{{ community.link() }}/unsubscribe">Pending</a>
{% else %}
<a class="btn btn-primary btn-sm" href="/community/{{ community.link() }}/subscribe">Subscribe</a>
{% endif %}
{% endif %}
</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

12
app/templates/post/_post_full.html
View file

@ -14,7 +14,7 @@
</div> </div>
<h1 class="mt-2 post_title">{{ post.title }}</h1> <h1 class="mt-2 post_title">{{ post.title }}</h1>
{% if post.url %} {% if post.url %}
<p><small><a href="{{ post.url }}" rel="nofollow ugc">{{ post.url|shorten_url }} <p><small><a href="{{ post.url }}" rel="nofollow ugc" target="_blank">{{ post.url|shorten_url }}
<img src="/static/images/external_link_black.svg" class="external_link_icon" alt="External link" /> <img src="/static/images/external_link_black.svg" class="external_link_icon" alt="External link" />
</a></small></p> </a></small></p>
{% endif %} {% endif %}
@ -28,7 +28,7 @@
<a href="{{ post.image.view_url() }}" rel="nofollow ugc"><img src="{{ post.image.view_url() }}" alt="{{ post.image.alt_text }}" <a href="{{ post.image.view_url() }}" rel="nofollow ugc"><img src="{{ post.image.view_url() }}" alt="{{ post.image.alt_text }}"
width="{{ post.image.width }}" height="{{ post.image.height }}" /></a> width="{{ post.image.width }}" height="{{ post.image.height }}" /></a>
{% else %} {% else %}
<a href="{{ post.url }}" rel="nofollow ugc"><img src="{{ post.url }}" style="max-width: 100%; height: auto;" /></a> <a href="{{ post.url }}" rel="nofollow ugc" target="_blank"><img src="{{ post.url }}" style="max-width: 100%; height: auto;" /></a>
{% endif %} {% endif %}
</div> </div>
</div> </div>
@ -48,7 +48,7 @@
<h1 class="mt-2 post_title">{{ post.title }}</h1> <h1 class="mt-2 post_title">{{ post.title }}</h1>
{% if post.type == POST_TYPE_LINK and post.image_id and not (post.url and 'youtube.com' in post.url) %} {% if post.type == POST_TYPE_LINK and post.image_id and not (post.url and 'youtube.com' in post.url) %}
<div class="url_thumbnail"> <div class="url_thumbnail">
<a href="{{ post.url }}"><img src="{{ post.image.thumbnail_url() }}" alt="{{ post.image.alt_text }}" <a href="{{ post.url }}" target="_blank"><img src="{{ post.image.thumbnail_url() }}" alt="{{ post.image.alt_text }}"
width="{{ post.image.thumbnail_width }}" height="{{ post.image.thumbnail_height }}" /></a> width="{{ post.image.thumbnail_width }}" height="{{ post.image.thumbnail_height }}" /></a>
</div> </div>
{% endif %} {% endif %}
@ -59,7 +59,7 @@
{% if post.edited_at %} edited {{ moment(post.edited_at).fromNow() }}{% endif %}</small> {% if post.edited_at %} edited {{ moment(post.edited_at).fromNow() }}{% endif %}</small>
</p> </p>
{% if post.type == POST_TYPE_LINK %} {% if post.type == POST_TYPE_LINK %}
<p><small><a href="{{ post.url }}" rel="nofollow ugc">{{ post.url|shorten_url }} <p><small><a href="{{ post.url }}" rel="nofollow ugc" target="_blank">{{ post.url|shorten_url }}
<img src="/static/images/external_link_black.svg" class="external_link_icon" alt="External link" /></a> <img src="/static/images/external_link_black.svg" class="external_link_icon" alt="External link" /></a>
</small></p> </small></p>
{% if 'youtube.com' in post.url %} {% if 'youtube.com' in post.url %}
@ -67,12 +67,12 @@
{% endif %} {% endif %}
{% elif post.type == POST_TYPE_IMAGE %} {% elif post.type == POST_TYPE_IMAGE %}
<div class="post_image"> <div class="post_image">
<a href="{{ post.image.view_url() }}"><img src="{{ post.image.view_url() }}" alt="{{ post.image.alt_text }}" <a href="{{ post.image.view_url() }}" target="_blank"><img src="{{ post.image.view_url() }}" alt="{{ post.image.alt_text }}"
width="{{ post.image.width }}" height="{{ post.image.height }}" /></a> width="{{ post.image.width }}" height="{{ post.image.height }}" /></a>
</div> </div>
{% else %} {% else %}
{% if post.image_id and not (post.url and 'youtube.com' in post.url) %} {% if post.image_id and not (post.url and 'youtube.com' in post.url) %}
<a href="{{ post.image.view_url() }}"><img src="{{ post.image.thumbnail_url() }}" alt="{{ post.image.alt_text }}" <a href="{{ post.image.view_url() }}" target="_blank"><img src="{{ post.image.thumbnail_url() }}" alt="{{ post.image.alt_text }}"
width="{{ post.image.thumbnail_width }}" height="{{ post.image.thumbnail_height }}" /></a> width="{{ post.image.thumbnail_width }}" height="{{ post.image.thumbnail_height }}" /></a>
{% endif %} {% endif %}
{% endif %} {% endif %}

4
app/templates/post/add_reply.html
View file

@ -34,9 +34,9 @@
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
{% if current_user.is_authenticated and community_membership(current_user, post.community) %} {% if current_user.is_authenticated and community_membership(current_user, post.community) %}
<a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/unsubscribe">{{ _('Unsubscribe') }}</a> <a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/unsubscribe">{{ _('Leave') }}</a>
{% else %} {% else %}
<a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/subscribe">{{ _('Subscribe') }}</a> <a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/subscribe">{{ _('Join') }}</a>
{% endif %} {% endif %}
</div> </div>
<div class="col-6"> <div class="col-6">

4
app/templates/post/continue_discussion.html
View file

@ -64,9 +64,9 @@
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
{% if current_user.is_authenticated and community_membership(current_user, post.community) %} {% if current_user.is_authenticated and community_membership(current_user, post.community) %}
<a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/unsubscribe">{{ _('Unsubscribe') }}</a> <a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/unsubscribe">{{ _('Leave') }}</a>
{% else %} {% else %}
<a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/subscribe">{{ _('Subscribe') }}</a> <a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/subscribe">{{ _('Join') }}</a>
{% endif %} {% endif %}
</div> </div>
<div class="col-6"> <div class="col-6">

4
app/templates/post/post.html
View file

@ -138,9 +138,9 @@
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
{% if current_user.is_authenticated and community_membership(current_user, post.community) %} {% if current_user.is_authenticated and community_membership(current_user, post.community) %}
<a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/unsubscribe">{{ _('Unsubscribe') }}</a> <a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/unsubscribe">{{ _('Leave') }}</a>
{% else %} {% else %}
<a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/subscribe">{{ _('Subscribe') }}</a> <a class="w-100 btn btn-primary" href="/community/{{ post.community.link() }}/subscribe">{{ _('Join') }}</a>
{% endif %} {% endif %}
</div> </div>
<div class="col-6"> <div class="col-6">

2
app/templates/user/notifications.html
View file

@ -63,7 +63,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
{% if len(subscribed) > 0 %} {% if len(subscribed) > 0 %}
<h4>Subscribed to</h4> <h4>Member of</h4>
<ul> <ul>
{% for community in subscribed %} {% for community in subscribed %}
<li> <li>

14
app/templates/user/show_profile.html
View file

@ -72,6 +72,8 @@
</a> </a>
{% endif %} {% endif %}
</nav> </nav>
{% else %}
<p>{{ _('No posts yet.') }}</p>
{% endif %} {% endif %}
{% if post_replies %} {% if post_replies %}
@ -93,6 +95,8 @@
</a> </a>
{% endif %} {% endif %}
</nav> </nav>
{% else %}
<p>{{ _('No comments yet.') }}</p>
{% endif %} {% endif %}
</div> </div>
@ -121,10 +125,10 @@
</div> </div>
<div class="card-body"> <div class="card-body">
{% if len(subscribed) > 0 %} {% if len(subscribed) > 0 %}
<h4>Subscribed to</h4> <h4>{{ _('Member of') }}</h4>
<ul> <ul class="list-group list-group-flush">
{% for community in subscribed %} {% for community in subscribed %}
<li> <li class="list-group-item">
<a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" />{{ community.display_name() }}</a> <a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" />{{ community.display_name() }}</a>
</li> </li>
{% endfor %} {% endfor %}
@ -132,9 +136,9 @@
{% endif %} {% endif %}
{% if len(moderates) > 0 %} {% if len(moderates) > 0 %}
<h4>Moderates</h4> <h4>Moderates</h4>
<ul> <ul class="list-group list-group-flush">
{% for community in moderates %} {% for community in moderates %}
<li> <li class="list-group-item">
<a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" />{{ community.display_name() }}</a> <a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" />{{ community.display_name() }}</a>
</li> </li>
{% endfor %} {% endfor %}

2
app/user/forms.py
View file

@ -14,7 +14,7 @@ class ProfileForm(FlaskForm):
password_field = PasswordField(_l('Set new password'), validators=[Optional(), Length(min=1, max=50)], password_field = PasswordField(_l('Set new password'), validators=[Optional(), Length(min=1, max=50)],
render_kw={"autocomplete": 'Off'}) render_kw={"autocomplete": 'Off'})
about = TextAreaField(_l('Bio'), validators=[Optional(), Length(min=3, max=5000)]) about = TextAreaField(_l('Bio'), validators=[Optional(), Length(min=3, max=5000)])
matrix_user_id = StringField(_l('Matrix User ID'), validators=[Optional(), Length(max=255)]) matrix_user_id = StringField(_l('Matrix User ID'), validators=[Optional(), Length(max=255)], render_kw={'autocomplete': 'off'})
profile_file = FileField(_('Avatar image')) profile_file = FileField(_('Avatar image'))
banner_file = FileField(_('Top banner image')) banner_file = FileField(_('Top banner image'))
bot = BooleanField(_l('This profile is a bot')) bot = BooleanField(_l('This profile is a bot'))

18
app/user/routes.py
View file

@ -86,10 +86,11 @@ def edit_profile(actor):
profile_file = request.files['profile_file'] profile_file = request.files['profile_file']
if profile_file and profile_file.filename != '': if profile_file and profile_file.filename != '':
# remove old avatar # remove old avatar
file = File.query.get(current_user.avatar_id) if current_user.avatar_id:
file.delete_from_disk() file = File.query.get(current_user.avatar_id)
current_user.avatar_id = None file.delete_from_disk()
db.session.delete(file) current_user.avatar_id = None
db.session.delete(file)
# add new avatar # add new avatar
file = save_icon_file(profile_file, 'users') file = save_icon_file(profile_file, 'users')
@ -98,10 +99,11 @@ def edit_profile(actor):
banner_file = request.files['banner_file'] banner_file = request.files['banner_file']
if banner_file and banner_file.filename != '': if banner_file and banner_file.filename != '':
# remove old cover # remove old cover
file = File.query.get(current_user.cover_id) if current_user.cover_id:
file.delete_from_disk() file = File.query.get(current_user.cover_id)
current_user.cover_id = None file.delete_from_disk()
db.session.delete(file) current_user.cover_id = None
db.session.delete(file)
# add new cover # add new cover
file = save_banner_file(banner_file, 'users') file = save_banner_file(banner_file, 'users')