Soapbox merge
This commit is contained in:
parent
28598015df
commit
c53e68d890
|
@ -33,5 +33,6 @@ export const fetchAccountFamiliarFollowers = (accountId: string) => (dispatch: A
|
|||
type: FAMILIAR_FOLLOWERS_FETCH_FAIL,
|
||||
id: accountId,
|
||||
error,
|
||||
skipAlert: true,
|
||||
}));
|
||||
};
|
||||
|
|
|
@ -11,6 +11,7 @@ describe('<QuotedStatus />', () => {
|
|||
const account = normalizeAccount({
|
||||
id: '1',
|
||||
acct: 'alex',
|
||||
url: 'https://soapbox.test/users/alex',
|
||||
});
|
||||
|
||||
const status = normalizeStatus({
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
|
||||
|
@ -101,4 +102,4 @@ export {
|
|||
buildGroupTag,
|
||||
buildRelationship,
|
||||
buildStatus,
|
||||
};
|
||||
};
|
||||
|
|
|
@ -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(''),
|
||||
|
@ -154,4 +154,4 @@ const accountSchema = baseAccountSchema.extend({
|
|||
|
||||
type Account = Resolve<z.infer<typeof accountSchema>>;
|
||||
|
||||
export { accountSchema, type Account };
|
||||
export { accountSchema, type Account };
|
||||
|
|
Loading…
Reference in a new issue