Commit c1f9bb5eafa944deb4e4dc32fcd5558306e4542e

Authored by Adhidarma Hadiwinoto
1 parent f9da2fd9ca
Exists in master

separate function

Showing 1 changed file with 17 additions and 14 deletions Side-by-side Diff

... ... @@ -36,10 +36,9 @@ function broadcast(destinations, message) {
36 36 }
37 37  
38 38 var keepAliveLoop = function() {
39   - logger.info('Polling loop');
  39 + logger.info('Keep alive loop');
40 40  
41 41 YahooMessenger.keepAlive();
42   -
43 42 pollingTimer = setTimeout(keepAliveLoop, config.yahoomessenger.keepalive_interval * 1000);
44 43 }
45 44  
... ... @@ -69,12 +68,7 @@ var striptags = require('striptags');
69 68 var YahooMessenger = require("yahoomessenger");
70 69 YahooMessenger.newInstance();
71 70  
72   -YahooMessenger.on('ready', function onReady(){
73   - logger.info("Going to online on YM")
74   - YahooMessenger.login(config.yahoomessenger.username, config.yahoomessenger.password);
75   -});
76   -
77   -YahooMessenger.on('loginSuccessful', function onLoginSuccessful(data){
  71 +function onYmLoginSuccesful(data){
78 72 logger.info('Online on YM as ' + data.user_id + ' (' + data.firstname + ' ' + data.lastname + ')');
79 73  
80 74 if (config.yahoomessenger.status) {
... ... @@ -85,9 +79,9 @@ YahooMessenger.on('loginSuccessful', function onLoginSuccessful(data){
85 79 broadcast(config.yahoomessenger.report_to, config.yahoomessenger.report_message);
86 80  
87 81 keepAliveLoop();
88   -});
  82 +}
89 83  
90   -YahooMessenger.on('pm', function(data){
  84 +function onYmPM(data) {
91 85  
92 86 if (config.globals.debug == 1) {
93 87 console.log(data);
... ... @@ -123,13 +117,22 @@ YahooMessenger.on('pm', function(data){
123 117 );
124 118  
125 119 broadcast(config.yahoomessenger.report_to, data.sender + '-> ' + message);
  120 +}
126 121  
127   -});
128   -
129   -YahooMessenger.on('buddyAddRequest', function(data) {
  122 +function onYmBuddyAddRequest(data) {
130 123 logger.info("Got request to add buddy from " + data.username);
131 124 YahooMessenger.acceptAddBuddy(data.username);
132   -});
  125 +}
  126 +
  127 +function onYmReady(){
  128 + logger.info("Going to online on YM")
  129 + YahooMessenger.login(config.yahoomessenger.username, config.yahoomessenger.password);
  130 +}
  131 +
  132 +YahooMessenger.on('ready', onYmReady);
  133 +YahooMessenger.on('loginSuccessful', onYmLoginSuccesful);
  134 +YahooMessenger.on('pm', onYmPM);
  135 +YahooMessenger.on('buddyAddRequest', onYmBuddyAddRequest);
133 136  
134 137 var http = require('http');
135 138 var url = require('url');