Răsfoiți Sursa

Run prettier

JC Brand 3 luni în urmă
părinte
comite
a27e246fec
2 a modificat fișierele cu 38 adăugiri și 41 ștergeri
  1. 20 20
      src/headless/plugins/disco/entity.js
  2. 18 21
      src/plugins/controlbox/utils.js

+ 20 - 20
src/headless/plugins/disco/entity.js

@@ -4,7 +4,7 @@ import _converse from '../../shared/_converse.js';
 import api from '../../shared/api/index.js';
 import converse from '../../shared/api/public.js';
 import { parseErrorStanza } from '../../shared/parsers.js';
-import log from "@converse/log";
+import log from '@converse/log';
 import sizzle from 'sizzle';
 import { createStore } from '../../utils/storage.js';
 
@@ -20,11 +20,11 @@ const { Strophe, u } = converse.env;
  * See XEP-0030: https://xmpp.org/extensions/xep-0030.html
  */
 class DiscoEntity extends Model {
-    get idAttribute () {
+    get idAttribute() {
         return 'jid';
     }
 
-    initialize (_, options) {
+    initialize(_, options) {
         super.initialize();
         this.waitUntilFeaturesDiscovered = getOpenPromise();
         this.waitUntilItemsFetched = getOpenPromise();
@@ -56,7 +56,7 @@ class DiscoEntity extends Model {
      * @param {String} category - The identity category
      * @param {String} type - The identity type
      */
-    async getIdentity (category, type) {
+    async getIdentity(category, type) {
         await this.waitUntilFeaturesDiscovered;
         return this.identities.findWhere({
             'category': category,
@@ -70,14 +70,14 @@ class DiscoEntity extends Model {
      * @method _converse.DiscoEntity#getFeature
      * @param {String} feature - The feature that might be supported.
      */
-    async getFeature (feature) {
+    async getFeature(feature) {
         await this.waitUntilFeaturesDiscovered;
         if (this.features.findWhere({ var: feature })) {
             return this;
         }
     }
 
-    onFeatureAdded (feature) {
+    onFeatureAdded(feature) {
         feature.entity = this;
         /**
          * Triggered when Converse has learned of a service provided by the XMPP server.
@@ -89,7 +89,7 @@ class DiscoEntity extends Model {
         api.trigger('serviceDiscovered', feature);
     }
 
-    onFieldAdded (field) {
+    onFieldAdded(field) {
         field.entity = this;
         /**
          * Triggered when Converse has learned of a disco extension field.
@@ -100,7 +100,7 @@ class DiscoEntity extends Model {
         api.trigger('discoExtensionFieldDiscovered', field);
     }
 
-    async fetchFeatures (options) {
+    async fetchFeatures(options) {
         if (options.ignore_cache) {
             this.queryInfo();
         } else {
@@ -121,7 +121,7 @@ class DiscoEntity extends Model {
         }
     }
 
-    async queryInfo () {
+    async queryInfo() {
         let stanza;
         try {
             stanza = await api.disco.info(this.get('jid'), null);
@@ -136,8 +136,8 @@ class DiscoEntity extends Model {
     /**
      * @param {Element} stanza
      */
-    onDiscoItems (stanza) {
-        sizzle(`query[xmlns="${Strophe.NS.DISCO_ITEMS}"] item`, stanza).forEach(item => {
+    onDiscoItems(stanza) {
+        sizzle(`query[xmlns="${Strophe.NS.DISCO_ITEMS}"] item`, stanza).forEach((item) => {
             if (item.getAttribute('node')) {
                 // XXX: Ignore nodes for now.
                 // See: https://xmpp.org/extensions/xep-0030.html#items-nodes
@@ -151,14 +151,14 @@ class DiscoEntity extends Model {
             } else {
                 api.disco.entities.create({
                     jid,
-                    'parent_jids': [this.get('jid')],
-                    'name': item.getAttribute('name'),
+                    parent_jids: [this.get('jid')],
+                    name: item.getAttribute('name'),
                 });
             }
         });
     }
 
-    async queryForItems () {
+    async queryForItems() {
         if (this.identities.where({ category: 'server' }).length === 0) {
             // Don't fetch features and items if this is not a
             // server or a conference component.
@@ -171,8 +171,8 @@ class DiscoEntity extends Model {
     /**
      * @param {Element} stanza
      */
-    async onInfo (stanza) {
-        Array.from(stanza.querySelectorAll('identity')).forEach(identity => {
+    async onInfo(stanza) {
+        Array.from(stanza.querySelectorAll('identity')).forEach((identity) => {
             this.identities.create({
                 'category': identity.getAttribute('category'),
                 'type': identity.getAttribute('type'),
@@ -180,9 +180,9 @@ class DiscoEntity extends Model {
             });
         });
 
-        sizzle(`x[type="result"][xmlns="${Strophe.NS.XFORM}"]`, stanza).forEach(form => {
+        sizzle(`x[type="result"][xmlns="${Strophe.NS.XFORM}"]`, stanza).forEach((form) => {
             const data = {};
-            sizzle('field', form).forEach(field => {
+            sizzle('field', form).forEach((field) => {
                 data[field.getAttribute('var')] = {
                     'value': field.querySelector('value')?.textContent,
                     'type': field.getAttribute('type'),
@@ -196,7 +196,7 @@ class DiscoEntity extends Model {
         }
         this.waitUntilItemsFetched.resolve();
 
-        Array.from(stanza.querySelectorAll('feature')).forEach(feature => {
+        Array.from(stanza.querySelectorAll('feature')).forEach((feature) => {
             this.features.create({
                 'var': feature.getAttribute('var'),
                 'from': stanza.getAttribute('from'),
@@ -204,7 +204,7 @@ class DiscoEntity extends Model {
         });
 
         // XEP-0128 Service Discovery Extensions
-        sizzle('x[type="result"][xmlns="jabber:x:data"] field', stanza).forEach(field => {
+        sizzle('x[type="result"][xmlns="jabber:x:data"] field', stanza).forEach((field) => {
             this.fields.create({
                 'var': field.getAttribute('var'),
                 'value': field.querySelector('value')?.textContent,

+ 18 - 21
src/plugins/controlbox/utils.js

@@ -1,33 +1,33 @@
+import { _converse, api, converse } from '@converse/headless';
 import { __ } from 'i18n/index.js';
-import { _converse, api, converse } from "@converse/headless";
 
 const { Strophe, u } = converse.env;
 
-export function addControlBox () {
-    const m = _converse.state.chatboxes.add(new _converse.exports.ControlBox({'id': 'controlbox'}));
-     _converse.state.chatboxviews.get('controlbox')?.setModel();
+export function addControlBox() {
+    const m = _converse.state.chatboxes.add(new _converse.exports.ControlBox({ 'id': 'controlbox' }));
+    _converse.state.chatboxviews.get('controlbox')?.setModel();
     return m;
 }
 
 /**
  * @param {Event} [ev]
  */
-export function showControlBox (ev) {
+export function showControlBox(ev) {
     ev?.preventDefault?.();
     const controlbox = _converse.state.chatboxes.get('controlbox') || addControlBox();
-    u.safeSave(controlbox, {'closed': false});
+    u.safeSave(controlbox, { 'closed': false });
 }
 
 /**
  * @param {string} jid
  */
-export function navigateToControlBox (jid) {
+export function navigateToControlBox(jid) {
     showControlBox();
     const model = _converse.state.chatboxes.get(jid);
-    u.safeSave(model, {'hidden': true});
+    u.safeSave(model, { 'hidden': true });
 }
 
-export function disconnect () {
+export function disconnect() {
     // Upon disconnection, set connected to `false`, so that if
     // we reconnect, "onConnected" will be called,
     // to fetch the roster again and to send out a presence stanza.
@@ -35,7 +35,7 @@ export function disconnect () {
     if (model) u.safeSave(model, { 'connected': false });
 }
 
-export function clearSession () {
+export function clearSession() {
     const { chatboxviews } = _converse.state;
     const view = chatboxviews?.get('controlbox');
     if (view) {
@@ -50,20 +50,19 @@ export function clearSession () {
 /**
  * @param {MouseEvent} ev
  */
-export async function logOut (ev) {
+export async function logOut(ev) {
     ev?.preventDefault();
-    const result = await api.confirm(__("Are you sure you want to log out?"));
+    const result = await api.confirm(__('Confirm'), __('Are you sure you want to log out?'));
     if (result) {
         api.user.logout();
     }
 }
 
-export function onChatBoxesFetched () {
+export function onChatBoxesFetched() {
     const controlbox = _converse.state.chatboxes.get('controlbox') || addControlBox();
     controlbox.save({ 'connected': true });
 }
 
-
 /**
  * Given the login `<form>` element, parse its data and update the
  * converse settings with the supplied JID, password and connection URL.
@@ -71,17 +70,17 @@ export function onChatBoxesFetched () {
  * @param {Object} settings - Extra settings that may be passed in and will
  *  also be set together with the form settings.
  */
-export function updateSettingsWithFormData (form, settings={}) {
+export function updateSettingsWithFormData(form, settings = {}) {
     const form_data = new FormData(form);
 
-    const connection_url  = /** @type {string} */(form_data.get('connection-url'));
+    const connection_url = /** @type {string} */ (form_data.get('connection-url'));
     if (connection_url?.startsWith('ws')) {
         settings['websocket_url'] = connection_url;
     } else if (connection_url?.startsWith('http')) {
         settings['bosh_service_url'] = connection_url;
     }
 
-    let jid = /** @type {string} */(form_data.get('jid'));
+    let jid = /** @type {string} */ (form_data.get('jid'));
     if (api.settings.get('locked_domain')) {
         const last_part = '@' + api.settings.get('locked_domain');
         if (jid.endsWith(last_part)) {
@@ -99,12 +98,11 @@ export function updateSettingsWithFormData (form, settings={}) {
     _converse.state.config.save({ 'trusted': (form_data.get('trusted') && true) || false });
 }
 
-
 /**
  * @param {HTMLFormElement} form
  */
-export function validateJID (form) {
-    const jid_element = /** @type {HTMLInputElement} */(form.querySelector('input[name=jid]'));
+export function validateJID(form) {
+    const jid_element = /** @type {HTMLInputElement} */ (form.querySelector('input[name=jid]'));
     if (
         jid_element.value &&
         !api.settings.get('locked_domain') &&
@@ -117,4 +115,3 @@ export function validateJID (form) {
     jid_element.setCustomValidity('');
     return true;
 }
-