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

dont trigger unread counts for beacon location events (#9071)

Browse source
This commit is contained in:
Kerry 2022-07-18 16:23:24 +02:00 • committed by GitHub
parent 42ff9d6dc8
commit 43773e134a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Unread.ts
View file

@ -17,6 +17,7 @@ limitations under the License.
import { Room } from "matrix-js-sdk/src/models/room"; import { Room } from "matrix-js-sdk/src/models/room";
import { MatrixEvent } from "matrix-js-sdk/src/models/event"; import { MatrixEvent } from "matrix-js-sdk/src/models/event";
import { EventType } from "matrix-js-sdk/src/@types/event"; import { EventType } from "matrix-js-sdk/src/@types/event";
import { M_BEACON } from "matrix-js-sdk/src/@types/beacon";
import { MatrixClientPeg } from "./MatrixClientPeg"; import { MatrixClientPeg } from "./MatrixClientPeg";
import shouldHideEvent from './shouldHideEvent'; import shouldHideEvent from './shouldHideEvent';
@ -44,6 +45,8 @@ export function eventTriggersUnreadCount(ev: MatrixEvent): boolean {
case EventType.RoomAliases: case EventType.RoomAliases:
case EventType.RoomCanonicalAlias: case EventType.RoomCanonicalAlias:
case EventType.RoomServerAcl: case EventType.RoomServerAcl:
case M_BEACON.name:
case M_BEACON.altName:
return false; return false;
} }

8
test/Unread-test.ts
View file

@ -22,7 +22,7 @@ import {
} from "matrix-js-sdk/src/matrix"; } from "matrix-js-sdk/src/matrix";
import { haveRendererForEvent } from "../src/events/EventTileFactory"; import { haveRendererForEvent } from "../src/events/EventTileFactory";
import { getMockClientWithEventEmitter, mockClientMethodsUser } from "./test-utils"; import { getMockClientWithEventEmitter, makeBeaconEvent, mockClientMethodsUser } from "./test-utils";
import { eventTriggersUnreadCount } from "../src/Unread"; import { eventTriggersUnreadCount } from "../src/Unread";
jest.mock("../src/events/EventTileFactory", () => ({ jest.mock("../src/events/EventTileFactory", () => ({
@ -92,6 +92,12 @@ describe('eventTriggersUnreadCount()', () => {
expect(haveRendererForEvent).toHaveBeenCalledWith(alicesMessage, false); expect(haveRendererForEvent).toHaveBeenCalledWith(alicesMessage, false);
}); });
it('returns false for beacon locations', () => {
const beaconLocationEvent = makeBeaconEvent(aliceId);
expect(eventTriggersUnreadCount(beaconLocationEvent)).toBe(false);
expect(haveRendererForEvent).not.toHaveBeenCalled();
});
const noUnreadEventTypes = [ const noUnreadEventTypes = [
EventType.RoomMember, EventType.RoomMember,
EventType.RoomThirdPartyInvite, EventType.RoomThirdPartyInvite,