nonebot-plugin-l4d2-server 0.3.4a2__py3-none-any.whl → 0.3.5__py3-none-any.whl

nonebot_plugin_l4d2_server/l4d2_server/webUI.py

@@ -0,0 +1,353 @@
+from amis import ColumnList, AmisList, ActionType, TableCRUD, TableColumn
+from amis import Dialog, PageSchema, Switch, InputNumber, InputTag, Action, App
+from amis import Form, InputText, InputPassword, DisplayModeEnum, Horizontal, Remark, Html, Page, AmisAPI, Wrapper
+from amis import LevelEnum, Select, InputArray, Alert, Tpl, Flex
+
+
+from ..config import NICKNAME
+
+logo = Html(html='''
+<p align="center">
+    <a href="https://github.com/CMHopeSunshine/nonebot-plugin-learning-chat/">
+        <img src="http://static.cherishmoon.fun/LittlePaimon/readme/logo.png"
+         width="256" height="256" alt="Learning-Chat">
+    </a>
+</p>
+<h1 align="center">Nonebot-Plugin-Learning-Chat 控制台</h1>
+<div align="center">
+    <a href="https://github.com/CMHopeSunshine/nonebot-plugin-learning-chat/" target="_blank">
+    Github仓库</a>
+</div>
+<br>
+<br>
+''')
+login_api = AmisAPI(
+    url='/learning_chat/api/login',
+    method='post',
+    adaptor='''
+        if (payload.status == 0) {
+            localStorage.setItem("token", payload.data.token);
+        }
+        return payload;
+    '''
+)
+
+login_form = Form(api=login_api, title='', body=[
+    InputText(name='username', label='用户名',
+              labelRemark=Remark(shape='circle', content='后台管理用户名，默认为chat')),
+    InputPassword(name='password', label='密码',
+                  labelRemark=Remark(shape='circle', content='后台管理密码，默认为admin')),
+], mode=DisplayModeEnum.horizontal, horizontal=Horizontal(left=3, right=9, offset=5), redirect='/learning_chat/admin')
+body = Wrapper(className='w-2/5 mx-auto my-0 m:w-full', body=login_form)
+login_page = Page(title='', body=[logo, body])
+
+global_config_form = Form(
+    title='全局配置',
+    name='global_config',
+    initApi='/learning_chat/api/chat_global_config',
+    api='post:/learning_chat/api/chat_global_config',
+    body=[
+        Switch(label='群聊学习总开关', name='total_enable', value='${total_enable}', onText='开启', offText='关闭',
+               labelRemark=Remark(shape='circle',
+                                  content='关闭后，全局都将不会再学习和回复(但是仍会对收到的消息进行记录)。')),
+        Switch(label='后台管理总开关', name='enable_web', value='${enable_web}', onText='开启', offText='关闭',
+               labelRemark=Remark(shape='circle',
+                                  content='是否开启本后台管理，若关闭，则无法再访问本页面。')),
+        InputText(label='后台管理用户名', name='web_username', value='${web_username}',
+                  labelRemark=Remark(shape='circle',
+                                     content='登录本后台管理所需要的用户名。')),
+        InputPassword(label='后台管理密码', name='web_password', value='${web_password}',
+                      labelRemark=Remark(shape='circle',
+                                         content='登录本后台管理所需要的密码。')),
+        InputText(label='后台管理token密钥', name='web_secret_key', value='${web_secret_key}',
+                  labelRemark=Remark(shape='circle',
+                                     content='用于本后台管理加密验证token的密钥。')),
+        InputNumber(label='单句关键词数量', name='KEYWORDS_SIZE', value='${KEYWORDS_SIZE}', visibleOn='${total_enable}',
+                    min=2,
+                    labelRemark=Remark(shape='circle',
+                                       content='单句语句标签数量，影响对一句话的主题词提取效果，建议保持默认为3。')),
+        InputNumber(label='跨群回复阈值', name='cross_group_threshold', value='${cross_group_threshold}',
+                    visibleOn='${total_enable}', min=1,
+                    labelRemark=Remark(shape='circle',
+                                       content='当学习到的一种回复在N个群都有，那么这个回复就会变为全局回复。')),
+        InputNumber(label='最高学习次数', name='learn_max_count', value='${learn_max_count}',
+                    visibleOn='${total_enable}', min=2, labelRemark=Remark(shape='circle',
+                                                                           content='学习的回复最高能累计到的次数，值越高，这个回复就会学习得越深，越容易进行回复，如果不想每次都大概率固定回复某一句话，可以将该值设低点。')),
+        InputTag(label='全局屏蔽词', name='ban_words', value='${ban_words}', enableBatchAdd=True,
+                 placeholder='添加全局屏蔽词', visibleOn='${total_enable}', joinValues=False, extractValue=True,
+                 labelRemark=Remark(shape='circle',
+                                    content='全局屏蔽词，含有这些词的消息不会学习和回复，默认已屏蔽at、分享、语音、和视频等消息。(回车进行添加)')),
+        InputTag(label='全局屏蔽用户', name='ban_users', value='${ban_users}',
+                 enableBatchAdd=True,
+                 placeholder='添加全局屏蔽用户', visibleOn='${total_enable}', joinValues=False, extractValue=True,
+                 labelRemark=Remark(shape='circle',
+                                    content='全局屏蔽用户，和这些用户有关的消息不会学习和回复。(回车进行添加)')),
+        InputTag(label='自定义词典', name='dictionary', value='${dictionary}',
+                 enableBatchAdd=True,
+                 placeholder='添加自定义词语', visibleOn='${total_enable}', joinValues=False, extractValue=True,
+                 labelRemark=Remark(shape='circle',
+                                    content='添加自定义词语，让分词能够识别未收录的词汇，提高学习的准确性。你可以添加特殊名词，这样学习时就会将该词看作一个整体，目前词典中已默认添加部分原神相关词汇。(回车进行添加)')),
+    ],
+    actions=[Action(label='保存', level=LevelEnum.success, type='submit'),
+             Action(label='重置', level=LevelEnum.warning, type='reset')]
+)
+group_select = Select(label='分群配置', name='group_id', source='${group_list}',
+                      placeholder='选择群')
+group_config_form = Form(
+    title='分群配置',
+    visibleOn='group_id != null',
+    initApi='/learning_chat/api/chat_group_config?group_id=${group_id}',
+    api='post:/learning_chat/api/chat_group_config?group_id=${group_id}',
+    body=[
+        Switch(label='群聊学习开关', name='enable', value='${enable}', onText='开启', offText='关闭',
+               labelRemark=Remark(shape='circle', content='针对该群的群聊学习开关，关闭后，仅该群不会学习和回复。')),
+        InputNumber(label='回复阈值', name='answer_threshold', value='${answer_threshold}', visibleOn='${enable}',
+                    min=2,
+                    labelRemark=Remark(shape='circle', content='可以理解为学习成功所需要的次数，值越低学得越快。')),
+        InputArray(label='回复阈值权重', name='answer_threshold_weights', value='${answer_threshold_weights}',
+                   items=InputNumber(min=1, max=100, value=25, suffix='%'), inline=True, visibleOn='${enable}',
+                   labelRemark=Remark(shape='circle',
+                                      content='影响回复阈值的计算方式，以默认的回复阈值4、权重[10, 30, 60]为例，在计算阈值时，60%概率为4，30%概率为3，10%概率为2。')),
+        InputNumber(label='复读阈值', name='repeat_threshold', value='${repeat_threshold}', visibleOn='${enable}',
+                    min=2,
+                    labelRemark=Remark(shape='circle',
+                                       content=f'跟随复读所需要的阈值，有N个人复读后，{NICKNAME}就会跟着复读。')),
+        InputNumber(label='打断复读概率', name='break_probability', value='${break_probability}',
+                    min=0, max=100, suffix='%', visibleOn='${AND(enable, speak_enable)}',
+                    labelRemark=Remark(shape='circle', content='达到复读阈值时，打断复读而不是跟随复读的概率。')),
+        InputTag(label='屏蔽词', name='ban_words', value='${ban_words}', enableBatchAdd=True,
+                 placeholder='添加屏蔽词', visibleOn='${enable}', joinValues=False, extractValue=True,
+                 labelRemark=Remark(shape='circle', content='含有这些词的消息不会学习和回复。(回车进行添加)')),
+        InputTag(label='屏蔽用户', source='${member_list}', name='ban_users', value='${ban_users}', enableBatchAdd=True,
+                 placeholder='添加屏蔽用户', visibleOn='${enable}', joinValues=False, extractValue=True,
+                 labelRemark=Remark(shape='circle', content='和该群中这些用户有关的消息不会学习和回复。(回车进行添加)')),
+        Switch(label='主动发言开关', name='speak_enable', value='${speak_enable}', visibleOn='${enable}',
+               labelRemark=Remark(shape='circle',
+                                  content=f'是否允许{NICKNAME}在该群主动发言，主动发言是指每隔一段时间挑选一个热度较高的群，主动发一些学习过的内容。')),
+        InputNumber(label='主动发言阈值', name='speak_threshold', value='${speak_threshold}',
+                    visibleOn='${AND(enable, speak_enable)}', min=0,
+                    labelRemark=Remark(shape='circle', content='值越低，主动发言的可能性越高。')),
+        InputNumber(label='主动发言最小间隔', name='speak_min_interval', value='${speak_min_interval}', min=0,
+                    visibleOn='${AND(enable, speak_enable)}', suffix='秒',
+                    labelRemark=Remark(shape='circle', content='进行主动发言的最小时间间隔。')),
+        InputNumber(label='连续主动发言概率', name='speak_continuously_probability',
+                    value='${speak_continuously_probability}', min=0, max=100, suffix='%',
+                    visibleOn='${AND(enable, speak_enable)}',
+                    labelRemark=Remark(shape='circle', content='触发主动发言时，连续进行发言的概率。')),
+        InputNumber(label='最大连续主动发言句数', name='speak_continuously_max_len',
+                    value='${speak_continuously_max_len}', visibleOn='${AND(enable, speak_enable)}', min=1,
+                    labelRemark=Remark(shape='circle', content='连续主动发言的最大句数。')),
+        InputNumber(label='主动发言附带戳一戳概率', name='speak_poke_probability', value='${speak_poke_probability}',
+                    min=0, max=100, suffix='%', visibleOn='${AND(enable, speak_enable)}',
+                    labelRemark=Remark(shape='circle',
+                                       content='主动发言时附带戳一戳的概率，会在最近5个发言者中随机选一个戳。')),
+    ],
+    actions=[Action(label='保存', level=LevelEnum.success, type='submit'),
+             ActionType.Ajax(
+                 label='保存至所有群',
+                 level=LevelEnum.primary,
+                 confirmText='确认将当前配置保存至所有群？',
+                 api='post:/learning_chat/api/chat_group_config?group_id=all'
+             ),
+             Action(label='重置', level=LevelEnum.warning, type='reset')]
+)
+
+blacklist_table = TableCRUD(mode='table',
+                            title='',
+                            syncLocation=False,
+                            api='/learning_chat/api/get_chat_blacklist',
+                            interval=15000,
+                            headerToolbar=[ActionType.Ajax(label='取消所有禁用',
+                                                           level=LevelEnum.warning,
+                                                           confirmText='确定要取消所有禁用吗？',
+                                                           api='put:/learning_chat/api/delete_all?type=blacklist')],
+                            itemActions=[ActionType.Ajax(tooltip='取消禁用',
+                                                         icon='fa fa-check-circle-o text-info',
+                                                         confirmText='取消该被禁用的内容/关键词，但是仍然需要重新学习哦！',
+                                                         api='delete:/learning_chat/api/delete_chat?type=blacklist&id=${id}')
+                                         ],
+                            footable=True,
+                            columns=[TableColumn(type='tpl', tpl='${keywords|truncate:20}', label='内容/关键词',
+                                                 name='keywords',
+                                                 searchable=True, popOver={'mode':      'dialog', 'title': '全文',
+                                                                           'className': 'break-all',
+                                                                           'body':      {'type': 'tpl',
+                                                                                         'tpl':  '${keywords}'}}),
+                                     TableColumn(label='已禁用的群', name='bans', searchable=True),
+                                     ])
+message_table = TableCRUD(mode='table',
+                          title='',
+                          syncLocation=False,
+                          api='/learning_chat/api/get_chat_messages',
+                          interval=12000,
+                          headerToolbar=[ActionType.Ajax(label='删除所有聊天记录',
+                                                         level=LevelEnum.warning,
+                                                         confirmText='确定要删除所有聊天记录吗？',
+                                                         api='put:/learning_chat/api/delete_all?type=message')],
+                          itemActions=[ActionType.Ajax(tooltip='禁用',
+                                                       icon='fa fa-ban text-danger',
+                                                       confirmText='禁用该聊天记录相关的学习内容和回复',
+                                                       api='put:/learning_chat/api/ban_chat?type=message&id=${id}'),
+                                       ActionType.Ajax(tooltip='删除',
+                                                       icon='fa fa-times text-danger',
+                                                       confirmText='删除该条聊天记录',
+                                                       api='delete:/learning_chat/api/delete_chat?type=message&id=${id}')
+                                       ],
+                          footable=True,
+                          columns=[TableColumn(label='消息ID', name='message_id'),
+                                   TableColumn(label='群ID', name='group_id', searchable=True),
+                                   TableColumn(label='用户ID', name='user_id', searchable=True),
+                                   TableColumn(type='tpl', tpl='${raw_message|truncate:20}', label='消息',
+                                               name='message',
+                                               searchable=True, popOver={'mode':      'dialog', 'title': '消息全文',
+                                                                         'className': 'break-all',
+                                                                         'body':      {'type': 'tpl',
+                                                                                       'tpl':  '${raw_message}'}}),
+                                   TableColumn(type='tpl', tpl='${time|date:YYYY-MM-DD HH\\:mm\\:ss}', label='时间',
+                                               name='time', sortable=True)
+                                   ])
+answer_table = TableCRUD(
+    mode='table',
+    syncLocation=False,
+    footable=True,
+    api='/learning_chat/api/get_chat_answers',
+    interval=12000,
+    headerToolbar=[ActionType.Ajax(label='删除所有已学习的回复',
+                                   level=LevelEnum.warning,
+                                   confirmText='确定要删除所有已学习的回复吗？',
+                                   api='put:/learning_chat/api/delete_all?type=answer')],
+    itemActions=[ActionType.Ajax(tooltip='禁用',
+                                 icon='fa fa-ban text-danger',
+                                 confirmText='禁用并删除该已学回复',
+                                 api='put:/learning_chat/api/ban_chat?type=answer&id=${id}'),
+                 ActionType.Ajax(tooltip='删除',
+                                 icon='fa fa-times text-danger',
+                                 confirmText='仅删除该已学回复，不会禁用，所以依然能继续学',
+                                 api='delete:/learning_chat/api/delete_chat?type=answer&id=${id}')],
+    columns=[TableColumn(label='ID', name='id', visible=False),
+             TableColumn(label='群ID', name='group_id', searchable=True),
+             TableColumn(type='tpl', tpl='${keywords|truncate:20}', label='内容/关键词', name='keywords',
+                         searchable=True, popOver={'mode': 'dialog', 'title': '内容全文', 'className': 'break-all',
+                                                   'body': {'type': 'tpl', 'tpl': '${keywords}'}}),
+             TableColumn(type='tpl', tpl='${time|date:YYYY-MM-DD HH\\:mm\\:ss}', label='最后学习时间', name='time',
+                         sortable=True),
+             TableColumn(label='次数', name='count', sortable=True),
+             ColumnList(label='完整消息', name='messages', breakpoint='*', source='${messages}',
+                        listItem=AmisList.Item(body={'name': 'msg'}))
+             ])
+answer_table_on_context = TableCRUD(
+    mode='table',
+    syncLocation=False,
+    footable=True,
+    api='/learning_chat/api/get_chat_answers?context_id=${id}&page=${page}&perPage=${perPage}&orderBy=${orderBy}&orderDir=${orderDir}',
+    interval=12000,
+    headerToolbar=[ActionType.Ajax(label='删除该内容所有回复',
+                                   level=LevelEnum.warning,
+                                   confirmText='确定要删除该条内容已学习的回复吗？',
+                                   api='put:/learning_chat/api/delete_all?type=answer&id=${id}')],
+    itemActions=[ActionType.Ajax(tooltip='禁用',
+                                 icon='fa fa-ban text-danger',
+                                 confirmText='禁用并删除该已学回复',
+                                 api='put:/learning_chat/api/ban_chat?type=answer&id=${id}'),
+                 ActionType.Ajax(tooltip='删除',
+                                 icon='fa fa-times text-danger',
+                                 confirmText='仅删除该已学回复，但不禁用，依然能继续学',
+                                 api='delete:/learning_chat/api/delete_chat?type=answer&id=${id}')],
+    columns=[TableColumn(label='ID', name='id', visible=False),
+             TableColumn(label='群ID', name='group_id'),
+             TableColumn(type='tpl', tpl='${keywords|truncate:20}', label='内容/关键词', name='keywords',
+                         searchable=True, popOver={'mode': 'dialog', 'title': '内容全文', 'className': 'break-all',
+                                                   'body': {'type': 'tpl', 'tpl': '${keywords}'}}),
+             TableColumn(type='tpl', tpl='${time|date:YYYY-MM-DD HH\\:mm\\:ss}', label='最后学习时间', name='time',
+                         sortable=True),
+             TableColumn(label='次数', name='count', sortable=True),
+             ColumnList(label='完整消息', name='messages', breakpoint='*', source='${messages}',
+                        listItem=AmisList.Item(body={'name': 'msg'}))
+             ])
+context_table = TableCRUD(mode='table',
+                          title='',
+                          syncLocation=False,
+                          api='/learning_chat/api/get_chat_contexts',
+                          interval=12000,
+                          headerToolbar=[ActionType.Ajax(label='删除所有学习内容',
+                                                         level=LevelEnum.warning,
+                                                         confirmText='确定要删除所有已学习的内容吗？',
+                                                         api='put:/learning_chat/api/delete_all?type=context')],
+                          itemActions=[ActionType.Dialog(tooltip='回复列表',
+                                                         icon='fa fa-book text-info',
+                                                         dialog=Dialog(title='回复列表',
+                                                                       size='lg',
+                                                                       body=answer_table_on_context)),
+                                       ActionType.Ajax(tooltip='禁用',
+                                                       icon='fa fa-ban text-danger',
+                                                       confirmText='禁用并删除该学习的内容及其所有回复',
+                                                       api='put:/learning_chat/api/ban_chat?type=context&id=${id}'),
+                                       ActionType.Ajax(tooltip='删除',
+                                                       icon='fa fa-times text-danger',
+                                                       confirmText='仅删除该学习的内容及其所有回复，但不禁用，依然能继续学',
+                                                       api='delete:/learning_chat/api/delete_chat?type=context&id=${id}')
+                                       ],
+                          footable=True,
+                          columns=[TableColumn(label='ID', name='id', visible=False),
+                                   TableColumn(type='tpl', tpl='${keywords|truncate:20}', label='内容/关键词',
+                                               name='keywords', searchable=True,
+                                               popOver={'mode': 'dialog', 'title': '内容全文', 'className': 'break-all',
+                                                        'body': {'type': 'tpl', 'tpl': '${keywords}'}}),
+                                   TableColumn(type='tpl', tpl='${time|date:YYYY-MM-DD HH\\:mm\\:ss}',
+                                               label='最后学习时间', name='time', sortable=True),
+                                   TableColumn(label='已学次数', name='count', sortable=True),
+                                   ])
+
+message_page = PageSchema(url='/messages', icon='fa fa-comments', label='群聊消息',
+                          schema=Page(title='群聊消息', body=[
+                              Alert(level=LevelEnum.info,
+                                    className='white-space-pre-wrap',
+                                    body=(f'此数据库记录了{NICKNAME}收到的聊天记录。\n'
+                                          '· 点击"禁用"可以将某条聊天记录进行禁用，这样其相关的学习就会列入禁用列表。\n'
+                                          '· 点击"删除"可以删除某条记录，但不会影响它的学习。\n'
+                                          f'· 可以通过搜索{NICKNAME}的QQ号，来查看它的回复记录。')),
+                              message_table]))
+context_page = PageSchema(url='/contexts', icon='fa fa-comment', label='学习内容',
+                          schema=Page(title='内容',
+                                      body=[Alert(level=LevelEnum.info,
+                                                  className='white-space-pre-wrap',
+                                                  body=(f'此数据库记录了{NICKNAME}所学习的内容。\n'
+                                                        '· 点击"回复列表"可以查看该条内容已学习到的可能的回复。\n'
+                                                        '· 点击"禁用"可以将该学习进行禁用，以后不会再学。\n'
+                                                        '· 点击"删除"可以删除该学习，让它重新开始学习这句话。')),
+                                            context_table]))
+answer_page = PageSchema(url='/answers', icon='fa fa-commenting-o', label='内容回复',
+                         schema=Page(title='回复',
+                                     body=[Alert(level=LevelEnum.info,
+                                                 className='white-space-pre-wrap',
+                                                 body=(
+                                                     f'此数据库记录了{NICKNAME}已学习到的所有回复，但看不到这些回复属于哪些内容，推荐到"学习内容"表进行操作。\n'
+                                                     '· 点击"禁用"可以将该回复进行禁用，以后不会再学。\n'
+                                                     '· 点击"删除"可以删除该回复，让它重新开始学习。')),
+                                           answer_table]))
+blacklist_page = PageSchema(url='/blacklist', icon='fa fa-ban', label='禁用列表',
+                            schema=Page(title='禁用列表',
+                                        body=[Alert(level=LevelEnum.info,
+                                                    className='white-space-pre-wrap',
+                                                    body=f'此数据库记录了{NICKNAME}被禁用的内容/关键词。\n'
+                                                         '· 可以取消禁用，使其能够重新继续学习。\n'
+                                                         '· 不能在此添加禁用，只能在群中回复[不可以]或者在<配置>中添加屏蔽词来达到禁用效果。'),
+                                              blacklist_table]))
+database_page = PageSchema(label='数据库', icon='fa fa-database',
+                           children=[message_page, context_page, answer_page, blacklist_page])
+config_page = PageSchema(url='/configs', isDefaultPage=True, icon='fa fa-wrench', label='配置',
+                         schema=Page(title='配置', initApi='/learning_chat/api/get_group_list',
+                                     body=[global_config_form, group_select, group_config_form]))
+chat_page = PageSchema(label='群聊学习', icon='fa fa-wechat (alias)', children=[config_page, database_page])
+
+github_logo = Tpl(className='w-full',
+                  tpl='<div class="flex justify-between"><div></div><div><a href="https://github.com/CMHopeSunshine/nonebot-plugin-learning-chat" target="_blank" title="Copyright"><i class="fa fa-github fa-2x"></i></a></div></div>')
+header = Flex(className='w-full', justify='flex-end', alignItems='flex-end', items=[github_logo])
+
+admin_app = App(brandName='Learning-Chat',
+                logo='http://static.cherishmoon.fun/LittlePaimon/readme/logo.png',
+                header=header,
+                pages=[{
+                    'children': [config_page, database_page]
+                }],
+                footer='<div class="p-2 text-center bg-blue-100">Copyright © 2021 - 2022 <a href="https://github.com/CMHopeSunshine/nonebot-plugin-learning-chat" target="_blank" class="link-secondary">Learning-Chat</a> X<a target="_blank" href="https://github.com/baidu/amis" class="link-secondary" rel="noopener"> amis v2.2.0</a></div>')

