From 3aa9ee1ba053c2fdb4c2bb816b7ddcd8c7916471 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Mon, 4 Mar 2019 17:49:44 +0100 Subject: [PATCH] Replace http: with https: in xmpp.org links --- CHANGES.md | 2 +- docs/source/configuration.rst | 8 ++++---- docs/source/developer_api.rst | 2 +- docs/source/index.rst | 2 +- docs/source/setup.rst | 8 ++++---- spec/chatbox.js | 6 +++--- spec/muc.js | 30 +++++++++++++++--------------- spec/room_registration.js | 2 +- spec/roster.js | 2 +- src/converse-muc-views.js | 8 ++++---- src/headless/converse-core.js | 2 +- src/headless/converse-disco.js | 2 +- src/headless/converse-muc.js | 8 ++++---- tests/utils.js | 2 +- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7deb8451e..1e46c5ad7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -646,7 +646,7 @@ More info here: https://github.com/LeaVerou/awesomplete/pull/17082 ## 2.0.4 (2016-12-13) - #737: Bugfix. Translations weren't being applied. [jcbrand] - Fetch room info and store it on the room model. - For context, see: http://xmpp.org/extensions/xep-0045.html#disco-roominfo [jcbrand] + For context, see: https://xmpp.org/extensions/xep-0045.html#disco-roominfo [jcbrand] - Bugfix. Switching from bookmarks form to config form shows only the spinner. [jcbrand] - Bugfix. Other room occupants sometimes not shown when reloading the page. [jcbrand] - Bugfix. Due to changes in `converse-core` the controlbox wasn't aware anymore of diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index 0cc08fe75..43c5cc44d 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -222,7 +222,7 @@ allow_registration * Default: ``true`` -Support for `XEP-0077: In band registration `_ +Support for `XEP-0077: In band registration `_ Allow XMPP account registration showing the corresponding UI register form interface. @@ -572,7 +572,7 @@ csi_waiting_time * Default: ``0`` -This option adds support for `XEP-0352 Client State Indication _` +This option adds support for `XEP-0352 Client State Indication _` If Converse is idle for the configured amount of seconds, a chat state indication of ``inactive`` will be sent out to the XMPP server (if the server @@ -806,7 +806,7 @@ See also: Currently the "keepalive" setting only works with BOSH and not with websockets. This is because XMPP over websocket does not use the same session token as with BOSH. A possible solution for this is to implement - `XEP-0198 `_, specifically + `XEP-0198 `_, specifically with regards to "stream resumption". .. _`locales`: @@ -993,7 +993,7 @@ muc_instant_rooms Determines whether 'instant' (also called 'dynamic' in OpenFire) rooms are created. Otherwise rooms first have to be configured before they're available to other -users (so-called "registered rooms" in `MUC-0045 `_). +users (so-called "registered rooms" in `MUC-0045 `_). From a UX perspective, if this settings is `false`, then a configuration form will render, that has to be filled in first, before the room can be joined by other diff --git a/docs/source/developer_api.rst b/docs/source/developer_api.rst index 258c29212..348cbbb1d 100644 --- a/docs/source/developer_api.rst +++ b/docs/source/developer_api.rst @@ -1050,7 +1050,7 @@ Room attributes that may be passed in: configured automatically. Currently it doesn't make sense to specify ``roomconfig`` values if ``auto_configure`` is set to ``false``. For a list of configuration values that can be passed in, refer to these values - in the `XEP-0045 MUC specification `_. + in the `XEP-0045 MUC specification `_. The values should be named without the ``muc#roomconfig_`` prefix. * *maximize*: A boolean, indicating whether minimized rooms should also be maximized, when opened. Set to ``false`` by default. diff --git a/docs/source/index.rst b/docs/source/index.rst index 40e9e06ec..9d6303ce5 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -20,7 +20,7 @@ contribute, please read the :doc:`documentation` page. Introduction ============ -Converse is a free and open-source `XMPP `_ +Converse is a free and open-source `XMPP `_ chat client written in JavaScript which can be tightly integrated into any website. The benefit of using converse.js as opposed to relying on a SaaS diff --git a/docs/source/setup.rst b/docs/source/setup.rst index 63a0d1ebd..12abeb569 100644 --- a/docs/source/setup.rst +++ b/docs/source/setup.rst @@ -57,7 +57,7 @@ The various components An XMPP server ============== -Converse uses `XMPP `_ as its +Converse uses `XMPP `_ as its messaging protocol, and therefore needs to connect to an XMPP/Jabber server (Jabber® is an older and more user-friendly synonym for XMPP). @@ -67,7 +67,7 @@ authentication sessions to log in users to the XMPP server (i.e. :ref:`session s then you'll have to set up your own XMPP server. You can find a list of public XMPP servers/providers on `compliance.conversations.im `_ -and a list of servers that you can set up yourself on `xmpp.org `_. +and a list of servers that you can set up yourself on `xmpp.org `_. .. _`BOSH-section`: @@ -90,7 +90,7 @@ server, we need a proxy which acts as a bridge between these two protocols. This is the job of a BOSH connection manager. BOSH (Bidirectional-streams Over Synchronous HTTP) is a protocol for allowing XMPP communication over HTTP. The -protocol is defined in `XEP-0206: XMPP Over BOSH `_. +protocol is defined in `XEP-0206: XMPP Over BOSH `_. Popular XMPP servers such as `Ejabberd `_, Prosody `(mod_bosh) `_ and @@ -258,7 +258,7 @@ Option 1). Server-side authentication via BOSH prebinding --------------------------------------------------------- To **prebind** refers to a technique whereby your web application sets up an -authenticated BOSH session with the XMPP server or a standalone `BOSH `_ +authenticated BOSH session with the XMPP server or a standalone `BOSH `_ connection manager. Once authenticated, it receives RID and SID tokens which need to be passed diff --git a/spec/chatbox.js b/spec/chatbox.js index 403b022b6..05f961247 100644 --- a/spec/chatbox.js +++ b/spec/chatbox.js @@ -671,7 +671,7 @@ await test_utils.waitForRoster(_converse, 'current'); test_utils.openControlBox(); - // See XEP-0085 http://xmpp.org/extensions/xep-0085.html#definitions + // See XEP-0085 https://xmpp.org/extensions/xep-0085.html#definitions spyOn(_converse, 'emit'); const sender_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@localhost'; await test_utils.waitUntil(() => _converse.rosterview.el.querySelectorAll('.roster-group').length); @@ -817,7 +817,7 @@ test_utils.openControlBox(); await test_utils.waitUntil(() => _converse.rosterview.el.querySelectorAll('.roster-group').length); // TODO: only show paused state if the previous state was composing - // See XEP-0085 http://xmpp.org/extensions/xep-0085.html#definitions + // See XEP-0085 https://xmpp.org/extensions/xep-0085.html#definitions spyOn(_converse, 'emit').and.callThrough(); const sender_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@localhost'; const view = await test_utils.openChatBoxFor(_converse, sender_jid); @@ -985,7 +985,7 @@ await test_utils.waitForRoster(_converse, 'current'); test_utils.openControlBox(); const sender_jid = mock.cur_names[1].replace(/ /g,'.').toLowerCase() + '@localhost'; - // See XEP-0085 http://xmpp.org/extensions/xep-0085.html#definitions + // See XEP-0085 https://xmpp.org/extensions/xep-0085.html#definitions spyOn(_converse, 'emit'); await test_utils.openChatBoxFor(_converse, sender_jid); const view = _converse.chatboxviews.get(sender_jid); diff --git a/spec/muc.js b/spec/muc.js index 1f92af780..8d1ee16aa 100644 --- a/spec/muc.js +++ b/spec/muc.js @@ -347,7 +347,7 @@ // The user has just entered the room (because join was called) // and receives their own presence from the server. // See example 24: - // http://xmpp.org/extensions/xep-0045.html#enter-pres + // https://xmpp.org/extensions/xep-0045.html#enter-pres // /* * @@ -1219,7 +1219,7 @@ /* Check that an IQ is sent out, asking for the * configuration form. - * See: // http://xmpp.org/extensions/xep-0045.html#example-163 + * See: // https://xmpp.org/extensions/xep-0045.html#example-163 * * `); /* Server responds with the configuration form. - * See: // http://xmpp.org/extensions/xep-0045.html#example-165 + * See: // https://xmpp.org/extensions/xep-0045.html#example-165 */ var config_stanza = $iq({from: 'coven@chat.shakespeare.lit', 'id': IQ_id, @@ -1398,7 +1398,7 @@ for (var i=0; i-1; i--) { name = mock.chatroom_names[i]; role = mock.chatroom_roles[name].role; - // See example 21 http://xmpp.org/extensions/xep-0045.html#enter-pres + // See example 21 https://xmpp.org/extensions/xep-0045.html#enter-pres presence = $pres({ to:'dummy@localhost/pda', from:'lounge@localhost/'+name, @@ -1452,7 +1452,7 @@ for (var i=0; i-1; i--) { name = mock.chatroom_names[i]; role = mock.chatroom_roles[name].role; - // See example 21 http://xmpp.org/extensions/xep-0045.html#enter-pres + // See example 21 https://xmpp.org/extensions/xep-0045.html#enter-pres presence = $pres({ to:'dummy@localhost/pda', from:'lounge@localhost/'+name, @@ -1695,7 +1695,7 @@ // The user has just entered the groupchat (because join was called) // and receives their own presence from the server. // See example 24: - // http://xmpp.org/extensions/xep-0045.html#enter-pres + // https://xmpp.org/extensions/xep-0045.html#enter-pres const presence = $pres({ to:'dummy@localhost/resource', from:'lounge@localhost/thirdwitch', @@ -1946,7 +1946,7 @@ async function (done, _converse) { await test_utils.openAndEnterChatRoom(_converse, 'jdev', 'conference.jabber.org', 'jc'); - const text = 'Jabber/XMPP Development | RFCs and Extensions: http://xmpp.org/ | Protocol and XSF discussions: xsf@muc.xmpp.org'; + const text = 'Jabber/XMPP Development | RFCs and Extensions: https://xmpp.org/ | Protocol and XSF discussions: xsf@muc.xmpp.org'; let stanza = u.toStanza(` ${text} @@ -2008,7 +2008,7 @@ * nickname and one indicating availability for the new * nickname. * - * See: http://xmpp.org/extensions/xep-0045.html#changenick + * See: https://xmpp.org/extensions/xep-0045.html#changenick * * Promise.resolve()); roomspanel.delegateEvents(); // We need to rebind all events otherwise our spy won't be called - // See: http://xmpp.org/extensions/xep-0045.html#disco-rooms + // See: https://xmpp.org/extensions/xep-0045.html#disco-rooms expect(modal.el.querySelectorAll('.available-chatrooms li').length).toBe(0); const server_input = modal.el.querySelector('input[name="server"]'); @@ -4299,7 +4299,7 @@ expect(sizzle('div.chat-info:last', chat_content).pop().textContent) .toBe("nomorenicks has entered the groupchat"); - // See XEP-0085 http://xmpp.org/extensions/xep-0085.html#definitions + // See XEP-0085 https://xmpp.org/extensions/xep-0085.html#definitions // state let msg = $msg({ @@ -4475,7 +4475,7 @@ expect(sizzle('div.chat-info:last', chat_content).pop().textContent) .toBe("nomorenicks has entered the groupchat"); - // See XEP-0085 http://xmpp.org/extensions/xep-0085.html#definitions + // See XEP-0085 https://xmpp.org/extensions/xep-0085.html#definitions // state var msg = $msg({ diff --git a/spec/room_registration.js b/spec/room_registration.js index 040f3ba72..ce829b39f 100644 --- a/spec/room_registration.js +++ b/spec/room_registration.js @@ -112,7 +112,7 @@ }).then(stanza => { // The user has just entered the room (because join was called) // and receives their own presence from the server. - // See example 24: http://xmpp.org/extensions/xep-0045.html#enter-pres + // See example 24: https://xmpp.org/extensions/xep-0045.html#enter-pres const presence = $pres({ to: _converse.connection.jid, from: room_jid, diff --git a/spec/roster.js b/spec/roster.js index ef998af76..d318d6ad0 100644 --- a/spec/roster.js +++ b/spec/roster.js @@ -1270,7 +1270,7 @@ expect(_converse.roster.pluck('jid').length).toBe(1); expect(_.includes(_converse.roster.pluck('jid'), 'data@enterprise')).toBeTruthy(); // Taken from the spec - // http://xmpp.org/rfcs/rfc3921.html#rfc.section.7.3 + // https://xmpp.org/rfcs/rfc3921.html#rfc.section.7.3 stanza = $iq({ to: _converse.connection.jid, type: 'result', diff --git a/src/converse-muc-views.js b/src/converse-muc-views.js index 160d17bc7..2f3cb2123 100644 --- a/src/converse-muc-views.js +++ b/src/converse-muc-views.js @@ -128,7 +128,7 @@ converse.plugins.add('converse-muc-views', { return str; } - /* http://xmpp.org/extensions/xep-0045.html + /* https://xmpp.org/extensions/xep-0045.html * ---------------------------------------- * 100 message Entering a groupchat Inform user that any occupant is allowed to see the user's full JID * 101 message (out of band) Affiliation change Inform user that his or her affiliation changed while not in the groupchat @@ -206,7 +206,7 @@ converse.plugins.add('converse-muc-views', { * (XMLElement) stanza: The IQ stanza containing the groupchat * info. */ - // All MUC features found here: http://xmpp.org/registrar/disco-features.html + // All MUC features found here: https://xmpp.org/registrar/disco-features.html el.querySelector('span.spinner').remove(); el.querySelector('a.room-info').classList.add('selected'); el.insertAdjacentHTML( @@ -812,7 +812,7 @@ converse.plugins.add('converse-muc-views', { * ignore notifications in groupchats. * * As laid out in the business rules in XEP-0085 - * http://xmpp.org/extensions/xep-0085.html#bizrules-groupchat + * https://xmpp.org/extensions/xep-0085.html#bizrules-groupchat */ if (message.get('fullname') === this.model.get('nick')) { // Don't know about other servers, but OpenFire sends @@ -1669,7 +1669,7 @@ converse.plugins.add('converse-muc-views', { showStatusMessages (stanza) { /* Check for status codes and communicate their purpose to the user. - * See: http://xmpp.org/registrar/mucstatus.html + * See: https://xmpp.org/registrar/mucstatus.html * * Parameters: * (XMLElement) stanza: The message or presence stanza diff --git a/src/headless/converse-core.js b/src/headless/converse-core.js index 94b765d11..974770c12 100644 --- a/src/headless/converse-core.js +++ b/src/headless/converse-core.js @@ -165,7 +165,7 @@ _converse.TIMEOUTS = { // Set as module attr so that we can override in tests. }; // XEP-0085 Chat states -// http://xmpp.org/extensions/xep-0085.html +// https://xmpp.org/extensions/xep-0085.html _converse.INACTIVE = 'inactive'; _converse.ACTIVE = 'active'; _converse.COMPOSING = 'composing'; diff --git a/src/headless/converse-disco.js b/src/headless/converse-disco.js index 771a12f3f..3aa3106fa 100644 --- a/src/headless/converse-disco.js +++ b/src/headless/converse-disco.js @@ -217,7 +217,7 @@ converse.plugins.add('converse-disco', { }); function addClientFeatures () { - // See http://xmpp.org/registrar/disco-categories.html + // See https://xmpp.org/registrar/disco-categories.html _converse.api.disco.own.identities.add('client', 'web', 'Converse'); _converse.api.disco.own.features.add(Strophe.NS.BOSH); diff --git a/src/headless/converse-muc.js b/src/headless/converse-muc.js index d69238aea..015ef7496 100644 --- a/src/headless/converse-muc.js +++ b/src/headless/converse-muc.js @@ -538,7 +538,7 @@ converse.plugins.add('converse-muc', { /* Send an IQ stanza to the server, asking it for the * member-list of this groupchat. * - * See: http://xmpp.org/extensions/xep-0045.html#modifymember + * See: https://xmpp.org/extensions/xep-0045.html#modifymember * * Parameters: * (String) affiliation: The specific member list to @@ -559,7 +559,7 @@ converse.plugins.add('converse-muc', { /* Send IQ stanzas to the server to set an affiliation for * the provided JIDs. * - * See: http://xmpp.org/extensions/xep-0045.html#modifymember + * See: https://xmpp.org/extensions/xep-0045.html#modifymember * * XXX: Prosody doesn't accept multiple JIDs' affiliations * being set in one IQ stanza, so as a workaround we send @@ -728,7 +728,7 @@ converse.plugins.add('converse-muc', { /* Send IQ stanzas to the server to modify the * affiliations in this groupchat. * - * See: http://xmpp.org/extensions/xep-0045.html#modifymember + * See: https://xmpp.org/extensions/xep-0045.html#modifymember * * Parameters: * (Object) members: A map of jids, affiliations and optionally reasons @@ -1498,7 +1498,7 @@ converse.plugins.add('converse-muc', { * configured automatically. Currently it doesn't make sense to specify * `roomconfig` values if `auto_configure` is set to `false`. * For a list of configuration values that can be passed in, refer to these values - * in the [XEP-0045 MUC specification](http://xmpp.org/extensions/xep-0045.html#registrar-formtype-owner). + * in the [XEP-0045 MUC specification](https://xmpp.org/extensions/xep-0045.html#registrar-formtype-owner). * The values should be named without the `muc#roomconfig_` prefix. * @param {boolean} [attrs.maximize] A boolean, indicating whether minimized rooms should also be * maximized, when opened. Set to `false` by default. diff --git a/tests/utils.js b/tests/utils.js index c7a6bb981..b01f2841c 100644 --- a/tests/utils.js +++ b/tests/utils.js @@ -182,7 +182,7 @@ // The user has just entered the room (because join was called) // and receives their own presence from the server. - // See example 24: http://xmpp.org/extensions/xep-0045.html#enter-pres + // See example 24: https://xmpp.org/extensions/xep-0045.html#enter-pres var presence = $pres({ to: _converse.connection.jid, from: `${room_jid}/${nick}`,