Skip to content

Commit

Permalink
Add minimal types for "notification settings" UI
Browse files Browse the repository at this point in the history
  • Loading branch information
turt2live committed Jul 12, 2021
1 parent 5ce787c commit 3c77a87
Show file tree
Hide file tree
Showing 3 changed files with 192 additions and 7 deletions.
154 changes: 154 additions & 0 deletions src/@types/PushRules.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
/*
Copyright 2021 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.
*/

export enum PushRuleActionName {
DontNotify = "dont_notify",
Notify = "notify",
Coalesce = "coalesce",
}

export enum TweakName {
Highlight = "highlight",
Sound = "sound",
}

export type Tweak<N extends TweakName, V> = {
set_tweak: N; // eslint-disable-line camel-case
value: V;
}

export type TweakHighlight = Tweak<TweakName.Highlight, boolean>;
export type TweakSound = Tweak<TweakName.Sound, string>;

export type Tweaks = TweakHighlight | TweakSound;

export enum ConditionOperator {
ExactEquals = "==",
LessThan = "<",
GreaterThan = ">",
GreaterThanOrEqual = ">=",
LessThanOrEqual = "<=",
}

export type PushRuleAction = Tweaks | PushRuleActionName;

export type MemberCountCondition
<N extends number, Op extends ConditionOperator = ConditionOperator.ExactEquals>
= `${Op}${N}` | (Op extends ConditionOperator.ExactEquals ? `${N}` : never);

export type AnyMemberCountCondition = MemberCountCondition<number, ConditionOperator>;

export const DMMemberCountCondition: MemberCountCondition<2> = "2";

export function isDmMemberCountCondition(condition: AnyMemberCountCondition): boolean {
return condition === "==2" || condition === "2";
}

export enum ConditionKind {
EventMatch = "event_match",
ContainsDisplayName = "contains_display_name",
RoomMemberCount = "room_member_count",
SenderNotificationPermission = "sender_notification_permission",
}

export enum PushRuleKind {
Override = "override",
ContentSpecific = "content",
RoomSpecific = "room",
SenderSpecific = "sender",
Underride = "underride",
}

export type PushRuleSet = {
[k in PushRuleKind]?: IPushRule[];
};

export interface IPushRule {
actions: PushRuleAction[];
conditions?: PushRuleCondition[];
default: boolean;
enabled: boolean;
pattern?: string;
rule_id: RuleId | string; // eslint-disable-line camel-case
}

export interface IAnnotatedPushRule extends IPushRule {
kind: PushRuleKind;
}

export interface IPushRuleCondition<N extends ConditionKind | string> {
[k: string]: any; // for custom conditions, there can be other fields here
kind: N;
}

export interface IEventMatchCondition extends IPushRuleCondition<ConditionKind.EventMatch> {
key: string;
pattern: string;
}

export interface IContainsDisplayNameCondition extends IPushRuleCondition<ConditionKind.ContainsDisplayName> {
// no additional fields
}

export interface IRoomMemberCountCondition extends IPushRuleCondition<ConditionKind.RoomMemberCount> {
is: AnyMemberCountCondition;
}

export interface ISenderNotificationPermissionCondition
extends IPushRuleCondition<ConditionKind.SenderNotificationPermission> {
key: string;
}

export type PushRuleCondition = IPushRuleCondition<string>
| IEventMatchCondition
| IContainsDisplayNameCondition
| IRoomMemberCountCondition
| ISenderNotificationPermissionCondition;

export interface IPushRules {
global: PushRuleSet;
device?: PushRuleSet;
}

export enum RuleId {
Master = ".m.rule.master",
ContainsDisplayName = ".m.rule.contains_display_name",
ContainsUserName = ".m.rule.contains_user_name",
AtRoomNotification = ".m.rule.roomnotif",
DM = ".m.rule.room_one_to_one",
EncryptedDM = ".m.rule.encrypted_room_one_to_one",
Message = ".m.rule.message",
EncryptedMessage = ".m.rule.encrypted",
InviteToSelf = ".m.rule.invite_for_me",
MemberEvent = ".m.rule.member_event",
IncomingCall = ".m.rule.call",
SuppressNotices = ".m.rule.suppress_notices",
Tombstone = ".m.rule.tombstone",
}

