From 9a80e5bf4e147fc5d4253f9608c4b63ab819938d Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 4 Apr 2020 23:44:37 -0700
Subject: [PATCH] Use areRelated
---
src/endWeek/saServeThePublic.js | 7 +------
src/endWeek/saWhore.js | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index d67fde13d97..db878594dd5 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -552,12 +552,7 @@ window.saServeThePublic = (function saServeThePublic() {
// Someone double check this block
if (V.familyTesting === 1) {
if (totalRelatives(slave) > 0) {
- let children = [];
- children = V.slaves.filter(
- function(s) {
- return ((slave.ID === s.father || slave.ID === s.mother || s.ID === slave.father || s.ID === slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment));
- }
- );
+ let children = V.slaves.filter((s) => areRelated(slave, s) && (s.assignment === slave.assignment));
if (children.length > 2) {
r += ` Since ${his} relatives,`;
sstp = 0;
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 008de40707c..2a087e5757f 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -629,12 +629,7 @@ window.saWhore = (function saWhore() {
if (V.familyTesting === 1) {
if (totalRelatives(slave) > 0) {
- let children = [];
- children = V.slaves.filter(
- function(s) {
- return ((slave.ID === s.father || slave.ID === s.mother || s.ID === slave.father || s.ID === slave.mother || areSisters(slave, s) > 0) && (s.assignment === slave.assignment));
- }
- );
+ let children = V.slaves.filter((s) => areRelated(slave, s) && (s.assignment === slave.assignment));
if (children.length > 2) {
r += ` Since ${his} relatives,`;
SWi = 0;
--
GitLab