Merge remote-tracking branch 'origin/staging' into production

danielr18 · danielr18 · commit 2d332e06670e · 2024-06-13T05:14:45.000-04:00
diff --git a/functions/package-lock.json b/functions/package-lock.json
diff --git a/functions/package.json b/functions/package.json
@@ -60,12 +60,14 @@
     "firebase-admin": "^11.11.0",
     "firebase-functions": "^4.4.1",
     "fuse.js": "^7.0.0",
+    "get-urls": "^12.1.0",
     "google-auth-library": "^9.0.0",
     "google-libphonenumber": "^3.2.33",
     "json2csv": "^5.0.7",
     "jsonwebtoken": "^9.0.2",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
+    "open-graph-scraper": "^6.5.1",
     "openai": "^4.33.0",
     "p-limit": "3.1.0",
     "pino": "^8.14.1",
diff --git a/functions/src/chat/controllers/sendChatMessage.ts b/functions/src/chat/controllers/sendChatMessage.ts
@@ -1,4 +1,4 @@
-import { InferType, array, object, string } from "yup";
+import { InferType, array, boolean, number, object, string } from "yup";
 import { responseExecutor } from "../../util";
 import { chatService } from "../services";
 import { NextFunction, Request, Response } from "express";
@@ -27,6 +27,23 @@ export const sendChatMessageValidationSchema = object({
   ownerAvatar: link.required(),
   parentId: string().uuid().optional(),
   id: string().uuid().required(),
+  linkPreviews: array(
+    object({
+      hidden: boolean().optional(),
+      title: string().optional(),
+      description: string().optional(),
+      image: object({
+        height: number().optional(),
+        type: string().optional(),
+        url: string().required(),
+        width: number().optional(),
+        alt: string().optional(),
+      }).optional(),
+      url: string().required(),
+    })
+  )
+    .optional()
+    .default(undefined),
 });
 
 export type SendChatMessageValidated = InferType<
diff --git a/functions/src/chat/db/chatMessage/update.ts b/functions/src/chat/db/chatMessage/update.ts
@@ -7,7 +7,7 @@ import { SUBCOLLECTIONS } from "../../../shared/enums";
 export type ChatMessageUpdate = Partial<
   Pick<
     Omit<ChatMessage, keyof BaseEntity>,
-    "text" | "images" | "files" | "editedAt" | "mentions"
+    "text" | "images" | "files" | "editedAt" | "mentions" | "linkPreviews"
   >
 >;
 
diff --git a/functions/src/chat/eventHandlers/onChatMessageCreated.ts b/functions/src/chat/eventHandlers/onChatMessageCreated.ts
@@ -1,9 +1,12 @@
 import { EVENT_TYPES } from "../../shared/enums";
-import { IEvent } from "../../shared/interfaces";
+import { ChatMessage, IEvent } from "../../shared/interfaces";
+import ogs from "open-graph-scraper";
 import { isString } from "lodash";
 import { chatChannelDb } from "../db/chatChannel";
 import { chatMessageDb } from "../db/chatMessage";
 import { updateNewMessageChatChannelUserUniqueStatus } from "../business/newMessageChatChannelUserUniqueStatus";
+import { richTextToPlainText } from "../../discussion/business/discussionMessage/utils/textExtractor";
+import { isDefined } from "../../util";
 
 export const onChatMessageCreated = async (
   event: Omit<IEvent, "type"> & { type: EVENT_TYPES.CHAT_MESSAGE_CREATED }
@@ -17,6 +20,8 @@ export const onChatMessageCreated = async (
       true
     );
 
+    const addLinkPreviewsPromise = addLinkPreviews(chatMessage);
+
     await Promise.all(
       chatChannel.participants.map(async (participant) => {
         if (participant !== chatMessage.ownerId) {
@@ -27,5 +32,48 @@ export const onChatMessageCreated = async (
         }
       })
     );
+    await addLinkPreviewsPromise;
   }
 };
