@@ -37,7 +37,8 @@ export class ShortLinkService {
37
37
}
38
38
39
39
const mergeMessages = messages . join ( ' ' ) ;
40
- const urlRegex = / ( h t t p s ? : \/ \/ (?: w w w \. ) ? [ - a - z A - Z 0 - 9 @ : % . _ \+ ~ # = ] { 1 , 256 } \. [ a - z A - Z 0 - 9 ( ) ] { 1 , 6 } \b (?: [ - a - z A - Z 0 - 9 ( ) @ : % _ \+ . ~ # ? & / / = ] * ) ) / gm;
40
+ const urlRegex =
41
+ / ( h t t p s ? : \/ \/ (?: w w w \. ) ? [ - a - z A - Z 0 - 9 @ : % . _ \+ ~ # = ] { 1 , 256 } \. [ a - z A - Z 0 - 9 ( ) ] { 1 , 6 } \b (?: [ - a - z A - Z 0 - 9 ( ) @ : % _ \+ . ~ # ? & / / = ] * ) ) / gm;
41
42
const urls = mergeMessages . match ( urlRegex ) ;
42
43
if ( ! urls ) {
43
44
// No URLs found, return the original text
@@ -49,12 +50,20 @@ export class ShortLinkService {
49
50
) ;
50
51
}
51
52
52
- async convertTextToShortLinks ( id : string , messages : string [ ] ) {
53
+ async convertTextToShortLinks ( id : string , messagesList : string [ ] ) {
53
54
if ( ShortLinkService . provider . shortLinkDomain === 'empty' ) {
54
- return messages ;
55
+ return messagesList ;
55
56
}
56
57
57
- const urlRegex = / ( h t t p s ? : \/ \/ (?: w w w \. ) ? [ - a - z A - Z 0 - 9 @ : % . _ \+ ~ # = ] { 1 , 256 } \. [ a - z A - Z 0 - 9 ( ) ] { 1 , 6 } \b (?: [ - a - z A - Z 0 - 9 ( ) @ : % _ \+ . ~ # ? & / / = ] * ) ) / gm;
58
+ const messages = messagesList . map ( ( text ) => {
59
+ return text
60
+ . replace ( / & a m p ; / g, '&' )
61
+ . replace ( / & q u e s t ; / g, '?' )
62
+ . replace ( / & n u m ; / g, '#' ) ;
63
+ } ) ;
64
+
65
+ const urlRegex =
66
+ / ( h t t p s ? : \/ \/ (?: w w w \. ) ? [ - a - z A - Z 0 - 9 @ : % . _ \+ ~ # = ] { 1 , 256 } \. [ a - z A - Z 0 - 9 ( ) ] { 1 , 6 } \b (?: [ - a - z A - Z 0 - 9 ( ) @ : % _ \+ . ~ # ? & / / = ] * ) ) / gm;
58
67
return Promise . all (
59
68
messages . map ( async ( text ) => {
60
69
const urls = uniq ( text . match ( urlRegex ) ) ;
0 commit comments