修改版本号, 以及修正部分判断用户是否相同的bug

Saplonily · Jan 5, 2023 · c65ce75 · c65ce75
1 parent 07b609e
commit c65ce75
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/SaladimQBot.Core/-Extensions/EntityExtensions.cs b/SaladimQBot.Core/-Extensions/EntityExtensions.cs
@@ -147,7 +147,7 @@ public static IEnumerable<IMessageChainTextNode> AllText(this IMessageEntity ent
     /// </summary>
     /// <param name="user">目标用户</param>
     public static bool Mentioned(this IMessageEntity entity, IUser user)
-        => entity.AllAt().Where(n => !n.MentionedAllUser() && n.User! == user).Any();
+        => entity.AllAt().Where(n => !n.MentionedAllUser() && n.User!.IsSameUser(user)).Any();
 
     public static bool MentionedAllUser(this IMessageEntity entity)
         => entity.AllAt().Where(n => n.MentionedAllUser()).Any();

diff --git a/SaladimQBot.Core/SaladimQBot.Core.csproj b/SaladimQBot.Core/SaladimQBot.Core.csproj
@@ -8,7 +8,7 @@
 		<Title>SaladimQBot.Core</Title>
 		<Authors>Saplonily</Authors>
 		<PackAsTool>False</PackAsTool>
-		<Version>0.3.1</Version>
+		<Version>0.4.0</Version>
 		<PackageProjectUrl>https://github.com/saladim-org/Saladim.QBot</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/saladim-org/Saladim.QBot</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>

diff --git a/SaladimQBot.Extensions/SaladimQBot.Extensions.csproj b/SaladimQBot.Extensions/SaladimQBot.Extensions.csproj
@@ -5,7 +5,7 @@
 		<LangVersion>preview</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>0.3.1</Version>
+		<Version>0.4.0</Version>
 		<Title>SaladimQBot.Extensions</Title>
 		<Authors>Saplonily</Authors>
 		<Company>Saplonily</Company>

diff --git a/SaladimQBot.GoCqHttp/SaladimQBot.GoCqHttp.csproj b/SaladimQBot.GoCqHttp/SaladimQBot.GoCqHttp.csproj
@@ -8,7 +8,7 @@
 		<Title>SaladimQBot.GoCqHttp</Title>
 		<Authors>Saplonily</Authors>
 		<PackAsTool>False</PackAsTool>
-		<Version>0.3.1</Version>
+		<Version>0.4.0</Version>
 		<PackageProjectUrl>https://github.com/saladim-org/Saladim.QBot</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/saladim-org/Saladim.QBot</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>

diff --git a/SaladimQBot.Shared/SaladimQBot.Shared.csproj b/SaladimQBot.Shared/SaladimQBot.Shared.csproj
@@ -7,7 +7,7 @@
 		<Title>SaladimQBot.Shared</Title>
 		<Authors>Saplonily</Authors>
 		<PackAsTool>False</PackAsTool>
-		<Version>0.3.1</Version>
+		<Version>0.4.0</Version>
 		<PackageProjectUrl>https://github.com/saladim-org/Saladim.QBot</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/saladim-org/Saladim.QBot</RepositoryUrl>
 		<RepositoryType>git</RepositoryType>

diff --git a/SaladimWpf/Properties/PublishProfiles/FolderProfile.pubxml.user b/SaladimWpf/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2023-01-05T07:08:31.6491096Z;False|2023-01-05T15:08:19.9781972+08:00;False|2023-01-05T15:05:41.3082089+08:00;True|2023-01-05T11:17:02.6841461+08:00;True|2023-01-05T11:01:56.5159682+08:00;True|2023-01-05T11:01:16.6067244+08:00;True|2023-01-05T11:00:41.0894016+08:00;True|2023-01-04T21:55:42.5301452+08:00;True|2023-01-04T21:54:10.5989202+08:00;True|2023-01-03T21:30:00.6144582+08:00;True|2023-01-02T20:23:10.2277035+08:00;True|2023-01-02T20:15:03.4479581+08:00;True|2023-01-02T20:14:30.6578219+08:00;True|2023-01-02T20:13:35.9810001+08:00;True|2023-01-02T20:12:49.5190240+08:00;True|2023-01-02T18:41:02.6217807+08:00;True|2023-01-02T18:32:44.8093539+08:00;True|2023-01-02T18:11:08.6941887+08:00;True|2023-01-02T16:33:42.1850536+08:00;True|2023-01-02T16:32:26.4861060+08:00;True|2023-01-02T14:29:37.5313187+08:00;True|2023-01-02T14:29:05.0817055+08:00;True|2023-01-01T11:56:47.6765386+08:00;True|2022-12-31T20:47:29.3442163+08:00;True|2022-12-31T19:53:31.4897608+08:00;True|2022-12-31T19:09:27.5849193+08:00;True|2022-12-31T18:34:51.6835134+08:00;True|2022-12-31T18:33:07.6356083+08:00;True|2022-12-31T18:31:44.3594272+08:00;True|2022-12-31T16:30:33.5907953+08:00;False|2022-12-31T16:29:57.1706009+08:00;True|2022-12-30T22:23:38.8870651+08:00;True|2022-12-30T20:13:20.9119842+08:00;True|2022-12-30T20:08:30.3908541+08:00;True|2022-12-30T16:07:17.2492927+08:00;True|2022-12-30T11:02:36.4689010+08:00;True|2022-12-30T10:05:08.1779874+08:00;True|2022-12-30T10:03:14.7093706+08:00;True|2022-12-29T23:30:06.6475000+08:00;True|2022-12-29T23:26:41.2422368+08:00;True|2022-12-29T23:26:02.2951705+08:00;True|2022-12-29T22:36:46.4297516+08:00;True|2022-12-29T17:08:57.3370321+08:00;True|2022-12-29T17:00:01.7295036+08:00;True|2022-12-28T22:08:08.7670608+08:00;True|2022-12-28T17:27:29.8124543+08:00;True|2022-12-28T16:24:51.9861635+08:00;True|2022-12-28T16:23:44.1004953+08:00;True|2022-12-28T16:21:08.2353403+08:00;True|2022-12-28T16:20:56.6429409+08:00;True|2022-12-23T19:22:48.4392831+08:00;True|2022-12-21T22:23:35.9045939+08:00;True|2022-12-21T22:18:16.0962966+08:00;True|2022-12-21T20:54:02.6827032+08:00;True|2022-12-21T20:52:52.1827338+08:00;True|2022-12-21T20:52:06.8220342+08:00;True|2022-12-21T20:51:17.2555457+08:00;True|2022-12-18T21:48:23.3182037+08:00;False|2022-12-18T21:46:45.4066089+08:00;False|2022-12-18T21:46:32.1453050+08:00;True|2022-12-18T21:45:56.8222951+08:00;True|2022-12-18T19:21:18.8207927+08:00;True|2022-12-17T22:46:09.3784351+08:00;True|2022-12-17T21:59:08.8587742+08:00;True|2022-12-17T20:48:28.8245676+08:00;True|2022-12-17T20:34:01.3071499+08:00;True|2022-12-17T20:32:23.5134227+08:00;True|2022-12-17T18:31:00.3332961+08:00;True|2022-12-17T12:29:27.2257800+08:00;True|2022-12-17T11:06:37.8176899+08:00;True|2022-12-15T08:00:13.6842411+08:00;True|2022-12-13T12:10:12.2530920+08:00;True|2022-12-13T10:10:50.0512184+08:00;True|2022-12-13T10:08:30.0309694+08:00;True|2022-12-13T10:04:52.6876847+08:00;True|2022-12-12T20:14:30.0623921+08:00;True|2022-12-12T20:13:38.1238116+08:00;True|2022-12-12T20:12:07.0936964+08:00;True|2022-12-11T13:10:18.2140245+08:00;True|2022-12-11T13:08:51.2427844+08:00;True|2022-12-10T13:00:16.6605746+08:00;True|2022-12-09T23:07:24.8079525+08:00;True|2022-12-09T19:58:04.0989594+08:00;True|2022-12-09T19:56:42.7195927+08:00;True|2022-12-09T19:53:31.8804030+08:00;True|2022-12-09T19:45:39.8557456+08:00;True|2022-11-29T10:02:12.9644217+08:00;True|2022-11-28T20:07:05.4948835+08:00;True|2022-11-28T20:06:52.1724049+08:00;True|2022-11-28T12:58:30.0455236+08:00;True|2022-11-28T12:56:29.6927989+08:00;True|2022-11-28T12:55:41.4295095+08:00;True|2022-11-28T12:53:49.0933314+08:00;True|2022-11-28T12:51:28.8301278+08:00;True|2022-11-28T12:50:46.0058585+08:00;True|2022-11-28T12:50:01.8716847+08:00;True|2022-11-28T12:49:25.7150025+08:00;</History>
+    <History>True|2023-01-05T08:55:14.3920225Z;True|2023-01-05T15:08:31.6491096+08:00;False|2023-01-05T15:08:19.9781972+08:00;False|2023-01-05T15:05:41.3082089+08:00;True|2023-01-05T11:17:02.6841461+08:00;True|2023-01-05T11:01:56.5159682+08:00;True|2023-01-05T11:01:16.6067244+08:00;True|2023-01-05T11:00:41.0894016+08:00;True|2023-01-04T21:55:42.5301452+08:00;True|2023-01-04T21:54:10.5989202+08:00;True|2023-01-03T21:30:00.6144582+08:00;True|2023-01-02T20:23:10.2277035+08:00;True|2023-01-02T20:15:03.4479581+08:00;True|2023-01-02T20:14:30.6578219+08:00;True|2023-01-02T20:13:35.9810001+08:00;True|2023-01-02T20:12:49.5190240+08:00;True|2023-01-02T18:41:02.6217807+08:00;True|2023-01-02T18:32:44.8093539+08:00;True|2023-01-02T18:11:08.6941887+08:00;True|2023-01-02T16:33:42.1850536+08:00;True|2023-01-02T16:32:26.4861060+08:00;True|2023-01-02T14:29:37.5313187+08:00;True|2023-01-02T14:29:05.0817055+08:00;True|2023-01-01T11:56:47.6765386+08:00;True|2022-12-31T20:47:29.3442163+08:00;True|2022-12-31T19:53:31.4897608+08:00;True|2022-12-31T19:09:27.5849193+08:00;True|2022-12-31T18:34:51.6835134+08:00;True|2022-12-31T18:33:07.6356083+08:00;True|2022-12-31T18:31:44.3594272+08:00;True|2022-12-31T16:30:33.5907953+08:00;False|2022-12-31T16:29:57.1706009+08:00;True|2022-12-30T22:23:38.8870651+08:00;True|2022-12-30T20:13:20.9119842+08:00;True|2022-12-30T20:08:30.3908541+08:00;True|2022-12-30T16:07:17.2492927+08:00;True|2022-12-30T11:02:36.4689010+08:00;True|2022-12-30T10:05:08.1779874+08:00;True|2022-12-30T10:03:14.7093706+08:00;True|2022-12-29T23:30:06.6475000+08:00;True|2022-12-29T23:26:41.2422368+08:00;True|2022-12-29T23:26:02.2951705+08:00;True|2022-12-29T22:36:46.4297516+08:00;True|2022-12-29T17:08:57.3370321+08:00;True|2022-12-29T17:00:01.7295036+08:00;True|2022-12-28T22:08:08.7670608+08:00;True|2022-12-28T17:27:29.8124543+08:00;True|2022-12-28T16:24:51.9861635+08:00;True|2022-12-28T16:23:44.1004953+08:00;True|2022-12-28T16:21:08.2353403+08:00;True|2022-12-28T16:20:56.6429409+08:00;True|2022-12-23T19:22:48.4392831+08:00;True|2022-12-21T22:23:35.9045939+08:00;True|2022-12-21T22:18:16.0962966+08:00;True|2022-12-21T20:54:02.6827032+08:00;True|2022-12-21T20:52:52.1827338+08:00;True|2022-12-21T20:52:06.8220342+08:00;True|2022-12-21T20:51:17.2555457+08:00;True|2022-12-18T21:48:23.3182037+08:00;False|2022-12-18T21:46:45.4066089+08:00;False|2022-12-18T21:46:32.1453050+08:00;True|2022-12-18T21:45:56.8222951+08:00;True|2022-12-18T19:21:18.8207927+08:00;True|2022-12-17T22:46:09.3784351+08:00;True|2022-12-17T21:59:08.8587742+08:00;True|2022-12-17T20:48:28.8245676+08:00;True|2022-12-17T20:34:01.3071499+08:00;True|2022-12-17T20:32:23.5134227+08:00;True|2022-12-17T18:31:00.3332961+08:00;True|2022-12-17T12:29:27.2257800+08:00;True|2022-12-17T11:06:37.8176899+08:00;True|2022-12-15T08:00:13.6842411+08:00;True|2022-12-13T12:10:12.2530920+08:00;True|2022-12-13T10:10:50.0512184+08:00;True|2022-12-13T10:08:30.0309694+08:00;True|2022-12-13T10:04:52.6876847+08:00;True|2022-12-12T20:14:30.0623921+08:00;True|2022-12-12T20:13:38.1238116+08:00;True|2022-12-12T20:12:07.0936964+08:00;True|2022-12-11T13:10:18.2140245+08:00;True|2022-12-11T13:08:51.2427844+08:00;True|2022-12-10T13:00:16.6605746+08:00;True|2022-12-09T23:07:24.8079525+08:00;True|2022-12-09T19:58:04.0989594+08:00;True|2022-12-09T19:56:42.7195927+08:00;True|2022-12-09T19:53:31.8804030+08:00;True|2022-12-09T19:45:39.8557456+08:00;True|2022-11-29T10:02:12.9644217+08:00;True|2022-11-28T20:07:05.4948835+08:00;True|2022-11-28T20:06:52.1724049+08:00;True|2022-11-28T12:58:30.0455236+08:00;True|2022-11-28T12:56:29.6927989+08:00;True|2022-11-28T12:55:41.4295095+08:00;True|2022-11-28T12:53:49.0933314+08:00;True|2022-11-28T12:51:28.8301278+08:00;True|2022-11-28T12:50:46.0058585+08:00;True|2022-11-28T12:50:01.8716847+08:00;True|2022-11-28T12:49:25.7150025+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
diff --git a/SaladimWpf/Services/Auto1A2BService.cs b/SaladimWpf/Services/Auto1A2BService.cs
@@ -25,8 +25,10 @@ public IEnumerator<EventWaiter> Auto1A2BCoroutine(IMessage msg)
         _ = msg.MessageWindow.SendMessageAsync("开始1a2b");
         IGroupMessage announceMessage = null!;
         yield return new MessageWaiter(
-            msg => msg is IGroupMessage groupMessage
-                && groupMessage.MessageEntity.RawString == "1A2B开始啦，来猜结果吧~",
+            msg => msg is IGroupMessage groupMessage && (
+                groupMessage.MessageEntity.RawString == "1A2B开始啦，来猜结果吧~" ||
+                (groupMessage.MessageEntity.MentionedSelf() && groupMessage.MessageEntity.RawString.Contains("1A2B已经开始啦，不能重复开启哦~"))
+                ),
             msg => announceMessage = (IGroupMessage)msg
             );
         IGroupUser game1A2BAnnounceUser = announceMessage.Sender;