OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: pass event to redactedAnEvent and removedBy

This commit is contained in:
td 2023-07-04 17:09:23 +05:30
parent 49b97787a3
commit d042f9e6ae
No known key found for this signature in database
GPG Key ID: F6D9E9BF14C7D103
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/event.dart
View File

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

3
lib/src/utils/event_localizations.dart
View File

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

6
lib/src/utils/matrix_default_localizations.dart
View File

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

6
lib/src/utils/matrix_localizations.dart
View File

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