This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8a0b62c
commit 6282ff7
Showing
9 changed files
with
225 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import { MatrixEvent } from "matrix-js-sdk/src/matrix"; | ||
|
||
import { textForVoiceBroadcastStoppedEventWithoutLink, VoiceBroadcastInfoState } from "../../../voice-broadcast"; | ||
import { IPreview } from "./IPreview"; | ||
|
||
export class VoiceBroadcastPreview implements IPreview { | ||
getTextFor(event: MatrixEvent, tagId?: string, isThread?: boolean): string | null { | ||
if (!event.isRedacted() && event.getContent()?.state === VoiceBroadcastInfoState.Stopped) { | ||
return textForVoiceBroadcastStoppedEventWithoutLink(event); | ||
} | ||
|
||
return null; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
src/voice-broadcast/utils/textForVoiceBroadcastStoppedEventWithoutLink.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import { MatrixEvent } from "matrix-js-sdk/src/matrix"; | ||
|
||
import { _t } from "../../languageHandler"; | ||
import { MatrixClientPeg } from "../../MatrixClientPeg"; | ||
import { getSenderName } from "../../TextForEvent"; | ||
|
||
export const textForVoiceBroadcastStoppedEventWithoutLink = (event: MatrixEvent): string => { | ||
const ownUserId = MatrixClientPeg.get()?.getUserId(); | ||
|
||
if (ownUserId && ownUserId === event.getSender()) { | ||
return _t("You ended a voice broadcast", {}); | ||
} | ||
|
||
return _t("%(senderName)s ended a voice broadcast", { senderName: getSenderName(event) }); | ||
}; |
96 changes: 96 additions & 0 deletions
96
test/stores/room-list/previews/MessageEventPreview-test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import { RelationType } from "matrix-js-sdk/src/matrix"; | ||
|
||
import { MessageEventPreview } from "../../../../src/stores/room-list/previews/MessageEventPreview"; | ||
import { mkEvent, stubClient } from "../../../test-utils"; | ||
|
||
describe("MessageEventPreview", () => { | ||
const preview = new MessageEventPreview(); | ||
const userId = "@user:example.com"; | ||
|
||
beforeAll(() => { | ||
stubClient(); | ||
}); | ||
|
||
describe("getTextFor", () => { | ||
it("when called with an event with empty content should return null", () => { | ||
const event = mkEvent({ | ||
event: true, | ||
content: {}, | ||
user: userId, | ||
type: "m.room.message", | ||
}); | ||
expect(preview.getTextFor(event)).toBeNull(); | ||
}); | ||
|
||
it("when called with an event with empty body should return null", () => { | ||
const event = mkEvent({ | ||
event: true, | ||
content: { | ||
body: "", | ||
}, | ||
user: userId, | ||
type: "m.room.message", | ||
}); | ||
expect(preview.getTextFor(event)).toBeNull(); | ||
}); | ||
|
||
it("when called with an event with body should return »user: body«", () => { | ||
const event = mkEvent({ | ||
event: true, | ||
content: { | ||
body: "test body", | ||
}, | ||
user: userId, | ||
type: "m.room.message", | ||
}); | ||
expect(preview.getTextFor(event)).toBe(`${userId}: test body`); | ||
}); | ||
|
||
it("when called for a replaced event with new content should return the new content body", () => { | ||
const event = mkEvent({ | ||
event: true, | ||
content: { | ||
["m.new_content"]: { | ||
body: "test new content body", | ||
}, | ||
["m.relates_to"]: { | ||
rel_type: RelationType.Replace, | ||
event_id: "$asd123", | ||
}, | ||
}, | ||
user: userId, | ||
type: "m.room.message", | ||
}); | ||
expect(preview.getTextFor(event)).toBe(`${userId}: test new content body`); | ||
}); | ||
|
||
it("when called with a broadcast chunk event it should return null", () => { | ||
const event = mkEvent({ | ||
event: true, | ||
content: { | ||
body: "test body", | ||
["io.element.voice_broadcast_chunk"]: {}, | ||
}, | ||
user: userId, | ||
type: "m.room.message", | ||
}); | ||
expect(preview.getTextFor(event)).toBeNull(); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
test/voice-broadcast/utils/textForVoiceBroadcastStoppedEventWithoutLink-test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import { mocked } from "jest-mock"; | ||
import { MatrixClient } from "matrix-js-sdk/src/client"; | ||
|
||
import { textForVoiceBroadcastStoppedEventWithoutLink, VoiceBroadcastInfoState } from "../../../src/voice-broadcast"; | ||
import { stubClient } from "../../test-utils"; | ||
import { mkVoiceBroadcastInfoStateEvent } from "./test-utils"; | ||
|
||
describe("textForVoiceBroadcastStoppedEventWithoutLink", () => { | ||
const otherUserId = "@other:example.com"; | ||
const roomId = "!room:example.com"; | ||
let client: MatrixClient; | ||
|
||
beforeAll(() => { | ||
client = stubClient(); | ||
}); | ||
|
||
const getText = (senderId: string, startEventId?: string) => { | ||
const event = mkVoiceBroadcastInfoStateEvent( | ||
roomId, | ||
VoiceBroadcastInfoState.Stopped, | ||
senderId, | ||
client.deviceId!, | ||
); | ||
return textForVoiceBroadcastStoppedEventWithoutLink(event); | ||
}; | ||
|
||
it("when called for an own broadcast it should return the expected text", () => { | ||
expect(getText(client.getUserId()!)).toBe("You ended a voice broadcast"); | ||
}); | ||
|
||
it("when called for other ones broadcast it should return the expected text", () => { | ||
expect(getText(otherUserId)).toBe(`${otherUserId} ended a voice broadcast`); | ||
}); | ||
|
||
it("when not logged in it should return the exptected text", () => { | ||
mocked(client.getUserId).mockReturnValue(null); | ||
expect(getText(otherUserId)).toBe(`${otherUserId} ended a voice broadcast`); | ||
}); | ||
}); |