Revert "从上游重新合并代码"

This reverts commit 616701e.

Author: renmu123

List/DanmakuFactoryList.c

@@ -314,47 +314,8 @@ void blockByType(DANMAKU *const danmakuHead, const int mode, char **keyStrings,
                 }
                 else
                 {
-                    const char *key = keyStrings[i];
-                    size_t keyLen = strlen(key);
-                    
-                    // 如果黑名单文本被<>包裹，认为是uid，使用ptr -> user -> uid进行完整匹配
-                    if (keyStrings[i][0] == '<' && keyStrings[i][keyLen - 1] == '>')
-                    {
-                        if (ptr -> user != NULL && ptr -> user -> uid != 0)
-                        {
-                            char *uidStr = (char *)malloc(keyLen - 1);
-                            strncpy(uidStr, keyStrings[i] + 1, keyLen - 2);
-                            uidStr[keyLen - 2] = '\0';
-                            if (ptr -> user -> uid == atoi(uidStr))
-                            {
-                                if (ptr -> type > 0)
-                                {
-                                    ptr -> type *= -1;
-                                }
-                                break;
-                            }
-                        }
-                    }
-                    // 如果黑名单文本被[]包裹，认为是user，使用ptr -> user -> name进行完整匹配
-                    else if (keyStrings[i][0] == '[' && keyStrings[i][keyLen - 1] == ']')
-                    {
-                        if (ptr -> user != NULL && ptr -> user -> name[0] != '\0')
-                        {
-                            char *nameStr = (char *)malloc(keyLen - 1);
-                            strncpy(nameStr, keyStrings[i] + 1, keyLen - 2);
-                            nameStr[keyLen - 2] = '\0';
-                            if (strcmp(ptr -> user -> name, nameStr) == 0)
-                            {
-                                if (ptr -> type > 0)
-                                {
-                                    ptr -> type *= -1;
-                                }
-                                break;
-                            }
-                        }
-                    }
                     // 使用简单的字符串匹配
-                    else if (strstr(ptr->text, keyStrings[i]) != NULL)
+                    if (strstr(ptr->text, keyStrings[i]) != NULL)
                     {
                         if (ptr->type > 0)
                         {