@@ -101,13 +101,13 @@ public static function verifyAttachments($data)
101
101
'string ' ,
102
102
Rule::in ($ mediaTypes )
103
103
],
104
- '*.url ' => 'required|url|max:255 ' ,
104
+ '*.url ' => 'required|url ' ,
105
105
'*.mediaType ' => [
106
106
'required ' ,
107
107
'string ' ,
108
108
Rule::in ($ mimeTypes )
109
109
],
110
- '*.name ' => 'sometimes|nullable|string|max:255 '
110
+ '*.name ' => 'sometimes|nullable|string '
111
111
])->passes ();
112
112
113
113
return $ valid ;
@@ -665,12 +665,13 @@ public static function importNoteAttachment($data, Status $status)
665
665
foreach ($ attachments as $ media ) {
666
666
$ type = $ media ['mediaType ' ];
667
667
$ url = $ media ['url ' ];
668
- $ blurhash = isset ($ media ['blurhash ' ]) ? $ media ['blurhash ' ] : null ;
669
- $ license = isset ($ media ['license ' ]) ? License::nameToId ($ media ['license ' ]) : null ;
670
668
$ valid = self ::validateUrl ($ url );
671
669
if (in_array ($ type , $ allowed ) == false || $ valid == false ) {
672
670
continue ;
673
671
}
672
+ $ blurhash = isset ($ media ['blurhash ' ]) ? $ media ['blurhash ' ] : null ;
673
+ $ license = isset ($ media ['license ' ]) ? License::nameToId ($ media ['license ' ]) : null ;
674
+ $ caption = $ media ['name ' ] ? Purify::clean ($ media ['name ' ]) : null ;
674
675
675
676
$ media = new Media ();
676
677
$ media ->blurhash = $ blurhash ;
@@ -680,6 +681,7 @@ public static function importNoteAttachment($data, Status $status)
680
681
$ media ->user_id = null ;
681
682
$ media ->media_path = $ url ;
682
683
$ media ->remote_url = $ url ;
684
+ $ media ->caption = $ caption ;
683
685
if ($ license ) {
684
686
$ media ->license = $ license ;
685
687
}
0 commit comments