Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react
Vincent
5 years ago
commit
707200718d
@ -1,83 +0,0 @@
|
||||
/* global storage, _ */
|
||||
/* global _: false */
|
||||
/* global Backbone: false */
|
||||
|
||||
/* global BlockedNumberController: false */
|
||||
/* global storage: false */
|
||||
/* global Whisper: false */
|
||||
|
||||
/* eslint-disable more/no-then */
|
||||
|
||||
// eslint-disable-next-line func-names
|
||||
(function() {
|
||||
'use strict';
|
||||
|
||||
window.Whisper = window.Whisper || {};
|
||||
|
||||
const BLOCKED_NUMBERS_ID = 'blocked';
|
||||
const BLOCKED_GROUPS_ID = 'blocked-groups';
|
||||
|
||||
storage.isBlocked = number => {
|
||||
const numbers = storage.get(BLOCKED_NUMBERS_ID, []);
|
||||
|
||||
return _.include(numbers, number);
|
||||
};
|
||||
storage.getBlockedNumbers = () => storage.get(BLOCKED_NUMBERS_ID, []);
|
||||
storage.addBlockedNumber = number => {
|
||||
const numbers = storage.get(BLOCKED_NUMBERS_ID, []);
|
||||
if (_.include(numbers, number)) {
|
||||
return;
|
||||
}
|
||||
|
||||
window.log.info('adding', number, 'to blocked list');
|
||||
storage.put(BLOCKED_NUMBERS_ID, numbers.concat(number));
|
||||
};
|
||||
storage.removeBlockedNumber = number => {
|
||||
const numbers = storage.get(BLOCKED_NUMBERS_ID, []);
|
||||
if (!_.include(numbers, number)) {
|
||||
return;
|
||||
}
|
||||
|
||||
window.log.info('removing', number, 'from blocked list');
|
||||
storage.put(BLOCKED_NUMBERS_ID, _.without(numbers, number));
|
||||
};
|
||||
|
||||
storage.isGroupBlocked = groupId => {
|
||||
const groupIds = storage.get(BLOCKED_GROUPS_ID, []);
|
||||
|
||||
return _.include(groupIds, groupId);
|
||||
};
|
||||
storage.removeBlockedGroup = groupId => {
|
||||
const groupIds = storage.get(BLOCKED_GROUPS_ID, []);
|
||||
if (!_.include(groupIds, groupId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
window.log.info(`removing group(${groupId} from blocked list`);
|
||||
storage.put(BLOCKED_GROUPS_ID, _.without(groupIds, groupId));
|
||||
};
|
||||
|
||||
Whisper.BlockedNumber = Backbone.Model.extend({
|
||||
defaults() {
|
||||
return {
|
||||
number: '',
|
||||
};
|
||||
},
|
||||
block() {
|
||||
return BlockedNumberController.block(this.number);
|
||||
},
|
||||
unblock() {
|
||||
return BlockedNumberController.unblock(this.number);
|
||||
},
|
||||
});
|
||||
|
||||
Whisper.BlockedNumberCollection = Backbone.Collection.extend({
|
||||
model: Whisper.BlockedNumber,
|
||||
comparator(m) {
|
||||
return m.get('number');
|
||||
},
|
||||
getModel(number) {
|
||||
return this.models.find(m => m.get('number') === number);
|
||||
},
|
||||
});
|
||||
})();
|
||||
@ -1,162 +0,0 @@
|
||||
/* eslint-disable no-await-in-loop */
|
||||
/* eslint-disable no-loop-func */
|
||||
/* global log, window, textsecure */
|
||||
|
||||
const EventEmitter = require('events');
|
||||
|
||||
const PER_MIN = 60 * 1000;
|
||||
const PER_HR = 60 * PER_MIN;
|
||||
const RSS_POLL_EVERY = 1 * PER_HR; // once an hour
|
||||
|
||||
function xml2json(xml) {
|
||||
try {
|
||||
let obj = {};
|
||||
if (xml.children.length > 0) {
|
||||
for (let i = 0; i < xml.children.length; i += 1) {
|
||||
const item = xml.children.item(i);
|
||||
const { nodeName } = item;
|
||||
|
||||
if (typeof obj[nodeName] === 'undefined') {
|
||||
obj[nodeName] = xml2json(item);
|
||||
} else {
|
||||
if (typeof obj[nodeName].push === 'undefined') {
|
||||
const old = obj[nodeName];
|
||||
|
||||
obj[nodeName] = [];
|
||||
obj[nodeName].push(old);
|
||||
}
|
||||
obj[nodeName].push(xml2json(item));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
obj = xml.textContent;
|
||||
}
|
||||
return obj;
|
||||
} catch (e) {
|
||||
log.error(e.message);
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
class LokiRssAPI extends EventEmitter {
|
||||
constructor(settings) {
|
||||
super();
|
||||
// properties
|
||||
this.feedUrl = settings.RSS_FEED;
|
||||
this.groupId = settings.CONVO_ID;
|
||||
this.feedTitle = settings.title;
|
||||
this.closeable = settings.closeable;
|
||||
// non configureable options
|
||||
this.feedTimer = null;
|
||||
// initial set up
|
||||
this.getFeed();
|
||||
}
|
||||
|
||||
async getFeed() {
|
||||
// deal with file server proxy hardcoding
|
||||
const map = {
|
||||
'https://loki.network/category/messenger-updates/feed/':
|
||||
'loki/v1/rss/messenger',
|
||||
'https://loki.network/feed/': 'loki/v1/rss/loki',
|
||||
};
|
||||
if (map[this.feedUrl] === undefined) {
|
||||
log.warn('LokiRssAPI unsupported rss feed', this.feedUrl);
|
||||
return;
|
||||
}
|
||||
const result = await window.tokenlessFileServerAdnAPI.serverRequest(
|
||||
map[this.feedUrl]
|
||||
);
|
||||
if (!result) {
|
||||
log.error('LokiRssAPI empty rss proxy response');
|
||||
return;
|
||||
}
|
||||
if (!result.response) {
|
||||
log.error('LokiRssAPI rss proxy error, no response', result);
|
||||
return;
|
||||
}
|
||||
if (!result.response.data) {
|
||||
log.error(
|
||||
'LokiRssAPI rss proxy error, no data, response',
|
||||
typeof result.response,
|
||||
result.response
|
||||
);
|
||||
return;
|
||||
}
|
||||
const responseXML = result.response.data;
|
||||
let feedDOM = {};
|
||||
try {
|
||||
feedDOM = await new window.DOMParser().parseFromString(
|
||||
responseXML,
|
||||
'text/xml'
|
||||
);
|
||||
} catch (e) {
|
||||
log.error('LokiRssAPI xml parsing error', e, responseXML);
|
||||
return;
|
||||
}
|
||||
const feedObj = xml2json(feedDOM);
|
||||
let receivedAt = new Date().getTime();
|
||||
|
||||
if (!feedObj || !feedObj.rss || !feedObj.rss.channel) {
|
||||
log.error(
|
||||
'LokiRssAPI rss structure error',
|
||||
feedObj,
|
||||
feedDOM,
|
||||
responseXML
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (!feedObj.rss.channel.item) {
|
||||
// no records, not an error
|
||||
return;
|
||||
}
|
||||
if (feedObj.rss.channel.item.constructor !== Array) {
|
||||
// Treat single record as array for consistency
|
||||
feedObj.rss.channel.item = [feedObj.rss.channel.item];
|
||||
}
|
||||
feedObj.rss.channel.item.reverse().forEach(item => {
|
||||
// log.debug('item', item)
|
||||
|
||||
const pubDate = new Date(item.pubDate);
|
||||
|
||||
// if we use group style, we can put the title in the source
|
||||
const messageData = {
|
||||
isSessionRequest: false,
|
||||
source: this.groupId,
|
||||
sourceDevice: 1,
|
||||
timestamp: pubDate.getTime(),
|
||||
serverTimestamp: pubDate.getTime(),
|
||||
receivedAt,
|
||||
isRss: true,
|
||||
message: {
|
||||
body: `<h2>${item.title} </h2>${item.description}`,
|
||||
attachments: [],
|
||||
group: {
|
||||
id: this.groupId,
|
||||
type: textsecure.protobuf.GroupContext.Type.DELIVER,
|
||||
},
|
||||
flags: 0,
|
||||
expireTimer: 0,
|
||||
profileKey: null,
|
||||
timestamp: pubDate.getTime(),
|
||||
received_at: receivedAt,
|
||||
sent_at: pubDate.getTime(),
|
||||
quote: null,
|
||||
contact: [],
|
||||
preview: [],
|
||||
profile: null,
|
||||
},
|
||||
};
|
||||
receivedAt += 1; // Ensure different arrival times
|
||||
this.emit('rssMessage', {
|
||||
message: messageData,
|
||||
});
|
||||
});
|
||||
const ref = this;
|
||||
function callTimer() {
|
||||
ref.getFeed();
|
||||
}
|
||||
this.feedTimer = setTimeout(callTimer, RSS_POLL_EVERY);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = LokiRssAPI;
|
||||
Loading…
Reference in New Issue