fix: Fix VCard and User Avatar queries being encrypted

- moxxmpp@0.1.6+1
 - moxxmpp_socket_tcp@0.1.2+9

.github/FUNDING.yml

@@ -0,0 +1 @@
+ko_fi: papatutuwawa

README.md

@@ -25,3 +25,9 @@ the development shell provided by the NixOS Flake, ensure that `ANDROID_HOME` an
 ## License
 
 See `./LICENSE`.
+
+## Support
+
+If you like what I do and you want to support me, feel free to donate to me on Ko-Fi.
+
+[<img src="https://codeberg.org/moxxy/moxxyv2/raw/branch/master/assets/repo/kofi.png" height="36" style="height: 36px; border: 0px;"></img>](https://ko-fi.com/papatutuwawa)

example/pubspec.yaml

@@ -16,10 +16,10 @@ dependencies:
     version: 0.1.4+1
   moxxmpp:
     hosted: https://git.polynom.me/api/packages/Moxxy/pub
-    version: 0.1.4
+    version: 0.1.6+1
   moxxmpp_socket_tcp:
     hosted: https://git.polynom.me/api/packages/Moxxy/pub
-    version: 0.1.2+6
+    version: 0.1.2+9
 
 dev_dependencies:
   flutter_test:

packages/moxxmpp/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.1.6+1
+
+ - **FIX**: Fix LMC not working.
+
+## 0.1.6
+
+ - **FEAT**: Implement XEP-0308.
+
+## 0.1.5
+
+ - **FEAT**: Message events now contain the stanza error, if available.
+
 ## 0.1.4
 
  - **FIX**: Only stanza-id required 'sid:0' support.

packages/moxxmpp/README.md

@@ -5,3 +5,9 @@ A pure-Dart XMPP library written for Moxxy.
 ## License
 
 See `./LICENSE`.
+
+## Support
+
+If you like what I do and you want to support me, feel free to donate to me on Ko-Fi.
+
+[<img src="https://codeberg.org/moxxy/moxxyv2/raw/branch/master/assets/repo/kofi.png" height="36" style="height: 36px; border: 0px;"></img>](https://ko-fi.com/papatutuwawa)

packages/moxxmpp/lib/moxxmpp.dart

@@ -59,6 +59,7 @@ export 'package:moxxmpp/src/xeps/xep_0203.dart';
 export 'package:moxxmpp/src/xeps/xep_0280.dart';
 export 'package:moxxmpp/src/xeps/xep_0297.dart';
 export 'package:moxxmpp/src/xeps/xep_0300.dart';
+export 'package:moxxmpp/src/xeps/xep_0308.dart';
 export 'package:moxxmpp/src/xeps/xep_0333.dart';
 export 'package:moxxmpp/src/xeps/xep_0334.dart';
 export 'package:moxxmpp/src/xeps/xep_0352.dart';
@@ -74,7 +75,9 @@ export 'package:moxxmpp/src/xeps/xep_0384/xep_0384.dart';
 export 'package:moxxmpp/src/xeps/xep_0385.dart';
 export 'package:moxxmpp/src/xeps/xep_0414.dart';
 export 'package:moxxmpp/src/xeps/xep_0424.dart';
+export 'package:moxxmpp/src/xeps/xep_0444.dart';
 export 'package:moxxmpp/src/xeps/xep_0446.dart';
 export 'package:moxxmpp/src/xeps/xep_0447.dart';
 export 'package:moxxmpp/src/xeps/xep_0448.dart';
+export 'package:moxxmpp/src/xeps/xep_0449.dart';
 export 'package:moxxmpp/src/xeps/xep_0461.dart';

packages/moxxmpp/lib/src/events.dart

@@ -6,9 +6,11 @@ import 'package:moxxmpp/src/xeps/xep_0030/types.dart';
 import 'package:moxxmpp/src/xeps/xep_0060/xep_0060.dart';
 import 'package:moxxmpp/src/xeps/xep_0066.dart';
 import 'package:moxxmpp/src/xeps/xep_0085.dart';
+import 'package:moxxmpp/src/xeps/xep_0334.dart';
 import 'package:moxxmpp/src/xeps/xep_0359.dart';
 import 'package:moxxmpp/src/xeps/xep_0385.dart';
 import 'package:moxxmpp/src/xeps/xep_0424.dart';
+import 'package:moxxmpp/src/xeps/xep_0444.dart';
 import 'package:moxxmpp/src/xeps/xep_0446.dart';
 import 'package:moxxmpp/src/xeps/xep_0447.dart';
 import 'package:moxxmpp/src/xeps/xep_0461.dart';
@@ -63,6 +65,7 @@ class MessageEvent extends XmppEvent {
     required this.isMarkable,
     required this.encrypted,
     required this.other,
+    this.error,
     this.type,
     this.oob,
     this.sfs,
@@ -73,7 +76,12 @@ class MessageEvent extends XmppEvent {
     this.funReplacement,
     this.funCancellation,
     this.messageRetraction,
+    this.messageCorrectionId,
+    this.messageReactions,
+    this.messageProcessingHints,
+    this.stickerPackId,
   });
+  final StanzaError? error;
   final String body;
   final JID fromJid;
   final JID toJid;
@@ -93,6 +101,10 @@ class MessageEvent extends XmppEvent {
   final String? funCancellation;
   final bool encrypted;
   final MessageRetractionData? messageRetraction;
+  final String? messageCorrectionId;
+  final MessageReactions? messageReactions;
+  final List<MessageProcessingHint>? messageProcessingHints;
+  final String? stickerPackId;
   final Map<String, dynamic> other;
 }
 

packages/moxxmpp/lib/src/managers/attributes.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-
 import 'package:moxxmpp/src/connection.dart';
 import 'package:moxxmpp/src/events.dart';
 import 'package:moxxmpp/src/jid.dart';
@@ -11,7 +10,6 @@ import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 
 class XmppManagerAttributes {
-  
   XmppManagerAttributes({
     required this.sendStanza,
     required this.sendNonza,

packages/moxxmpp/lib/src/managers/data.dart

@@ -7,6 +7,7 @@ import 'package:moxxmpp/src/xeps/xep_0359.dart';
 import 'package:moxxmpp/src/xeps/xep_0380.dart';
 import 'package:moxxmpp/src/xeps/xep_0385.dart';
 import 'package:moxxmpp/src/xeps/xep_0424.dart';
+import 'package:moxxmpp/src/xeps/xep_0444.dart';
 import 'package:moxxmpp/src/xeps/xep_0446.dart';
 import 'package:moxxmpp/src/xeps/xep_0447.dart';
 import 'package:moxxmpp/src/xeps/xep_0461.dart';
@@ -59,6 +60,12 @@ class StanzaHandlerData with _$StanzaHandlerData {
       // If non-null, then it indicates the origin Id of the message that should be
       // retracted
       MessageRetractionData? messageRetraction,
+      // If non-null, then the message is a correction for the specified stanza Id
+      String? lastMessageCorrectionSid,
+      // Reactions data
+      MessageReactions? messageReactions,
+      // The Id of the sticker pack this sticker belongs to
+      String? stickerPackId,
     }
   ) = _StanzaHandlerData;
 }

packages/moxxmpp/lib/src/managers/data.freezed.dart

@@ -58,7 +58,12 @@ mixin _$StanzaHandlerData {
       throw _privateConstructorUsedError; // If non-null, then it indicates the origin Id of the message that should be
 // retracted
   MessageRetractionData? get messageRetraction =>
-      throw _privateConstructorUsedError;
+      throw _privateConstructorUsedError; // If non-null, then the message is a correction for the specified stanza Id
+  String? get lastMessageCorrectionSid =>
+      throw _privateConstructorUsedError; // Reactions data
+  MessageReactions? get messageReactions =>
+      throw _privateConstructorUsedError; // The Id of the sticker pack this sticker belongs to
+  String? get stickerPackId => throw _privateConstructorUsedError;
 
   @JsonKey(ignore: true)
   $StanzaHandlerDataCopyWith<StanzaHandlerData> get copyWith =>
@@ -92,7 +97,10 @@ abstract class $StanzaHandlerDataCopyWith<$Res> {
       ExplicitEncryptionType? encryptionType,
       DelayedDelivery? delayedDelivery,
       Map<String, dynamic> other,
-      MessageRetractionData? messageRetraction});
+      MessageRetractionData? messageRetraction,
+      String? lastMessageCorrectionSid,
+      MessageReactions? messageReactions,
+      String? stickerPackId});
 }
 
 /// @nodoc
