optimize catch uid

snowtafir · Aug 25, 2024 · f82e100 · f82e100
1 parent 024ff6b
commit f82e100
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/apps/bilibili.ts b/apps/bilibili.ts
@@ -109,7 +109,7 @@ export default class YukiBili extends Plugin {
       this.e.reply("未取得bot主人身份，无权限添加B站动态订阅");
     } else {
       // 从消息中提取UID
-      const uid = this.e.msg.replace(/^(#|\/)(yuki|优纪)?(订阅|添加|add|ADD)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim();
+      const uid = this.e.msg.replace(/^(#|\/)(yuki|优纪)?(订阅|添加|add|ADD)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim().replace(/^(uid|UID)?(:|：)?/g, '');
       if (!uid) {
         this.e.reply(`请在指令末尾指定订阅的B站up主的UID！`);
         return true;
@@ -190,7 +190,7 @@ export default class YukiBili extends Plugin {
       this.e.reply("未取得bot主人身份，无权限删除B站动态订阅");
     } else {
       // 提取用户输入的UID
-      const uid = this.e.msg.replace(/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim();
+      const uid = this.e.msg.replace(/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim().replace(/^(uid|UID)?(:|：)?/g, '');
       if (!uid) {
         this.e.reply(`请在指令末尾指定订阅的B站up主的UID！`);
         return;
@@ -444,7 +444,7 @@ export default class YukiBili extends Plugin {
 
       // 处理群组订阅
       if (subData.group && Object.keys(subData.group).length > 0) {
-        messages.push("------群组B站订阅------");
+        messages.push("------群组B站订阅------\n");
         Object.keys(subData.group).forEach((groupId) => {
           messages.push(`群组ID：${groupId}：`);
           subData.group[groupId].forEach((item: { type: any[]; uid: any; name: any; }) => {
@@ -467,7 +467,7 @@ export default class YukiBili extends Plugin {
 
       // 处理私聊订阅
       if (subData.private && Object.keys(subData.private).length > 0) {
-        messages.push("------私聊B站订阅------");
+        messages.push("\n------私聊B站订阅------");
         Object.keys(subData.private).forEach((userId) => {
           messages.push(`用户ID：${userId}：`);
           subData.private[userId].forEach((item: { type: any[]; uid: any; name: any; }) => {