add sunset to prayers

jd1378 · May 10, 2022 · 9d0bf0f · 9d0bf0f
1 parent e2465bb
commit 9d0bf0f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/Adhan.d.ts b/Adhan.d.ts
@@ -7,6 +7,7 @@ export class PrayerTimes {
   sunrise: Date;
   dhuhr: Date;
   asr: Date;
+  sunset: Date;
   maghrib: Date;
   isha: Date;
 
@@ -85,6 +86,7 @@ export interface PrayerAdjustments {
   sunrise: number;
   dhuhr: number;
   asr: number;
+  sunset: number;
   maghrib: number;
   isha: number;
 }
@@ -134,6 +136,7 @@ export enum Prayer {
   Sunrise,
   Dhuhr,
   Asr,
+  Sunset,
   Maghrib,
   Isha,
   None

diff --git a/src/Prayer.js b/src/Prayer.js
@@ -3,6 +3,7 @@ const Prayer = {
     Sunrise: 'sunrise',
     Dhuhr: 'dhuhr',
     Asr: 'asr',
+    Sunset: 'sunset',
     Maghrib: 'maghrib',
     Isha: 'isha',
     None: 'none'

diff --git a/src/PrayerTimes.js b/src/PrayerTimes.js
@@ -120,13 +120,15 @@ export default class PrayerTimes {
         const sunriseAdjustment = (calculationParameters.adjustments.sunrise || 0) + (calculationParameters.methodAdjustments.sunrise || 0);
         const dhuhrAdjustment = (calculationParameters.adjustments.dhuhr || 0) + (calculationParameters.methodAdjustments.dhuhr || 0);
         const asrAdjustment = (calculationParameters.adjustments.asr || 0) + (calculationParameters.methodAdjustments.asr || 0);
+        const sunsetAdjustment = (calculationParameters.adjustments.sunset || 0) + (calculationParameters.methodAdjustments.sunset || 0);
         const maghribAdjustment = (calculationParameters.adjustments.maghrib || 0) + (calculationParameters.methodAdjustments.maghrib || 0);
         const ishaAdjustment = (calculationParameters.adjustments.isha || 0) + (calculationParameters.methodAdjustments.isha || 0);
 
         this.fajr = roundedMinute(dateByAddingMinutes(fajrTime, fajrAdjustment), calculationParameters.rounding);
         this.sunrise = roundedMinute(dateByAddingMinutes(sunriseTime, sunriseAdjustment), calculationParameters.rounding);
         this.dhuhr = roundedMinute(dateByAddingMinutes(dhuhrTime, dhuhrAdjustment), calculationParameters.rounding);
         this.asr = roundedMinute(dateByAddingMinutes(asrTime, asrAdjustment), calculationParameters.rounding);
+        this.sunset = roundedMinute(dateByAddingMinutes(sunsetTime, sunsetAdjustment), calculationParameters.rounding);
         this.maghrib = roundedMinute(dateByAddingMinutes(maghribTime, maghribAdjustment), calculationParameters.rounding);
         this.isha = roundedMinute(dateByAddingMinutes(ishaTime, ishaAdjustment), calculationParameters.rounding);
     }
@@ -144,6 +146,9 @@ export default class PrayerTimes {
         else if (prayer === Prayer.Asr) {
             return this.asr;
         }
+        else if (prayer === Prayer.Sunset) {
+            return this.sunset;
+        }
         else if (prayer === Prayer.Maghrib) {
             return this.maghrib;
         }
@@ -165,6 +170,9 @@ export default class PrayerTimes {
         else if (date >= this.maghrib) {
             return Prayer.Maghrib;
         }
+        else if (date >= this.sunset && this.sunset !== this.maghrib) {
+            return Prayer.Sunset;
+        }
         else if (date >= this.asr) {
             return Prayer.Asr;
         }
@@ -192,9 +200,12 @@ export default class PrayerTimes {
         else if (date >= this.maghrib) {
             return Prayer.Isha;
         }
-        else if (date >= this.asr) {
+        else if (date >= this.sunset) {
             return Prayer.Maghrib;
         }
+        else if (date >= this.asr && this.sunset !== this.maghrib) {
+            return Prayer.Sunset;
+        }
         else if (date >= this.dhuhr) {
             return Prayer.Asr;
         }