Merge tag '2023.10.0' into merge-upstream
This commit is contained in:
@@ -3,16 +3,16 @@
|
||||
* SPDX-License-Identifier: AGPL-3.0-only
|
||||
*/
|
||||
|
||||
export function isUserRelated(note: any, userIds: Set<string>): boolean {
|
||||
if (userIds.has(note.userId)) {
|
||||
export function isUserRelated(note: any, userIds: Set<string>, ignoreAuthor = false): boolean {
|
||||
if (userIds.has(note.userId) && !ignoreAuthor) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (note.reply != null && userIds.has(note.reply.userId)) {
|
||||
if (note.reply != null && note.reply.userId !== note.userId && userIds.has(note.reply.userId)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (note.renote != null && userIds.has(note.renote.userId)) {
|
||||
if (note.renote != null && note.renote.userId !== note.userId && userIds.has(note.renote.userId)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@@ -1,9 +1,12 @@
|
||||
export type FetchFunction<K, V> = (key: K) => Promise<V>;
|
||||
|
||||
type ResolveReject<V> = Parameters<ConstructorParameters<typeof Promise<V>>[0]>;
|
||||
|
||||
type ResolverPair<V> = {
|
||||
resolve: ResolveReject<V>[0];
|
||||
reject: ResolveReject<V>[1];
|
||||
};
|
||||
|
||||
export class DebounceLoader<K, V> {
|
||||
private resolverMap = new Map<K, ResolverPair<V>>();
|
||||
private promiseMap = new Map<K, Promise<V>>();
|
||||
|
Reference in New Issue
Block a user