Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Track a slightly fresher fork of better-discord.js #858

Merged
merged 1 commit into from
Nov 3, 2022
Merged

Track a slightly fresher fork of better-discord.js #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/858.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Prevent crashes when handling messages sent to voice channels.
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"homepage": "https://github.com/Half-Shot/matrix-appservice-discord#readme",
"dependencies": {
"@mx-puppet/matrix-discord-parser": "0.1.10",
"better-discord.js": "git+https://github.com/Sorunome/better-discord.js.git#b5a28499899fe2d9e6aa1aa3b3c5d693ae672117",
"better-discord.js": "github:matrix-org/better-discord.js#5024781db755259e88abe915630b7d5b3ba5f48f",
"better-sqlite3": "^7.1.0",
"command-line-args": "^5.1.1",
"command-line-usage": "^6.1.0",
Expand Down
6 changes: 3 additions & 3 deletions src/bot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ export class DiscordBot {
client.on("userUpdate", async (_, user) => {
try {
if (!(user instanceof Discord.User)) {
log.warn(`Ignoring update for ${user.username}. User was partial.`);
log.warn(`Ignoring update for ${(<any>user).username}. User was partial.`);
return;
}
await this.userSync.OnUpdateUser(user);
Expand All @@ -352,7 +352,7 @@ export class DiscordBot {
client.on("guildMemberAdd", async (member) => {
try {
if (!(member instanceof Discord.GuildMember)) {
log.warn(`Ignoring update for ${member.guild.id} ${member.id}. User was partial.`);
log.warn(`Ignoring update for ${(<any>member).guild?.id} ${(<any>member).id}. User was partial.`);
return;
}
await this.userSync.OnAddGuildMember(member);
Expand All @@ -370,7 +370,7 @@ export class DiscordBot {
client.on("guildMemberUpdate", async (_, member) => {
try {
if (!(member instanceof Discord.GuildMember)) {
log.warn(`Ignoring update for ${member.guild.id} ${member.id}. User was partial.`);
log.warn(`Ignoring update for ${(<any>member).guild.id} ${(<any>member).id}. User was partial.`);
return;
}
await this.userSync.OnUpdateGuildMember(member);
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,14 +885,14 @@ bcrypt-pbkdf@^1.0.0:
dependencies:
tweetnacl "^0.14.3"

"better-discord.js@git+https://github.com/Sorunome/better-discord.js.git#b5a28499899fe2d9e6aa1aa3b3c5d693ae672117":
version "12.3.1"
resolved "git+https://github.com/Sorunome/better-discord.js.git#b5a28499899fe2d9e6aa1aa3b3c5d693ae672117"
"better-discord.js@github:matrix-org/better-discord.js#5024781db755259e88abe915630b7d5b3ba5f48f":
version "12.5.1"
resolved "https://codeload.github.com/matrix-org/better-discord.js/tar.gz/5024781db755259e88abe915630b7d5b3ba5f48f"
dependencies:
"@discordjs/collection" "^0.1.6"
"@discordjs/form-data" "^3.0.1"
abort-controller "^3.0.0"
node-fetch "^2.6.0"
node-fetch "^2.6.1"
prism-media "^1.2.2"
setimmediate "^1.0.5"
tweetnacl "^1.0.3"
Expand Down Expand Up @@ -3018,7 +3018,7 @@ node-emoji@^1.10.0:
dependencies:
lodash "^4.17.21"

node-fetch@^2.6.0:
node-fetch@^2.6.1:
version "2.6.7"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
Expand Down