export interface IPusher {
app_display_name: string; // eslint-disable-line camel-case
app_id: string; // eslint-disable-line camel-case
data: {
format?: string; // TODO: Types
url?: string; // TODO: Required if kind==http
},
device_display_name: string; // eslint-disable-line camel-case
kind: string; // TODO: Types
lang: string;
profile_tag?: string; // eslint-disable-line camel-case
pushkey: string;
}
28 changes: 28 additions & 0 deletions src/@types/threepids.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
Copyright 2021 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.
*/

export enum ThreepidMedium {
Email = "email",
Phone = "msisdn",
}

// TODO: Are these types universal, or specific to just /account/3pid?
export interface IThirdPartyIdentifier {
added_at: number; // eslint-disable-line camel-case
address: string;
medium: ThreepidMedium;
validated_at: number; // eslint-disable-line camel-case
}
17 changes: 10 additions & 7 deletions src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ import { WebStorageSessionStore } from "./store/session/webstorage";
import { BackupManager, IKeyBackupCheck, IPreparedKeyBackupVersion, TrustInfo } from "./crypto/backup";
import { DEFAULT_TREE_POWER_LEVELS_TEMPLATE, MSC3089TreeSpace } from "./models/MSC3089TreeSpace";
import { ISignatures } from "./@types/signed";
import { IPusher, IPushRules } from "./@types/PushRules";
import { IThirdPartyIdentifier } from "./@types/threepids";

export type Store = StubStore | MemoryStore | LocalIndexedDBStoreBackend | RemoteIndexedDBStoreBackend;
export type SessionStore = WebStorageSessionStore;
Expand Down Expand Up @@ -3636,7 +3638,7 @@ export class MatrixClient extends EventEmitter {
* @return {Promise} Resolves: TODO
* @return {module:http-api.MatrixError} Rejects: with an error response.
*/
public async sendReadReceipt(event: MatrixEvent, opts: { hidden?: boolean }, callback?: Callback): Promise<any> {
public async sendReadReceipt(event: MatrixEvent, opts?: { hidden?: boolean }, callback?: Callback): Promise<any> {
if (typeof (opts) === 'function') {
callback = opts as any as Callback; // legacy
opts = {};
Expand Down Expand Up @@ -6759,10 +6761,10 @@ export class MatrixClient extends EventEmitter {

/**
* @param {module:client.callback} callback Optional.
* @return {Promise} Resolves: TODO
* @return {Promise} Resolves to a list of the user's threepids.
* @return {module:http-api.MatrixError} Rejects: with an error response.
*/
public getThreePids(callback?: Callback): Promise<any> { // TODO: Types
public getThreePids(callback?: Callback): Promise<{ threepids: IThirdPartyIdentifier[] }> {
const path = "/account/3pid";
return this.http.authedRequest(
callback, "GET", path, undefined, undefined,
Expand Down Expand Up @@ -6989,7 +6991,7 @@ export class MatrixClient extends EventEmitter {
* @return {Promise} Resolves: Array of objects representing pushers
* @return {module:http-api.MatrixError} Rejects: with an error response.
*/
public getPushers(callback?: Callback): Promise<any> { // TODO: Types
public getPushers(callback?: Callback): Promise<{ pushers: IPusher[] }> { // TODO: Types
const path = "/pushers";
return this.http.authedRequest(
callback, "GET", path, undefined, undefined,
Expand All @@ -7004,19 +7006,20 @@ export class MatrixClient extends EventEmitter {
* @return {Promise} Resolves: Empty json object on success
* @return {module:http-api.MatrixError} Rejects: with an error response.
*/
public setPusher(pusher: any, callback?: Callback): Promise<any> { // TODO: Types
public setPusher(pusher: any, callback?: Callback): Promise<{}> {
const path = "/pushers/set";
return this.http.authedRequest(
callback, "POST", path, null, pusher,
);
}

/**
* Get the push rules for the account from the server.
* @param {module:client.callback} callback Optional.
* @return {Promise} Resolves: TODO
* @return {Promise} Resolves to the push rules.
* @return {module:http-api.MatrixError} Rejects: with an error response.
*/
public getPushRules(callback?: Callback): Promise<any> { // TODO: Types
public getPushRules(callback?: Callback): Promise<IPushRules> {
return this.http.authedRequest(callback, "GET", "/pushrules/").then(rules => {
return PushProcessor.rewriteDefaultRules(rules);
});
Expand Down

0 comments on commit 3c77a87

Please sign in to comment.