Added quick alert button to actor bio.

src/actors.js

@@ -166,6 +166,10 @@ export function curateActor(actor, context = {}) {
 		scenes: actor.scenes,
 		likes: actor.stashed,
 		stashes: context.stashes?.map((stash) => curateStash(stash)) || [],
+		alerts: {
+			only: context.alerts?.filter((alert) => alert.is_only).flatMap((alert) => alert.alert_ids) || [],
+			multi: context.alerts?.filter((alert) => !alert.is_only).flatMap((alert) => alert.alert_ids) || [],
+		},
 		...context.append?.[actor.id],
 	};
 }
@@ -198,7 +202,7 @@ export function sortActorsByGender(actors, context = {}) {
 }
 
 export async function fetchActorsById(actorIds, options = {}, reqUser) {
-	const [actors, profiles, photos, socials, stashes] = await Promise.all([
+	const [actors, profiles, photos, socials, stashes, alerts] = await Promise.all([
 		knex('actors')
 			.select(
 				'actors.*',
@@ -253,11 +257,17 @@ export async function fetchActorsById(actorIds, options = {}, reqUser) {
 				.where('stashes.user_id', reqUser.id)
 				.whereIn('stashes_actors.actor_id', actorIds)
 			: [],
+		reqUser
+			? knex('alerts_users_actors')
+				.where('user_id', reqUser.id)
+				.whereIn('actor_id', actorIds)
+			: [],
 	]);
 
 	if (options.order) {
 		return actors.map((actorEntry) => curateActor(actorEntry, {
 			stashes: stashes.filter((stash) => stash.actor_id === actorEntry.id),
+			alerts: alerts.filter((alert) => alert.actor_id === actorEntry.id),
 			append: options.append,
 		}));
 	}
@@ -272,6 +282,7 @@ export async function fetchActorsById(actorIds, options = {}, reqUser) {
 
 		return curateActor(actor, {
 			stashes: stashes.filter((stash) => stash.actor_id === actor.id),
+			alerts: alerts.filter((alert) => alert.actor_id === actor.id),
 			profiles: profiles.filter((profile) => profile.actor_id === actor.id),
 			photos: photos.filter((photo) => photo.actor_id === actor.id),
 			socials: socials.filter((social) => social.actor_id === actor.id),

src/alerts.js

@@ -120,6 +120,7 @@ export async function createAlert(alert, reqUser) {
 			all_entities: alert.allEntities,
 			all_tags: alert.allTags,
 			all_matches: alert.allMatches,
+			from_preset: alert.preset,
 		})
 		.returning('id');
 
@@ -149,14 +150,43 @@ export async function createAlert(alert, reqUser) {
 		})).slice(0, alert.allEntities ? 1 : Infinity)), // one scene can never match multiple entities in AND mode
 	]);
 
+	await Promise.all([
+		alert.actors?.length > 0 && knex.schema.refreshMaterializedView('alerts_users_actors'),
+		alert.tags?.length > 0 && knex.schema.refreshMaterializedView('alerts_users_tags'),
+		alert.entities?.length > 0 && knex.schema.refreshMaterializedView('alerts_users_entities'),
+	]);
+
 	return alertId;
 }
 
 export async function removeAlert(alertId, reqUser) {
+	const alert = await knex('alerts')
+		.where('alerts.id', alertId)
+		.select(
+			'alerts.id',
+			knex.raw('coalesce(array_agg(distinct alerts_actors.actor_id) filter (where alerts_actors.actor_id is not null), \'{}\') as actor_ids'),
+			knex.raw('coalesce(array_agg(distinct alerts_entities.entity_id) filter (where alerts_entities.entity_id is not null), \'{}\') as entity_ids'),
+			knex.raw('coalesce(array_agg(distinct alerts_tags.tag_id) filter (where alerts_tags.tag_id is not null), \'{}\') as tag_ids'),
+		)
+		.leftJoin('alerts_actors', 'alerts_actors.alert_id', 'alerts.id')
+		.leftJoin('alerts_entities', 'alerts_entities.alert_id', 'alerts.id')
+		.leftJoin('alerts_tags', 'alerts_tags.alert_id', 'alerts.id')
+		.leftJoin('alerts_matches', 'alerts_matches.alert_id', 'alerts.id')
+		.groupBy('alerts.id')
+		.first();
+
+	console.log(alertId, alert);
+
 	await knex('alerts')
 		.where('id', alertId)
 		.where('user_id', reqUser.id)
 		.delete();
+
+	await Promise.all([
+		alert.actor_ids.length > 0 && knex.schema.refreshMaterializedView('alerts_users_actors'),
+		alert.tag_ids.length > 0 && knex.schema.refreshMaterializedView('alerts_users_tags'),
+		alert.entity_ids?.length > 0 && knex.schema.refreshMaterializedView('alerts_users_entities'),
+	]);
 }
 
 export async function fetchUnseenNotificationsCount(reqUser) {

src/web/alerts.js

@@ -20,7 +20,7 @@ export async function createAlertApi(req, res) {
 }
 
 export async function removeAlertApi(req, res) {
-	await removeAlert(req.params.alertId, req.user);
+	await Promise.all(req.params.alertId.split(',').map(async (alertId) => removeAlert(alertId, req.user)));
 
 	res.status(204).send();
 }