Merge branch 'chore-update-dependencies' of github.com:dailydotdev/da…

…ily-api into chore-update-dependencies

__tests__/workers/cdc/primary.ts

@@ -148,6 +148,7 @@ import {
   SourcePostModerationStatus,
 } from '../../../src/entity/SourcePostModeration';
 import { NotificationType } from '../../../src/notifications/common';
+import type { UserReport } from '../../../src/entity/UserReport';
 
 jest.mock('../../../src/common', () => ({
   ...(jest.requireActual('../../../src/common') as Record<string, unknown>),
@@ -163,6 +164,7 @@ jest.mock('../../../src/common', () => ({
   notifyPostReport: jest.fn(),
   notifySourceReport: jest.fn(),
   notifyCommentReport: jest.fn(),
+  notifyReportUser: jest.fn(),
   notifySourceFeedAdded: jest.fn(),
   notifySourceFeedRemoved: jest.fn(),
   notifySettingsUpdated: jest.fn(),
@@ -1573,6 +1575,28 @@ describe('comment report', () => {
   });
 });
 
+describe('User report', () => {
+  type ObjectType = UserReport;
+  const base: ChangeObject<ObjectType> = {
+    reportedUserId: '2',
+    reason: ReportReason.Harassment,
+    note: 'This guy is very mean',
+  };
+
+  it('should notify on new user report', async () => {
+    const after: ChangeObject<ObjectType> = base;
+    await expectSuccessfulBackground(
+      worker,
+      mockChangeMessage<ObjectType>({
+        after,
+        before: null,
+        op: 'c',
+        table: 'user_report',
+      }),
+    );
+  });
+});
+
 describe('post report', () => {
   type ObjectType = PostReport;
   const base: ChangeObject<ObjectType> = {

seeds/AdvancedSettings.json

@@ -1 +1 @@
-[{"id":1,"title":"Community recommendations","description":"Show posts that are recommended by other community members.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":2,"title":"Tech magazines","description":"Show tech news posts that are not related directly to programming, for example, reports about tech companies, startups, venture capital, and scientific discoveries.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":3,"title":"Newsletters","description":"Show posts that were published on developer newsletters. Such posts usually contain curated lists and opinionated essays.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":4,"title":"Product launches","description":"Show posts that aim to help you discover new product launches or major releases to existing developer tools.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":5,"title":"Showcases","description":"Show posts that aim to showcase a project or other types of code snippets. These posts usually provide a demo-only of the showcased work without broader context around it.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":6,"title":"Non-editorial content","description":"Show user-generated posts that were created on external blogging platforms. Such posts are usually not checked by professional editors for fact accuracy, spelling, grammar, and punctuation.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":7,"title":"Videos","description":"Show video posts on my feed","group":"content_types","defaultEnabledState":true,"options":{"type":"video:youtube"}}]
+[{"id":1,"title":"Community recommendations","description":"Show posts that are recommended by other community members.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":2,"title":"Tech magazines","description":"Show tech news posts that are not related directly to programming, for example, reports about tech companies, startups, venture capital, and scientific discoveries.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":3,"title":"Newsletters","description":"Show posts that were published on developer newsletters. Such posts usually contain curated lists and opinionated essays.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":4,"title":"Product launches","description":"Show posts that aim to help you discover new product launches or major releases to existing developer tools.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":5,"title":"Showcases","description":"Show posts that aim to showcase a project or other types of code snippets. These posts usually provide a demo-only of the showcased work without broader context around it.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":6,"title":"Non-editorial content","description":"Show user-generated posts that were created on external blogging platforms. Such posts are usually not checked by professional editors for fact accuracy, spelling, grammar, and punctuation.","group":"advanced","defaultEnabledState":true,"options":{}},{"id":7,"title":"Videos","description":"Show video posts on my feed","group":"content_types","defaultEnabledState":true,"options":{"type":"video:youtube"}},{"id":8,"title":"Article","description":"Show article posts on my feed","group":"content_types","defaultEnabledState":true,"options":{"type":"article"}},{"id":9,"title":"Share","description":"Show share posts on my feed","group":"content_types","defaultEnabledState":true,"options":{"type":"share"}},{"id":10,"title":"Freeform","description":"Show freeform posts on my feed","group":"content_types","defaultEnabledState":true,"options":{"type":"freeform"}},{"id":11,"title":"Welcome","description":"Show welcome posts on my feed","group":"content_types","defaultEnabledState":true,"options":{"type":"welcome"}},{"id":12,"title":"Collection","description":"Show collection posts on my feed","group":"content_types","defaultEnabledState":true,"options":{"type":"collection"}}]

src/common/reporting.ts

@@ -11,12 +11,14 @@ import {
   ReportEntity,
   ReportReason,
   sourceReportReasonsMap,
+  userReportReasonsMap,
 } from '../entity/common';
 import { ValidationError } from 'apollo-server-errors';
 import { AuthContext } from '../Context';
 import { SourceReport } from '../entity/sources/SourceReport';
 import { ensureSourcePermissions } from '../schema/sources';
 import { CommentReport } from '../entity/CommentReport';
+import { UserReport } from '../entity/UserReport';
 
 interface SaveHiddenPostArgs {
   postId: string;
@@ -156,8 +158,27 @@ export const reportSource = async ({
   });
 };
 
+export const reportUser = async ({
+  ctx,
+  id,
+  reason,
+  comment,
+}: BaseReportArgs) => {
+  if (!userReportReasonsMap.has(reason)) {
+    throw new ValidationError('Reason is invalid');
+  }
+
+  await ctx.getRepository(UserReport).insert({
+    reportedUserId: id,
+    userId: ctx.userId,
+    reason,
+    note: comment,
+  });
+};
+
 export const reportFunctionMap: Record<ReportEntity, ReportFunction> = {
   [ReportEntity.Post]: reportPost,
   [ReportEntity.Comment]: reportComment,
   [ReportEntity.Source]: reportSource,
+  [ReportEntity.User]: reportUser,
 };

src/common/slack.ts

@@ -261,6 +261,37 @@ export const notifyCommentReport = async (
   });
 };
 
+export const notifyReportUser = async (
+  reportedUserId: string,
+  reason: string,
+  note?: string,
+): Promise<void> => {
+  await webhooks.content.send({
+    text: 'A user was just reported!',
+    attachments: [
+      {
+        title: `User profile`,
+        title_link: `https://app.daily.dev/${reportedUserId}`,
+        fields: [
+          {
+            title: 'Reported User',
+            value: reportedUserId,
+          },
+          {
+            title: 'Reason',
+            value: reason,
+          },
+          {
+            title: 'Note',
+            value: note || '',
+          },
+        ],
+        color: '#FF1E1F',
+      },
+    ],
+  });
+};
+
 export const getSlackIntegration = async ({
   id,
   userId,

src/entity/UserReport.ts

@@ -0,0 +1,37 @@
+import {
+  Column,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
+import type { User } from './user';
+import { ReportReason } from './common';
+
+@Entity()
+export class UserReport {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column({ type: 'text' })
+  @Index('IDX_user_report_reported_user_id')
+  reportedUserId: string;
+
+  @Column({ type: 'text' })
+  userId: string;
+
+  @Column({ default: () => 'now()' })
+  createdAt: Date;
+
+  @Column({ length: 36, type: 'varchar' })
+  reason: ReportReason;
+
+  @Column({ type: 'text', nullable: true })
+  note: string;
+
+  @ManyToOne('User', {
+    lazy: true,
+    onDelete: 'CASCADE',
+  })
+  user: Promise<User>;
+}

src/entity/common.ts

@@ -2,6 +2,7 @@ export enum ReportEntity {
   Post = 'post',
   Source = 'source',
   Comment = 'comment',
+  User = 'user',
 }
 
 export enum ReportReason {
@@ -19,6 +20,10 @@ export enum ReportReason {
   Miscategorized = 'MISCATEGORIZED',
   Misinformation = 'MISINFORMATION',
   Illegal = 'ILLEGAL',
+  Inappropriate = 'INAPPROPRIATE',
+  Trolling = 'TROLLING',
+  Impersonation = 'IMPERSONATION',
+  Plagiarism = 'PLAGIARISM',
 }
 
 export const postReportReasonsMap: Map<ReportReason, string> = new Map([
@@ -50,3 +55,16 @@ export const reportCommentReasonsMap: Map<ReportReason, string> = new Map([
   [ReportReason.Misinformation, 'False Information or Misinformation'],
   [ReportReason.Other, 'Other'],
 ]);
+
+export const userReportReasonsMap: Map<ReportReason, string> = new Map([
+  [ReportReason.Inappropriate, 'Inappropriate or NSFW Content'],
+  [ReportReason.Trolling, 'Trolling or Disruptive Behavior'],
+  [ReportReason.Harassment, 'Harassment or Bullying'],
+  [ReportReason.Impersonation, 'Impersonation or False Identity'],
+  [ReportReason.Spam, 'Spam or Unsolicited Advertising'],
+  [ReportReason.Misinformation, 'Misinformation or False Claims'],
+  [ReportReason.Hateful, 'Hate Speech or Discrimination'],
+  [ReportReason.Privacy, 'Privacy or Copyright Violation'],
+  [ReportReason.Plagiarism, 'Plagiarism or Content Theft'],
+  [ReportReason.Other, 'Other'],
+]);

src/migration/1736363898760-UserReport.ts

@@ -0,0 +1,17 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UserReport1736363898760 implements MigrationInterface {
+  name = 'UserReport1736363898760'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`CREATE TABLE IF NOT EXISTS "user_report" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "reportedUserId" text NOT NULL, "userId" character varying NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "reason" character varying(36) NOT NULL, "note" text, CONSTRAINT "PK_58c08f0e20fa66561b119421eb2" PRIMARY KEY ("id"))`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_user_report_reported_user_id" ON "user_report" ("reportedUserId") `);
+    await queryRunner.query(`ALTER TABLE "user_report" ADD CONSTRAINT "FK_cfc9cf9a552e98d6a634377496f" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "user_report" DROP CONSTRAINT "FK_cfc9cf9a552e98d6a634377496f"`);
+    await queryRunner.query(`DROP INDEX IF EXISTS "public"."IDX_user_report_reported_user_id"`);
+    await queryRunner.query(`DROP TABLE IF EXISTS "user_report"`);
+  }
+}

src/workers/cdc/primary.ts

@@ -86,6 +86,7 @@ import {
   notifySourceReport,
   DayOfWeek,
   processApprovedModeratedPost,
+  notifyReportUser,
 } from '../../common';
 import { ChangeMessage, ChangeObject, UserVote } from '../../types';
 import { DataSource, IsNull } from 'typeorm';
@@ -117,6 +118,7 @@ import {
   postReportReasonsMap,
   reportCommentReasonsMap,
   sourceReportReasonsMap,
+  userReportReasonsMap,
 } from '../../entity/common';
 import { utcToZonedTime } from 'date-fns-tz';
 import { SourceReport } from '../../entity/sources/SourceReport';
@@ -125,6 +127,7 @@ import {
   SourcePostModerationStatus,
 } from '../../entity/SourcePostModeration';
 import { cleanupSourcePostModerationNotifications } from '../../notifications/common';
+import { UserReport } from '../../entity/UserReport';
 
 const isFreeformPostLongEnough = (
   freeform: ChangeMessage<FreeformPost>,
@@ -629,6 +632,16 @@ const onPostReportChange = async (
   }
 };
 
+const onUserReportChange = async (data: ChangeMessage<UserReport>) => {
+  if (data.payload.op === 'c') {
+    await notifyReportUser(
+      data.payload.after!.reportedUserId,
+      userReportReasonsMap.get(data.payload.after!.reason)!,
+      data.payload.after!.note,
+    );
+  }
+};
+
 const onCommentReportChange = async (
   con: DataSource,
   logger: FastifyBaseLogger,
@@ -1141,6 +1154,9 @@ const worker: Worker = {
         case getTableName(con, PostReport):
           await onPostReportChange(con, logger, data);
           break;
+        case getTableName(con, UserReport):
+          await onUserReportChange(data);
+          break;
         case getTableName(con, SourceReport):
           await onSourceReportChange(con, logger, data);
           break;