nobigtech
/
pleroma-relay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'db-inbox-fix' into 'master' 

properly create 'relay-list' in db

See merge request pleroma/relay!25
This commit is contained in:
Haelwenn 2020-11-23 07:06:50 +00:00
parent 8b4ef87eba 89990331d5
commit 4d4bebd0be
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
relay/database.py
View File

@ -24,11 +24,11 @@ following = DATABASE.get('relay-list', [])
for inbox in following: for inbox in following:
if urllib.parse.urlsplit(inbox).hostname in AP_CONFIG['blocked_instances']: if urllib.parse.urlsplit(inbox).hostname in AP_CONFIG['blocked_instances']:
following.remove(inbox) following.remove(inbox)
DATABASE['relay-list'] = following
elif AP_CONFIG['whitelist_enabled'] is True and urllib.parse.urlsplit(inbox).hostname not in AP_CONFIG['whitelist']: elif AP_CONFIG['whitelist_enabled'] is True and urllib.parse.urlsplit(inbox).hostname not in AP_CONFIG['whitelist']:
following.remove(inbox) following.remove(inbox)
DATABASE['relay-list'] = following
DATABASE['relay-list'] = following
if 'actors' in DATABASE: if 'actors' in DATABASE:
DATABASE.pop('actors') DATABASE.pop('actors')