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

Fix "accept answer" double-sending in some cases #180

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix "accept answer" double-sending in some cases #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bfeb69a
https://github.com/reactiflux/reactibot/issues/160
definoob Jan 27, 2022
08c3341
Merge branch 'main' of github.com:reactiflux/reactibot
definoob Jan 27, 2022
cbcad00
Issue 173
definoob Feb 3, 2022
a3f3404
revert unnecessary changes
definoob Feb 3, 2022
5169549
get uesr-sent messages from thread
definoob Feb 3, 2022
c6d2232
add reactibot ID
definoob Feb 3, 2022
436c9f1
check if bot replied already
definoob Feb 3, 2022
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 src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const modRoleId = "&102870499406647296";
export const reactibot = "644375510725689369";

export const enum CHANNELS {
"helpReact" = "103696749012467712",
Expand Down
29 changes: 27 additions & 2 deletions src/features/autothread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { differenceInHours, format } from "date-fns";
import { Client } from "discord.js";
import { CHANNELS } from "../constants";
import { Client, Collection, ThreadChannel, Message } from "discord.js";
import { CHANNELS, reactibot } from "../constants";
import {
constructDiscordLink,
fetchReactionMembers,
isHelpful,
isStaff,
fetchMessagesByUser,
} from "../helpers/discord";
import { sleep } from "../helpers/misc";
import { ChannelHandlers } from "../types";
Expand All @@ -15,6 +16,20 @@ const CHECKS = ["☑️", "✔️", "✅"];
const IDLE_TIMEOUT = 12;
const STAFF_ACCEPT_THRESHOLD = 2;

const checkIfBotReplied = (
messages: Collection<string, Message<boolean>>,
): boolean => {
let flag = 0;

messages.forEach((message) => {
if (message.content.includes("This question has an answer!")) {
flag++;
}
});

return flag > 0;
Comment on lines +22 to +30
Copy link
Member

@vcarl vcarl Feb 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about: (prettier might complain, my dev laptop is out of commission atm)

Suggested change
let flag = 0;
messages.forEach((message) => {
if (message.content.includes("This question has an answer!")) {
flag++;
}
});
return flag > 0;
return messages.some((message) =>
message.content.includes("This question has an answer!")
);

};

Comment on lines +19 to +32
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me know if I can improve this function in any way.

const autoThread: ChannelHandlers = {
handleMessage: async ({ msg: maybeMessage }) => {
const msg = maybeMessage.partial
Expand Down Expand Up @@ -55,6 +70,16 @@ const autoThread: ChannelHandlers = {
}

const { channel: thread, author, guild } = await reaction.message.fetch();

const threadMessages = fetchMessagesByUser(
thread as ThreadChannel,
reactibot,
);

if (checkIfBotReplied(threadMessages)) {
Comment on lines +74 to +79
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple notes:

  • fetchMessagesByUser is a relatively expensive call, I think we should move it further down in the logic so it's only run when absolutely necessary -- we have less expensive calls that can bail out earlier
  • I'd prefer to avoid as, as that bails out of type checking. There's a thread.isThread() assertion that perserves type safety. There's an implied "return early if it's not a thread" here, maybe we could make that more explicit and move this code further down to remove the need to cast

return;
}

const starter = thread.isThread()
? await thread.fetchStarterMessage()
: undefined;
Expand Down
4 changes: 4 additions & 0 deletions src/helpers/discord.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
Guild,
MessageReaction,
PartialMessageReaction,
ThreadChannel,
} from "discord.js";

const staffRoles = ["mvp", "moderator", "admin", "admins"];
Expand Down Expand Up @@ -41,3 +42,6 @@ export const fetchReactionMembers = (
.then((users) =>
Promise.all(users.map((user) => guild.members.fetch(user.id))),
);

export const fetchMessagesByUser = (thread: ThreadChannel, userID: string) =>
thread.messages.cache.filter((message) => message.author.id === userID);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This relies on the messages being cached, which won't be true for threads that were created before the bot restarted. Is it feasible to make this something like, thread.messages.fetch()? (I don't have a dev computer handy or I'd check, sorry)