@@ -128,6 +136,9 @@ class _$StanzaHandlerDataCopyWithImpl<$Res>
     Object? delayedDelivery = freezed,
     Object? other = freezed,
     Object? messageRetraction = freezed,
+    Object? lastMessageCorrectionSid = freezed,
+    Object? messageReactions = freezed,
+    Object? stickerPackId = freezed,
   }) {
     return _then(_value.copyWith(
       done: done == freezed
@@ -218,6 +229,18 @@ class _$StanzaHandlerDataCopyWithImpl<$Res>
           ? _value.messageRetraction
           : messageRetraction // ignore: cast_nullable_to_non_nullable
               as MessageRetractionData?,
+      lastMessageCorrectionSid: lastMessageCorrectionSid == freezed
+          ? _value.lastMessageCorrectionSid
+          : lastMessageCorrectionSid // ignore: cast_nullable_to_non_nullable
+              as String?,
+      messageReactions: messageReactions == freezed
+          ? _value.messageReactions
+          : messageReactions // ignore: cast_nullable_to_non_nullable
+              as MessageReactions?,
+      stickerPackId: stickerPackId == freezed
+          ? _value.stickerPackId
+          : stickerPackId // ignore: cast_nullable_to_non_nullable
+              as String?,
     ));
   }
 }
@@ -251,7 +274,10 @@ abstract class _$$_StanzaHandlerDataCopyWith<$Res>
       ExplicitEncryptionType? encryptionType,
       DelayedDelivery? delayedDelivery,
       Map<String, dynamic> other,
-      MessageRetractionData? messageRetraction});
+      MessageRetractionData? messageRetraction,
+      String? lastMessageCorrectionSid,
+      MessageReactions? messageReactions,
+      String? stickerPackId});
 }
 
 /// @nodoc
@@ -289,6 +315,9 @@ class __$$_StanzaHandlerDataCopyWithImpl<$Res>
     Object? delayedDelivery = freezed,
     Object? other = freezed,
     Object? messageRetraction = freezed,
+    Object? lastMessageCorrectionSid = freezed,
+    Object? messageReactions = freezed,
+    Object? stickerPackId = freezed,
   }) {
     return _then(_$_StanzaHandlerData(
       done == freezed
@@ -379,6 +408,18 @@ class __$$_StanzaHandlerDataCopyWithImpl<$Res>
           ? _value.messageRetraction
           : messageRetraction // ignore: cast_nullable_to_non_nullable
               as MessageRetractionData?,
+      lastMessageCorrectionSid: lastMessageCorrectionSid == freezed
+          ? _value.lastMessageCorrectionSid
+          : lastMessageCorrectionSid // ignore: cast_nullable_to_non_nullable
+              as String?,
+      messageReactions: messageReactions == freezed
+          ? _value.messageReactions
+          : messageReactions // ignore: cast_nullable_to_non_nullable
+              as MessageReactions?,
+      stickerPackId: stickerPackId == freezed
+          ? _value.stickerPackId
+          : stickerPackId // ignore: cast_nullable_to_non_nullable
+              as String?,
     ));
   }
 }
@@ -404,7 +445,10 @@ class _$_StanzaHandlerData implements _StanzaHandlerData {
       this.encryptionType,
       this.delayedDelivery,
       final Map<String, dynamic> other = const <String, dynamic>{},
-      this.messageRetraction})
+      this.messageRetraction,
+      this.lastMessageCorrectionSid,
+      this.messageReactions,
+      this.stickerPackId})
       : _other = other;
 
 // Indicates to the runner that processing is now done. This means that all
@@ -484,10 +528,19 @@ class _$_StanzaHandlerData implements _StanzaHandlerData {
 // retracted
   @override
   final MessageRetractionData? messageRetraction;
+// If non-null, then the message is a correction for the specified stanza Id
+  @override
+  final String? lastMessageCorrectionSid;
+// Reactions data
+  @override
+  final MessageReactions? messageReactions;
+// The Id of the sticker pack this sticker belongs to
+  @override
+  final String? stickerPackId;
 
   @override
   String toString() {
-    return 'StanzaHandlerData(done: $done, cancel: $cancel, cancelReason: $cancelReason, stanza: $stanza, retransmitted: $retransmitted, sims: $sims, sfs: $sfs, oob: $oob, stableId: $stableId, reply: $reply, chatState: $chatState, isCarbon: $isCarbon, deliveryReceiptRequested: $deliveryReceiptRequested, isMarkable: $isMarkable, fun: $fun, funReplacement: $funReplacement, funCancellation: $funCancellation, encrypted: $encrypted, encryptionType: $encryptionType, delayedDelivery: $delayedDelivery, other: $other, messageRetraction: $messageRetraction)';
+    return 'StanzaHandlerData(done: $done, cancel: $cancel, cancelReason: $cancelReason, stanza: $stanza, retransmitted: $retransmitted, sims: $sims, sfs: $sfs, oob: $oob, stableId: $stableId, reply: $reply, chatState: $chatState, isCarbon: $isCarbon, deliveryReceiptRequested: $deliveryReceiptRequested, isMarkable: $isMarkable, fun: $fun, funReplacement: $funReplacement, funCancellation: $funCancellation, encrypted: $encrypted, encryptionType: $encryptionType, delayedDelivery: $delayedDelivery, other: $other, messageRetraction: $messageRetraction, lastMessageCorrectionSid: $lastMessageCorrectionSid, messageReactions: $messageReactions, stickerPackId: $stickerPackId)';
   }
 
   @override
@@ -525,7 +578,13 @@ class _$_StanzaHandlerData implements _StanzaHandlerData {
                 .equals(other.delayedDelivery, delayedDelivery) &&
             const DeepCollectionEquality().equals(other._other, this._other) &&
             const DeepCollectionEquality()
-                .equals(other.messageRetraction, messageRetraction));
+                .equals(other.messageRetraction, messageRetraction) &&
+            const DeepCollectionEquality().equals(
+                other.lastMessageCorrectionSid, lastMessageCorrectionSid) &&
+            const DeepCollectionEquality()
+                .equals(other.messageReactions, messageReactions) &&
+            const DeepCollectionEquality()
+                .equals(other.stickerPackId, stickerPackId));
   }
 
   @override
