-
Notifications
You must be signed in to change notification settings - Fork 40
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.
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
definoob
wants to merge
7
commits into
reactiflux:main
Choose a base branch
from
definoob:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
bfeb69a
https://github.com/reactiflux/reactibot/issues/160
definoob 08c3341
Merge branch 'main' of github.com:reactiflux/reactibot
definoob cbcad00
Issue 173
definoob a3f3404
revert unnecessary changes
definoob 5169549
get uesr-sent messages from thread
definoob c6d2232
add reactibot ID
definoob 436c9f1
check if bot replied already
definoob File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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"; | ||
|
@@ -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
+19
to
+32
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
@@ -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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A couple notes:
|
||
return; | ||
} | ||
|
||
const starter = thread.isThread() | ||
? await thread.fetchStarterMessage() | ||
: undefined; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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)