Nexus/nexus
Nexus/nexus
4
4
Fork 5
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

add sticker support

Browse source
This commit is contained in:
Henry Hiles 2026-05-26 19:43:25 -04:00
commit 451875b137
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
5 changed files with 97 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/models/content/content.dart
View file

@ -14,6 +14,7 @@ import "package:nexus/models/content/encrypted.dart";
import "package:nexus/models/content/redaction.dart"; import "package:nexus/models/content/redaction.dart";
import "package:nexus/models/content/server_acl.dart"; import "package:nexus/models/content/server_acl.dart";
import "package:nexus/models/content/topic.dart"; import "package:nexus/models/content/topic.dart";
import "package:nexus/models/content/sticker.dart";
import "package:nexus/models/content/history_visibility.dart"; import "package:nexus/models/content/history_visibility.dart";
class Content { class Content {
@ -50,6 +51,7 @@ enum EventType {
HistoryVisibilityContent.fromJson, HistoryVisibilityContent.fromJson,
), ),
canonicalAlias("m.room.canonical_alias", CanonicalAliasContent.fromJson), canonicalAlias("m.room.canonical_alias", CanonicalAliasContent.fromJson),
sticker("m.sticker", StickerContent.fromJson),
joinRules("m.room.join_rules", JoinRulesContent.fromJson), joinRules("m.room.join_rules", JoinRulesContent.fromJson),
powerLevels("m.room.power_levels", PowerLevelsContent.fromJson), powerLevels("m.room.power_levels", PowerLevelsContent.fromJson),
serverACL("m.room.server_acl", ServerACLContent.fromJson), serverACL("m.room.server_acl", ServerACLContent.fromJson),

18
lib/models/content/sticker.dart Normal file
View file

@ -0,0 +1,18 @@
import "package:freezed_annotation/freezed_annotation.dart";
import "package:nexus/models/content/content.dart";
import "package:nexus/models/info/image.dart";
part "sticker.freezed.dart";
part "sticker.g.dart";
@freezed
abstract class StickerContent extends Content with _$StickerContent {
StickerContent._();
factory StickerContent({
required String body,
required ImageInfo info,
required Uri url,
}) = _StickerContent;
factory StickerContent.fromJson(Map<String, Object?> json) =>
_$StickerContentFromJson(json);
}

56
lib/widgets/message_image.dart Normal file
View file

@ -0,0 +1,56 @@
import "package:cross_cache/cross_cache.dart";
import "package:flutter/material.dart";
import "package:flutter_blurhash/flutter_blurhash.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:nexus/controllers/cross_cache_controller.dart";
import "package:nexus/helpers/extensions/get_headers.dart";
import "package:nexus/models/info/image.dart" as i;
import "package:nexus/widgets/expandable_image.dart";
import "package:nexus/widgets/loading.dart";
class MessageImage extends ConsumerWidget {
final Uri url;
final i.ImageInfo? info;
const MessageImage(this.url, {this.info, super.key});
@override
Widget build(BuildContext context, WidgetRef ref) => ExpandableImage(
url.toString(),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(8)),
child: Image(
image: CachedNetworkImage(
url.toString(),
ref.watch(CrossCacheController.provider),
headers: ref.headers,
),
width: info?.width,
loadingBuilder: (_, child, loadingProgress) => loadingProgress == null
? child
: switch (info?.blurHash) {
final blurHash? =>
info?.width == null || info?.height == null
? SizedBox(
width: 200,
height: 200,
child: BlurHash(hash: blurHash),
)
: AspectRatio(
aspectRatio: info!.width! / info!.height!,
child: SizedBox(
width: info!.width,
child: BlurHash(hash: blurHash),
),
),
_ => Loading(),
},
errorBuilder: (context, error, stackTrace) => Center(
child: Text(
"Image Failed to Load",
style: TextStyle(color: Theme.of(context).colorScheme.error),
),
),
),
),
);
}

5
lib/widgets/renderers/event.dart
View file

