@@ -128,82 +128,80 @@ async function sendWebhooks(voteData: VoteData) {
128
128
webhookURL = config . discordCompletelyIncorrectReportWebhookURL ;
129
129
}
130
130
131
- if ( config . newLeafURLs !== null ) {
132
- const videoID = submissionInfoRow . videoID ;
133
- const data = await getVideoDetails ( videoID ) ;
134
-
135
- const isUpvote = voteData . incrementAmount > 0 ;
136
- // Send custom webhooks
137
- dispatchEvent ( isUpvote ? "vote.up" : "vote.down" , {
131
+ const videoID = submissionInfoRow . videoID ;
132
+ const data = await getVideoDetails ( videoID ) ;
133
+
134
+ const isUpvote = voteData . incrementAmount > 0 ;
135
+ // Send custom webhooks
136
+ dispatchEvent ( isUpvote ? "vote.up" : "vote.down" , {
137
+ "user" : {
138
+ "status" : getVoteAuthorRaw ( userSubmissionCountRow . submissionCount , voteData . isTempVIP , voteData . isVIP , voteData . isOwnSubmission ) ,
139
+ } ,
140
+ "video" : {
141
+ "id" : submissionInfoRow . videoID ,
142
+ "title" : data ?. title ,
143
+ "url" : `https://www.youtube.com/watch?v=${ videoID } ` ,
144
+ "thumbnail" : getMaxResThumbnail ( videoID ) ,
145
+ } ,
146
+ "submission" : {
147
+ "UUID" : voteData . UUID ,
148
+ "views" : voteData . row . views ,
149
+ "category" : voteData . category ,
150
+ "startTime" : submissionInfoRow . startTime ,
151
+ "endTime" : submissionInfoRow . endTime ,
138
152
"user" : {
139
- "status" : getVoteAuthorRaw ( userSubmissionCountRow . submissionCount , voteData . isTempVIP , voteData . isVIP , voteData . isOwnSubmission ) ,
153
+ "UUID" : submissionInfoRow . userID ,
154
+ "username" : submissionInfoRow . userName ,
155
+ "submissions" : {
156
+ "total" : submissionInfoRow . count ,
157
+ "ignored" : submissionInfoRow . disregarded ,
158
+ } ,
140
159
} ,
141
- "video" : {
142
- "id" : submissionInfoRow . videoID ,
160
+ } ,
161
+ "votes" : {
162
+ "before" : voteData . row . votes ,
163
+ "after" : ( voteData . row . votes + voteData . incrementAmount - voteData . oldIncrementAmount ) ,
164
+ } ,
165
+ } ) ;
166
+
167
+ // Send discord message
168
+ if ( webhookURL !== null && ! isUpvote ) {
169
+ axios . post ( webhookURL , {
170
+ "embeds" : [ {
143
171
"title" : data ?. title ,
144
- "url" : `https://www.youtube.com/watch?v=${ videoID } ` ,
145
- "thumbnail" : getMaxResThumbnail ( videoID ) ,
146
- } ,
147
- "submission" : {
148
- "UUID" : voteData . UUID ,
149
- "views" : voteData . row . views ,
150
- "category" : voteData . category ,
151
- "startTime" : submissionInfoRow . startTime ,
152
- "endTime" : submissionInfoRow . endTime ,
153
- "user" : {
154
- "UUID" : submissionInfoRow . userID ,
155
- "username" : submissionInfoRow . userName ,
156
- "submissions" : {
157
- "total" : submissionInfoRow . count ,
158
- "ignored" : submissionInfoRow . disregarded ,
159
- } ,
172
+ "url" : `https://www.youtube.com/watch?v=${ submissionInfoRow . videoID } &t=${ ( submissionInfoRow . startTime . toFixed ( 0 ) - 2 ) } s#requiredSegment=${ voteData . UUID } ` ,
173
+ "description" : `**${ voteData . row . votes } Votes Prior | \
174
+ ${ ( voteData . row . votes + voteData . incrementAmount - voteData . oldIncrementAmount ) } Votes Now | ${ voteData . row . views } \
175
+ Views**\n\n**Locked**: ${ voteData . row . locked } \n\n**Submission ID:** ${ voteData . UUID } \
176
+ \n**Category:** ${ submissionInfoRow . category } \
177
+ \n\n**Submitted by:** ${ submissionInfoRow . userName } \n${ submissionInfoRow . userID } \
178
+ \n\n**Total User Submissions:** ${ submissionInfoRow . count } \
179
+ \n**Ignored User Submissions:** ${ submissionInfoRow . disregarded } \
180
+ \n\n**Timestamp:** \
181
+ ${ getFormattedTime ( submissionInfoRow . startTime ) } to ${ getFormattedTime ( submissionInfoRow . endTime ) } ` ,
182
+ "color" : 10813440 ,
183
+ "author" : {
184
+ "name" : voteData . finalResponse ?. webhookMessage ??
185
+ voteData . finalResponse ?. finalMessage ??
186
+ `${ getVoteAuthor ( userSubmissionCountRow . submissionCount , voteData . isTempVIP , voteData . isVIP , voteData . isOwnSubmission ) } ${ voteData . row . locked ? " (Locked)" : "" } ` ,
160
187
} ,
161
- } ,
162
- "votes" : {
163
- "before" : voteData . row . votes ,
164
- "after" : ( voteData . row . votes + voteData . incrementAmount - voteData . oldIncrementAmount ) ,
165
- } ,
166
- } ) ;
167
-
168
- // Send discord message
169
- if ( webhookURL !== null && ! isUpvote ) {
170
- axios . post ( webhookURL , {
171
- "embeds" : [ {
172
- "title" : data ?. title ,
173
- "url" : `https://www.youtube.com/watch?v=${ submissionInfoRow . videoID } &t=${ ( submissionInfoRow . startTime . toFixed ( 0 ) - 2 ) } s#requiredSegment=${ voteData . UUID } ` ,
174
- "description" : `**${ voteData . row . votes } Votes Prior | \
175
- ${ ( voteData . row . votes + voteData . incrementAmount - voteData . oldIncrementAmount ) } Votes Now | ${ voteData . row . views } \
176
- Views**\n\n**Locked**: ${ voteData . row . locked } \n\n**Submission ID:** ${ voteData . UUID } \
177
- \n**Category:** ${ submissionInfoRow . category } \
178
- \n\n**Submitted by:** ${ submissionInfoRow . userName } \n${ submissionInfoRow . userID } \
179
- \n\n**Total User Submissions:** ${ submissionInfoRow . count } \
180
- \n**Ignored User Submissions:** ${ submissionInfoRow . disregarded } \
181
- \n\n**Timestamp:** \
182
- ${ getFormattedTime ( submissionInfoRow . startTime ) } to ${ getFormattedTime ( submissionInfoRow . endTime ) } ` ,
183
- "color" : 10813440 ,
184
- "author" : {
185
- "name" : voteData . finalResponse ?. webhookMessage ??
186
- voteData . finalResponse ?. finalMessage ??
187
- `${ getVoteAuthor ( userSubmissionCountRow . submissionCount , voteData . isTempVIP , voteData . isVIP , voteData . isOwnSubmission ) } ${ voteData . row . locked ? " (Locked)" : "" } ` ,
188
- } ,
189
- "thumbnail" : {
190
- "url" : getMaxResThumbnail ( videoID ) ,
191
- } ,
192
- } ] ,
193
- } )
194
- . then ( res => {
195
- if ( res . status >= 400 ) {
196
- Logger . error ( "Error sending reported submission Discord hook" ) ;
197
- Logger . error ( JSON . stringify ( ( res . data ) ) ) ;
198
- Logger . error ( "\n" ) ;
199
- }
200
- } )
201
- . catch ( err => {
202
- Logger . error ( "Failed to send reported submission Discord hook." ) ;
203
- Logger . error ( JSON . stringify ( err ) ) ;
188
+ "thumbnail" : {
189
+ "url" : getMaxResThumbnail ( videoID ) ,
190
+ } ,
191
+ } ] ,
192
+ } )
193
+ . then ( res => {
194
+ if ( res . status >= 400 ) {
195
+ Logger . error ( "Error sending reported submission Discord hook" ) ;
196
+ Logger . error ( JSON . stringify ( ( res . data ) ) ) ;
204
197
Logger . error ( "\n" ) ;
205
- } ) ;
206
- }
198
+ }
199
+ } )
200
+ . catch ( err => {
201
+ Logger . error ( "Failed to send reported submission Discord hook." ) ;
202
+ Logger . error ( JSON . stringify ( err ) ) ;
203
+ Logger . error ( "\n" ) ;
204
+ } ) ;
207
205
}
208
206
}
209
207
}
0 commit comments