From 8a98ef87fe1a49f26681073b404d4ee712c96f9f Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 11 Jul 2019 12:30:14 +0200 Subject: [PATCH] Various small fixes. (Unused imports, unused vars etc). --- demo/anonymous.html | 2 +- spec/chatbox.js | 2 -- spec/mam.js | 1 - spec/messages.js | 6 +++--- spec/muc.js | 23 +++++++++-------------- spec/room_registration.js | 3 +-- spec/roster.js | 1 - src/converse-bookmark-views.js | 4 ++-- src/converse-muc-views.js | 5 +---- src/headless/converse-bookmarks.js | 2 +- src/headless/converse-bosh.js | 1 - src/headless/converse-chatboxes.js | 2 +- src/headless/converse-core.js | 7 +++---- src/headless/converse-muc.js | 5 ++--- src/utils/html.js | 2 +- 15 files changed, 25 insertions(+), 41 deletions(-) diff --git a/demo/anonymous.html b/demo/anonymous.html index 4d841e629..db61c625a 100644 --- a/demo/anonymous.html +++ b/demo/anonymous.html @@ -30,7 +30,7 @@ -
+

diff --git a/spec/chatbox.js b/spec/chatbox.js index a6d06dcb6..e49eead4d 100644 --- a/spec/chatbox.js +++ b/spec/chatbox.js @@ -118,7 +118,6 @@ const jid = el.textContent.trim().replace(/ /g,'.').toLowerCase() + '@montague.lit'; el.click(); await test_utils.waitUntil(() => _converse.chatboxes.length == 2); - const chatboxview = _converse.chatboxviews.get(jid); expect(_converse.chatboxviews.trimChats).toHaveBeenCalled(); // Check that new chat boxes are created to the left of the // controlbox (but to the right of all existing chat boxes) @@ -127,7 +126,6 @@ await test_utils.waitUntil(() => _converse.chatboxes.length == 3); el = online_contacts[1]; const new_jid = el.textContent.trim().replace(/ /g,'.').toLowerCase() + '@montague.lit'; - const new_chatboxview = _converse.chatboxviews.get(new_jid); expect(_converse.chatboxviews.trimChats).toHaveBeenCalled(); // Check that new chat boxes are created to the left of the // controlbox (but to the right of all existing chat boxes) diff --git a/spec/mam.js b/spec/mam.js index ca69d0198..6f6ca2b06 100644 --- a/spec/mam.js +++ b/spec/mam.js @@ -738,7 +738,6 @@ sent_stanza = iq; IQ_id = sendIQ.bind(this)(iq, callback, errback); }); - const view = _converse.chatboxviews.get(contact_jid); await test_utils.waitUntil(() => sent_stanza); const stanza_el = sent_stanza.root().nodeTree; const queryid = stanza_el.querySelector('query').getAttribute('queryid'); diff --git a/spec/messages.js b/spec/messages.js index 1ab326b2d..75fcf92bd 100644 --- a/spec/messages.js +++ b/spec/messages.js @@ -1712,7 +1712,7 @@ await _converse.api.chats.open(sender_jid) let msg_text = 'This message will not be sent, due to an error'; const view = _converse.api.chatviews.get(sender_jid); - let message = view.model.messages.create({ + view.model.messages.create({ 'msgid': '82bc02ce-9651-4336-baf0-fa04762ed8d2', 'fullname': fullname, 'sender': 'me', @@ -1729,7 +1729,7 @@ // not be received, to test that errors appear // after the relevant message. msg_text = 'This message will be sent, and also receive an error'; - message = view.model.messages.create({ + view.model.messages.create({ 'msgid': '6fcdeee3-000f-4ce8-a17e-9ce28f0ae104', 'fullname': fullname, 'sender': 'me', @@ -1797,7 +1797,7 @@ // not be received, to test that errors appear // after the relevant message. msg_text = 'This message will be sent, and also receive an error'; - message = view.model.messages.create({ + view.model.messages.create({ 'msgid': 'another-id', 'fullname': fullname, 'sender': 'me', diff --git a/spec/muc.js b/spec/muc.js index 092d24993..71240e3ae 100644 --- a/spec/muc.js +++ b/spec/muc.js @@ -103,9 +103,8 @@ // (when it's a new room being created). spyOn(_converse.ChatRoom.prototype, 'getRoomFeatures').and.callFake(() => Promise.resolve()); - const sent_IQ_els = []; let jid = 'lounge@montague.lit'; - let chatroomview, sent_IQ, IQ_id; + let chatroomview, IQ_id; test_utils.openControlBox(); test_utils.createContacts(_converse, 'current'); await test_utils.waitUntil(() => _converse.rosterview.el.querySelectorAll('.roster-group .group-toggle').length); @@ -163,6 +162,7 @@ 'whois': 'anyone' } }); + expect(room instanceof Backbone.Model).toBeTruthy(); chatroomview = _converse.chatboxviews.get('room@conference.example.org'); // We pretend this is a new room, so no disco info is returned. @@ -1436,8 +1436,9 @@ 'var': 'muc#roomconfig_passwordprotectedroom'}) .c('value').t(1).up().up() .c('field', {'type': 'fixed'}) - .c('value').t('If a password is required to enter this groupchat,'+ - 'you must specify the password below.').up().up() + .c('value').t( + 'If a password is required to enter this groupchat, you must specify the password below.' + ).up().up() .c('field', { 'label': 'Password', 'type': 'text-private', @@ -1521,7 +1522,6 @@ // https://xmpp.org/extensions/xep-0045.html#exit for (let i=mock.chatroom_names.length-1; i>-1; i--) { const name = mock.chatroom_names[i]; - const role = mock.chatroom_roles[name].role; // See example 21 https://xmpp.org/extensions/xep-0045.html#enter-pres const presence = $pres({ to:'romeo@montague.lit/pda', @@ -1569,15 +1569,13 @@ async function (done, _converse) { await test_utils.openAndEnterChatRoom(_converse, 'lounge@montague.lit', 'romeo'); - var name; var view = _converse.chatboxviews.get('lounge@montague.lit'), occupants = view.el.querySelector('.occupant-list'); - var presence, role, jid, model; + var presence, jid; for (var i=0; i-1; i--) { - name = mock.chatroom_names[i]; - role = mock.chatroom_roles[name].role; + const name = mock.chatroom_names[i]; // See example 21 https://xmpp.org/extensions/xep-0045.html#enter-pres presence = $pres({ to:'romeo@montague.lit/pda', @@ -2083,7 +2080,6 @@ _converse.connection._dataRecv(test_utils.createRequest(stanza)); const view = _converse.chatboxviews.get('jdev@conference.jabber.org'); await new Promise((resolve, reject) => view.model.once('change:subject', resolve)); - let chat_content = view.el.querySelector('.chat-content'); expect(sizzle('.chat-event:last').pop().textContent).toBe('Topic set by ralphm'); expect(sizzle('.chat-topic:last').pop().textContent).toBe(text); expect(view.el.querySelector('.chatroom-description').textContent).toBe(text); @@ -2095,7 +2091,6 @@ `); _converse.connection._dataRecv(test_utils.createRequest(stanza)); await new Promise((resolve, reject) => view.once('messageInserted', resolve)); - chat_content = view.el.querySelector('.chat-content'); expect(sizzle('.chat-topic').length).toBe(1); expect(sizzle('.chat-msg__subject').length).toBe(1); expect(sizzle('.chat-msg__subject').pop().textContent).toBe('This is a message subject'); diff --git a/spec/room_registration.js b/spec/room_registration.js index 2d44f7bc1..a49b91571 100644 --- a/spec/room_registration.js +++ b/spec/room_registration.js @@ -3,7 +3,6 @@ } (this, function (jasmine, mock, test_utils) { const _ = converse.env._, $iq = converse.env.$iq, - $pres = converse.env.$pres, Strophe = converse.env.Strophe, sizzle = converse.env.sizzle, u = converse.env.utils; @@ -77,7 +76,7 @@ const IQ_stanzas = _converse.connection.IQ_stanzas; const muc_jid = 'coven@chat.shakespeare.lit'; - await test_utils.openAndEnterChatRoom(_converse, 'coven@chat.shakespeare.lit', 'romeo'); + await test_utils.openAndEnterChatRoom(_converse, muc_jid, 'romeo'); const view = _converse.chatboxviews.get(muc_jid); let stanza = await test_utils.waitUntil(() => _.filter( diff --git a/spec/roster.js b/spec/roster.js index 09809d97f..1622c97c1 100644 --- a/spec/roster.js +++ b/spec/roster.js @@ -121,7 +121,6 @@ async function (done, _converse) { const filter = _converse.rosterview.el.querySelector('.roster-filter'); - const names = mock.cur_names; test_utils.openControlBox(); expect(_.isNull(filter)).toBe(false); test_utils.createContacts(_converse, 'current').openControlBox(); diff --git a/src/converse-bookmark-views.js b/src/converse-bookmark-views.js index 34dde805c..83f09cfa4 100644 --- a/src/converse-bookmark-views.js +++ b/src/converse-bookmark-views.js @@ -10,16 +10,16 @@ * Converse.js plugin which adds views for XEP-0048 bookmarks */ import "backbone.nativeview"; +import "@converse/headless/converse-muc"; import BrowserStorage from "backbone.browserStorage"; import { OrderedListView } from "backbone.overview"; import converse from "@converse/headless/converse-core"; -import muc from "@converse/headless/converse-muc"; import tpl_bookmark from "templates/bookmark.html"; import tpl_bookmarks_list from "templates/bookmarks_list.html" import tpl_chatroom_bookmark_form from "templates/chatroom_bookmark_form.html"; import tpl_chatroom_bookmark_toggle from "templates/chatroom_bookmark_toggle.html"; -const { Backbone, Promise, Strophe, $iq, sizzle, _ } = converse.env; +const { Backbone, Strophe, _ } = converse.env; const u = converse.env.utils; diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js index 90d5724ed..682b02a79 100644 --- a/src/converse-muc-views.js +++ b/src/converse-muc-views.js @@ -41,9 +41,8 @@ import tpl_spinner from "templates/spinner.html"; import xss from "xss/dist/xss"; -const { Backbone, Promise, Strophe, dayjs, sizzle, _, $build, $iq, $msg, $pres } = converse.env; +const { Backbone, Promise, Strophe, dayjs, sizzle, _, $iq, $msg, $pres } = converse.env; const u = converse.env.utils; -const AFFILIATION_CHANGE_COMANDS = ['admin', 'ban', 'owner', 'member', 'revoke']; const OWNER_COMMANDS = ['owner']; const ADMIN_COMMANDS = ['admin', 'ban', 'deop', 'destroy', 'member', 'op', 'revoke']; const MODERATOR_COMMANDS = ['kick', 'mute', 'voice']; @@ -1202,11 +1201,9 @@ converse.plugins.add('converse-muc-views', { u.hideElement(this.el.querySelector('.occupants')); sizzle('.spinner', this.el).forEach(u.removeElement); - const message = this.model.get('destroyed_message'); const reason = this.model.get('destroyed_reason'); const moved_jid = this.model.get('moved_jid'); this.model.save({ - 'destroyed_message': undefined, 'destroyed_reason': undefined, 'moved_jid': undefined }); diff --git a/src/headless/converse-bookmarks.js b/src/headless/converse-bookmarks.js index 16d21482e..6fe04b9c9 100644 --- a/src/headless/converse-bookmarks.js +++ b/src/headless/converse-bookmarks.js @@ -9,9 +9,9 @@ * @description * Converse.js plugin which adds views for bookmarks specified in XEP-0048. */ +import "@converse/headless/converse-muc"; import BrowserStorage from "backbone.browserStorage"; import converse from "@converse/headless/converse-core"; -import muc from "@converse/headless/converse-muc"; const { Backbone, Promise, Strophe, $iq, sizzle, _ } = converse.env; const u = converse.env.utils; diff --git a/src/headless/converse-bosh.js b/src/headless/converse-bosh.js index 23e40f0a5..2648860e9 100644 --- a/src/headless/converse-bosh.js +++ b/src/headless/converse-bosh.js @@ -12,7 +12,6 @@ import BrowserStorage from "backbone.browserStorage"; import converse from "./converse-core"; const { Backbone, Strophe, _ } = converse.env; -const u = converse.env.utils; converse.plugins.add('converse-bosh', { diff --git a/src/headless/converse-chatboxes.js b/src/headless/converse-chatboxes.js index f71b22880..22286095c 100644 --- a/src/headless/converse-chatboxes.js +++ b/src/headless/converse-chatboxes.js @@ -918,7 +918,7 @@ converse.plugins.add('converse-chatboxes', { attrs.fullname = _converse.xmppstatus.get('fullname'); } else { attrs.sender = 'them'; - attrs.fullname = this.get('fullname') || this.get('fullname') + attrs.fullname = this.get('fullname'); } } sizzle(`x[xmlns="${Strophe.NS.OUTOFBAND}"]`, stanza).forEach(xform => { diff --git a/src/headless/converse-core.js b/src/headless/converse-core.js index e244c4bb5..bfc82c682 100644 --- a/src/headless/converse-core.js +++ b/src/headless/converse-core.js @@ -6,10 +6,9 @@ /** * @module converse-core */ -import * as bosh from 'strophe.js/src/bosh'; +import 'strophe.js/src/bosh'; +import 'strophe.js/src/websocket'; import * as strophe from 'strophe.js/src/core'; -import * as websocket from 'strophe.js/src/websocket'; - import Backbone from 'backbone'; import BrowserStorage from 'backbone.browserStorage'; import Promise from 'es6-promise/dist/es6-promise.auto'; @@ -213,7 +212,7 @@ _converse.default_settings = { csi_waiting_time: 0, // Support for XEP-0352. Seconds before client is considered idle and CSI is sent out. debug: false, default_state: 'online', - geouri_regex: /https:\/\/www.openstreetmap.org\/.*#map=[0-9]+\/([\-0-9.]+)\/([\-0-9.]+)\S*/g, + geouri_regex: /https\:\/\/www.openstreetmap.org\/.*#map=[0-9]+\/([\-0-9.]+)\/([\-0-9.]+)\S*/g, geouri_replacement: 'https://www.openstreetmap.org/?mlat=$1&mlon=$2#map=18/$1/$2', idle_presence_timeout: 300, // Seconds after which an idle presence is sent jid: undefined, diff --git a/src/headless/converse-muc.js b/src/headless/converse-muc.js index b1f72015b..3b39fc036 100644 --- a/src/headless/converse-muc.js +++ b/src/headless/converse-muc.js @@ -23,7 +23,7 @@ const MUC_ROLE_WEIGHTS = { 'none': 2, }; -const { Strophe, Backbone, Promise, $iq, $build, $msg, $pres, sizzle, dayjs, _ } = converse.env; +const { Strophe, Backbone, Promise, $iq, $build, $msg, $pres, sizzle, _ } = converse.env; // Add Strophe Namespaces Strophe.addNamespace('MUC_ADMIN', Strophe.NS.MUC + "#admin"); @@ -1445,9 +1445,8 @@ converse.plugins.add('converse-muc', { 'to': `${this.get('jid')}/${this.get('nick')}`, 'type': "get" }).c("ping", {'xmlns': Strophe.NS.PING}); - let result; try { - result = await _converse.api.sendIQ(ping); + await _converse.api.sendIQ(ping); } catch (e) { const sel = `error not-acceptable[xmlns="${Strophe.NS.STANZAS}"]`; if (_.isElement(e) && sizzle(sel, e).length) { diff --git a/src/utils/html.js b/src/utils/html.js index 823d36ac0..3f7902ed5 100644 --- a/src/utils/html.js +++ b/src/utils/html.js @@ -24,7 +24,7 @@ import tpl_select_option from "../templates/select_option.html"; import tpl_video from "../templates/video.html"; import u from "../headless/utils/core"; -const URL_REGEX = /\b(https?:\/\/|www\.|https?:\/\/www\.)[^\s<>]{2,200}\b\/?/g; +const URL_REGEX = /\b(https?\:\/\/|www\.|https?:\/\/www\.)[^\s<>]{2,200}\b\/?/g; function getAutoCompleteProperty (name, options) { return {