Reapply "Remove emojis from bluesky posts"

This reverts commit 6d6687a.
jdpgrailsdev · Dec 13, 2024 · d6de8bd · d6de8bd
1 parent dba2fc7
commit d6de8bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/autobot/src/intTest/java/com/jdpgrailsdev/oasis/timeline/EndToEndIntegrationTests.java b/autobot/src/intTest/java/com/jdpgrailsdev/oasis/timeline/EndToEndIntegrationTests.java
@@ -169,16 +169,14 @@ void testSchedulingBlueSky() throws IOException {
     assertEquals(4, serveEventList.size(), SIZE_ASSERTION_MESSAGE);
 
     final String record1 =
-        TimelineDataType.RELEASES.getEmoji(false)
-            + " #OnThisDay in 1995, Oasis release '(What's the Story) Morning Glory?', their "
+        "#OnThisDay in 1995, Oasis release '(What's the Story) Morning Glory?', their "
             + "second studio album, on Creation Records.  The album would propel the band to "
             + "a worldwide fame, selling over 12 million copies around the world."
             + "\n\n@creationrecords.bsky.social #OTD #Oasis #TodayInMusic #britpop";
     validateRecord(record1, serveEventList.get(3).getRequest());
 
     final String record2 =
-        TimelineDataType.NOTEWORTHY.getEmoji(false)
-            + " #OnThisDay in 2016, 'Oasis: Supersonic' premieres at the Manchester Odeon "
+        "#OnThisDay in 2016, 'Oasis: Supersonic' premieres at the Manchester Odeon "
             + "Printworks in Manchester, UK.  The event is attended by Liam Gallagher, Paul "
             + "\"Bonehead\" Arthurs and director Mat Whitecross.  Liam, Bonehead and Mat take "
             + "part in a Q&A with the...";
@@ -190,8 +188,7 @@ void testSchedulingBlueSky() throws IOException {
     validateRecord(record3, serveEventList.get(1).getRequest());
 
     final String record4 =
-        TimelineDataType.NOTEWORTHY.getEmoji(true)
-            + " #OnThisDay in 2024, Oasis announces that due to overwhelming demand, additional"
+        "#OnThisDay in 2024, Oasis announces that due to overwhelming demand, additional"
             + " dates have been added to the North American leg of their upcoming \"Live 25\""
             + " world reunion tour. The dates include an extra night in Toronto, New Jersey, Los"
             + " Angeles and Mexico City.\n\n#OTD #Oasis #TodayInMusic #britpop";
@@ -258,8 +255,7 @@ void testSchedulingRecordsExceedingTheLimit() throws IOException {
     assertEquals(3, serveEventList.size(), SIZE_ASSERTION_MESSAGE);
 
     final String record1 =
-        TimelineDataType.RELEASES.getEmoji(false)
-            + " #OnThisDay in 1995, Oasis release 'Some Might Say', the first single from the "
+        "#OnThisDay in 1995, Oasis release 'Some Might Say', the first single from the "
             + "forthcoming album '(What's The Story) Morning Glory?', on Creation Records.  It "
             + "would go on to become Oasis's first number one single and is the last recording "
             + "to feature the...";
@@ -272,8 +268,7 @@ void testSchedulingRecordsExceedingTheLimit() throws IOException {
     validateRecord(record2, serveEventList.get(1).getRequest());
 
     final String record3 =
-        TimelineDataType.VIDEOS.getEmoji(false)
-            + " #OnThisDay in 1995, Oasis release the music video for 'Some Might Say'.  "
+        "#OnThisDay in 1995, Oasis release the music video for 'Some Might Say'.  "
             + "The video is directed by Stuart Fryer."
             + "\n\n#OTD #Oasis #TodayInMusic #britpop";
     validateRecord(record3, serveEventList.get(0).getRequest());
@@ -328,8 +323,7 @@ void testSchedulingRecordsWithMentions() throws IOException {
     assertEquals(5, serveEventList.size(), SIZE_ASSERTION_MESSAGE);
 
     final String record1 =
-        TimelineDataType.NOTEWORTHY.getEmoji(false)
-            + " #OnThisDay in 1994, Noel Gallagher, Liam Gallagher and Paul \"Bonehead\" Arthurs "
+        "#OnThisDay in 1994, Noel Gallagher, Liam Gallagher and Paul \"Bonehead\" Arthurs "
             + "appear on MTV's Most Wanted to promote the release of their upcoming debut album "
             + "'Definitely Maybe' and a live show later that evening at the Astoria Theatre in "
             + "London, UK.  After a short interview with host...";
@@ -344,8 +338,7 @@ void testSchedulingRecordsWithMentions() throws IOException {
     validateRecord(record2, serveEventList.get(3).getRequest());
 
     final String record3 =
-        TimelineDataType.NOTEWORTHY.getEmoji(false)
-            + " #OnThisDay in 1996, Noel Gallagher joins Paul Weller and Jools Holland on "
+        "#OnThisDay in 1996, Noel Gallagher joins Paul Weller and Jools Holland on "
             + "stage at the first V Festival in Hylands Park, Chelmsford, UK to play 'Eye of "
             + "the Storm'.  During the song, Noel asks the crowd to \"show your appreciation\" "
             + "and informs the crowd that \"Alan White's brother\"...";
@@ -359,8 +352,7 @@ void testSchedulingRecordsWithMentions() throws IOException {
     validateRecord(record4, serveEventList.get(1).getRequest());
 
     final String record5 =
-        TimelineDataType.CERTIFICATIONS.getEmoji(true)
-            + " #OnThisDay in 2022, the British Phonographic Industry certifies 'Time Flies"
+        "#OnThisDay in 2022, the British Phonographic Industry certifies 'Time Flies"
             + " 1994-2009' album sales as 5x Platinum.\n"
             + "\n"
             + "#OTD #Oasis #TodayInMusic #britpop";

diff --git a/autobot/src/main/resources/templates/text/bluesky.txt b/autobot/src/main/resources/templates/text/bluesky.txt
@@ -1,3 +1,3 @@
-[(${emoji})] #OnThisDay in [(${year})], [(${description})].[# th:if="${#strings.isEmpty(additionalContext)} == false" ]  [# th:switch="${type}"][# th:case="'recordings'"]This session includes the recording of the following songs: [(${additionalContext})].[/][# th:case="'gigs'"]The setlist includes the following songs: [(${additionalContext})].[/][# th:case="'releases'"]The tracklist includes: [(${additionalContext})].[/][# th:case="'noteworthy'"][(${additionalContext})].[/][/][/]
+#OnThisDay in [(${year})], [(${description})].[# th:if="${#strings.isEmpty(additionalContext)} == false" ]  [# th:switch="${type}"][# th:case="'recordings'"]This session includes the recording of the following songs: [(${additionalContext})].[/][# th:case="'gigs'"]The setlist includes the following songs: [(${additionalContext})].[/][# th:case="'releases'"]The tracklist includes: [(${additionalContext})].[/][# th:case="'noteworthy'"][(${additionalContext})].[/][/][/]
 
 [# th:if="${#strings.isEmpty(mentions)} == false" ][(${mentions})][/][# th:if="${#strings.isEmpty(hashtags)} == false" ][# th:if="${#strings.isEmpty(mentions)} == false" ] [/][(${hashtags})][/]