From a67686b71797ac6e606e2c23352049ab057e5074 Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Tue, 21 Jan 2025 14:54:10 +0000
Subject: [PATCH 1/4] Mark the attendance command as broken

---
 src/commands/AttendanceCommand.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/commands/AttendanceCommand.ts b/src/commands/AttendanceCommand.ts
index f79a0f4..6005d96 100644
--- a/src/commands/AttendanceCommand.ts
+++ b/src/commands/AttendanceCommand.ts
@@ -21,6 +21,8 @@ import { COLOR_GREEN, COLOR_RED } from "../models/colors";
 import { IPerson } from "../models/schedule";
 import { ConferenceMatrixClient } from "../ConferenceMatrixClient";
 
+const BROKEN_WARNING = "<a href='https://github.com/matrix-org/conference-bot/issues/245'>This command is somewhat broken/misleading.</a> Accepted = percentage of invites that are Matrix and accepted. Emails = percentage of invites that are e-mail (regardless of whether they are accepted or not).";
+
 export class AttendanceCommand implements ICommand {
     public readonly prefixes = ["attendance"];
 
@@ -46,16 +48,22 @@ export class AttendanceCommand implements ICommand {
             }
         }
 
-        let html = "<ul>";
+        let html = BROKEN_WARNING + "<ul>";
         const append = async (invitePeople: IPerson[], bsPeople: IPerson[] | null, name: string, roomId: string, bsRoomId: string | null, withHtml: boolean) => {
+            // all persons that are to be invited to this room
             const inviteTargets = await resolveIdentifiers(this.client, invitePeople);
 
+            // all Matrix members of the room
             const joinedMembers = await this.client.getJoinedRoomMembers(roomId);
 
+            // all invite targets that were e-mail invited, by virtue of not having a registered MXID
             const emailInvites = inviteTargets.filter(i => !i.mxid).length;
+            // all Matrix targets that have also joined
             const joined = inviteTargets.filter(i => i.mxid && joinedMembers.includes(i.mxid)).length;
 
+            // percentage of invites that are both Matrix and accepted
             const acceptedPct = Math.round((joined / inviteTargets.length) * 100);
+            // percentage of invites that are e-mail invites. Regardless of whether they are accepted.
             const emailPct = Math.round((emailInvites / inviteTargets.length) * 100);
 
             totalInvites += inviteTargets.length;

From a193e2958b96e0b260ba419216eaf4ea01a4c6ff Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Tue, 21 Jan 2025 14:55:44 +0000
Subject: [PATCH 2/4] Reimplement `findPeopleWithId` in an attempt to fix
 stored person overrides

---
 src/Conference.ts | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/Conference.ts b/src/Conference.ts
index 86837da..b592156 100644
--- a/src/Conference.ts
+++ b/src/Conference.ts
@@ -875,10 +875,31 @@ export class Conference {
     }
 
     /**
-     * @deprecated This always returns `[]` and should be removed or fixed.
+     * Return a list of all people with the given person ID.
+     *
+     * TODO does not support interest rooms
      */
     public async findPeopleWithId(personId: string): Promise<IPerson[]> {
-        return [];
+        let out: IPerson[] = [];
+
+        for (let auditorium of Object.values(this.auditoriums)) {
+            let audDef = auditorium.getDefinition();
+            for (let talk of audDef.talks.values()) {
+                for (let person of talk.speakers) {
+                    if (person.id === personId) {
+                        out.push(person);
+                    }
+                }
+            }
+
+            for (let person of audDef.extraPeople) {
+                if (person.id === personId) {
+                    out.push(person);
+                }
+            }
+        }
+
+        return out;
     }
 
     /**

From cc6bf843af1f06688cb5f5dca01964e11232cb75 Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Tue, 21 Jan 2025 16:58:55 +0000
Subject: [PATCH 3/4] Don't store one stored person override per redeemed 3pid
 invite

---
 src/Conference.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Conference.ts b/src/Conference.ts
index b592156..3db0cfb 100644
--- a/src/Conference.ts
+++ b/src/Conference.ts
@@ -117,12 +117,11 @@ export class Conference {
                             const people = await this.findPeopleWithId(emailInvite[RS_3PID_PERSON_ID]);
                             if (people?.length) {
                                 // Finally, associate the users.
-                                for (const person of people) {
-                                    const clonedPerson = objectFastClone(person);
-                                    clonedPerson.matrix_id = event['state_key'];
-                                    await this.createUpdatePerson(clonedPerson);
-                                    LogService.info("Conference", `Updated ${clonedPerson.id} to be associated with ${clonedPerson.matrix_id}`);
-                                }
+                                let person = people[0];
+                                const clonedPerson = objectFastClone(person);
+                                clonedPerson.matrix_id = event['state_key'];
+                                await this.createUpdatePerson(clonedPerson);
+                                LogService.info("Conference", `Updated ${clonedPerson.id} to be associated with ${clonedPerson.matrix_id}`);
 
                                 // Update permissions while we're here (if we can identify the room kind)
                                 const aud = this.storedAuditoriums.find(a => a.roomId === roomId);

From 5c1357791824d3643dd864301f578ec1208fc927 Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Tue, 21 Jan 2025 17:00:36 +0000
Subject: [PATCH 4/4] Only store person overrides if we are the bot process

---
 src/Conference.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Conference.ts b/src/Conference.ts
index 3db0cfb..07af54a 100644
--- a/src/Conference.ts
+++ b/src/Conference.ts
@@ -45,7 +45,7 @@ import {
 } from "./models/room_state";
 import { applySuffixRules, objectFastClone, safeCreateRoom } from "./utils";
 import { addAndDeleteManagedAliases, applyAllAliasPrefixes, assignAliasVariations, calculateAliasVariations } from "./utils/aliases";
-import { IConfig } from "./config";
+import { IConfig, RunMode } from "./config";
 import { MatrixRoom } from "./models/MatrixRoom";
 import { Auditorium, AuditoriumBackstage } from "./models/Auditorium";
 import { Talk } from "./models/Talk";
@@ -101,7 +101,8 @@ export class Conference {
             // On any member event, recaulculate the membership.
             this.enqueueRecalculateRoomMembership(roomId);
 
-            if (event['content']?.['third_party_invite']) {
+            // Only process 3pid invites when running as the bot, not the web interface
+            if (event['content']?.['third_party_invite'] && config.mode === RunMode.normal) {
                 const emailInviteToken = event['content']['third_party_invite']['signed']?.['token'];
                 const emailInvite = await this.client.getRoomStateEvent(roomId, "m.room.third_party_invite", emailInviteToken);
                 if (emailInvite[RS_3PID_PERSON_ID]) {