teidesu/mtcute
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix(dispatcher): default state for merge

Browse source
This commit is contained in:
teidesu 2021-06-24 01:12:00 +03:00
parent 3c79c56879
commit a2ad4128f1
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages/dispatcher/src/state/update-state.ts
View file

@ -1,5 +1,5 @@
import { IStateStorage } from './storage' import { IStateStorage } from './storage'
import { MtCuteError } from '@mtcute/client' import { MtCuteArgumentError, MtCuteError } from '@mtcute/client'
/** /**
* Error thrown by `.throttle()` * Error thrown by `.throttle()`
@ -125,16 +125,22 @@ export class UpdateState<State, SceneName extends string = string> {
* modifying and then calling `.set()` * modifying and then calling `.set()`
* *
* @param state State to be merged * @param state State to be merged
* @param fallback Default state
* @param ttl TTL for the new state (in seconds) * @param ttl TTL for the new state (in seconds)
* @param forceLoad Whether to force load the old state from storage * @param forceLoad Whether to force load the old state from storage
*/ */
async merge(state: Partial<State>, ttl?: number, forceLoad = false): Promise<void> { async merge(state: Partial<State>, fallback?: State, ttl?: number, forceLoad = false): Promise<State> {
const old = await this.get(forceLoad) const old = await this.get(forceLoad)
if (!old) { if (!old) {
await this.set(state as State, ttl) if (!fallback)
throw new MtCuteArgumentError('Cannot use merge on empty state without fallback.')
await this.set({ ...fallback, ...state }, ttl)
} else { } else {
await this.set({ ...old, ...state }, ttl) await this.set({ ...old, ...state }, ttl)
} }
return this._cached!
} }
/** /**