Skip to content

fix: async presence #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacoobes merged 2 commits into from
Oct 6, 2024
Merged

fix: async presence #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
118a8c7
fix: async presence
jacoobes Oct 5, 2024
d779a79
fixes to typings
jacoobes Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/core/presences.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import type { ActivitiesOptions } from "discord.js";
import type { IntoDependencies } from "./ioc";
import type { Emitter } from "./interfaces";
import { Awaitable } from "../types/utility";

type Status = 'online' | 'idle' | 'invisible' | 'dnd'
type PresenceReduce = (previous: Presence.Result) => Presence.Result;


type PresenceReduce = (previous: Presence.Result) => Awaitable<Presence.Result>;

export const Presence = {
/**
Expand Down Expand Up @@ -50,7 +49,7 @@ export const Presence = {
export declare namespace Presence {
export type Config<T extends (keyof Dependencies)[]> = {
inject?: [...T]
execute: (...v: IntoDependencies<T>) => Presence.Result;
execute: (...v: IntoDependencies<T>) => Awaitable<Presence.Result>;

}

Expand All @@ -60,7 +59,7 @@ export declare namespace Presence {
activities?: ActivitiesOptions[];
shardId?: number[];
repeat?: number | [Emitter, string];
onRepeat?: (previous: Result) => Result;
onRepeat?: PresenceReduce
}
}

4 changes: 2 additions & 2 deletions src/handlers/presence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { concatMap, from, interval, of, map, scan, startWith, fromEvent, take } from "rxjs"
import { concatMap, from, interval, of, map, scan, startWith, fromEvent, take, mergeScan } from "rxjs"
import { Presence } from "../core/presences";
import { Services } from "../core/ioc";
import assert from "node:assert";
Expand All @@ -14,7 +14,7 @@ const parseConfig = async (conf: Promise<Presence.Result>) => {
const src$ = typeof repeat === 'number'
? interval(repeat)
: fromEvent(...repeat);
return src$.pipe(scan(onRepeat, s),
return src$.pipe(mergeScan(async (args) => onRepeat(args), s),
startWith(s));
}
return of(s).pipe(take(1));
Expand Down