From e99b88414675161b5f92360e3c5ed65b35ac52c9 Mon Sep 17 00:00:00 2001 From: Thomas Lynch Date: Sat, 29 Aug 2020 00:51:12 +0000 Subject: [PATCH] Use the proper country codes file in boarsettings --- models/forms/changeboardsettings.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/models/forms/changeboardsettings.js b/models/forms/changeboardsettings.js index 72b9704d..ffe9aacb 100644 --- a/models/forms/changeboardsettings.js +++ b/models/forms/changeboardsettings.js @@ -8,7 +8,8 @@ const { Boards, Posts, Accounts } = require(__dirname+'/../../db/') , { remove } = require('fs-extra') , deletePosts = require(__dirname+'/deletepost.js') , messageHandler = require(__dirname+'/../../helpers/posting/message.js') - , countryCodes = new Set(['??', 'AD','AE','AF','AG','AI','AL','AM','AO','AQ','AR','AS','AT','AU','AW','AX','AZ','BA','BB','BD','BE','BF','BG','BH','BI','BJ','BL','BM','BN','BO','BQ','BR','BS','BT','BV','BW','BY','BZ','CA','CC','CD','CF','CG','CH','CI','CK','CL','CM','CN','CO','CR','CU','CV','CW','CX','CY','CZ','DE','DJ','DK','DM','DO','DZ','EC','EE','EG','EH','ER','ES','ET','FI','FJ','FK','FM','FO','FR','GA','GB','GD','GE','GF','GG','GH','GI','GL','GM','GN','GP','GQ','GR','GS','GT','GU','GW','GY','HK','HM','HN','HR','HT','HU','ID','IE','IL','IM','IN','IO','IQ','IR','IS','IT','JE','JM','JO','JP','KE','KG','KH','KI','KM','KN','KP','KR','KW','KY','KZ','LA','LB','LC','LI','LK','LR','LS','LT','LU','LV','LY','MA','MC','MD','ME','MF','MG','MH','MK','ML','MM','MN','MO','MP','MQ','MR','MS','MT','MU','MV','MW','MX','MY','MZ','NA','NC','NE','NF','NG','NI','NL','NO','NP','NR','NU','NZ','OM','PA','PE','PF','PG','PH','PK','PL','PM','PN','PR','PS','PT','PW','PY','QA','RE','RO','RS','RU','RW','SA','SB','SC','SD','SE','SG','SH','SI','SJ','SK','SL','SM','SN','SO','SR','SS','ST','SV','SX','SY','SZ','TC','TD','TF','TG','TH','TJ','TK','TL','TM','TN','TO','TR','TT','TV','TW','TZ','UA','UG','UM','US','UY','UZ','VA','VC','VE','VG','VI','VN','VU','WF','WS','XK','YE','YT','ZA','ZM','ZW']) + , { countryCodes } = require(__dirname+'/../../helpers/countries.js') + , validCountryCodes = new Set(countryCodes) , trimSetting = (setting, oldSetting) => { return setting && setting.trim().length > 0 ? setting : oldSetting; } @@ -63,7 +64,7 @@ module.exports = async (req, res, next) => { if (req.body.countries) { req.body.countries = [...new Set(req.body.countries)] //prevents submitting multiple of same code, not like it matters, but meh - .filter(code => countryCodes.has(code)) + .filter(code => validCountryCodes.has(code)) .slice(0,250); }