2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'krille/desktopnotifications' into 'main'

Browse source 
feat: Display room avatar and actions and play sound for linux desktop notifications

See merge request famedly/fluffychat!691
This commit is contained in:
Krille Fear 2022-01-22 10:38:55 +00:00
commit e3f1e551d0
6 changed files with 100 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

92
lib/widgets/local_notifications_extension.dart Normal file
View file

@ -0,0 +1,92 @@
import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:desktop_notifications/desktop_notifications.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:matrix/matrix.dart';
import 'package:universal_html/html.dart' as html;
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
import 'package:fluffychat/widgets/matrix.dart';
extension LocalNotificationsExtension on MatrixState {
void showLocalNotification(EventUpdate eventUpdate) async {
final roomId = eventUpdate.roomID;
if (webHasFocus && activeRoomId == roomId) return;
final room = client.getRoomById(roomId);
if (room.notificationCount == 0) return;
final event = Event.fromJson(eventUpdate.content, room);
final title =
room.getLocalizedDisplayname(MatrixLocals(L10n.of(widget.context)));
final body = event.getLocalizedBody(
MatrixLocals(L10n.of(widget.context)),
withSenderNamePrefix:
!room.isDirectChat || room.lastEvent.senderId == client.userID,
plaintextBody: true,
hideReply: true,
hideEdit: true,
);
final icon = event.sender.avatarUrl?.getThumbnail(client,
width: 64, height: 64, method: ThumbnailMethod.crop) ??
room.avatar?.getThumbnail(client,
width: 64, height: 64, method: ThumbnailMethod.crop);
if (kIsWeb) {
html.AudioElement()
..src =
'assets/assets/sounds/WoodenBeaver_stereo_message-new-instant.ogg'
..autoplay = true
..load();
html.Notification(
title,
body: body,
icon: icon.toString(),
);
} else if (Platform.isLinux) {
final appIconUrl = room.avatar
?.getThumbnail(
room.client,
width: 56,
height: 56,
)
.toString();
final appIconFile = await DefaultCacheManager().getSingleFile(appIconUrl);
final notification = await linuxNotifications.notify(
title,
body: body,
replacesId: linuxNotificationIds[roomId] ?? 0,
appName: AppConfig.applicationName,
appIcon: appIconFile.path,
actions: [
NotificationAction(
DesktopNotificationActions.dismiss.name,
L10n.of(widget.context).dismiss,
),
NotificationAction(
DesktopNotificationActions.seen.name,
L10n.of(widget.context).markAsRead,
),
],
hints: [
NotificationHint.soundName('message-new-instant'),
],
);
notification.action.then((actionStr) {
final action = DesktopNotificationActions.values
.singleWhere((a) => a.name == actionStr);
switch (action) {
case DesktopNotificationActions.seen:
room.setReadMarker(event.eventId, mRead: event.eventId);
break;
case DesktopNotificationActions.dismiss:
break;
}
});
linuxNotificationIds[roomId] = notification.id;
}
}
}
enum DesktopNotificationActions { seen, dismiss }

48
lib/widgets/matrix.dart
View file

@ -21,7 +21,6 @@ import 'package:vrouter/vrouter.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/utils/client_manager.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/utils/sentry_controller.dart';
import 'package:fluffychat/utils/uia_request_manager.dart';
@ -32,6 +31,7 @@ import '../utils/account_bundles.dart';
import '../utils/background_push.dart';
import '../utils/famedlysdk_store.dart';
import '../utils/platform_infos.dart';
import 'local_notifications_extension.dart';
// import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@ -229,51 +229,9 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
String get activeRoomId =>
VRouter.of(navigatorContext).pathParameters['roomid'];
void _showLocalNotification(EventUpdate eventUpdate) async {
final roomId = eventUpdate.roomID;
if (webHasFocus && activeRoomId == roomId) return;
final room = client.getRoomById(roomId);
if (room.notificationCount == 0) return;
final event = Event.fromJson(eventUpdate.content, room);
final title =
room.getLocalizedDisplayname(MatrixLocals(L10n.of(widget.context)));
final body = event.getLocalizedBody(
MatrixLocals(L10n.of(widget.context)),
withSenderNamePrefix:
!room.isDirectChat || room.lastEvent.senderId == client.userID,
plaintextBody: true,
hideReply: true,
hideEdit: true,
);
final icon = event.sender.avatarUrl?.getThumbnail(client,
width: 64, height: 64, method: ThumbnailMethod.crop) ??
room.avatar?.getThumbnail(client,
width: 64, height: 64, method: ThumbnailMethod.crop);
if (kIsWeb) {
html.AudioElement()
..src = 'assets/assets/sounds/notification.wav'
..autoplay = true
..load();
html.Notification(
title,
body: body,
icon: icon.toString(),
);
} else if (Platform.isLinux) {
final notification = await linuxNotifications.notify(
title,
body: body,
replacesId: _linuxNotificationIds[roomId] ?? 0,
appName: AppConfig.applicationName,
appIcon: "im.fluffychat.Fluffychat",
);
_linuxNotificationIds[roomId] = notification.id;
}
}
final linuxNotifications =
PlatformInfos.isLinux ? NotificationsClient() : null;
final Map<String, int> _linuxNotificationIds = {};
final Map<String, int> linuxNotificationIds = {};
@override
void initState() {
@ -388,7 +346,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
[EventTypes.Message, EventTypes.Sticker, EventTypes.Encrypted]
.contains(e.content['type']) &&
e.content['sender'] != c.userID)
.listen(_showLocalNotification);
.listen(showLocalNotification);
});
}
}