Merge branch 'account-url' into 'develop'

Actually, account.url is not optional

See merge request soapbox-pub/soapbox!2604

app/soapbox/components/__tests__/quoted-status.test.tsx

@@ -11,6 +11,7 @@ describe('<QuotedStatus />', () => {
     const account = normalizeAccount({
       id: '1',
       acct: 'alex',
+      url: 'https://soapbox.test/users/alex',
     });
 
     const status = normalizeStatus({

app/soapbox/features/ui/components/__tests__/who-to-follow-panel.test.tsx

@@ -1,201 +0,0 @@
-import React from 'react';
-
-import { __stub } from 'soapbox/api';
-
-import { render, rootState, screen, waitFor } from '../../../../jest/test-helpers';
-import { normalizeInstance } from '../../../../normalizers';
-import WhoToFollowPanel from '../who-to-follow-panel';
-
-const buildTruthSuggestion = (id: string) => ({
-  account_avatar: 'avatar',
-  account_id: id,
-  acct: 'acct',
-  display_name: 'my name',
-  note: 'hello',
-  verified: true,
-});
-
-const buildSuggestion = (id: string) => ({
-  source: 'staff',
-  account: {
-    username: 'username',
-    verified: true,
-    id,
-    acct: 'acct',
-    avatar: 'avatar',
-    avatar_static: 'avatar',
-    display_name: 'my name',
-  },
-});
-
-describe('<WhoToFollow />', () => {
-  let store: any;
-
-  describe('using Truth Social software', () => {
-    beforeEach(() => {
-      store = rootState
-        .set('me', '1234')
-        .set('instance', normalizeInstance({
-          version: '3.4.1 (compatible; TruthSocial 1.0.0)',
-        }));
-    });
-
-    describe('with a single suggestion', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v1/truth/carousels/suggestions')
-            .reply(200, [buildTruthSuggestion('1')], {
-              link: '<https://example.com/api/v1/truth/carousels/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('renders suggested accounts', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.getByTestId('account')).toHaveTextContent(/my name/i);
-        });
-      });
-    });
-
-    describe('with a multiple suggestion', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v1/truth/carousels/suggestions')
-            .reply(200, [buildTruthSuggestion('1'), buildTruthSuggestion('2')], {
-              link: '<https://example.com/api/v1/truth/carousels/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('renders suggested accounts', async () => {
-        render(<WhoToFollowPanel limit={2} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(2);
-        });
-      });
-    });
-
-    describe('with a set limit', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v1/truth/carousels/suggestions')
-            .reply(200, [buildTruthSuggestion('1'), buildTruthSuggestion('2')], {
-              link: '<https://example.com/api/v1/truth/carousels/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('respects the limit prop', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(1);
-        });
-      });
-    });
-
-    describe('when the API returns an empty list', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v1/truth/carousels/suggestions')
-            .reply(200, [], {
-              link: '',
-            });
-        });
-      });
-
-      it('renders empty', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(0);
-        });
-      });
-    });
-  });
-
-  describe('using Pleroma software', () => {
-    beforeEach(() => {
-      store = rootState.set('me', '1234');
-    });
-
-    describe('with a single suggestion', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v2/suggestions')
-            .reply(200, [buildSuggestion('1')], {
-              link: '<https://example.com/api/v2/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('renders suggested accounts', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.getByTestId('account')).toHaveTextContent(/my name/i);
-        });
-      });
-    });
-
-    describe('with a multiple suggestion', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v2/suggestions')
-            .reply(200, [buildSuggestion('1'), buildSuggestion('2')], {
-              link: '<https://example.com/api/v2/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('renders suggested accounts', async () => {
-        render(<WhoToFollowPanel limit={2} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(2);
-        });
-      });
-    });
-
-    describe('with a set limit', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v2/suggestions')
-            .reply(200, [buildSuggestion('1'), buildSuggestion('2')], {
-              link: '<https://example.com/api/v2/suggestions?since_id=1>; rel=\'prev\'',
-            });
-        });
-      });
-
-      it('respects the limit prop', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(1);
-        });
-      });
-    });
-
-    describe('when the API returns an empty list', () => {
-      beforeEach(() => {
-        __stub((mock) => {
-          mock.onGet('/api/v2/suggestions')
-            .reply(200, [], {
-              link: '',
-            });
-        });
-      });
-
-      it('renders empty', async () => {
-        render(<WhoToFollowPanel limit={1} />, undefined, store);
-
-        await waitFor(() => {
-          expect(screen.queryAllByTestId('account')).toHaveLength(0);
-        });
-      });
-    });
-  });
-});

app/soapbox/jest/factory.ts

@@ -30,6 +30,7 @@ import type { PartialDeep } from 'type-fest';
 function buildAccount(props: PartialDeep<Account> = {}): Account {
   return accountSchema.parse(Object.assign({
     id: uuidv4(),
+    url: `https://soapbox.test/users/${uuidv4()}`,
   }, props));
 }
 

app/soapbox/schemas/account.ts

@@ -87,7 +87,7 @@ const baseAccountSchema = z.object({
   statuses_count: z.number().catch(0),
   suspended: z.boolean().catch(false),
   uri: z.string().url().catch(''),
-  url: z.string().url().catch(''),
+  url: z.string().url(),
   username: z.string().catch(''),
   verified: z.boolean().catch(false),
   website: z.string().catch(''),