imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure my votes from a different device show up (#7233)

Browse source 
Co-authored-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Andy Balaam 2021-12-02 17:12:18 +00:00 • committed by GitHub
parent 25c119dd5a
commit 141950d9e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 101 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/components/views/messages/MPollBody.tsx
View file

@ -36,14 +36,15 @@ import ErrorDialog from '../dialogs/ErrorDialog';
const TEXT_NODE_TYPE = "org.matrix.msc1767.text";
interface IState {
selected?: string;
pollRelations: Relations;
selected?: string; // Which option was clicked by the local user
pollRelations: Relations; // Allows us to access voting events
}
@replaceableComponent("views.messages.MPollBody")
export default class MPollBody extends React.Component<IBodyProps, IState> {
static contextType = MatrixClientContext;
public static contextType = MatrixClientContext;
public context!: React.ContextType<typeof MatrixClientContext>;
private seenEventIds: string[] = []; // Events we have already seen
constructor(props: IBodyProps) {
super(props);
@ -98,7 +99,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
private onRelationsChange = () => {
// We hold pollRelations in our state, and it has changed under us
this.forceUpdate();
this.unselectIfNewEventFromMe();
};
private selectOption(answerId: string) {
@ -120,7 +121,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
this.props.mxEvent.getRoomId(),
POLL_RESPONSE_EVENT_TYPE.name,
responseContent,
).catch(e => {
).catch((e: any) => {
console.error("Failed to submit poll response event:", e);
Modal.createTrackedDialog(
@ -165,6 +166,33 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
);
}
/**
* If we've just received a new event that we hadn't seen
* before, and that event is me voting (e.g. from a different
* device) then forget when the local user selected.
*
* Either way, calls setState to update our list of events we
* have already seen.
*/
private unselectIfNewEventFromMe() {
const newEvents: MatrixEvent[] = this.state.pollRelations.getRelations()
.filter(isPollResponse)
.filter((mxEvent: MatrixEvent) =>
!this.seenEventIds.includes(mxEvent.getId()));
let newSelected = this.state.selected;
if (newEvents.length > 0) {
for (const mxEvent of newEvents) {
if (mxEvent.getSender() === this.context.getUserId()) {
newSelected = null;
}
}
}
const newEventIds = newEvents.map((mxEvent: MatrixEvent) => mxEvent.getId());
this.seenEventIds = this.seenEventIds.concat(newEventIds);
this.setState( { selected: newSelected } );
}
private totalVotes(collectedVotes: Map<string, number>): number {
let sum = 0;
for (const v of collectedVotes.values()) {
@ -254,13 +282,6 @@ function userResponseFromPollResponseEvent(event: MatrixEvent): UserVote {
}
export function allVotes(pollRelations: Relations): Array<UserVote> {
function isPollResponse(responseEvent: MatrixEvent): boolean {
return (
responseEvent.getType() === POLL_RESPONSE_EVENT_TYPE.name &&
responseEvent.getContent().hasOwnProperty(POLL_RESPONSE_EVENT_TYPE.name)
);
}
if (pollRelations) {
return pollRelations.getRelations()
.filter(isPollResponse)
@ -270,6 +291,13 @@ export function allVotes(pollRelations: Relations): Array<UserVote> {
}
}
function isPollResponse(responseEvent: MatrixEvent): boolean {
return (
POLL_RESPONSE_EVENT_TYPE.matches(responseEvent.getType()) &&
POLL_RESPONSE_EVENT_TYPE.findIn(responseEvent.getContent())
);
}
/**
* Figure out the correct vote for each user.
* @returns a Map of user ID to their vote info