From 824557266b720c5bdd14e57926f6775f21f5c589 Mon Sep 17 00:00:00 2001 From: Snazzah Date: Wed, 2 Oct 2024 20:31:53 -0500 Subject: [PATCH] chore(deps): update dysnomia --- apps/bot/package.json | 3 +- apps/bot/src/textCommands/join.ts | 2 +- apps/bot/src/textCommands/leave.ts | 2 +- apps/bot/src/util.ts | 2 +- yarn.lock | 113 +++++++++++++++++++++++++---- 5 files changed, 105 insertions(+), 17 deletions(-) diff --git a/apps/bot/package.json b/apps/bot/package.json index 789f377a..a550cc25 100644 --- a/apps/bot/package.json +++ b/apps/bot/package.json @@ -36,7 +36,7 @@ "dbots": "^11.0.0", "dexare": "^3.0.1", "dotenv": "^16.0.3", - "eris": "github:CraigChat/dysnomia#craig-master", + "eris": "github:CraigChat/dysnomia#2e2e69481c2bc7097070068d502b95ff31d26c8a", "eventemitter3": "^4.0.7", "fastq": "^1.13.0", "i18next": "^21.10.0", @@ -47,6 +47,7 @@ "nanoid": "^3.3.4", "node-fetch": "2.6.7", "slash-create": "^5.10.0", + "sodium-native": "^4.1.1", "winston": "^3.11.0", "ws": "^8.10.0" }, diff --git a/apps/bot/src/textCommands/join.ts b/apps/bot/src/textCommands/join.ts index 0ca26284..a5993879 100644 --- a/apps/bot/src/textCommands/join.ts +++ b/apps/bot/src/textCommands/join.ts @@ -37,7 +37,7 @@ export default class JoinCommand extends TextCommand { style: ButtonStyle.LINK, label: 'What are slash commands?', url: 'https://support.discord.com/hc/en-us/articles/1500000368501-Slash-Commands-FAQ', - emoji: { name: '❔', id: null } + emoji: { name: '❔' } } ] } diff --git a/apps/bot/src/textCommands/leave.ts b/apps/bot/src/textCommands/leave.ts index a4a6303c..da39320c 100644 --- a/apps/bot/src/textCommands/leave.ts +++ b/apps/bot/src/textCommands/leave.ts @@ -51,7 +51,7 @@ export default class LeaveCommand extends TextCommand { style: ButtonStyle.LINK, label: 'What are slash commands?', url: 'https://support.discord.com/hc/en-us/articles/1500000368501-Slash-Commands-FAQ', - emoji: { name: '❔', id: null } + emoji: { name: '❔' } } ] } diff --git a/apps/bot/src/util.ts b/apps/bot/src/util.ts index e48e31f2..e66e653f 100644 --- a/apps/bot/src/util.ts +++ b/apps/bot/src/util.ts @@ -169,7 +169,7 @@ export function makeDownloadMessage(recording: Recording, parsedRewards: ParsedR } : null ].filter((c) => !!c) - } as Eris.MessageContent; + } as Eris.MessageContent<'hasNonce'>; } export async function blessServer(userID: string, guildID: string): Promise { diff --git a/yarn.lock b/yarn.lock index 13f5834f..52422b0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -952,6 +952,81 @@ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== +"@stablelib/aead@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/aead/-/aead-1.0.1.tgz#c4b1106df9c23d1b867eb9b276d8f42d5fc4c0c3" + integrity sha512-q39ik6sxGHewqtO0nP4BuSe3db5G1fEJE8ukvngS2gLkBXyy6E7pLubhbYgnkDFv6V8cWaxcE4Xn0t6LWcJkyg== + +"@stablelib/binary@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/binary/-/binary-1.0.1.tgz#c5900b94368baf00f811da5bdb1610963dfddf7f" + integrity sha512-ClJWvmL6UBM/wjkvv/7m5VP3GMr9t0osr4yVgLZsLCOz4hGN9gIAFEqnJ0TsSMAN+n840nf2cHZnA5/KFqHC7Q== + dependencies: + "@stablelib/int" "^1.0.1" + +"@stablelib/chacha20poly1305@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/chacha20poly1305/-/chacha20poly1305-1.0.1.tgz#de6b18e283a9cb9b7530d8767f99cde1fec4c2ee" + integrity sha512-MmViqnqHd1ymwjOQfghRKw2R/jMIGT3wySN7cthjXCBdO+qErNPUBnRzqNpnvIwg7JBCg3LdeCZZO4de/yEhVA== + dependencies: + "@stablelib/aead" "^1.0.1" + "@stablelib/binary" "^1.0.1" + "@stablelib/chacha" "^1.0.1" + "@stablelib/constant-time" "^1.0.1" + "@stablelib/poly1305" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/chacha@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/chacha/-/chacha-1.0.1.tgz#deccfac95083e30600c3f92803a3a1a4fa761371" + integrity sha512-Pmlrswzr0pBzDofdFuVe1q7KdsHKhhU24e8gkEwnTGOmlC7PADzLVxGdn2PoNVBBabdg0l/IfLKg6sHAbTQugg== + dependencies: + "@stablelib/binary" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/constant-time@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/constant-time/-/constant-time-1.0.1.tgz#bde361465e1cf7b9753061b77e376b0ca4c77e35" + integrity sha512-tNOs3uD0vSJcK6z1fvef4Y+buN7DXhzHDPqRLSXUel1UfqMB1PWNsnnAezrKfEwTLpN0cGH2p9NNjs6IqeD0eg== + +"@stablelib/int@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/int/-/int-1.0.1.tgz#75928cc25d59d73d75ae361f02128588c15fd008" + integrity sha512-byr69X/sDtDiIjIV6m4roLVWnNNlRGzsvxw+agj8CIEazqWGOQp2dTYgQhtyVXV9wpO6WyXRQUzLV/JRNumT2w== + +"@stablelib/poly1305@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/poly1305/-/poly1305-1.0.1.tgz#93bfb836c9384685d33d70080718deae4ddef1dc" + integrity sha512-1HlG3oTSuQDOhSnLwJRKeTRSAdFNVB/1djy2ZbS35rBSJ/PFqx9cf9qatinWghC2UbfOYD8AcrtbUQl8WoxabA== + dependencies: + "@stablelib/constant-time" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/wipe@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/wipe/-/wipe-1.0.1.tgz#d21401f1d59ade56a62e139462a97f104ed19a36" + integrity sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg== + +"@stablelib/xchacha20@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/xchacha20/-/xchacha20-1.0.1.tgz#e98808d1f7d8b20e3ff37c71a3062a2a955d9a8c" + integrity sha512-1YkiZnFF4veUwBVhDnDYwo6EHeKzQK4FnLiO7ezCl/zu64uG0bCCAUROJaBkaLH+5BEsO3W7BTXTguMbSLlWSw== + dependencies: + "@stablelib/binary" "^1.0.1" + "@stablelib/chacha" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + +"@stablelib/xchacha20poly1305@~1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@stablelib/xchacha20poly1305/-/xchacha20poly1305-1.0.1.tgz#addcaf30b92dd956f76b3357888e2f91b92e7a61" + integrity sha512-B1Abj0sMJ8h3HNmGnJ7vHBrAvxuNka6cJJoZ1ILN7iuacXp7sUYcgOVEOTLWj+rtQMpspY9tXSCRLPmN1mQNWg== + dependencies: + "@stablelib/aead" "^1.0.1" + "@stablelib/chacha20poly1305" "^1.0.1" + "@stablelib/constant-time" "^1.0.1" + "@stablelib/wipe" "^1.0.1" + "@stablelib/xchacha20" "^1.0.1" + "@szmarczak/http-timer@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" @@ -2639,14 +2714,14 @@ eol@^0.9.1: resolved "https://registry.yarnpkg.com/eol/-/eol-0.9.1.tgz#f701912f504074be35c6117a5c4ade49cd547acd" integrity sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg== -"eris@github:CraigChat/dysnomia#craig-master": +"eris@github:CraigChat/dysnomia#2e2e69481c2bc7097070068d502b95ff31d26c8a": version "0.2.0-dev" - resolved "https://codeload.github.com/CraigChat/dysnomia/tar.gz/5d4ede6891da7321679f06c79bccebd539a8b16a" + resolved "https://codeload.github.com/CraigChat/dysnomia/tar.gz/2e2e69481c2bc7097070068d502b95ff31d26c8a" dependencies: - ws "^8.2.3" + ws "^8.18.0" optionalDependencies: - opusscript "^0.0.8" - tweetnacl "^1.0.3" + "@stablelib/xchacha20poly1305" "~1.0.1" + opusscript "^0.1.1" err-code@^2.0.2: version "2.0.3" @@ -4984,6 +5059,11 @@ node-forge@^1.3.1: resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== +node-gyp-build@^4.8.0: + version "4.8.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.1.tgz#976d3ad905e71b76086f4f0b0d3637fe79b6cda5" + integrity sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw== + node-gyp@^8.4.1: version "8.4.1" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937" @@ -5216,10 +5296,10 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -opusscript@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/opusscript/-/opusscript-0.0.8.tgz#00b49e81281b4d99092d013b1812af8654bd0a87" - integrity sha512-VSTi1aWFuCkRCVq+tx/BQ5q9fMnQ9pVZ3JU4UHKqTkf0ED3fKEPdr+gKAAl3IA2hj9rrP6iyq3hlcJq3HELtNQ== +opusscript@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/opusscript/-/opusscript-0.1.1.tgz#322c126b753ddbf9b0b209d0060a432805b6a34d" + integrity sha512-mL0fZZOUnXdZ78woRXp18lApwpp0lF5tozJOD1Wut0dgrA9WuQTgSels/CSmFleaAZrJi/nci5KOVtbuxeWoQA== ora@^5.4.1: version "5.4.1" @@ -6605,6 +6685,13 @@ socks@^2.6.2: ip "^2.0.0" smart-buffer "^4.2.0" +sodium-native@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/sodium-native/-/sodium-native-4.1.1.tgz#109bc924dd55c13db87c6dd30da047487595723c" + integrity sha512-LXkAfRd4FHtkQS4X6g+nRcVaN7mWVNepV06phIsC6+IZFvGh1voW5TNQiQp2twVaMf05gZqQjuS+uWLM6gHhNQ== + dependencies: + node-gyp-build "^4.8.0" + sonic-boom@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.2.0.tgz#ce9f2de7557e68be2e52c8df6d9b052e7d348143" @@ -7432,10 +7519,10 @@ ws@^8.10.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51" integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw== -ws@^8.2.3: - version "8.16.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" - integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== +ws@^8.18.0: + version "8.18.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" + integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== xtend@^4.0.2: version "4.0.2"