+
+async function addLinkPreviews(message: ChatMessage) {
+  if (message.linkPreviews !== undefined) return;
+  let discussionMessageText: string = message.text ?? "";
+  try {
+    const parsedMessage = JSON.parse(message.text);
+    if (Array.isArray(parsedMessage)) {
+      discussionMessageText = richTextToPlainText(parsedMessage);
+    }
+  } catch {
+    return;
+  }
+
+  const getUrls = (await import("get-urls")).default;
+  const links = getUrls(discussionMessageText);
+  if (links.size === 0) return;
+
+  const linkPreviews = (
+    await Promise.all(
+      Array.from(links).map(async (url) => {
+        try {
+          const { result } = await ogs({ url });
+          return {
+            title: result.ogTitle,
+            description: result.ogDescription,
+            image: result.ogImage?.[0],
+            url,
+          };
+        } catch {
+          return undefined;
+        }
+      })
+    )
+  ).filter(isDefined);
+
+  await chatMessageDb.update(
+    {
+      linkPreviews,
+    },
+    message.id
+  );
+}
diff --git a/functions/src/commons/business/createCommonFeedObject/createMembershipAdmittanceCommonFeedObject.ts b/functions/src/commons/business/createCommonFeedObject/createMembershipAdmittanceCommonFeedObject.ts
@@ -0,0 +1,53 @@
+import { discussionDb } from "../../../discussion/db";
+import { proposalsDb } from "../../../proposals/db/proposals";
+import { EVENT_TYPES } from "../../../shared/enums";
+import { FeedObjectTypes } from "../../../shared/interfaces";
+import { DbOperationConfig, createEvent } from "../../../util/db";
+import { commonFeedDb } from "../../db/commonFeed";
+
+export const createMembershipAdmittanceCommonFeedObject = async (
+  proposalId: string,
+  dbConfig?: DbOperationConfig
+) => {
+  const {
+    data: {
+      args: { proposerId, commonId, images, files },
+    },
+    id,
+    createdAt,
+    discussionId,
+  } = await proposalsDb.get(proposalId, true, dbConfig);
+  const discussion = await discussionDb.getDiscussion(
+    discussionId,
+    true,
+    dbConfig
+  );
+  const feedItem = await commonFeedDb.add(
+    {
+      userId: proposerId,
+      createdAt,
+      data: {
+        type: FeedObjectTypes.Proposal,
+        id,
+        discussionId,
+        hasFiles: !!files?.length,
+        hasImages: !!images?.length,
+      },
+      circleVisibility: discussion.circleVisibilityByCommon?.[commonId] || [],
+    },
+    commonId,
+    dbConfig
+  );
+
+  await createEvent(
+    {
+      type: EVENT_TYPES.NEW_FEED_ITEM_CREATED,
+      userId: proposerId,
+      objectIds: [commonId, feedItem?.id || ""],
+      data: {
+        sourceAction: "create",
+      },
+    },
+    dbConfig
+  );
+};
diff --git a/functions/src/commons/business/createCommonFeedObject/index.ts b/functions/src/commons/business/createCommonFeedObject/index.ts
@@ -6,6 +6,7 @@ import { createCreateCircleCommonFeedObject } from "./createCreateCircleCommonFe
 import { createDeleteCommonCommonFeedObject } from "./createDeleteCommonCommonFeedObject";
 import { createDiscussionCommonFeedObject } from "./createDiscussionCommonFeedObject";
 import { createFundsAllocationCommonFeedObject } from "./createFundsAllocationCommonFeedObject";
+import { createMembershipAdmittanceCommonFeedObject } from "./createMembershipAdmittanceCommonFeedObject";
 import { createPayInCommonFeedObject } from "./createPayInCommonFeedObject";
 import { createProjectCreatedCommonFeedObject } from "./createProjectCreatedCommonFeedObject";
 import { createRemoveCircleCommonFeedObject } from "./createRemoveCircleCommonFeedObject";
