Apply prettier formatting
This commit is contained in:
Michael Weimann
parent
1cac306093
commit
526645c791
1576 changed files with 65385 additions and 62478 deletions
|
|
@ -16,20 +16,20 @@ See the License for the specific language governing permissions and
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React, { ComponentProps } from 'react';
|
||||
import React, { ComponentProps } from "react";
|
||||
import { MatrixEvent } from "matrix-js-sdk/src/models/event";
|
||||
import { RoomMember } from "matrix-js-sdk/src/models/room-member";
|
||||
import { EventType } from 'matrix-js-sdk/src/@types/event';
|
||||
import { EventType } from "matrix-js-sdk/src/@types/event";
|
||||
|
||||
import { _t } from '../../../languageHandler';
|
||||
import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
|
||||
import { _t } from "../../../languageHandler";
|
||||
import { formatCommaSeparatedList } from "../../../utils/FormattingUtils";
|
||||
import { isValid3pidInvite } from "../../../RoomInvite";
|
||||
import GenericEventListSummary from "./GenericEventListSummary";
|
||||
import { RightPanelPhases } from '../../../stores/right-panel/RightPanelStorePhases';
|
||||
import { jsxJoin } from '../../../utils/ReactUtils';
|
||||
import { Layout } from '../../../settings/enums/Layout';
|
||||
import RightPanelStore from '../../../stores/right-panel/RightPanelStore';
|
||||
import AccessibleButton from './AccessibleButton';
|
||||
import { RightPanelPhases } from "../../../stores/right-panel/RightPanelStorePhases";
|
||||
import { jsxJoin } from "../../../utils/ReactUtils";
|
||||
import { Layout } from "../../../settings/enums/Layout";
|
||||
import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
|
||||
import AccessibleButton from "./AccessibleButton";
|
||||
import RoomContext from "../../../contexts/RoomContext";
|
||||
|
||||
const onPinnedMessagesClick = (): void => {
|
||||
|
|
@ -128,14 +128,12 @@ export default class EventListSummary extends React.Component<IProps> {
|
|||
const coalescedTransitions = EventListSummary.coalesceRepeatedTransitions(canonicalTransitions);
|
||||
|
||||
const descs = coalescedTransitions.map((t) => {
|
||||
return EventListSummary.getDescriptionForTransition(
|
||||
t.transitionType, userNames.length, t.repeats,
|
||||
);
|
||||
return EventListSummary.getDescriptionForTransition(t.transitionType, userNames.length, t.repeats);
|
||||
});
|
||||
|
||||
const desc = formatCommaSeparatedList(descs);
|
||||
|
||||
return _t('%(nameList)s %(transitionList)s', { nameList, transitionList: desc });
|
||||
return _t("%(nameList)s %(transitionList)s", { nameList, transitionList: desc });
|
||||
});
|
||||
|
||||
if (!summaries) {
|
||||
|
|
@ -247,110 +245,132 @@ export default class EventListSummary extends React.Component<IProps> {
|
|||
let res = null;
|
||||
switch (t) {
|
||||
case TransitionType.Joined:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)sjoined %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sjoined %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)sjoined %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sjoined %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.Left:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)sleft %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sleft %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)sleft %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sleft %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.JoinedAndLeft:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)sjoined and left %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sjoined and left %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)sjoined and left %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sjoined and left %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.LeftAndJoined:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)sleft and rejoined %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sleft and rejoined %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)sleft and rejoined %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sleft and rejoined %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.InviteReject:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)srejected their invitations %(count)s times", {
|
||||
severalUsers: "",
|
||||
count,
|
||||
})
|
||||
: _t("%(oneUser)srejected their invitation %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)srejected their invitations %(count)s times", {
|
||||
severalUsers: "",
|
||||
count,
|
||||
})
|
||||
: _t("%(oneUser)srejected their invitation %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.InviteWithdrawal:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)shad their invitations withdrawn %(count)s times", {
|
||||
severalUsers: "",
|
||||
count,
|
||||
})
|
||||
: _t("%(oneUser)shad their invitation withdrawn %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)shad their invitations withdrawn %(count)s times", {
|
||||
severalUsers: "",
|
||||
count,
|
||||
})
|
||||
: _t("%(oneUser)shad their invitation withdrawn %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.Invited:
|
||||
res = (userCount > 1)
|
||||
? _t("were invited %(count)s times", { count })
|
||||
: _t("was invited %(count)s times", { count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("were invited %(count)s times", { count })
|
||||
: _t("was invited %(count)s times", { count });
|
||||
break;
|
||||
case TransitionType.Banned:
|
||||
res = (userCount > 1)
|
||||
? _t("were banned %(count)s times", { count })
|
||||
: _t("was banned %(count)s times", { count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("were banned %(count)s times", { count })
|
||||
: _t("was banned %(count)s times", { count });
|
||||
break;
|
||||
case TransitionType.Unbanned:
|
||||
res = (userCount > 1)
|
||||
? _t("were unbanned %(count)s times", { count })
|
||||
: _t("was unbanned %(count)s times", { count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("were unbanned %(count)s times", { count })
|
||||
: _t("was unbanned %(count)s times", { count });
|
||||
break;
|
||||
case TransitionType.Kicked:
|
||||
res = (userCount > 1)
|
||||
? _t("were removed %(count)s times", { count })
|
||||
: _t("was removed %(count)s times", { count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("were removed %(count)s times", { count })
|
||||
: _t("was removed %(count)s times", { count });
|
||||
break;
|
||||
case TransitionType.ChangedName:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)schanged their name %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)schanged their name %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)schanged their name %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)schanged their name %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.ChangedAvatar:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)schanged their avatar %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)schanged their avatar %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)schanged their avatar %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)schanged their avatar %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.NoChange:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)smade no changes %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)smade no changes %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)smade no changes %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)smade no changes %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.ServerAcl:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)schanged the server ACLs %(count)s times",
|
||||
{ severalUsers: "", count })
|
||||
: _t("%(oneUser)schanged the server ACLs %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)schanged the server ACLs %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)schanged the server ACLs %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.ChangedPins:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times",
|
||||
{ severalUsers: "", count },
|
||||
{
|
||||
"a": (sub) => <AccessibleButton kind='link_inline' onClick={onPinnedMessagesClick}>
|
||||
{ sub }
|
||||
</AccessibleButton>,
|
||||
})
|
||||
: _t("%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times",
|
||||
{ oneUser: "", count },
|
||||
{
|
||||
"a": (sub) => <AccessibleButton kind='link_inline' onClick={onPinnedMessagesClick}>
|
||||
{ sub }
|
||||
</AccessibleButton>,
|
||||
});
|
||||
res =
|
||||
userCount > 1
|
||||
? _t(
|
||||
"%(severalUsers)schanged the <a>pinned messages</a> for the room %(count)s times",
|
||||
{ severalUsers: "", count },
|
||||
{
|
||||
a: (sub) => (
|
||||
<AccessibleButton kind="link_inline" onClick={onPinnedMessagesClick}>
|
||||
{sub}
|
||||
</AccessibleButton>
|
||||
),
|
||||
},
|
||||
)
|
||||
: _t(
|
||||
"%(oneUser)schanged the <a>pinned messages</a> for the room %(count)s times",
|
||||
{ oneUser: "", count },
|
||||
{
|
||||
a: (sub) => (
|
||||
<AccessibleButton kind="link_inline" onClick={onPinnedMessagesClick}>
|
||||
{sub}
|
||||
</AccessibleButton>
|
||||
),
|
||||
},
|
||||
);
|
||||
break;
|
||||
case TransitionType.MessageRemoved:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)sremoved a message %(count)s times",
|
||||
{ severalUsers: "", count })
|
||||
: _t("%(oneUser)sremoved a message %(count)s times", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)sremoved a message %(count)s times", { severalUsers: "", count })
|
||||
: _t("%(oneUser)sremoved a message %(count)s times", { oneUser: "", count });
|
||||
break;
|
||||
case TransitionType.HiddenEvent:
|
||||
res = (userCount > 1)
|
||||
? _t("%(severalUsers)ssent %(count)s hidden messages",
|
||||
{ severalUsers: "", count })
|
||||
: _t("%(oneUser)ssent %(count)s hidden messages", { oneUser: "", count });
|
||||
res =
|
||||
userCount > 1
|
||||
? _t("%(severalUsers)ssent %(count)s hidden messages", { severalUsers: "", count })
|
||||
: _t("%(oneUser)ssent %(count)s hidden messages", { oneUser: "", count });
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -390,10 +410,12 @@ export default class EventListSummary extends React.Component<IProps> {
|
|||
|
||||
case EventType.RoomMember:
|
||||
switch (e.mxEvent.getContent().membership) {
|
||||
case 'invite': return TransitionType.Invited;
|
||||
case 'ban': return TransitionType.Banned;
|
||||
case 'join':
|
||||
if (e.mxEvent.getPrevContent().membership === 'join') {
|
||||
case "invite":
|
||||
return TransitionType.Invited;
|
||||
case "ban":
|
||||
return TransitionType.Banned;
|
||||
case "join":
|
||||
if (e.mxEvent.getPrevContent().membership === "join") {
|
||||
if (e.mxEvent.getContent().displayname !== e.mxEvent.getPrevContent().displayname) {
|
||||
return TransitionType.ChangedName;
|
||||
} else if (e.mxEvent.getContent().avatar_url !== e.mxEvent.getPrevContent().avatar_url) {
|
||||
|
|
@ -403,7 +425,7 @@ export default class EventListSummary extends React.Component<IProps> {
|
|||
} else {
|
||||
return TransitionType.Joined;
|
||||
}
|
||||
case 'leave':
|
||||
case "leave":
|
||||
if (e.mxEvent.getSender() === e.mxEvent.getStateKey()) {
|
||||
if (e.mxEvent.getPrevContent().membership === "invite") {
|
||||
return TransitionType.InviteReject;
|
||||
|
|
@ -411,12 +433,16 @@ export default class EventListSummary extends React.Component<IProps> {
|
|||
return TransitionType.Left;
|
||||
}
|
||||
switch (e.mxEvent.getPrevContent().membership) {
|
||||
case 'invite': return TransitionType.InviteWithdrawal;
|
||||
case 'ban': return TransitionType.Unbanned;
|
||||
case "invite":
|
||||
return TransitionType.InviteWithdrawal;
|
||||
case "ban":
|
||||
return TransitionType.Unbanned;
|
||||
// sender is not target and made the target leave, if not from invite/ban then this is a kick
|
||||
default: return TransitionType.Kicked;
|
||||
default:
|
||||
return TransitionType.Kicked;
|
||||
}
|
||||
default: return null;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
||||
default:
|
||||
|
|
@ -440,26 +466,22 @@ export default class EventListSummary extends React.Component<IProps> {
|
|||
};
|
||||
|
||||
const users = Object.keys(userEvents);
|
||||
users.forEach(
|
||||
(userId) => {
|
||||
const firstEvent = userEvents[userId][0];
|
||||
const displayName = firstEvent.displayName;
|
||||
users.forEach((userId) => {
|
||||
const firstEvent = userEvents[userId][0];
|
||||
const displayName = firstEvent.displayName;
|
||||
|
||||
const seq = EventListSummary.getTransitionSequence(userEvents[userId]).join(SEP);
|
||||
if (!aggregate[seq]) {
|
||||
aggregate[seq] = [];
|
||||
aggregateIndices[seq] = -1;
|
||||
}
|
||||
const seq = EventListSummary.getTransitionSequence(userEvents[userId]).join(SEP);
|
||||
if (!aggregate[seq]) {
|
||||
aggregate[seq] = [];
|
||||
aggregateIndices[seq] = -1;
|
||||
}
|
||||
|
||||
aggregate[seq].push(displayName);
|
||||
aggregate[seq].push(displayName);
|
||||
|
||||
if (aggregateIndices[seq] === -1 ||
|
||||
firstEvent.index < aggregateIndices[seq]
|
||||
) {
|
||||
aggregateIndices[seq] = firstEvent.index;
|
||||
}
|
||||
},
|
||||
);
|
||||
if (aggregateIndices[seq] === -1 || firstEvent.index < aggregateIndices[seq]) {
|
||||
aggregateIndices[seq] = firstEvent.index;
|
||||
}
|
||||
});
|
||||
|
||||
return {
|
||||
names: aggregate,
|
||||
|
|
@ -525,15 +547,18 @@ export default class EventListSummary extends React.Component<IProps> {
|
|||
(seq1, seq2) => aggregate.indices[seq1] - aggregate.indices[seq2],
|
||||
);
|
||||
|
||||
return <GenericEventListSummary
|
||||
data-testid={this.props['data-testid']}
|
||||
events={this.props.events}
|
||||
threshold={this.props.threshold}
|
||||
onToggle={this.props.onToggle}
|
||||
startExpanded={this.props.startExpanded}
|
||||
children={this.props.children}
|
||||
summaryMembers={[...latestUserAvatarMember.values()]}
|
||||
layout={this.props.layout}
|
||||
summaryText={this.generateSummary(aggregate.names, orderedTransitionSequences)} />;
|
||||
return (
|
||||
<GenericEventListSummary
|
||||
data-testid={this.props["data-testid"]}
|
||||
events={this.props.events}
|
||||
threshold={this.props.threshold}
|
||||
onToggle={this.props.onToggle}
|
||||
startExpanded={this.props.startExpanded}
|
||||
children={this.props.children}
|
||||
summaryMembers={[...latestUserAvatarMember.values()]}
|
||||
layout={this.props.layout}
|
||||
summaryText={this.generateSummary(aggregate.names, orderedTransitionSequences)}
|
||||
/>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue