feat: Add bluesky support (#2606)

Backend portion for [this PR](dailydotdev/apps#4052) --------- Co-authored-by: Ole-Martin Bratteng <[email protected]>
dailydotdev · Jan 20, 2025 · 9196a52 · 9196a52
1 parent ed76205
commit 9196a52
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 0 deletions.
diff --git a/__tests__/boot.ts b/__tests__/boot.ts
@@ -114,6 +114,7 @@ const LOGGED_IN_BODY = {
     followNotifications: true,
     followingEmail: true,
     isTeamMember: false,
+    bluesky: null,
     roadmap: null,
     threads: null,
     codepen: null,

diff --git a/__tests__/users.ts b/__tests__/users.ts
@@ -79,6 +79,7 @@ import {
   type GQLUserTopReader,
   UploadPreset,
   updateSubscriptionFlags,
+  bskySocialUrlMatch,
 } from '../src/common';
 import { DataSource, In, IsNull } from 'typeorm';
 import createOrGetConnection from '../src/db';
@@ -3669,6 +3670,33 @@ describe('mutation updateUserProfile', () => {
     });
   });
 
+  it('should validate bluesky handle', () => {
+    const valid = [
+      'https://bsky.app/profile/amar.com',
+      'https://bsky.app/profile/amartrebinjac.bsky.social',
+      'bsky.app/profile/user.example.com',
+      'www.bsky.app/profile/test.bsky.social',
+      'amar.com',
+      'amartrebinjac.bsky.social',
+      'user.example.com',
+    ];
+
+    const invalid = [
+      'https://bsky.app/amar.com',
+      'https://bsky.app/amar/',
+      'https://bsky.app/',
+      '#amar.com',
+    ];
+
+    valid.forEach((item) => {
+      expect(bskySocialUrlMatch.test(item)).toBe(true);
+    });
+
+    invalid.forEach((item) => {
+      expect(bskySocialUrlMatch.test(item)).toBe(false);
+    });
+  });
+
   it('should validate roadmap handle', () => {
     const valid = [
       'lee',

diff --git a/src/common/users.ts b/src/common/users.ts
@@ -625,4 +625,7 @@ export const mastodonSocialUrlMatch =
 export const socialUrlMatch =
   /^(?<value>https:\/\/(?:[a-z0-9-]{1,50}\.){0,5}[a-z0-9-]{1,50}\.[a-z]{2,24}\b([-a-zA-Z0-9@:%_+.~#?&\/=]*))$/;
 
+export const bskySocialUrlMatch =
+  /^(?:(?:https:\/\/)?(?:www\.)?bsky\.app\/profile\/)?(?<value>[\w.-]+)(?:\/.*)?$/;
+
 export const portfolioLimit = 500;
diff --git a/src/entity/user/User.ts b/src/entity/user/User.ts
@@ -121,6 +121,10 @@ export class User {
   @Index('users_mastodon_unique', { unique: true })
   mastodon?: string;
 
+  @Column({ length: 100, nullable: true })
+  @Index('users_bluesky_unique', { unique: true })
+  bluesky?: string;
+
   @Column({ type: 'text', nullable: true })
   portfolio?: string;
 

diff --git a/src/entity/user/utils.ts b/src/entity/user/utils.ts
@@ -11,6 +11,7 @@ import { generateTrackingId } from '../../ids';
 import { fallbackImages } from '../../config';
 import { validateAndTransformHandle } from '../../common/handles';
 import {
+  bskySocialUrlMatch,
   codepenSocialUrlMatch,
   DEFAULT_TIMEZONE,
   DEFAULT_WEEK_START,
@@ -352,6 +353,7 @@ export const validateUserUpdate = async (
     ['linkedin', data.linkedin, linkedinSocialUrlMatch],
     ['mastodon', data.mastodon, mastodonSocialUrlMatch],
     ['portfolio', data.portfolio, socialUrlMatch],
+    ['bluesky', data.bluesky, bskySocialUrlMatch],
   ];
 
   try {

diff --git a/src/migration/1737231506705-Users.ts b/src/migration/1737231506705-Users.ts
@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class Users1737231506705 implements MigrationInterface {
+  name = 'Users1737231506705';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user" ADD "bluesky" character varying(100)`,
+    );
+    await queryRunner.query(
+      `CREATE UNIQUE INDEX IF NOT EXISTS "users_bluesky_unique" ON "user" ("bluesky") `,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX IF EXISTS "public"."users_bluesky_unique"`);
+    await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "bluesky"`);
+  }
+}
diff --git a/src/routes/boot.ts b/src/routes/boot.ts
@@ -406,6 +406,7 @@ const getUser = (
       'reputation',
       'bio',
       'twitter',
+      'bluesky',
       'github',
       'portfolio',
       'hashnode',

diff --git a/src/schema/users.ts b/src/schema/users.ts
@@ -125,6 +125,7 @@ export interface GQLUpdateUserInput {
   threads?: string;
   codepen?: string;
   reddit?: string;
+  bluesky?: string;
   stackoverflow?: string;
   youtube?: string;
   linkedin?: string;
@@ -174,6 +175,7 @@ export interface GQLUser {
   cover?: string | null;
   readme?: string;
   readmeHtml?: string;
+  bluesky?: string;
   experienceLevel?: string | null;
   language?: ContentLanguage | null;
   topReader?: GQLUserTopReader;
@@ -362,6 +364,10 @@ export const typeDefs = /* GraphQL */ `
     """
     mastodon: String
     """
+    Bluesky profile of the user
+    """
+    bluesky: String
+    """
     Portfolio URL of the user
     """
     portfolio: String
@@ -472,6 +478,10 @@ export const typeDefs = /* GraphQL */ `
     """
     hashnode: String
     """
+    Bluesky profile of the user
+    """
+    bluesky: String
+    """
     Roadmap profile of the user
     """
     roadmap: String
@@ -1920,6 +1930,7 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
             'stackoverflow',
             'youtube',
             'linkedin',
+            'bluesky',
             'mastodon',
           ];