Merge branch 'master' into feature/hidden_event_achievement

app/Policies/NewsPolicy.php

@@ -17,7 +17,6 @@ public function manage(User $user): bool
     {
         return $user->hasAnyRole([
             Role::ADMINISTRATOR,
-            Role::DEVELOPER,
             Role::EVENT_MANAGER,
             Role::MODERATOR,
             Role::NEWS_MANAGER,
@@ -39,7 +38,6 @@ public function create(User $user): bool
     {
         return $user->hasAnyRole([
             Role::ADMINISTRATOR,
-            Role::DEVELOPER,
             Role::EVENT_MANAGER,
             Role::MODERATOR,
             Role::NEWS_MANAGER,
@@ -51,7 +49,6 @@ public function update(User $user, News $news): bool
     {
         return $user->hasAnyRole([
             Role::ADMINISTRATOR,
-            Role::DEVELOPER,
             Role::EVENT_MANAGER,
             Role::MODERATOR,
             Role::NEWS_MANAGER,
@@ -106,7 +103,6 @@ public function pin(User $user, News $news): bool
     {
         return $user->hasAnyRole([
             Role::ADMINISTRATOR,
-            Role::NEWS_MANAGER,
         ]);
     }
 }

resources/js/features/forums/utils/preProcessShortcodesInBody.test.ts

@@ -83,4 +83,71 @@ describe('Util: preProcessShortcodesInBody', () => {
     // ASSERT
     expect(result).toEqual(input);
   });
+
+  it('normalizes escaped newlines to actual newlines', () => {
+    // ARRANGE
+    const input = 'first line↵\nsecond line';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('first line\nsecond line');
+  });
+
+  it('handles mixed escaped and actual newlines', () => {
+    // ARRANGE
+    const input = 'first line↵\nsecond line\nthird line↵\nfourth line';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('first line\nsecond line\nthird line\nfourth line');
+  });
+
+  it('normalizes line endings when content includes shortcodes', () => {
+    // ARRANGE
+    const input =
+      'Check out https://retroachievements.org/user/ScottAdams↵\nAnd also↵\nhttps://retroachievements.org/game/1234';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('Check out [user=ScottAdams]\nAnd also\n[game=1234]');
+  });
+
+  it('handles carriage returns and different line ending styles', () => {
+    // ARRANGE
+    const input = 'line1\r\nline2\rline3\nline4';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('line1\nline2\nline3\nline4');
+  });
+
+  it('preserves whitespace while normalizing line endings', () => {
+    // ARRANGE
+    const input = '  indented↵\n  still indented  ↵\n\n  more space  ';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('  indented\n  still indented  \n\n  more space  ');
+  });
+
+  it('preserves whitespace while normalizing encoded line endings', () => {
+    // ARRANGE
+    const input = '  indented\u21B5\n  still indented  \u21B5\n\n  more space  ';
+
+    // ACT
+    const result = preProcessShortcodesInBody(input);
+
+    // ASSERT
+    expect(result).toEqual('  indented\n  still indented  \n\n  more space  ');
+  });
 });

resources/js/features/forums/utils/preProcessShortcodesInBody.ts

@@ -30,7 +30,11 @@ const createPatterns = (type: string) => [
 ];
 
 export function preProcessShortcodesInBody(body: string): string {
-  let result = body;
+  // First, normalize any escaped newlines back to actual newlines.
+  let result = body.replace(/\u21B5\n/g, '\n');
+
+  // Then, normalize any remaining line endings.
+  result = result.replace(/\r\n|\r|\n/g, '\n');
 
   for (const { type, shortcode } of shortcodeTypes) {
     const patterns = createPatterns(type);