Implement guild not found message (#381)

Use shared notifier method for guild replies. Don't change to information/member list state until the provider data is different from the cached data
ethanmoffat · Oct 22, 2024 · 206b88f · 206b88f
1 parent 985c8e4
commit 206b88f
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 21 deletions.
diff --git a/EOLib.Localization/DialogResourceID.cs b/EOLib.Localization/DialogResourceID.cs
@@ -99,8 +99,7 @@ public enum DialogResourceID
         GUILD_MEMBER_HAS_BEEN_ACCEPTED = 174,
         GUILD_DOES_NOT_EXIST = 176,
         GUILD_YOU_HAVE_BEEN_ACCEPTED = 178,
-        GUILD_ACCEPTED = 180,
-        GUILD_DETAILS_HAVE_BEEN_UPDATED = 181,
+        GUILD_DETAILS_UPDATED = 180,
         GUILD_PROMPT_DISBAND_GUILD = 182,
         GUILD_REMOVE_MEMBER_WHO = 184,
         GUILD_REMOVE_PLAYER_NOT_MEMBER = 186,

diff --git a/EOLib/Domain/Interact/Guild/GuildSessionRepository.cs b/EOLib/Domain/Interact/Guild/GuildSessionRepository.cs
@@ -16,7 +16,7 @@ public interface IGuildSessionProvider
         IReadOnlyList<GuildMember> GuildMembers { get; }
     }
 
-    public interface IGuildSessionRepository
+    public interface IGuildSessionRepository : IResettable
     {
         int SessionID { get; set; }
 
@@ -41,9 +41,14 @@ public class GuildSessionRepository : IGuildSessionRepository, IGuildSessionProv
         IReadOnlyList<GuildMember> IGuildSessionProvider.GuildMembers => GuildMembers;
 
         public GuildSessionRepository()
+        {
+            ResetState();
+        }
+
+        public void ResetState()
         {
             SessionID = 0;
-            GuildDescription = "";
+            GuildDescription = string.Empty;
             GuildInfo = Option.None<GuildInfo>();
             GuildMembers = new List<GuildMember>();
         }

diff --git a/EOLib/Domain/Notifiers/IGuildNotifier.cs b/EOLib/Domain/Notifiers/IGuildNotifier.cs
@@ -1,19 +1,22 @@
 using AutomaticTypeMapper;
+using Moffat.EndlessOnline.SDK.Protocol.Net.Server;
 
 namespace EOLib.Domain.Notifiers
 {
     public interface IGuildNotifier
     {
         void NotifyGuildCreationRequest(int creatorPlayerID, string guildIdentity);
+
         void NotifyRequestToJoinGuild(int playerId, string name);
-        void NotifyGuildDetailsUpdated();
+
+        void NotifyGuildReply(GuildReply reply);
     }
 
     [AutoMappedType]
     public class NoOpGuildNotifier : IGuildNotifier
     {
         public void NotifyGuildCreationRequest(int creatorPlayerID, string guildIdentity) { }
         public void NotifyRequestToJoinGuild(int playerId, string name) { }
-        public void NotifyGuildDetailsUpdated() { }
+        public void NotifyGuildReply(GuildReply reply) { }
     }
 }
diff --git a/EOLib/PacketHandlers/Guild/GuildOpenHandler.cs b/EOLib/PacketHandlers/Guild/GuildOpenHandler.cs
@@ -3,11 +3,9 @@
 using EOLib.Domain.Interact;
 using EOLib.Domain.Interact.Guild;
 using EOLib.Domain.Login;
-using EOLib.Domain.Map;
 using EOLib.Net.Handlers;
 using Moffat.EndlessOnline.SDK.Protocol.Net;
 using Moffat.EndlessOnline.SDK.Protocol.Net.Server;
-using Optional;
 
 namespace EOLib.PacketHandlers.Guild
 {
@@ -34,6 +32,7 @@ public GuildOpenHandler(IPlayerInfoProvider playerInfoProvider,
 
         public override bool HandlePacket(GuildOpenServerPacket packet)
         {
+            _guildSessionRepository.ResetState();
             _guildSessionRepository.SessionID = packet.SessionId;
 
             foreach (var notifier in _npcInteractionNotifiers)

diff --git a/EOLib/PacketHandlers/Guild/GuildReplyHandler.cs b/EOLib/PacketHandlers/Guild/GuildReplyHandler.cs
@@ -34,8 +34,9 @@ public override bool HandlePacket(GuildReplyServerPacket packet)
                         notifier.NotifyRequestToJoinGuild(joinRequestData.PlayerId, joinRequestData.Name);
                     break;
                 case GuildReply.Updated:
+                case GuildReply.NotFound:
                     foreach (var notifier in _guildNotifiers)
-                        notifier.NotifyGuildDetailsUpdated();
+                        notifier.NotifyGuildReply(packet.ReplyCode);
                     break;
             }
 

diff --git a/EndlessClient/Dialogs/GuildDialog.cs b/EndlessClient/Dialogs/GuildDialog.cs
@@ -167,7 +167,7 @@ protected override void OnUpdateControl(GameTime gameTime)
                     });
                     break;
 
-                case GuildDialogState.Lookup:
+                case GuildDialogState.Information:
                     _cachedGuildInfo.Match(
                         some: cachedGuildInfo =>
                         {
@@ -182,11 +182,10 @@ protected override void OnUpdateControl(GameTime gameTime)
                         },
                         none: () => _guildSessionProvider.GuildInfo.MatchSome(CacheAndSetGuildInfo)
                     );
-                    break;
 
-                case GuildDialogState.ViewMembers:
                     if (!_cachedMembers.SetEquals(_guildSessionProvider.GuildMembers))
                     {
+                        SetState(State.ViewMembers);
                         ClearItemList();
 
                         _cachedMembers = _guildSessionProvider.GuildMembers.ToHashSet();
@@ -202,6 +201,8 @@ protected override void OnUpdateControl(GameTime gameTime)
 
             void CacheAndSetGuildInfo(GuildInfo guildInfo)
             {
+                SetState(State.Information);
+
                 _cachedGuildInfo = Option.Some(guildInfo);
 
                 ClearItemList();
@@ -236,8 +237,6 @@ void CacheAndSetGuildInfo(GuildInfo guildInfo)
         private void GoBack()
         {
             _modifyGuildDescriptionListItem = Option.None<ListDialogItem>();
-            _cachedGuildInfo = Option.None<GuildInfo>();
-            _cachedMembers.Clear();
 
             SetState(_stateStack.Count > 0 ? _stateStack.Pop() : State.Initial, pushState: false);
         }
@@ -356,7 +355,6 @@ void GuildLookup_Click(object sender, MouseEventArgs e)
                     }
                     else
                     {
-                        SetState(State.GuildLookup);
                         _guildActions.Lookup(dlg.ResponseText);
                     }
                 };
@@ -383,7 +381,6 @@ void ViewMembers_Click(object sender, MouseEventArgs e)
                     }
                     else
                     {
-                        SetState(State.ViewMembers);
                         _guildActions.ViewMembers(dlg.ResponseText);
                     }
                 };

