Merge branch 'main' into eng-696-adding-to-stack-fails-when-stack-has-50-items

Author: rebelchris

__tests__/integrations/feed.ts

@@ -394,10 +394,18 @@ describe('FeedPreferencesConfigGenerator', () => {
         defaultEnabledState: true,
         options: { type: 'news' },
       },
+      {
+        title: 'Social',
+        group: 'content_types',
+        description: '',
+        defaultEnabledState: true,
+        options: { type: PostType.SocialTwitter },
+      },
     ]);
     await con.getRepository(FeedAdvancedSettings).save([
       { feedId: '1', advancedSettingsId: 1, enabled: false },
       { feedId: '1', advancedSettingsId: 2, enabled: true },
+      { feedId: '1', advancedSettingsId: 4, enabled: false },
     ]);
   });
 
@@ -432,7 +440,7 @@ describe('FeedPreferencesConfigGenerator', () => {
         followed_sources: expect.arrayContaining(['c', 'p']),
         followed_user_ids: expect.arrayContaining(['2', '3']),
         allowed_post_types: postTypes.filter(
-          (x) => x !== PostType.VideoYouTube,
+          (x) => x !== PostType.VideoYouTube && x !== PostType.SocialTwitter,
         ),
         feed_config_name: FeedConfigName.Personalise,
         fresh_page_size: '1',

src/migration/1770400000000-SocialContentTypeAdvancedSetting.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class SocialContentTypeAdvancedSetting1770400000000
+  implements MigrationInterface
+{
+  name = 'SocialContentTypeAdvancedSetting1770400000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `INSERT INTO advanced_settings
+        ("title", "description", "group", "options")
+        VALUES
+        ('Social', 'Posts from social platforms, including tweets and threads shared on daily.dev.', 'content_types', '{"type": "social:twitter"}')`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DELETE FROM advanced_settings
+        WHERE "title" = 'Social'
+          AND "group" = 'content_types'
+          AND options->>'type' = 'social:twitter'`,
+    );
+  }
+}