@@ -76,7 +76,7 @@ const (
76
76
RELEASE_API_URL = "https://api.github.com/repos/Seklfreak/discord-image-downloader-go/releases/latest"
77
77
IMGUR_CLIENT_ID = "a39473314df3f59"
78
78
REGEXP_URL_TWITTER = `^http(s?):\/\/pbs(-[0-9]+)?\.twimg\.com\/media\/[^\./]+\.(jpg|png)((\:[a-z]+)?)$`
79
- REGEXP_URL_TWITTER_STATUS = `^http(s?):\/\/(www\.)?twitter\.com\/([A-Za-z0-9-_\.]+\/status\/|statuses\/)([0-9]+)$`
79
+ REGEXP_URL_TWITTER_STATUS = `^http(s?):\/\/(www\.)?twitter\.com\/([A-Za-z0-9-_\.]+\/status\/|statuses\/|i\/web\/status\/ )([0-9]+)$`
80
80
REGEXP_URL_TISTORY = `^http(s?):\/\/[a-z0-9]+\.uf\.tistory\.com\/(image|original)\/[A-Z0-9]+$`
81
81
REGEXP_URL_TISTORY_WITH_CDN = `^http(s)?:\/\/[0-9a-z]+.daumcdn.net\/[a-z]+\/[a-zA-Z0-9\.]+\/\?scode=mtistory&fname=http(s?)%3A%2F%2F[a-z0-9]+\.uf\.tistory\.com%2F(image|original)%2F[A-Z0-9]+$`
82
82
REGEXP_URL_GFYCAT = `^http(s?):\/\/gfycat\.com\/(gifs\/detail\/)?[A-Za-z]+$`
@@ -328,95 +328,95 @@ func getDownloadLinks(inputURL string, channelID string, interactive bool) map[s
328
328
if RegexpUrlTwitter .MatchString (inputURL ) {
329
329
links , err := getTwitterUrls (inputURL )
330
330
if err != nil {
331
- fmt .Println ("twitter inputURL failed," , inputURL , "," , err )
331
+ fmt .Println ("twitter URL failed," , inputURL , "," , err )
332
332
} else if len (links ) > 0 {
333
333
return skipDuplicateLinks (links , channelID , interactive )
334
334
}
335
335
}
336
336
if RegexpUrlTwitterStatus .MatchString (inputURL ) {
337
337
links , err := getTwitterStatusUrls (inputURL , channelID )
338
338
if err != nil {
339
- fmt .Println ("twitter status inputURL failed," , inputURL , "," , err )
339
+ fmt .Println ("twitter status URL failed," , inputURL , "," , err )
340
340
} else if len (links ) > 0 {
341
341
return skipDuplicateLinks (links , channelID , interactive )
342
342
}
343
343
}
344
344
if RegexpUrlTistory .MatchString (inputURL ) {
345
345
links , err := getTistoryUrls (inputURL )
346
346
if err != nil {
347
- fmt .Println ("tistory inputURL failed," , inputURL , "," , err )
347
+ fmt .Println ("tistory URL failed," , inputURL , "," , err )
348
348
} else if len (links ) > 0 {
349
349
return skipDuplicateLinks (links , channelID , interactive )
350
350
}
351
351
}
352
352
if RegexpUrlGfycat .MatchString (inputURL ) {
353
353
links , err := getGfycatUrls (inputURL )
354
354
if err != nil {
355
- fmt .Println ("gfycat inputURL failed," , inputURL , "," , err )
355
+ fmt .Println ("gfycat URL failed," , inputURL , "," , err )
356
356
} else if len (links ) > 0 {
357
357
return skipDuplicateLinks (links , channelID , interactive )
358
358
}
359
359
}
360
360
if RegexpUrlInstagram .MatchString (inputURL ) {
361
361
links , err := getInstagramUrls (inputURL )
362
362
if err != nil {
363
- fmt .Println ("instagram inputURL failed," , inputURL , "," , err )
363
+ fmt .Println ("instagram URL failed," , inputURL , "," , err )
364
364
} else if len (links ) > 0 {
365
365
return skipDuplicateLinks (links , channelID , interactive )
366
366
}
367
367
}
368
368
if RegexpUrlImgurSingle .MatchString (inputURL ) {
369
369
links , err := getImgurSingleUrls (inputURL )
370
370
if err != nil {
371
- fmt .Println ("imgur single inputURL failed, " , inputURL , "," , err )
371
+ fmt .Println ("imgur single URL failed, " , inputURL , "," , err )
372
372
} else if len (links ) > 0 {
373
373
return skipDuplicateLinks (links , channelID , interactive )
374
374
}
375
375
}
376
376
if RegexpUrlImgurAlbum .MatchString (inputURL ) {
377
377
links , err := getImgurAlbumUrls (inputURL )
378
378
if err != nil {
379
- fmt .Println ("imgur album inputURL failed, " , inputURL , "," , err )
379
+ fmt .Println ("imgur album URL failed, " , inputURL , "," , err )
380
380
} else if len (links ) > 0 {
381
381
return skipDuplicateLinks (links , channelID , interactive )
382
382
}
383
383
}
384
384
if RegexpUrlGoogleDrive .MatchString (inputURL ) {
385
385
links , err := getGoogleDriveUrls (inputURL )
386
386
if err != nil {
387
- fmt .Println ("google drive album inputURL failed, " , inputURL , "," , err )
387
+ fmt .Println ("google drive album URL failed, " , inputURL , "," , err )
388
388
} else if len (links ) > 0 {
389
389
return skipDuplicateLinks (links , channelID , interactive )
390
390
}
391
391
}
392
392
if RegexpUrlFlickrPhoto .MatchString (inputURL ) {
393
393
links , err := getFlickrPhotoUrls (inputURL )
394
394
if err != nil {
395
- fmt .Println ("flickr photo inputURL failed, " , inputURL , "," , err )
395
+ fmt .Println ("flickr photo URL failed, " , inputURL , "," , err )
396
396
} else if len (links ) > 0 {
397
397
return skipDuplicateLinks (links , channelID , interactive )
398
398
}
399
399
}
400
400
if RegexpUrlFlickrAlbum .MatchString (inputURL ) {
401
401
links , err := getFlickrAlbumUrls (inputURL )
402
402
if err != nil {
403
- fmt .Println ("flickr album inputURL failed, " , inputURL , "," , err )
403
+ fmt .Println ("flickr album URL failed, " , inputURL , "," , err )
404
404
} else if len (links ) > 0 {
405
405
return skipDuplicateLinks (links , channelID , interactive )
406
406
}
407
407
}
408
408
if RegexpUrlFlickrAlbumShort .MatchString (inputURL ) {
409
409
links , err := getFlickrAlbumShortUrls (inputURL )
410
410
if err != nil {
411
- fmt .Println ("flickr album short inputURL failed, " , inputURL , "," , err )
411
+ fmt .Println ("flickr album short URL failed, " , inputURL , "," , err )
412
412
} else if len (links ) > 0 {
413
413
return skipDuplicateLinks (links , channelID , interactive )
414
414
}
415
415
}
416
416
if RegexpUrlStreamable .MatchString (inputURL ) {
417
417
links , err := getStreamableUrls (inputURL )
418
418
if err != nil {
419
- fmt .Println ("streamable inputURL failed, " , inputURL , "," , err )
419
+ fmt .Println ("streamable URL failed, " , inputURL , "," , err )
420
420
} else if len (links ) > 0 {
421
421
return skipDuplicateLinks (links , channelID , interactive )
422
422
}
@@ -435,7 +435,7 @@ func getDownloadLinks(inputURL string, channelID string, interactive bool) map[s
435
435
if interactive {
436
436
links , err := getGoogleDriveFolderUrls (inputURL )
437
437
if err != nil {
438
- fmt .Println ("google drive folder inputURL failed, " , inputURL , "," , err )
438
+ fmt .Println ("google drive folder URL failed, " , inputURL , "," , err )
439
439
} else if len (links ) > 0 {
440
440
return skipDuplicateLinks (links , channelID , interactive )
441
441
}
0 commit comments