@@ -54,6 +55,9 @@ export const createCommonFeedObject = async (
   if (type === EVENT_TYPES.PAYMENT_CONFIRMED)
     return await createPayInCommonFeedObject(objectId, dbConfig);
 
+  if (type === EVENT_TYPES.REQUEST_TO_JOIN_CREATED)
+    return await createMembershipAdmittanceCommonFeedObject(objectId, dbConfig);
+
   if (type === EVENT_TYPES.DISCUSSION_CREATED) {
     const discussion = await discussionDb.getDiscussion(
       objectId,
diff --git a/functions/src/discussion/eventHandlers/onMessageCreated.ts b/functions/src/discussion/eventHandlers/onMessageCreated.ts
@@ -1,4 +1,5 @@
 import OpenAI from "openai";
+import ogs from "open-graph-scraper";
 import { EVENT_TYPES } from "../../shared/enums";
 import {
   Common,
@@ -48,8 +49,48 @@ export const onMessageCreated = async (
   });
 
   await aiReplyPromise;
+  await addLinkPreviews(discussionMessage);
 };
 
+async function addLinkPreviews(message: DiscussionMessage) {
+  if (message.linkPreviews !== undefined) return;
+  let discussionMessageText: string = message.text ?? "";
+  try {
+    const parsedMessage = JSON.parse(message.text);
+    if (Array.isArray(parsedMessage)) {
+      discussionMessageText = richTextToPlainText(parsedMessage);
+    }
+  } catch {
+    return;
+  }
+
+  const getUrls = (await import("get-urls")).default;
+  const links = getUrls(discussionMessageText);
+  if (links.size === 0) return;
+
+  const linkPreviews = (
+    await Promise.all(
+      Array.from(links).map(async (url) => {
+        try {
+          const { result } = await ogs({ url });
+          return {
+            title: result.ogTitle,
+            description: result.ogDescription,
+            image: result.ogImage?.[0],
+            url,
+          };
+        } catch {
+          return undefined;
+        }
+      })
+    )
+  ).filter(isDefined);
+
+  await discussionMessageDb.updateDiscussionMessage(message.id, {
+    linkPreviews,
+  });
+}
+
 async function createAiReply(message: DiscussionMessage) {
   if (
     message.ownerType === DiscussionMessageOwnerType.System ||
diff --git a/functions/src/discussion/services/discussionMessage/create.ts b/functions/src/discussion/services/discussionMessage/create.ts
@@ -31,6 +31,7 @@ export const createDiscussionMessageService = async (
     ownerType: DiscussionMessageOwnerType.User,
     ownerId: user.uid,
     id: payload.id || v4(),
+    linkPreviews: payload.linkPreviews,
   });
 
   return discussionMessage;
diff --git a/functions/src/metadata/index.ts b/functions/src/metadata/index.ts
@@ -1,9 +1,16 @@
 import { env } from "../shared/configs";
-import { commonRouter } from "../util";
+import {
+  CommonError,
+  UnauthorizedError,
+  authenticate,
+  commonRouter,
+  responseExecutor,
+} from "../util";
 import { ENVIRONMENTS } from "../shared/enums";
 import { helper } from "./helper";
 import { addCommonUsers } from "./addCommonUsers";
 import { ExpressAppConfig } from "../shared/interfaces";
+import ogs from "open-graph-scraper";
 
 const metadataRouter = commonRouter();
 
@@ -18,6 +25,41 @@ metadataRouter.get("/headers", async (req, res) => {
   res.send(req.ipAddress);
 });
 
+// Authenticated routes
+metadataRouter.use(authenticate);
+
+metadataRouter.get(
+  "/og-link",
+  async (req, res, next) =>
+    await responseExecutor(
+      async () => {
+        if (!req.user) throw new UnauthorizedError();
+        const url = req.query.url as string;
+        if (!url) {
+          throw new CommonError("URL is required");
+        }
+        try {
+          const { result } = await ogs({ url });
+          return {
+            title: result.ogTitle,
+            description: result.ogDescription,
+            image: result.ogImage?.[0],
+            url,
+          };
+        } catch (error) {
+          logger.error("Failed to fetch link preview", error);
+          throw new CommonError("Failed to fetch link preview");
+        }
+      },
+      {
+        req,
+        res,
+        next,
+        successMessage: "",
+      }
+    )
+);
+
 if (
   env.environment === ENVIRONMENTS.DEV ||
   ENVIRONMENTS.LOCAL ||
diff --git a/functions/src/proposals/services/proposals/createMemberAdmittance.ts b/functions/src/proposals/services/proposals/createMemberAdmittance.ts
@@ -20,6 +20,7 @@ import { createEvent, genericWhere } from "../../../util/db";
 import { governanceDb } from "../../../governance/db";
 import { cardDb } from "../../../payments/db/cards";
 import { db } from "../../../settings";
+import { createCommonFeedObject } from "../../../commons/business/createCommonFeedObject";
 
 export const createMemberAdmittance = async (payload: MemberAdmittanceArgs) => {
   const {
@@ -152,6 +153,13 @@ export const createMemberAdmittance = async (payload: MemberAdmittanceArgs) => {
       type: EVENT_TYPES.REQUEST_TO_JOIN_CREATED,
     });
 
+    if (memberAdmittance.global.votingDuration > 0) {
+      await createCommonFeedObject({
+        type: EVENT_TYPES.REQUEST_TO_JOIN_CREATED,
+        objectId: memberAdmittance.id,
+      });
+    }
+
     if (fromSupportersFlow) {
       await db.collection(COLLECTIONS.SupportersFlowTracker).doc().set({
         memberAdmittaceProposalId: memberAdmittance.id,
diff --git a/functions/src/shared/interfaces/chat/ChatMessage.ts b/functions/src/shared/interfaces/chat/ChatMessage.ts
@@ -14,4 +14,17 @@ export interface ChatMessage extends BaseEntity {
   mentions: string[]; // userIds
   parentId?: string;
   reactionCounts?: Record<string, number>;
+  linkPreviews?: Array<{
+    hidden?: boolean;
+    title?: string;
+    description?: string;
+    image?: {
+      height?: number;
+      type?: string;
+      url: string;
+      width?: number;
+      alt?: string;
+    };
+    url: string;
+  }>;
 }
diff --git a/functions/src/shared/interfaces/discussions/DiscussionMessage.ts b/functions/src/shared/interfaces/discussions/DiscussionMessage.ts
@@ -235,6 +235,20 @@ type BaseDiscussionMessage = BaseEntity & {
 
   files?: Link[];
 
+  linkPreviews?: Array<{
+    hidden?: boolean;
+    title?: string;
+    description?: string;
+    image?: {
+      height?: number;
+      type?: string;
+      url: string;
+      width?: number;
+      alt?: string;
+    };
+    url: string;
+  }>;
+
   /**
    * Collection of user names that are tagged in this message
    */
diff --git a/functions/src/shared/schemas/createDiscussionMessage.ts b/functions/src/shared/schemas/createDiscussionMessage.ts

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import { SUBCOLLECTIONS } from "../../../shared/enums";`
`7`	`7`	`export type ChatMessageUpdate = Partial<`
`8`	`8`	`Pick<`
`9`	`9`	`Omit<ChatMessage, keyof BaseEntity>,`
`10`		`- "text" \| "images" \| "files" \| "editedAt" \| "mentions"`
	`10`	`+ "text" \| "images" \| "files" \| "editedAt" \| "mentions" \| "linkPreviews"`
`11`	`11`	`>`
`12`	`12`	`>;`
`13`	`13`