Fix Telegram forum topic routing
This commit is contained in:
@@ -9,6 +9,7 @@ data/*.db
|
|||||||
data/*.db-*
|
data/*.db-*
|
||||||
data/*.db.*
|
data/*.db.*
|
||||||
data/*.json
|
data/*.json
|
||||||
|
!data/city_thread_ids.json
|
||||||
data/*backtest*.csv
|
data/*backtest*.csv
|
||||||
data/logs/
|
data/logs/
|
||||||
data/historical/
|
data/historical/
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"amsterdam": 116398,
|
||||||
|
"ankara": 116394,
|
||||||
|
"atlanta": 13115,
|
||||||
|
"austin": 13120,
|
||||||
|
"beijing": 116383,
|
||||||
|
"busan": 116381,
|
||||||
|
"chengdu": 116388,
|
||||||
|
"chicago": 13113,
|
||||||
|
"chongqing": 116389,
|
||||||
|
"dallas": 13119,
|
||||||
|
"denver": 13114,
|
||||||
|
"guangzhou": 116385,
|
||||||
|
"helsinki": 116397,
|
||||||
|
"hong kong": 116391,
|
||||||
|
"houston": 13118,
|
||||||
|
"istanbul": 116395,
|
||||||
|
"los angeles": 13112,
|
||||||
|
"miami": 13116,
|
||||||
|
"new york": 13111,
|
||||||
|
"paris": 116399,
|
||||||
|
"qingdao": 116387,
|
||||||
|
"san francisco": 13117,
|
||||||
|
"seattle": 13122,
|
||||||
|
"seoul": 116380,
|
||||||
|
"shanghai": 116384,
|
||||||
|
"shenzhen": 116386,
|
||||||
|
"singapore": 116393,
|
||||||
|
"taipei": 116392,
|
||||||
|
"tel aviv": 116396,
|
||||||
|
"tokyo": 116382,
|
||||||
|
"wuhan": 116390
|
||||||
|
}
|
||||||
@@ -41,37 +41,37 @@ BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN", "").strip()
|
|||||||
CHAT_ID = -1003927451869
|
CHAT_ID = -1003927451869
|
||||||
|
|
||||||
CITIES: list[tuple[str, str]] = [
|
CITIES: list[tuple[str, str]] = [
|
||||||
("🇰🇷 Seoul", "seoul"),
|
("#seoul", "seoul"),
|
||||||
("🇰🇷 Busan", "busan"),
|
("#busan", "busan"),
|
||||||
("🇯🇵 Tokyo", "tokyo"),
|
("#tokyo", "tokyo"),
|
||||||
("🇨🇳 Beijing", "beijing"),
|
("#beijing", "beijing"),
|
||||||
("🇨🇳 Shanghai", "shanghai"),
|
("#shanghai", "shanghai"),
|
||||||
("🇨🇳 Guangzhou", "guangzhou"),
|
("#guangzhou", "guangzhou"),
|
||||||
("🇨🇳 Shenzhen / Lau Fau Shan", "shenzhen"),
|
("#shenzhen #LauFauShan", "shenzhen"),
|
||||||
("🇨🇳 Qingdao", "qingdao"),
|
("#qingdao", "qingdao"),
|
||||||
("🇨🇳 Chengdu", "chengdu"),
|
("#chengdu", "chengdu"),
|
||||||
("🇨🇳 Chongqing", "chongqing"),
|
("#chongqing", "chongqing"),
|
||||||
("🇨🇳 Wuhan", "wuhan"),
|
("#wuhan", "wuhan"),
|
||||||
("🇭🇰 Hong Kong", "hong kong"),
|
("#HongKong", "hong kong"),
|
||||||
("🇹🇼 Taipei", "taipei"),
|
("#taipei", "taipei"),
|
||||||
("🇸🇬 Singapore", "singapore"),
|
("#singapore", "singapore"),
|
||||||
("🇹🇷 Istanbul", "istanbul"),
|
("#istanbul", "istanbul"),
|
||||||
("🇹🇷 Ankara", "ankara"),
|
("#ankara", "ankara"),
|
||||||
("🇮🇱 Tel Aviv", "tel aviv"),
|
("#TelAviv", "tel aviv"),
|
||||||
("🇫🇮 Helsinki", "helsinki"),
|
("#helsinki", "helsinki"),
|
||||||
("🇳🇱 Amsterdam", "amsterdam"),
|
("#amsterdam", "amsterdam"),
|
||||||
("🇫🇷 Paris", "paris"),
|
("#paris", "paris"),
|
||||||
("🇺🇸 New York", "new york"),
|
("#NewYork", "new york"),
|
||||||
("🇺🇸 Los Angeles", "los angeles"),
|
("#LosAngeles", "los angeles"),
|
||||||
("🇺🇸 Chicago", "chicago"),
|
("#chicago", "chicago"),
|
||||||
("🇺🇸 Denver", "denver"),
|
("#denver", "denver"),
|
||||||
("🇺🇸 Atlanta", "atlanta"),
|
("#atlanta", "atlanta"),
|
||||||
("🇺🇸 Miami", "miami"),
|
("#miami", "miami"),
|
||||||
("🇺🇸 San Francisco", "san francisco"),
|
("#SanFrancisco", "san francisco"),
|
||||||
("🇺🇸 Houston", "houston"),
|
("#houston", "houston"),
|
||||||
("🇺🇸 Dallas", "dallas"),
|
("#dallas", "dallas"),
|
||||||
("🇺🇸 Austin", "austin"),
|
("#austin", "austin"),
|
||||||
("🇺🇸 Seattle", "seattle"),
|
("#seattle", "seattle"),
|
||||||
]
|
]
|
||||||
|
|
||||||
URL = f"https://api.telegram.org/bot{BOT_TOKEN}/createForumTopic"
|
URL = f"https://api.telegram.org/bot{BOT_TOKEN}/createForumTopic"
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ _HTTP_SESSION_LOCK = threading.Lock()
|
|||||||
# Bot send_message rate limiter: max N messages per second across all threads
|
# Bot send_message rate limiter: max N messages per second across all threads
|
||||||
_SEND_MSG_LOCK = threading.Lock()
|
_SEND_MSG_LOCK = threading.Lock()
|
||||||
_SEND_MSG_LAST_TS: float = 0.0
|
_SEND_MSG_LAST_TS: float = 0.0
|
||||||
_SEND_MSG_MIN_INTERVAL_SEC = float(os.getenv("TELEGRAM_SEND_RATE_LIMIT_SEC", "0.05"))
|
_SEND_MSG_MIN_INTERVAL_SEC = float(os.getenv("TELEGRAM_SEND_RATE_LIMIT_SEC", "1.1"))
|
||||||
|
|
||||||
|
|
||||||
def _get_http_session() -> requests_lib.Session:
|
def _get_http_session() -> requests_lib.Session:
|
||||||
|
|||||||
Reference in New Issue
Block a user