murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed avatar arg issue, fixed motivate bottom text

Browse source
This commit is contained in:
Essem 2021-12-30 14:27:18 -06:00
parent e66f45ba0f
commit 1a76d4d0c4
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
commands/general/avatar.js
View file

@ -7,7 +7,7 @@ class AvatarCommand extends Command {
} else if (await this.ipc.fetchUser(this.args[0])) { } else if (await this.ipc.fetchUser(this.args[0])) {
const user = await this.ipc.fetchUser(this.args[0]); const user = await this.ipc.fetchUser(this.args[0]);
return user.avatar ? this.client._formatImage(`/avatars/${user.id}/${user.avatar}`, null, 1024) : `https://cdn.discordapp.com/embed/avatars/${user.discriminator % 5}.png`; // hacky "solution" return user.avatar ? this.client._formatImage(`/avatars/${user.id}/${user.avatar}`, null, 1024) : `https://cdn.discordapp.com/embed/avatars/${user.discriminator % 5}.png`; // hacky "solution"
} else if (this.args[0].match(/^<?[@#]?[&!]?\d+>?$/) && this.args[0] >= 21154535154122752) { } else if (this.args[0] && this.args[0].match(/^<?[@#]?[&!]?\d+>?$/) && this.args[0] >= 21154535154122752) {
try { try {
const user = await this.client.getRESTUser(this.args[0]); const user = await this.client.getRESTUser(this.args[0]);
return user.avatar ? this.client._formatImage(`/avatars/${user.id}/${user.avatar}`, null, 1024) : `https://cdn.discordapp.com/embed/avatars/${user.discriminator % 5}.png`; // repeat of hacky "solution" from above return user.avatar ? this.client._formatImage(`/avatars/${user.id}/${user.avatar}`, null, 1024) : `https://cdn.discordapp.com/embed/avatars/${user.discriminator % 5}.png`; // repeat of hacky "solution" from above

2
natives/motivate.cc
View file

@ -58,7 +58,7 @@ Napi::Value Motivate(const Napi::CallbackInfo &info) {
bottom.fontPointsize(28); bottom.fontPointsize(28);
bottom.read("pango:<span font_family=\"" + bottom.read("pango:<span font_family=\"" +
(font == "roboto" ? "Roboto Condensed" : font) + (font == "roboto" ? "Roboto Condensed" : font) +
"\" foreground='white'>" + top_text + "</span>"); "\" foreground='white'>" + bottom_text + "</span>");
bottom.extent(Geometry(to_string(bottom.columns()) + "x" + bottom.extent(Geometry(to_string(bottom.columns()) + "x" +
to_string(bottom.rows() + 20)), to_string(bottom.rows() + 20)),
"black", Magick::NorthGravity); "black", Magick::NorthGravity);

1
package.json
View file

@ -3,6 +3,7 @@
"version": "1.6.4", "version": "1.6.4",
"description": "A Discord bot with miscellaneous features", "description": "A Discord bot with miscellaneous features",
"exports": "./app.js", "exports": "./app.js",
"bin": "./app.js",
"type": "module", "type": "module",
"engines": { "engines": {
"node": ">=15" "node": ">=15"