Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
106 changes: 74 additions & 32 deletions src/renderer/utils/notifications/filters/filter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import type { SettingsState } from '../../../types';
import type { Notification } from '../../../typesGitHub';
import type {
Notification,
StateType,
SubjectUser,
} from '../../../typesGitHub';
import {
filterNotificationByHandle,
hasExcludeHandleFilters,
Expand Down Expand Up @@ -45,37 +49,11 @@ export function filterDetailedNotifications(
let passesFilters = true;

if (settings.detailedNotifications) {
if (userTypeFilter.hasFilters(settings)) {
passesFilters =
passesFilters &&
settings.filterUserTypes.some((userType) =>
userTypeFilter.filterNotification(notification, userType),
);
}

if (hasIncludeHandleFilters(settings)) {
passesFilters =
passesFilters &&
settings.filterIncludeHandles.some((handle) =>
filterNotificationByHandle(notification, handle),
);
}

if (hasExcludeHandleFilters(settings)) {
passesFilters =
passesFilters &&
!settings.filterExcludeHandles.some((handle) =>
filterNotificationByHandle(notification, handle),
);
}

if (stateFilter.hasFilters(settings)) {
passesFilters =
passesFilters &&
settings.filterStates.some((state) =>
stateFilter.filterNotification(notification, state),
);
}
passesFilters =
passesFilters && passesUserFilters(notification, settings);

passesFilters =
passesFilters && passesStateFilter(notification, settings);
}

return passesFilters;
Expand All @@ -92,3 +70,67 @@ export function hasAnyFiltersSet(settings: SettingsState): boolean {
reasonFilter.hasFilters(settings)
);
}

function passesUserFilters(
notification: Notification,
settings: SettingsState,
): boolean {
let passesFilters = true;

if (userTypeFilter.hasFilters(settings)) {
passesFilters =
passesFilters &&
settings.filterUserTypes.some((userType) =>
userTypeFilter.filterNotification(notification, userType),
);
}

if (hasIncludeHandleFilters(settings)) {
passesFilters =
passesFilters &&
settings.filterIncludeHandles.some((handle) =>
filterNotificationByHandle(notification, handle),
);
}

if (hasExcludeHandleFilters(settings)) {
passesFilters =
passesFilters &&
!settings.filterExcludeHandles.some((handle) =>
filterNotificationByHandle(notification, handle),
);
}

return passesFilters;
}

function passesStateFilter(
notification: Notification,
settings: SettingsState,
): boolean {
if (stateFilter.hasFilters(settings)) {
return settings.filterStates.some((state) =>
stateFilter.filterNotification(notification, state),
);
}

return true;
}

export function isStateFilteredOut(
state: StateType,
settings: SettingsState,
): boolean {
const notification = { subject: { state: state } } as Notification;

return !passesStateFilter(notification, settings);
}

export function isUserFilteredOut(
user: SubjectUser,
settings: SettingsState,
): boolean {
const notification = { subject: { user: user } } as Notification;

return !passesUserFilters(notification, settings);
}
5 changes: 4 additions & 1 deletion src/renderer/utils/notifications/notifications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@ export async function enrichNotifications(
let additionalSubjectDetails: GitifySubject = {};

try {
additionalSubjectDetails = await getGitifySubjectDetails(notification);
additionalSubjectDetails = await getGitifySubjectDetails(
notification,
settings,
);
} catch (err) {
logError(
'enrichNotifications',
Expand Down
Loading
Loading