Fixed the merge conflicts and many other things

Author: Fahad Malik

requirements.txt

@@ -52,3 +52,4 @@ python-slugify==1.1.4
 six==1.16.0
 Unidecode==1.3.6
 websockets==11.0.3
+

rewards/__pycache__/urls.cpython-310.pyc

@@ -19,8 +19,8 @@
     path('addQuizApi', views.AddQuizInApi.as_view()),
     path('quizTurns', views.QuizInTurns.as_view()),
     path("automatequiz", views.load_questions_from_json_view, name="nothing"),
-    path("getZoloVideos", views.GetZoloVideos.as_view()),
-    path("ZoloVideoApi", views.ZoloVideoApi.as_view())
+    # path("getZoloVideos", views.GetZoloVideos.as_view()),
+    # path("ZoloVideoApi", views.ZoloVideoApi.as_view())
 ]
 
 

rewards/__pycache__/views.cpython-310.pyc

@@ -13,8 +13,6 @@
 from django.utils import timezone as django_timezone
 from .serializers import QuestionSerializer, QuizApiSerializer, QuizSerializer, MonsterHunterSerializer
 from .models import Subject, Quiz, Questions
-
-
 User = get_user_model()
 
 
@@ -433,24 +431,17 @@ def get(self, request):
         # Retrieve ZoloVideos instance for the current user
         zolo_videos = ZoloVideos.objects.get(user=request.user)
 
+
         # Get the unwatched video URLs based on the user's country
         unwatched_urls = zolo_videos.get_videos_by_country()
         return Response({"urls": unwatched_urls}, status=status.HTTP_200_OK)
 
 
-# def get_stream_url(video_url):
-#     # Create youtube_dl options dictionary
-#     ydl_opts = {
-#         'format': 'best',
-#         'quiet': True
-#     }
-#
-#     # Create youtube_dl extractor
-#     with youtube_dl.YoutubeDL(ydl_opts) as ydl:
-#         info_dict = ydl.extract_info(video_url, download=False)
-#         stream_url = info_dict['url']
-#
-#     return stream_url
+
+
+
+
+
 
 
 class ZoloVideoApi(APIView):