Reload97 / sate24-to-xmpp

Download as
Browse Code ยป

Commit c3f61306aa6a2347ce05f0cea19891916a6901e0

Authored by Adhidarma Hadiwinoto
1 parent ddffb312fc
Exists in master

migrate matrix to matrix-util

Showing 2 changed files with 44 additions and 57 deletions Side-by-side Diff

... ... @@ -30,22 +30,7 @@ function onPM(sender, msg) {
30 30 callbacks.onPM(sender, msg);
31 31 }
32 32  
33   - if (!matrix) {
34   - return;
35   - }
36   -
37   - if (!matrix.buddies) {
38   - matrix.buddies = {};
39   - }
40   -
41   - if (!matrix.buddies[sender]) {
42   - matrix.buddies[sender] = {};
43   - }
44   -
45   - matrix.buddies[sender].lastIncoming = {
46   - msg: msg,
47   - lastUpdate: moment().format('YYYY-MM-DD HH:mm:ss')
48   - }
  33 + matrixUtil.updateLastIncoming(sender, msg);
49 34 }
50 35  
51 36 function onError(err) {
... ... @@ -65,35 +50,12 @@ function onBuddy(jid, state, statusText, resource) {
65 50 matrixUtil.updateBuddyState(jid, state, statusText, resource);
66 51 }
67 52  
68   -function _isPartnerOffline(partner) {
69   - if (!matrix) { return false; }
70   -
71   - if (!isAFriend(partner)) {
72   - logger.verbose(partner + ' is not a friend yet, adding it as a friend')
73   - addFriend(partner);
74   - }
75   -
76   - if (!matrix.buddies[partner]) { return false; }
77   - if (!matrix.buddies[partner].resources) { return false; };
78   -
79   - var resources = matrix.buddies[partner].resources;
80   - for (var key in resources) {
81   - if (resources.hasOwnProperty(key)) {
82   - var resource = resources[key];
83   - if (resources[key].state == 'online') {
84   - return false;
85   - }
86   - }
87   - }
88   - logger.verbose('Offline partner detected: ' + partner);
89   - return true;
90   -}
91   -
92 53 function isPartnerOffline(partner) {
93 54 if (!matrixUtil.isAFriend(partner)) {
  55 + logger.verbose(partner + ' is not a friend yet, adding it as a friend')
94 56 addFriend(partner);
95 57 }
96   -
  58 +
97 59 return matrixUtil.isPartnerOffline(partner);
98 60 }
99 61  
... ... @@ -143,22 +105,7 @@ function sendMessage(destination, msg) {
143 105  
144 106 xmpp.send(destination, msg);
145 107  
146   - if (!matrix) {
147   - return;
148   - }
149   -
150   - if (!matrix.buddies) {
151   - matrix.buddies = {};
152   - }
153   -
154   - if (!matrix.buddies[destination]) {
155   - matrix.buddies[destination] = {};
156   - }
157   -
158   - matrix.buddies[destination].lastOutgoing = {
159   - msg: msg,
160   - lastUpdate: moment().format('YYYY-MM-DD HH:mm:ss')
161   - }
  108 + matrixUtil.updateLastOutgoing(destination, msg);
162 109 }
163 110  
164 111 function addFriend(friend) {
... ... @@ -86,3 +86,43 @@ MatrixUtil.prototype.isPartnerOffline = function(partner) {
86 86 logger.verbose('Offline partner detected: ' + partner);
87 87 return true;
88 88 }
  89 +
  90 +MatrixUtil.prototype.updateLastIncoming(sender, msg) {
  91 + var matrix = this.matrix;
  92 +
  93 + if (!matrix) {
  94 + return;
  95 + }
  96 +
  97 + if (!matrix.buddies) {
  98 + matrix.buddies = {};
  99 + }
  100 +
  101 + if (!matrix.buddies[sender]) {
  102 + matrix.buddies[sender] = {};
  103 + }
  104 +
  105 + matrix.buddies[sender].lastIncoming = {
  106 + msg: msg,
  107 + lastUpdate: moment().format('YYYY-MM-DD HH:mm:ss')
  108 + }
  109 +}
  110 +
  111 +MatrixUtil.prototype.updateLastOutgoing(destination, msg) {
  112 + if (!matrix) {
  113 + return;
  114 + }
  115 +
  116 + if (!matrix.buddies) {
  117 + matrix.buddies = {};
  118 + }
  119 +
  120 + if (!matrix.buddies[destination]) {
  121 + matrix.buddies[destination] = {};
  122 + }
  123 +
  124 + matrix.buddies[destination].lastOutgoing = {
  125 + msg: msg,
  126 + lastUpdate: moment().format('YYYY-MM-DD HH:mm:ss')
  127 + }
  128 +}