新人群主群变更

Bleatingsheep.NewHydrant.Bot.Private/Osu/Newbie/HardcodedProvider.cs

@@ -71,22 +71,26 @@ internal class HardcodedProvider : INewbieInfoProvider
             97512825, // a9
         };
 
-        private const long NewbieGroupId = 595985887;
-        private const long NewbieGroup2Id = 928936255;
+        private const long LegacyNewbieGroupId = 595985887; // 即将删除
+        private const long NewbieGroupId = 231094840;
+        private const long AdvancedGroupId = 928936255;
+        private const long HyperGroupId = 281624271;
+        private const long GraveyardGroupId = 293129929;
 
         public static INewbieInfoProvider GetProvider() => new HardcodedProvider();
 
         public string Name => "ignore";
 
         public IEnumerable<long> MonitoredGroups { get; } = new List<long>
         {
+            LegacyNewbieGroupId,
             NewbieGroupId,
-            NewbieGroup2Id,
+            AdvancedGroupId
         }.AsReadOnly();
 
 #pragma warning disable CS1998
         public async Task<bool> ShouldIgnoreAsync(long qq) => IgnoreList.Contains(qq);
-        public async Task<bool> ShouldIgnorePerformanceAsync(long group, long qq) => group == NewbieGroupId ? IgnorePerformanceListBase.Contains(qq) : false;
+        public async Task<bool> ShouldIgnorePerformanceAsync(long group, long qq) => (group == NewbieGroupId || group == LegacyNewbieGroupId) ? IgnorePerformanceListBase.Contains(qq) : false;
 #pragma warning restore CS1998
         public double? PerformanceLimit(long group) => group == NewbieGroupId ? (double?)2500 : null;
     }

Bleatingsheep.NewHydrant.Bot.Private/Osu/Newbie/NotifyOnJoinRequest.cs

@@ -34,7 +34,8 @@ public partial class NotifyOnJoinRequest : Service, IMessageCommand
 #endif
         private static readonly IReadOnlyDictionary<long, double?> ManagedGroups = new Dictionary<long, double?>
         {
-            [595985887] = 2800,
+            [595985887] = 2800, // 即将删除
+            [231094840] = 2800,
             [928936255] = 4300,
             [281624271] = 5800,
             [758120648] = null,

Bleatingsheep.NewHydrant.Bot.Private/Osu/Newbie/统计新人群成员.cs

@@ -29,7 +29,8 @@ public class 统计新人群成员 : Service, IMessageCommand
 
         private static readonly Dictionary<string, (long, int, int)> s_groups = new()
         {
-            { "新人群", (595985887, 3000, 190) },
+            { "旧新人群", (595985887, 3000, 190) },
+            { "新人群", (231094840, 3000, 190) },
             { "进阶群", (928936255, 4500, 280) },
             { "高阶群", (281624271, 6000, 360) },
         };

Bleatingsheep.NewHydrant.Bot.Public/Osu/PerformancePlusUser.cs

@@ -143,7 +143,7 @@ public async Task ProcessAsync(Sisters.WudiLib.Posts.Message message, HttpApiCli
             }
             catch (ExceptionPlus)
             {
-                await api.SendMessageAsync(message.Endpoint, "查询PP+失败。");
+                await api.SendMessageAsync(message.Endpoint, "查询 PP+ 失败。");
                 return;
             }
         }
@@ -165,7 +165,7 @@ public bool ShouldResponse(Sisters.WudiLib.Posts.Message message)
         {
             if (!message.Content.IsPlaintext)
                 return false;
-            if (message is GroupMessage g && g.GroupId == 595985887)
+            if (message is GroupMessage g && (g.GroupId == 595985887 || g.GroupId == 231094840))
                 return false; // ignored in newbie group.
             string text = message.Content.Text.Trim();
             if (text.StartsWith("+", StringComparison.Ordinal))

Bleatingsheep.NewHydrant.Bot.Public/Osu/Plus/PlusPlus.cs

@@ -65,7 +65,7 @@ public async Task ProcessAsync(MessageContext context, HttpApiClient api)
 
         public bool ShouldResponse(MessageContext context)
         {
-            if (context is GroupMessage g && g.GroupId == 595985887)
+            if (context is GroupMessage g && (g.GroupId == 595985887 || g.GroupId == 231094840))
                 return false; // ignored in newbie group.
             return context.Content.TryGetPlainText(out var text) && text == "++";
         }

Bleatingsheep.NewHydrant.Bot.Public/Osu/PpTth2.cs

@@ -123,7 +123,7 @@ await page.SetViewportAsync(new ViewPortOptions
 
         public bool ShouldResponse(MessageContext message)
         {
-            if (message is GroupMessage g && g.GroupId == 595985887)
+            if (message is GroupMessage g && (g.GroupId == 595985887 || g.GroupId == 231094840))
                 return false; // ignored in newbie group.
             if (message.Content.TryGetPlainText(out string text))
             {

Bleatingsheep.NewHydrant.Bot.Public/啥玩意儿啊/Moebooru/AdvancedKonachan.cs

@@ -206,6 +206,6 @@ private async Task<bool> TrySendImage(Endpoint endpoint, HttpApiClient api, int
         private record struct ImageCacheEntry(bool IsSuccess, byte[] Data);
 
         public bool ShouldResponse(MessageContext context)
-            => RegexCommand(s_regex, context.Content) && (!(context is GroupMessage g) || !(g.GroupId == 595985887));
+            => RegexCommand(s_regex, context.Content) && (!(context is GroupMessage g) || !(g.GroupId == 595985887 || g.GroupId == 231094840));
     }
 }