improve authorization

auth.js

@@ -1,5 +1,4 @@
 const { LocalStorageCryptoStore } = require('matrix-js-sdk/lib/crypto/store/localStorage-crypto-store');
-
 const matrixTokenLogin = async () => {
   matrixClient = sdk.createClient({
     baseUrl: config.matrix.domain,
@@ -40,31 +39,75 @@ module.exports.getMatrixToken = async () => {
     });
 };
 
-module.exports.registerFediverseApp = async () => {
+const getFediverseLink = (domain,roomId) => {
-  axios.post(`${config.fediverse.domain}/api/v1/apps`,
+  let apps = {}
+  apps = JSON.parse(localStorage.getItem("apps"));
+  if(!apps[domain]){
+  axios.post(`https://${domain}/api/v1/apps`,
     {
       client_name: config.fediverse.client_name,
       redirect_uris: 'urn:ietf:wg:oauth:2.0:oob',
       scopes: 'read write follow push',
     })
     .then((response) => {
-      axios.post(`${config.fediverse.domain}/oauth/token`,
+      console.log(response.data)
-        {
+      if(!response.data.client_id || !response.data.client_secret) return false;
-          username: config.fediverse.username,
+      apps[domain] = {
-          password: config.fediverse.password,
+        client_id: response.data.client_id,
-          client_id: response.data.client_id,
+        client_secret: response.data.client_secret
-          client_secret: response.data.client_secret,
+      }
-          scope: 'read write follow push',
+      localStorage.setItem("apps",JSON.stringify(apps))
-          grant_type: 'password',
+      matrixClient.sendHtmlNotice(roomId,"Приложение зарегистрировано. Введите команду еще раз для создания ссылки")
-          redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
+     // return getFediverseLink(domain)
-        })
-        .then((tokens) => {
-          localStorage.setItem('fediverse_auth', JSON.stringify(tokens.data, null, 2));
-        })
-        .catch((e) => {
-          console.log(e);
-        });
     }).catch((e) => {
       console.log(e);
     });
+  }else{
+    const app = apps[domain]
+    const uri = "urn:ietf:wg:oauth:2.0:oob".replace(/:/g,"%3A")
+    const scope = "read write follow push".replace(/ /g,"%20")
+    return `https://${domain}/oauth/authorize?client_id=${app.client_id}&response_type=code&redirect_uri=${uri}&scope=${scope}`
+  }
+  return "nothing"
 };
+
+const obtainAccessToken = (domain,code,event) => {
+  const apps = JSON.parse(localStorage.getItem("apps"));
+  console.log(domain,code)
+  const app = apps[domain];
+  axios.post(`https://${domain}/oauth/token`, {
+    client_id: app.client_id,
+    client_secret: app.client_secret,
+    redirect_uri: "urn:ietf:wg:oauth:2.0:oob",
+    grant_type: "authorization_code",
+    code: code,
+    scopes: "read write follow push"
+  }).then(response => {
+    if(!response.data.access_token) return console.log(response.data)
+    fediverse.auth[event.getSender()] = {
+      domain: domain,
+      access_token: response.data.access_token
+    }
+    localStorage.setItem("fediverse_auth", JSON.stringify(fediverse.auth))
+    getFediverseUserInfo(event)
+  }).catch(e => console.error(e))
+}
+
+const getFediverseUserInfo = (event) => {
+  const user = event.getSender()
+  axios({
+    method: "GET",
+    url: `https://${fediverse.auth[user].domain}/api/v1/accounts/verify_credentials`,
+    headers: {
+      Authorization: `Bearer ${fediverse.auth[user].access_token}`
+    }
+  }).then(response => {
+    if(response.data.username){
+      matrixClient.sendHtmlNotice(event.getRoomId(), `Успешный вход в аккаунт ${response.data.display_name || response.data.username} (@${response.data.username}@${fediverse.auth[user].domain})`)
+    }else{
+      console.log(response.data)
+    }
+  }).catch(e => console.error(e))
+}
+module.exports.getFediverseLink = getFediverseLink;
+module.exports.obtainAccessToken = obtainAccessToken;

commands/fediverse/auth.js

@@ -0,0 +1,12 @@
+exports.runQuery = (roomId,event,userInput) => {
+  
+  //matrixClient.sendHtmlNotice(roomId,"Проверка связи","Проверка связи");
+  const link = auth.getFediverseLink(userInput)
+  if(!link){
+    matrixClient.sendHtmlNotice(roomId,"Не удалось получить ссылку")
+  }else if(link == "nothing"){
+  }else{
+    authEvents.push(event.event_id)
+    matrixClient.sendHtmlNotice(roomId,`Перейдите по ссылке для входа в аккаунт. Для завершения ответьте на это сообщение кодом (еще не готово, пж не переходе по ссылке): ${link}`)
+  }
+}

commands/fediverse/beg.js

@@ -1,15 +0,0 @@
-exports.runQuery = function (roomId, event) {
-  axios({
-    method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
-    data: { status: '@10grans@fedi.cc beg' },
-  })
-    .then(() => {
-      matrix.utils.addReact(event, '✅');
-    })
-    .catch((e) => {
-      matrix.utils.addReact(event, '❌');
-      matrix.utils.sendError(event, roomId, e);
-    });
-};

commands/fediverse/boo.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses/${userInput}/unfavourite`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${userInput}/unfavourite`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');

commands/fediverse/clap.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses/${userInput}/favourite`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${userInput}/favourite`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');

commands/fediverse/copy.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses/${userInput}/reblog`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${userInput}/reblog`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');

commands/fediverse/flood.js

@@ -12,11 +12,12 @@ exports.runQuery = function (roomId, disable) {
   intervalId = setInterval(() => {
     axios({
       method: 'GET',
-      url: `${config.fediverse.domain}/api/v1/timelines/home`,
+      url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/timelines/home`,
-      headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+      headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
     })
       .then((res) => {
-        let past = JSON.parse(localStorage.getItem('timeline'));
+        let timeline = JSON.parse(localStorage.getItem('timeline'));
+        past = timeline[event.getSender()] || {}
         if (past.length === 0) past = res.data;
         const events = res.data;
         const len = events.length;
@@ -28,7 +29,8 @@ exports.runQuery = function (roomId, disable) {
             fediverse.utils.formatter(events[i], roomId);
           }
         }
-        localStorage.setItem('timeline', JSON.stringify(events, null, 2));
+        timeline[event.getSender()] = events
+        localStorage.setItem('timeline', JSON.stringify(timeline, null, 2));
       })
       .catch((e) => {
         matrix.utils.sendError(null, roomId, e);

commands/fediverse/follow.js

@@ -5,8 +5,8 @@ exports.runQuery = async function (roomId, event, userInput) {
   const suggest = [];
   axios({
     method: 'GET',
-    url: `${config.fediverse.domain}/api/v2/search?q=${userInput}&type=accounts`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v2/search?q=${userInput}&type=accounts`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   }).then((findUserId) => {
     const results = findUserId.data.accounts;
     const len = results.length;

commands/fediverse/makeitrain.js

@@ -1,31 +0,0 @@
-exports.runQuery = async function (roomId, event, notice) {
-  if (config.fediverse.tipping === false) return matrixClient.sendHtmlNotice(roomId, `Tipping is not enabled.`, `<code>Tipping is not enabled.</code>`);
-  const loadingString = `Making it rain for notice: ${notice}...`;
-  const original = await matrixClient.sendHtmlNotice(roomId, `${loadingString}`, `<code>${loadingString}</code>`);
-  const findAllUsers = await fediverse.utils.getStatusMentions(notice, event, original);
-  const exclude = "@10grans@fedi.cc";
-  const users = findAllUsers.filter(users => !exclude.includes(findAllUsers));
-  if (!users) return matrix.utils.editNoticeHTML(roomId, original, `<code>No eligible users found.</code>`);
-  const rain = (users) => {
-    amount = users.length * 0.00000001337 // by per user:
-    if (users.length === 1) return amount * 100000 // 0.001337
-    if (users.length <= 5) return amount * 10000 // 0.0001337
-    if (users.length <= 10) return amount * 1000 // 0.00001337
-    if (users.length <= 100) return amount * 100 // 0.000001337
-    return amount
-  }
-  axios({
-    method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
-    data: { status: `@10grans@fedi.cc makeitrain ${rain(users)} to ${users.join(' ')}` },
-  })
-    .then(() => {
-      matrix.utils.addReact(event, '✅');
-      return matrix.utils.editNoticeHTML(roomId, original, `<code>Raining ${rain(users)} 10grans on: 🌧${users.join(', ')}🌧</code>`);
-    })
-    .catch((e) => {
-      matrix.utils.addReact(event, '❌');
-      return matrix.utils.editNoticeHTML(roomId, original, `<code>${e}</code>`)
-    });
-};

commands/fediverse/mordy.js

@@ -1,20 +0,0 @@
-exports.runQuery = function (roomId, event, userInput) {
-  axios({
-    method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
-    data: {
-      status: `@mordekai ${userInput}`,
-      content_type: 'text/markdown',
-      visibility: 'unlisted',
-      expires_in: '7200',
-    },
-  })
-    .then(() => {
-      matrix.utils.addReact(event, '✅');
-    })
-    .catch((e) => {
-      matrix.utils.addReact(event, '❌');
-      matrix.utils.sendError(event, roomId, e);
-    });
-};

commands/fediverse/notify.js

@@ -12,11 +12,12 @@ exports.runQuery = function (roomId, disable) {
   intervalId = setInterval(() => {
     axios({
       method: 'GET',
-      url: `${config.fediverse.domain}/api/v1/notifications`,
+      url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/notifications`,
-      headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+      headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
     })
       .then((res) => {
-        let past = JSON.parse(localStorage.getItem('notifications'));
+        let notifications = JSON.parse(localStorage.getItem('notifications'));
+        let past = notifications[event.getSender()] || {}
         if (past.length === 0) past = res.data;
         const events = res.data;
         const len = events.length;
@@ -28,7 +29,8 @@ exports.runQuery = function (roomId, disable) {
             fediverse.utils.formatter(events[i], roomId);
           }
         }
-        localStorage.setItem('notifications', JSON.stringify(events, null, 2));
+        notifications[event.getSender()] = events
+        localStorage.setItem('notifications', JSON.stringify(notifications, null, 2));
       })
       .catch((e) => {
         matrix.utils.sendError(null, roomId, e);

commands/fediverse/pin.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses/${userInput}/pin`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${userInput}/pin`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');

commands/fediverse/post.js

@@ -84,8 +84,8 @@ const mediaUpload = async ({ domain }, { data, filename, mimetype }) => {
   });
   const upload = await axios({
     method: 'POST',
-    url: `${domain}/api/v1/media`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/media`,
-    headers: form.getHeaders({ Authorization: `Bearer ${fediverse.auth.access_token}` }),
+    headers: form.getHeaders({ Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` }),
     data: form,
   });
   if (upload.statusText !== 'OK') throw upload;
@@ -101,8 +101,8 @@ const run = async (roomId, event, content, replyId, mediaURL, subject, visibilit
   if (replyId) content = await fediverse.utils.getStatusMentions(replyId, event).then(m => m.concat(content).join(' '));
   const response = await axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}`, 'Content-Type': 'application/x-www-form-urlencoded' },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}`, 'Content-Type': 'application/x-www-form-urlencoded' },
     data: qs.stringify({
       status: content,
       content_type: 'text/markdown',
@@ -126,6 +126,7 @@ exports.runQuery = async (roomId, event, userInput, { isReply, hasMedia, hasSubj
     if (hasMedia) mediaURL = chunks.shift();
     return await run(roomId, event, chunks.join(' '), replyId, mediaURL, subject, visibility);
   } catch (e) {
+    console.error(e)
     return matrixClient.sendHtmlNotice(roomId, 'Sad!', '<strong>Sad!</strong>').catch(() => {});
   }
 };

commands/fediverse/react.js

@@ -1,8 +1,8 @@
 const run = async (roomId, event, id, emoji, remove) => {
   axios({
     method: remove ? 'DELETE' : 'PUT',
-    url: `${config.fediverse.domain}/api/v1/pleroma/statuses/${id}/reactions/${emoji}`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/pleroma/statuses/${id}/reactions/${emoji}`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');

commands/fediverse/redact.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   axios({
     method: 'DELETE',
-    url: `${config.fediverse.domain}/api/v1/statuses/${userInput}`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${userInput}`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');

commands/fediverse/status.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   axios({
     method: 'GET',
-    url: `${config.fediverse.domain}/api/v1/statuses/${userInput}`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${userInput}`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then((response) => {
       response.label = 'status';

commands/fediverse/tip.js

@@ -1,16 +0,0 @@
-exports.runQuery = function (roomId, event, address, flaggedInput) {
-  if (config.fediverse.tipping === false) return matrixClient.sendHtmlNotice(roomId, `Tipping is not enabled.`, `<code>Tipping is not enabled.</code>`);
-  axios({
-    method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
-    data: { status: `@10grans@fedi.cc tip ${flaggedInput} to ${address}` },
-  })
-    .then(() => {
-      matrix.utils.addReact(event, '✅');
-    })
-    .catch((e) => {
-      matrix.utils.addReact(event, '❌');
-      matrix.utils.sendError(event, roomId, e);
-    });
-};

commands/fediverse/unfollow.js

@@ -5,8 +5,8 @@ exports.runQuery = async function (roomId, event, userInput) {
   const suggest = [];
   axios({
     method: 'GET',
-    url: `${config.fediverse.domain}/api/v2/search?q=${userInput}&type=accounts`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v2/search?q=${userInput}&type=accounts`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   }).then((findUserId) => {
     const results = findUserId.data.accounts;
     const len = results.length;

commands/fediverse/unpin.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses/${userInput}/unpin`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${userInput}/unpin`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');

commands/fediverse/unreblog.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/statuses/${userInput}/unreblog`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${userInput}/unreblog`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');

commands/fediverse/unroll.js

@@ -1,8 +1,8 @@
 exports.runQuery = function (roomId, event, userInput) {
   const instance = axios.create({
-    baseURL: config.fediverse.domain,
+    baseURL: 'https://' + fediverse.auth[event.getSender()].domain,
     method: 'GET',
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   });
   instance.get(`/api/v1/statuses/${userInput}/context`)
     .then(async (response) => {

commands/fediverse/utils.js

@@ -142,8 +142,8 @@ module.exports.formatter = (res, roomId, event) => {
 module.exports.follow = (roomId, account, event, original) => {
   axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/accounts/${account[0].id}/follow`,
+    url: `https://${config.fediverse[event.getSender()].domain}/api/v1/accounts/${account[0].id}/follow`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');
@@ -158,8 +158,8 @@ module.exports.follow = (roomId, account, event, original) => {
 module.exports.unfollow = (roomId, account, event, original) => {
   axios({
     method: 'POST',
-    url: `${config.fediverse.domain}/api/v1/accounts/${account[0].id}/unfollow`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/accounts/${account[0].id}/unfollow`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   })
     .then(() => {
       matrix.utils.addReact(event, '✅');
@@ -174,8 +174,8 @@ module.exports.unfollow = (roomId, account, event, original) => {
 module.exports.getStatusMentions = (notice, event) => {
   const users = axios({
     method: 'GET',
-    url: `${config.fediverse.domain}/api/v1/statuses/${notice}`,
+    url: `https://${fediverse.auth[event.getSender()].domain}/api/v1/statuses/${notice}`,
-    headers: { Authorization: `Bearer ${fediverse.auth.access_token}` },
+    headers: { Authorization: `Bearer ${fediverse.auth[event.getSender()].access_token}` },
   }).then((notice) => {
     const users = [];
     users.push('@' + notice.data.account.acct);

commands/help.js

@@ -12,9 +12,6 @@ exports.runQuery = function (roomId) {
           + '+copy [post id] : repeat/repost/retweet<br>'
           + '+crossblog [status URL]: cross blog twitter post to fediverse post<br>'
           + '+reply [post id] [content] : reply to post<br>'
-          + '+tip [@user@fedi.url] [amount] : tip 10grans<br>'
-          + '+makeitrain [post id] : make it rain 10grans<br>'
-          + '+beg : beg for 10grans<br>'
           + '+clap [post id] : favorite<br>'
           + '+boo [post id] : unfavorite</blockquote>'
           + '<blockquote><b>channel commands<br>'
@@ -30,6 +27,7 @@ exports.runQuery = function (roomId) {
           + `<blockquote><b>ligh7hau5 version ${require('../package.json').version}</b><br>`
           + '<b>--- <i>Contributors🐱</i> ---</b><br>'
           + '<b>CRYPTOMOONERS</b><br>'
+          + '<b>doesnm</b><br>'
           + '<b><i>docs by LINT</i></b></blockquote>'
 );
 };

commands/proxy.js

@@ -1,4 +0,0 @@
-
-const msg = 'Invalid proxy domain!';
-exports.runQuery = (roomId, event, userInput) =>
-  matrixClient.sendHtmlNotice(roomId, msg, `<b>${msg}</b>`).catch(() => {});

config.example.js

@@ -1,48 +0,0 @@
-module.exports = {
-  matrix: {
-    domain: 'https://your_homeserver.com',
-    user: '@your_user:your_homeserver.com',
-    password: 'your_password',
-    domains: [ 'your_homeserver.com' ],
-    manualVerify: false,
-    reactions: {
-      copy: '🔁',
-      clap: '👏',
-      redact: '🗑️️',
-      rain: '🌧️',
-      unroll: '🔍️',
-      expand: '➕',
-    }
-  },
-  fediverse: {
-    domain: 'https://your_federation.com',
-    username: '',
-    password: '',
-    client_name: 'ligh7hau5',
-    subject: '',
-    tipping: false,
-    mimetypes: {
-      whitelist: [],
-      blacklist: []
-    }
-  },
-  archive: {
-    domain: 'archive.is',
-    userAgent: 'Mozilla/4.0 (compatible; Beep Boop)'
-  },
-  nitter: {
-    userAgent: 'Mozilla/4.0 (compatible; Beep Boop)',
-    domains: {
-      redirect: [ 'nitter.unixfox.eu', 'nitter.cz', 'nitter.privacydev.net', 'nitter.poast.org', 'nitter.fdn.fr', 'nitter.snopyta.org', 'nitter.net' ],
-      original:  [ 'nitter.unixfox.eu', 'nitter.cz', 'nitter.privacydev.net', 'nitter.poast.org', 'nitter.net', 'www.nitter.net', 'twitter.com', 'www.twitter.com', 'mobile.twitter.com', 'm.twitter.com' ]
-    },
-    check: '(✅)',
-  },
-  invidious: {
-    userAgent: 'Mozilla/4.0 (compatible; Beep Boop)',
-    domains: {
-      redirect: [ 'invidious.fdn.fr', 'invidious.snopyta.org', 'invidious.xyz', 'inv.riverside.rocks', 'vid.puffyan.us', 'y.com.cm' ],
-      original:  [ 'youtube.com', 'www.youtube.com', 'youtu.be', 'm.youtube.com' ]
-    }
-  }
-};

main.js

@@ -1,7 +1,7 @@
 global.registrar = require('./registrar.js');
 
 matrix.auth.access_token ? auth.matrixTokenLogin() : auth.getMatrixToken();
-if (!fediverse.auth.access_token && config.fediverse.username) auth.registerFediverseApp();
+//if (!fediverse.auth.access_token && config.fediverse.username) auth.registerFediverseApp();
 
 matrixClient.on('RoomMember.membership', (event, member) => {
   if (member.membership === 'invite' && member.userId === matrixClient.credentials.userId) {

registrar.js

@@ -3,16 +3,16 @@ global.sdk = require('matrix-js-sdk');
 global.axios = require('axios');
 global.config = require('./config.js');
 global.auth = require('./auth.js');
-
+global.authEvents = [];
 const { LocalStorage } = require('node-localstorage');
 global.localStorage = new LocalStorage('./keys');
 if (!localStorage.getItem('matrix_auth')) {
   localStorage.clear();
   localStorage.setItem('matrix_auth', '[]');
 }
-if (!localStorage.getItem('fediverse_auth')) localStorage.setItem('fediverse_auth', '[]');
+if (!localStorage.getItem('fediverse_auth')) localStorage.setItem('fediverse_auth', '{}');
-if (!localStorage.getItem('timeline')) localStorage.setItem('timeline', '[]');
+if (!localStorage.getItem('timeline')) localStorage.setItem('timeline', '{}');
-if (!localStorage.getItem('notifications')) localStorage.setItem('notifications', '[]');
+if (!localStorage.getItem('notifications')) localStorage.setItem('notifications', '{}');
 
 
 global.fediverse = {
@@ -30,25 +30,22 @@ module.exports = {
   proxy: require('./commands/proxy.js'),
   invidious: require('./commands/invidious.js'),
   nitter: require('./commands/nitter.js'),
-  beg: require('./commands/fediverse/beg.js'),
   boo: require('./commands/fediverse/boo.js'),
   clap: require('./commands/fediverse/clap.js'),
   copy: require('./commands/fediverse/copy.js'),
   flood: require('./commands/fediverse/flood.js'),
   follow: require('./commands/fediverse/follow.js'),
   help: require('./commands/help.js'),
-  makeitrain: require('./commands/fediverse/makeitrain.js'),
-  mordy: require('./commands/fediverse/mordy.js'),
   notify: require('./commands/fediverse/notify.js'),
   pin: require('./commands/fediverse/pin.js'),
   post: require('./commands/fediverse/post.js'),
   redact: require('./commands/fediverse/redact.js'),
   status: require('./commands/fediverse/status.js'),
-  tip: require('./commands/fediverse/tip.js'),
   unfollow: require('./commands/fediverse/unfollow.js'),
   unpin: require('./commands/fediverse/unpin.js'),
   unreblog: require('./commands/fediverse/unreblog.js'),
   unroll: require('./commands/fediverse/unroll.js'),
   react: require('./commands/fediverse/react.js'),
-  expand: require('./commands/expand.js')
+  expand: require('./commands/expand.js'),
+  auth: require("./commands/fediverse/auth.js")
 };

utils.js

@@ -1,5 +1,5 @@
 const { MatrixEvent } = require('matrix-js-sdk/lib/models/event');
-
+const url = require("url")
 const isEmoji = string => true;
 
 const sendError = async (event, roomId, e) => {
@@ -68,21 +68,11 @@ const eventHandler = (args, roomId, command, event) => {
       args.push(roomId, event, userInput, true);
       command = 'nitter'
       break;
-    case 'proxy': case 'p':
-      try {
-        const url = new URL(userInput);
-        const invidio = config.invidious.domains;
-        const nitter = config.nitter.domains;
-        command = invidio.redirect.includes(url.hostname) || invidio.original.includes(url.hostname)
-          ? 'invidious'
-          : nitter.redirect.includes(url.hostname) || nitter.original.includes(url.hostname)
-            ? 'nitter'
-            : 'proxy';
-      } catch (e) { sendError(event, roomId, e); }
       // fallthrough
     default:
       args.push(roomId, event, userInput);
   }
+  if(["boo","clap","copy","flood","follow","notify","pin","unpin","post","react","redact","status","unfollow","unreblog","unroll"].includes(command) && !fediverse.auth[event.getSender()]) return matrixClient.sendHtmlNotice(roomId, ' ',`${event.getSender()}, для использования команды ${command} нужно привязать аккаунт Fediverse. Используйте для этого команду +auth <имя сервера>`)
   registrar[command] && registrar[command].runQuery.apply(null, args);
 };
 
@@ -153,7 +143,7 @@ module.exports.handleReact = async (event) => {
         args.push(reaction.key);
       }
       break;
-  };
+  }
   eventHandler(args, roomId, command, event);
 };
 
@@ -162,6 +152,16 @@ module.exports.handleReply = async (event) => {
   if(!event.event.content['m.relates_to']['m.in_reply_to']) return;
   const reply = event.event.content['m.relates_to']['m.in_reply_to'];
   const metaEvent = await fetchEncryptedOrNot(roomId, reply);
+  if(authEvents.includes(metaEvent.event_id)){
+const domain = metaEvent.event.content.body.match(/https?:\/\/[^\s]+/);
+if(domain && domain[0]){
+  domain[0] = url.parse(domain[0]).host
+  let code = event.getContent().body.split("\n");
+  code = code[code.length-1].trim()
+  auth.obtainAccessToken(domain[0],code,event)
+  authEvents = authEvents.filter(f => f != event.event_id)
+}
+  }
   if (!metaEvent.getContent().meta || metaEvent.event.sender !== config.matrix.user) return;
   const args = metaEvent.getContent().meta.split(' ');
   args.push(event.getContent().formatted_body.trim().split('</mx-reply>')[1]);

yarn.lock

@@ -4,39 +4,39 @@
 
 "@babel/runtime@^7.12.5":
   version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.10.tgz#ae3e9631fd947cb7e3610d3e9d8fef5f76696682"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz"
   integrity sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==
   dependencies:
     regenerator-runtime "^0.14.0"
 
 "@matrix-org/matrix-sdk-crypto-wasm@^1.2.0":
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.2.1.tgz#5b546c8a0e53b614f10b77b3b649818aed9d0db1"
+  resolved "https://registry.npmjs.org/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-1.2.1.tgz"
   integrity sha512-DCb7Q83PCQK0uav5vB3KNV/hJPlxAhT/ddar+VHz2kC39hMLKGzWYVhprpLYVcavaE/6OX+Q/xFkAoV/3QtUHQ==
 
 "@tootallnate/once@2":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  resolved "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
 "@types/events@^3.0.0":
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  resolved "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
 "@types/retry@0.12.0":
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
 abab@^2.0.5, abab@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  resolved "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
 acorn-globals@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+  resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz"
   integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
   dependencies:
     acorn "^7.1.1"
@@ -44,63 +44,63 @@ acorn-globals@^6.0.0:
 
 acorn-walk@^7.1.1:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
 acorn@^7.1.1:
   version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.5.0:
   version "8.10.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
 agent-base@6:
   version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
 another-json@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
+  resolved "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz"
   integrity sha512-/Ndrl68UQLhnCdsAzEXLMFuOR546o2qbYRqCglaNHbjXrwG1ayTcdwr3zkSGOGtGXDyR5X9nCFfnyG2AFJIsqg==
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 axios@^0.25.0:
   version "0.25.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
+  resolved "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"
   integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
   dependencies:
     follow-redirects "^1.14.7"
 
 base-x@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a"
+  resolved "https://registry.npmjs.org/base-x/-/base-x-4.0.0.tgz"
   integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 bs58@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/bs58/-/bs58-5.0.0.tgz#865575b4d13c09ea2a84622df6c8cbeb54ffc279"
+  resolved "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz"
   integrity sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==
   dependencies:
     base-x "^4.0.0"
 
 call-bind@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   dependencies:
     function-bind "^1.1.1"
@@ -108,41 +108,41 @@ call-bind@^1.0.0:
 
 combined-stream@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
 content-type@^1.0.4:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
 crypto-js@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
+  resolved "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"
   integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
 
 cssom@^0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  resolved "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz"
   integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
 
 cssom@~0.3.6:
   version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
 cssstyle@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"
   integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
   dependencies:
     cssom "~0.3.6"
 
 data-urls@^3.0.1:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
+  resolved "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz"
   integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
   dependencies:
     abab "^2.0.6"
@@ -151,31 +151,31 @@ data-urls@^3.0.1:
 
 debug@4:
   version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
 decimal.js@^10.3.1:
   version "10.4.3"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 domexception@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
+  resolved "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz"
   integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
   dependencies:
     webidl-conversions "^7.0.0"
 
 escodegen@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
+  resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz"
   integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
   dependencies:
     esprima "^4.0.1"
@@ -186,32 +186,32 @@ escodegen@^2.0.0:
 
 esprima@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 estraverse@^5.2.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 events@^3.2.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 follow-redirects@^1.14.7:
   version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
 form-data@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
   integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
@@ -220,12 +220,12 @@ form-data@^4.0.0:
 
 function-bind@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 get-intrinsic@^1.0.2:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz"
   integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
   dependencies:
     function-bind "^1.1.1"
@@ -235,36 +235,36 @@ get-intrinsic@^1.0.2:
 
 graceful-fs@^4.1.11:
   version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 has-proto@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
 has-symbols@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 html-encoding-sniffer@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
+  resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"
   integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
   dependencies:
     whatwg-encoding "^2.0.0"
 
 http-proxy-agent@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"
   integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
   dependencies:
     "@tootallnate/once" "2"
@@ -273,7 +273,7 @@ http-proxy-agent@^5.0.0:
 
 https-proxy-agent@^5.0.0:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
@@ -281,24 +281,24 @@ https-proxy-agent@^5.0.0:
 
 iconv-lite@0.6.3:
   version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
 jsdom@^19.0.0:
   version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a"
+  resolved "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz"
   integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==
   dependencies:
     abab "^2.0.5"
@@ -331,22 +331,22 @@ jsdom@^19.0.0:
 
 jwt-decode@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
+  resolved "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz"
   integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==
 
 loglevel@^1.7.1:
   version "1.8.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4"
+  resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz"
   integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg==
 
 matrix-events-sdk@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
+  resolved "https://registry.npmjs.org/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz"
   integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
 
 matrix-js-sdk@^27.2.0:
   version "27.2.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.2.0.tgz#c06d5ce9f961b18ed62593e1c01eeaec754725bc"
+  resolved "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-27.2.0.tgz"
   integrity sha512-jsoA5oPv0eQbELlOzQ6J3v1HTPU0oydqgLQNVpztsajEj6AfJYvCaZueFak8jac9RsopZlqWbP8CXI8r5MvNEA==
   dependencies:
     "@babel/runtime" "^7.12.5"
@@ -366,7 +366,7 @@ matrix-js-sdk@^27.2.0:
 
 matrix-widget-api@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.5.0.tgz#4ae3e46a7f2854f944ddaf8a5af63d72fba76c45"
+  resolved "https://registry.npmjs.org/matrix-widget-api/-/matrix-widget-api-1.5.0.tgz"
   integrity sha512-hKGfqQKK5qVMwW0Sp8l2TiuW8UuHafTvUZNSWBPghedB/rSFbVLlr0mufuEV0iq/pQ7ChW96q/WEC6Llie4SnA==
   dependencies:
     "@types/events" "^3.0.0"
@@ -374,41 +374,41 @@ matrix-widget-api@^1.5.0:
 
 mime-db@1.52.0:
   version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12:
   version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
 ms@2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 node-localstorage@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/node-localstorage/-/node-localstorage-2.2.1.tgz#869723550a4883e426cb391d2df0b563a51c7c1c"
+  resolved "https://registry.npmjs.org/node-localstorage/-/node-localstorage-2.2.1.tgz"
   integrity sha512-vv8fJuOUCCvSPjDjBLlMqYMHob4aGjkmrkaE42/mZr0VT+ZAU10jRF8oTnX9+pgU9/vYJ8P7YT3Vd6ajkmzSCw==
   dependencies:
     write-file-atomic "^1.1.4"
 
 nwsapi@^2.2.0:
   version "2.2.7"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
+  resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz"
   integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
 
 object-inspect@^1.9.0:
   version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
 oidc-client-ts@^2.2.4:
   version "2.2.5"
-  resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-2.2.5.tgz#ca0a9f791d8d9d00a1720226d3e96b50065ce015"
+  resolved "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.2.5.tgz"
   integrity sha512-omAHoLdFcylnwZeHJahOnJBwd0r78JzhmVAmsQjLGrexAnQKiHW9Ilr9FlRD5qjMikmabvaucI4k49AbQLXhmQ==
   dependencies:
     crypto-js "^4.1.1"
@@ -416,11 +416,12 @@ oidc-client-ts@^2.2.4:
 
 "olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz":
   version "3.2.14"
-  resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz#acd96c00a881d0f462e1f97a56c73742c8dbc984"
+  resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.14.tgz"
+  integrity sha512-Yz8X5+R1PL0RwJNjuH4r9WgWgXHX5v4NB093baUUE3Wh1INHEminESeur6FtIfQhVRQd8UZ9HRBh+Rd2nkNFGQ==
 
 p-retry@4:
   version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
+  resolved "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz"
   integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
   dependencies:
     "@types/retry" "0.12.0"
@@ -428,66 +429,66 @@ p-retry@4:
 
 parse5@6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
 psl@^1.1.33:
   version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 punycode@^2.1.1:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
 qs@^6.11.2:
   version "6.11.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz"
   integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
   dependencies:
     side-channel "^1.0.4"
 
 querystringify@^2.1.1:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 regenerator-runtime@^0.14.0:
   version "0.14.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz"
   integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
 
 requires-port@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 retry@^0.13.1:
   version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  resolved "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"
   integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
 
 "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 saxes@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+  resolved "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz"
   integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
   dependencies:
     xmlchars "^2.2.0"
 
 sdp-transform@^2.14.1:
   version "2.14.1"
-  resolved "https://registry.yarnpkg.com/sdp-transform/-/sdp-transform-2.14.1.tgz#2bb443583d478dee217df4caa284c46b870d5827"
+  resolved "https://registry.npmjs.org/sdp-transform/-/sdp-transform-2.14.1.tgz"
   integrity sha512-RjZyX3nVwJyCuTo5tGPx+PZWkDMCg7oOLpSlhjDdZfwUoNqG1mM8nyj31IGHyaPWXhjbP7cdK3qZ2bmkJ1GzRw==
 
 side-channel@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
   integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
   dependencies:
     call-bind "^1.0.0"
@@ -496,22 +497,22 @@ side-channel@^1.0.4:
 
 slide@^1.1.5:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+  resolved "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz"
   integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
 
 source-map@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 symbol-tree@^3.2.4:
   version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 tough-cookie@^4.0.0:
   version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz"
   integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
   dependencies:
     psl "^1.1.33"
@@ -521,24 +522,24 @@ tough-cookie@^4.0.0:
 
 tr46@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz"
   integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
   dependencies:
     punycode "^2.1.1"
 
 unhomoglyph@^1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/unhomoglyph/-/unhomoglyph-1.0.6.tgz#ea41f926d0fcf598e3b8bb2980c2ddac66b081d3"
+  resolved "https://registry.npmjs.org/unhomoglyph/-/unhomoglyph-1.0.6.tgz"
   integrity sha512-7uvcWI3hWshSADBu4JpnyYbTVc7YlhF5GDW/oPD5AxIxl34k4wXR3WDkPnzLxkN32LiTCTKMQLtKVZiwki3zGg==
 
 universalify@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz"
   integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
 
 url-parse@^1.5.3:
   version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  resolved "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"
   integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
@@ -546,43 +547,43 @@ url-parse@^1.5.3:
 
 uuid@9:
   version "9.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
 w3c-hr-time@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"
   integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
     browser-process-hrtime "^1.0.0"
 
 w3c-xmlserializer@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923"
+  resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz"
   integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==
   dependencies:
     xml-name-validator "^4.0.0"
 
 webidl-conversions@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
 whatwg-encoding@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
+  resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"
   integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
   dependencies:
     iconv-lite "0.6.3"
 
 whatwg-mimetype@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"
   integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
 whatwg-url@^10.0.0:
   version "10.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-10.0.0.tgz"
   integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==
   dependencies:
     tr46 "^3.0.0"
@@ -590,7 +591,7 @@ whatwg-url@^10.0.0:
 
 whatwg-url@^11.0.0:
   version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"
   integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
   dependencies:
     tr46 "^3.0.0"
@@ -598,7 +599,7 @@ whatwg-url@^11.0.0:
 
 write-file-atomic@^1.1.4:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz"
   integrity sha512-SdrHoC/yVBPpV0Xq/mUZQIpW2sWXAShb/V4pomcJXh92RuaO+f3UTWItiR3Px+pLnV2PvC2/bfn5cwr5X6Vfxw==
   dependencies:
     graceful-fs "^4.1.11"
@@ -607,15 +608,15 @@ write-file-atomic@^1.1.4:
 
 ws@^8.2.3:
   version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+  resolved "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"
   integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
 
 xml-name-validator@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
 xmlchars@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==