secstate/vrobbler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Its a webhook, not a websocket

Browse Source
This commit is contained in:
Colin Powell
2023-02-23 11:03:19 -05:00
parent 40a126cf8b
commit 479fee6a5c
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/scrobbles_tests/test_aggregators.py
View File

@ -16,7 +16,7 @@ from scrobbles.models import Scrobble
def build_scrobbles(client, request_data, num=7, spacing=2): def build_scrobbles(client, request_data, num=7, spacing=2):
url = reverse('scrobbles:mopidy-websocket') url = reverse('scrobbles:mopidy-webhook')
user = get_user_model().objects.create(username='Test User') user = get_user_model().objects.create(username='Test User')
UserProfile.objects.create(user=user, timezone='US/Eastern') UserProfile.objects.create(user=user, timezone='US/Eastern')
for i in range(num): for i in range(num):

10
tests/scrobbles_tests/test_views.py
View File

@ -10,7 +10,7 @@ from podcasts.models import Episode
@pytest.mark.django_db @pytest.mark.django_db
def test_get_not_allowed_from_mopidy(client, valid_auth_token): def test_get_not_allowed_from_mopidy(client, valid_auth_token):
url = reverse('scrobbles:mopidy-websocket') url = reverse('scrobbles:mopidy-webhook')
headers = {'Authorization': f'Token {valid_auth_token}'} headers = {'Authorization': f'Token {valid_auth_token}'}
response = client.get(url, headers=headers) response = client.get(url, headers=headers)
assert response.status_code == 405 assert response.status_code == 405
@ -18,7 +18,7 @@ def test_get_not_allowed_from_mopidy(client, valid_auth_token):
@pytest.mark.django_db @pytest.mark.django_db
def test_bad_mopidy_request_data(client, valid_auth_token): def test_bad_mopidy_request_data(client, valid_auth_token):
url = reverse('scrobbles:mopidy-websocket') url = reverse('scrobbles:mopidy-webhook')
headers = {'Authorization': f'Token {valid_auth_token}'} headers = {'Authorization': f'Token {valid_auth_token}'}
response = client.post(url, headers) response = client.post(url, headers)
assert response.status_code == 400 assert response.status_code == 400
@ -32,7 +32,7 @@ def test_bad_mopidy_request_data(client, valid_auth_token):
def test_scrobble_mopidy_track( def test_scrobble_mopidy_track(
client, mopidy_track_request_data, valid_auth_token client, mopidy_track_request_data, valid_auth_token
): ):
url = reverse('scrobbles:mopidy-websocket') url = reverse('scrobbles:mopidy-webhook')
headers = {'Authorization': f'Token {valid_auth_token}'} headers = {'Authorization': f'Token {valid_auth_token}'}
response = client.post( response = client.post(
url, url,
@ -55,7 +55,7 @@ def test_scrobble_mopidy_same_track_different_album(
mopidy_track_diff_album_request_data, mopidy_track_diff_album_request_data,
valid_auth_token, valid_auth_token,
): ):
url = reverse('scrobbles:mopidy-websocket') url = reverse('scrobbles:mopidy-webhook')
headers = {'Authorization': f'Token {valid_auth_token}'} headers = {'Authorization': f'Token {valid_auth_token}'}
response = client.post( response = client.post(
url, url,
@ -84,7 +84,7 @@ def test_scrobble_mopidy_same_track_different_album(
def test_scrobble_mopidy_podcast( def test_scrobble_mopidy_podcast(
client, mopidy_podcast_request_data, valid_auth_token client, mopidy_podcast_request_data, valid_auth_token
): ):
url = reverse('scrobbles:mopidy-websocket') url = reverse('scrobbles:mopidy-webhook')
headers = {'Authorization': f'Token {valid_auth_token}'} headers = {'Authorization': f'Token {valid_auth_token}'}
response = client.post( response = client.post(
url, url,

12
vrobbler/apps/scrobbles/urls.py
View File

@ -32,14 +32,14 @@ urlpatterns = [
name='lastfm-import', name='lastfm-import',
), ),
path( path(
'websocket/jellyfin/', 'webhook/jellyfin/',
views.jellyfin_websocket, views.jellyfin_webhook,
name='jellyfin-websocket', name='jellyfin-webhook',
), ),
path( path(
'websocket/mopidy/', 'webhook/mopidy/',
views.mopidy_websocket, views.mopidy_webhook,
name='mopidy-websocket', name='mopidy-webhook',
), ),
path('export/', views.export, name='export'), path('export/', views.export, name='export'),
] ]

4
vrobbler/apps/scrobbles/views.py
View File

@ -216,7 +216,7 @@ def lastfm_import(request):
@csrf_exempt @csrf_exempt
@permission_classes([IsAuthenticated]) @permission_classes([IsAuthenticated])
@api_view(['POST']) @api_view(['POST'])
def jellyfin_websocket(request): def jellyfin_webhook(request):
data_dict = request.data data_dict = request.data
if ( if (
@ -248,7 +248,7 @@ def jellyfin_websocket(request):
@csrf_exempt @csrf_exempt
@permission_classes([IsAuthenticated]) @permission_classes([IsAuthenticated])
@api_view(['POST']) @api_view(['POST'])
def mopidy_websocket(request): def mopidy_webhook(request):
try: try:
data_dict = json.loads(request.data) data_dict = json.loads(request.data)
except TypeError: except TypeError: