Change SystemNotification message type: String -> Markdown

Author: CarsonF

src/common/markdown.scalar.ts

@@ -1,11 +1,9 @@
 import { CustomScalar, Scalar } from '@nestjs/graphql';
 import { GraphQLError, Kind, ValueNode } from 'graphql';
 
-@Scalar('InlineMarkdown')
-export class InlineMarkdownScalar
-  implements CustomScalar<string, string | null>
-{
-  description = 'A string that holds inline Markdown formatted text';
+@Scalar('Markdown')
+export class MarkdownScalar implements CustomScalar<string, string | null> {
+  description = 'A string that holds Markdown formatted text';
 
   parseLiteral(ast: ValueNode): string | null {
     if (ast.kind !== Kind.STRING) {
@@ -22,3 +20,8 @@ export class InlineMarkdownScalar
     return value;
   }
 }
+
+@Scalar('InlineMarkdown')
+export class InlineMarkdownScalar extends MarkdownScalar {
+  description = 'A string that holds inline Markdown formatted text';
+}

src/common/scalars.ts

@@ -3,7 +3,7 @@ import { CustomScalar } from '@nestjs/graphql';
 import { GraphQLScalarType } from 'graphql';
 import UploadScalar from 'graphql-upload/GraphQLUpload.mjs';
 import { DateScalar, DateTimeScalar } from './luxon.graphql';
-import { InlineMarkdownScalar } from './markdown.scalar';
+import { InlineMarkdownScalar, MarkdownScalar } from './markdown.scalar';
 import { RichTextScalar } from './rich-text.scalar';
 import { UrlScalar } from './url.field';
 
@@ -16,5 +16,6 @@ export const getRegisteredScalars = (): Scalar[] => [
   RichTextScalar,
   UploadScalar,
   UrlScalar,
+  MarkdownScalar,
   InlineMarkdownScalar,
 ];

src/components/notification-system/system-notification.dto.ts

@@ -1,6 +1,7 @@
 import { Field, ObjectType } from '@nestjs/graphql';
 import { keys as keysOf } from 'ts-transformer-keys';
 import { SecuredProps } from '~/common';
+import { MarkdownScalar } from '~/common/markdown.scalar';
 import { Notification } from '../notifications';
 
 @ObjectType({
@@ -10,6 +11,6 @@ export class SystemNotification extends Notification {
   static readonly Props = keysOf<SystemNotification>();
   static readonly SecuredProps = keysOf<SecuredProps<SystemNotification>>();
 
-  @Field()
+  @Field(() => MarkdownScalar)
   readonly message: string;
 }

src/components/notification-system/system-notification.resolver.ts

@@ -7,6 +7,7 @@ import {
   Resolver,
 } from '@nestjs/graphql';
 import { ID, LoggedInSession, Session, UnauthorizedException } from '~/common';
+import { MarkdownScalar } from '~/common/markdown.scalar';
 import { isAdmin } from '~/common/session';
 import { NotificationService } from '../notifications';
 import { SystemNotification } from './system-notification.dto';
@@ -26,7 +27,7 @@ export class SystemNotificationResolver {
 
   @Mutation(() => SystemNotificationCreationOutput)
   async createSystemNotification(
-    @Args('message') message: string,
+    @Args({ name: 'message', type: () => MarkdownScalar }) message: string,
     @LoggedInSession() session: Session,
   ): Promise<SystemNotificationCreationOutput> {
     if (!isAdmin(session)) {