From e60c4f170ecc689f997cac79765ce327375c642e Mon Sep 17 00:00:00 2001
From: Menci <mencici@msn.com>
Date: Fri, 17 Jan 2025 17:27:45 +0800
Subject: [PATCH] [-] Revert 'feat: ServerAnnouncement'

This reverts commit 429ae1ead5d17c527d0872dc05c18177b189614b.
---
 AquaMai.Core/Helpers/MessageHelper.cs |   5 +-
 AquaMai.Mods/UX/ServerAnnouncement.cs | 148 --------------------------
 2 files changed, 1 insertion(+), 152 deletions(-)
 delete mode 100644 AquaMai.Mods/UX/ServerAnnouncement.cs

diff --git a/AquaMai.Core/Helpers/MessageHelper.cs b/AquaMai.Core/Helpers/MessageHelper.cs
index 99dd6ecd..b0e6b64f 100644
--- a/AquaMai.Core/Helpers/MessageHelper.cs
+++ b/AquaMai.Core/Helpers/MessageHelper.cs
@@ -3,7 +3,6 @@ using HarmonyLib;
 using Manager;
 using MelonLoader;
 using Process;
-using UnityEngine;
 
 namespace AquaMai.Core.Helpers;
 
@@ -18,7 +17,7 @@ public class MessageHelper
         _genericManager = genericManager;
     }
 
-    public static void ShowMessage(string message, WindowSizeID size = WindowSizeID.Middle, string title = null, Sprite sprite = null)
+    public static void ShowMessage(string message, WindowSizeID size = WindowSizeID.Middle, string title = null)
     {
         if (_genericManager is null)
         {
@@ -35,8 +34,6 @@ public class MessageHelper
             text = message,
             changeSize = true,
             sizeID = size,
-            directSprite = sprite is not null,
-            sprite = sprite,
         });
     }
 }
diff --git a/AquaMai.Mods/UX/ServerAnnouncement.cs b/AquaMai.Mods/UX/ServerAnnouncement.cs
deleted file mode 100644
index ac3aeb01..00000000
--- a/AquaMai.Mods/UX/ServerAnnouncement.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-using System;
-using System.Collections;
-using AquaMai.Config.Attributes;
-using AquaMai.Core.Helpers;
-using AquaMai.Core.Resources;
-using DB;
-using HarmonyLib;
-using JetBrains.Annotations;
-using Manager;
-using Manager.Operation;
-using MelonLoader;
-using Net.Packet;
-using Net.Packet.Helper;
-using Net.VO;
-using Process;
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace AquaMai.Mods.UX;
-
-[ConfigSection(
-    defaultOn: true,
-    en: "Show announcement from server.",
-    zh: "获取和显示来自服务端的公告")]
-public static class ServerAnnouncement
-{
-    [Serializable]
-    private class ServerAnnouncementRequestVO : VOSerializer
-    {
-        public string clientId;
-        public string aquaMaiVersion;
-    }
-
-    [Serializable]
-    private class ServerAnnouncementResponseVO : VOSerializer
-    {
-        [CanBeNull] public string title;
-        [CanBeNull] public string announcement;
-        [CanBeNull] public string imageUrl;
-        public bool showOnIdle;
-        public bool showOnUserLogin;
-    }
-
-    private class PacketGetServerAnnouncement : Packet
-    {
-        private readonly Action<ServerAnnouncementResponseVO> _onDone;
-
-        private readonly Action<PacketStatus> _onError;
-
-        public PacketGetServerAnnouncement(Action<ServerAnnouncementResponseVO> onDone, Action<PacketStatus> onError = null)
-        {
-            _onDone = onDone;
-            _onError = onError;
-            var netQuery = new NetQuery<ServerAnnouncementRequestVO, ServerAnnouncementResponseVO>("GetServerAnnouncementApi");
-            netQuery.Request.clientId = AMDaemon.System.KeychipId.ShortValue;
-            Create(netQuery);
-        }
-
-        public override PacketState Proc()
-        {
-            switch (ProcImpl())
-            {
-                case PacketState.Done:
-                {
-                    var netQuery = Query as NetQuery<ServerAnnouncementRequestVO, ServerAnnouncementResponseVO>;
-                    _onDone(netQuery.Response);
-                    break;
-                }
-                case PacketState.Error:
-                    _onError?.Invoke(Status);
-                    break;
-            }
-
-            return State;
-        }
-    }
-
-    private static ServerAnnouncementResponseVO _announcement;
-    private static Sprite _sprite;
-
-    private class DownloadTexture : MonoBehaviour
-    {
-        private void Start()
-        {
-            StartCoroutine(GetTexture());
-        }
-
-        private IEnumerator GetTexture()
-        {
-            var www = UnityWebRequestTexture.GetTexture(_announcement.imageUrl);
-            yield return www.SendWebRequest();
-
-            if (www.isNetworkError || www.isHttpError)
-            {
-                MelonLogger.Error($"[ServerAnnouncement] Failed to download image: {www.error}");
-            }
-            else
-            {
-                var texture = DownloadHandlerTexture.GetContent(www);
-                _sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f), texture.width / 4f);
-#if DEBUG
-                MelonLogger.Msg($"[ServerAnnouncement] Downloaded image success");
-#endif
-            }
-
-            Destroy(gameObject);
-        }
-    }
-
-
-    [HarmonyPatch(typeof(DataDownloaderMai2), "InitPacketList")]
-    [HarmonyPostfix]
-    private static void GetServerAnnouncement()
-    {
-        if (_announcement is not null) return;
-        PacketHelper.StartPacket(new PacketGetServerAnnouncement(delegate(ServerAnnouncementResponseVO data)
-        {
-            _announcement = data;
-            MelonLogger.Msg($"[ServerAnnouncement] {data.title}: {data.announcement}");
-            if (!string.IsNullOrWhiteSpace(data.imageUrl))
-            {
-                new GameObject("[AquaMai] ServerAnnouncement - DownloadTexture").AddComponent<DownloadTexture>();
-            }
-        }, delegate(PacketStatus status)
-        {
-            // 可能是第三方服务器不支持这个功能，忽略即可
-#if DEBUG
-            MelonLogger.Error($"[ServerAnnouncement] Failed to get server announcement. {status}");
-#endif
-        }));
-    }
-
-    [HarmonyPatch(typeof(AdvertiseProcess), "OnStart")]
-    [HarmonyPostfix]
-    private static void AdvertiseProcessOnStart()
-    {
-        if (!_announcement.showOnIdle) return;
-        MessageHelper.ShowMessage(_announcement.announcement, title: _announcement.title, sprite: _sprite, size: WindowSizeID.LargeVerticalPostImage);
-    }
-
-    [HarmonyPatch(typeof(EntryProcess), "OnStart")]
-    [HarmonyPostfix]
-    private static void EntryProcessOnStart()
-    {
-        if (!_announcement.showOnUserLogin) return;
-        MessageHelper.ShowMessage(_announcement.announcement, title: _announcement.title, sprite: _sprite, size: WindowSizeID.LargeVerticalPostImage);
-    }
-}
\ No newline at end of file