@@ -13,20 +13,13 @@ async function fetchMeme(subreddit: string) {
13
13
}
14
14
15
15
const data = await response . json ( ) ;
16
- if ( response . status == 404 ) {
17
- data . code = 404 ;
18
- } else {
19
- data . code = 200 ;
20
16
21
- }
17
+ data . code = response . status ;
22
18
return data ;
23
19
} catch ( err : any ) {
24
20
console . error ( "Fetch error:" , err ) ;
25
21
let channel = await client . channels . cache . get ( config . log . errorChannelId ) ;
26
- channel . send ( `
27
- Error: ${ err . toString ( ) } \n
28
- In fetchAction.ts ` ) ;
29
- console . error ( err ) ;
22
+ channel . send ( `Error: ${ err . toString ( ) } \nIn fetchAction.ts` ) ;
30
23
}
31
24
}
32
25
@@ -42,19 +35,15 @@ module.exports = {
42
35
const args = await message . content . slice ( prefix . length ) . trim ( ) . split ( / + / ) ;
43
36
args . shift ( ) ;
44
37
45
-
46
-
47
38
const Embed = new EmbedBuilder ( ) ;
48
39
Embed . setColor ( '#ADD8E6' )
49
40
if ( args . length == 0 ) {
50
41
Embed . setDescription ( `Loading...(hint: You can also specify subreddit by ${ prefix } meme [subreddit]` ) ;
51
42
} else {
52
43
Embed . setDescription ( `Loading...` ) ;
53
-
54
44
}
55
45
56
46
message . channel . send ( { embeds : [ Embed ] } ) . then ( async ( sentMessage : any ) => {
57
-
58
47
59
48
if ( args . length == 0 ) {
60
49
var meme = await fetchMeme ( "" ) ;
@@ -72,9 +61,9 @@ module.exports = {
72
61
var meme = await fetchMeme ( subreddit ) ;
73
62
}
74
63
75
- if ( meme . code == 404 ) {
64
+ if ( meme . code == 404 || meme . code == 403 ) {
76
65
Embed . setAuthor ( { name : meme . message } ) ;
77
- Embed . setDescription ( 'error code: 404' ) ;
66
+ Embed . setDescription ( `Error code: ${ meme . code } ` ) ;
78
67
sentMessage . edit ( { embeds : [ Embed ] } ) ;
79
68
return ;
80
69
}
0 commit comments