Compare commits
	
		
			2 Commits
		
	
	
		
			690d793e8c
			...
			8d32439a15
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8d32439a15 | |||
| 
						 | 
					9497cca3e0 | 
@@ -15,7 +15,7 @@ async def get_bybit_client(tg_id: int) -> HTTP | None:
 | 
				
			|||||||
    """
 | 
					    """
 | 
				
			||||||
    try:
 | 
					    try:
 | 
				
			||||||
        api_key, api_secret = await rq.get_user_api(tg_id=tg_id)
 | 
					        api_key, api_secret = await rq.get_user_api(tg_id=tg_id)
 | 
				
			||||||
        return HTTP(api_key=api_key, api_secret=api_secret)
 | 
					        return HTTP(demo=True, api_key=api_key, api_secret=api_secret)
 | 
				
			||||||
    except Exception as e:
 | 
					    except Exception as e:
 | 
				
			||||||
        logger.error("Error getting bybit client for user %s: %s", tg_id, e)
 | 
					        logger.error("Error getting bybit client for user %s: %s", tg_id, e)
 | 
				
			||||||
        return None
 | 
					        return None
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -152,11 +152,13 @@ async def trading_cycle_profit(
 | 
				
			|||||||
        else:
 | 
					        else:
 | 
				
			||||||
            s_side = side
 | 
					            s_side = side
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        next_series = current_series + 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        await rq.set_user_deal(
 | 
					        await rq.set_user_deal(
 | 
				
			||||||
            tg_id=tg_id,
 | 
					            tg_id=tg_id,
 | 
				
			||||||
            symbol=symbol,
 | 
					            symbol=symbol,
 | 
				
			||||||
            current_step=1,
 | 
					            current_step=1,
 | 
				
			||||||
            current_series=current_series,
 | 
					            current_series=next_series,
 | 
				
			||||||
            trade_mode=trade_mode,
 | 
					            trade_mode=trade_mode,
 | 
				
			||||||
            side_mode=side_mode,
 | 
					            side_mode=side_mode,
 | 
				
			||||||
            margin_type=margin_type,
 | 
					            margin_type=margin_type,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -190,10 +190,6 @@ class TelegramMessageHandler:
 | 
				
			|||||||
                    res = await trading_cycle_profit(
 | 
					                    res = await trading_cycle_profit(
 | 
				
			||||||
                        tg_id=tg_id, symbol=symbol, side=r_side
 | 
					                        tg_id=tg_id, symbol=symbol, side=r_side
 | 
				
			||||||
                    )
 | 
					                    )
 | 
				
			||||||
                    current_series += 1
 | 
					 | 
				
			||||||
                    await rq.set_current_series(
 | 
					 | 
				
			||||||
                        tg_id=tg_id, symbol=symbol, current_series=current_series
 | 
					 | 
				
			||||||
                    )
 | 
					 | 
				
			||||||
                    if res == "OK":
 | 
					                    if res == "OK":
 | 
				
			||||||
                        pass
 | 
					                        pass
 | 
				
			||||||
                    else:
 | 
					                    else:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -58,7 +58,8 @@ class WebSocketBot:
 | 
				
			|||||||
                    )
 | 
					                    )
 | 
				
			||||||
                    logger.info("User %s connected to WebSocket", tg_id)
 | 
					                    logger.info("User %s connected to WebSocket", tg_id)
 | 
				
			||||||
                else:
 | 
					                else:
 | 
				
			||||||
                    await asyncio.sleep(30)
 | 
					                    await asyncio.sleep(5)
 | 
				
			||||||
 | 
					                    await self.try_connect_user(api_key, api_secret, tg_id)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            await asyncio.sleep(10)
 | 
					            await asyncio.sleep(10)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -73,6 +74,7 @@ class WebSocketBot:
 | 
				
			|||||||
        """Try to connect a user to the WebSocket."""
 | 
					        """Try to connect a user to the WebSocket."""
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            self.ws_private = WebSocket(
 | 
					            self.ws_private = WebSocket(
 | 
				
			||||||
 | 
					                demo=True,
 | 
				
			||||||
                testnet=False,
 | 
					                testnet=False,
 | 
				
			||||||
                channel_type="private",
 | 
					                channel_type="private",
 | 
				
			||||||
                api_key=api_key,
 | 
					                api_key=api_key,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user