kopia lustrzana https://gitlab.com/marnanel/chapeau
intermediate
rodzic
8e910bd974
commit
d330c649ae
|
@ -302,11 +302,12 @@ class Status(models.Model):
|
|||
max_length = 255,
|
||||
null = True,
|
||||
blank = True,
|
||||
default = None,
|
||||
default = '',
|
||||
)
|
||||
|
||||
visibility = models.CharField(
|
||||
max_length = 255,
|
||||
default = 'public',
|
||||
)
|
||||
|
||||
language = models.CharField(
|
||||
|
@ -385,6 +386,14 @@ class Status(models.Model):
|
|||
def url(self):
|
||||
return 'FIXME' # FIXME
|
||||
|
||||
@property
|
||||
def ancestors(self):
|
||||
return [] # FIXME
|
||||
|
||||
@property
|
||||
def descendants(self):
|
||||
return [] # FIXME
|
||||
|
||||
###################
|
||||
|
||||
class Notification(models.Model):
|
||||
|
|
|
@ -37,7 +37,7 @@ ACCOUNT_SOURCE_EXPECTED = [
|
|||
|
||||
STATUS_EXPECTED = [
|
||||
('in_reply_to_account_id', None),
|
||||
('content', '<p>Hello world.</p>'),
|
||||
('content', 'Hello world.'),
|
||||
('emojis', []),
|
||||
('reblogs_count', 0),
|
||||
('favourites_count', 0),
|
||||
|
@ -163,7 +163,7 @@ class TestStatuses(TestCase):
|
|||
self._create_status()
|
||||
|
||||
request = self.factory.get(
|
||||
'/api/v1/statuses/'+self._status.id,
|
||||
'/api/v1/statuses/'+str(self._status.id),
|
||||
)
|
||||
force_authenticate(request, user=self._alice.local_user)
|
||||
|
||||
|
@ -244,14 +244,14 @@ class TestStatuses(TestCase):
|
|||
self._create_status()
|
||||
|
||||
request = self.factory.get(
|
||||
'/api/v1/statuses/'+self._status.number+'/context',
|
||||
'/api/v1/statuses/'+str(self._status.id)+'/context',
|
||||
)
|
||||
force_authenticate(request, user=self._alice.local_user)
|
||||
|
||||
view = StatusContext.as_view()
|
||||
|
||||
result = view(request,
|
||||
id=str(int(self._status.number,16)))
|
||||
id=str(self._status.id))
|
||||
|
||||
self.assertEqual(
|
||||
result.status_code,
|
||||
|
|
|
@ -2,7 +2,7 @@ from django.test import TestCase
|
|||
from rest_framework.test import APIClient, force_authenticate
|
||||
from kepi.trilby_api.views import *
|
||||
from kepi.trilby_api.tests import *
|
||||
import kepi.bowler_pub.models as bowler_pub_models
|
||||
from kepi.trilby_api.models import *
|
||||
from django.conf import settings
|
||||
|
||||
class TestStatus(TestCase):
|
||||
|
@ -25,7 +25,7 @@ class TestStatus(TestCase):
|
|||
|
||||
result = c.post(
|
||||
'/api/v1/statuses/{}/{}'.format(
|
||||
self._alice_status.serial,
|
||||
self._alice_status.id,
|
||||
verb,
|
||||
),
|
||||
format = 'json',
|
||||
|
@ -38,9 +38,9 @@ class TestStatus(TestCase):
|
|||
|
||||
self._test_doing_something('favourite')
|
||||
|
||||
found = bowler_pub_models.AcLike.objects.filter(
|
||||
f_actor = self._alice.actor.id,
|
||||
f_object = self._alice_status.id,
|
||||
found = Like.objects.filter(
|
||||
liker = self._alice,
|
||||
liked = self._alice_status,
|
||||
)
|
||||
|
||||
self.assertEqual(len(found), 1,
|
||||
|
|
|
@ -249,7 +249,7 @@ class Statuses(generics.ListCreateAPIView,
|
|||
queryset = self.get_queryset()
|
||||
|
||||
if 'id' in kwargs:
|
||||
number = '/'+kwargs['id']
|
||||
number = kwargs['id']
|
||||
logger.info('Looking up status numbered %s, for %s',
|
||||
number, request.user)
|
||||
|
||||
|
@ -330,8 +330,7 @@ class StatusContext(generics.ListCreateAPIView):
|
|||
|
||||
queryset = self.get_queryset()
|
||||
|
||||
number = '/'+kwargs['id']
|
||||
status = queryset.get(id=number)
|
||||
status = queryset.get(id=int(kwargs['id']))
|
||||
serializer = StatusContextSerializer(status)
|
||||
|
||||
return JsonResponse(serializer.data)
|
||||
|
|
Ładowanie…
Reference in New Issue