Skip to content

Commit 314c83c

Browse files
committed
api [nfc]: Rename field UploadFileResult.url from "uri"
Like elsewhere in our codebase, use the standard term "URL": https://github.com/zulip/zulip-mobile/blob/main/docs/style.md#url-not-uri
1 parent f9ea6c9 commit 314c83c

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

lib/api/route/messages.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,11 @@ Future<UploadFileResult> uploadFile(
315315

316316
@JsonSerializable(fieldRename: FieldRename.snake)
317317
class UploadFileResult {
318-
final String uri;
318+
@JsonKey(name: 'uri')
319+
final String url;
319320

320321
UploadFileResult({
321-
required this.uri,
322+
required this.url,
322323
});
323324

324325
factory UploadFileResult.fromJson(Map<String, dynamic> json) =>

lib/api/route/messages.g.dart

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/widgets/compose_box.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ Future<void> _uploadFiles({
979979
filename: filename,
980980
contentType: mimeType,
981981
);
982-
url = Uri.parse(result.uri);
982+
url = Uri.parse(result.url);
983983
} catch (e) {
984984
if (!context.mounted) return;
985985
// TODO(#741): Specifically handle `413 Payload Too Large`

test/api/route/messages_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ void main() {
567567
required String? contentType,
568568
}) async {
569569
connection.prepare(json:
570-
UploadFileResult(uri: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/$filename').toJson());
570+
UploadFileResult(url: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/$filename').toJson());
571571
await uploadFile(connection,
572572
content: Stream.fromIterable(content),
573573
length: length,

test/widgets/compose_box_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ void main() {
10701070
size: 12345,
10711071
)]);
10721072
connection.prepare(delay: const Duration(seconds: 1), json:
1073-
UploadFileResult(uri: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/image.jpg').toJson());
1073+
UploadFileResult(url: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/image.jpg').toJson());
10741074

10751075
await tester.tap(find.byIcon(ZulipIcons.image));
10761076
await tester.pump();
@@ -1129,7 +1129,7 @@ void main() {
11291129
path: '/private/var/mobile/Containers/Data/Application/foo/tmp/image.jpg',
11301130
);
11311131
connection.prepare(delay: const Duration(seconds: 1), json:
1132-
UploadFileResult(uri: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/image.jpg').toJson());
1132+
UploadFileResult(url: '/user_uploads/1/4e/m2A3MSqFnWRLUf9SaPzQ0Up_/image.jpg').toJson());
11331133

11341134
await tester.tap(find.byIcon(ZulipIcons.camera));
11351135
await tester.pump();
@@ -1833,7 +1833,7 @@ void main() {
18331833
testBinding.pickFilesResult = FilePickerResult([
18341834
PlatformFile(name: 'file.jpg', size: 1000, readStream: Stream.fromIterable(['asdf'.codeUnits]))]);
18351835
connection.prepare(json:
1836-
UploadFileResult(uri: '/path/file.jpg').toJson());
1836+
UploadFileResult(url: '/path/file.jpg').toJson());
18371837
await tester.tap(find.byIcon(ZulipIcons.attach_file), warnIfMissed: false);
18381838
await tester.pump(Duration.zero);
18391839
checkNoErrorDialog(tester);

0 commit comments

Comments
 (0)