Skip to content

Commit 5b64008

Browse files
committed
Merge branch 'main' of github.com:/element-hq/element-web-modules into t3chguy/restricted-guests-api
2 parents 16412a0 + 92bc9d5 commit 5b64008

File tree

4 files changed

+54
-12
lines changed

4 files changed

+54
-12
lines changed

packages/element-web-module-api/element-web-module-api.api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ originalComponent?: (props?: OriginalMessageComponentProps) => React.JSX.Element
9595
// @alpha
9696
export type CustomMessageRenderHints = {
9797
allowEditingEvent?: boolean;
98+
allowDownloadingMedia?: (mxEvent: MatrixEvent) => Promise<boolean>;
9899
};
99100

100101
// @alpha

packages/element-web-module-api/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@element-hq/element-web-module-api",
33
"type": "module",
4-
"version": "1.2.0",
4+
"version": "1.3.0",
55
"description": "Module API surface for element-web",
66
"repository": {
77
"type": "git",

packages/element-web-module-api/src/api/custom-components.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ export type CustomMessageRenderHints = {
4444
* Default is true.
4545
*/
4646
allowEditingEvent?: boolean;
47+
/**
48+
* If an event contains media, this function will be called to check
49+
* if the media can be prompted to be downloaded as a file.
50+
* If this function is not supplied, media downloads are allowed.
51+
*/
52+
allowDownloadingMedia?: (mxEvent: MatrixEvent) => Promise<boolean>;
4753
};
4854

4955
/**

yarn.lock

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3036,7 +3036,7 @@ create-ecdh@^4.0.4:
30363036
bn.js "^4.1.0"
30373037
elliptic "^6.5.3"
30383038

3039-
create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
3039+
create-hash@^1.1.0, create-hash@^1.2.0:
30403040
version "1.2.0"
30413041
resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
30423042
integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
@@ -3047,7 +3047,17 @@ create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
30473047
ripemd160 "^2.0.1"
30483048
sha.js "^2.4.0"
30493049

3050-
create-hmac@^1.1.4, create-hmac@^1.1.7:
3050+
create-hash@~1.1.3:
3051+
version "1.1.3"
3052+
resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
3053+
integrity sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA==
3054+
dependencies:
3055+
cipher-base "^1.0.1"
3056+
inherits "^2.0.1"
3057+
ripemd160 "^2.0.0"
3058+
sha.js "^2.4.0"
3059+
3060+
create-hmac@^1.1.7:
30513061
version "1.1.7"
30523062
resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
30533063
integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
@@ -4283,6 +4293,13 @@ has-tostringtag@^1.0.2:
42834293
dependencies:
42844294
has-symbols "^1.0.3"
42854295

4296+
hash-base@^2.0.0:
4297+
version "2.0.2"
4298+
resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
4299+
integrity sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw==
4300+
dependencies:
4301+
inherits "^2.0.1"
4302+
42864303
hash-base@^3.0.0:
42874304
version "3.1.0"
42884305
resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
@@ -5630,15 +5647,16 @@ pathval@^2.0.0:
56305647
integrity sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==
56315648

56325649
pbkdf2@^3.1.2:
5633-
version "3.1.2"
5634-
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
5635-
integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
5650+
version "3.1.3"
5651+
resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.3.tgz#8be674d591d65658113424592a95d1517318dd4b"
5652+
integrity sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==
56365653
dependencies:
5637-
create-hash "^1.1.2"
5638-
create-hmac "^1.1.4"
5639-
ripemd160 "^2.0.1"
5640-
safe-buffer "^5.0.1"
5641-
sha.js "^2.4.8"
5654+
create-hash "~1.1.3"
5655+
create-hmac "^1.1.7"
5656+
ripemd160 "=2.0.1"
5657+
safe-buffer "^5.2.1"
5658+
sha.js "^2.4.11"
5659+
to-buffer "^1.2.0"
56425660

56435661
picocolors@^1.0.0, picocolors@^1.1.0, picocolors@^1.1.1:
56445662
version "1.1.1"
@@ -6116,6 +6134,14 @@ rimraf@^3.0.2:
61166134
dependencies:
61176135
glob "^7.1.3"
61186136

6137+
ripemd160@=2.0.1:
6138+
version "2.0.1"
6139+
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
6140+
integrity sha512-J7f4wutN8mdbV08MJnXibYpCOPHR+yzy+iQ/AsjMv2j8cLavQ8VGagDFUwwTAdF8FmRKVeNpbTTEwNHCW1g94w==
6141+
dependencies:
6142+
hash-base "^2.0.0"
6143+
inherits "^2.0.1"
6144+
61196145
ripemd160@^2.0.0, ripemd160@^2.0.1:
61206146
version "2.0.2"
61216147
resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -6281,7 +6307,7 @@ setimmediate@^1.0.4:
62816307
resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
62826308
integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
62836309

6284-
sha.js@^2.4.0, sha.js@^2.4.8:
6310+
sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
62856311
version "2.4.11"
62866312
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
62876313
integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
@@ -6878,6 +6904,15 @@ tmp@^0.2.3:
68786904
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
68796905
integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
68806906

6907+
to-buffer@^1.2.0:
6908+
version "1.2.1"
6909+
resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.1.tgz#2ce650cdb262e9112a18e65dc29dcb513c8155e0"
6910+
integrity sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==
6911+
dependencies:
6912+
isarray "^2.0.5"
6913+
safe-buffer "^5.2.1"
6914+
typed-array-buffer "^1.0.3"
6915+
68816916
to-regex-range@^5.0.1:
68826917
version "5.0.1"
68836918
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"

0 commit comments

Comments
 (0)