@@ -552,7 +611,10 @@ class _$_StanzaHandlerData implements _StanzaHandlerData {
         const DeepCollectionEquality().hash(encryptionType),
         const DeepCollectionEquality().hash(delayedDelivery),
         const DeepCollectionEquality().hash(_other),
-        const DeepCollectionEquality().hash(messageRetraction)
+        const DeepCollectionEquality().hash(messageRetraction),
+        const DeepCollectionEquality().hash(lastMessageCorrectionSid),
+        const DeepCollectionEquality().hash(messageReactions),
+        const DeepCollectionEquality().hash(stickerPackId)
       ]);
 
   @JsonKey(ignore: true)
@@ -582,7 +644,10 @@ abstract class _StanzaHandlerData implements StanzaHandlerData {
       final ExplicitEncryptionType? encryptionType,
       final DelayedDelivery? delayedDelivery,
       final Map<String, dynamic> other,
-      final MessageRetractionData? messageRetraction}) = _$_StanzaHandlerData;
+      final MessageRetractionData? messageRetraction,
+      final String? lastMessageCorrectionSid,
+      final MessageReactions? messageReactions,
+      final String? stickerPackId}) = _$_StanzaHandlerData;
 
   @override // Indicates to the runner that processing is now done. This means that all
 // pre-processing is done and no other handlers should be consulted.
