Fix quotes in areas (#609)

Co-authored-by: James Berry <[email protected]>
KartulUdus · Nov 11, 2021 · e7f4494 · e7f4494
1 parent 2027ebb
commit e7f4494
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/src/controllers/gym.js b/src/controllers/gym.js
@@ -189,7 +189,7 @@ class Gym extends Controller {
 					tths: data.tth.seconds,
 					now: new Date(),
 					nowISO: new Date().toISOString(),
-					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 				}
 
 				const templateType = 'gym'

diff --git a/src/controllers/monster.js b/src/controllers/monster.js
@@ -606,7 +606,7 @@ class Monster extends Controller {
 					now: new Date(),
 					nowISO: new Date().toISOString(),
 					pvpUserRanking: cares.pvp_ranking_worst === 4096 ? 0 : cares.pvp_ranking_worst,
-					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 					pvpDisplayMaxRank: this.config.pvp.pvpDisplayMaxRank,
 					pvpDisplayGreatMinCP: this.config.pvp.pvpDisplayGreatMinCP,
 					pvpDisplayUltraMinCP: this.config.pvp.pvpDisplayUltraMinCP,

diff --git a/src/controllers/nest.js b/src/controllers/nest.js
@@ -213,7 +213,7 @@ class Nest extends Controller {
 					tths: data.tth.seconds,
 					now: new Date(),
 					nowISO: new Date().toISOString(),
-					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 				}
 
 				const templateType = 'nest'

diff --git a/src/controllers/pokestop.js b/src/controllers/pokestop.js
@@ -266,7 +266,7 @@ class Invasion extends Controller {
 						name: translator.translate(data.genderDataEng.name),
 						emoji: translator.translate(this.emojiLookup.lookup(data.genderDataEng.emoji, platform)),
 					} : { name: '', emoji: '' },
-					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 				}
 
 				const templateType = 'invasion'

diff --git a/src/controllers/pokestop_lure.js b/src/controllers/pokestop_lure.js
@@ -163,7 +163,7 @@ class Lure extends Controller {
 					tths: data.tth.seconds,
 					now: new Date(),
 					nowISO: new Date().toISOString(),
-					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 				}
 
 				const templateType = 'lure'

diff --git a/src/controllers/quest.js b/src/controllers/quest.js
@@ -351,7 +351,7 @@ class Quest extends Controller {
 					confirmedTime: data.disappear_time_verified,
 					now: new Date(),
 					nowISO: new Date().toISOString(),
-					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 				}
 
 				const templateType = 'quest'

diff --git a/src/controllers/raid.js b/src/controllers/raid.js
@@ -314,7 +314,7 @@ class Raid extends Controller {
 						now: new Date(),
 						nowISO: new Date().toISOString(),
 						genderData: { name: translator.translate(data.genderDataEng.name), emoji: translator.translate(this.emojiLookup.lookup(data.genderDataEng.emoji, platform)) },
-						areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+						areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 					}
 
 					const templateType = 'raid'
@@ -412,7 +412,7 @@ class Raid extends Controller {
 					confirmedTime: data.disappear_time_verified,
 					now: new Date(),
 					nowISO: new Date().toISOString(),
-					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 				}
 
 				const templateType = 'egg'

diff --git a/src/controllers/weather.js b/src/controllers/weather.js
@@ -416,7 +416,7 @@ class Weather extends Controller {
 					...data,
 					...geoResult,
 					id: data.s2_cell_id,
-					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name.replace(/'/gi, '')).join(', '),
+					areas: data.matchedAreas.filter((area) => area.displayInMatches).map((area) => area.name).join(', '),
 					now: new Date(),
 					nowISO: new Date().toISOString(),
 				}