diff --git a/EndlessClient/Subscribers/GuildEventSubscriber.cs b/EndlessClient/Subscribers/GuildEventSubscriber.cs
@@ -5,6 +5,7 @@
 using EOLib.Localization;
 using EOLib.Net.Communication;
 using Moffat.EndlessOnline.SDK.Protocol.Net.Client;
+using Moffat.EndlessOnline.SDK.Protocol.Net.Server;
 
 namespace EndlessClient.Subscribers
 {
@@ -80,13 +81,19 @@ public void NotifyRequestToJoinGuild(int playerId, string name)
             dlg.ShowDialog();
         }
 
-        public void NotifyGuildDetailsUpdated()
+        public void NotifyGuildReply(GuildReply reply)
         {
-            var dlg = _messageBoxFactory.CreateMessageBox(_localizedStringFinder.GetString(DialogResourceID.GUILD_DETAILS_HAVE_BEEN_UPDATED),
-                caption: _localizedStringFinder.GetString(DialogResourceID.GUILD_ACCEPTED),
-                whichButtons: Dialogs.EODialogButtons.Ok,
-                style: Dialogs.EOMessageBoxStyle.SmallDialogSmallHeader);
+            var dialogMessage = reply switch
+            {
+                GuildReply.Updated => DialogResourceID.GUILD_DETAILS_UPDATED,
+                GuildReply.NotFound => DialogResourceID.GUILD_DOES_NOT_EXIST,
+                _ => default
+            };
+
+            if (dialogMessage == default)
+                return;
 
+            var dlg = _messageBoxFactory.CreateMessageBox(dialogMessage);
             dlg.ShowDialog();
         }
     }