From 0283eaac2a8e73006c66df3cf5bb9012e37450e5 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 20 Aug 2019 13:52:49 +0200
Subject: Cleanup model types

---
 server/typings/models/account/account-blocklist.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'server/typings/models/account/account-blocklist.ts')

diff --git a/server/typings/models/account/account-blocklist.ts b/server/typings/models/account/account-blocklist.ts
index 6d1771de8..d20d97aa8 100644
--- a/server/typings/models/account/account-blocklist.ts
+++ b/server/typings/models/account/account-blocklist.ts
@@ -2,10 +2,16 @@ import { AccountBlocklistModel } from '../../../models/account/account-blocklist
 import { PickWith } from '../../utils'
 import { MAccountDefault } from './account'
 
+type Use<K extends keyof AccountBlocklistModel, M> = PickWith<AccountBlocklistModel, K, M>
+
+// ############################################################################
+
 export type MAccountBlocklist = Omit<AccountBlocklistModel, 'ByAccount' | 'BlockedAccount'>
 
+// ############################################################################
+
 export type MAccountBlocklistId = Pick<AccountBlocklistModel, 'id'>
 
 export type MAccountBlocklistAccounts = MAccountBlocklist &
-  PickWith<AccountBlocklistModel, 'ByAccount', MAccountDefault> &
-  PickWith<AccountBlocklistModel, 'BlockedAccount', MAccountDefault>
+  Use<'ByAccount', MAccountDefault> &
+  Use<'BlockedAccount', MAccountDefault>
-- 
cgit v1.2.3