Commit a0f2ed6a5b7c2f9b16ffa2a930aadcfb4f34b1b5

Authored by Adhidarma Hadiwinoto
1 parent 24071b44e8
Exists in master

a little typo in log

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

1 var xmpp = require('simple-xmpp'); 1 var xmpp = require('simple-xmpp');
2 var moment = require('moment'); 2 var moment = require('moment');
3 var MatrixUtil = require('./matrix-util'); 3 var MatrixUtil = require('./matrix-util');
4 4
5 var username; 5 var username;
6 var password; 6 var password;
7 7
8 var callbacks; 8 var callbacks;
9 var matrix; 9 var matrix;
10 var matrixUtil; 10 var matrixUtil;
11 11
12 function onOnline(data) { 12 function onOnline(data) {
13 logger.info('XMPP login successful', {data: data}); 13 logger.info('XMPP login successful', {data: data});
14 14
15 xmpp.getRoster(); 15 xmpp.getRoster();
16 16
17 if (callbacks.onOnline) { 17 if (callbacks.onOnline) {
18 callbacks.onOnline(); 18 callbacks.onOnline();
19 } 19 }
20 } 20 }
21 21
22 function onPM(sender, msg) { 22 function onPM(sender, msg) {
23 if (sender.toLowerCase() == username.replace(/\/.*/, '').toLowerCase()) { 23 if (sender.toLowerCase() == username.replace(/\/.*/, '').toLowerCase()) {
24 return; 24 return;
25 } 25 }
26 26
27 logger.verbose('Got a message', {from: sender, msg: msg}); 27 logger.verbose('Got a message', {from: sender, msg: msg});
28 28
29 if (callbacks.onPM) { 29 if (callbacks.onPM) {
30 callbacks.onPM(sender, msg); 30 callbacks.onPM(sender, msg);
31 } 31 }
32 32
33 matrixUtil.updateLastIncoming(sender, msg); 33 matrixUtil.updateLastIncoming(sender, msg);
34 } 34 }
35 35
36 function onError(err) { 36 function onError(err) {
37 logger.warn('XMPP error, terminating in 3 secs', {err: err}); 37 logger.warn('XMPP error, terminating in 3 secs', {err: err});
38 setTimeout(process.exit, 3000, 1); 38 setTimeout(process.exit, 3000, 1);
39 } 39 }
40 40
41 function onSubscribe(sender) { 41 function onSubscribe(sender) {
42 xmpp.acceptSubscription(sender); 42 xmpp.acceptSubscription(sender);
43 } 43 }
44 44
45 function onUnsubscribe(sender) { 45 function onUnsubscribe(sender) {
46 xmpp.acceptUnsubscription(sender); 46 xmpp.acceptUnsubscription(sender);
47 } 47 }
48 48
49 function onBuddy(jid, state, statusText, resource) { 49 function onBuddy(jid, state, statusText, resource) {
50 matrixUtil.updateBuddyState(jid, state, statusText, resource); 50 matrixUtil.updateBuddyState(jid, state, statusText, resource);
51 } 51 }
52 52
53 function isPartnerOffline(partner) { 53 function isPartnerOffline(partner) {
54 return matrixUtil.isPartnerOffline(partner); 54 return matrixUtil.isPartnerOffline(partner);
55 } 55 }
56 56
57 function init(_username, _password, _logger, _callbacks) { 57 function init(_username, _password, _logger, _callbacks) {
58 username = _username; 58 username = _username;
59 password = _password; 59 password = _password;
60 logger = _logger; 60 logger = _logger;
61 callbacks = _callbacks; 61 callbacks = _callbacks;
62 62
63 xmpp.on('online', onOnline); 63 xmpp.on('online', onOnline);
64 xmpp.on('chat', onPM); 64 xmpp.on('chat', onPM);
65 xmpp.on('error', onError); 65 xmpp.on('error', onError);
66 xmpp.on('subscribe', onSubscribe); 66 xmpp.on('subscribe', onSubscribe);
67 xmpp.on('unsubscribe', onUnsubscribe); 67 xmpp.on('unsubscribe', onUnsubscribe);
68 xmpp.on('buddy', onBuddy); 68 xmpp.on('buddy', onBuddy);
69 69
70 xmpp.unsubscribe(); 70 xmpp.unsubscribe();
71 71
72 xmpp.connect({ 72 xmpp.connect({
73 jid: username, 73 jid: username,
74 password: password 74 password: password
75 }); 75 });
76 } 76 }
77 77
78 function setOptions(options) { 78 function setOptions(options) {
79 if (!options.matrix) { 79 if (!options.matrix) {
80 return; 80 return;
81 } 81 }
82 82
83 matrix = options.matrix; 83 matrix = options.matrix;
84 matrixUtil = new MatrixUtil({matrix: matrix, logger: logger}); 84 matrixUtil = new MatrixUtil({matrix: matrix, logger: logger});
85 } 85 }
86 86
87 function sendMessage(destination, msg) { 87 function sendMessage(destination, msg) {
88 if (!destination) { 88 if (!destination) {
89 logger.warn('adaptorXmpp.sendMessage: Undefined destination, send message aborted', {destination: destination, msg: msg}); 89 logger.warn('adaptorXmpp.sendMessage: Undefined destination, send message aborted', {destination: destination, msg: msg});
90 } 90 }
91 91
92 if (!msg) { 92 if (!msg) {
93 logger.warn('adaptorXmpp.sendMessage: Undefined message, send message aborted', {destination: destination, msg: msg}); 93 logger.warn('adaptorXmpp.sendMessage: Undefined message, send message aborted', {destination: destination, msg: msg});
94 } 94 }
95 95
96 96
97 if (destination.toLowerCase() != username.replace(/\/.*/, '').toLowerCase()) { 97 if (destination.toLowerCase() != username.replace(/\/.*/, '').toLowerCase()) {
98 logger.verbose('Sending message', {from: username, destination: destination, msg: msg}); 98 logger.verbose('Sending message', {from: username, destination: destination, msg: msg});
99 } 99 }
100 100
101 xmpp.send(destination, msg); 101 xmpp.send(destination, msg);
102 102
103 matrixUtil.updateLastOutgoing(destination, msg); 103 matrixUtil.updateLastOutgoing(destination, msg);
104 } 104 }
105 105
106 function addFriend(friend) { 106 function addFriend(friend) {
107 logger.verbose('Adding XMP friend: ' + friend); 107 logger.verbose('Adding XMPP friend: ' + friend);
108 xmpp.subscribe(friend); 108 xmpp.subscribe(friend);
109 } 109 }
110 110
111 exports.init = init; 111 exports.init = init;
112 exports.sendMessage = sendMessage; 112 exports.sendMessage = sendMessage;
113 exports.setOptions = setOptions; 113 exports.setOptions = setOptions;
114 exports.addFriend = addFriend; 114 exports.addFriend = addFriend;
115 exports.isPartnerOffline = isPartnerOffline; 115 exports.isPartnerOffline = isPartnerOffline;
116 116