diff --git a/packages/pl-fe/src/normalizers/account.ts b/packages/pl-fe/src/normalizers/account.ts index 8dea8a83d..874b96696 100644 --- a/packages/pl-fe/src/normalizers/account.ts +++ b/packages/pl-fe/src/normalizers/account.ts @@ -8,9 +8,9 @@ const normalizeAccount = (account: BaseAccount) => { mute_expires_at: null, ...account, avatar: account.avatar || account.avatar_static || missingAvatar, - avatar_static: account.avatar_static || account.avatar || missingAvatar, + avatar_static: account.avatar_static || missingAvatar, header: account.header || account.header_static || missingHeader, - header_static: account.header_static || account.header || missingHeader, + header_static: account.header_static || missingHeader, }; }; diff --git a/packages/pl-fe/src/normalizers/group.ts b/packages/pl-fe/src/normalizers/group.ts index 856cb33b8..473a7cb6b 100644 --- a/packages/pl-fe/src/normalizers/group.ts +++ b/packages/pl-fe/src/normalizers/group.ts @@ -1,27 +1,15 @@ import type { Group as BaseGroup } from 'pl-api'; -const getDomainFromURL = (group: Pick): string => { - try { - const url = group.url; - return new URL(url).host; - } catch { - return ''; - } -}; - const normalizeGroup = (group: BaseGroup) => { const missingAvatar = require('pl-fe/assets/images/avatar-missing.png'); const missingHeader = require('pl-fe/assets/images/header-missing.png'); - const domain = getDomainFromURL(group); - return { ...group, avatar: group.avatar || group.avatar_static || missingAvatar, - avatar_static: group.avatar_static || group.avatar || missingAvatar, + avatar_static: group.avatar_static || missingAvatar, header: group.header || group.header_static || missingHeader, - header_static: group.header_static || group.header || missingHeader, - domain, + header_static: group.header_static || missingHeader, }; };