@@ -635,6 +700,12 @@ abstract class _StanzaHandlerData implements StanzaHandlerData {
   @override // If non-null, then it indicates the origin Id of the message that should be
 // retracted
   MessageRetractionData? get messageRetraction;
+  @override // If non-null, then the message is a correction for the specified stanza Id
+  String? get lastMessageCorrectionSid;
+  @override // Reactions data
+  MessageReactions? get messageReactions;
+  @override // The Id of the sticker pack this sticker belongs to
+  String? get stickerPackId;
   @override
   @JsonKey(ignore: true)
   _$$_StanzaHandlerDataCopyWith<_$_StanzaHandlerData> get copyWith =>

packages/moxxmpp/lib/src/managers/namespaces.dart

@@ -25,3 +25,6 @@ const emeManager = 'org.moxxmpp.ememanager';
 const cryptographicHashManager = 'org.moxxmpp.cryptographichashmanager';
 const delayedDeliveryManager = 'org.moxxmpp.delayeddeliverymanager';
 const messageRetractionManager = 'org.moxxmpp.messageretractionmanager';
+const lastMessageCorrectionManager = 'org.moxxmpp.lastmessagecorrectionmanager';
+const messageReactionsManager = 'org.moxxmpp.messagereactionsmanager';
+const stickersManager = 'org.moxxmpp.stickersmanager';

packages/moxxmpp/lib/src/message.dart

@@ -11,13 +11,21 @@ import 'package:moxxmpp/src/xeps/staging/file_upload_notification.dart';
 import 'package:moxxmpp/src/xeps/xep_0066.dart';
 import 'package:moxxmpp/src/xeps/xep_0085.dart';
 import 'package:moxxmpp/src/xeps/xep_0184.dart';
+import 'package:moxxmpp/src/xeps/xep_0308.dart';
 import 'package:moxxmpp/src/xeps/xep_0333.dart';
+import 'package:moxxmpp/src/xeps/xep_0334.dart';
 import 'package:moxxmpp/src/xeps/xep_0359.dart';
 import 'package:moxxmpp/src/xeps/xep_0424.dart';
+import 'package:moxxmpp/src/xeps/xep_0444.dart';
 import 'package:moxxmpp/src/xeps/xep_0446.dart';
 import 'package:moxxmpp/src/xeps/xep_0447.dart';
 import 'package:moxxmpp/src/xeps/xep_0448.dart';
 
+/// Data used to build a message stanza.
+///
+/// [setOOBFallbackBody] indicates, when using SFS, whether a OOB fallback should be
+/// added. This is recommended when sharing files but may cause issues when the message
+/// stanza should include a SFS element without any fallbacks.
 class MessageDetails {
   const MessageDetails({
     required this.to,
@@ -36,6 +44,11 @@ class MessageDetails {
     this.funCancellation,
     this.shouldEncrypt = false,
     this.messageRetraction,
+    this.lastMessageCorrectionId,
+    this.messageReactions,
+    this.messageProcessingHints,
+    this.stickerPackId,
+    this.setOOBFallbackBody = true,
   });
   final String to;
   final String? body;
@@ -53,6 +66,11 @@ class MessageDetails {
   final String? funCancellation;
   final bool shouldEncrypt;
   final MessageRetractionData? messageRetraction;
+  final String? lastMessageCorrectionId;
+  final MessageReactions? messageReactions;
+  final String? stickerPackId;
+  final List<MessageProcessingHint>? messageProcessingHints;
+  final bool setOOBFallbackBody;
 }
 
 class MessageManager extends XmppManagerBase {
@@ -78,6 +96,11 @@ class MessageManager extends XmppManagerBase {
     final message = state.stanza;
     final body = message.firstTag('body');
 
+    final hints = List<MessageProcessingHint>.empty(growable: true);
+    for (final element in message.findTagsByXmlns(messageProcessingHintsXmlns)) {
+      hints.add(messageProcessingHintFromXml(element)); 
+    }
+    
     getAttributes().sendEvent(MessageEvent(
       body: body != null ? body.innerText() : '',
       fromJid: JID.fromString(message.attributes['from']! as String),
@@ -98,7 +121,14 @@ class MessageManager extends XmppManagerBase {
       funCancellation: state.funCancellation,
       encrypted: state.encrypted,
       messageRetraction: state.messageRetraction,
+      messageCorrectionId: state.lastMessageCorrectionSid,
+      messageReactions: state.messageReactions,
+      messageProcessingHints: hints.isEmpty ?
+        null :
+        hints,
+      stickerPackId: state.stickerPackId,
       other: state.other,
+      error: StanzaError.fromStanza(message),
     ),);
 
     return state.copyWith(done: true);
@@ -154,7 +184,7 @@ class MessageManager extends XmppManagerBase {
         );
     } else {
       var body = details.body;
-      if (details.sfs != null) {
+      if (details.sfs != null && details.setOOBFallbackBody) {
         // TODO(Unknown): Maybe find a better solution
         final firstSource = details.sfs!.sources.first;
         if (firstSource is StatelessFileSharingUrlSource) {
@@ -166,10 +196,12 @@ class MessageManager extends XmppManagerBase {
         body = details.messageRetraction!.fallback;
       }
 
+      if (body != null) {
         stanza.addChild(
           XMLNode(tag: 'body', text: body),
         );
       }
+    }
 
     if (details.requestDeliveryReceipt) {
       stanza.addChild(makeMessageDeliveryRequest());
@@ -185,7 +217,7 @@ class MessageManager extends XmppManagerBase {
       stanza.addChild(details.sfs!.toXML());
 
       final source = details.sfs!.sources.first;
-      if (source is StatelessFileSharingUrlSource) {
+      if (source is StatelessFileSharingUrlSource && details.setOOBFallbackBody) {
         // SFS recommends OOB as a fallback
         stanza.addChild(constructOOBNode(OOBData(url: source.url)));
       }
@@ -249,6 +281,36 @@ class MessageManager extends XmppManagerBase {
       }
     }
 
+    if (details.lastMessageCorrectionId != null) {
+      stanza.addChild(
+        makeLastMessageCorrectionEdit(
+          details.lastMessageCorrectionId!,
+        ),
+      );
+    }
+
+    if (details.messageReactions != null) {
+      stanza.addChild(details.messageReactions!.toXml());
+    }
+    
+    if (details.messageProcessingHints != null) {
+      for (final hint in details.messageProcessingHints!) {
+        stanza.addChild(hint.toXml());
+      }
+    }
+
+    if (details.stickerPackId != null) {
+      stanza.addChild(
+        XMLNode.xmlns(
+          tag: 'sticker',
+          xmlns: stickersXmlns,
+          attributes: {
+            'pack': details.stickerPackId!,
+          },
+        ),
+      );
+    }
+    
     getAttributes().sendStanza(stanza, awaitable: false);
   }
 }

packages/moxxmpp/lib/src/namespaces.dart

@@ -76,6 +76,9 @@ const hashSha3512 = 'sha3-512';
 const hashBlake2b256 = 'blake2b-256';
 const hashBlake2b512 = 'blake2b-512';
 
+// XEP-0308
+const lmcXmlns = 'urn:xmpp:message-correct:0';
+
 // XEP-0333
 const chatMarkersXmlns = 'urn:xmpp:chat-markers:0';
 
@@ -120,9 +123,12 @@ const fasteningXmlns = 'urn:xmpp:fasten:0';
 // XEP-0424
 const messageRetractionXmlns = 'urn:xmpp:message-retract:0';
 
-// XEp-0428
+// XEP-0428
 const fallbackIndicationXmlns = 'urn:xmpp:fallback:0';
 
+// XEP-0444
+const messageReactionsXmlns = 'urn:xmpp:reactions:0';
+
 // XEP-0446
 const fileMetadataXmlns = 'urn:xmpp:file:metadata:0';
 
@@ -135,6 +141,9 @@ const sfsEncryptionAes128GcmNoPaddingXmlns = 'urn:xmpp:ciphers:aes-128-gcm-nopad
 const sfsEncryptionAes256GcmNoPaddingXmlns = 'urn:xmpp:ciphers:aes-256-gcm-nopadding:0';
 const sfsEncryptionAes256CbcPkcs7Xmlns = 'urn:xmpp:ciphers:aes-256-cbc-pkcs7:0';
 
+// XEP-0449
+const stickersXmlns = 'urn:xmpp:stickers:0';
+
 // XEP-0461
 const replyXmlns = 'urn:xmpp:reply:0';
 const fallbackXmlns = 'urn:xmpp:feature-fallback:0';

packages/moxxmpp/lib/src/rfcs/rfc_4790.dart

@@ -24,3 +24,28 @@ int ioctetSortComparator(String a, String b) {
   
   return 1;
 }
+
+int ioctetSortComparatorRaw(List<int> a, List<int> b) {
+  if (a.isEmpty && b.isEmpty) {
+    return 0;
+  }
+
+  if (a.isEmpty && b.isNotEmpty) {
+    return -1;
+  }
+
+  if (a.isNotEmpty && b.isEmpty) {
+    return 1;
+  }
+
+  if (a[0] == b[0]) {
+    return ioctetSortComparatorRaw(a.sublist(1), b.sublist(1));
+  }
+
+  // TODO(Unknown): Is this correct?
+  if (a[0] < b[0]) {
+    return -1;
+  }
+  
+  return 1;
+}

packages/moxxmpp/lib/src/stanza.dart

@@ -1,6 +1,28 @@
 import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stringxml.dart';
 
+/// A simple description of the <error /> element that may be inside a stanza
+class StanzaError {
+  StanzaError(this.type, this.error);
+  String type;
+  String error;
+
+  /// Returns a StanzaError if [stanza] contains a <error /> element. If not, returns
+  /// null.
+  static StanzaError? fromStanza(Stanza stanza) {
+    final error = stanza.firstTag('error');
+    if (error == null) return null;
+
+    final stanzaError = error.firstTagByXmlns(fullStanzaXmlns);
+    if (stanzaError == null) return null;
+
+    return StanzaError(
+      error.attributes['type']! as String,
+      stanzaError.tag,
+    );
+  }
+}
+
 class Stanza extends XMLNode {
   // ignore: use_super_parameters
   Stanza({ this.to, this.from, this.type, this.id, List<XMLNode> children = const [], required String tag, Map<String, String> attributes = const {} }) : super(

packages/moxxmpp/lib/src/stringxml.dart

@@ -129,6 +129,12 @@ class XMLNode {
     }).toList();
   }
   
+  List<XMLNode> findTagsByXmlns(String xmlns) {
+    return children
+      .where((element) => element.attributes['xmlns'] == xmlns)
+      .toList();
+  }
+  
   /// Returns the inner text of the node. If none is set, returns the "".
   String innerText() {
     return text ?? '';

packages/moxxmpp/lib/src/xeps/xep_0030/xep_0030.dart

@@ -289,7 +289,7 @@ class DiscoManager extends XmppManagerBase {
   }
   
   /// Sends a disco info query to the (full) jid [entity], optionally with node=[node].
-  Future<Result<DiscoError, DiscoInfo>> discoInfoQuery(String entity, { String? node}) async {
+  Future<Result<DiscoError, DiscoInfo>> discoInfoQuery(String entity, { String? node, bool shouldEncrypt = true }) async {
     final cacheKey = DiscoCacheKey(entity, node);
     DiscoInfo? info;
     Completer<Result<DiscoError, DiscoInfo>>? completer;
@@ -316,6 +316,7 @@ class DiscoManager extends XmppManagerBase {
 
     final stanza = await getAttributes().sendStanza(
       buildDiscoInfoQueryStanza(entity, node),
+      encrypted: !shouldEncrypt,
     );
     final query = stanza.firstTag('query');
     if (query == null) {
@@ -359,9 +360,12 @@ class DiscoManager extends XmppManagerBase {
   }
 
   /// Sends a disco items query to the (full) jid [entity], optionally with node=[node].
-  Future<Result<DiscoError, List<DiscoItem>>> discoItemsQuery(String entity, { String? node }) async {
+  Future<Result<DiscoError, List<DiscoItem>>> discoItemsQuery(String entity, { String? node, bool shouldEncrypt = true }) async {
     final stanza = await getAttributes()
-      .sendStanza(buildDiscoItemsQueryStanza(entity, node: node)) as Stanza;
+      .sendStanza(
+        buildDiscoItemsQueryStanza(entity, node: node),
+        encrypted: !shouldEncrypt,
+      ) as Stanza;
 
     final query = stanza.firstTag('query');
     if (query == null) return Result(InvalidResponseDiscoError());

packages/moxxmpp/lib/src/xeps/xep_0054.dart

@@ -7,15 +7,20 @@ import 'package:moxxmpp/src/managers/namespaces.dart';
 import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stanza.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/types/result.dart';
+
+abstract class VCardError {}
+
+class UnknownVCardError extends VCardError {}
+
+class InvalidVCardError extends VCardError {}
 
 class VCardPhoto {
-
   const VCardPhoto({ this.binval });
   final String? binval;
 }
 
 class VCard {
-
   const VCard({ this.nickname, this.url, this.photo });
   final String? nickname;
   final String? url;
@@ -23,7 +28,6 @@ class VCard {
 }
 
 class VCardManager extends XmppManagerBase {
-
   VCardManager() : _lastHash = {}, super();
   final Map<String, String> _lastHash;
   
@@ -59,12 +63,18 @@ class VCardManager extends XmppManagerBase {
     final lastHash = _lastHash[from];
     if (lastHash != hash) {
       _lastHash[from] = hash;
-      final vcard = await requestVCard(from);
+      final vcardResult = await requestVCard(from);
 
-      if (vcard != null) {
-        final binval = vcard.photo?.binval;
+      if (vcardResult.isType<VCard>()) {
+        final binval = vcardResult.get<VCard>().photo?.binval;
         if (binval != null) {
-          getAttributes().sendEvent(AvatarUpdatedEvent(jid: from, base64: binval, hash: hash));
+          getAttributes().sendEvent(
+            AvatarUpdatedEvent(
+              jid: from,
+              base64: binval,
+              hash: hash,
+            ),
+          );
         } else {
           logger.warning('No avatar data found');
         }
@@ -95,7 +105,7 @@ class VCardManager extends XmppManagerBase {
     );
   }
   
-  Future<VCard?> requestVCard(String jid) async {
+  Future<Result<VCardError, VCard>> requestVCard(String jid) async {
     final result = await getAttributes().sendStanza(
       Stanza.iq(
         to: jid,
@@ -107,12 +117,13 @@ class VCardManager extends XmppManagerBase {
           )
         ],
       ),
+      encrypted: true,
     );
 
-    if (result.attributes['type'] != 'result') return null;
+    if (result.attributes['type'] != 'result') return Result(UnknownVCardError());
     final vcard = result.firstTag('vCard', xmlns: vCardTempXmlns);
-    if (vcard == null) return null;
+    if (vcard == null) return Result(UnknownVCardError());
     
-    return _parseVCard(vcard);
+    return Result(_parseVCard(vcard));
   } 
 }

packages/moxxmpp/lib/src/xeps/xep_0060/xep_0060.dart

@@ -16,7 +16,6 @@ import 'package:moxxmpp/src/xeps/xep_0060/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0060/helpers.dart';
 
 class PubSubPublishOptions {
-
   const PubSubPublishOptions({
     this.accessModel,
     this.maxItems,
@@ -60,7 +59,6 @@ class PubSubPublishOptions {
 }
 
 class PubSubItem {
-
   const PubSubItem({ required this.id, required this.node, required this.payload });
   final String id;
   final String node;

packages/moxxmpp/lib/src/xeps/xep_0084.dart

@@ -3,21 +3,24 @@ import 'package:moxxmpp/src/managers/base.dart';
 import 'package:moxxmpp/src/managers/namespaces.dart';
 import 'package:moxxmpp/src/namespaces.dart';
 import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/types/result.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/types.dart';
 import 'package:moxxmpp/src/xeps/xep_0030/xep_0030.dart';
 import 'package:moxxmpp/src/xeps/xep_0060/errors.dart';
 import 'package:moxxmpp/src/xeps/xep_0060/xep_0060.dart';
 
-class UserAvatar {
+abstract class AvatarError {}
 
+class UnknownAvatarError extends AvatarError {}
+
+class UserAvatar {
   const UserAvatar({ required this.base64, required this.hash });
   final String base64;
   final String hash;
 }
 
 class UserAvatarMetadata {
-
   const UserAvatarMetadata(
     this.id,
     this.length,
@@ -65,27 +68,27 @@ class UserAvatarManager extends XmppManagerBase {
 
   /// Requests the avatar from [jid]. Returns the avatar data if the request was
   /// successful. Null otherwise
-  // TODO(Unknown): Migrate to Resultsv2
-  Future<UserAvatar?> getUserAvatar(String jid) async {
+  Future<Result<AvatarError, UserAvatar>> getUserAvatar(String jid) async {
     final pubsub = _getPubSubManager();
     final resultsRaw = await pubsub.getItems(jid, userAvatarDataXmlns);
-    if (resultsRaw.isType<PubSubError>()) return null;
+    if (resultsRaw.isType<PubSubError>()) return Result(UnknownAvatarError());
 
     final results = resultsRaw.get<List<PubSubItem>>();
-    if (results.isEmpty) return null;
+    if (results.isEmpty) return Result(UnknownAvatarError());
 
     final item = results[0];
-    return UserAvatar(
+    return Result(
+      UserAvatar(
         base64: item.payload.innerText(),
         hash: item.id,
+      ),
     );
   }
 
   /// Publish the avatar data, [base64], on the pubsub node using [hash] as
   /// the item id. [hash] must be the SHA-1 hash of the image data, while
   /// [base64] must be the base64-encoded version of the image data.
-  // TODO(Unknown): Migrate to Resultsv2
-  Future<bool> publishUserAvatar(String base64, String hash, bool public) async {
+  Future<Result<AvatarError, bool>> publishUserAvatar(String base64, String hash, bool public) async {
     final pubsub = _getPubSubManager();
     final result = await pubsub.publish(
       getAttributes().getFullJID().toBare().toString(),
@@ -101,14 +104,15 @@ class UserAvatarManager extends XmppManagerBase {
       ),
     );
 
-    return !result.isType<PubSubError>();
+    if (result.isType<PubSubError>()) return Result(UnknownAvatarError());
+    
+    return const Result(true);
   }
 
   /// Publish avatar metadata [metadata] to the User Avatar's metadata node. If [public]
   /// is true, then the node will be set to an 'open' access model. If [public] is false,
   /// then the node will be set to an 'roster' access model.
-  // TODO(Unknown): Migrate to Resultsv2
-  Future<bool> publishUserAvatarMetadata(UserAvatarMetadata metadata, bool public) async {
+  Future<Result<AvatarError, bool>> publishUserAvatarMetadata(UserAvatarMetadata metadata, bool public) async {
     final pubsub = _getPubSubManager();
     final result = await pubsub.publish(
       getAttributes().getFullJID().toBare().toString(),
@@ -135,39 +139,37 @@ class UserAvatarManager extends XmppManagerBase {
       ),
     );
 
-    return result.isType<PubSubError>();
+    if (result.isType<PubSubError>()) return Result(UnknownAvatarError());
+    return const Result(true);
   }
   
   /// Subscribe the data and metadata node of [jid].
-  // TODO(Unknown): Migrate to Resultsv2
-  Future<bool> subscribe(String jid) async {
+  Future<Result<AvatarError, bool>> subscribe(String jid) async {
     await _getPubSubManager().subscribe(jid, userAvatarDataXmlns);
     await _getPubSubManager().subscribe(jid, userAvatarMetadataXmlns);
 
-    return true;
+    return const Result(true);
   }
 
   /// Unsubscribe the data and metadata node of [jid].
-  // TODO(Unknown): Migrate to Resultsv2
-  Future<bool> unsubscribe(String jid) async {
+  Future<Result<AvatarError, bool>> unsubscribe(String jid) async {
     await _getPubSubManager().unsubscribe(jid, userAvatarDataXmlns);
     await _getPubSubManager().subscribe(jid, userAvatarMetadataXmlns);
 
-    return true;
+    return const Result(true);
   }
 
   /// Returns the PubSub Id of an avatar after doing a disco#items query.
   /// Note that this assumes that there is only one (1) item published on
   /// the node.
-  // TODO(Unknown): Migrate to Resultsv2
-  Future<String?> getAvatarId(String jid) async {
+  Future<Result<AvatarError, String>> getAvatarId(String jid) async {
     final disco = getAttributes().getManagerById(discoManager)! as DiscoManager;
-    final response = await disco.discoItemsQuery(jid, node: userAvatarDataXmlns);
-    if (response.isType<DiscoError>()) return null;
+    final response = await disco.discoItemsQuery(jid, node: userAvatarDataXmlns, shouldEncrypt: false);
+    if (response.isType<DiscoError>()) return Result(UnknownAvatarError());
 
     final items = response.get<List<DiscoItem>>();
-    if (items.isEmpty) return null;
+    if (items.isEmpty) return Result(UnknownAvatarError());
 
-    return items.first.name;
+    return Result(items.first.name);
   }
 }

packages/moxxmpp/lib/src/xeps/xep_0203.dart

@@ -8,14 +8,12 @@ import 'package:moxxmpp/src/stanza.dart';
 
 @immutable
 class DelayedDelivery {
-
   const DelayedDelivery(this.from, this.timestamp);
   final DateTime timestamp;
   final String from;
 }
 
 class DelayedDeliveryManager extends XmppManagerBase {
-
   @override
   String getId() => delayedDeliveryManager;
 

packages/moxxmpp/lib/src/xeps/xep_0308.dart

@@ -0,0 +1,50 @@
+import 'package:moxxmpp/src/managers/base.dart';
+import 'package:moxxmpp/src/managers/data.dart';
+import 'package:moxxmpp/src/managers/handlers.dart';
+import 'package:moxxmpp/src/managers/namespaces.dart';
+import 'package:moxxmpp/src/namespaces.dart';
+import 'package:moxxmpp/src/stanza.dart';
+import 'package:moxxmpp/src/stringxml.dart';
+
+XMLNode makeLastMessageCorrectionEdit(String id) {
+  return XMLNode.xmlns(
+    tag: 'replace',
+    xmlns: lmcXmlns,
+    attributes: <String, String>{
+      'id': id,
+    },
+  );
+}
+
+class LastMessageCorrectionManager extends XmppManagerBase {
+  @override
+  String getName() => 'LastMessageCorrectionManager';
+
+  @override
+  String getId() => lastMessageCorrectionManager;
+
+  @override
+  List<String> getDiscoFeatures() => [ lmcXmlns ];
+  
+  @override
+  List<StanzaHandler> getIncomingStanzaHandlers() => [
+    StanzaHandler(
+      stanzaTag: 'message',
+      tagName: 'replace',
+      tagXmlns: lmcXmlns,
+      callback: _onMessage,
+      // Before the message handler
+      priority: -99,
+    )
+  ];
+
+  @override
+  Future<bool> isSupported() async => true;
+  
+  Future<StanzaHandlerData> _onMessage(Stanza stanza, StanzaHandlerData state) async {
+    final edit = stanza.firstTag('replace', xmlns: lmcXmlns)!;
+    return state.copyWith(
+      lastMessageCorrectionSid: edit.attributes['id']! as String,
+    );
+  }
+}

packages/moxxmpp/lib/src/xeps/xep_0334.dart

@@ -8,8 +8,18 @@ enum MessageProcessingHint {
   store,
 }
 
-/// NOTE: We do not define a function for turning a Message Processing Hint element into
-///       an enum value since the elements do not concern us as a client.
+MessageProcessingHint messageProcessingHintFromXml(XMLNode element) {
+  switch (element.tag) {
+    case 'no-permanent-store': return MessageProcessingHint.noPermanentStore;
+    case 'no-store': return MessageProcessingHint.noStore;
+    case 'no-copy': return MessageProcessingHint.noCopies;
+    case 'store': return MessageProcessingHint.store;
+  }
+    
+  assert(false, 'Invalid Message Processing Hint: ${element.tag}');
+  return MessageProcessingHint.noStore;
+}
+
 extension XmlExtension on MessageProcessingHint {
   XMLNode toXml() {
     String tag;

packages/moxxmpp/lib/src/xeps/xep_0444.dart

@@ -0,0 +1,68 @@
+import 'package:moxxmpp/src/managers/base.dart';
+import 'package:moxxmpp/src/managers/data.dart';
+import 'package:moxxmpp/src/managers/handlers.dart';
+import 'package:moxxmpp/src/managers/namespaces.dart';
+import 'package:moxxmpp/src/namespaces.dart';
+import 'package:moxxmpp/src/stanza.dart';
+import 'package:moxxmpp/src/stringxml.dart';
+
+class MessageReactions {
+  const MessageReactions(this.messageId, this.emojis);
+  final String messageId;
+  final List<String> emojis;
+
+  XMLNode toXml() {
+    return XMLNode.xmlns(
+      tag: 'reactions',
+      xmlns: messageReactionsXmlns,
+      attributes: <String, String>{
+        'id': messageId,
+      },
+      children: emojis.map((emoji) {
+        return XMLNode(
+          tag: 'reaction',
+          text: emoji,
+        );
+      }).toList(),
+    );
+  }
+}
+
+class MessageReactionsManager extends XmppManagerBase {
+  @override
+  List<String> getDiscoFeatures() => [ messageReactionsXmlns ];
+
+  @override
+  String getName() => 'MessageReactionsManager';
+
+  @override
+  String getId() => messageReactionsManager;
+
+  @override
+  List<StanzaHandler> getIncomingStanzaHandlers() => [
+    StanzaHandler(
+      stanzaTag: 'message',
+      tagName: 'reactions',
+      tagXmlns: messageReactionsXmlns,
+      callback: _onReactionsReceived,
+      // Before the message handler
+      priority: -99,
+    ),
+  ];
+
+  @override
+  Future<bool> isSupported() async => true;
+ 
+  Future<StanzaHandlerData> _onReactionsReceived(Stanza message, StanzaHandlerData state) async {
+    final reactionsElement = message.firstTag('reactions', xmlns: messageReactionsXmlns)!;
+    return state.copyWith(
+      messageReactions: MessageReactions(
+        reactionsElement.attributes['id']! as String,
+        reactionsElement.children
+          .where((c) => c.tag == 'reaction')
+          .map((c) => c.innerText())
+          .toList(),
+      ),
+    );
+  }
+}

packages/moxxmpp/lib/src/xeps/xep_0446.dart

@@ -4,7 +4,6 @@ import 'package:moxxmpp/src/xeps/staging/extensible_file_thumbnails.dart';
 import 'package:moxxmpp/src/xeps/xep_0300.dart';
 
 class FileMetadataData {
-
   const FileMetadataData({
     this.mediaType,
     this.width,

packages/moxxmpp/lib/src/xeps/xep_0447.dart

@@ -18,7 +18,6 @@ abstract class StatelessFileSharingSource {
 
 /// Implementation for url-data source elements.
 class StatelessFileSharingUrlSource extends StatelessFileSharingSource {
-
   StatelessFileSharingUrlSource(this.url);
 
   factory StatelessFileSharingUrlSource.fromXml(XMLNode element) {
@@ -41,18 +40,17 @@ class StatelessFileSharingUrlSource extends StatelessFileSharingSource {
   }
 }
 
-class StatelessFileSharingData {
-
-  const StatelessFileSharingData(this.metadata, this.sources);
-
-  /// Parse [node] as a StatelessFileSharingData element.
-  factory StatelessFileSharingData.fromXML(XMLNode node) {
-    assert(node.attributes['xmlns'] == sfsXmlns, 'Invalid element xmlns');
-    assert(node.tag == 'file-sharing', 'Invalid element name');
-
+/// Finds the <sources/> element in [node] and returns the list of
+/// StatelessFileSharingSources contained with it.
+/// If [checkXmlns] is true, then the sources element must also have an xmlns attribute
+/// of "urn:xmpp:sfs:0".
+List<StatelessFileSharingSource> processStatelessFileSharingSources(XMLNode node, { bool checkXmlns = true }) {
   final sources = List<StatelessFileSharingSource>.empty(growable: true);
   
-    final sourcesElement = node.firstTag('sources')!;
+  final sourcesElement = node.firstTag(
+    'sources',
+    xmlns: checkXmlns ? sfsXmlns : null,
+  )!;
   for (final source in sourcesElement.children) {
     if (source.attributes['xmlns'] == urlDataXmlns) {
       sources.add(StatelessFileSharingUrlSource.fromXml(source));
@@ -61,9 +59,21 @@ class StatelessFileSharingData {
     }
   }
 
+  return sources;
+}
+
+class StatelessFileSharingData {
+  const StatelessFileSharingData(this.metadata, this.sources);
+
+  /// Parse [node] as a StatelessFileSharingData element.
+  factory StatelessFileSharingData.fromXML(XMLNode node) {
+    assert(node.attributes['xmlns'] == sfsXmlns, 'Invalid element xmlns');
+    assert(node.tag == 'file-sharing', 'Invalid element name');
+
     return StatelessFileSharingData(
       FileMetadataData.fromXML(node.firstTag('file')!),
-      sources,
+      // TODO(PapaTutuWawa): This is a work around for Stickers where the source element has a XMLNS but SFS does not have one.
+      processStatelessFileSharingSources(node, checkXmlns: false),
     );
   }
 
@@ -120,7 +130,7 @@ class SFSManager extends XmppManagerBase {
     final sfs = message.firstTag('file-sharing', xmlns: sfsXmlns)!;
 
     return state.copyWith(
-      sfs: StatelessFileSharingData.fromXML(sfs),
+      sfs: StatelessFileSharingData.fromXML(sfs, ),
     );
   }
 }

packages/moxxmpp/lib/src/xeps/xep_0449.dart

@@ -0,0 +1,308 @@
+import 'dart:convert';
+import 'package:moxxmpp/src/jid.dart';
+import 'package:moxxmpp/src/managers/base.dart';
+import 'package:moxxmpp/src/managers/data.dart';
+import 'package:moxxmpp/src/managers/handlers.dart';
+import 'package:moxxmpp/src/managers/namespaces.dart';
+import 'package:moxxmpp/src/namespaces.dart';
+import 'package:moxxmpp/src/rfcs/rfc_4790.dart';
+import 'package:moxxmpp/src/stanza.dart';
+import 'package:moxxmpp/src/stringxml.dart';
+import 'package:moxxmpp/src/types/result.dart';
+import 'package:moxxmpp/src/xeps/xep_0060/errors.dart';
+import 'package:moxxmpp/src/xeps/xep_0060/xep_0060.dart';
+import 'package:moxxmpp/src/xeps/xep_0300.dart';
+import 'package:moxxmpp/src/xeps/xep_0446.dart';
+import 'package:moxxmpp/src/xeps/xep_0447.dart';
+
+class Sticker {
+  const Sticker(this.metadata, this.sources, this.suggests);
+
+  factory Sticker.fromXML(XMLNode node) {
+    assert(node.tag == 'item', 'sticker has wrong tag');
+
+    return Sticker(
+      FileMetadataData.fromXML(node.firstTag('file', xmlns: fileMetadataXmlns)!),
+      processStatelessFileSharingSources(node, checkXmlns: false),
+      {},
+    );
+  }
+
+  final FileMetadataData metadata;
+  final List<StatelessFileSharingSource> sources;
+  // Language -> suggestion
+  final Map<String, String> suggests; 
+
+  XMLNode toPubSubXML() {
+    final suggestsElements = suggests.keys.map((suggest) {
+      Map<String, String> attrs;
+      if (suggest.isEmpty) {
+        attrs = {};
+      } else {
+        attrs = {
+          'xml:lang': suggest,
+        };
+      }
+
+      return XMLNode(
+        tag: 'suggest',
+        attributes: attrs,
+        text: suggests[suggest],
+      );
+    });
+
+    return XMLNode(
+      tag: 'item',
+      children: [
+        metadata.toXML(),
+        ...sources.map((source) => source.toXml()),
+        ...suggestsElements,
+      ],
+    );
+  }
+}
+
+class StickerPack {
+  const StickerPack(
+    this.id,
+    this.name,
+    this.summary,
+    this.hashAlgorithm,
+    this.hashValue,
+    this.stickers,
+    this.restricted,
+  );
+
+  factory StickerPack.fromXML(String id, XMLNode node, { bool hashAvailable = true }) {
+    assert(node.tag == 'pack', 'node has wrong tag');
+    assert(node.attributes['xmlns'] == stickersXmlns, 'node has wrong XMLNS');
+
+    var hashAlgorithm = HashFunction.sha256;
+    var hashValue = '';
+    if (hashAvailable) {
+      final hash = node.firstTag('hash', xmlns: hashXmlns)!;
+      hashAlgorithm = hashFunctionFromName(hash.attributes['algo']! as String);
+      hashValue = hash.innerText();
+    }
+    
+    return StickerPack(
+      id,
+      node.firstTag('name')!.innerText(),
+      node.firstTag('summary')!.innerText(),
+      hashAlgorithm,
+      hashValue,
+      node.children
+        .where((e) => e.tag == 'item')
+        .map<Sticker>(Sticker.fromXML)
+        .toList(),
+      node.firstTag('restricted') != null,
+    );
+  }
+
+  final String id;
+  // TODO(PapaTutuWawa): Turn name and summary into a Map as it may contain a xml:lang
+  final String name;
+  final String summary;
+  final HashFunction hashAlgorithm;
+  final String hashValue;
+  final List<Sticker> stickers;
+  final bool restricted;
+
+  /// When using the fromXML factory to parse a description of a sticker pack with a
+  /// yet unknown hash, then this function can be used in order to apply the freshly
+  /// calculated hash to the object.
+  StickerPack copyWithId(HashFunction newHashFunction, String newId) {
+    return StickerPack(
+      newId,
+      name,
+      summary,
+      newHashFunction,
+      newId,
+      stickers,
+      restricted,
+    );
+  }
+  
+  XMLNode toXML() {
+    return XMLNode.xmlns(
+      tag: 'pack',
+      xmlns: stickersXmlns,
+      children: [
+        // Pack metadata
+        XMLNode(
+          tag: 'name',
+          text: name,
+        ),
+        XMLNode(
+          tag: 'summary',
+          text: summary,
+        ),
+        constructHashElement(
+          hashAlgorithm.toName(),
+          hashValue,
+        ),
+
+        ...restricted ?
+          [XMLNode(tag: 'restricted')] :
+          [],
+        
+        // Stickers
+        ...stickers
+          .map((sticker) => sticker.toPubSubXML()),
+      ],
+    );
+  }
+
+  /// Calculates the sticker pack's hash as specified by XEP-0449.
+  Future<String> getHash(HashFunction hashFunction) async {
+    // Build the meta string
+    final metaTmp = [
+      <int>[
+        ...utf8.encode('name'),
+        0x1f,
+        0x1f,
+        ...utf8.encode(name),
+        0x1f,
+        0x1e,
+      ],
+      <int>[
+        ...utf8.encode('summary'),
+        0x1f,
+        0x1f,
+        ...utf8.encode(summary),
+        0x1f,
+        0x1e,
+      ],
+    ]..sort(ioctetSortComparatorRaw);
+    final metaString = List<int>.empty(growable: true);
+    for (final m in metaTmp) {
+      metaString.addAll(m);
+    }
+    metaString.add(0x1c);
+
+    // Build item hashes
+    final items = List<List<int>>.empty(growable: true);
+    for (final sticker in stickers) {
+      final tmp = List<int>.empty(growable: true)
+        ..addAll(utf8.encode(sticker.metadata.desc!))
+        ..add(0x1e);
+
+      final hashes = List<List<int>>.empty(growable: true);
+      for (final hash in sticker.metadata.hashes.keys) {
+        hashes.add([
+          ...utf8.encode(hash),
+          0x1f,
+          ...utf8.encode(sticker.metadata.hashes[hash]!),
+          0x1f,
+          0x1e,
+        ]);
+      }
+      hashes.sort(ioctetSortComparatorRaw);
+
+      for (final hash in hashes) {
+        tmp.addAll(hash);
+      }
+      tmp.add(0x1d);
+      items.add(tmp);
+    }
+    items.sort(ioctetSortComparatorRaw);
+    final stickersString = List<int>.empty(growable: true);
+    for (final item in items) {
+      stickersString.addAll(item);
+    }
+    stickersString.add(0x1c);
+
+    // Calculate the hash
+    final rawHash = await CryptographicHashManager.hashFromData(
+      [
+        ...metaString,
+        ...stickersString,
+      ],
+      hashFunction,
+    );
+    return base64.encode(rawHash).substring(0, 24);
+  }
+}
+
+class StickersManager extends XmppManagerBase {
+  @override
+  String getId() => stickersManager;
+
+  @override
+  String getName() => 'StickersManager';
+
+  @override
+  Future<bool> isSupported() async => true;
+
+  @override
+  List<StanzaHandler> getIncomingStanzaHandlers() => [
+    StanzaHandler(
+      stanzaTag: 'message',
+      tagXmlns: stickersXmlns,
+      tagName: 'sticker',
+      callback: _onIncomingMessage,
+      priority: -99,
+    ),
+  ];
+
+  Future<StanzaHandlerData> _onIncomingMessage(Stanza stanza, StanzaHandlerData state) async {
+    final sticker = stanza.firstTag('sticker', xmlns: stickersXmlns)!;
+    return state.copyWith(
+      stickerPackId: sticker.attributes['pack']! as String,
+    );
+  }
+
+  /// Publishes the StickerPack [pack] to the PubSub node of [jid].
+  ///
+  /// On success, returns true. On failure, returns a PubSubError.
+  Future<Result<PubSubError, bool>> publishStickerPack(JID jid, StickerPack pack) async {
+    assert(pack.id != '', 'The sticker pack must have an id');
+    final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
+
+    return pm.publish(
+      jid.toBare().toString(),
+      stickersXmlns,
+      pack.toXML(),
+      id: pack.id,
+      options: const PubSubPublishOptions(
+        maxItems: 'max',
+      ),
+    );
+  }
+
+  /// Removes the sticker pack with id [id] from the PubSub node of [jid].
+  ///
+  /// On success, returns the true. On failure, returns a PubSubError.
+  Future<Result<PubSubError, bool>> retractStickerPack(JID jid, String id) async {
+    final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
+
+    return pm.retract(
+      jid,
+      stickersXmlns,
+      id,
+    );
+  }
+
+  /// Fetches the sticker pack with id [id] from [jid].
+  ///
+  /// On success, returns the StickerPack. On failure, returns a PubSubError.
+  Future<Result<PubSubError, StickerPack>> fetchStickerPack(JID jid, String id) async {
+    final pm = getAttributes().getManagerById<PubSubManager>(pubsubManager)!;
+    final stickerPackDataRaw = await pm.getItem(
+      jid.toBare().toString(),
+      stickersXmlns,
+      id,
+    );
+    if (stickerPackDataRaw.isType<PubSubError>()) {
+      return Result(stickerPackDataRaw.get<PubSubError>());
+    }
+
+    final stickerPackData = stickerPackDataRaw.get<PubSubItem>();
+    final stickerPack = StickerPack.fromXML(
+      stickerPackData.id,
+      stickerPackData.payload,
+    );
+
+    return Result(stickerPack);
+  }
+}

packages/moxxmpp/pubspec.yaml

@@ -1,6 +1,6 @@
 name: moxxmpp
 description: A pure-Dart XMPP library
-version: 0.1.4
+version: 0.1.6+1
 homepage: https://codeberg.org/moxxy/moxxmpp
 publish_to: https://git.polynom.me/api/packages/Moxxy/pub
 
@@ -31,6 +31,6 @@ dev_dependencies:
   build_runner: ^2.1.11
   moxxmpp_socket_tcp:
    hosted: https://git.polynom.me/api/packages/Moxxy/pub
-   version: ^0.1.2+6
+   version: ^0.1.2+9
   test: ^1.16.0
   very_good_analysis: ^3.0.1

packages/moxxmpp_socket_tcp/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.1.2+9
+
+ - Update a dependency to the latest release.
+
+## 0.1.2+8
+
+ - Update a dependency to the latest release.
+
+## 0.1.2+7
+
+ - Update a dependency to the latest release.
+
 ## 0.1.2+6
 
  - Update a dependency to the latest release.

packages/moxxmpp_socket_tcp/README.md

@@ -14,3 +14,9 @@ is, for example, [moxdns](https://codeberg.org/moxxy/moxdns).
 ## License
 
 See `./LICENSE`.
+
+## Support
+
+If you like what I do and you want to support me, feel free to donate to me on Ko-Fi.
+
+[<img src="https://codeberg.org/moxxy/moxxyv2/raw/branch/master/assets/repo/kofi.png" height="36" style="height: 36px; border: 0px;"></img>](https://ko-fi.com/papatutuwawa)

packages/moxxmpp_socket_tcp/pubspec.yaml

@@ -1,6 +1,6 @@
 name: moxxmpp_socket_tcp
 description: A socket for moxxmpp using TCP that implements the RFC6120 connection algorithm and XEP-0368
-version: 0.1.2+6
+version: 0.1.2+9
 homepage: https://codeberg.org/moxxy/moxxmpp
 publish_to: https://git.polynom.me/api/packages/Moxxy/pub
 
@@ -12,7 +12,7 @@ dependencies:
   meta: ^1.6.0
   moxxmpp:
     hosted: https://git.polynom.me/api/packages/Moxxy/pub
-    version: ^0.1.4
+    version: ^0.1.6+1
 
 dev_dependencies:
   lints: ^2.0.0