Update app.py
Browse files
app.py
CHANGED
@@ -134,10 +134,10 @@ def load_data_from_webdav():
|
|
134 |
chatHistories = data['chatHistories']
|
135 |
GROUP_SETTINGS = data['GROUP_SETTINGS']
|
136 |
USER_SETTINGS = data['USER_SETTINGS']
|
137 |
-
USER_LAST_ACTIVE = {k: datetime.fromisoformat(v) for k, v in data['USER_LAST_ACTIVE'].items()}
|
138 |
-
GROUP_ACTIVE_USERS = {k: set(v) for k, v in data['GROUP_ACTIVE_USERS'].items()}
|
139 |
-
GROUP_INFO = {k: {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in data['GROUP_INFO'].items()}
|
140 |
-
BANNED_USERS = {k: datetime.fromisoformat(v) for k, v in data['BANNED_USERS'].items()}
|
141 |
|
142 |
print(f"数据已从WebDAV成功加载: {datetime.now()}")
|
143 |
else:
|
@@ -339,7 +339,8 @@ async def handlePrivateCommand(chatId, userMessage, fromUserId, isGroupChat):
|
|
339 |
await sendTelegramMessage(chatId, '提示词索引无效。请使用 /getpromat 查看可用的索引。')
|
340 |
return
|
341 |
if command == 'getpromat':
|
342 |
-
|
|
|
343 |
await sendTelegramMessage(chatId, f'当前使用的提示词索引是: {index}')
|
344 |
return
|
345 |
if command == 'resetuser':
|
|
|
134 |
chatHistories = data['chatHistories']
|
135 |
GROUP_SETTINGS = data['GROUP_SETTINGS']
|
136 |
USER_SETTINGS = data['USER_SETTINGS']
|
137 |
+
USER_LAST_ACTIVE = {int(k): datetime.fromisoformat(v) for k, v in data['USER_LAST_ACTIVE'].items()}
|
138 |
+
GROUP_ACTIVE_USERS = {int(k): set(v) for k, v in data['GROUP_ACTIVE_USERS'].items()}
|
139 |
+
GROUP_INFO = {int(k): {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in data['GROUP_INFO'].items()}
|
140 |
+
BANNED_USERS = {int(k): datetime.fromisoformat(v) for k, v in data['BANNED_USERS'].items()}
|
141 |
|
142 |
print(f"数据已从WebDAV成功加载: {datetime.now()}")
|
143 |
else:
|
|
|
339 |
await sendTelegramMessage(chatId, '提示词索引无效。请使用 /getpromat 查看可用的索引。')
|
340 |
return
|
341 |
if command == 'getpromat':
|
342 |
+
user_settings = USER_SETTINGS.get(fromUserId, {})
|
343 |
+
index = user_settings.get('prompt_index', CURRENT_PROMPT_INDEX)
|
344 |
await sendTelegramMessage(chatId, f'当前使用的提示词索引是: {index}')
|
345 |
return
|
346 |
if command == 'resetuser':
|