From 9df0a79fb9832c6835177c78719bdf3a2b8fc6f8 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Jul 2020 10:24:13 +1000 Subject: [PATCH] remove blockedNumber.js --- js/models/blockedNumbers.js | 83 ------------------------------------- ts/receiver/multidevice.ts | 7 ---- 2 files changed, 90 deletions(-) delete mode 100644 js/models/blockedNumbers.js diff --git a/js/models/blockedNumbers.js b/js/models/blockedNumbers.js deleted file mode 100644 index cb24c6466..000000000 --- a/js/models/blockedNumbers.js +++ /dev/null @@ -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); - }, - }); -})(); diff --git a/ts/receiver/multidevice.ts b/ts/receiver/multidevice.ts index 9633c3247..eda7c3cba 100644 --- a/ts/receiver/multidevice.ts +++ b/ts/receiver/multidevice.ts @@ -366,13 +366,6 @@ async function onContactReceived(details: any) { conversation.setProfileKey(profileKey); } - if (details.blocked !== 'undefined') { - if (details.blocked) { - storage.addBlockedNumber(id); - } else { - storage.removeBlockedNumber(id); - } - } // Do not set name to allow working with lokiProfile and nicknames conversation.set({