From 0efc106ea9d155e47b1109173ec4ed8edeae37cc Mon Sep 17 00:00:00 2001
From: FeudeyTF <72273449+FeudeyTF@users.noreply.github.com>
Date: Tue, 30 Sep 2025 03:12:38 +0300
Subject: [PATCH] Newspaper update (#93073)

---
 .../newscaster/newscaster_machine.dm          |  2 +-
 code/game/machinery/newscaster/newspaper.dm   |  3 +-
 tgui/packages/tgui/interfaces/Newspaper.tsx   | 46 ++++++++++---------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm
index 77b9c51d012..bea301dbc64 100644
--- a/code/game/machinery/newscaster/newscaster_machine.dm
+++ b/code/game/machinery/newscaster/newscaster_machine.dm
@@ -781,7 +781,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
 	if(current_channel.receiving_cross_sector)
 		return
 
-	var/temp_message = tgui_input_text(user, "Write your Feed story", "Network Channel Handler", feed_channel_message, max_length = MAX_BROADCAST_LEN, multiline = TRUE)
+	var/temp_message = tgui_input_text(user, "Write your Feed story", "Network Channel Handler", feed_channel_message, max_length = MAX_MESSAGE_LEN, multiline = TRUE)
 	if(length(temp_message) <= 1)
 		return TRUE
 
diff --git a/code/game/machinery/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm
index cc05b578a1e..91f6374ca50 100644
--- a/code/game/machinery/newscaster/newspaper.dm
+++ b/code/game/machinery/newscaster/newspaper.dm
@@ -262,8 +262,7 @@
 		channel_data["channel_messages"] = list()
 		for(var/datum/feed_message/feed_messages as anything in current_channel.messages)
 			if(feed_messages.creation_time > creation_time)
-				data["channel_has_messages"] = FALSE
-				break
+				continue
 			data["channel_has_messages"] = TRUE
 			var/has_image = FALSE
 			if(feed_messages.img)
diff --git a/tgui/packages/tgui/interfaces/Newspaper.tsx b/tgui/packages/tgui/interfaces/Newspaper.tsx
index b92899f5bf2..488675f52f3 100644
--- a/tgui/packages/tgui/interfaces/Newspaper.tsx
+++ b/tgui/packages/tgui/interfaces/Newspaper.tsx
@@ -41,23 +41,6 @@ export const Newspaper = (props) => {
   return (
     <Window width={300} height={400}>
       <Window.Content backgroundColor="#858387" scrollable>
-        {current_page === channels.length + 1 ? (
-          <NewspaperEnding />
-        ) : current_page ? (
-          <NewspaperChannel />
-        ) : (
-          <NewspaperIntro />
-        )}
-        {!!scribble_message && (
-          <Box
-            style={{
-              borderTop: '3px dotted rgba(255, 255, 255, 0.8)',
-              borderBottom: '3px dotted rgba(255, 255, 255, 0.8)',
-            }}
-          >
-            {scribble_message}
-          </Box>
-        )}
         <Section>
           <Button
             icon="arrow-left"
@@ -76,6 +59,23 @@ export const Newspaper = (props) => {
             Next Page
           </Button>
         </Section>
+        {current_page === channels.length + 1 ? (
+          <NewspaperEnding />
+        ) : current_page ? (
+          <NewspaperChannel />
+        ) : (
+          <NewspaperIntro />
+        )}
+        {!!scribble_message && (
+          <Box
+            style={{
+              borderTop: '3px dotted rgba(255, 255, 255, 0.8)',
+              borderBottom: '3px dotted rgba(255, 255, 255, 0.8)',
+            }}
+          >
+            {scribble_message}
+          </Box>
+        )}
       </Window.Content>
     </Window>
   );
@@ -120,8 +120,9 @@ const NewspaperChannel = (props) => {
           <Box fontSize="12px">
             Channel made by: {individual_channel.author_name}
           </Box>
-          {channel_has_messages
-            ? individual_channel.channel_messages.map((message) => (
+          {channel_has_messages ? (
+            <>
+              {individual_channel.channel_messages.map((message) => (
                 <>
                   <Box key={message.message}>
                     <Box
@@ -132,8 +133,11 @@ const NewspaperChannel = (props) => {
                   </Box>
                   <Divider />
                 </>
-              ))
-            : 'No feed stories stem from this channel...'}
+              ))}
+            </>
+          ) : (
+            'No feed stories stem from this channel...'
+          )}
         </Box>
       ))}
     </Section>