From 714809f52805dabbf3e10b429a600bbfa797879b Mon Sep 17 00:00:00 2001
From: Christian 'ketura' McCarty <hyperlink.teltura@gmail.com>
Date: Fri, 6 Dec 2024 19:08:42 -0600
Subject: [PATCH] Fixed announcements not rendering

---
 .../src/main/web/css/gemp-001/game.css          |  5 +++++
 .../src/main/web/css/gemp-001/hall.css          | 17 +++++++++++++----
 .../js/gemp-022/announcementDeliveryService.js  |  2 +-
 .../lotro/collection/CachedTransferDAO.java     |  7 ++++++-
 .../gempukku/lotro/collection/TransferDAO.java  |  1 +
 .../com/gempukku/lotro/db/DbTransferDAO.java    | 16 ++++++++++++++++
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/game.css b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/game.css
index 8d1155b12..17de559c3 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/game.css
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/game.css
@@ -13,6 +13,11 @@ body {
     color: #A63F03;
 }
 
+.ui-widget-content a:link,
+.msg-content p a:link {
+    color: #BF6B04;
+}
+
 .deckSize {
     display: table-cell;
     text-align: center;
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css
index 3d2512a6e..2374d33f6 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css
@@ -26,7 +26,7 @@ html, body {
 
 
 a:visited {
-	color: #A63F03;
+	color: #BF6B04;
 }
 
 .custom-icon {
@@ -215,8 +215,9 @@ button {
 #buttonsDiv a,
 #motd a,
 #infoButtons a,
-.msg-content p a {
-	color: #BF6B04;
+.msg-content p a,
+#announcement-dialog a {
+	color: #E88104;
 }
 
 #infoButtons {
@@ -827,4 +828,12 @@ table.standings {
 	margin-left: auto;
 	margin-right: auto;
 	padding-bottom: 50px;
-}
\ No newline at end of file
+}
+
+#announcement-dialog img{
+    width:90%;
+    max-width:600px;
+    display: block;
+	  margin-left: auto;
+	  margin-right: auto;
+}
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/announcementDeliveryService.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/announcementDeliveryService.js
index f6265528e..e9fe2583f 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/announcementDeliveryService.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/announcementDeliveryService.js
@@ -31,7 +31,7 @@ function announcementDeliveryService(comm, json) {
 		closeOnEscape:true,
 		close: closeCleanup,
 		resizable:false,
-		width:$(window).width() * 0.9,
+		width:800,
 		height:$(window).height() * 0.9,
 		closeText: ''
 	});
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedTransferDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedTransferDAO.java
index 926704eb9..264aec2e9 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedTransferDAO.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CachedTransferDAO.java
@@ -97,7 +97,12 @@ public class CachedTransferDAO implements TransferDAO, Cached {
 
     @Override
     public DBDefs.Announcement getUndeliveredAnnouncement(Player player) {
-        return _delegate.getUndeliveredAnnouncement(player);
+        return this.getUndeliveredAnnouncement(player, getCurrentAnnouncement());
+    }
+
+    @Override
+    public DBDefs.Announcement getUndeliveredAnnouncement(Player player, DBDefs.Announcement announcement) {
+        return _delegate.getUndeliveredAnnouncement(player, announcement);
     }
 
     @Override
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/TransferDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/TransferDAO.java
index c7d3eba13..1a493a224 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/TransferDAO.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/TransferDAO.java
@@ -18,6 +18,7 @@ public interface TransferDAO {
     int addTransferFrom(String player, String reason, String collectionName, int currency, CardCollection items);
 
     DBDefs.Announcement getUndeliveredAnnouncement(Player player);
+    DBDefs.Announcement getUndeliveredAnnouncement(Player player, DBDefs.Announcement announcement);
     DBDefs.Transfer addAnnouncementEntryForPlayer(DBDefs.Announcement announcement, Player player);
     void dismissAnnouncement(DBDefs.Announcement announcement, Player player);
     void snoozeAnnouncement(DBDefs.Announcement announcement, Player player);
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java
index f3a65db3f..46784b25b 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java
@@ -226,8 +226,24 @@ public class DbTransferDAO implements TransferDAO {
         } catch (Exception ex) {
             throw new RuntimeException("Unable to get undelivered announcement for player", ex);
         }
+    }
 
+    @Override
+    public DBDefs.Announcement getUndeliveredAnnouncement(Player player, DBDefs.Announcement currentAnnouncement) {
+        try {
+            if(currentAnnouncement == null) {
+                currentAnnouncement = getCurrentAnnouncement();
+            }
+            var transferEntry = addAnnouncementEntryForPlayer(currentAnnouncement, player);
 
+            if(transferEntry == null || !transferEntry.notify || DateUtils.Now().isBefore(transferEntry.GetUTCDateRecorded()))
+                return null;
+
+            return currentAnnouncement;
+
+        } catch (Exception ex) {
+            throw new RuntimeException("Unable to get undelivered announcement for player", ex);
+        }
     }
 
     @Override