michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-02-02 16:21:32 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'various small changes and fixes' (#81) from rscmbbng/pyfedi:main into main

Browse source 
Reviewed-on: https://codeberg.org/rimu/pyfedi/pulls/81
This commit is contained in:
rimu 2024-03-08 09:55:18 +00:00
commit 12545379b3
5 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/cli.py
View file

@ -86,16 +86,13 @@ def register(app):
db.session.add(Settings(name='registration_open', value=json.dumps(True)))
db.session.add(Settings(name='approve_registrations', value=json.dumps(False)))
db.session.add(Settings(name='federation', value=json.dumps(True)))
db.session.add(BannedInstances(domain='lemmygrad.ml'))
db.session.add(BannedInstances(domain='gab.com'))
db.session.add(BannedInstances(domain='rqd2.net'))
db.session.add(BannedInstances(domain='exploding-heads.com'))
db.session.add(BannedInstances(domain='hexbear.net'))
db.session.add(BannedInstances(domain='threads.net'))
db.session.add(BannedInstances(domain='pieville.net'))
db.session.add(BannedInstances(domain='noauthority.social'))
db.session.add(BannedInstances(domain='pieville.net'))
db.session.add(BannedInstances(domain='links.hackliberty.org'))
banned_instances = ['anonib.al','lemmygrad.ml', 'gab.com', 'rqd2.net', 'exploding-heads.com', 'hexbear.net', 'threads.net', 'pieville.net', 'noauthority.social', 'pieville.net', 'links.hackliberty.org']
for bi in banned_instances:
db.session.add(BannedInstances(domain=bi))
print("Added banned instance", bi)
print("Populating DB with instances and interests")
print("See interests.txt")
interests = file_get_contents('interests.txt')
db.session.add(Interest(name='🕊 Chilling', communities=parse_communities(interests, 'chilling')))
db.session.add(Interest(name='💭 Interesting stuff', communities=parse_communities(interests, 'interesting stuff')))
@ -114,13 +111,14 @@ def register(app):
if block_list:
for domain in block_list.split('\n'):
db.session.add(Domain(name=domain.strip(), banned=True))
print("Added 'No-QAnon' blocklist, see https://github.com/rimu/no-qanon")
# 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))
db.session.add(Domain(name='anonib.al', banned=True))
print("Added 'Peertube Isolation' blocklist, see https://peertube_isolation.frama.io/")
# Initial roles
anon_role = Role(name='Anonymous user', weight=0)

2
app/community/forms.py
View file

@ -81,7 +81,7 @@ class CreatePostForm(FlaskForm):
return False
domain = domain_from_url(self.link_url.data, create=False)
if domain and domain.banned:
self.link_url.errors.append(_(f"Links to %s are not allowed.".format(domain.name)))
self.link_url.errors.append(_("Links to %s are not allowed." % (domain.name)))
return False
elif self.post_type.data == 'image':
if self.image_title.data == '':

2
app/templates/index.html
View file

@ -42,7 +42,7 @@
</div>
</div> -->
<div class="card mt-3">
<div class="card">
<div class="card-header">
<h2>{{ _('Active communities') }}</h2>
</div>

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

@ -35,7 +35,7 @@
<aside id="side_pane" class="col-12 col-md-4 side_pane" role="complementary">
<div class="card mt-3">
<div class="card">
<div class="card-header">
<h2> </h2>
</div>

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

@ -108,7 +108,7 @@
<aside id="side_pane" class="col-12 col-md-4 side_pane" role="complementary">
{% if current_user.is_authenticated and current_user.id == user.id %}
<div class="card mt-3">
<div class="card">
<div class="card-header">
<h2>{{ _('Manage') }}</h2>
</div>