Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit b13ae76

Browse files
authored
Merge pull request #1345 from matrix-org/t3chguy/text4event_modified_widget
text4event widget modified, used to show widget added each time.
2 parents 22bb635 + 6127727 commit b13ae76

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

src/TextForEvent.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,15 +244,16 @@ function textForPowerEvent(event) {
244244
}
245245
return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
246246
senderName: senderName,
247-
powerLevelDiffText: diff.join(", ")
247+
powerLevelDiffText: diff.join(", "),
248248
});
249249
}
250250

251251
function textForWidgetEvent(event) {
252-
const senderName = event.sender ? event.sender.name : event.getSender();
253-
const previousContent = event.getPrevContent() || {};
252+
const senderName = event.getSender();
253+
const {name: prevName, type: prevType, url: prevUrl} = event.getPrevContent();
254254
const {name, type, url} = event.getContent() || {};
255-
let widgetName = name || previousContent.name || type || previousContent.type || '';
255+
256+
let widgetName = name || prevName || type || prevType || '';
256257
// Apply sentence case to widget name
257258
if (widgetName && widgetName.length > 0) {
258259
widgetName = widgetName[0].toUpperCase() + widgetName.slice(1) + ' ';
@@ -261,9 +262,15 @@ function textForWidgetEvent(event) {
261262
// If the widget was removed, its content should be {}, but this is sufficiently
262263
// equivalent to that condition.
263264
if (url) {
264-
return _t('%(widgetName)s widget added by %(senderName)s', {
265-
widgetName, senderName,
266-
});
265+
if (prevUrl) {
266+
return _t('%(widgetName)s widget modified by %(senderName)s', {
267+
widgetName, senderName,
268+
});
269+
} else {
270+
return _t('%(widgetName)s widget added by %(senderName)s', {
271+
widgetName, senderName,
272+
});
273+
}
267274
} else {
268275
return _t('%(widgetName)s widget removed by %(senderName)s', {
269276
widgetName, senderName,

src/i18n/strings/en_EN.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -977,5 +977,6 @@
977977
"Hide avatars in user and room mentions": "Hide avatars in user and room mentions",
978978
"%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget added by %(senderName)s",
979979
"%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s widget removed by %(senderName)s",
980+
"%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget modified by %(senderName)s",
980981
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>"
981982
}

0 commit comments

Comments
 (0)