Merge pull request #9251 from hicommonwealth/tim/decode-content-clean-up

libs/model/src/comment/CreateComment.command.ts

@@ -13,7 +13,6 @@ import {
   emitEvent,
   emitMentions,
   parseUserMentions,
-  quillToPlain,
   uniqueMentions,
 } from '../utils';
 import { getCommentDepth } from '../utils/getCommentDepth';
@@ -57,7 +56,6 @@ export function CreateComment(): Command<
       }
 
       const text = decodeContent(payload.text);
-      const plaintext = quillToPlain(text);
       const mentions = uniqueMentions(parseUserMentions(text));
 
       const { contentUrl } = await uploadIfLarge('comments', text);
@@ -71,7 +69,6 @@ export function CreateComment(): Command<
               thread_id,
               parent_id: parent_id ? parent_id.toString() : null, // TODO: change parent_id from string to number
               text,
-              plaintext,
               address_id: address.id!,
               reaction_count: 0,
               reaction_weights_sum: 0,

libs/model/src/comment/UpdateComment.command.ts

@@ -9,7 +9,6 @@ import {
   emitMentions,
   findMentionDiff,
   parseUserMentions,
-  quillToPlain,
   uniqueMentions,
   uploadIfLarge,
 } from '../utils';
@@ -32,7 +31,6 @@ export function UpdateComment(): Command<
 
       if (currentVersion?.text !== payload.text) {
         const text = decodeContent(payload.text);
-        const plaintext = quillToPlain(text);
         const mentions = findMentionDiff(
           parseUserMentions(currentVersion?.text),
           uniqueMentions(parseUserMentions(text)),
@@ -46,7 +44,6 @@ export function UpdateComment(): Command<
             // TODO: text should be set to truncatedBody once client renders content_url
             {
               text,
-              plaintext,
               search: getCommentSearchVector(text),
               content_url: contentUrl,
             },

libs/model/src/globalActivityCache.ts

@@ -29,7 +29,6 @@ export async function getActivityFeed(models: DB, id = 0) {
           json_build_object(
             'id', T.id,
             'body', T.body,
-            'plaintext', T.plaintext,
             'title', T.title,
             'numberOfComments', T.comment_count,
             'created_at', T.created_at,
@@ -63,7 +62,6 @@ export async function getActivityFeed(models: DB, id = 0) {
             'id', C.id,
             'address', A.address,
             'text', C.text,
-            'plainText', C.plainText,
             'created_at', C.created_at::text,
             'updated_at', C.updated_at::text,
             'deleted_at', C.deleted_at::text,

libs/model/src/models/comment.ts

@@ -37,7 +37,6 @@ export default (
       address_id: { type: Sequelize.INTEGER, allowNull: true },
       created_by: { type: Sequelize.STRING, allowNull: true },
       text: { type: Sequelize.TEXT, allowNull: false },
-      plaintext: { type: Sequelize.TEXT, allowNull: true },
 
       // canvas-related columns
       canvas_signed_data: { type: Sequelize.JSONB, allowNull: true },

libs/model/src/models/thread.ts

@@ -26,7 +26,6 @@ export default (
       created_by: { type: Sequelize.STRING, allowNull: true },
       title: { type: Sequelize.TEXT, allowNull: false },
       body: { type: Sequelize.TEXT, allowNull: true },
-      plaintext: { type: Sequelize.TEXT, allowNull: true },
       kind: { type: Sequelize.STRING, allowNull: false },
       stage: {
         type: Sequelize.TEXT,

libs/model/src/tester/e2eSeeds.ts

@@ -198,7 +198,6 @@ export const e2eTestEntities = async function (
                   community_id: 'cmntest',
                   topic_id: -1,
                   kind: 'discussion',
-                  plaintext: 'text',
                   stage: 'discussion',
                   view_count: 0,
                   reaction_count: 0,
@@ -231,7 +230,6 @@ export const e2eTestEntities = async function (
                   community_id: 'cmntest',
                   topic_id: -2,
                   kind: 'discussion',
-                  plaintext: 'text',
                   stage: 'discussion',
                   view_count: 0,
                   reaction_count: 0,
@@ -277,7 +275,6 @@ export const e2eTestEntities = async function (
                   address_id: -1,
                   text: '',
                   thread_id: -1,
-                  plaintext: '',
                   reaction_count: 0,
                   search: getCommentSearchVector(''),
                 },
@@ -300,7 +297,6 @@ export const e2eTestEntities = async function (
                   address_id: -2,
                   text: '',
                   thread_id: -2,
-                  plaintext: '',
                   reaction_count: 0,
                   search: getCommentSearchVector(''),
                 },

libs/model/src/thread/CreateThread.command.ts

@@ -20,7 +20,6 @@ import {
   decodeContent,
   emitMentions,
   parseUserMentions,
-  quillToPlain,
   uniqueMentions,
   uploadIfLarge,
 } from '../utils';
@@ -114,7 +113,6 @@ export function CreateThread(): Command<
       }
 
       const body = decodeContent(payload.body);
-      const plaintext = kind === 'discussion' ? quillToPlain(body) : body;
       const mentions = uniqueMentions(parseUserMentions(body));
 
       const { contentUrl } = await uploadIfLarge('threads', body);
@@ -130,7 +128,6 @@ export function CreateThread(): Command<
               topic_id,
               kind,
               body,
-              plaintext,
               view_count: 0,
               comment_count: 0,
               reaction_count: 0,

libs/model/src/thread/UpdateThread.command.ts

@@ -20,8 +20,6 @@ import {
   emitMentions,
   findMentionDiff,
   parseUserMentions,
-  quillToPlain,
-  sanitizeQuillText,
   uploadIfLarge,
 } from '../utils';
 
@@ -50,7 +48,6 @@ function getContentPatch(
 
   if (typeof body !== 'undefined' && thread.kind === 'discussion') {
     patch.body = decodeContent(body);
-    patch.plaintext = quillToPlain(sanitizeQuillText(body));
   }
 
   typeof url !== 'undefined' && thread.kind === 'link' && (patch.url = url);
@@ -355,7 +352,6 @@ export function UpdateThread(): Command<
                 'id',
                 'address_id',
                 'text',
-                ['plaintext', 'plainText'],
                 'created_at',
                 'updated_at',
                 'deleted_at',

libs/model/test/util-tests/getCommentDepth.spec.ts

@@ -24,10 +24,8 @@ describe('getCommentDepth', () => {
     });
     const thread = await models.Thread.create({
       community_id,
-      // @ts-expect-error StrictNullChecks
-      address_id: address.id,
+      address_id: address!.id!,
       title: 'Testing',
-      plaintext: '',
       kind: 'discussion',
       search: getThreadSearchVector('Testing', ''),
     });

libs/schemas/src/entities/comment.schemas.ts

@@ -17,7 +17,6 @@ export const Comment = z.object({
   thread_id: PG_INT,
   address_id: PG_INT,
   text: z.string(),
-  plaintext: z.string(),
   parent_id: z.string().nullish(),
   content_url: z.string().nullish(),
 

libs/schemas/src/entities/notification.schemas.ts

@@ -84,7 +84,6 @@ export const CommentSubscription = z.object({
     created_at: true,
     updated_at: true,
     text: true,
-    plaintext: true,
   })
     .merge(
       z.object({

libs/schemas/src/entities/thread.schemas.ts

@@ -20,14 +20,13 @@ export const Thread = z.object({
   address_id: PG_INT,
   title: z.string(),
   kind: z.string(),
-  stage: z.string(),
+  stage: z.string().optional(),
   body: z.string().nullish(),
-  plaintext: z.string().nullish(),
   url: z.string().nullish(),
   topic_id: PG_INT.nullish(),
   pinned: z.boolean().nullish(),
   community_id: z.string(),
-  view_count: PG_INT,
+  view_count: PG_INT.optional(),
   links: z.object(linksSchema).array().nullish(),
   content_url: z.string().nullish(),
 
@@ -49,9 +48,9 @@ export const Thread = z.object({
   discord_meta: DiscordMetaSchema.nullish(),
 
   //counts
-  reaction_count: PG_INT,
-  reaction_weights_sum: PG_INT,
-  comment_count: PG_INT,
+  reaction_count: PG_INT.optional(),
+  reaction_weights_sum: PG_INT.optional(),
+  comment_count: PG_INT.optional().optional(),
 
   activity_rank_date: z.coerce.date().nullish(),
 

libs/schemas/src/queries/thread.schemas.ts

@@ -34,7 +34,6 @@ export const BulkThread = z.object({
   collaborators: z.any().array(),
   has_poll: z.boolean().nullable().optional(),
   last_commented_on: z.date().nullable().optional(),
-  plaintext: z.string().nullable().optional(),
   Address: z.object({
     id: PG_INT,
     address: z.string(),

packages/commonwealth/client/scripts/models/Comment.ts

@@ -20,7 +20,6 @@ export class Comment<T extends IUniqueId> {
   public readonly author: string;
   public readonly Address: AddressInfo;
   public readonly text: string;
-  public readonly plaintext: string;
   public reactions: Reaction[];
   public reactionWeightsSum: number;
   public readonly id: number;
@@ -49,7 +48,6 @@ export class Comment<T extends IUniqueId> {
     Address,
     thread_id,
     parent_id,
-    plaintext,
     reactions,
     reaction_weights_sum,
     created_at,
@@ -66,7 +64,6 @@ export class Comment<T extends IUniqueId> {
     this.communityId = community_id;
     this.author = Address?.address || author;
     this.text = deleted_at?.length > 0 ? '[deleted]' : getDecodedString(text);
-    this.plaintext = deleted_at?.length > 0 ? '[deleted]' : plaintext;
     this.versionHistory = versionHistory;
     this.threadId = thread_id;
     this.id = id;

packages/commonwealth/client/scripts/models/Thread.ts

@@ -195,7 +195,6 @@ type RecentComment = {
   id: number;
   address: string;
   text: string;
-  plainText: string;
   created_at: string;
   updated_at: string;
   marked_as_spam_at?: string;
@@ -233,7 +232,6 @@ export class Thread implements IUniqueId {
   public readonly authorCommunity: string;
   public readonly title: string;
   public readonly body: string;
-  public readonly plaintext: string;
   public pinned: boolean;
   public readonly kind: ThreadKind;
   public stage: ThreadStage;
@@ -289,7 +287,6 @@ export class Thread implements IUniqueId {
     community_id,
     read_only,
     body,
-    plaintext,
     url,
     pinned,
     collaborators,
@@ -336,7 +333,6 @@ export class Thread implements IUniqueId {
     links?: Link[];
     canvas_signed_data?: string;
     canvas_msg_id?: string;
-    plaintext?: string;
     collaborators?: any[];
     last_edited: string;
     locked_at: string;
@@ -375,8 +371,6 @@ export class Thread implements IUniqueId {
     this.title = getDecodedString(title);
     // @ts-expect-error StrictNullChecks
     this.body = getDecodedString(body);
-    // @ts-expect-error StrictNullChecks
-    this.plaintext = plaintext;
     this.id = id;
     this.identifier = `${id}`;
     this.createdAt = moment(created_at);
@@ -444,7 +438,6 @@ export class Thread implements IUniqueId {
           author: rc?.address,
           last_edited: rc?.updated_at ? moment(rc.updated_at) : null,
           created_at: rc?.created_at ? moment(rc?.created_at) : null,
-          plaintext: rc?.plainText,
           text: rc?.text,
           Address: {
             user_id: rc?.user_id,

packages/commonwealth/client/scripts/state/api/comments/deleteComment.ts

@@ -35,7 +35,6 @@ const useDeleteCommentMutation = ({
         id: response.comment_id,
         deleted: true,
         text: '[deleted]',
-        plaintext: '[deleted]',
         versionHistory: [],
         canvas_signed_data: response.canvas_signed_data,
         canvas_msg_id: response.canvas_msg_id,

packages/commonwealth/client/scripts/state/api/feeds/util.ts

@@ -7,7 +7,6 @@ type ActivityResponse = {
   thread: {
     id: number;
     body: string;
-    plaintext: string;
     title: string;
     numberOfComments: number;
     created_at: string;
@@ -54,7 +53,6 @@ export function formatActivityResponse(response: AxiosResponse<any, any>) {
         body: x.thread.body,
         discord_meta: x.thread.discord_meta,
         numberOfComments: x.thread.numberOfComments,
-        plaintext: x.thread.plaintext,
         read_only: x.thread.read_only,
         archived_at: x.thread.archived_at,
         // @ts-expect-error <StrictNullChecks/>

packages/commonwealth/client/scripts/views/pages/NotificationSettings/CommentSubscriptionEntry.tsx

@@ -122,7 +122,7 @@ export const CommentSubscriptionEntry = (
 
       <div className="SubscriptionFooter">
         <CWThreadAction
-          label={pluralize(thread.comment_count, 'Comment')}
+          label={pluralize(thread.comment_count!, 'Comment')}
           action="comment"
           onClick={(e) => {
             e.preventDefault();

packages/commonwealth/client/scripts/views/pages/NotificationSettings/ThreadSubscriptionEntry.tsx

@@ -107,7 +107,7 @@ export const ThreadSubscriptionEntry = (
 
       <div className="SubscriptionFooter">
         <CWThreadAction
-          label={pluralize(thread.comment_count, 'Comment')}
+          label={pluralize(thread.comment_count!, 'Comment')}
           action="comment"
           onClick={(e) => {
             e.preventDefault();

packages/commonwealth/client/scripts/views/pages/Snapshots/NewSnapshotProposal/NewSnapshotProposalForm/NewSnapshotProposalForm.tsx

@@ -97,8 +97,8 @@ export const NewSnapshotProposalForm = ({
   useEffect(() => {
     const init = async () => {
       const initialForm: ThreadForm = {
-        name: !thread ? '' : thread.title,
-        body: !thread ? '' : thread.plaintext,
+        name: thread?.title || '',
+        body: thread?.body || '',
         choices: ['Yes', 'No'],
         range: '5d',
         start: new Date().getTime(),
@@ -121,13 +121,10 @@ export const NewSnapshotProposalForm = ({
 
           const linkMarkdown = `${linkText}[here](${linkUrl})`;
 
-          const delta = createDeltaFromText(
-            thread.plaintext + linkMarkdown,
-            true,
-          );
+          const delta = createDeltaFromText(thread.body + linkMarkdown, true);
           setContentDelta(delta);
         } else {
-          const delta = createDeltaFromText(thread.plaintext);
+          const delta = createDeltaFromText(thread.body);
           setContentDelta(delta);
         }
       }