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

Make Select Image always return an ephemeral image, fix playing suffix

This commit is contained in:
Essem 2022-09-01 15:03:16 -05:00
parent 603e732704
commit 9788314868
No known key found for this signature in database
GPG Key ID: 7D497397CC3A2A8C
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
commands/message/select-image.js
View File

@ -15,7 +15,6 @@ class SelectImageCommand extends Command {
return "I've been rate-limited by Tenor. Please try uploading your GIF elsewhere."; return "I've been rate-limited by Tenor. Please try uploading your GIF elsewhere.";
} }
selectedImages.set(this.author.id, image); selectedImages.set(this.author.id, image);
this.success = true;
return "The image has been selected for your next command."; return "The image has been selected for your next command.";
} }
} }

11
shard.js
View File

@ -26,13 +26,12 @@ import { generateList, createPage } from "./utils/help.js";
// whether a broadcast is currently in effect // whether a broadcast is currently in effect
let broadcast = false; let broadcast = false;
const playingSuffix = !types.classic ? ` | @${this.bot.user.username} help` : "";
class Shard extends BaseClusterWorker { class Shard extends BaseClusterWorker {
constructor(bot) { constructor(bot) {
super(bot); super(bot);
console.info = (str) => this.ipc.sendToAdmiral("info", str); console.info = (str) => this.ipc.sendToAdmiral("info", str);
this.playingSuffix = types.classic ? ` | @${this.bot.user.username} help` : "";
this.init(); this.init();
} }
@ -120,7 +119,7 @@ class Shard extends BaseClusterWorker {
this.ipc.register("playbroadcast", (message) => { this.ipc.register("playbroadcast", (message) => {
this.bot.editStatus("dnd", { this.bot.editStatus("dnd", {
name: message + playingSuffix, name: message + this.playingSuffix,
}); });
broadcast = true; broadcast = true;
return this.ipc.broadcast("broadcastSuccess"); return this.ipc.broadcast("broadcastSuccess");
@ -128,7 +127,7 @@ class Shard extends BaseClusterWorker {
this.ipc.register("broadcastend", () => { this.ipc.register("broadcastend", () => {
this.bot.editStatus("dnd", { this.bot.editStatus("dnd", {
name: random(messages) + playingSuffix, name: random(messages) + this.playingSuffix,
}); });
broadcast = false; broadcast = false;
return this.ipc.broadcast("broadcastEnd"); return this.ipc.broadcast("broadcastEnd");
@ -141,7 +140,7 @@ class Shard extends BaseClusterWorker {
if (broadcastMessage) { if (broadcastMessage) {
broadcast = true; broadcast = true;
this.bot.editStatus("dnd", { this.bot.editStatus("dnd", {
name: broadcastMessage + playingSuffix, name: broadcastMessage + this.playingSuffix,
}); });
} }
@ -154,7 +153,7 @@ class Shard extends BaseClusterWorker {
activityChanger() { activityChanger() {
if (!broadcast) { if (!broadcast) {
this.bot.editStatus("dnd", { this.bot.editStatus("dnd", {
name: random(messages) + playingSuffix, name: random(messages) + this.playingSuffix,
}); });
} }
setTimeout(this.activityChanger.bind(this), 900000); setTimeout(this.activityChanger.bind(this), 900000);