yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 01:19:16 +02:00
Code Issues Releases Wiki Activity

Removed too complex FollowRequest model, we now use an aproved field on Follow

Browse source
This commit is contained in:
Eliot Berriot 2018-04-10 21:25:35 +02:00
parent c97db31cb1
commit 0b2fe8439a
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
14 changed files with 480 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

26
api/funkwhale_api/federation/library.py
View file

@ -38,25 +38,21 @@ def scan_from_account_name(account_name):
actor__domain=domain,
actor__preferred_username=username
).select_related('actor').first()
follow_request = None
if library:
data['local']['following'] = True
data['local']['awaiting_approval'] = True
else:
follow_request = models.FollowRequest.objects.filter(
data['local'] = {
'following': False,
'awaiting_approval': False,
}
try:
follow = models.Follow.objects.get(
target__preferred_username=username,
target__domain=username,
actor=system_library,
).first()
data['local'] = {
'following': False,
'awaiting_approval': False,
}
if follow_request:
data['awaiting_approval'] = follow_request.approved is None
)
data['local']['awaiting_approval'] = not bool(follow.approved)
data['local']['following'] = True
except models.Follow.DoesNotExist:
pass
follow_request = models.Follow
try:
data['webfinger'] = webfinger.get_resource(
'acct:{}'.format(account_name))