Komodo / komodo-center-sms

Download as
Browse Code ยป

Commit 98fa55b40fa585a1d7502e5752d92533dd8a5448

Authored by Adhidarma Hadiwinoto
1 parent 4acd86be1e
Exists in master

Buang modemSelect.js

Showing 3 changed files with 8 additions and 36 deletions Side-by-side Diff

... ... @@ -0,0 +1,6 @@
  1 +'use strict';
  2 +
  3 +exports.removeSuffixFromNumber = function removeSuffixFromNumber(number, suffix) {
  4 + const re = new RegExp((suffix || '@.*') + '$');
  5 + return number.replace(re, '');
  6 +}
lib/modemSelect.js
View file @ 98fa55b
... ... @@ -1,34 +0,0 @@
1   -"use strict";
2   -
3   -function getModemConfig(modemName, modemsConfig) {
4   - if (!modemsConfig) return;
5   - if (!modemName) return;
6   - if (typeof modemName === 'string' && !modemName.trim()) return;
7   -
8   - return modemsConfig[modemName.trim()];
9   -}
10   -
11   -function getModemUrl(modemName, modemsConfig) {
12   - const modemConfig = getModemConfig(modemName, modemsConfig);
13   - return modemConfig ? modemConfig.url : null;
14   -}
15   -
16   -function getModemApikey(modemName, modemsConfig) {
17   - const modemConfig = getModemConfig(modemName, modemsConfig);
18   - return modemConfig ? modemConfig.apikey : null;
19   -}
20   -
21   -function removeSuffixFromNumber(number, config) {
22   - if (!config) {
23   - config = {};
24   - }
25   -
26   - const suffix = config && config.number_suffix ? config.number_suffix : '@.*';
27   - const re = new RegExp(suffix + '$');
28   - return number.replace(re, '');
29   -}
30   -
31   -exports.getModemConfig = getModemConfig;
32   -exports.getModemUrl = getModemUrl;
33   -exports.getModemApikey = getModemApikey;
34   -exports.removeSuffixFromNumber = removeSuffixFromNumber;
35 0 \ No newline at end of file
... ... @@ -12,7 +12,7 @@ const logger = require('komodo-sdk/logger');
12 12  
13 13 const messagingService = require('komodo-center-messaging-client-lib');
14 14  
15   -const modemSelect = require('./modemSelect');
  15 +const common = require('./common');
16 16 const modems = require('./modems2');
17 17 const partnerLastSeen = require('./partner-last-seen');
18 18 const history = require('./history');
... ... @@ -114,7 +114,7 @@ async function send(partner, msg) {
114 114 msg = msg.trim();
115 115 if (!msg) return;
116 116  
117   - const destinationNumber = modemSelect.removeSuffixFromNumber(partner, config);
  117 + const destinationNumber = common.removeSuffixFromNumber(partner, config.number_suffix);
118 118 const prefixName = await prefixes.lookup(destinationNumber);
119 119 logger.verbose('Destination number prefix lookup', {partner: destinationNumber, prefix: prefixName});
120 120