From 4c963abe2a5b70d456f27975ef109aab64391cd0 Mon Sep 17 00:00:00 2001 From: zoe Date: Mon, 22 Aug 2022 21:14:16 +0200 Subject: [PATCH] fix remote host lookup --- .../interactions/interactions.dart | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/business_logic/interactions/interactions.dart b/lib/business_logic/interactions/interactions.dart index 46e052c..e4bdd76 100644 --- a/lib/business_logic/interactions/interactions.dart +++ b/lib/business_logic/interactions/interactions.dart @@ -77,17 +77,31 @@ Future makeInteractionFromUrl( global.settings!.identities[id]!.getAuthHeaders(); headers.addAll(global.defaultHeaders); - final uri = Uri( + final uriv1 = Uri( scheme: "https", host: global.settings!.identities[id]!.instanceUrl, path: "api/v1/search", queryParameters: { + "resolve": "true", "type": "statuses", "q": posturl, }, ); - final response = await http.get(uri, headers: headers); + http.Response response = await http.get(uriv1, headers: headers); + if (response.statusCode != 200) { + final uriv2 = Uri( + scheme: "https", + host: global.settings!.identities[id]!.instanceUrl, + path: "api/v2/search", + queryParameters: { + "type": "statuses", + "q": posturl, + "resolve": "true", + }, + ); + response = await http.get(uriv2, headers: headers); + } if (response.statusCode != 200) { return response.statusCode; @@ -98,7 +112,6 @@ Future makeInteractionFromUrl( if (statuses.isEmpty) { return 404; } - print(response.body); final String postid = statuses[0]["id"]; return await makeInteractionFromId(id, postid, type);