`
+
diff --git a/app/cli.py b/app/cli.py
index a1f1ec19..d37646cc 100644
--- a/app/cli.py
+++ b/app/cli.py
@@ -19,7 +19,7 @@ from app.auth.util import random_token
from app.email import send_verification_email, send_email
from app.models import Settings, BannedInstances, Interest, Role, User, RolePermission, Domain, ActivityPubLog, \
utcnow, Site, Instance, File, Notification, Post, CommunityMember
-from app.utils import file_get_contents, retrieve_block_list, blocked_domains
+from app.utils import file_get_contents, retrieve_block_list, blocked_domains, retrieve_peertube_block_list
def register(app):
@@ -115,6 +115,12 @@ def register(app):
for domain in block_list.split('\n'):
db.session.add(Domain(name=domain.strip(), banned=True))
+ # Load peertube domain block list
+ block_list = retrieve_peertube_block_list()
+ if block_list:
+ for domain in block_list.split('\n'):
+ db.session.add(Domain(name=domain.strip(), banned=True))
+
# Initial roles
anon_role = Role(name='Anonymous user', weight=0)
anon_role.permissions.append(RolePermission(permission='register'))
diff --git a/app/main/routes.py b/app/main/routes.py
index 08b7cc7e..9a2b3550 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -147,7 +147,7 @@ def home_page(type, sort):
@bp.route('/topics', methods=['GET'])
def list_topics():
verification_warning()
- topics = Topic.query.order_by(Topic.name).all()
+ topics = Topic.query.filter_by(parent_id=None).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',
diff --git a/app/post/routes.py b/app/post/routes.py
index 46621a4c..c310b27e 100644
--- a/app/post/routes.py
+++ b/app/post/routes.py
@@ -75,7 +75,7 @@ def show_post(post_id: int):
reply = PostReply(user_id=current_user.id, post_id=post.id, community_id=community.id, body=form.body.data,
body_html=markdown_to_html(form.body.data), body_html_safe=True,
- from_bot=current_user.bot, up_votes=1, nsfw=post.nsfw, nsfl=post.nsfl,
+ from_bot=current_user.bot, nsfw=post.nsfw, nsfl=post.nsfl,
notify_author=form.notify_author.data, instance_id=1)
if post.notify_author and current_user.id != post.user_id:
notification = Notification(title=shorten_string(_('Reply from %(name)s on %(post_title)s',
@@ -208,16 +208,16 @@ def post_vote(post_id: int, vote_direction):
post.score -= 2
downvoted_class = 'voted_down'
else: # previous vote was down
- if vote_direction == 'upvote': # new vote is upvote
+ if vote_direction == 'downvote': # new vote is also down, so remove it
+ db.session.delete(existing_vote)
+ post.down_votes -= 1
+ post.score += 1
+ else: # new vote is up while previous vote was down, so reverse their previous vote
existing_vote.effect = 1
post.up_votes += 1
post.down_votes -= 1
- post.score += 1
- upvoted_class = 'voted_up'
- else: # reverse a previous downvote
- db.session.delete(existing_vote)
- post.down_votes -= 1
post.score += 2
+ upvoted_class = 'voted_up'
else:
if vote_direction == 'upvote':
effect = 1
@@ -303,16 +303,16 @@ def comment_vote(comment_id, vote_direction):
comment.score -= 2
downvoted_class = 'voted_down'
else: # previous vote was down
- if vote_direction == 'upvote': # new vote is upvote
+ if vote_direction == 'downvote': # new vote is also down, so remove it
+ db.session.delete(existing_vote)
+ comment.down_votes -= 1
+ comment.score += 1
+ else: # new vote is up while previous vote was down, so reverse their previous vote
existing_vote.effect = 1
comment.up_votes += 1
comment.down_votes -= 1
- comment.score += 1
- upvoted_class = 'voted_up'
- else: # reverse a previous downvote
- db.session.delete(existing_vote)
- comment.down_votes -= 1
comment.score += 2
+ upvoted_class = 'voted_up'
else:
if vote_direction == 'upvote':
effect = 1
@@ -422,7 +422,7 @@ def add_reply(post_id: int, comment_id: int):
reply = PostReply(user_id=current_user.id, post_id=post.id, parent_id=in_reply_to.id, depth=in_reply_to.depth + 1,
community_id=post.community.id, body=form.body.data,
body_html=markdown_to_html(form.body.data), body_html_safe=True,
- from_bot=current_user.bot, up_votes=1, nsfw=post.nsfw, nsfl=post.nsfl,
+ from_bot=current_user.bot, nsfw=post.nsfw, nsfl=post.nsfl,
notify_author=form.notify_author.data, instance_id=1)
db.session.add(reply)
if in_reply_to.notify_author and current_user.id != in_reply_to.user_id and in_reply_to.author.ap_id is None: # todo: check if replier is blocked
diff --git a/app/templates/topic/show_topic.html b/app/templates/topic/show_topic.html
index 3af75077..9d837766 100644
--- a/app/templates/topic/show_topic.html
+++ b/app/templates/topic/show_topic.html
@@ -17,7 +17,14 @@
{{ topic.name }}
-
+ {% if sub_topics %}
+ {{ _('Sub-topics') }}
+
+ {% endif %}
{% include "community/_community_nav.html" %}
{% if post_layout == 'masonry' or post_layout == 'masonry_wide' %}
diff --git a/app/topic/routes.py b/app/topic/routes.py
index 55e2eaf1..f58bdded 100644
--- a/app/topic/routes.py
+++ b/app/topic/routes.py
@@ -77,9 +77,12 @@ def show_topic(topic_name):
topic_name=topic_name,
page=posts.prev_num, sort=sort, layout=post_layout) if posts.has_prev and page != 1 else None
+ sub_topics = Topic.query.filter_by(parent_id=topic.id).order_by(Topic.name).all()
+
return render_template('topic/show_topic.html', title=_(topic.name), posts=posts, topic=topic, sort=sort,
page=page, post_layout=post_layout, next_url=next_url, prev_url=prev_url,
topic_communities=topic_communities, content_filters=content_filters,
+ sub_topics=sub_topics,
rss_feed=f"https://{current_app.config['SERVER_NAME']}/topic/{topic_name}.rss",
rss_feed_name=f"{topic.name} on {g.site.name}",
show_post_community=True, moderating_communities=moderating_communities(current_user.get_id()),
diff --git a/app/utils.py b/app/utils.py
index a54aba67..e7ba8f10 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -319,6 +319,19 @@ def retrieve_block_list():
return response.text
+def retrieve_peertube_block_list():
+ try:
+ response = requests.get('https://peertube_isolation.frama.io/list/peertube_isolation.json', timeout=1)
+ except:
+ return None
+ list = ''
+ if response and response.status_code == 200:
+ response_data = response.json()
+ for row in response_data['data']:
+ list += row['value'] + "\n"
+ return list.strip()
+
+
def ensure_directory_exists(directory):
parts = directory.split('/')
rebuild_directory = ''