@ -14,6 +14,7 @@ import "package:nexus/models/content/message.dart";
import "package:nexus/models/content/pinned_events.dart"; import "package:nexus/models/content/pinned_events.dart";
import "package:nexus/models/content/power_levels.dart"; import "package:nexus/models/content/power_levels.dart";
import "package:nexus/models/content/server_acl.dart"; import "package:nexus/models/content/server_acl.dart";
import "package:nexus/models/content/sticker.dart";
import "package:nexus/models/content/topic.dart"; import "package:nexus/models/content/topic.dart";
import "package:nexus/models/event.dart"; import "package:nexus/models/event.dart";
import "package:nexus/widgets/lazy_loading/message_displayname.dart"; import "package:nexus/widgets/lazy_loading/message_displayname.dart";
@ -53,7 +54,9 @@ class EventRenderer extends ConsumerWidget {
style: errorStyle, style: errorStyle,
), ),
MessageContent() || EncryptedContent() => MessageRenderer( MessageContent() ||
EncryptedContent() ||
StickerContent() => MessageRenderer(
event, event,
onTapReply: onTapReply, onTapReply: onTapReply,
isGrouped: isGrouped, isGrouped: isGrouped,

92
lib/widgets/renderers/message.dart
View file

@ -1,25 +1,21 @@
import "package:collection/collection.dart"; import "package:collection/collection.dart";
import "package:cross_cache/cross_cache.dart";
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:flutter_blurhash/flutter_blurhash.dart";
import "package:flutter_riverpod/flutter_riverpod.dart"; import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:linkify/linkify.dart"; import "package:linkify/linkify.dart";
import "package:nexus/controllers/client_state_controller.dart"; import "package:nexus/controllers/client_state_controller.dart";
import "package:nexus/controllers/cross_cache_controller.dart";
import "package:nexus/controllers/event_controller.dart"; import "package:nexus/controllers/event_controller.dart";
import "package:nexus/helpers/extensions/get_headers.dart";
import "package:nexus/helpers/extensions/mxc_to_https.dart"; import "package:nexus/helpers/extensions/mxc_to_https.dart";
import "package:nexus/models/content/encrypted.dart"; import "package:nexus/models/content/encrypted.dart";
import "package:nexus/models/content/message.dart"; import "package:nexus/models/content/message.dart";
import "package:nexus/models/content/sticker.dart";
import "package:nexus/models/event.dart"; import "package:nexus/models/event.dart";
import "package:nexus/models/requests/get_event_request.dart"; import "package:nexus/models/requests/get_event_request.dart";
import "package:nexus/widgets/expandable_image.dart";
import "package:nexus/widgets/file_card.dart"; import "package:nexus/widgets/file_card.dart";
import "package:nexus/widgets/html/html.dart"; import "package:nexus/widgets/html/html.dart";
import "package:nexus/widgets/lazy_loading/message_avatar.dart"; import "package:nexus/widgets/lazy_loading/message_avatar.dart";
import "package:nexus/widgets/lazy_loading/message_displayname.dart"; import "package:nexus/widgets/lazy_loading/message_displayname.dart";
import "package:nexus/widgets/linkified_text.dart"; import "package:nexus/widgets/linkified_text.dart";
import "package:nexus/widgets/loading.dart"; import "package:nexus/widgets/message_image.dart";
import "package:nexus/widgets/reaction_row.dart"; import "package:nexus/widgets/reaction_row.dart";
import "package:nexus/widgets/url_preview.dart"; import "package:nexus/widgets/url_preview.dart";
import "package:timeago/timeago.dart"; import "package:timeago/timeago.dart";
@ -144,6 +140,20 @@ class MessageRenderer extends ConsumerWidget {
"Unable to decrypt event", "Unable to decrypt event",
style: errorStyle, style: errorStyle,
), ),
StickerContent(:final url, :final info) =>
ConstrainedBox(
constraints: BoxConstraints.loose(Size.square(200)),
child: MessageImage(
url.mxcToHttps(
ref.watch(
ClientStateController.provider.select(
(value) => value!.homeserverUrl!,
),
),
),
info: info,
),
),
// TODO: Handle locations // TODO: Handle locations
// LocationMessageContent(:final body , :final geoUri) => // LocationMessageContent(:final body , :final geoUri) =>
TextMessageContent( TextMessageContent(
@ -239,75 +249,7 @@ class MessageRenderer extends ConsumerWidget {
) => ) =>
FileCard(url, info, filename: filename), FileCard(url, info, filename: filename),
ImageMessageContent(:final info) => ImageMessageContent(:final info) =>
ExpandableImage( MessageImage(url, info: info),
url.toString(),
child: ClipRRect(
borderRadius: BorderRadius.all(
Radius.circular(8),
),
child: Image(
image: CachedNetworkImage(
url.toString(),
ref.watch(
CrossCacheController.provider,
),
headers: ref.headers,
),
width: info?.width,
loadingBuilder:
(
_,
child,
loadingProgress,
) => loadingProgress == null
? child
: switch (info?.blurHash) {
final blurHash? =>
info?.width == null ||
info?.height ==
null
? SizedBox(
width: 200,
height: 200,
child: BlurHash(
hash:
blurHash,
),
)
: AspectRatio(
aspectRatio:
info!
.width! /
info.height!,
child: SizedBox(
width: info
.width,
child: BlurHash(
hash:
blurHash,
),
),
),
_ => Loading(),
},
errorBuilder:
(
context,
error,
stackTrace,
) => Center(
child: Text(
"Image Failed to Load",
style: TextStyle(
color: Theme.of(
context,
).colorScheme.error,
),
),
),
),
),
),
_ => SizedBox.shrink(), _ => SizedBox.shrink(),
}, },
), ),