From 7f6f9844386523b19efeb7b69a664210fc8a956b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 19 Nov 2021 17:35:11 +0000 Subject: [PATCH 1/3] Iterate type definitions (#7168) --- src/RoomNotifs.ts | 18 ++++++++---------- .../views/dialogs/IncomingSasDialog.tsx | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/RoomNotifs.ts b/src/RoomNotifs.ts index 5abee9a6add..50d75ea91e6 100644 --- a/src/RoomNotifs.ts +++ b/src/RoomNotifs.ts @@ -18,7 +18,7 @@ limitations under the License. import { MatrixClientPeg } from './MatrixClientPeg'; import { PushProcessor } from 'matrix-js-sdk/src/pushprocessor'; import { NotificationCountType, Room } from "matrix-js-sdk/src/models/room"; -import { IAnnotatedPushRule, PushRuleKind } from "matrix-js-sdk/src/@types/PushRules"; +import { ConditionKind, IPushRule, PushRuleActionName, PushRuleKind } from "matrix-js-sdk/src/@types/PushRules"; export enum RoomNotifState { AllMessagesLoud = 'all_messages_loud', @@ -205,14 +205,12 @@ function setRoomNotifsStateUnmuted(roomId: string, newState: RoomNotifState): Pr return Promise.all(promises); } -function findOverrideMuteRule(roomId: string): IAnnotatedPushRule { +function findOverrideMuteRule(roomId: string): IPushRule { const cli = MatrixClientPeg.get(); - if (!cli.pushRules || - !cli.pushRules['global'] || - !cli.pushRules['global'].override) { + if (!cli?.pushRules?.global?.override) { return null; } - for (const rule of cli.pushRules['global'].override) { + for (const rule of cli.pushRules.global.override) { if (isRuleForRoom(roomId, rule)) { if (isMuteRule(rule) && rule.enabled) { return rule; @@ -222,14 +220,14 @@ function findOverrideMuteRule(roomId: string): IAnnotatedPushRule { return null; } -function isRuleForRoom(roomId: string, rule: IAnnotatedPushRule): boolean { +function isRuleForRoom(roomId: string, rule: IPushRule): boolean { if (rule.conditions.length !== 1) { return false; } const cond = rule.conditions[0]; - return (cond.kind === 'event_match' && cond.key === 'room_id' && cond.pattern === roomId); + return (cond.kind === ConditionKind.EventMatch && cond.key === 'room_id' && cond.pattern === roomId); } -function isMuteRule(rule: IAnnotatedPushRule): boolean { - return (rule.actions.length === 1 && rule.actions[0] === 'dont_notify'); +function isMuteRule(rule: IPushRule): boolean { + return (rule.actions.length === 1 && rule.actions[0] === PushRuleActionName.DontNotify); } diff --git a/src/components/views/dialogs/IncomingSasDialog.tsx b/src/components/views/dialogs/IncomingSasDialog.tsx index da766f495cd..9b372c2b389 100644 --- a/src/components/views/dialogs/IncomingSasDialog.tsx +++ b/src/components/views/dialogs/IncomingSasDialog.tsx @@ -39,7 +39,7 @@ const PHASE_VERIFIED = 3; const PHASE_CANCELLED = 4; interface IProps extends IDialogProps { - verifier: VerificationBase; // TODO types + verifier: VerificationBase; } interface IState { From b6b7511fd938117479411f703098e7cd4ff7b61f Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 21 Nov 2021 14:16:12 +0000 Subject: [PATCH 2/3] Restore 'large' thumbnails to be 800x600 (#7172) In order to restore the original behaviour for those who want it, redefine "large" thumbnails to be fit within 800x600px. This means that timeline screenshots end up typically not being downscaled (which is important given screenshots are our easiest way of copying chunks of history between rooms currently :/). It also means that photos end up nice and big, which was a deliberate aesthetic choice for the app in the past, which some users will want to retain. --- src/settings/enums/ImageSize.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings/enums/ImageSize.ts b/src/settings/enums/ImageSize.ts index 47f16ddc834..3d8dba62e95 100644 --- a/src/settings/enums/ImageSize.ts +++ b/src/settings/enums/ImageSize.ts @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -const SIZE_LARGE = { w: 480, h: 360 }; +const SIZE_LARGE = { w: 800, h: 600 }; const SIZE_NORMAL = { w: 324, h: 220 }; export enum ImageSize { From e0927f3fc8744e5a3c052bc80b8143896993a63d Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 21 Nov 2021 18:56:25 +0100 Subject: [PATCH 3/3] s/boarder/border/g (#7174) --- res/css/_common.scss | 2 +- res/css/views/messages/_MImageBody.scss | 4 ++-- res/css/views/messages/_MVideoBody.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/css/_common.scss b/res/css/_common.scss index 7c8f7326a4c..4c782d00fb3 100644 --- a/res/css/_common.scss +++ b/res/css/_common.scss @@ -32,7 +32,7 @@ $slider-selection-dot-size: 2.4em; $container-border-width: 8px; -$timeline-image-boarder-radius: 8px; +$timeline-image-border-radius: 8px; :root { font-size: 10px; diff --git a/res/css/views/messages/_MImageBody.scss b/res/css/views/messages/_MImageBody.scss index db06c11e21e..e155afcbf39 100644 --- a/res/css/views/messages/_MImageBody.scss +++ b/res/css/views/messages/_MImageBody.scss @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -$timeline-image-boarder-radius: 8px; +$timeline-image-border-radius: 8px; .mx_MImageBody_thumbnail--blurhash { position: absolute; @@ -25,7 +25,7 @@ $timeline-image-boarder-radius: 8px; .mx_MImageBody_thumbnail { object-fit: contain; - border-radius: $timeline-image-boarder-radius; + border-radius: $timeline-image-border-radius; display: flex; justify-content: center; diff --git a/res/css/views/messages/_MVideoBody.scss b/res/css/views/messages/_MVideoBody.scss index b5fdaeabef4..ac4db004d78 100644 --- a/res/css/views/messages/_MVideoBody.scss +++ b/res/css/views/messages/_MVideoBody.scss @@ -18,6 +18,6 @@ span.mx_MVideoBody { video.mx_MVideoBody { max-width: 100%; height: auto; - border-radius: $timeline-image-boarder-radius; + border-radius: $timeline-image-border-radius; } }