From 5d01be5b9346bcf11e89f684d37660772726bf28 Mon Sep 17 00:00:00 2001 From: linmeideli <2558527373@qq.com> Date: Sun, 15 Nov 2026 11:42:49 +0800 Subject: [PATCH] Remove QQ Verify Plugin --- marketplace/Empostor.Plugins.QqVerify.dll | Bin 18432 -> 0 bytes marketplace/plugins.json | 13 -- .../Service/Admin/Verify/IVerifyStore.cs | 4 +- .../Empostor.Plugins.QqVerify.csproj | 13 -- .../Localization/en.json | 8 -- .../Localization/zh-CN.json | 8 -- .../QqVerifyAdminExtension.cs | 39 ------ .../QqVerifyCommand.cs | 70 ---------- .../QqVerifyConfig.cs | 9 -- .../QqVerifyPlugin.cs | 24 ---- .../QqVerifyStartup.cs | 29 ---- .../QqVerifyStore.cs | 74 ---------- .../packages.lock.json | 128 ------------------ src/Empostor.Server/Http/VerifyController.cs | 8 +- src/Empostor.sln | 15 -- 15 files changed, 6 insertions(+), 436 deletions(-) delete mode 100644 marketplace/Empostor.Plugins.QqVerify.dll delete mode 100644 src/Empostor.Plugins.QqVerify/Empostor.Plugins.QqVerify.csproj delete mode 100644 src/Empostor.Plugins.QqVerify/Localization/en.json delete mode 100644 src/Empostor.Plugins.QqVerify/Localization/zh-CN.json delete mode 100644 src/Empostor.Plugins.QqVerify/QqVerifyAdminExtension.cs delete mode 100644 src/Empostor.Plugins.QqVerify/QqVerifyCommand.cs delete mode 100644 src/Empostor.Plugins.QqVerify/QqVerifyConfig.cs delete mode 100644 src/Empostor.Plugins.QqVerify/QqVerifyPlugin.cs delete mode 100644 src/Empostor.Plugins.QqVerify/QqVerifyStartup.cs delete mode 100644 src/Empostor.Plugins.QqVerify/QqVerifyStore.cs delete mode 100644 src/Empostor.Plugins.QqVerify/packages.lock.json diff --git a/marketplace/Empostor.Plugins.QqVerify.dll b/marketplace/Empostor.Plugins.QqVerify.dll deleted file mode 100644 index 173e501a3572d9918e7d5c9f933c38843f6bd740..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18432 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 diff --git a/marketplace/plugins.json b/marketplace/plugins.json index dc9502d..c81779e 100644 --- a/marketplace/plugins.json +++ b/marketplace/plugins.json @@ -77,19 +77,6 @@ } ] }, - { - "id": "cn.hayashiume.qqverify", - "name": "QQ群验证API", - "description": "[仅限中国],搭配 [本插件](https://github.com/HayashiUme/LLOneBot_Empostor_Verify) 使用", - "author": "HayashiUme", - "versions": [ - { - "version": "1.0.0", - "empostor_version": "2.0.0", - "download_url": "https://raw.githubusercontent.com/Empostor/Empostor/master/marketplace/Empostor.Plugins.QqVerify.dll" - } - ] - }, { "id": "cn.hayashiume.message", "name": "Leave a Message", diff --git a/src/Empostor.Api/Service/Admin/Verify/IVerifyStore.cs b/src/Empostor.Api/Service/Admin/Verify/IVerifyStore.cs index ab4604d..376ce2e 100644 --- a/src/Empostor.Api/Service/Admin/Verify/IVerifyStore.cs +++ b/src/Empostor.Api/Service/Admin/Verify/IVerifyStore.cs @@ -2,10 +2,10 @@ namespace Empostor.Api.Service.Admin.Verify { public interface IVerifyStore { - void AddPending(string friendCode, string qqNumber); + void AddPending(string friendCode, string userOpenid); bool ValidateSecret(string secret); - bool TryConfirm(string friendCode, string qqNumber); + bool TryConfirm(string friendCode, string userOpenid); } } diff --git a/src/Empostor.Plugins.QqVerify/Empostor.Plugins.QqVerify.csproj b/src/Empostor.Plugins.QqVerify/Empostor.Plugins.QqVerify.csproj deleted file mode 100644 index 084f985..0000000 --- a/src/Empostor.Plugins.QqVerify/Empostor.Plugins.QqVerify.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - net10.0 - Empostor.Plugins.QqVerify - enable - - - - - - - - diff --git a/src/Empostor.Plugins.QqVerify/Localization/en.json b/src/Empostor.Plugins.QqVerify/Localization/en.json deleted file mode 100644 index 350a3f8..0000000 --- a/src/Empostor.Plugins.QqVerify/Localization/en.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "command.verify.description":"Verify your QQ number for group access.", - "command.verify.usage":"verify ", - "qqverify.chinese_only":"This command is only available for Chinese language players.\n此功能仅支持简体/繁体中文玩家使用。", - "qqverify.no_friendcode":"Unable to get your friend code. Please make sure you are logged in.", - "qqverify.usage_message":"Usage: #verify \nExample: #verify 123456789", - "qqverify.recorded":"Verification request recorded! Send /验证 {0} to the QQ bot.\nNote: The code is valid for 10 minutes." -} diff --git a/src/Empostor.Plugins.QqVerify/Localization/zh-CN.json b/src/Empostor.Plugins.QqVerify/Localization/zh-CN.json deleted file mode 100644 index 33ec057..0000000 --- a/src/Empostor.Plugins.QqVerify/Localization/zh-CN.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "command.verify.description":"验证你的QQ号以获取群组访问权限。", - "command.verify.usage":"verify ", - "qqverify.chinese_only":"此功能仅支持简体/繁体中文玩家使用。\nThis command is only available for Chinese language players.", - "qqverify.no_friendcode":"无法获取你的好友代码,请确保已登录账号。", - "qqverify.usage_message":"用法:#verify <你的QQ号>\n示例:#verify 123456789", - "qqverify.recorded":"已记录验证请求!请私聊QQ机器人发送:/验证 {0}\n注意:验证码10分钟内有效。" -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyAdminExtension.cs b/src/Empostor.Plugins.QqVerify/QqVerifyAdminExtension.cs deleted file mode 100644 index c96ec54..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyAdminExtension.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Empostor.Api.Admin; -using Empostor.Api.Plugins; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyAdminExtension : IAdminExtension -{ - private readonly QqVerifyConfig _config; - private readonly string _configPath; - - public QqVerifyAdminExtension(QqVerifyConfig config, string configPath) - { - _config = config; - _configPath = configPath; - } - - public string Id => "qq-verify"; - - public string Title => "QQ Verify"; - - public string Icon => "shield"; - - public void Build(AdminPanelBuilder b) - { - b.RegisterTextbox(t => - { - t.Label = "Bot secret"; - t.Value = _config.BotSecret; - t.Secret = true; - t.Placeholder = "change-bot-secret"; - t.OnSubmit(async ctx => - { - _config.BotSecret = ctx.Value ?? string.Empty; - PluginConfigLoader.Save(_configPath, _config); - return AdminActionResult.Ok("Bot secret saved."); - }); - }); - } -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyCommand.cs b/src/Empostor.Plugins.QqVerify/QqVerifyCommand.cs deleted file mode 100644 index 69dfccc..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyCommand.cs +++ /dev/null @@ -1,70 +0,0 @@ -using System.Threading.Tasks; -using Empostor.Api.Commands; -using Empostor.Api.Service.Admin.Verify; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyCommand : ICommand -{ - private readonly IVerifyStore _store; - - public QqVerifyCommand(IVerifyStore store) - { - _store = store; - } - - public string Name => "verify"; - public string LocalizationOwner => QqVerifyPlugin.Owner; - - public string[] Aliases => new[] { "ver" }; - - public string Description => "Verify your QQ number for group access."; - - public string Usage => "verify "; - - public async ValueTask ExecuteAsync(CommandContext ctx) - { - if (!ctx.IsSenderChinese()) - { - await ctx.PlayerControl.SendChatToPlayerAsync( - T(ctx, "qqverify.chinese_only", - "This command is only available for Chinese language players.\n此功能仅支持简体/繁体中文玩家使用。"), - ctx.PlayerControl); - return true; - } - - var fc = ctx.Sender.Client.FriendCode; - if (string.IsNullOrEmpty(fc)) - { - await ctx.PlayerControl.SendChatToPlayerAsync( - T(ctx, "qqverify.no_friendcode", - "Unable to get your friend code. Please make sure you are logged in."), - ctx.PlayerControl); - return true; - } - - var qqNumber = ctx.RawArgs?.Trim(); - if (string.IsNullOrEmpty(qqNumber) || !long.TryParse(qqNumber, out _)) - { - await ctx.PlayerControl.SendChatToPlayerAsync( - T(ctx, "qqverify.usage_message", - "Usage: #verify \nExample: #verify 123456789"), - ctx.PlayerControl); - return true; - } - - _store.AddPending(fc, qqNumber); - - await ctx.PlayerControl.SendChatToPlayerAsync( - T(ctx, "qqverify.recorded", - "Verification request recorded! Send /验证 {0} to the QQ bot.\nNote: The code is valid for 10 minutes.", fc), - ctx.PlayerControl); - - return true; - } - - private static string T(CommandContext ctx, string key, string defaultText, params object?[] arguments) - { - return ctx.GetPluginString(QqVerifyPlugin.Owner, key, arguments); - } -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyConfig.cs b/src/Empostor.Plugins.QqVerify/QqVerifyConfig.cs deleted file mode 100644 index 22fc580..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyConfig.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Text.Json.Serialization; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyConfig -{ - [JsonPropertyName("botSecret")] - public string BotSecret { get; set; } = "change-bot-secret"; -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyPlugin.cs b/src/Empostor.Plugins.QqVerify/QqVerifyPlugin.cs deleted file mode 100644 index 04d9168..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyPlugin.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Threading.Tasks; -using Empostor.Api.Localization; -using Empostor.Api.Plugins; -using Microsoft.Extensions.Logging; - -namespace Empostor.Plugins.QqVerify; - -[EmpostorPlugin(Owner, "QQ Verify", "ELinmei", "1.0.0")] -public sealed class QqVerifyPlugin : PluginBase -{ - public const string Owner = "cn.hayashiume.qqverify"; - private readonly ILocalizationRegistry _registry; - private readonly ILogger _logger; - private IDisposable? _registration; - public QqVerifyPlugin(ILogger logger, ILocalizationRegistry registry) { _logger = logger; _registry = registry; } - public override ValueTask EnableAsync() - { - if (!_registry.TryRegister(new LocalizationCatalog(Owner, typeof(QqVerifyPlugin).Assembly, "Empostor.Plugins.QqVerify.Localization"), out _registration)) - _logger.LogWarning("Could not register localization resources for {Owner}", Owner); - return default; - } - public override ValueTask DisableAsync() { _registration?.Dispose(); return default; } -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyStartup.cs b/src/Empostor.Plugins.QqVerify/QqVerifyStartup.cs deleted file mode 100644 index a45f961..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyStartup.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Empostor.Api.Admin; -using Empostor.Api.Commands; -using Empostor.Api.Plugins; -using Empostor.Api.Service.Admin.Verify; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyStartup : IPluginStartup -{ - private string _configPath = "[QQ Verify]Config.json"; - - public void SetConfigPath(string configPath) => _configPath = configPath; - - public void ConfigureHost(IHostBuilder host) { } - - public void ConfigureServices(IServiceCollection services) - { - var config = PluginConfigLoader.Load(_configPath); - services.AddSingleton(config); - services.AddSingleton(); - services.AddSingleton(); - services.AddSingleton( - sp => sp.GetRequiredService()); - services.AddSingleton( - _ => new QqVerifyAdminExtension(config, _configPath)); - } -} diff --git a/src/Empostor.Plugins.QqVerify/QqVerifyStore.cs b/src/Empostor.Plugins.QqVerify/QqVerifyStore.cs deleted file mode 100644 index 8dcf3d2..0000000 --- a/src/Empostor.Plugins.QqVerify/QqVerifyStore.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using System.Collections.Generic; -using Empostor.Api.Service.Admin.Verify; - -namespace Empostor.Plugins.QqVerify; - -public sealed class QqVerifyStore : IVerifyStore -{ - private readonly object _lock = new(); - private readonly Dictionary _pending = new(); - private static readonly TimeSpan Expiry = TimeSpan.FromMinutes(10); - private readonly QqVerifyConfig _config; - - public QqVerifyStore(QqVerifyConfig config) - { - _config = config; - } - - public void AddPending(string friendCode, string qqNumber) - { - var key = Normalize(friendCode); - lock (_lock) - { - CleanExpiredLocked(); - _pending[key] = new PendingEntry(qqNumber, DateTime.UtcNow); - } - } - - public bool ValidateSecret(string secret) - { - return !string.IsNullOrWhiteSpace(secret) && secret == _config.BotSecret; - } - - public bool TryConfirm(string friendCode, string qqNumber) - { - var key = Normalize(friendCode); - lock (_lock) - { - CleanExpiredLocked(); - if (_pending.TryGetValue(key, out var entry) && entry.QqNumber == qqNumber) - { - _pending.Remove(key); - return true; - } - - return false; - } - } - - private void CleanExpiredLocked() - { - var cutoff = DateTime.UtcNow - Expiry; - var expired = new List(); - foreach (var (k, v) in _pending) - { - if (v.Timestamp < cutoff) - { - expired.Add(k); - } - } - - foreach (var k in expired) - { - _pending.Remove(k); - } - } - - private static string Normalize(string fc) - { - return (fc ?? string.Empty).Trim().ToUpperInvariant(); - } - - private sealed record PendingEntry(string QqNumber, DateTime Timestamp); -} diff --git a/src/Empostor.Plugins.QqVerify/packages.lock.json b/src/Empostor.Plugins.QqVerify/packages.lock.json deleted file mode 100644 index 8c2d1e8..0000000 --- a/src/Empostor.Plugins.QqVerify/packages.lock.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "version": 1, - "dependencies": { - "net10.0": { - "BouncyCastle.Cryptography": { - "type": "Transitive", - "resolved": "2.6.1", - "contentHash": "vZsG2YILhthgRqO+ZVgRff4ZFKKTl0v7kqaVBLCtRvpREhfBP33pcWrdA3PRYgWuFL1RxiUFvjMUHTdBZlJcoA==" - }, - "Empostor.Hazel": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "cblWCgvLcQ2xK6ztV04RVrghVEnJpCWe4N6G3LCNaJhuUq367a1/bbtQxUWAflqvgSvGwY3g3SClhh9eWTCBDA==", - "dependencies": { - "BouncyCastle.Cryptography": "2.6.1", - "Empostor.Hazel.Abstractions": "1.0.2", - "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.6", - "Microsoft.Extensions.ObjectPool": "8.0.1", - "Serilog": "4.3.1" - } - }, - "Empostor.Hazel.Abstractions": { - "type": "Transitive", - "resolved": "1.0.2", - "contentHash": "uJqGMASOGj+ELffmIMqubyvJ/FHjOXA1RtQdS38s1LRhP+Eu4zJMTTndr12+Q3vS0kHggFFyuExFmNxWyzWmig==" - }, - "Microsoft.AspNetCore.Http.Abstractions": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "Nxs7Z1q3f1STfLYKJSVXCs1iBl+Ya6E8o4Oy1bCxJ/rNI44E/0f6tbsrVqAWfB7jlnJfyaAtIalBVxPKUPQb4Q==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.2.0" - } - }, - "Microsoft.AspNetCore.Http.Features": { - "type": "Transitive", - "resolved": "2.2.0", - "contentHash": "ziFz5zH8f33En4dX81LW84I6XrYXKf9jg6aM39cM+LffN9KJahViKZ61dGMSO2gd3e+qe5yBRwsesvyqlZaSMg==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.2.0" - } - }, - "Microsoft.Extensions.Configuration.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions": { - "type": "Transitive", - "resolved": "9.0.6", - "contentHash": "0Zn6nR/6g+90MxskZyOOMPQvnPnrrGu6bytPwkV+azDcTtCSuQ1+GJUrg8Klmnrjk1i6zMpw2lXijl+tw7Q3kA==" - }, - "Microsoft.Extensions.Diagnostics.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JHYCQG7HmugNYUhOl368g+NMxYE/N/AiclCYRNlgCY9eVyiBkOHMwK4x60RYMxv9EL3+rmj1mqHvdCiPpC+D4Q==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" - } - }, - "Microsoft.Extensions.FileProviders.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", - "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Hosting.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AG7HWwVRdCHlaA++1oKDxLsXIBxmDpMPb3VoyOoAghEWnkUvEAdYQUwnV4jJbAaa/nMYNiEh5ByoLauZBEiovg==", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Diagnostics.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.Logging.Abstractions": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" - } - }, - "Microsoft.Extensions.ObjectPool": { - "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "X21b8D6z58EG34OMLH955750mFaEaGs5xLGe9Vyi3059Cgb3sk+p2k/JlQXaieEBRrk+SVlFzDei3Q6PdVzJOA==" - }, - "Microsoft.Extensions.Options": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" - } - }, - "Microsoft.Extensions.Primitives": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" - }, - "Serilog": { - "type": "Transitive", - "resolved": "4.3.1", - "contentHash": "savYe7h5yRlkqBVOwP8cIRDOdqKiPmYCU4W87JH38sBmcKD5EBoXvQIw6bNEvZ/pTe1gsiye3VFCzBsoppGkXQ==" - }, - "empostor.api": { - "type": "Project", - "dependencies": { - "Empostor.Hazel": "[1.0.2, )", - "Microsoft.AspNetCore.Http.Abstractions": "[2.2.0, )", - "Microsoft.Extensions.Hosting.Abstractions": "[8.0.0, )", - "Microsoft.Extensions.Logging.Abstractions": "[8.0.0, )" - } - } - } - } -} \ No newline at end of file diff --git a/src/Empostor.Server/Http/VerifyController.cs b/src/Empostor.Server/Http/VerifyController.cs index 7565601..794a4ed 100644 --- a/src/Empostor.Server/Http/VerifyController.cs +++ b/src/Empostor.Server/Http/VerifyController.cs @@ -23,12 +23,12 @@ public sealed class VerifyController : ControllerBase return Unauthorized(new { ok = false, error = "Invalid bot secret." }); } - if (string.IsNullOrWhiteSpace(req.FriendCode) || string.IsNullOrWhiteSpace(req.QqNumber)) + if (string.IsNullOrWhiteSpace(req.FriendCode) || string.IsNullOrWhiteSpace(req.UserOpenid)) { - return BadRequest(new { ok = false, error = "friendCode and qqNumber are required." }); + return BadRequest(new { ok = false, error = "friendCode and userOpenid are required." }); } - var ok = _store.TryConfirm(req.FriendCode, req.QqNumber); + var ok = _store.TryConfirm(req.FriendCode, req.UserOpenid); if (ok) { return Ok(new { ok = true }); @@ -44,6 +44,6 @@ public sealed class VerifyController : ControllerBase public sealed record VerifyConfirmRequest( [property: JsonPropertyName("friendCode")] string FriendCode, - [property: JsonPropertyName("qqNumber")] string QqNumber, + [property: JsonPropertyName("userOpenid")] string UserOpenid, [property: JsonPropertyName("secret")] string Secret); } diff --git a/src/Empostor.sln b/src/Empostor.sln index 0438b80..95e71bb 100644 --- a/src/Empostor.sln +++ b/src/Empostor.sln @@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.FixedCode" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.FriendCodeValidator", "Empostor.Plugins.FriendCodeValidator\Empostor.Plugins.FriendCodeValidator.csproj", "{70CD7AC9-1DE3-CD23-602A-EFD504B91450}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.QqVerify", "Empostor.Plugins.QqVerify\Empostor.Plugins.QqVerify.csproj", "{B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugins.PlayerChannel", "Empostor.Plugins.PlayerChannel\Empostor.Plugins.PlayerChannel.csproj", "{D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Empostor.Plugin.Chat", "Empostor.Plugin.Chat\Empostor.Plugin.Chat.csproj", "{9D1FD146-E7D9-4AFF-9B8E-25E6021A69D7}" @@ -133,18 +131,6 @@ Global {70CD7AC9-1DE3-CD23-602A-EFD504B91450}.Release|x64.Build.0 = Release|Any CPU {70CD7AC9-1DE3-CD23-602A-EFD504B91450}.Release|x86.ActiveCfg = Release|Any CPU {70CD7AC9-1DE3-CD23-602A-EFD504B91450}.Release|x86.Build.0 = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|x64.ActiveCfg = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|x64.Build.0 = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|x86.ActiveCfg = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Debug|x86.Build.0 = Debug|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|Any CPU.Build.0 = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|x64.ActiveCfg = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|x64.Build.0 = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|x86.ActiveCfg = Release|Any CPU - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E}.Release|x86.Build.0 = Release|Any CPU {D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -262,7 +248,6 @@ Global {AA000002-0000-0000-0000-000000000002} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {C583BD2A-1468-99CA-4E3D-CBDA4D2EDB9F} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {70CD7AC9-1DE3-CD23-602A-EFD504B91450} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} - {B8A5D7C3-1F4E-4A2B-9C6D-8E3F5A7B1D2E} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {D4B6C8A2-5F3E-4C1D-9B7A-6E2F8A4C1D3F} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {9D1FD146-E7D9-4AFF-9B8E-25E6021A69D7} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29} {ADC4F301-51C0-45DB-B97A-BE3844DFD19B} = {E0009DCB-32A6-45C4-A06C-7F62D4091A29}