forked from Nexus/nexus
use gomuks for URL previews
This commit is contained in:
parent
16fdf0c420
commit
eca9d3b411
6 changed files with 18 additions and 69 deletions
|
|
@ -17,6 +17,7 @@ import "package:nexus/main.dart";
|
||||||
import "package:nexus/models/content/message.dart";
|
import "package:nexus/models/content/message.dart";
|
||||||
import "package:nexus/models/event.dart";
|
import "package:nexus/models/event.dart";
|
||||||
import "package:nexus/models/oauth_auth_code_response.dart";
|
import "package:nexus/models/oauth_auth_code_response.dart";
|
||||||
|
import "package:nexus/models/open_graph_data.dart";
|
||||||
import "package:nexus/models/paginate.dart";
|
import "package:nexus/models/paginate.dart";
|
||||||
import "package:nexus/models/requests/download_media.dart";
|
import "package:nexus/models/requests/download_media.dart";
|
||||||
import "package:nexus/models/requests/get_event.dart";
|
import "package:nexus/models/requests/get_event.dart";
|
||||||
|
|
@ -215,11 +216,6 @@ class ClientController extends AsyncNotifier<int> {
|
||||||
return response["room_id"];
|
return response["room_id"];
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<String?> getAccessToken() async {
|
|
||||||
final response = await _sendCommand("get_account_info", {});
|
|
||||||
return response?["access_token"];
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> leaveRoom(Room room) async {
|
Future<void> leaveRoom(Room room) async {
|
||||||
if (room.metadata == null) return;
|
if (room.metadata == null) return;
|
||||||
await _sendCommand("leave_room", {"room_id": room.metadata!.id});
|
await _sendCommand("leave_room", {"room_id": room.metadata!.id});
|
||||||
|
|
@ -255,6 +251,9 @@ class ClientController extends AsyncNotifier<int> {
|
||||||
return json == null ? null : .fromJson(json);
|
return json == null ? null : .fromJson(json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<OpenGraphData> getUrlPreview(Uri url) async =>
|
||||||
|
.fromJson(await _sendCommand("get_url_preview", {"url": url.toString()}));
|
||||||
|
|
||||||
Future<Paginate> paginate(PaginateRequest request) async =>
|
Future<Paginate> paginate(PaginateRequest request) async =>
|
||||||
.fromJson(await _sendCommand("paginate", request.toJson()));
|
.fromJson(await _sendCommand("paginate", request.toJson()));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
|
||||||
import "package:nexus/controllers/client.dart";
|
|
||||||
import "package:nexus/controllers/client_state.dart";
|
|
||||||
|
|
||||||
class HeaderController extends AsyncNotifier<Map<String, String>> {
|
|
||||||
@override
|
|
||||||
Future<Map<String, String>> build() async {
|
|
||||||
if (ref.watch(ClientStateController.provider)?.isLoggedIn != true) {
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
final client = ref.watch(ClientController.provider.notifier);
|
|
||||||
final accessToken = await client.getAccessToken();
|
|
||||||
return {"authorization": "Bearer $accessToken"};
|
|
||||||
}
|
|
||||||
|
|
||||||
static final provider =
|
|
||||||
AsyncNotifierProvider<HeaderController, Map<String, String>>(
|
|
||||||
HeaderController.new,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
@ -1,50 +1,22 @@
|
||||||
import "dart:convert";
|
|
||||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||||
import "package:http/http.dart";
|
import "package:nexus/controllers/client.dart";
|
||||||
import "package:nexus/controllers/client_state.dart";
|
|
||||||
import "package:nexus/controllers/header.dart";
|
|
||||||
import "package:nexus/models/open_graph_data.dart";
|
import "package:nexus/models/open_graph_data.dart";
|
||||||
|
|
||||||
class UrlPreviewController extends AsyncNotifier<OpenGraphData?> {
|
class UrlPreviewController extends AsyncNotifier<OpenGraphData?> {
|
||||||
final String link;
|
final Uri url;
|
||||||
UrlPreviewController(this.link);
|
UrlPreviewController(this.url);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<OpenGraphData?> build() async {
|
Future<OpenGraphData?> build() async {
|
||||||
try {
|
if (url.host == "matrix.to") return null;
|
||||||
final homeserver = ref.watch(
|
|
||||||
ClientStateController.provider.select((value) => value?.homeserverUrl),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (homeserver != null && !link.contains("matrix.to")) {
|
return await ref
|
||||||
{
|
.watch(ClientController.provider.notifier)
|
||||||
final response = await get(
|
.getUrlPreview(url);
|
||||||
.parse(homeserver)
|
|
||||||
.resolve("/_matrix/client/v1/media/preview_url")
|
|
||||||
.replace(queryParameters: {"url": link}),
|
|
||||||
headers: await ref.watch(HeaderController.provider.future),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (response.statusCode == 200) {
|
|
||||||
final decodedValue = json.decode(response.body);
|
|
||||||
if (decodedValue is! Map<String, dynamic>) return null;
|
|
||||||
|
|
||||||
return .fromJson(
|
|
||||||
decodedValue,
|
|
||||||
).copyWith(imageUrl: decodedValue["og:image"]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (_) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static final provider =
|
static final provider =
|
||||||
AsyncNotifierProvider.family<
|
AsyncNotifierProvider.family<UrlPreviewController, OpenGraphData?, Uri>(
|
||||||
UrlPreviewController,
|
UrlPreviewController.new,
|
||||||
OpenGraphData?,
|
);
|
||||||
String
|
|
||||||
>(UrlPreviewController.new);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||||
import "package:media_kit/media_kit.dart";
|
import "package:media_kit/media_kit.dart";
|
||||||
import "package:nexus/controllers/client.dart";
|
import "package:nexus/controllers/client.dart";
|
||||||
import "package:nexus/controllers/client_state.dart";
|
import "package:nexus/controllers/client_state.dart";
|
||||||
import "package:nexus/controllers/header.dart";
|
|
||||||
import "package:nexus/controllers/multi_provider.dart";
|
import "package:nexus/controllers/multi_provider.dart";
|
||||||
import "package:nexus/controllers/settings.dart";
|
import "package:nexus/controllers/settings.dart";
|
||||||
import "package:nexus/controllers/shared_prefs.dart";
|
import "package:nexus/controllers/shared_prefs.dart";
|
||||||
|
|
@ -144,7 +143,6 @@ class App extends StatelessWidget {
|
||||||
IListConst([
|
IListConst([
|
||||||
SharedPrefsController.provider,
|
SharedPrefsController.provider,
|
||||||
ClientController.provider,
|
ClientController.provider,
|
||||||
HeaderController.provider,
|
|
||||||
]),
|
]),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -273,7 +273,8 @@ class MessageRenderer extends ConsumerWidget {
|
||||||
(element) => element is UrlElement,
|
(element) => element is UrlElement,
|
||||||
)
|
)
|
||||||
case final UrlElement link?)
|
case final UrlElement link?)
|
||||||
UrlPreview(link.url),
|
if (Uri.tryParse(link.url) case final Uri url?)
|
||||||
|
UrlPreview(url),
|
||||||
|
|
||||||
ReactionRow(event),
|
ReactionRow(event),
|
||||||
],
|
],
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import "package:nexus/helpers/launch_helper.dart";
|
||||||
import "package:nexus/helpers/mxc_image.dart";
|
import "package:nexus/helpers/mxc_image.dart";
|
||||||
|
|
||||||
class UrlPreview extends ConsumerWidget {
|
class UrlPreview extends ConsumerWidget {
|
||||||
final String link;
|
final Uri link;
|
||||||
const UrlPreview(this.link, {super.key});
|
const UrlPreview(this.link, {super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|
@ -18,8 +18,7 @@ class UrlPreview extends ConsumerWidget {
|
||||||
data: (preview) => preview == null
|
data: (preview) => preview == null
|
||||||
? SizedBox.shrink()
|
? SizedBox.shrink()
|
||||||
: InkWell(
|
: InkWell(
|
||||||
onTap: () =>
|
onTap: () => ref.watch(LaunchHelper.provider).launchUrl(link),
|
||||||
ref.watch(LaunchHelper.provider).launchUrl(.parse(link)),
|
|
||||||
child: Card(
|
child: Card(
|
||||||
margin: .symmetric(vertical: 4),
|
margin: .symmetric(vertical: 4),
|
||||||
color: Theme.of(
|
color: Theme.of(
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue