fix: announcement length/formatting

classes/components/EmbedBase.js

@@ -136,8 +136,7 @@ export class EmbedBase extends MessageEmbed {
 		this.description &&= truncate(this.description.trim(), { length: 4095, omission: '\u2026' });
 		// I'd like to split the embeds before slicing fields, if possible
 		this.fields = this.fields
-			.map((f) => this.splitField(f))
-			.flat()
+			.flatMap((f) => this.splitField(f))
 			.slice(0, 25)
 			.map((f) => ({
 				...f,

classes/services/AnnouncementService.js

@@ -14,6 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { decode } from 'html-entities';
 import { EmbedBase, Firebase, Logger } from '..';
 import bot from '../../bot';
 
@@ -92,10 +93,15 @@ export class AnnouncementService {
 					fields: [
 						{
 							name: 'Message',
-							value: announcement.content
-								.replaceAll('<br>', '\n')
-								.replaceAll('</p><p>', '\n') //this is kinda hacky ngl
-								.replace(/<\/?[^>]+(>|$)/g, ''),
+							value: decode(
+								announcement.content
+									.replaceAll('<br>', '\n')
+									.replaceAll('</p><p>', '\n') //this is kinda hacky ngl
+									.replaceAll('<li>', '\n\t\u2022 ')
+									.replaceAll('</ol>', '\n')
+									.replaceAll('</ul>', '\n')
+									.replace(/<\/?[^>]+(>|$)/g, '')
+							),
 						},
 						//TODO: cleanup dry code
 						...(!!announcement.resources.filter(({ kind }) => kind !== 'URL').length

classes/services/GradeService.js

@@ -14,6 +14,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { decode } from 'html-entities';
 import { round } from 'lodash-es';
 import { EmbedBase, Firebase, Logger } from '..';
 import bot from '../../bot';
@@ -106,10 +107,15 @@ export class GradeService {
 						{
 							name: `Feedback:`,
 							value: !!finalComment?.comment
-								? finalComment.comment
-										.replaceAll('<br>', '\n')
-										.replaceAll('</p><p>', '\n') //this is kinda hacky ngl
-										.replace(/<\/?[^>]+(>|$)/g, '')
+								? decode(
+										finalComment.comment
+											.replaceAll('<br>', '\n')
+											.replaceAll('</p><p>', '\n') //this is kinda hacky ngl
+											.replaceAll('<li>', '\n\t\u2022 ')
+											.replaceAll('</ol>', '\n')
+											.replaceAll('</ul>', '\n')
+											.replace(/<\/?[^>]+(>|$)/g, '')
+								  )
 								: 'None',
 						},
 						...(show_overall_grade

classes/services/InboxMessageService.js

@@ -14,7 +14,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { EmbedBase, Firebase, Logger } from '..';
+import { decode } from 'html-entities';
+import { EmbedBase, Logger } from '..';
 import bot from '../../bot';
 
 export class InboxMessageService {
@@ -79,10 +80,15 @@ export class InboxMessageService {
 			content: `New message received from **${firstName} ${lastName}**:`,
 			embeds: [
 				new EmbedBase({
-					description: inbox_message.content
-						.replaceAll('<br>', '\n')
-						.replaceAll('</p><p>', '\n') //this is kinda hacky ngl
-						.replace(/<\/?[^>]+(>|$)/g, ''),
+					description: decode(
+						inbox_message.content
+							.replaceAll('<br>', '\n')
+							.replaceAll('</p><p>', '\n') //this is kinda hacky ngl
+							.replaceAll('<li>', '\n\t\u2022 ')
+							.replaceAll('</ol>', '\n')
+							.replaceAll('</ul>', '\n')
+							.replace(/<\/?[^>]+(>|$)/g, '')
+					),
 					fields: [
 						...(!!inbox_message.resources.filter(({ kind }) => kind !== 'URL').length
 							? [

package.json

@@ -32,6 +32,7 @@
 		"dotenv": "16.0.3",
 		"firebase-admin": "11.5.0",
 		"graphql-request": "5.1.0",
+		"html-entities": "2.3.3",
 		"klaw": "4.1.0",
 		"lodash-es": "4.17.21",
 		"moment": "2.29.4",