Change strat

.forgejo/workflows/deploy.yaml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: s4_docker
+    runs-on: s3_docker
 
     steps:
       - name: Check out code

app/MusicProvider/SpotifyStrategy.py

@@ -29,7 +29,8 @@ class SpotifyStrategy(MusicProviderStrategy):
 
         token, expires_in = await refresh_token('https://accounts.spotify.com/api/token',
                                                 user.spotify_auth['refresh_token'],
-                                                config.spotify.encoded
+                                                config.spotify.encoded,
+                                                config.proxy
                                                 )
         async with get_session_context() as session:
             await session.execute(
@@ -45,7 +46,7 @@ class SpotifyStrategy(MusicProviderStrategy):
             'Authorization': 'Bearer ' + token,
             'Content-Type': 'application/json'
         }
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(proxy=config.proxy) as session:
             resp = await session.get(f'https://api.spotify.com/v1{endpoint}', headers=user_headers)
             if resp.status != 200:
                 return None

app/MusicProvider/YMusicStrategy.py

@@ -32,8 +32,8 @@ class YandexMusicStrategy(MusicProviderStrategy):
 
         token, expires_in = await refresh_token('https://oauth.yandex.com/token',
                                                 user.ymusic_auth['refresh_token'],
-                                                config.ymusic.encoded,
-                                                config.proxy)
+                                                config.ymusic.encoded
+                                                )
         async with get_session_context() as session:
             await session.execute(
                 update(User).where(User.id == self.user_id).values(spotify_auth=get_oauth_creds(token,
@@ -44,10 +44,10 @@ class YandexMusicStrategy(MusicProviderStrategy):
         return token
 
     async def get_tracks(self, token) -> list[Track]:
-        if config.proxy:
-            client = ClientAsync(token, request=Request(proxy_url=config.proxy))
-        else:
-            client = await ClientAsync(token).init()
+        # if config.proxy:
+        #     client = ClientAsync(token, request=Request(proxy_url=config.proxy))
+        # else:
+        client = await ClientAsync(token).init()
         liked: TracksList = await client.users_likes_tracks()
         tracks = await client.tracks([x.id for x in liked.tracks[:5]])
         print(tracks[0])

app/youtube_api.py

@@ -10,8 +10,8 @@ from app.config import config
 
 ytmusic = YTMusic('oauth.json',
                   oauth_credentials=OAuthCredentials(client_id=config.yt.client_id, client_secret=config.yt.client_secret))
-# if config.proxy:
-#     ytmusic.proxies = {'http': config.proxy, 'https': config.proxy}
+if config.proxy:
+    ytmusic.proxies = {'http': config.proxy, 'https': config.proxy}
 
 
 def name_to_youtube(name: str):
@@ -26,8 +26,8 @@ def _download(yt_id: str, directory: str):
         'quiet': True,
         'outtmpl': os.path.join(directory, 'dl.%(ext)s'),
     }
-    # if config.proxy:
-    #     params['proxy'] = config.proxy
+    if config.proxy:
+        params['proxy'] = config.proxy
     with YoutubeDL(params) as ydl:
         return ydl.extract_info(yt_id)