nonebot_plugin_l4d2_server/l4d2_server/workshop.py

@@ -7,6 +7,16 @@ except:
 
 async def workshop_to_dict(msg:str):
     """把创意工坊的id，转化为信息字典"""
+    i = await api_get_json(msg)
+    
+    # 处理是否是多地图文件
+    if i['file_url'] == i['preview_url']:
+        return await primary_map(i)
+    else:
+        return await only_map(i)
+
+    
+async def api_get_json(msg:str) ->dict:
     url_serach = 'https://db.steamworkshopdownloader.io/prod/api/details/file'
     data = f'[{msg}]'
     headers = {
@@ -17,15 +27,24 @@ async def workshop_to_dict(msg:str):
     out = {}
     data = data[1:-1]
     data = json.loads(data)
-    i = data
+    return data
+    
+
+async def only_map(i:dict):
+    """单地图下载"""
+    out = {}
     out['名字'] = i['title']
     out['游戏'] = i['app_name']
     out['下载地址'] = i['file_url']
     out['图片地址'] = i['preview_url']
     out['细节'] = i['file_description']
     return out
-    
-    
-    
 
-    
+async def primary_map(i):
+    """主地图返回多地图参数"""
+    map_list = []
+    map_list.append(i)
+    for one in i['children']:
+        map_list.append(await api_get_json(one['publishedfileid']))
+    return map_list
+

nonebot_plugin_l4d2_server/seach.py

@@ -29,4 +29,5 @@ def name_steamid_html(name):
     for i in data:
         onclick:str = i['onclick']
         steamid = onclick.split('=')[2].strip("'")
-        return steamid
+        return steamid
+

nonebot_plugin_l4d2_server/utils.py

@@ -6,7 +6,7 @@ import httpx
 import os
 from pathlib import Path
 
-from typing import List,Dict
+from typing import List,Dict,Union
 from .txt_to_img import txt_to_img
 from .config import *
 from .l4d2_anne import write_player,del_player,anne_messgae
@@ -42,12 +42,12 @@ async def get_file(url:str,down_file:Path):
         mes = None
     return mes
 
-def get_vpk(vpk_list:list,path):
+def get_vpk(vpk_list:list,path,file_:str = '.vpk'):
     '''
     获取所有vpk文件
     '''
     for file in os.listdir(path):
-        if file.endswith('.vpk'):
+        if file.endswith(file_):
             vpk_list.append(file)
     return vpk_list
 
@@ -190,8 +190,6 @@ async def show_ip(group_id):
     if len(data_list) == 0 :
         return "本群没有订阅"
     msg = await qq_ip_queries_pic(data_list)
-    if type(msg) == str:
-        msg = solve(msg)
     return  msg
 
 async def get_number_url(number):
@@ -211,7 +209,7 @@ async def workshop_msg(msg:str):
             pass
         msg = msg.replace('https://steamcommunity.com/sharedfiles/filedetails/?id=','')
     if msg.isdigit():
-        data:Dict = await workshop_to_dict(msg)
+        data:Union[dict,List[dict]] = await workshop_to_dict(msg)
         return data
     else:
         return None
@@ -222,7 +220,7 @@ async def save_file(file:bytes,path_name):
         files.write(file)
         
 async def get_anne_server_ip(ip):
-    """输出查询ip"""
+    """输出查询ip和ping"""
     host,port = split_maohao(ip)
     data = await queries_server([host,port])
     lines = data.splitlines()

{nonebot_plugin_l4d2_server-0.3.4a2.dist-info → nonebot_plugin_l4d2_server-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-l4d2-server
-Version: 0.3.4a2
+Version: 0.3.5
 Summary: L4D2 server related operations plugin for NoneBot
 Home-page: https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server
 License: MIT
@@ -22,21 +22,25 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Requires-Dist: aiohttp (>=3.8.3,<4.0.0)
+Requires-Dist: amis-python (>=1.0.6,<2.0.0)
 Requires-Dist: asyncio (>=3.4.3,<4.0.0)
 Requires-Dist: beautifulsoup4 (>=4.8.0,<5.0.0)
 Requires-Dist: httpx (>=0.23.3,<0.24.0)
+Requires-Dist: jieba (>=0.42.1,<0.43.0)
 Requires-Dist: jinja2 (>=3.0.0,<4.0.0)
 Requires-Dist: nonebot-adapter-onebot (>=2.1.5)
 Requires-Dist: nonebot2 (>=2.0.0rc3,<3.0.0)
 Requires-Dist: nonebot_plugin_apscheduler (>=0.2.0,<0.3.0)
 Requires-Dist: nonebot_plugin_htmlrender (>=0.2.0.1,<0.3.0.0)
 Requires-Dist: nonebot_plugin_txt2img (>=0.3.0)
+Requires-Dist: pandas (>=1.5.2)
 Requires-Dist: patool (>=1.12,<2.0)
 Requires-Dist: pillow (>=9.3.0,<10.0.0)
 Requires-Dist: python-a2s (>=1.3.0,<2.0.0)
 Requires-Dist: pyunpack (>=0.3.0,<0.4.0)
 Requires-Dist: rarfile (>=4.0,<5.0)
 Requires-Dist: rcon (>=2.1.0,<3.0.0)
+Requires-Dist: ruamel.yaml (>=0.17.21,<0.18.0)
 Requires-Dist: srctools (>=2.3.9,<3.0.0)
 Project-URL: Repository, https://github.com/Umamusume-Agnes-Digital/nonebot_plugin_l4d2_server
 Description-Content-Type: text/markdown
@@ -259,6 +263,8 @@ _✨Nonebot & Left 4 Dead 2 server操作✨_
 | l4_image | 否 | True | 布尔值，是否显示图片 |
 | l4_font | 否 | 'simsun.ttc' | str，确保在开启图片的时候，字体存在 |
 | l4_only | 否 | False | 布尔值，如果不想在下载的时候阻碍其他指令可以开启，但是有不能下载超过200m地图的bug |
+| l4_style | 否 | '' | str,图片风格，目前可选['balck'] |
+
 
 </details>
 
@@ -335,6 +341,23 @@ anne:<br>
 <details>
 <summary>展开/收起</summary>
 
+### 0.3.5--2022.3.6
+
+ - 新增ping查询（在ip里包括）
+ - 新增api查询（未完成）
+ - 修复了电信服查询绑定名字无法查询的错误
+ - 新增了救援率的显示
+ - 新增web端（未完成）
+
+### 0.3.4--2022.3.1
+
+ - 新增本地插件smx查询
+ - 增加了三个内置群服
+ - 修改了图片的UI,变好看了
+ - 删减了部分图片和字体，使得轻量化
+ - 修复了海量bug
+ - 修复了python3.8中typing错误
+
 ### 0.3.3--2022.2.26
 
  - 重写协议，使用a2s库，同时解决win端不同报错无法输出
@@ -490,16 +513,17 @@ ubuntu20.04 python3.10
 - 2、~[自己写的求生之路查询库](https://github.com/Umamusume-Agnes-Digital/VSQ)~
 - 3、[可爱小Q的帮助(太好看了tql)](https://github.com/MeetWq/mybot)
 - 4、感谢petpet交流群各位大佬指点nonebot2事件处理api
+- 5、ArcPav改的暗♂黑风格菜单
 
 <h2 id="cx">服务器相关 </h2>
 
-目前插件会内置经腐竹同意的服的ip
+目前插件会内置经腐竹同意的服的查询（未来将使用api）
 
 | 指令 | 服务器 | op | 数量 |
 |:-----:|:----:|:----:|:----:|
-| 云 | anne电信服云服 | 东 | 26
+| 云 | ~anne电信服云服~(暂时不提供) | 东 | 24
 | 呆呆 | 呆呆的小窝 | 提莫大魔王 | 15
-| 橘 | 橘希实香的小窝 | 橘希实香 | 4
+| 橘 | 橘希实香的小窝 | 橘希实香 | 7
 
 如果需要上传自己的ip可以Pr、iss或者进qq群
 

nonebot_plugin_l4d2_server-0.3.5.dist-info/RECORD

@@ -0,0 +1,49 @@
+LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+nonebot_plugin_l4d2_server/__init__.py,sha256=bltu79zSdOQrR3bOxqTIIvEcfcARI-4EmvTYNZ2OiTg,17752
+nonebot_plugin_l4d2_server/command.py,sha256=oyM-j86qLSRUu-8WDRw39SJ33qzW9AqabRDjji_r1SM,5051
+nonebot_plugin_l4d2_server/config.py,sha256=PrN3VQeEnErz7FOK8lnHeyZzzDmndf09IO-UlQXbfJY,4035
+nonebot_plugin_l4d2_server/data/L4D2/image/head/head.png,sha256=Z72PEvp7xF1DZcLDeuWlg2_g6JAfHxtisptWn6BYGN8,158357
+nonebot_plugin_l4d2_server/data/L4D2/image/header/player1.jpg,sha256=2A_llIi9YVhJs9JOMuF36by7Ewc7P7qOgQS8t5jemNw,405369
+nonebot_plugin_l4d2_server/data/L4D2/image/template/anne.html,sha256=DP2bEr2TAgDfXwNTe1Fz71TcJYPA1z4bqxkI9LXY1Q4,1666
+nonebot_plugin_l4d2_server/data/L4D2/image/template/back.png,sha256=tFXhpNiFnbTZiEF9Z2O2EjxCxcrhsFJH4po8Cb7SnIg,242997
+nonebot_plugin_l4d2_server/data/L4D2/image/template/fingerprint.svg,sha256=AwLa0b5WQjuatlNF4ob1sTJk2ZG3bi4S46AgoNbs10U,2150
+nonebot_plugin_l4d2_server/data/L4D2/image/template/help - 副本.html,sha256=oHrIGU9bCTG1rFelUm7aLWHvsjRKI0fimW1srjewOVw,5829
+nonebot_plugin_l4d2_server/data/L4D2/image/template/help.html,sha256=SxTXrQbo_4YkGj0IKV_Ll-RSZiXruPlS8ISwbc9yjkA,6206
+nonebot_plugin_l4d2_server/data/L4D2/image/template/help_dack.html,sha256=g7tp8g_ZejiQBQrOti-EvcygJBFICnscU5ckrJ5Lp2A,6417
+nonebot_plugin_l4d2_server/data/L4D2/image/template/ip.html,sha256=5uNt3wigNdAZX2gNX4nFOJghbXoiBJoceGyV5qcK9Xg,1595
+nonebot_plugin_l4d2_server/data/L4D2/image/template/vue.css,sha256=2sGjCFrR-3tFMB_x7l4K6k40tZ5JVzhWqD759cagYBA,7874
+nonebot_plugin_l4d2_server/data/L4D2/l4d2.json,sha256=_txrDFATQSxiGLENGyXATx1OcAqYDjHIzGzsYssJqwc,2591
+nonebot_plugin_l4d2_server/l4d2_anne/__init__.py,sha256=5rcVF6r4fKgU4B-RLPO3kEbeiVkFS0s5S9Ild0AbyaU,8928
+nonebot_plugin_l4d2_server/l4d2_anne/analysis.py,sha256=GNkqAxi-gKIdHnIScGRMQlVjPyDTDqo_C81a8bTskts,1209
+nonebot_plugin_l4d2_server/l4d2_anne/anne_telecom.py,sha256=poAlUAgTvDryAtSa0CpQo5kawtJbddpWyt2JtIxzcgI,3085
+nonebot_plugin_l4d2_server/l4d2_anne/server.py,sha256=_ZKRi0eLh7GnQJJaUUckaieWLzuLWaZL3brXcovjoOE,1702
+nonebot_plugin_l4d2_server/l4d2_anne/startand.py,sha256=3veOrk5BUDvLG_Iuj0k6OT7EB0f9IIk655dLlSFla3w,376
+nonebot_plugin_l4d2_server/l4d2_data/__init__.py,sha256=1JDSuJ1mCF_zIZZfvD-O1JZCgQ2ju_EH0Y3k6oLr2j4,3332
+nonebot_plugin_l4d2_server/l4d2_data/config.py,sha256=1s0VUTX6Mx4aAOCym0bexNl3E-SHIQfmuv6-5qP1ymQ,485
+nonebot_plugin_l4d2_server/l4d2_data/players.py,sha256=USNwhbilbllbW8AP5HK-QTITA-ndip5AMxvEIfuYtwE,3308
+nonebot_plugin_l4d2_server/l4d2_data/serverip.py,sha256=AKZbr1YZkXRBUX1QNQyPfvhF3am0sY7Y9Ed_EAHlg4c,1316
+nonebot_plugin_l4d2_server/l4d2_file/__init__.py,sha256=KvTdzPNTeNopoMHAGVn5IwEdtdm_Vjn8iqekVqr5U0o,4510
+nonebot_plugin_l4d2_server/l4d2_image/__init__.py,sha256=iLx4-zICuYGFzVklb2jQZqxUAWK_oi-jPaS1s88IP1E,4173
+nonebot_plugin_l4d2_server/l4d2_image/download.py,sha256=n1YQNMeTslbLMLbkRVfRFX6mipmxfI8HWQ7sG8bVXDI,4097
+nonebot_plugin_l4d2_server/l4d2_image/htmlimg.py,sha256=bz1oJn-CUoPuBktJxGLrm1FsuMoehlt17pcoYVhIrVs,1070
+nonebot_plugin_l4d2_server/l4d2_image/send_image_tool.py,sha256=DKliVudSSeec4Gl5Deji04-P4_bbSIvXWorEIPQpKDc,968
+nonebot_plugin_l4d2_server/l4d2_image/steam.py,sha256=-N0dcTmnCu5UOjUik0UMWR3pTlCQK7PnkxGuZpju-TU,2481
+nonebot_plugin_l4d2_server/l4d2_image/vtfs.py,sha256=2WuXE_4_5eVNExzYCTgZnKZrcE6CxqnDpjpKEA_FHCE,1427
+nonebot_plugin_l4d2_server/l4d2_queries/__init__.py,sha256=Qv3aIDaqbP2J5zUXiOnfl9eJ1o0WKeGnC1qzOqfDgDo,3468
+nonebot_plugin_l4d2_server/l4d2_queries/maps.py,sha256=EcyHLVIa801qADz1zO-TZwSdQpr4aHZEGz_M-UeDQQ4,669
+nonebot_plugin_l4d2_server/l4d2_queries/ohter.py,sha256=HQzsbk10L5nUrPAaN-FvCJO9kmfOyXz8nrnZZezg8Ss,888
+nonebot_plugin_l4d2_server/l4d2_queries/qqgroup.py,sha256=RkBAF-VrKYxVaSFjgpIslPOdj7CEDWcGdTUUUg1Q5XM,10297
+nonebot_plugin_l4d2_server/l4d2_server/__init__.py,sha256=mp3Za6jJ-V92ChXRhl3k4D1tMTY4dqHdXgMzdWutccc,1676
+nonebot_plugin_l4d2_server/l4d2_server/rcon.py,sha256=aP2n-sq_vM-h6UjnNCmKK9_WW8oS9zFySgowPl5FXd4,1160
+nonebot_plugin_l4d2_server/l4d2_server/web.py,sha256=UanKE3YWvMRCEDqF9wCZKOK2CITgR61Dq6AgwP4zUMY,8727
+nonebot_plugin_l4d2_server/l4d2_server/webUI.py,sha256=pRZEyTHWOTcoX_U8r2I342M60-g9h59BjaDwZqa_jUk,28187
+nonebot_plugin_l4d2_server/l4d2_server/workshop.py,sha256=ZpWnWJ7EABNpDu86Rzoqu3tWoABanprIEcmej1zUT1A,1409
+nonebot_plugin_l4d2_server/message.py,sha256=x_ts0HaW3SNOma-baEG0oaeozKE5Nh_fybnRH6VE8i0,1678
+nonebot_plugin_l4d2_server/seach.py,sha256=dsusYogKH9pGeLxZz9BTheQwtJ3wAO3tfbePYdcaIuA,1025
+nonebot_plugin_l4d2_server/txt_to_img.py,sha256=ZaxHYNu8aAZUH4fNALyE1Q_ET7KuWytEiMFZ9loZnqc,2188
+nonebot_plugin_l4d2_server/utils.py,sha256=PEYguv-HIwXbR0Y17eisMrYbRL1HgDNuzKBo1_Stf-I,8296
+README.md,sha256=Tk4QX5-s8fEa4mCEV4mFYFWdDss5yC4Ensp5dZjAEMQ,16973
+nonebot_plugin_l4d2_server-0.3.5.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+nonebot_plugin_l4d2_server-0.3.5.dist-info/METADATA,sha256=ekNdv3wLvChX_Y6EQEN8NmKjgqJE9B4HwuTk10WSf3M,18519
+nonebot_plugin_l4d2_server-0.3.5.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+nonebot_plugin_l4d2_server-0.3.5.dist-info/RECORD,,