diff options
| -rw-r--r-- | backend/views.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/backend/views.py b/backend/views.py index 54671b3..29df477 100644 --- a/backend/views.py +++ b/backend/views.py @@ -593,7 +593,7 @@ def api_room_watch(request): last = 0 if 'last' in request.POST: last =int(request.POST['last']) - 1 - videos = SJContent.objects.filter(room=room, content_type='video').order_by('-datetime') + videos = SJContent.objects.filter(room=room, content_type='video').order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE] if videos and last <= datetime_to_timestamp(videos[0].datetime): response.write(videos_response_str([v for v in videos if last <= datetime_to_timestamp(v.datetime)])) return response @@ -668,7 +668,7 @@ def api_room_join(request): user_profile.save() response = response_success('%d\t%s\t%d' % (user.id, user.username, user_profile.access)) response.write('%s\n' % '\t'.join([u.username for u in room.users.all()])) - videos = SJContent.objects.filter(room=room, content_type='video').order_by('-datetime') + videos = SJContent.objects.filter(room=room, content_type='video').order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE] response.write(videos_response_str(videos)) if 'enqueue' in request.POST and request.POST['enqueue']: #print 'EXPECTED TO ENQUEUE', request.POST['enqueue'] @@ -702,10 +702,10 @@ def api_room_read(request): last =int(request.POST['last']) - 15 if last <= datetime_to_timestamp(room.settings_update): response.write(settings_response_str('ROOM', room.settings)) - videos = SJContent.objects.filter(room=room, content_type='video').order_by('-datetime') + videos = SJContent.objects.filter(room=room, content_type='video').order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE] if videos and last <= datetime_to_timestamp(videos[0].datetime): response.write(videos_response_str([v for v in videos if last <= datetime_to_timestamp(v.datetime)])) - texts = SJContent.objects.filter(room=room, content_type='text').order_by('-datetime') + texts = SJContent.objects.filter(room=room, content_type='text').order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE] if texts and last <= datetime_to_timestamp(texts[0].datetime): response.write(texts_response_str([t for t in texts if last <= datetime_to_timestamp(t.datetime)])) return response @@ -745,13 +745,13 @@ def api_room_poll(request): last =int(request.POST['last']) - 15 if last <= datetime_to_timestamp(room.settings_update): response.write(settings_response_str('ROOM', room.settings)) - videos = SJContent.objects.filter(room=room, content_type='video').order_by('-datetime') + videos = SJContent.objects.filter(room=room, content_type='video').order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE] if videos and last <= datetime_to_timestamp(videos[0].datetime): response.write(videos_response_str([v for v in videos if last <= datetime_to_timestamp(v.datetime)])) - texts = SJContent.objects.filter(room=room, content_type='text').order_by('-datetime') + texts = SJContent.objects.filter(room=room, content_type='text').order_by('-datetime')[0:ROOM_CHAT_LOG_SIZE] if texts and last <= datetime_to_timestamp(texts[0].datetime): response.write(texts_response_str([t for t in texts if last <= datetime_to_timestamp(t.datetime)])) - likes = SJLike.objects.filter(content__content_type='video', content__user=user) + likes = SJLike.objects.filter(content__content_type='video', content__user=user)[0:ROOM_CHAT_LOG_SIZE] response.write(likes_response_str(likes)) user_webcams = room.users.filter(sjuserprofile__lastseen_webcam__gt=lastseentime) response.write('CAM\t%d\n' % user_webcams.count()) |