Skip to content

Commit a4e4ec2

Browse files
committed
fix: 加载依赖不可能成功
1 parent 095ea1e commit a4e4ec2

3 files changed

Lines changed: 17 additions & 23 deletions

File tree

telegram_chat/__init__.py

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
# 变量声明
1818
bot: TelegramBot
1919
command_tree: CommandBuilder
20-
online_player_api: Any
21-
2220
logger: logging.Logger
2321

2422
# 实用函数
@@ -37,39 +35,36 @@ async def on_load(server: PluginServerInterface, old):
3735
"""
3836
插件加载操作
3937
"""
40-
global bindings, ban_list, bot, logger, online_player_api
41-
38+
global bindings, ban_list, bot, logger
39+
4240
tools.load_data(server)
43-
44-
server.register_help_message("!!tg", "向 Telegram 群聊发送聊天信息")
45-
server.register_command(
46-
Literal("!!tg").then(GreedyText("message").runs(mc_command_tg))
47-
)
4841

49-
online_player_api = server.get_plugin_instance("online_player_api")
50-
if online_player_api is None: raise Exception("Unable to load dependency \"online_player_api\"")
51-
42+
config.online_player_api = server.get_plugin_instance("online_player_api")
43+
if config.online_player_api is None: raise Exception("Unable to load dependency \"online_player_api\"")
44+
5245
async def action(event: Update, context: ContextTypes.DEFAULT_TYPE):
5346
await on_message(server, event, context)
5447

5548
bot = TelegramBot(server.logger, instance.telegram["token"]) if instance.telegram["api"] is None else TelegramBot(server.logger, instance.telegram["token"], instance.telegram["api"])
5649
bot.action = action
5750
bot.register()
5851
bot.start(True)
52+
5953
logger = server.logger
6054
register_commands()
55+
56+
server.register_help_message("!!tg", "向 Telegram 群聊发送聊天信息")
57+
server.register_command(
58+
Literal("!!tg").then(GreedyText("message").runs(mc_command_tg))
59+
)
60+
6161

6262
if old is not None and old.VERSION < VERSION:
63-
tip: str = f"TelegramChat 已从 ver.{old.VERSION_STR} 更新到 ver.{VERSION_STR}"
63+
tip: str = f"TelegramChat 已从 ver.{old.const.VERSION_STR} 更新到 ver.{VERSION_STR}"
6464
# await tools.send_to_group(tip)
6565
server.say(f"§7{tip}")
6666

67-
def on_unload(server: PluginServerInterface):
68-
"""
69-
卸载插件执行机器人停止操作
70-
"""
71-
if bot is not None:
72-
bot.stop()
67+
def on_unload(server: PluginServerInterface): bot.stop() if bot is not None else None
7368

7469
async def on_user_info(server: PluginServerInterface, info: Info):
7570
if instance.forwardings["mc_to_tg"] is True and info.player:

telegram_chat/commands/game.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
async def list(server: PluginServerInterface, event: Update, context: ContextTypes.DEFAULT_TYPE, *args):
1313
players = online_player_api.get_player_list()
1414

15-
players_count = len(players)
16-
message = f"服务器目前有 {players_count} 个玩家在线~"
17-
if players_count:
15+
count = len(players)
16+
message = f"服务器目前有 {count} 个玩家在线~"
17+
if count:
1818
message += f"\n=== 玩家列表 ===\n"
1919
for player in players: message += f"{player}\n"
2020

telegram_chat/config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
class Config(Serializable):
55
group: int = 0
6-
76
admins: List[str] = []
87

98
whitelist: Dict[str, Any] = {

0 commit comments

Comments
 (0)