graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 04:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor

Browse source
This commit is contained in:
syuilo 2018-04-02 04:48:38 +09:00
parent ec4c6d48c1
commit 86e1ff6a6f
1 changed files with 44 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
src/models/user.ts
View file

@ -39,45 +39,6 @@ export function isValidBirthday(birthday: string): boolean {
return typeof birthday == 'string' && /^([0-9]{4})\-([0-9]{2})-([0-9]{2})$/.test(birthday); return typeof birthday == 'string' && /^([0-9]{4})\-([0-9]{2})-([0-9]{2})$/.test(birthday);
} }
type ILocalAccount = {
keypair: string;
email: string;
links: string[];
password: string;
token: string;
twitter: {
accessToken: string;
accessTokenSecret: string;
userId: string;
screenName: string;
};
line: {
userId: string;
};
profile: {
location: string;
birthday: string; // 'YYYY-MM-DD'
tags: string[];
};
lastUsedAt: Date;
isBot: boolean;
isPro: boolean;
twoFactorSecret: string;
twoFactorEnabled: boolean;
twoFactorTempSecret: string;
clientSettings: any;
settings: any;
};
type IRemoteAccount = {
inbox: string;
uri: string;
publicKey: {
id: string;
publicKeyPem: string;
};
};
type IUserBase = { type IUserBase = {
_id: mongo.ObjectID; _id: mongo.ObjectID;
createdAt: Date; createdAt: Date;
@ -102,8 +63,50 @@ type IUserBase = {
export type IUser = ILocalUser | IRemoteUser; export type IUser = ILocalUser | IRemoteUser;
export interface ILocalUser extends IUserBase { host: null; account: ILocalAccount; } export interface ILocalUser extends IUserBase {
export interface IRemoteUser extends IUserBase { host: string; account: IRemoteAccount; } host: null;
account: {
keypair: string;
email: string;
links: string[];
password: string;
token: string;
twitter: {
accessToken: string;
accessTokenSecret: string;
userId: string;
screenName: string;
};
line: {
userId: string;
};
profile: {
location: string;
birthday: string; // 'YYYY-MM-DD'
tags: string[];
};
lastUsedAt: Date;
isBot: boolean;
isPro: boolean;
twoFactorSecret: string;
twoFactorEnabled: boolean;
twoFactorTempSecret: string;
clientSettings: any;
settings: any;
};
}
export interface IRemoteUser extends IUserBase {
host: string;
account: {
inbox: string;
uri: string;
publicKey: {
id: string;
publicKeyPem: string;
};
};
}
export const isLocalUser = (user: any): user is ILocalUser => export const isLocalUser = (user: any): user is ILocalUser =>
user.host === null; user.host === null;