-
-
Notifications
You must be signed in to change notification settings - Fork 583
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix sync init when thread unread notif is not supported (#2739)
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
- Loading branch information
Showing
9 changed files
with
160 additions
and
14 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
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 { buildFeatureSupportMap, Feature, ServerSupport } from "../../src/feature"; | ||
|
||
describe("Feature detection", () => { | ||
it("checks the matrix version", async () => { | ||
const support = await buildFeatureSupportMap({ | ||
versions: ["v1.3"], | ||
unstable_features: {}, | ||
}); | ||
|
||
expect(support.get(Feature.Thread)).toBe(ServerSupport.Stable); | ||
expect(support.get(Feature.ThreadUnreadNotifications)).toBe(ServerSupport.Unsupported); | ||
}); | ||
|
||
it("checks the matrix msc number", async () => { | ||
const support = await buildFeatureSupportMap({ | ||
versions: ["v1.2"], | ||
unstable_features: { | ||
"org.matrix.msc3771": true, | ||
"org.matrix.msc3773": true, | ||
}, | ||
}); | ||
expect(support.get(Feature.ThreadUnreadNotifications)).toBe(ServerSupport.Unstable); | ||
}); | ||
|
||
it("requires two MSCs to pass", async () => { | ||
const support = await buildFeatureSupportMap({ | ||
versions: ["v1.2"], | ||
unstable_features: { | ||
"org.matrix.msc3771": false, | ||
"org.matrix.msc3773": true, | ||
}, | ||
}); | ||
expect(support.get(Feature.ThreadUnreadNotifications)).toBe(ServerSupport.Unsupported); | ||
}); | ||
|
||
it("requires two MSCs OR matrix versions to pass", async () => { | ||
const support = await buildFeatureSupportMap({ | ||
versions: ["v1.4"], | ||
unstable_features: { | ||
"org.matrix.msc3771": false, | ||
"org.matrix.msc3773": true, | ||
}, | ||
}); | ||
expect(support.get(Feature.ThreadUnreadNotifications)).toBe(ServerSupport.Stable); | ||
}); | ||
}); |
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,62 @@ | ||
/* | ||
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 { IServerVersions } from "./client"; | ||
|
||
export enum ServerSupport { | ||
Stable, | ||
Unstable, | ||
Unsupported | ||
} | ||
|
||
export enum Feature { | ||
Thread = "Thread", | ||
ThreadUnreadNotifications = "ThreadUnreadNotifications", | ||
} | ||
|
||
type FeatureSupportCondition = { | ||
unstablePrefixes?: string[]; | ||
matrixVersion?: string; | ||
}; | ||
|
||
const featureSupportResolver: Record<string, FeatureSupportCondition> = { | ||
[Feature.Thread]: { | ||
unstablePrefixes: ["org.matrix.msc3440"], | ||
matrixVersion: "v1.3", | ||
}, | ||
[Feature.ThreadUnreadNotifications]: { | ||
unstablePrefixes: ["org.matrix.msc3771", "org.matrix.msc3773"], | ||
matrixVersion: "v1.4", | ||
}, | ||
}; | ||
|
||
export async function buildFeatureSupportMap(versions: IServerVersions): Promise<Map<Feature, ServerSupport>> { | ||
const supportMap = new Map<Feature, ServerSupport>(); | ||
for (const [feature, supportCondition] of Object.entries(featureSupportResolver)) { | ||
const supportMatrixVersion = versions.versions?.includes(supportCondition.matrixVersion || "") ?? false; | ||
const supportUnstablePrefixes = supportCondition.unstablePrefixes?.every(unstablePrefix => { | ||
return versions.unstable_features?.[unstablePrefix] === true; | ||
}) ?? false; | ||
if (supportMatrixVersion) { | ||
supportMap.set(feature as Feature, ServerSupport.Stable); | ||
} else if (supportUnstablePrefixes) { | ||
supportMap.set(feature as Feature, ServerSupport.Unstable); | ||
} else { | ||
supportMap.set(feature as Feature, ServerSupport.Unsupported); | ||
} | ||
} | ||
return supportMap; | ||
} |
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