Merge branch 'td/customRedactedMessage' into 'main'

chore: pass event to redacted localization and bump version

See merge request famedly/company/frontend/famedlysdk!1320

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.22.0] - 4th July 2023
+
+- chore: pass event to redactedAnEvent and removedBy (td)
+
 ## [0.21.2] - 27th June 2023
 
 - chore: cleanup some eventTypes and unused variables (td)

lib/src/event.dart

@@ -721,9 +721,7 @@ class Event extends MatrixEvent {
       bool plaintextBody = false,
       bool removeMarkdown = false}) {
     if (redacted) {
-      return i18n.removedBy((redactedBecause?.senderFromMemoryOrFallback)
-              ?.calcDisplayname(i18n: i18n) ??
-          senderId);
+      return i18n.removedBy(this);
     }
 
     final body = calcUnlocalizedBody(

lib/src/utils/event_localizations.dart

@@ -85,8 +85,7 @@ abstract class EventLocalizations {
       localizationsMap = {
     EventTypes.Sticker: (event, i18n, body) => i18n.sentASticker(
         event.senderFromMemoryOrFallback.calcDisplayname(i18n: i18n)),
-    EventTypes.Redaction: (event, i18n, body) => i18n.redactedAnEvent(
-        event.senderFromMemoryOrFallback.calcDisplayname(i18n: i18n)),
+    EventTypes.Redaction: (event, i18n, body) => i18n.redactedAnEvent(event),
     EventTypes.RoomAliases: (event, i18n, body) => i18n.changedTheRoomAliases(
         event.senderFromMemoryOrFallback.calcDisplayname(i18n: i18n)),
     EventTypes.RoomCanonicalAlias: (event, i18n, body) =>

lib/src/utils/matrix_default_localizations.dart

@@ -154,14 +154,16 @@ class MatrixDefaultLocalizations extends MatrixLocalizations {
   String get noPermission => 'No permission';
 
   @override
-  String redactedAnEvent(String senderName) => '$senderName redacted an event';
+  String redactedAnEvent(Event redactedEvent) =>
+      '${redactedEvent.senderFromMemoryOrFallback.calcDisplayname()} redacted an event';
 
   @override
   String rejectedTheInvitation(String targetName) =>
       '$targetName rejected the invitation';
 
   @override
-  String removedBy(String calcDisplayname) => 'Removed by $calcDisplayname';
+  String removedBy(Event redactedEvent) =>
+      'Removed by ${redactedEvent.senderFromMemoryOrFallback.calcDisplayname()}';
 
   @override
   String get roomHasBeenUpgraded => 'Room has been upgraded';

lib/src/utils/matrix_localizations.dart

@@ -16,7 +16,7 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/src/room.dart';
+import 'package:matrix/matrix.dart';
 
 abstract class MatrixLocalizations {
   const MatrixLocalizations();
@@ -76,11 +76,11 @@ abstract class MatrixLocalizations {
 
   String groupWith(String displayname);
 
-  String removedBy(String calcDisplayname);
+  String removedBy(Event redactedEvent);
 
   String sentASticker(String senderName);
 
-  String redactedAnEvent(String senderName);
+  String redactedAnEvent(Event redactedEvent);
 
   String changedTheRoomAliases(String senderName);
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: matrix
 description: Matrix Dart SDK
-version: 0.21.2
+version: 0.22.0
 homepage: https://famedly.com
 repository: https://gitlab.com/famedly/company/frontend/famedlysdk.git