mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-10 07:03:08 +02:00
fix types
This commit is contained in:
parent
72d4ad4c45
commit
5ec07ede7c
3 changed files with 6 additions and 6 deletions
|
@ -12,7 +12,7 @@ const retryDelay = 100;
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class AppLockService {
|
export class AppLockService {
|
||||||
private lock: (key: string, timeout?: number) => Promise<() => void>;
|
private lock: (key: string, timeout?: number, _?: (() => Promise<void>) | undefined) => Promise<() => void>;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@Inject(DI.redis)
|
@Inject(DI.redis)
|
||||||
|
|
|
@ -22,7 +22,7 @@ type PushNotificationsTypes = {
|
||||||
};
|
};
|
||||||
|
|
||||||
// Reduce length because push message servers have character limits
|
// Reduce length because push message servers have character limits
|
||||||
function truncateBody<T extends keyof pushNotificationsTypes>(type: T, body: pushNotificationsTypes[T]): pushNotificationsTypes[T] {
|
function truncateBody<T extends keyof PushNotificationsTypes>(type: T, body: PushNotificationsTypes[T]): PushNotificationsTypes[T] {
|
||||||
if (typeof body !== 'object') return body;
|
if (typeof body !== 'object') return body;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -37,13 +37,13 @@ export const paramDef = {
|
||||||
properties: {
|
properties: {
|
||||||
username: { type: 'string', nullable: true },
|
username: { type: 'string', nullable: true },
|
||||||
},
|
},
|
||||||
required: ['username']
|
required: ['username'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
properties: {
|
properties: {
|
||||||
host: { type: 'string', nullable: true },
|
host: { type: 'string', nullable: true },
|
||||||
},
|
},
|
||||||
required: ['host']
|
required: ['host'],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
} as const;
|
} as const;
|
||||||
|
@ -68,7 +68,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
||||||
super(meta, paramDef, async (ps, me) => {
|
super(meta, paramDef, async (ps, me) => {
|
||||||
const setUsernameAndHostQuery = (query = this.usersRepository.createQueryBuilder('user')) => {
|
const setUsernameAndHostQuery = (query = this.usersRepository.createQueryBuilder('user')) => {
|
||||||
if (ps.username) {
|
if (ps.username) {
|
||||||
query.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' })
|
query.andWhere('user.usernameLower LIKE :username', { username: sqlLikeEscape(ps.username.toLowerCase()) + '%' });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ps.host) {
|
if (ps.host) {
|
||||||
|
@ -76,7 +76,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
||||||
query.andWhere('user.host IS NULL');
|
query.andWhere('user.host IS NULL');
|
||||||
} else {
|
} else {
|
||||||
query.andWhere('user.host LIKE :host', {
|
query.andWhere('user.host LIKE :host', {
|
||||||
host: sqlLikeEscape(ps.host.toLowerCase()) + '%'
|
host: sqlLikeEscape(ps.host.toLowerCase()) + '%',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue