Compare commits

..

253 Commits

Author SHA1 Message Date
Krishan
714929c72f Bump Cinny version to 1.8.0 2022-03-08 16:53:17 +05:30
dependabot[bot]
98f0d384cb Bump webpack from 5.69.1 to 5.70.0 (#359)
Bumps [webpack](https://github.com/webpack/webpack) from 5.69.1 to 5.70.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.69.1...v5.70.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-08 16:50:36 +05:30
dependabot[bot]
e3c87ecf65 Bump css-loader from 6.6.0 to 6.7.0 (#360)
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.6.0 to 6.7.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.6.0...v6.7.0)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-08 16:47:30 +05:30
dependabot[bot]
1fb9e98eeb Bump mini-css-extract-plugin from 2.5.3 to 2.6.0 (#358)
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.5.3 to 2.6.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v2.5.3...v2.6.0)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-08 16:46:48 +05:30
dependabot[bot]
01d7c8ec36 Bump eslint-plugin-react from 7.29.2 to 7.29.3 (#361)
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.29.2 to 7.29.3.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.29.2...v7.29.3)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-08 16:43:38 +05:30
dependabot[bot]
22d8d5a0b8 Bump actions/upload-artifact from 2.3.1 to 3.0.0 (#362)
* Bump actions/upload-artifact from 2.3.1 to 3

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2.3.1 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2.3.1...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use exact version

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Krishan <33421343+kfiven@users.noreply.github.com>
2022-03-08 16:42:59 +05:30
dependabot[bot]
631ed997ba Bump actions/checkout from 2.4.0 to 3.0.0 (#363)
* Bump actions/checkout from 2.4.0 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use exact version

* Use exact version

* Use exact version

* Use exact version

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Krishan <33421343+kfiven@users.noreply.github.com>
2022-03-08 16:42:31 +05:30
dependabot[bot]
01930ab0cf Bump docker/login-action from 1.14.0 to 1.14.1 (#364)
Bumps [docker/login-action](https://github.com/docker/login-action) from 1.14.0 to 1.14.1.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1.14.0...v1.14.1)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-08 16:41:39 +05:30
Ajay Bura
b8fe4c937e Add dnd space shortcut (#153)
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-08 16:34:55 +05:30
Ajay Bura
a7a5b08ad8 Add function to move space shortcut
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-08 16:29:52 +05:30
Ajay Bura
faaac72b81 Add forward ref in avatar component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-08 16:29:01 +05:30
Ajay Bura
8f41139076 Refactor sidebar avatar component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-07 21:05:47 +05:30
Ajay Bura
e1a67acde1 Add manage pin spaces
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-06 17:52:04 +05:30
Ajay Bura
4ab2af51a5 Add option to create muliple pin spaces shortcut
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-06 17:51:21 +05:30
Ajay Bura
9ffc4eaa40 Add pin plus icon
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-06 17:50:03 +05:30
Ajay Bura
5eda2581f4 Fix side margin
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-06 17:49:21 +05:30
Ajay Bura
21ceb4fdc4 Fix room with join rule knock looks dm
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-06 17:48:31 +05:30
Krishan
edcf43efba Update English strings, fix #352, #354 (#356)
* Fix #354

* Fix #352
2022-03-06 15:57:39 +05:30
Ajay Bura
eb1ef16b5e Remove maximum-scale
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-04 20:13:38 +05:30
Ajay Bura
6b9c8b7a87 Fix roomlist not updating live
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-03 18:46:47 +05:30
Ajay Bura
a05b96e9a0 Show categorized subspaces
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-03 18:36:53 +05:30
Ajay Bura
699f67aa75 Add rooms category component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-03 18:36:09 +05:30
Ajay Bura
76e469e444 Add horizontal menu icon
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-03 18:34:28 +05:30
Ajay Bura
8df630ee0c Update postie to have multiple inbox
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-03 18:33:58 +05:30
Ajay Bura
b0c4c53880 Add categorize space option in space settings
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-02 21:35:09 +05:30
Ajay Bura
116a9c9de0 Add categorize space option
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-02 21:30:14 +05:30
Ajay Bura
e63f8ab8b8 Add categorized spaces hook
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-02 21:24:30 +05:30
Ajay Bura
424245df18 Add categorized spaces in account data
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-02 21:24:11 +05:30
Ajay Bura
094a11ec64 Add categorize spaces function in RoomList
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-03-02 20:57:29 +05:30
dependabot[bot]
6b03c9c99f Bump eslint from 8.9.0 to 8.10.0 (#349)
Bumps [eslint](https://github.com/eslint/eslint) from 8.9.0 to 8.10.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.9.0...v8.10.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 16:34:22 +05:30
dependabot[bot]
3d116af011 Bump matrix-js-sdk from 15.5.2 to 15.6.0 (#347)
Bumps [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk) from 15.5.2 to 15.6.0.
- [Release notes](https://github.com/matrix-org/matrix-js-sdk/releases)
- [Changelog](https://github.com/matrix-org/matrix-js-sdk/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-js-sdk/compare/v15.5.2...v15.6.0)

---
updated-dependencies:
- dependency-name: matrix-js-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 16:32:53 +05:30
dependabot[bot]
cbd965d8e5 Bump eslint-plugin-react from 7.28.0 to 7.29.2 (#346)
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.28.0 to 7.29.2.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.28.0...v7.29.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 16:32:19 +05:30
dependabot[bot]
c9d972fc12 Bump sass from 1.49.8 to 1.49.9 (#348)
Bumps [sass](https://github.com/sass/dart-sass) from 1.49.8 to 1.49.9.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.49.8...1.49.9)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 10:22:12 +05:30
dependabot[bot]
da9979494e Bump node from 17.5.0-alpine3.15 to 17.6.0-alpine3.15 (#351)
Bumps node from 17.5.0-alpine3.15 to 17.6.0-alpine3.15.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 10:16:51 +05:30
dependabot[bot]
f5c907af33 Bump docker/login-action from 1.13.0 to 1.14.0 (#350)
Bumps [docker/login-action](https://github.com/docker/login-action) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1.13.0...v1.14.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-01 10:15:58 +05:30
Ajay Bura
906fc2dd3d Refector room list drawer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-27 21:10:54 +05:30
Ajay Bura
a62df536dd Move space shortcut from roomlist to accountdata
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-27 17:02:03 +05:30
Ajay Bura
7db674b65d Fix button styles
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-27 16:58:15 +05:30
Ajay Bura
784deaa6ea Add icons
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-27 16:57:20 +05:30
Ajay Bura
8bc41c2c32 Fix bug when creating room
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-27 10:50:27 +05:30
Ajay Bura
79afc7649d Add option to create room/space
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-26 21:00:52 +05:30
dependabot[bot]
2eee3736df Bump actions/github-script from 3.1.0 to 6.0.0 (#314)
* Bump actions/github-script from 3.1.0 to 6

Bumps [actions/github-script](https://github.com/actions/github-script) from 3.1.0 to 6.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v3.1.0...v6)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update build-pull-request.yml

* Update deploy-pull-request.yml

* reference rest method by github.rest

this broke in v5 see https://github.com/actions/github-script#breaking-changes-in-v5

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ajay Bura <32841439+ajbura@users.noreply.github.com>
Co-authored-by: Krishan <33421343+kfiven@users.noreply.github.com>
2022-02-24 08:19:14 +05:30
Ajay Bura
a8ba38ef1e Fix bug in add existing rooms
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-23 20:19:56 +05:30
Ajay Bura
d3ddbc0c72 Fix space add options visible in home
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-23 19:48:24 +05:30
Ajay Bura
6c4085398e Add option to add existing room in space
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-23 19:30:48 +05:30
ginnyTheCat
2308578622 Fix input freeze on sending message (#343) 2022-02-23 08:35:06 +05:30
dependabot[bot]
47cd87e653 Bump style-loader from 2.0.0 to 3.3.1 (#341)
Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 2.0.0 to 3.3.1.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/style-loader/compare/v2.0.0...v3.3.1)

---
updated-dependencies:
- dependency-name: style-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 20:02:07 +05:30
dependabot[bot]
87c9684c71 Bump @tippyjs/react from 4.2.5 to 4.2.6 (#340)
Bumps [@tippyjs/react](https://github.com/atomiks/tippyjs-react) from 4.2.5 to 4.2.6.
- [Release notes](https://github.com/atomiks/tippyjs-react/releases)
- [Commits](https://github.com/atomiks/tippyjs-react/compare/v4.2.5...v4.2.6)

---
updated-dependencies:
- dependency-name: "@tippyjs/react"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:56:47 +05:30
dependabot[bot]
0b66d73178 Bump micromark from 3.0.7 to 3.0.10 (#339)
Bumps [micromark](https://github.com/micromark/micromark) from 3.0.7 to 3.0.10.
- [Release notes](https://github.com/micromark/micromark/releases)
- [Commits](https://github.com/micromark/micromark/compare/3.0.7...3.0.10)

---
updated-dependencies:
- dependency-name: micromark
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:55:52 +05:30
dependabot[bot]
24cd238eaf Bump dateformat from 5.0.2 to 5.0.3 (#338)
Bumps [dateformat](https://github.com/felixge/node-dateformat) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/felixge/node-dateformat/releases)
- [Commits](https://github.com/felixge/node-dateformat/compare/v5.0.2...v5.0.3)

---
updated-dependencies:
- dependency-name: dateformat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:51:31 +05:30
dependabot[bot]
72bb9b80ad Bump @babel/core from 7.17.0 to 7.17.5 (#337)
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.17.0 to 7.17.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.17.5/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:51:08 +05:30
dependabot[bot]
3d42ac8e44 Bump html-react-parser from 1.4.0 to 1.4.8 (#336)
Bumps [html-react-parser](https://github.com/remarkablemark/html-react-parser) from 1.4.0 to 1.4.8.
- [Release notes](https://github.com/remarkablemark/html-react-parser/releases)
- [Changelog](https://github.com/remarkablemark/html-react-parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/remarkablemark/html-react-parser/compare/v1.4.0...v1.4.8)

---
updated-dependencies:
- dependency-name: html-react-parser
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:50:40 +05:30
dependabot[bot]
205ab3b16d Bump emojibase-data from 6.2.0 to 7.0.1 (#331)
Bumps [emojibase-data](https://github.com/milesj/emojibase/tree/HEAD/packages/data) from 6.2.0 to 7.0.1.
- [Release notes](https://github.com/milesj/emojibase/releases)
- [Changelog](https://github.com/milesj/emojibase/blob/master/packages/data/CHANGELOG.md)
- [Commits](https://github.com/milesj/emojibase/commits/emojibase-data@7.0.1/packages/data)

---
updated-dependencies:
- dependency-name: emojibase-data
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:40:53 +05:30
dependabot[bot]
bb25da274d Bump eslint from 8.8.0 to 8.9.0 (#335)
Bumps [eslint](https://github.com/eslint/eslint) from 8.8.0 to 8.9.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.8.0...v8.9.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:40:16 +05:30
dependabot[bot]
b56de35664 Bump matrix-js-sdk from 15.5.0 to 15.5.2 (#332)
Bumps [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk) from 15.5.0 to 15.5.2.
- [Release notes](https://github.com/matrix-org/matrix-js-sdk/releases)
- [Changelog](https://github.com/matrix-org/matrix-js-sdk/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-js-sdk/compare/v15.5.0...v15.5.2)

---
updated-dependencies:
- dependency-name: matrix-js-sdk
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:34:56 +05:30
dependabot[bot]
0655ac82f2 Bump sass from 1.49.7 to 1.49.8 (#333)
Bumps [sass](https://github.com/sass/dart-sass) from 1.49.7 to 1.49.8.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.49.7...1.49.8)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:32:08 +05:30
dependabot[bot]
166dbfa491 Bump webpack-dev-server from 4.7.3 to 4.7.4 (#334)
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.7.3 to 4.7.4.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.7.3...v4.7.4)

---
updated-dependencies:
- dependency-name: webpack-dev-server
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:31:50 +05:30
dependabot[bot]
9348977548 Bump sanitize-html from 2.5.3 to 2.7.0 (#329)
Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 2.5.3 to 2.7.0.
- [Release notes](https://github.com/apostrophecms/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/compare/2.5.3...2.7.0)

---
updated-dependencies:
- dependency-name: sanitize-html
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:18:34 +05:30
dependabot[bot]
769c3eea9b Bump copy-webpack-plugin from 9.0.1 to 10.2.4 (#330)
Bumps [copy-webpack-plugin](https://github.com/webpack-contrib/copy-webpack-plugin) from 9.0.1 to 10.2.4.
- [Release notes](https://github.com/webpack-contrib/copy-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/copy-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/copy-webpack-plugin/compare/v9.0.1...v10.2.4)

---
updated-dependencies:
- dependency-name: copy-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:14:42 +05:30
dependabot[bot]
e7095af5b8 Bump webpack from 5.62.1 to 5.69.1 (#328)
Bumps [webpack](https://github.com/webpack/webpack) from 5.62.1 to 5.69.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.62.1...v5.69.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:14:09 +05:30
dependabot[bot]
fd42d72423 Bump css-minimizer-webpack-plugin from 1.3.0 to 3.4.1 (#327)
Bumps [css-minimizer-webpack-plugin](https://github.com/webpack-contrib/css-minimizer-webpack-plugin) from 1.3.0 to 3.4.1.
- [Release notes](https://github.com/webpack-contrib/css-minimizer-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/css-minimizer-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-minimizer-webpack-plugin/compare/v1.3.0...v3.4.1)

---
updated-dependencies:
- dependency-name: css-minimizer-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:10:47 +05:30
dependabot[bot]
1382c455a2 Bump css-loader from 5.2.7 to 6.6.0 (#293)
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 5.2.7 to 6.6.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v5.2.7...v6.6.0)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 19:07:34 +05:30
ginnyTheCat
1d7fbc841e Add option to view event source (#320)
* Add view source

* Add view source cons

* Change design

* Use PopupWindow instead of Dialog

* Undo changes to Dialog.jsx
2022-02-22 19:01:04 +05:30
dependabot[bot]
a8a168b0a7 Bump html-loader from 2.1.2 to 3.1.0 (#296)
Bumps [html-loader](https://github.com/webpack-contrib/html-loader) from 2.1.2 to 3.1.0.
- [Release notes](https://github.com/webpack-contrib/html-loader/releases)
- [Changelog](https://github.com/webpack-contrib/html-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/html-loader/compare/v2.1.2...v3.1.0)

---
updated-dependencies:
- dependency-name: html-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 18:57:51 +05:30
dependabot[bot]
dbd1d02485 Bump sass-loader from 11.0.1 to 12.6.0 (#326)
Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 11.0.1 to 12.6.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v11.0.1...v12.6.0)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 18:55:19 +05:30
dependabot[bot]
1c307daa03 Bump @babel/preset-env from 7.13.12 to 7.16.11 (#295)
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.15.8 to 7.16.11.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.11/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 18:52:47 +05:30
dependabot[bot]
7a31f84d34 Bump docker/login-action from 1.12.0 to 1.13.0 (#325)
Bumps [docker/login-action](https://github.com/docker/login-action) from 1.12.0 to 1.13.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1.12.0...v1.13.0)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 18:44:38 +05:30
dependabot[bot]
a2a4dd9862 Bump node from 17.4.0-alpine3.15 to 17.5.0-alpine3.15 (#313)
Bumps node from 17.4.0-alpine3.15 to 17.5.0-alpine3.15.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 18:44:16 +05:30
dependabot[bot]
3d8e0f6c23 Bump follow-redirects from 1.14.7 to 1.14.8 (#316)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 18:43:18 +05:30
dependabot[bot]
146da2d072 Bump simple-get from 3.1.0 to 3.1.1 (#309)
Bumps [simple-get](https://github.com/feross/simple-get) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/feross/simple-get/releases)
- [Commits](https://github.com/feross/simple-get/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: simple-get
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-22 18:42:49 +05:30
Ajay Bura
6a9964e889 Use font as npm module
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-21 21:29:17 +05:30
Ajay Bura
318e7c7458 Make dialog to add existing rooms to space
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-20 20:17:13 +05:30
Ajay Bura
f8e2d27bb0 Add tabIndex prop in checkbox
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-20 20:14:28 +05:30
Ajay Bura
44544f3289 Add ability to pass node in dialog title
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-20 20:13:59 +05:30
Ajay Bura
76a5c99b08 Add space plus ic
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-20 17:33:26 +05:30
ajbura
70f0f91a17 Fix manage rooms not showing avatar for dms
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-19 19:41:36 +05:30
ajbura
f1394239a3 Fix search dialog styles
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-19 19:35:12 +05:30
ajbura
9e810502c2 Fix dialog screen overflow
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-19 19:28:44 +05:30
ajbura
c67a1752c5 Add ability to remove and suggest/not rooms in manage space
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-19 16:18:39 +05:30
ajbura
d87e40ada5 Add suggested room label in manage rooms
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-19 13:40:32 +05:30
ajbura
86bbaa437e Fix manage room showing rooms as dms in some homeserver
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-18 19:28:55 +05:30
ajbura
96b6b56d95 Update loading screen message
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-17 21:12:28 +05:30
ajbura
1f6e5e71ef Add ability to explore and join space rooms
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-16 20:25:36 +05:30
ajbura
a55f1df17f Change class name for drawer breadcrumb
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-16 19:56:02 +05:30
ajbura
e654226e60 Add via param in join room function
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-16 19:54:21 +05:30
ajbura
189dc93a6e Add join rle to icon src util function
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-16 19:52:51 +05:30
ajbura
76cb52878c Fix bug in room hierarchy
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-16 19:50:11 +05:30
ginnyTheCat
8d3f0a9f4d Create icons for users without an avatar in desktop notifications (#305)
* Add notifications icon for users without an avatar

* Render icon at higher resolution

* Use scale to render at higher resolution
2022-02-15 17:18:25 +05:30
ajbura
fe674ef2ea Merge branch 'dev' of https://github.com/ajbura/cinny into dev 2022-02-14 21:34:57 +05:30
ajbura
33b165518e Update default homeserver list
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-14 21:34:28 +05:30
ginnyTheCat
ff9d509137 Prevent crash when opening room permission on conduit homeserver (#312)
* Prevent crash when opening room permission on conduit homeserver

* Make fix easier
2022-02-14 20:41:36 +05:30
ajbura
278fd5bd59 Fix member load triggering re-renders (#261)
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-13 13:32:57 +05:30
ajbura
8ddbc24dd4 Add rooms hierarchy class
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-10 20:56:23 +05:30
ajbura
e93f429906 Add roadmap to readme.md
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-10 18:00:41 +05:30
dependabot[bot]
1dccb1bb64 Bump docker/build-push-action from 2.8.0 to 2.9.0 (#308)
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.8.0 to 2.9.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2.8.0...v2.9.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-09 08:30:21 +05:30
ginnyTheCat
6d9e67b9f2 Fix crashing on droping text (#302)
* Add basic drop overlay

* Prevent crash when dragging text

* Only show popup when files are being dragged

* Make drop box bigger

* Make drag drop overlay without a modal

* Don't show drag drop menu on top of modals

* Use different way to check for modal
2022-02-09 08:29:21 +05:30
ajbura
4803d48ec7 Fix bug in this.isRawModalVisible
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-08 17:59:15 +05:30
ajbura
7c6a12ea8e Removed dead code
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-08 17:32:49 +05:30
ajbura
a17d5d01a7 Fix edit message input not expending properly
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-08 17:27:57 +05:30
ginnyTheCat
cdd909f2dd Keyboard focus related bugs (#299)
* Focus when opening the emoji board and editing a message

* Clean emoji board after closing

* Focus room search and member search

* Resolve conversations
2022-02-08 17:13:59 +05:30
ajbura
d0e9728c26 Change icon of join public room button
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-07 15:45:57 +05:30
ajbura
c8ae428df8 Keep direct rooms orthogonal (#183)
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-05 19:25:59 +05:30
ajbura
a9692f7db4 Show tombstone message in tombstoned room (#195)
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-05 18:59:44 +05:30
ajbura
d05a426d00 Fix avatar showing av when loading (#247)
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-05 18:19:30 +05:30
ajbura
a842b4c4d9 Fix select effect in emojiboard (#254)
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-05 18:07:41 +05:30
ajbura
101abaeda1 Fix sending localEvent id to redact and reply (#231)
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-05 17:53:02 +05:30
ajbura
bb99167433 Move message options upwards
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-05 17:51:16 +05:30
ajbura
e5b57e5ff9 Add react/no-unstable-nested-components rule in eslintrc
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-05 17:49:51 +05:30
ajbura
2bd598f7f8 Trim homserver in Auth component
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-04 11:43:39 +05:30
ajbura
b008c5f07f Fix reaction tooltip message
Signed-off-by: ajbura <ajbura@gmail.com>
2022-02-04 11:39:18 +05:30
dependabot[bot]
a59aa2c30f Bump matrix-js-sdk from 15.4.0 to 15.5.0 (#294)
Bumps [matrix-js-sdk](https://github.com/matrix-org/matrix-js-sdk) from 15.4.0 to 15.5.0.
- [Release notes](https://github.com/matrix-org/matrix-js-sdk/releases)
- [Changelog](https://github.com/matrix-org/matrix-js-sdk/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-js-sdk/compare/v15.4.0...v15.5.0)

---
updated-dependencies:
- dependency-name: matrix-js-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:58:24 +05:30
dependabot[bot]
93de0d4bf3 Bump @babel/core from 7.16.12 to 7.17.0 (#290)
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.16.12 to 7.17.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.17.0/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:57:17 +05:30
dependabot[bot]
7a0ac2077c Bump tippy.js from 6.3.2 to 6.3.7 (#291)
Bumps [tippy.js](https://github.com/atomiks/tippyjs) from 6.3.2 to 6.3.7.
- [Release notes](https://github.com/atomiks/tippyjs/releases)
- [Commits](https://github.com/atomiks/tippyjs/compare/v6.3.2...v6.3.7)

---
updated-dependencies:
- dependency-name: tippy.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:57:00 +05:30
dependabot[bot]
952f459e70 Bump react-modal from 3.14.3 to 3.14.4 (#292)
Bumps [react-modal](https://github.com/reactjs/react-modal) from 3.14.3 to 3.14.4.
- [Release notes](https://github.com/reactjs/react-modal/releases)
- [Changelog](https://github.com/reactjs/react-modal/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reactjs/react-modal/compare/v3.14.3...v3.14.4)

---
updated-dependencies:
- dependency-name: react-modal
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:56:43 +05:30
dependabot[bot]
4702196c6e Bump dateformat from 4.5.1 to 5.0.2 (#287)
Bumps [dateformat](https://github.com/felixge/node-dateformat) from 4.6.3 to 5.0.2.
- [Release notes](https://github.com/felixge/node-dateformat/releases)
- [Commits](https://github.com/felixge/node-dateformat/commits/v5.0.2)

---
updated-dependencies:
- dependency-name: dateformat
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:45:49 +05:30
dependabot[bot]
f77e064f4e Bump clean-webpack-plugin from 3.0.0 to 4.0.0 (#286)
Bumps [clean-webpack-plugin](https://github.com/johnagan/clean-webpack-plugin) from 3.0.0 to 4.0.0.
- [Release notes](https://github.com/johnagan/clean-webpack-plugin/releases)
- [Commits](https://github.com/johnagan/clean-webpack-plugin/compare/v3.0.0...v4.0.0)

---
updated-dependencies:
- dependency-name: clean-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:42:06 +05:30
dependabot[bot]
c74a9a30bf Bump webpack-cli from 4.9.1 to 4.9.2 (#285)
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.9.1 to 4.9.2.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.9.1...webpack-cli@4.9.2)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:41:25 +05:30
dependabot[bot]
1d43b36380 Bump sass from 1.49.0 to 1.49.7 (#288)
Bumps [sass](https://github.com/sass/dart-sass) from 1.49.0 to 1.49.7.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.49.0...1.49.7)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:40:42 +05:30
ajbura
736f4edfbd Replace gfmHtml with gfmHtml() as per #282 2022-02-03 20:35:02 +05:30
dependabot[bot]
c7e2540f6f Bump eslint from 7.32.0 to 8.8.0 (#278)
Bumps [eslint](https://github.com/eslint/eslint) from 7.32.0 to 8.8.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.32.0...v8.8.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:20:43 +05:30
dependabot[bot]
f796296286 Bump eslint-config-airbnb from 18.2.1 to 19.0.4 (#279)
Bumps [eslint-config-airbnb](https://github.com/airbnb/javascript) from 18.2.1 to 19.0.4.
- [Release notes](https://github.com/airbnb/javascript/releases)
- [Commits](https://github.com/airbnb/javascript/compare/eslint-config-airbnb-v18.2.1...eslint-config-airbnb-v19.0.4)

---
updated-dependencies:
- dependency-name: eslint-config-airbnb
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:17:48 +05:30
dependabot[bot]
eb206d2abb Bump sass from 1.43.4 to 1.49.0 (#280)
Bumps [sass](https://github.com/sass/dart-sass) from 1.43.4 to 1.49.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.43.4...1.49.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:15:47 +05:30
dependabot[bot]
bff62fb105 Bump @babel/core from 7.15.8 to 7.16.12 (#281)
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.15.8 to 7.16.12.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.12/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:14:31 +05:30
dependabot[bot]
5fc83d7615 Bump micromark-extension-gfm from 1.0.0 to 2.0.1 (#282)
Bumps [micromark-extension-gfm](https://github.com/micromark/micromark-extension-gfm) from 1.0.0 to 2.0.1.
- [Release notes](https://github.com/micromark/micromark-extension-gfm/releases)
- [Commits](https://github.com/micromark/micromark-extension-gfm/compare/1.0.0...2.0.1)

---
updated-dependencies:
- dependency-name: micromark-extension-gfm
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-03 20:13:29 +05:30
ginnyTheCat
552a324e08 Drag and drop files (#283)
* Add file drop

* Skip if no files are droped

* Show the page is not accepting file on the welcome page
2022-02-03 20:10:22 +05:30
Ajay Bura
b155d7d1ba Show confirm dialog when change your own power level
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-02-01 09:41:50 +05:30
Ajay Bura
e4571bf668 Remove unused deps, restore github-script to 3.1.0 2022-01-31 22:29:18 +05:30
dependabot[bot]
53cc929a72 Bump @babel/preset-react from 7.14.5 to 7.16.7 (#277)
Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.14.5 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-preset-react)

---
updated-dependencies:
- dependency-name: "@babel/preset-react"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 22:06:12 +05:30
dependabot[bot]
20f5a4cc91 Bump mini-css-extract-plugin from 1.6.2 to 2.5.3 (#275)
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 1.6.2 to 2.5.3.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v1.6.2...v2.5.3)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 22:05:46 +05:30
dependabot[bot]
2aabe559bf Bump follow-redirects from 1.14.5 to 1.14.7 (#266)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.5...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 21:47:09 +05:30
dependabot[bot]
dcf0902c5b Bump nanoid from 3.1.30 to 3.2.0 (#265)
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 21:31:38 +05:30
ginnyTheCat
0e8219b200 Add support for sending spoiler markdown (#267)
* Basic spoiler markdown plugin

* Remove console.log statement
2022-01-31 21:28:42 +05:30
Ajay Bura
5f7fa0557f Add menu header in general settings
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-31 15:22:53 +05:30
Ajay Bura
63fb4d57e2 Improve UX of members tab
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-31 15:20:12 +05:30
Ajay Bura
b5d6f44f4c Add license for graphics
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-31 12:16:49 +05:30
Ajay Bura
b21c8f8c3a Add credits in app about section
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-31 12:15:58 +05:30
Ajay Bura
fe7c7660d3 Use specific and latest version in actions x2 2022-01-31 10:03:31 +05:30
Ajay Bura
56de33c821 Use specific and latest version in actions 2022-01-31 09:59:36 +05:30
dependabot[bot]
1d442cd0e2 Bump prop-types from 15.7.2 to 15.8.1 (#276)
Bumps [prop-types](https://github.com/facebook/prop-types) from 15.7.2 to 15.8.1.
- [Release notes](https://github.com/facebook/prop-types/releases)
- [Changelog](https://github.com/facebook/prop-types/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/prop-types/compare/v15.7.2...v15.8.1)

---
updated-dependencies:
- dependency-name: prop-types
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-31 09:34:14 +05:30
Krishan
c79d7957f6 Update build-pull-request.yml to use npm ci (#271) 2022-01-30 20:59:37 +05:30
C0ffeeCode
1b9216b341 Improve Dockerfile (#256)
* Use npm ci over install to achive faster and more expectable build results;
Split copy package(-lock).json files and ci then to avoid reinstalling dependencies when not needed => Faster build times

* Stopp adding wasm type to mime.types, its already there (duplicate):
- avoids warning in console
- cleans up
- might have been missing in past nginx:alpine versions but now exists

* Change node tag from alpine and nginx to more specific ones for #260
2022-01-30 20:58:38 +05:30
Felix
6d97e5fa5d Create dependabot.yml (#260) 2022-01-30 20:57:53 +05:30
Ajay Bura
162af35254 Fix bug in room member search
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-30 18:57:15 +05:30
Ajay Bura
abe03811f1 Add member list in space settings
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-30 18:47:19 +05:30
Ajay Bura
e85a869733 Add max width for room and space options menu
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-30 10:41:18 +05:30
Ajay Bura
0c32d5302c Add btn and hotkey to close room settings (#269)
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-30 10:05:46 +05:30
Ajay Bura
f310196937 Enable markdown by default
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 19:54:39 +05:30
ginnyTheCat
c828dfd596 Add Desktop notifications (#252)
* Add notifications

* Abide push actions

* Handle browsers not having notification support

* Ask for notification permission after loading

* Make usePermission work without live permission support

* Focus message when clicking the notification

* make const all caps

* Fix usePermission error in Safari

* Fix live permissions

* Remove userActivity and use document.visibilityState instead

* Change setting label to "desktop notifications"

* Check for notification permissions in the settings.js
2022-01-29 19:50:51 +05:30
Ajay Bura
d0b4e092b3 Add space options in space selector
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 14:31:14 +05:30
Ajay Bura
91d7d78621 Open space options on right click pinned space icon
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 14:30:42 +05:30
Ajay Bura
2bc21f13d4 Add space options context menu
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 14:11:05 +05:30
Ajay Bura
833edc9568 Add space settings
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 13:48:06 +05:30
Ajay Bura
9d8efce26d Make room permission component reusable for space settings
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 13:47:37 +05:30
Ajay Bura
6d778ca223 Make room profile component reusable for space settings
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 13:47:06 +05:30
Ajay Bura
1e739e94e2 Make room alias component reusable for space settings
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 13:46:32 +05:30
Ajay Bura
8c013aa2a9 Make title prop as node in PopupWindow component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-29 13:45:36 +05:30
Ajay Bura
fb0a0b0dc2 Fix emoji scaling in suggestion
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-28 10:55:52 +05:30
ginnyTheCat
ab3d9ddb13 Normalize unicode search (#263)
* Normalize unicode search

* Add option to setup function

* Make the call to normalize more explicit
2022-01-27 15:35:53 +05:30
Ajay Bura
a67b32b3ce Twemojify name suggestion
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-27 11:20:36 +05:30
Ajay Bura
e15e690c5d Updated dependencies
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-27 09:49:52 +05:30
Ajay Bura
55c4c25663 v1.7.0 2022-01-26 18:06:07 +05:30
Ajay Bura
202ff53c41 Hide reaction picker for user without permission
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-26 17:16:40 +05:30
Ajay Bura
992da7c7be Refactor navigation
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-26 17:03:26 +05:30
Ajay Bura
f47998a553 Fix scroll when switching between home and DM (#243)
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-26 15:54:58 +05:30
Ajay Bura
f4d24420e7 Fix gap under typing indicator in some device
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-26 15:29:45 +05:30
Justin Shaw
308bdb3d46 Bugfix: Add lazy loading to emoji board (#259)
* add lazy loading to emoji board

* add newline to end of package-lock file
2022-01-26 12:18:11 +05:30
Ajay Bura
20b99dce48 Add support for custom emoji in reactions
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-26 12:06:18 +05:30
Ajay Bura
e4f7c6add9 Show underline on link hover
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-25 12:15:47 +05:30
Ajay Bura
80110d1a48 Fix scrollbar padding for safari breaks other component styling
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-24 14:56:36 +05:30
Ajay Bura
0a0b45fb8e twemojify names in reaction tooltip
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-24 14:54:53 +05:30
Ajay Bura
4ef29ae26f Fix username overflow in timeline change messages
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-24 14:53:51 +05:30
Ajay Bura
ead4b89874 Update contributing.md
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-17 12:50:58 +05:30
Ajay Bura
e827fb2eb2 Fix live read recipt count (#227)
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-17 12:20:18 +05:30
Ajay Bura
4f161fb891 Disabe search input in encrypted room
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-17 12:19:35 +05:30
Ajay Bura
8c30a013c7 Disabe search in encrypted room
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-17 10:15:13 +05:30
Ajay Bura
9f3f877bfd Fix type in search icon tooltip
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-17 10:00:19 +05:30
Ajay Bura
84a75788af Update bug report template
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-16 18:20:39 +05:30
Ajay Bura
f3615117d8 Add search icon in room header
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-16 18:18:33 +05:30
Ajay Bura
48a701ef87 Update bug report template
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-16 18:18:06 +05:30
Ajay Bura
41c72e0a8e Fix crash in profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-16 18:17:20 +05:30
Ajay Bura
a83b875b66 Re-arrange general room settings
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-16 17:55:00 +05:30
Ajay Bura
dcef08009d Add ability to search room messages
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-16 14:17:50 +05:30
Ajay Bura
eddba3c652 Fix font weight for dark theme
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-16 14:17:23 +05:30
Ajay Bura
f0c9a458bb Add broken avatar fallback
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-16 10:41:37 +05:30
Ajay Bura
62c9e271d8 Add padding in scroll view for safari
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-15 20:11:37 +05:30
Ajay Bura
871a25364d Fix typo in room-options
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-14 09:43:35 +05:30
Ajay Bura
e67abae3e0 Add afterClose param to reusabel context menu
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 18:43:22 +05:30
Ajay Bura
c50565dfda Open room options with right click
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 18:31:56 +05:30
Ajay Bura
60c44da974 Refactor room options
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 18:30:43 +05:30
Ajay Bura
ba6d9d0c23 Add option to change reaction permission
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 15:45:27 +05:30
Ajay Bura
8c55f38b07 Add ability to change room permissions
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 13:26:38 +05:30
Ajay Bura
568cf5e2ad Update readme
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 10:48:08 +05:30
Ajay Bura
5e843f7a4f Fix crash in profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 10:33:04 +05:30
Ajay Bura
090ada5807 Add option to unban user in profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 10:28:33 +05:30
Ajay Bura
0e17c57856 Remove mention button from profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 09:46:08 +05:30
Ajay Bura
74464992e6 Redesign session chip in profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-13 09:42:23 +05:30
Ajay Bura
a1d9c21337 Add option to ban user in profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-12 18:50:54 +05:30
Ajay Bura
248fc15716 Add option to kick user in profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-12 18:26:52 +05:30
Ajay Bura
e38ddebfb6 Refactor code of profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-12 16:46:56 +05:30
Ajay Bura
57fc8b2f1a Fix quote from discord bridge
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-12 15:11:34 +05:30
Ajay Bura
b7fac8bcbc Update people drawer on power level change
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-12 13:57:47 +05:30
Ajay Bura
12f2eed5b3 Add ability to change power level in profile viewer
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-12 13:57:13 +05:30
Ajay Bura
3f39fd487f Fix custom power level selection return NaN
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-12 11:40:55 +05:30
Ajay Bura
950bf14d95 Fix markdown heading formatting
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-12 11:17:44 +05:30
Ajay Bura
a279995982 Add action to open reusabel context menu
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-11 20:46:41 +05:30
Ajay Bura
a2eb9734f1 Add PowerLevelSelector component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-11 20:45:10 +05:30
Ajay Bura
cb23991841 Add ReusableContextMenu component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-11 20:43:40 +05:30
Ajay Bura
769d24d196 Add room permissions
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-10 20:34:54 +05:30
Ajay Bura
af61f4f1db Refactor SettingTile component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-10 20:33:40 +05:30
Ajay Bura
f8f77075ec Remove error handling from Avatar component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-09 16:22:04 +05:30
Ajay Bura
34bb5f9928 Fix error on room leave
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-09 10:29:06 +05:30
Ajay Bura
ca3cced6ad Fix system theme not working on load
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-07 10:21:35 +05:30
Ajay Bura
be905ac7be Hide role dropdown icon in profile viewer (#215)
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-05 17:50:50 +05:30
Ajay Bura
53f3ccc888 Fix memory leaks
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-05 17:48:37 +05:30
Ajay Bura
c304670f47 Add globe icons in search
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-05 17:47:41 +05:30
Ajay Bura
6388894aa4 Fix focus bug on room-selector
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-05 14:57:11 +05:30
Ajay Bura
c27b11bf25 Add room alias or id as fallback in room profile
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-05 14:56:30 +05:30
Gregory Anders
11f395f65f Add toggle to use browser's preferred theme (#224)
* Add Auto theme that uses browser's preferred color scheme

This will use dark mode automatically if the browser requests it.

* fixup! Add Auto theme that uses browser's preferred color scheme

* Use a toggle to use system theme
2022-01-03 18:46:43 +05:30
Ajay Bura
63a0adaa6e Add ability to enable room encryption
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-02 12:08:19 +05:30
Ajay Bura
0ddeb02d23 Add ability to manage room history visibility
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-01 16:27:36 +05:30
Ajay Bura
c23acf9e9e Fix context menu margin in auth page
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-01 11:47:53 +05:30
Ajay Bura
54635bf0d3 Add ability to manage room addresses
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2022-01-01 11:43:35 +05:30
Ajay Bura
6fdd9ed48b Remove room-settings hotkeys
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-31 17:39:39 +05:30
Ajay Bura
a0399b7f5e Add disabled attribute in Checkbox, Toggle and RadioButton
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-31 17:38:25 +05:30
Ajay Bura
387f6bcad4 Fix font-variant-ligatures
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-31 10:08:29 +05:30
Ajay Bura
0b43431543 Temp EmojiBoard performance improved
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-30 16:37:11 +05:30
Ajay Bura
34862f9ace Fix EmojiBoard styling
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-30 14:17:55 +05:30
Ajay Bura
cd465ca35a Fix default checkbox size
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-30 12:47:25 +05:30
Ajay Bura
93251e0029 Show pack icon or first emoji as fallback in EmojiBoard sidebar
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-30 12:46:48 +05:30
Ajay Bura
c2402ddb72 Add isImage prop in RawIcon
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-30 12:44:14 +05:30
Ajay Bura
d3dcb320f4 Add checkbox component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-30 11:37:18 +05:30
Emi
fd9f734de1 Add custom emoji to emoji board (#210)
* Display custom emoji in picker

Adds a single category at the start of the emoji picker to display the user's custom emoji

* Show any amount of custom emoji packs in the Emoji Board

* Use thumbnails in emoji picker + mark as emoji

* Fix emoji picker stretching when too many packs are available

* Sprinkle in a few comments for good measure

* Remove emoji-less packs from the emoji picker
2021-12-30 09:32:49 +05:30
Emi
9ea9bf4035 Add support for sending room-local emoji (#209)
* Add support for sending room-local emoji

Does not add support for sending a room's emoji outside of that room, but enables users to
send an emoji if the packs in a room support it.  Does not include room emoji in the
picker YET.

* Amend PR #209: Don't freak out if the `pack` tag is missing

* Amending PR:  Refactor emojifier, use better method for retrieving packs

* Amending PR:  Improve resiliance to bad data in emoji state events

* Amend PR: Remove redundant code, fix crash on edit
2021-12-29 09:56:17 +05:30
Ajay Bura
f9b70d65d8 Fix message formatting
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-28 10:54:46 +05:30
Emi
90621bb1e3 Add support for sending user emoji using autocomplete (#205)
* Add support for sending user emoji using autocomplete

What's included:
- An implementation for detecting user emojis
- Addition of user emojis to the emoji autocomplete in the command bar
- Translation of shortcodes into image tags on message sending

What's not included:
- Loading emojis from the active room, loading the user's global emoji packs, loading emoji from spaces
- Selecting custom emoji using the emoji picker

This is a predominantly proof-of-concept change, and everything here may be subject to
architectural review and reworking.

* Amending PR:  Allow sending multiple of the same emoji

* Amending PR:  Add support for emojis in edited messages

* Amend PR:  Apply requested revisions

This commit consists of several small changes, including:
- Fix crash when the user doesn't have the im.ponies.user_emotes account data entry
- Add mx-data-emoticon attribute to command bar emoji
- Rewrite alt text in the command bar interface
- Remove "vertical-align" attribute from sent emoji

* Amending PR:  Fix bugs (listed below)

- Fix bug where sending emoji w/ markdown off resulted in a crash
- Fix bug where alt text in the command bar was wrong

* Amending PR:  Add support for replacement of twemoji shortcodes

* Amending PR: Fix & refactor getAllEmoji -> getShortcodeToEmoji

* Amending PR: Fix bug: Sending two of the same emoji corrupts message

* Amending PR:  Stylistic fixes
2021-12-28 08:59:39 +05:30
Emi
6ff339b552 Use jumbo emoji for short emoji-only messages (#207)
* Display messages containing only <7 emoji bigger

* Amending PR: Address mentioned concerns

This fixes several concerns raised during the PR review process.  A summary of the changes
implemented is below:
- Size jumbo emoji using the text-h1 class, instead of hardcoding a size
- Increase the emoji limit to 10
- Re-wrap m.text messages in a p tag, fixing a bug where newlines were lost
2021-12-27 10:24:07 +05:30
Ajay Bura
9854f4eb2d Make contributing guideline short and simple
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-26 20:15:07 +05:30
Ajay Bura
d46b046f2d Adjust drawer width in small screen
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-26 16:16:58 +05:30
Ajay Bura
d02e8dcd4e Add optoins to change room visibility
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-26 15:34:20 +05:30
Ajay Bura
07b1fe8e47 Add separate icon for public rooms and spaces
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-26 11:26:41 +05:30
Ajay Bura
7c368ae029 Fix spolier click not working on some browser
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-25 12:26:20 +05:30
Ajay Bura
d6b5f92d6c Add GeneralSettings component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-24 15:09:58 +05:30
Ajay Bura
2b70a49e09 Refactor RoomOptions component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-24 15:09:11 +05:30
Ajay Bura
8cfa20be1e Add RoomNotification component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-24 15:08:16 +05:30
Ajay Bura
246f6caf20 Add disable prop in IconButton and MenuItem
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-24 15:05:56 +05:30
Ajay Bura
7750366654 Fix RadioButton style
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-24 15:03:57 +05:30
Ajay Bura
0f963a93f1 Fix twemoji scaling
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-24 10:18:07 +05:30
Ajay Bura
ea5b63af18 Add RadioButton component
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-23 17:09:09 +05:30
Ajay Bura
5e89675c9c Auto update room profile on change
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-23 10:03:20 +05:30
Ajay Bura
5777c1ab27 Add RoomSettings comp
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-22 20:18:32 +05:30
Ajay Bura
8eda0aeab3 Add room profile comp
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-22 20:17:01 +05:30
Ajay Bura
23c430fadc Add tabs comp
Signed-off-by: Ajay Bura <ajbura@gmail.com>
2021-12-21 18:34:13 +05:30
daemonspring
aa423cfa5b Removed mixin that was wiping out existing padding (#196)
Line 335 already gives blockquotes their padding. The mixin explicitly sets the right padding back to 0 and the left padding to exactly what it was already set to.
2021-12-20 13:47:38 +05:30
194 changed files with 12360 additions and 8999 deletions

2
.dockerignore Normal file
View File

@@ -0,0 +1,2 @@
node_modules/
.git/

View File

@@ -20,5 +20,9 @@ module.exports = {
rules: {
'linebreak-style': 0,
'no-underscore-dangle': 0,
'react/no-unstable-nested-components': [
'error',
{ allowAsProps: true },
],
},
};

View File

@@ -27,6 +27,7 @@ If applicable, add screenshots to help explain your problem.
- OS: [e.g. Windows, MacOS]
- Browser: [e.g. chrome, firefox]
- Version: [e.g. 3.22]
- Matrix homeserver: [e.g. matrix.org]
#### Additional context
Add any other context about the problem here.

22
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,22 @@
# Docs: <https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/customizing-dependency-updates>
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule: {interval: weekly}
reviewers: [ajbura]
assignees: [ajbura]
- package-ecosystem: docker
directory: /
schedule: {interval: weekly}
reviewers: [ajbura]
assignees: [ajbura]
- package-ecosystem: npm
directory: /
schedule: {interval: weekly}
reviewers: [ajbura]
assignees: [ajbura]

View File

@@ -10,22 +10,22 @@ jobs:
env:
PR_NUMBER: ${{github.event.number}}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3.0.0
- name: Build
run: npm install && npm run build
run: npm ci && npm run build
- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3.0.0
with:
name: previewbuild
path: dist
retention-days: 1
- uses: actions/github-script@v3.1.0
- uses: actions/github-script@v6.0.0
with:
script: |
var fs = require('fs');
fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
- name: Upload PR Info
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3.0.0
with:
name: pr.json
path: pr.json

View File

@@ -14,10 +14,10 @@ jobs:
# workflow_run action (https://github.com/actions/download-artifact/issues/60)
# so instead we get this mess:
- name: 'Download artifact'
uses: actions/github-script@v3.1.0
uses: actions/github-script@v6.0.0
with:
script: |
var artifacts = await github.actions.listWorkflowRunArtifacts({
var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
owner: context.repo.owner,
repo: context.repo.repo,
run_id: ${{github.event.workflow_run.id }},
@@ -25,7 +25,7 @@ jobs:
var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
return artifact.name == "previewbuild"
})[0];
var download = await github.actions.downloadArtifact({
var download = await github.rest.actions.downloadArtifact({
owner: context.repo.owner,
repo: context.repo.repo,
artifact_id: matchArtifact.id,
@@ -36,7 +36,7 @@ jobs:
var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
return artifact.name == "pr.json"
})[0];
var download = await github.actions.downloadArtifact({
var download = await github.rest.actions.downloadArtifact({
owner: context.repo.owner,
repo: context.repo.repo,
artifact_id: prInfoArtifact.id,
@@ -48,7 +48,7 @@ jobs:
run: unzip -d dist previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
- name: 'Read PR Info'
id: readctx
uses: actions/github-script@v3.1.0
uses: actions/github-script@v6.0.0
with:
script: |
var fs = require('fs');
@@ -56,7 +56,7 @@ jobs:
console.log(`::set-output name=prnumber::${pr.number}`);
- name: Deploy to Netlify
id: netlify
uses: nwtgck/actions-netlify@v1.2
uses: nwtgck/actions-netlify@v1.2.3
with:
publish-dir: dist
deploy-message: "Deploy from GitHub Actions"
@@ -75,4 +75,4 @@ jobs:
pull-request-number: ${{ steps.readctx.outputs.prnumber }}
description-message: |
Preview: ${{ steps.netlify.outputs.deploy-url }}
⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.
⚠️ Exercise caution. Use test accounts. ⚠️

View File

@@ -11,24 +11,24 @@ jobs:
steps:
- name: Check out the repo
uses: actions/checkout@v2
uses: actions/checkout@v3.0.0
- name: Log in to Docker Hub
uses: docker/login-action@v1
uses: docker/login-action@v1.14.1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v3.6.2
with:
images: ajbura/cinny
- name: Build and push Docker image
uses: docker/build-push-action@v2
uses: docker/build-push-action@v2.9.0
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
labels: ${{ steps.meta.outputs.labels }}

View File

@@ -11,11 +11,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: jsmrcaga/action-netlify-deploy@9cc40dcd499dd1511b3cc99912444f8970411cc6
- uses: actions/checkout@v3.0.0
- uses: jsmrcaga/action-netlify-deploy@v1.7.2
with:
install_command: "npm ci"
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE2_ID }}
BUILD_DIRECTORY: "dist"
NETLIFY_DEPLOY_MESSAGE: "Dev deploy v${{ github.ref }}"
NETLIFY_DEPLOY_TO_PROD: true
NETLIFY_DEPLOY_TO_PROD: true

View File

@@ -10,11 +10,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: jsmrcaga/action-netlify-deploy@9cc40dcd499dd1511b3cc99912444f8970411cc6
- uses: actions/checkout@v3.0.0
- uses: jsmrcaga/action-netlify-deploy@v1.7.2
with:
install_command: "npm ci"
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
BUILD_DIRECTORY: "dist"
NETLIFY_DEPLOY_MESSAGE: "Prod deploy v${{ github.ref }}"
NETLIFY_DEPLOY_TO_PROD: true
NETLIFY_DEPLOY_TO_PROD: true

View File

@@ -1,9 +1,8 @@
<!-- omit in toc -->
# Contributing to Cinny
First off, thanks for taking the time to contribute! ❤️
All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
All types of contributions are encouraged and valued. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
> - Star the project
@@ -12,128 +11,29 @@ All types of contributions are encouraged and valued. See the [Table of Contents
> - Mention the project at local meetups and tell your friends/colleagues
> - [Donate to us](https://cinny.in/#sponsor)
<!-- omit in toc -->
## Table of Contents
## Bug reports
- [I Have a Question](#i-have-a-question)
- [I Want To Contribute](#i-want-to-contribute)
- [Reporting Bugs](#reporting-bugs)
- [Suggesting Enhancements](#suggesting-enhancements)
- [Your First Code Contribution](#your-first-code-contribution)
- [Styleguides](#styleguides)
- [Commit Messages](#commit-messages)
- [Coding conventions](#coding-conventions)
Bug reports and feature suggestions must use descriptive and concise titles and be submitted to [GitHub Issues](https://github.com/ajbura/cinny/issues). Please use the search function to make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected.
## I Have a Question
## Pull requests
Before you ask a question, it is best to search for existing [Issues](https://github.com/ajbura/cinny/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue.
If you then still feel the need to ask a question and need clarification, we recommend the following:
- Ask in our [Matrix room](https://matrix.to/#/#cinny:matrix.org) or [IRC channel](https://web.libera.chat/?channel=#cinny).
- If no one respond in our channel, please open an [Issue](https://github.com/ajbura/cinny/issues/new).
- Provide as much context as you can about what you're running into.
- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.
We will then take care of the issue as soon as possible.
## I Want To Contribute
> ### Legal Notice <!-- omit in toc -->
> ### Legal Notice
> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
### Reporting Bugs
**NOTE: If you want to add new features, please discuss with maintainers before coding or opening a pull request.** This is to ensure that we are on same track and following our roadmap.
<!-- omit in toc -->
#### Before Submitting a Bug Report
**Please use clean, concise titles for your pull requests.** We use commit squashing, so the final commit in the dev branch will carry the title of the pull request. For easier sorting in changelog, start your pull request titles using one of the verbs "Add", "Change", "Remove", or "Fix" (present tense).
A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
Example:
- Make sure that you are using the latest version.
- Determine if your bug is really a bug and not an error on your side. If you are looking for support, you might want to check [this section](#i-have-a-question)).
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/ajbura/cinny/issues?q=label%3Abug).
- Collect information about the bug:
- OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
- Possibly your input and the output
- Can you reliably reproduce the issue?
|Not ideal|Better|
|---|----|
|Fixed markAllAsRead in RoomTimeline|Fix read marker when paginating room timeline|
<!-- omit in toc -->
#### How Do I Submit a Good Bug Report?
It is not always possible to phrase every change in such a manner, but it is desired.
> You must never report security related issues, vulnerabilities or bugs to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to <cinnyapp@gmail.com>.
**The smaller the set of changes in the pull request is, the quicker it can be reviewed and merged.** Splitting tasks into multiple smaller pull requests is often preferable.
We use GitHub issues to track bugs and errors. If you run into an issue with the project:
Also, we use [ESLint](https://eslint.org/) for clean and stylistically consistent code syntax, so make sure your pull request follow it.
- Open an [Issue](https://github.com/ajbura/cinny/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
- Explain the behavior you would expect and the actual behavior.
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. For good bug reports you should isolate the problem and create a reduced test case.
- Provide the information you collected in the previous section.
Once it's filed:
- The project team will label the issue accordingly.
- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#your-first-code-contribution).
### Suggesting Enhancements
This section guides you through submitting an enhancement suggestion for Cinny, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
<!-- omit in toc -->
#### Before Submitting an Enhancement
- Make sure that you are using the latest version.
- Perform a [search](https://github.com/ajbura/cinny/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset.
<!-- omit in toc -->
#### How Do I Submit a Good Enhancement Suggestion?
Enhancement suggestions are tracked as [GitHub issues](https://github.com/ajbura/cinny/issues).
- Use a **clear and descriptive title** for the issue to identify the suggestion.
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) on Linux.
- **Explain why this enhancement would be useful** to most Cinny users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
### Your First Code Contribution
Please send a [GitHub Pull Request to cinny](https://github.com/ajbura/cinny/pull/new/master) with a clear list of what you've done (read more about [pull requests](http://help.github.com/pull-requests/)).
When proposing a PR:
- Describe what problem it solves, what side effects come with it.
- Adding some screenshots will help.
- Add some documentation if relevant.
- Add some comments around blocks/functions if relevant.
Some reasons why a PR could be refused:
- PR is not meeting one of the previous points.
- PR is not meeting project goals.
- PR is conflicting with another PR, and the latter is being preferred.
- PR slows down Cinny, or it obviously does too many
computations for the task being accomplished. It needs to be optimized.
- PR is using copy-n-paste-programming. It needs to be factorized.
- PR contains commented code: remove it.
- PR adds new features or changes the behavior of Cinny without
having be approved by the current project owners first.
- PR is too big and needs to be splitted in many smaller ones.
- PR contains unnecessary "space/indentations fixes".
If a PR stays in a stale/WIP/POC state for too long, it may be closed
at any time.
## Styleguides
### Commit Messages
Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this:
$ git commit -m "A brief summary of the commit
>
> A paragraph describing what changed and its impact."
### Coding conventions
We use [ESLint](https://eslint.org/) for clean and stylistically consistent code syntax.
**For any query or design discussion, join our [Matrix room](https://matrix.to/#/#cinny:matrix.org).**

View File

@@ -1,20 +1,18 @@
## Builder
FROM node:14-alpine as builder
FROM node:17.6.0-alpine3.15 as builder
WORKDIR /src
COPY package.json package-lock.json /src
RUN npm ci
COPY . /src
RUN npm install \
&& npm run build
RUN npm run build
## App
FROM nginx:alpine
FROM nginx:1.21.6-alpine
COPY --from=builder /src/dist /app
# Insert wasm type into Nginx mime.types file so they load correctly.
RUN sed -i '3i\ \ \ \ application/wasm wasm\;' /etc/nginx/mime.types
RUN rm -rf /usr/share/nginx/html \
&& ln -s /app /usr/share/nginx/html

View File

@@ -5,6 +5,7 @@
- [About](#about)
- [Getting Started](https://cinny.in)
- [Contributing](./CONTRIBUTING.md)
- [Roadmap](https://github.com/ajbura/cinny/projects/11)
## About <a name = "about"></a>
@@ -24,11 +25,12 @@ You can serve the application with a webserver of your choosing by simply copyin
Execute the following commands to compile the app from its source code:
```sh
npm install # Installs all dependencies
npm ci # Installs all dependencies
npm run build # Compiles the app into the dist/ directory
```
You can then copy the files to a webserver's webroot of your choice.
You can then copy the files to a webserver's webroot of your choice.
To serve a development version of the app locally for testing, you may also use the command `npm start`.
### Running with Docker

View File

@@ -1,12 +1,11 @@
{
"defaultHomeserver": 5,
"defaultHomeserver": 4,
"homeserverList": [
"boba.best",
"converser.eu",
"envs.net",
"halogen.city",
"kde.org",
"matrix.org",
"mozilla.modular.im"
"chat.mozilla.org"
]
}

10687
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "cinny",
"version": "1.6.1",
"version": "1.8.0",
"description": "Yet another matrix client",
"main": "index.js",
"engines": {
@@ -15,64 +15,71 @@
"author": "Ajay Bura",
"license": "MIT",
"dependencies": {
"@fontsource/inter": "^4.5.4",
"@fontsource/roboto": "^4.5.3",
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
"@tippyjs/react": "^4.2.5",
"@tippyjs/react": "^4.2.6",
"babel-polyfill": "^6.26.0",
"browser-encrypt-attachment": "^0.3.0",
"dateformat": "^4.5.1",
"emojibase-data": "^6.2.0",
"dateformat": "^5.0.3",
"emojibase-data": "^7.0.1",
"file-saver": "^2.0.5",
"flux": "^4.0.1",
"flux": "^4.0.3",
"formik": "^2.2.9",
"html-react-parser": "^1.2.7",
"html-react-parser": "^1.4.8",
"linkifyjs": "^2.1.9",
"matrix-js-sdk": "^15.2.1",
"micromark": "^3.0.3",
"micromark-extension-gfm": "^1.0.0",
"prop-types": "^15.7.2",
"matrix-js-sdk": "^15.6.0",
"micromark": "^3.0.10",
"micromark-extension-gfm": "^2.0.1",
"micromark-util-chunked": "^1.0.0",
"micromark-util-resolve-all": "^1.0.0",
"micromark-util-symbol": "^1.0.1",
"prop-types": "^15.8.1",
"react": "^17.0.2",
"react-autosize-textarea": "^7.1.0",
"react-dnd": "^15.1.1",
"react-dnd-html5-backend": "^15.1.2",
"react-dom": "^17.0.2",
"react-google-recaptcha": "^2.1.0",
"react-modal": "^3.13.1",
"sanitize-html": "^2.5.3",
"tippy.js": "^6.3.1",
"react-modal": "^3.14.4",
"sanitize-html": "^2.7.0",
"tippy.js": "^6.3.7",
"twemoji": "^13.1.0"
},
"devDependencies": {
"@babel/core": "^7.15.5",
"@babel/preset-env": "^7.13.12",
"@babel/preset-react": "^7.13.13",
"@babel/core": "^7.17.5",
"@babel/preset-env": "^7.16.11",
"@babel/preset-react": "^7.16.7",
"assert": "^2.0.0",
"babel-loader": "^8.2.2",
"browserify-fs": "^1.0.0",
"buffer": "^6.0.3",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^9.0.1",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^10.2.4",
"crypto-browserify": "^3.12.0",
"css-loader": "^5.2.0",
"css-minimizer-webpack-plugin": "^1.3.0",
"eslint": "^7.23.0",
"eslint-config-airbnb": "^18.2.1",
"css-loader": "^6.7.0",
"css-minimizer-webpack-plugin": "^3.4.1",
"eslint": "^8.10.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.23.1",
"eslint-plugin-react": "^7.29.3",
"eslint-plugin-react-hooks": "^4.2.0",
"favicons": "^6.2.1",
"favicons": "^6.2.2",
"favicons-webpack-plugin": "^5.0.2",
"file-loader": "^6.2.0",
"html-loader": "^2.1.2",
"html-loader": "^3.1.0",
"html-webpack-plugin": "^5.3.1",
"mini-css-extract-plugin": "^1.4.0",
"mini-css-extract-plugin": "^2.6.0",
"path-browserify": "^1.0.1",
"sass": "^1.32.8",
"sass-loader": "^11.0.1",
"sass": "^1.49.9",
"sass-loader": "^12.6.0",
"stream-browserify": "^3.0.0",
"style-loader": "^2.0.0",
"style-loader": "^3.3.1",
"url": "^0.11.0",
"util": "^0.12.4",
"webpack": "^5.62.1",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.4.0",
"webpack": "^5.70.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.7.4",
"webpack-merge": "^5.7.3"
}
}

View File

@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0 user-scalable=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Cinny</title>
<meta name="name" content="Cinny">
<meta name="author" content="Ajay Bura">

395
public/res/LICENSE Normal file
View File

@@ -0,0 +1,395 @@
Attribution 4.0 International
=======================================================================
Creative Commons Corporation ("Creative Commons") is not a law firm and
does not provide legal services or legal advice. Distribution of
Creative Commons public licenses does not create a lawyer-client or
other relationship. Creative Commons makes its licenses and related
information available on an "as-is" basis. Creative Commons gives no
warranties regarding its licenses, any material licensed under their
terms and conditions, or any related information. Creative Commons
disclaims all liability for damages resulting from their use to the
fullest extent possible.
Using Creative Commons Public Licenses
Creative Commons public licenses provide a standard set of terms and
conditions that creators and other rights holders may use to share
original works of authorship and other material subject to copyright
and certain other rights specified in the public license below. The
following considerations are for informational purposes only, are not
exhaustive, and do not form part of our licenses.
Considerations for licensors: Our public licenses are
intended for use by those authorized to give the public
permission to use material in ways otherwise restricted by
copyright and certain other rights. Our licenses are
irrevocable. Licensors should read and understand the terms
and conditions of the license they choose before applying it.
Licensors should also secure all rights necessary before
applying our licenses so that the public can reuse the
material as expected. Licensors should clearly mark any
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
wiki.creativecommons.org/Considerations_for_licensors
Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
licensed material under specified terms and conditions. If
the licensor's permission is not necessary for any reason--for
example, because of any applicable exception or limitation to
copyright--then that use is not regulated by the license. Our
licenses grant only permissions under copyright and certain
other rights that a licensor has authority to grant. Use of
the licensed material may still be restricted for other
reasons, including because others have copyright or other
rights in the material. A licensor may make special requests,
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More considerations
for the public:
wiki.creativecommons.org/Considerations_for_licensees
=======================================================================
Creative Commons Attribution 4.0 International Public License
By exercising the Licensed Rights (defined below), You accept and agree
to be bound by the terms and conditions of this Creative Commons
Attribution 4.0 International Public License ("Public License"). To the
extent this Public License may be interpreted as a contract, You are
granted the Licensed Rights in consideration of Your acceptance of
these terms and conditions, and the Licensor grants You such rights in
consideration of benefits the Licensor receives from making the
Licensed Material available under these terms and conditions.
Section 1 -- Definitions.
a. Adapted Material means material subject to Copyright and Similar
Rights that is derived from or based upon the Licensed Material
and in which the Licensed Material is translated, altered,
arranged, transformed, or otherwise modified in a manner requiring
permission under the Copyright and Similar Rights held by the
Licensor. For purposes of this Public License, where the Licensed
Material is a musical work, performance, or sound recording,
Adapted Material is always produced where the Licensed Material is
synched in timed relation with a moving image.
b. Adapter's License means the license You apply to Your Copyright
and Similar Rights in Your contributions to Adapted Material in
accordance with the terms and conditions of this Public License.
c. Copyright and Similar Rights means copyright and/or similar rights
closely related to copyright including, without limitation,
performance, broadcast, sound recording, and Sui Generis Database
Rights, without regard to how the rights are labeled or
categorized. For purposes of this Public License, the rights
specified in Section 2(b)(1)-(2) are not Copyright and Similar
Rights.
d. Effective Technological Measures means those measures that, in the
absence of proper authority, may not be circumvented under laws
fulfilling obligations under Article 11 of the WIPO Copyright
Treaty adopted on December 20, 1996, and/or similar international
agreements.
e. Exceptions and Limitations means fair use, fair dealing, and/or
any other exception or limitation to Copyright and Similar Rights
that applies to Your use of the Licensed Material.
f. Licensed Material means the artistic or literary work, database,
or other material to which the Licensor applied this Public
License.
g. Licensed Rights means the rights granted to You subject to the
terms and conditions of this Public License, which are limited to
all Copyright and Similar Rights that apply to Your use of the
Licensed Material and that the Licensor has authority to license.
h. Licensor means the individual(s) or entity(ies) granting rights
under this Public License.
i. Share means to provide material to the public by any means or
process that requires permission under the Licensed Rights, such
as reproduction, public display, public performance, distribution,
dissemination, communication, or importation, and to make material
available to the public including in ways that members of the
public may access the material from a place and at a time
individually chosen by them.
j. Sui Generis Database Rights means rights other than copyright
resulting from Directive 96/9/EC of the European Parliament and of
the Council of 11 March 1996 on the legal protection of databases,
as amended and/or succeeded, as well as other essentially
equivalent rights anywhere in the world.
k. You means the individual or entity exercising the Licensed Rights
under this Public License. Your has a corresponding meaning.
Section 2 -- Scope.
a. License grant.
1. Subject to the terms and conditions of this Public License,
the Licensor hereby grants You a worldwide, royalty-free,
non-sublicensable, non-exclusive, irrevocable license to
exercise the Licensed Rights in the Licensed Material to:
a. reproduce and Share the Licensed Material, in whole or
in part; and
b. produce, reproduce, and Share Adapted Material.
2. Exceptions and Limitations. For the avoidance of doubt, where
Exceptions and Limitations apply to Your use, this Public
License does not apply, and You do not need to comply with
its terms and conditions.
3. Term. The term of this Public License is specified in Section
6(a).
4. Media and formats; technical modifications allowed. The
Licensor authorizes You to exercise the Licensed Rights in
all media and formats whether now known or hereafter created,
and to make technical modifications necessary to do so. The
Licensor waives and/or agrees not to assert any right or
authority to forbid You from making technical modifications
necessary to exercise the Licensed Rights, including
technical modifications necessary to circumvent Effective
Technological Measures. For purposes of this Public License,
simply making modifications authorized by this Section 2(a)
(4) never produces Adapted Material.
5. Downstream recipients.
a. Offer from the Licensor -- Licensed Material. Every
recipient of the Licensed Material automatically
receives an offer from the Licensor to exercise the
Licensed Rights under the terms and conditions of this
Public License.
b. No downstream restrictions. You may not offer or impose
any additional or different terms or conditions on, or
apply any Effective Technological Measures to, the
Licensed Material if doing so restricts exercise of the
Licensed Rights by any recipient of the Licensed
Material.
6. No endorsement. Nothing in this Public License constitutes or
may be construed as permission to assert or imply that You
are, or that Your use of the Licensed Material is, connected
with, or sponsored, endorsed, or granted official status by,
the Licensor or others designated to receive attribution as
provided in Section 3(a)(1)(A)(i).
b. Other rights.
1. Moral rights, such as the right of integrity, are not
licensed under this Public License, nor are publicity,
privacy, and/or other similar personality rights; however, to
the extent possible, the Licensor waives and/or agrees not to
assert any such rights held by the Licensor to the limited
extent necessary to allow You to exercise the Licensed
Rights, but not otherwise.
2. Patent and trademark rights are not licensed under this
Public License.
3. To the extent possible, the Licensor waives any right to
collect royalties from You for the exercise of the Licensed
Rights, whether directly or through a collecting society
under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly
reserves any right to collect such royalties.
Section 3 -- License Conditions.
Your exercise of the Licensed Rights is expressly made subject to the
following conditions.
a. Attribution.
1. If You Share the Licensed Material (including in modified
form), You must:
a. retain the following if it is supplied by the Licensor
with the Licensed Material:
i. identification of the creator(s) of the Licensed
Material and any others designated to receive
attribution, in any reasonable manner requested by
the Licensor (including by pseudonym if
designated);
ii. a copyright notice;
iii. a notice that refers to this Public License;
iv. a notice that refers to the disclaimer of
warranties;
v. a URI or hyperlink to the Licensed Material to the
extent reasonably practicable;
b. indicate if You modified the Licensed Material and
retain an indication of any previous modifications; and
c. indicate the Licensed Material is licensed under this
Public License, and include the text of, or the URI or
hyperlink to, this Public License.
2. You may satisfy the conditions in Section 3(a)(1) in any
reasonable manner based on the medium, means, and context in
which You Share the Licensed Material. For example, it may be
reasonable to satisfy the conditions by providing a URI or
hyperlink to a resource that includes the required
information.
3. If requested by the Licensor, You must remove any of the
information required by Section 3(a)(1)(A) to the extent
reasonably practicable.
4. If You Share Adapted Material You produce, the Adapter's
License You apply must not prevent recipients of the Adapted
Material from complying with this Public License.
Section 4 -- Sui Generis Database Rights.
Where the Licensed Rights include Sui Generis Database Rights that
apply to Your use of the Licensed Material:
a. for the avoidance of doubt, Section 2(a)(1) grants You the right
to extract, reuse, reproduce, and Share all or a substantial
portion of the contents of the database;
b. if You include all or a substantial portion of the database
contents in a database in which You have Sui Generis Database
Rights, then the database in which You have Sui Generis Database
Rights (but not its individual contents) is Adapted Material; and
c. You must comply with the conditions in Section 3(a) if You Share
all or a substantial portion of the contents of the database.
For the avoidance of doubt, this Section 4 supplements and does not
replace Your obligations under this Public License where the Licensed
Rights include other Copyright and Similar Rights.
Section 5 -- Disclaimer of Warranties and Limitation of Liability.
a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
c. The disclaimer of warranties and limitation of liability provided
above shall be interpreted in a manner that, to the extent
possible, most closely approximates an absolute disclaimer and
waiver of all liability.
Section 6 -- Term and Termination.
a. This Public License applies for the term of the Copyright and
Similar Rights licensed here. However, if You fail to comply with
this Public License, then Your rights under this Public License
terminate automatically.
b. Where Your right to use the Licensed Material has terminated under
Section 6(a), it reinstates:
1. automatically as of the date the violation is cured, provided
it is cured within 30 days of Your discovery of the
violation; or
2. upon express reinstatement by the Licensor.
For the avoidance of doubt, this Section 6(b) does not affect any
right the Licensor may have to seek remedies for Your violations
of this Public License.
c. For the avoidance of doubt, the Licensor may also offer the
Licensed Material under separate terms or conditions or stop
distributing the Licensed Material at any time; however, doing so
will not terminate this Public License.
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
License.
Section 7 -- Other Terms and Conditions.
a. The Licensor shall not be bound by any additional or different
terms or conditions communicated by You unless expressly agreed.
b. Any arrangements, understandings, or agreements regarding the
Licensed Material not stated herein are separate from and
independent of the terms and conditions of this Public License.
Section 8 -- Interpretation.
a. For the avoidance of doubt, this Public License does not, and
shall not be interpreted to, reduce, limit, restrict, or impose
conditions on any use of the Licensed Material that could lawfully
be made without permission under this Public License.
b. To the extent possible, if any provision of this Public License is
deemed unenforceable, it shall be automatically reformed to the
minimum extent necessary to make it enforceable. If the provision
cannot be reformed, it shall be severed from this Public License
without affecting the enforceability of the remaining terms and
conditions.
c. No term or condition of this Public License will be waived and no
failure to comply consented to unless expressly agreed to by the
Licensor.
d. Nothing in this Public License constitutes or may be interpreted
as a limitation upon, or waiver of, any privileges and immunities
that apply to the Licensor or You, including from the legal
processes of any jurisdiction or authority.
=======================================================================
Creative Commons is not a party to its public
licenses. Notwithstanding, Creative Commons may elect to apply one of
its public licenses to material it publishes and in those instances
will be considered the “Licensor.” The text of the Creative Commons
public licenses is dedicated to the public domain under the CC0 Public
Domain Dedication. Except for the limited purpose of indicating that
material is shared under a Creative Commons public license or as
otherwise permitted by the Creative Commons policies published at
creativecommons.org/policies, Creative Commons does not authorize the
use of the trademark "Creative Commons" or any other trademark or logo
of Creative Commons without its prior written consent including,
without limitation, in connection with any unauthorized modifications
to any of its public licenses or any other arrangements,
understandings, or agreements concerning use of licensed material. For
the avoidance of doubt, this paragraph does not form part of the
public licenses.
Creative Commons may be contacted at creativecommons.org.

7
public/res/README.md Normal file
View File

@@ -0,0 +1,7 @@
Graphics (c) by Ajay Bura (ajbura)
Graphic content is licensed under a
Creative Commons Attribution 4.0 International License.
You should have received a copy of the license along with this
work. If not, see <http://creativecommons.org/licenses/by/4.0/>;.

View File

@@ -1,202 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
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.

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<path fill="#231F20" d="M9,11H5c-1.1,0-2-0.9-2-2V5c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v4C11,10.1,10.1,11,9,11z"/>
</g>
<g>
<path fill="#231F20" d="M19,11h-4c-1.1,0-2-0.9-2-2V5c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v4C21,10.1,20.1,11,19,11z"/>
</g>
<g>
<path fill="#231F20" d="M9,21H5c-1.1,0-2-0.9-2-2v-4c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v4C11,20.1,10.1,21,9,21z"/>
</g>
<g>
<path fill="#231F20" d="M19,21h-4c-1.1,0-2-0.9-2-2v-4c0-1.1,0.9-2,2-2h4c1.1,0,2,0.9,2,2v4C21,20.1,20.1,21,19,21z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 940 B

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<path d="M13.8,4.7l0.7,0.7l-3.4,3.4L7.7,10l-1-1l-1.4,1.4l3.5,3.5l-5.7,5.7L4.6,21l5.7-5.7l3.5,3.5l1.4-1.4l-1-1l1.1-3.4l3.4-3.4
l0.7,0.7L20.9,9l-5.7-5.7L13.8,4.7z M13.7,12l-1,2.9l-3.4-3.4l2.9-1l3.7-3.7l1.4,1.4L13.7,12z"/>
<polygon points="10,3.3 7.8,3.3 7.8,1 6.3,1 6.3,3.3 4,3.3 4,4.8 6.3,4.8 6.3,7 7.8,7 7.8,4.8 10,4.8 "/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 781 B

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<path fill="#221F1F" d="M9,5v4H5V5H9 M9,3H5C3.9,3,3,3.9,3,5v4c0,1.1,0.9,2,2,2h4c1.1,0,2-0.9,2-2V5C11,3.9,10.1,3,9,3L9,3z"/>
<path fill="#221F1F" d="M19,5v4h-4V5H19 M19,3h-4c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2h4c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3L19,3
z"/>
<path fill="#221F1F" d="M9,15v4H5v-4H9 M9,13H5c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2h4c1.1,0,2-0.9,2-2v-4C11,13.9,10.1,13,9,13
L9,13z"/>
<path fill="#221F1F" d="M19,15v4h-4v-4H19 M19,13h-4c-1.1,0-2,0.9-2,2v4c0,1.1,0.9,2,2,2h4c1.1,0,2-0.9,2-2v-4
C21,13.9,20.1,13,19,13L19,13z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 995 B

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<polygon points="9.5,14.1 6,10.6 4.6,12 8.1,15.5 9.5,16.9 19.4,7 18,5.6 "/>
</svg>

After

Width:  |  Height:  |  Size: 520 B

View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<polygon points="16,12 14,12 14,14 10,14 10,10 12,10 12,8 10,8 10,3 8,3 8,8 3,8 3,10 8,10 8,14 3,14 3,16 8,16 8,21 10,21 10,16
14,16 14,21 16,21 16,16 21,16 21,14 16,14 "/>
<path d="M18.5,1C16,1,14,3,14,5.5s2,4.5,4.5,4.5S23,8,23,5.5S21,1,18.5,1z M17.5,7C17.5,7,17.5,7,17.5,7c-0.2-0.1-0.3-0.1-0.3-0.2
c-0.6-0.5-1.7-1.1-1.8-2c-0.1-0.7,0.8-1.6,1.3-2c0.8-0.6,2.3-1.1,3.2-0.5c0.6,0.4-1.2,1-1.4,1.3c-0.3,0.4-0.3,0.9-0.3,1.4
c0,0.5,0.1,1.2-0.2,1.6C17.9,6.9,17.7,7,17.5,7z M20.8,7.9c-0.4,0.3-0.9,0.2-1.3,0.5c-0.1,0.1-0.2,0.2-0.3,0.2
c-0.2,0.1-0.5-0.1-0.5-0.3c-0.3-0.8,0.3-1.2,0.9-1.3c0.3,0,0.7,0,1,0c0.2,0,0.4,0.1,0.4,0.3C21.1,7.5,20.9,7.7,20.8,7.9z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<circle cx="5" cy="12" r="2"/>
<circle cx="12" cy="12" r="2"/>
<circle cx="19" cy="12" r="2"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 551 B

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<path d="M12,2L3,6v7c0,5,4,9,9,9c5,0,9-4,9-9V6L12,2z M19,13c0,3.9-3.1,7-7,7s-7-3.1-7-7V7.3l7-3.1l7,3.1V13z"/>
<circle cx="12" cy="9" r="2"/>
<path d="M15,16H9v-1c0-1.7,1.3-3,3-3h0c1.7,0,3,1.3,3,3V16z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 659 B

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<path d="M15.4,13.7L14,14l-0.2,1.4c-0.4,2.8-1.3,4.2-1.7,4.6c-0.4-0.3-1.3-1.8-1.7-4.6L10,14l-1.4-0.2c-2.8-0.4-4.2-1.3-4.6-1.7
c0.3-0.4,1.8-1.3,4.6-1.7L10,10l0.2-1.4c0.4-2.8,1.3-4.2,1.7-4.6V2c-1.7,0-3.1,2.6-3.7,6.3C4.6,8.9,2,10.3,2,12s2.6,3.1,6.3,3.7
c0.6,3.7,2,6.3,3.7,6.3s3.1-2.6,3.7-6.3c3.7-0.6,6.3-2,6.3-3.7h-2.1C19.6,12.4,18.2,13.3,15.4,13.7z"/>
<path d="M18.5,1C16,1,14,3,14,5.5s2,4.5,4.5,4.5S23,8,23,5.5S21,1,18.5,1z M17.5,7C17.5,7,17.5,7,17.5,7c-0.2-0.1-0.3-0.1-0.3-0.2
c-0.6-0.5-1.7-1.1-1.8-2c-0.1-0.7,0.8-1.6,1.3-2c0.8-0.6,2.3-1.1,3.2-0.5c0.6,0.4-1.2,1-1.4,1.3c-0.3,0.4-0.3,0.9-0.3,1.4
c0,0.5,0.1,1.2-0.2,1.6C17.9,6.9,17.7,7,17.5,7z M20.8,7.9c-0.4,0.3-0.9,0.2-1.3,0.5c-0.1,0.1-0.2,0.2-0.3,0.2
c-0.2,0.1-0.5-0.1-0.5-0.3c-0.3-0.8,0.3-1.2,0.9-1.3c0.3,0,0.7,0,1,0c0.2,0,0.4,0.1,0.4,0.3C21.1,7.5,20.9,7.7,20.8,7.9z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<path d="M15.4,13.7L14,14l-0.2,1.4c-0.4,2.8-1.3,4.2-1.7,4.6c-0.4-0.3-1.3-1.8-1.7-4.6L10,14l-1.4-0.2c-2.8-0.4-4.2-1.3-4.6-1.7
c0.3-0.4,1.8-1.3,4.6-1.7L10,10l0.2-1.4c0.4-2.8,1.3-4.2,1.7-4.6V2c-1.7,0-3.1,2.6-3.7,6.3C4.6,8.9,2,10.3,2,12s2.6,3.1,6.3,3.7
c0.6,3.7,2,6.3,3.7,6.3s3.1-2.6,3.7-6.3c3.7-0.6,6.3-2,6.3-3.7h-2.1C19.6,12.4,18.2,13.3,15.4,13.7z"/>
<path d="M19,0c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S21.8,0,19,0z M22,5.8h-2.3V8h-1.5V5.8H16V4.3h2.3V2h1.5v2.3H22V5.8z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 930 B

View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
<g>
<g>
<polygon fill="#7F7F7F" points="20,7 20,5 18,5 18,7 16,7 16,5 18,5 18,3 16,3 16,2 3,2 3,22 11,22 11,20 19,12 21,12 21,7 "/>
<polygon fill="#7F7F7F" points="19,16 21,16 21,22 15,22 15,20 19,20 "/>
</g>
<polygon fill="#6FBEFF" points="19,9 14,9 14,4 5,4 5,20 11,20 13,20 13,18 15,18 15,16 17,16 17,14 19,14 "/>
<polygon fill="#FFFFFF" points="7,10 12,10 12,8 10,8 10,7 8,7 8,8 7,8 "/>
<g>
<rect x="17" y="18" fill="#00C72C" width="2" height="2"/>
<polygon fill="#00C72C" points="5,20 5,18 7,18 7,16 9,16 9,14 11,14 11,12 13,12 13,14 15,14 15,18 13,18 13,20 "/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14576) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="789.322px" height="336.807px" viewBox="0 0 789.322 336.807" enable-background="new 0 0 789.322 336.807"
xml:space="preserve">
<path d="M8.876,7.71v321.386h23.13v7.711H0V0h32.006v7.71H8.876z"/>
<path d="M97.989,109.594v16.264h0.463c4.338-6.191,9.563-10.998,15.684-14.406c6.117-3.402,13.129-5.11,21.027-5.11
c7.588,0,14.521,1.475,20.793,4.415c6.274,2.945,11.038,8.131,14.291,15.567c3.56-5.265,8.4-9.913,14.521-13.94
c6.117-4.025,13.358-6.042,21.724-6.042c6.351,0,12.234,0.776,17.66,2.325c5.418,1.549,10.065,4.027,13.938,7.434
c3.869,3.41,6.889,7.863,9.062,13.357c2.167,5.504,3.253,12.122,3.253,19.869v80.385h-32.993v-68.074
c0-4.025-0.154-7.82-0.465-11.385c-0.313-3.56-1.161-6.656-2.555-9.293c-1.395-2.631-3.45-4.724-6.157-6.274
c-2.711-1.543-6.391-2.322-11.037-2.322s-8.403,0.896-11.269,2.671c-2.868,1.784-5.112,4.109-6.737,6.971
c-1.626,2.869-2.711,6.12-3.252,9.762c-0.545,3.638-0.814,7.318-0.814,11.035v66.91h-32.991v-67.375c0-3.562-0.081-7.087-0.23-10.57
c-0.158-3.487-0.814-6.7-1.978-9.645c-1.162-2.94-3.099-5.304-5.809-7.088c-2.711-1.775-6.699-2.671-11.965-2.671
c-1.551,0-3.603,0.349-6.156,1.048c-2.556,0.697-5.036,2.016-7.435,3.949c-2.404,1.938-4.454,4.726-6.158,8.363
c-1.705,3.642-2.556,8.402-2.556,14.287v69.701h-32.99V109.594H97.989z"/>
<path d="M271.545,127.254c3.405-5.113,7.744-9.215,13.012-12.316c5.264-3.097,11.186-5.303,17.771-6.621
c6.582-1.315,13.205-1.976,19.865-1.976c6.042,0,12.158,0.428,18.354,1.277c6.195,0.855,11.85,2.522,16.962,4.997
c5.111,2.477,9.292,5.926,12.546,10.338c3.253,4.414,4.879,10.262,4.879,17.543v62.494c0,5.428,0.31,10.611,0.931,15.567
c0.615,4.959,1.701,8.676,3.251,11.153h-33.455c-0.621-1.86-1.126-3.755-1.511-5.693c-0.39-1.933-0.661-3.908-0.813-5.923
c-5.267,5.422-11.465,9.217-18.585,11.386c-7.127,2.163-14.407,3.251-21.842,3.251c-5.733,0-11.077-0.698-16.033-2.09
c-4.958-1.395-9.293-3.562-13.01-6.51c-3.718-2.938-6.622-6.656-8.713-11.147s-3.138-9.84-3.138-16.033
c0-6.813,1.199-12.43,3.604-16.84c2.399-4.417,5.495-7.939,9.295-10.575c3.793-2.632,8.129-4.607,13.01-5.923
c4.878-1.315,9.795-2.358,14.752-3.137c4.957-0.772,9.835-1.393,14.638-1.857c4.801-0.466,9.062-1.164,12.779-2.093
c3.718-0.929,6.658-2.282,8.829-4.065c2.165-1.781,3.172-4.375,3.02-7.785c0-3.56-0.58-6.389-1.742-8.479
c-1.161-2.09-2.711-3.719-4.646-4.88c-1.937-1.161-4.183-1.936-6.737-2.325c-2.557-0.382-5.309-0.58-8.248-0.58
c-6.506,0-11.617,1.395-15.335,4.183c-3.716,2.788-5.889,7.437-6.506,13.94h-32.991C266.2,138.793,268.133,132.362,271.545,127.254z
M336.714,173.837c-2.09,0.696-4.337,1.275-6.736,1.741c-2.402,0.465-4.918,0.853-7.551,1.161c-2.635,0.313-5.268,0.698-7.899,1.163
c-2.48,0.461-4.919,1.086-7.317,1.857c-2.404,0.779-4.495,1.822-6.274,3.138c-1.784,1.317-3.216,2.985-4.3,4.994
c-1.085,2.014-1.626,4.571-1.626,7.668c0,2.94,0.541,5.422,1.626,7.431c1.084,2.017,2.558,3.604,4.416,4.765
s4.025,1.976,6.507,2.438c2.475,0.466,5.031,0.698,7.665,0.698c6.505,0,11.537-1.082,15.103-3.253
c3.561-2.166,6.192-4.762,7.899-7.785c1.702-3.019,2.749-6.072,3.137-9.174c0.384-3.097,0.58-5.576,0.58-7.434V170.93
C340.548,172.172,338.806,173.139,336.714,173.837z"/>
<path d="M461.826,109.594v22.072h-24.161v59.479c0,5.573,0.928,9.292,2.788,11.149c1.856,1.859,5.576,2.788,11.152,2.788
c1.859,0,3.638-0.076,5.343-0.232c1.703-0.152,3.33-0.388,4.878-0.696v25.557c-2.788,0.465-5.887,0.773-9.293,0.931
c-3.407,0.149-6.737,0.23-9.99,0.23c-5.111,0-9.953-0.35-14.521-1.048c-4.571-0.695-8.597-2.047-12.081-4.063
c-3.486-2.011-6.236-4.88-8.248-8.597c-2.016-3.714-3.021-8.595-3.021-14.639v-70.859h-19.98v-22.072h19.98V73.582h32.992v36.012
H461.826z"/>
<path d="M508.989,109.594v22.306h0.465c1.546-3.72,3.636-7.163,6.272-10.341c2.634-3.172,5.652-5.885,9.06-8.131
c3.405-2.242,7.047-3.985,10.923-5.228c3.868-1.237,7.898-1.859,12.081-1.859c2.168,0,4.566,0.39,7.202,1.163v30.67
c-1.551-0.312-3.41-0.584-5.576-0.814c-2.17-0.233-4.26-0.35-6.274-0.35c-6.041,0-11.152,1.01-15.332,3.021
c-4.182,2.014-7.55,4.761-10.107,8.247c-2.555,3.487-4.379,7.55-5.462,12.198c-1.083,4.645-1.625,9.682-1.625,15.102v54.133h-32.991
V109.594H508.989z"/>
<path d="M568.931,91.006V63.823h32.994v27.183H568.931z M601.925,109.594v120.117h-32.994V109.594H601.925z"/>
<path d="M619.116,109.594h37.637l21.144,31.365l20.911-31.365h36.476l-39.496,56.226l44.377,63.892h-37.64l-25.093-37.87
l-25.094,37.87H615.4l43.213-63.193L619.116,109.594z"/>
<path d="M780.444,329.096V7.71h-23.13V0h32.008v336.807h-32.008v-7.711H780.444z"/>
</svg>

Before

Width:  |  Height:  |  Size: 4.7 KiB

View File

@@ -1,4 +1,4 @@
import React, { useState, useEffect } from 'react';
import React from 'react';
import PropTypes from 'prop-types';
import './Avatar.scss';
@@ -7,22 +7,30 @@ import { twemojify } from '../../../util/twemojify';
import Text from '../text/Text';
import RawIcon from '../system-icons/RawIcon';
function Avatar({
import ImageBrokenSVG from '../../../../public/res/svg/image-broken.svg';
import { avatarInitials } from '../../../util/common';
const Avatar = React.forwardRef(({
text, bgColor, iconSrc, iconColor, imageSrc, size,
}) {
const [image, updateImage] = useState(imageSrc);
}, ref) => {
let textSize = 's1';
if (size === 'large') textSize = 'h1';
if (size === 'small') textSize = 'b1';
if (size === 'extra-small') textSize = 'b3';
useEffect(() => updateImage(imageSrc), [imageSrc]);
return (
<div className={`avatar-container avatar-container__${size} noselect`}>
<div ref={ref} className={`avatar-container avatar-container__${size} noselect`}>
{
image !== null
? <img draggable="false" src={image} onError={() => updateImage(null)} alt="avatar" />
imageSrc !== null
? (
<img
draggable="false"
src={imageSrc}
onLoad={(e) => { e.target.style.backgroundColor = 'transparent'; }}
onError={(e) => { e.target.src = ImageBrokenSVG; }}
alt=""
/>
)
: (
<span
style={{ backgroundColor: iconSrc === null ? bgColor : 'transparent' }}
@@ -33,7 +41,7 @@ function Avatar({
? <RawIcon size={size} src={iconSrc} color={iconColor} />
: text !== null && (
<Text variant={textSize} primary>
{twemojify([...text][0])}
{twemojify(avatarInitials(text))}
</Text>
)
}
@@ -42,7 +50,7 @@ function Avatar({
}
</div>
);
}
});
Avatar.defaultProps = {
text: null,

View File

@@ -31,6 +31,7 @@
height: 100%;
object-fit: cover;
border-radius: inherit;
background-color: var(--bg-surface-hover);
}
.avatar__border {

View File

@@ -0,0 +1,61 @@
import { avatarInitials } from '../../../util/common';
function cssVar(name) {
return getComputedStyle(document.body).getPropertyValue(name);
}
// renders the avatar and returns it as an URL
export default async function renderAvatar({
text, bgColor, imageSrc, size, borderRadius, scale,
}) {
try {
const canvas = document.createElement('canvas');
canvas.width = size * scale;
canvas.height = size * scale;
const ctx = canvas.getContext('2d');
ctx.scale(scale, scale);
// rounded corners
ctx.beginPath();
ctx.moveTo(size, size);
ctx.arcTo(0, size, 0, 0, borderRadius);
ctx.arcTo(0, 0, size, 0, borderRadius);
ctx.arcTo(size, 0, size, size, borderRadius);
ctx.arcTo(size, size, 0, size, borderRadius);
if (imageSrc) {
// clip corners of image
ctx.closePath();
ctx.clip();
const img = new Image();
img.crossOrigin = 'anonymous';
const promise = new Promise((resolve, reject) => {
img.onerror = reject;
img.onload = resolve;
});
img.src = imageSrc;
await promise;
ctx.drawImage(img, 0, 0, size, size);
} else {
// colored background
ctx.fillStyle = cssVar(bgColor);
ctx.fill();
// centered letter
ctx.fillStyle = '#fff';
ctx.font = `${cssVar('--fs-s1')} ${cssVar('--font-primary')}`;
ctx.textBaseline = 'middle';
ctx.textAlign = 'center';
ctx.fillText(avatarInitials(text), size / 2, size / 2);
}
return canvas.toDataURL();
} catch (e) {
console.error(e);
return imageSrc;
}
}

View File

@@ -1,5 +1,6 @@
@use 'state';
@use '../../partials/dir';
@use '../../partials/text';
.btn-surface,
.btn-primary,
@@ -18,11 +19,16 @@
cursor: pointer;
@include state.disabled;
& .text {
@extend .cp-txt__ellipsis;
}
&--icon {
@include dir.side(padding, var(--sp-tight), var(--sp-loose));
.ic-raw {
@include dir.side(margin, 0, var(--sp-extra-tight));
flex-shrink: 0;
}
}
}

View File

@@ -0,0 +1,39 @@
import React from 'react';
import PropTypes from 'prop-types';
import './Checkbox.scss';
function Checkbox({
variant, isActive, onToggle,
disabled, tabIndex,
}) {
const className = `checkbox checkbox-${variant}${isActive ? ' checkbox--active' : ''}`;
if (onToggle === null) return <span className={className} />;
return (
// eslint-disable-next-line jsx-a11y/control-has-associated-label
<button
onClick={() => onToggle(!isActive)}
className={className}
type="button"
disabled={disabled}
tabIndex={tabIndex}
/>
);
}
Checkbox.defaultProps = {
variant: 'primary',
isActive: false,
onToggle: null,
disabled: false,
tabIndex: 0,
};
Checkbox.propTypes = {
variant: PropTypes.oneOf(['primary', 'positive', 'caution', 'danger']),
isActive: PropTypes.bool,
onToggle: PropTypes.func,
disabled: PropTypes.bool,
tabIndex: PropTypes.number,
};
export default Checkbox;

View File

@@ -0,0 +1,39 @@
@use '../../partials/flex';
@use './state';
.checkbox {
width: 20px;
height: 20px;
border-radius: calc(var(--bo-radius) / 2);
background-color: var(--bg-surface-border);
box-shadow: var(--bs-surface-border);
cursor: pointer;
@include state.disabled;
@extend .cp-fx__row--c-c;
&--active {
background-color: black;
&::before {
content: "";
display: inline-block;
width: 12px;
height: 6px;
border: 6px solid white;
border-width: 0 0 3px 3px;
transform: rotateZ(-45deg) translate(1px, -1px);
}
}
}
.checkbox-primary.checkbox--active {
background-color: var(--bg-primary);
}
.checkbox-positive.checkbox--active {
background-color: var(--bg-positive);
}
.checkbox-caution.checkbox--active {
background-color: var(--bg-caution);
}
.checkbox-danger.checkbox--active {
background-color: var(--bg-danger);
}

View File

@@ -9,7 +9,8 @@ import Text from '../text/Text';
const IconButton = React.forwardRef(({
variant, size, type,
tooltip, tooltipPlacement, src, onClick, tabIndex,
tooltip, tooltipPlacement, src,
onClick, tabIndex, disabled, isImage,
}, ref) => {
const btn = (
<button
@@ -20,8 +21,9 @@ const IconButton = React.forwardRef(({
// eslint-disable-next-line react/button-has-type
type={type}
tabIndex={tabIndex}
disabled={disabled}
>
<RawIcon size={size} src={src} />
<RawIcon size={size} src={src} isImage={isImage} />
</button>
);
if (tooltip === null) return btn;
@@ -43,6 +45,8 @@ IconButton.defaultProps = {
tooltipPlacement: 'top',
onClick: null,
tabIndex: 0,
disabled: false,
isImage: false,
};
IconButton.propTypes = {
@@ -54,6 +58,8 @@ IconButton.propTypes = {
src: PropTypes.string.isRequired,
onClick: PropTypes.func,
tabIndex: PropTypes.number,
disabled: PropTypes.bool,
isImage: PropTypes.bool,
};
export default IconButton;

View File

@@ -0,0 +1,30 @@
import React from 'react';
import PropTypes from 'prop-types';
import './RadioButton.scss';
function RadioButton({ isActive, onToggle, disabled }) {
if (onToggle === null) return <span className={`radio-btn${isActive ? ' radio-btn--active' : ''}`} />;
return (
// eslint-disable-next-line jsx-a11y/control-has-associated-label
<button
onClick={() => onToggle(!isActive)}
className={`radio-btn${isActive ? ' radio-btn--active' : ''}`}
type="button"
disabled={disabled}
/>
);
}
RadioButton.defaultProps = {
isActive: false,
onToggle: null,
disabled: false,
};
RadioButton.propTypes = {
isActive: PropTypes.bool,
onToggle: PropTypes.func,
disabled: PropTypes.bool,
};
export default RadioButton;

View File

@@ -0,0 +1,28 @@
@use '../../partials/flex';
@use './state';
.radio-btn {
@extend .cp-fx__row--c-c;
width: 20px;
height: 20px;
border-radius: 50%;
background-color: var(--bg-surface-border);
border: 2px solid var(--bg-surface-border);
cursor: pointer;
@include state.disabled;
&::before {
content: '';
display: inline-block;
width: 12px;
height: 12px;
background-color: var(--bg-surface-border);
border-radius: 50%;
}
&--active {
border: 2px solid var(--bg-positive);
&::before {
background-color: var(--bg-positive);
}
}
}

View File

@@ -2,24 +2,30 @@ import React from 'react';
import PropTypes from 'prop-types';
import './Toggle.scss';
function Toggle({ isActive, onToggle }) {
function Toggle({ isActive, onToggle, disabled }) {
const className = `toggle${isActive ? ' toggle--active' : ''}`;
if (onToggle === null) return <span className={className} />;
return (
// eslint-disable-next-line jsx-a11y/control-has-associated-label
<button
onClick={() => onToggle(!isActive)}
className={`toggle${isActive ? ' toggle--active' : ''}`}
className={className}
type="button"
disabled={disabled}
/>
);
}
Toggle.defaultProps = {
isActive: false,
disabled: false,
onToggle: null,
};
Toggle.propTypes = {
isActive: PropTypes.bool,
onToggle: PropTypes.func.isRequired,
onToggle: PropTypes.func,
disabled: PropTypes.bool,
};
export default Toggle;

View File

@@ -1,4 +1,5 @@
@use '../../partials/dir';
@use './state';
.toggle {
width: 44px;
@@ -10,6 +11,7 @@
box-shadow: var(--bs-surface-border);
cursor: pointer;
background-color: var(--bg-surface-low);
@include state.disabled;
transition: background 200ms ease-in-out;

View File

@@ -71,7 +71,8 @@ MenuHeader.propTypes = {
};
function MenuItem({
variant, iconSrc, type, onClick, children,
variant, iconSrc, type,
onClick, children, disabled,
}) {
return (
<div className="context-menu__item">
@@ -80,6 +81,7 @@ function MenuItem({
iconSrc={iconSrc}
type={type}
onClick={onClick}
disabled={disabled}
>
{ children }
</Button>
@@ -89,16 +91,19 @@ function MenuItem({
MenuItem.defaultProps = {
variant: 'surface',
iconSrc: 'none',
iconSrc: null,
type: 'button',
disabled: false,
onClick: null,
};
MenuItem.propTypes = {
variant: PropTypes.oneOf(['surface', 'positive', 'caution', 'danger']),
iconSrc: PropTypes.string,
type: PropTypes.oneOf(['button', 'submit']),
onClick: PropTypes.func.isRequired,
children: PropTypes.string.isRequired,
onClick: PropTypes.func,
children: PropTypes.node.isRequired,
disabled: PropTypes.bool,
};
function MenuBorder() {

View File

@@ -1,3 +1,4 @@
@use '../../partials/flex';
@use '../../partials/text';
@use '../../partials/dir';
@@ -25,7 +26,7 @@
.context-menu__header {
height: 34px;
padding: 0 var(--sp-tight);
padding: 0 var(--sp-normal);
margin-bottom: var(--sp-ultra-tight);
display: flex;
align-items: center;
@@ -37,30 +38,40 @@
}
&:not(:first-child) {
margin-top: var(--sp-normal);
margin-top: var(--sp-extra-tight);
border-top: 1px solid var(--bg-surface-border);
}
}
.context-menu__item {
display: flex;
button[class^="btn"] {
width: 100%;
@extend .cp-fx__item-one;
justify-content: flex-start;
border-radius: 0;
box-shadow: none;
white-space: nowrap;
padding: var(--sp-extra-tight) var(--sp-normal);
& > .ic-raw {
@include dir.side(margin, 0, var(--sp-tight));
}
// if item doesn't have icon
.text:first-child {
@include dir.side(
margin,
calc(var(--ic-small) + var(--sp-ultra-tight)),
var(--sp-extra-tight)
calc(var(--ic-small) + var(--sp-tight)),
0
);
}
}
.btn-surface:focus {
background-color: var(--bg-surface-hover);
}
.btn-positive:focus {
background-color: var(--bg-positive-hover);
}
.btn-caution:focus {
background-color: var(--bg-caution-hover);
}

View File

@@ -0,0 +1,87 @@
import React, { useState, useEffect, useRef } from 'react';
import cons from '../../../client/state/cons';
import navigation from '../../../client/state/navigation';
import ContextMenu from './ContextMenu';
let key = null;
function ReusableContextMenu() {
const [data, setData] = useState(null);
const openerRef = useRef(null);
const closeMenu = () => {
key = null;
if (data) openerRef.current.click();
};
useEffect(() => {
if (data) {
const { cords } = data;
openerRef.current.style.transform = `translate(${cords.x}px, ${cords.y}px)`;
openerRef.current.style.width = `${cords.width}px`;
openerRef.current.style.height = `${cords.height}px`;
openerRef.current.click();
}
const handleContextMenuOpen = (placement, cords, render, afterClose) => {
if (key) {
closeMenu();
return;
}
setData({
placement, cords, render, afterClose,
});
};
navigation.on(cons.events.navigation.REUSABLE_CONTEXT_MENU_OPENED, handleContextMenuOpen);
return () => {
navigation.removeListener(
cons.events.navigation.REUSABLE_CONTEXT_MENU_OPENED,
handleContextMenuOpen,
);
};
}, [data]);
const handleAfterToggle = (isVisible) => {
if (isVisible) {
key = Math.random();
return;
}
data?.afterClose?.();
if (setData) setData(null);
if (key === null) return;
const copyKey = key;
setTimeout(() => {
if (key === copyKey) key = null;
}, 200);
};
return (
<ContextMenu
afterToggle={handleAfterToggle}
placement={data?.placement || 'right'}
content={data?.render(closeMenu) ?? ''}
render={(toggleMenu) => (
<input
ref={openerRef}
onClick={toggleMenu}
type="button"
style={{
width: '32px',
height: '32px',
backgroundColor: 'transparent',
position: 'fixed',
top: 0,
left: 0,
padding: 0,
border: 'none',
visibility: 'hidden',
appearance: 'none',
}}
/>
)}
/>
);
}
export default ReusableContextMenu;

View File

@@ -8,7 +8,7 @@ function Input({
id, label, name, value, placeholder,
required, type, onChange, forwardRef,
resizable, minHeight, onResize, state,
onKeyDown,
onKeyDown, disabled, autoFocus,
}) {
return (
<div className="input-container">
@@ -29,6 +29,8 @@ function Input({
onChange={onChange}
onResize={onResize}
onKeyDown={onKeyDown}
disabled={disabled}
autoFocus={autoFocus}
/>
) : (
<input
@@ -43,6 +45,9 @@ function Input({
autoComplete="off"
onChange={onChange}
onKeyDown={onKeyDown}
disabled={disabled}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus={autoFocus}
/>
)}
</div>
@@ -64,6 +69,8 @@ Input.defaultProps = {
onResize: null,
state: 'normal',
onKeyDown: null,
disabled: false,
autoFocus: false,
};
Input.propTypes = {
@@ -81,6 +88,8 @@ Input.propTypes = {
onResize: PropTypes.func,
state: PropTypes.oneOf(['normal', 'success', 'error']),
onKeyDown: PropTypes.func,
disabled: PropTypes.bool,
autoFocus: PropTypes.bool,
};
export default Input;

View File

@@ -1,3 +1,5 @@
@use '../../atoms/scroll/scrollbar';
.input {
display: block;
width: 100%;
@@ -13,6 +15,11 @@
letter-spacing: var(--ls-b2);
line-height: var(--lh-b2);
:disabled {
opacity: 0.4;
cursor: no-drop;
}
&__label {
display: inline-block;
margin-bottom: var(--sp-ultra-tight);
@@ -21,6 +28,10 @@
&--resizable {
resize: vertical !important;
overflow-y: auto !important;
@include scrollbar.scroll;
@include scrollbar.scroll__v;
@include scrollbar.scroll--auto-hide;
}
&--success {
border: 1px solid var(--bg-positive);

View File

@@ -1,4 +1,4 @@
import React from 'react';
import React, { useEffect } from 'react';
import PropTypes from 'prop-types';
import './RawModal.scss';
@@ -26,7 +26,9 @@ function RawModal({
modalClass += 'raw-modal__small ';
}
navigation.setIsRawModalVisible(isOpen);
useEffect(() => {
navigation.setIsRawModalVisible(isOpen);
}, [isOpen]);
const modalOverlayClass = (overlayClassName !== null) ? `${overlayClassName} ` : '';
return (

View File

@@ -1,6 +1,6 @@
.ReactModal__Overlay {
opacity: 0;
transition: opacity 200ms cubic-bezier(0.13, 0.56, 0.25, 0.99);
transition: opacity 200ms var(--fluid-slide-up);
}
.ReactModal__Overlay--after-open{
opacity: 1;
@@ -11,7 +11,7 @@
.ReactModal__Content {
transform: translateY(100%);
transition: transform 200ms cubic-bezier(0.13, 0.56, 0.25, 0.99);
transition: transform 200ms var(--fluid-slide-up);
}
.ReactModal__Content--after-open{

View File

@@ -1,9 +1,17 @@
@use '../../partials/dir';
@use '_scrollbar';
@mixin paddingForSafari($padding) {
@media not all and (min-resolution:.001dpcm) {
@include dir.side(padding, 0, $padding);
}
}
.scrollbar {
width: 100%;
height: 100%;
@include scrollbar.scroll;
@include paddingForSafari(var(--sp-extra-tight));
&__h {
@include scrollbar.scroll__h;
@@ -18,5 +26,6 @@
}
&--invisible {
@include scrollbar.scroll--invisible;
@include paddingForSafari(0);
}
}

View File

@@ -58,6 +58,7 @@
@mixin scroll--invisible {
-ms-overflow-style: none;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}

View File

@@ -2,24 +2,33 @@ import React from 'react';
import PropTypes from 'prop-types';
import './RawIcon.scss';
function RawIcon({ color, size, src }) {
const style = {
WebkitMaskImage: `url(${src})`,
maskImage: `url(${src})`,
};
function RawIcon({
color, size, src, isImage,
}) {
const style = {};
if (color !== null) style.backgroundColor = color;
if (isImage) {
style.backgroundColor = 'transparent';
style.backgroundImage = `url(${src})`;
} else {
style.WebkitMaskImage = `url(${src})`;
style.maskImage = `url(${src})`;
}
return <span className={`ic-raw ic-raw-${size}`} style={style}> </span>;
}
RawIcon.defaultProps = {
color: null,
size: 'normal',
isImage: false,
};
RawIcon.propTypes = {
color: PropTypes.string,
size: PropTypes.oneOf(['large', 'normal', 'small', 'extra-small']),
src: PropTypes.string.isRequired,
isImage: PropTypes.bool,
};
export default RawIcon;

View File

@@ -10,6 +10,9 @@
-webkit-mask-size: cover;
mask-size: cover;
background-color: var(--ic-surface-normal);
background-size: cover;
background-repeat: no-repeat;
}
.ic-raw-large {
@include icSize(var(--ic-large));

View File

@@ -0,0 +1,87 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import './Tabs.scss';
import Button from '../button/Button';
import ScrollView from '../scroll/ScrollView';
function TabItem({
selected, iconSrc,
onClick, children, disabled,
}) {
const isSelected = selected ? 'tab-item--selected' : '';
return (
<Button
className={`tab-item ${isSelected}`}
iconSrc={iconSrc}
onClick={onClick}
disabled={disabled}
>
{children}
</Button>
);
}
TabItem.defaultProps = {
selected: false,
iconSrc: null,
onClick: null,
disabled: false,
};
TabItem.propTypes = {
selected: PropTypes.bool,
iconSrc: PropTypes.string,
onClick: PropTypes.func,
children: PropTypes.node.isRequired,
disabled: PropTypes.bool,
};
function Tabs({ items, defaultSelected, onSelect }) {
const [selectedItem, setSelectedItem] = useState(items[defaultSelected]);
const handleTabSelection = (item, index) => {
if (selectedItem === item) return;
setSelectedItem(item);
onSelect(item, index);
};
return (
<div className="tabs">
<ScrollView horizontal vertical={false} invisible>
<div className="tabs__content">
{items.map((item, index) => (
<TabItem
key={item.text}
selected={selectedItem.text === item.text}
iconSrc={item.iconSrc}
disabled={item.disabled}
onClick={() => handleTabSelection(item, index)}
>
{item.text}
</TabItem>
))}
</div>
</ScrollView>
</div>
);
}
Tabs.defaultProps = {
defaultSelected: 0,
};
Tabs.propTypes = {
items: PropTypes.arrayOf(
PropTypes.exact({
iconSrc: PropTypes.string,
text: PropTypes.string,
disabled: PropTypes.bool,
}),
).isRequired,
defaultSelected: PropTypes.number,
onSelect: PropTypes.func.isRequired,
};
export { Tabs as default };

View File

@@ -0,0 +1,45 @@
@use '../../partials/dir';
.tabs {
height: var(--header-height);
box-shadow: inset 0 -1px 0 var(--bg-surface-border);
&__content {
min-width: 100%;
height: 100%;
display: flex;
}
}
.tab-item {
flex-shrink: 0;
@include dir.side(padding, var(--sp-normal), 24px);
border-radius: 0;
height: 100%;
box-shadow: none;
border-radius: var(--bo-radius) var(--bo-radius) 0 0;
&:focus,
&:active {
background-color: var(--bg-surface-active);
box-shadow: none;
}
&--selected {
--bs-tab-selected: inset 0 -2px 0 var(--tc-surface-high);
box-shadow: var(--bs-tab-selected);
& .ic-raw {
background-color: var(--ic-surface-high);
}
& .text {
font-weight: var(--fw-medium);
}
&:focus,
&:active {
background-color: var(--bg-surface-active);
box-shadow: var(--bs-tab-selected);
}
}
}

View File

@@ -5,7 +5,7 @@
& img.emoji,
& img[data-mx-emoticon] {
height: var(--fs-#{$type});
height: calc(var(--lh-#{$type}) - .25rem);
}
}
@@ -20,7 +20,8 @@
margin-right: 2px !important;
padding: 0 !important;
position: relative;
top: 2px;
top: -.1rem;
vertical-align: middle;
}
}

View File

@@ -0,0 +1,25 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from 'react';
import initMatrix from '../../client/initMatrix';
import cons from '../../client/state/cons';
export function useCategorizedSpaces() {
const { accountData } = initMatrix;
const [categorizedSpaces, setCategorizedSpaces] = useState([...accountData.categorizedSpaces]);
useEffect(() => {
const handleCategorizedSpaces = () => {
setCategorizedSpaces([...accountData.categorizedSpaces]);
};
accountData.on(cons.events.accountData.CATEGORIZE_SPACE_UPDATED, handleCategorizedSpaces);
return () => {
accountData.removeListener(
cons.events.accountData.CATEGORIZE_SPACE_UPDATED,
handleCategorizedSpaces,
);
};
}, []);
return [categorizedSpaces];
}

View File

@@ -0,0 +1,28 @@
/* eslint-disable import/prefer-default-export */
import { useEffect, useState } from 'react';
export function usePermission(name, initial) {
const [state, setState] = useState(initial);
useEffect(() => {
let descriptor;
const update = () => setState(descriptor.state);
if (navigator.permissions?.query) {
navigator.permissions.query({ name }).then((_descriptor) => {
descriptor = _descriptor;
update();
descriptor.addEventListener('change', update);
});
}
return () => {
if (descriptor) descriptor.removeEventListener('change', update);
};
}, []);
return [state, setState];
}

View File

@@ -0,0 +1,21 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from 'react';
import cons from '../../client/state/cons';
import navigation from '../../client/state/navigation';
export function useSelectedSpace() {
const [spaceId, setSpaceId] = useState(navigation.selectedSpaceId);
useEffect(() => {
const onSpaceSelected = (roomId) => {
setSpaceId(roomId);
};
navigation.on(cons.events.navigation.SPACE_SELECTED, onSpaceSelected);
return () => {
navigation.removeListener(cons.events.navigation.SPACE_SELECTED, onSpaceSelected);
};
}, []);
return [spaceId];
}

View File

@@ -0,0 +1,21 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from 'react';
import cons from '../../client/state/cons';
import navigation from '../../client/state/navigation';
export function useSelectedTab() {
const [selectedTab, setSelectedTab] = useState(navigation.selectedTab);
useEffect(() => {
const onTabSelected = (tabId) => {
setSelectedTab(tabId);
};
navigation.on(cons.events.navigation.TAB_SELECTED, onTabSelected);
return () => {
navigation.removeListener(cons.events.navigation.TAB_SELECTED, onTabSelected);
};
}, []);
return [selectedTab];
}

View File

@@ -0,0 +1,25 @@
/* eslint-disable import/prefer-default-export */
import { useState, useEffect } from 'react';
import initMatrix from '../../client/initMatrix';
import cons from '../../client/state/cons';
export function useSpaceShortcut() {
const { accountData } = initMatrix;
const [spaceShortcut, setSpaceShortcut] = useState([...accountData.spaceShortcut]);
useEffect(() => {
const onSpaceShortcutUpdated = () => {
setSpaceShortcut([...accountData.spaceShortcut]);
};
accountData.on(cons.events.accountData.SPACE_SHORTCUT_UPDATED, onSpaceShortcutUpdated);
return () => {
accountData.removeListener(
cons.events.accountData.SPACE_SHORTCUT_UPDATED,
onSpaceShortcutUpdated,
);
};
}, []);
return [spaceShortcut];
}

View File

@@ -27,7 +27,11 @@ function Dialog({
<div className="dialog__content">
<Header>
<TitleWrapper>
<Text variant="h2" weight="medium" primary>{twemojify(title)}</Text>
{
typeof title === 'string'
? <Text variant="h2" weight="medium" primary>{twemojify(title)}</Text>
: title
}
</TitleWrapper>
{contentOptions}
</Header>
@@ -56,7 +60,7 @@ Dialog.defaultProps = {
Dialog.propTypes = {
className: PropTypes.string,
isOpen: PropTypes.bool.isRequired,
title: PropTypes.string.isRequired,
title: PropTypes.node.isRequired,
contentOptions: PropTypes.node,
onAfterOpen: PropTypes.func,
onAfterClose: PropTypes.func,

View File

@@ -1,28 +1,28 @@
.dialog-model {
--modal-height: 656px;
max-height: var(--modal-height) !important;
max-height: min(100%, var(--modal-height));
display: flex;
}
.dialog,
.dialog__content,
.dialog__content__wrapper {
flex: 1;
min-height: 0;
min-width: 0;
display: flex;
}
.dialog {
width: 100%;
max-height: inherit;
background-color: var(--bg-surface);
display: flex;
&__content {
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
}
}
.dialog__content-container {
padding-top: var(--sp-extra-tight);
padding-bottom: var(--sp-extra-loose);
}
.dialog__content__wrapper {
flex: 1;
min-height: 0;
}

View File

@@ -1,8 +1,11 @@
/* eslint-disable react/prop-types */
import React, { useState, useEffect, useCallback, useRef } from 'react';
import React, {
useState, useEffect, useCallback, useRef,
} from 'react';
import PropTypes from 'prop-types';
import './Message.scss';
import { getShortcodeToCustomEmoji } from '../../organisms/emoji-board/custom-emoji';
import { twemojify } from '../../../util/twemojify';
import initMatrix from '../../../client/initMatrix';
@@ -11,7 +14,7 @@ import colorMXID from '../../../util/colorMXID';
import { getEventCords } from '../../../util/common';
import { redactEvent, sendReaction } from '../../../client/action/roomTimeline';
import {
openEmojiBoard, openProfileViewer, openReadReceipts, replyTo,
openEmojiBoard, openProfileViewer, openReadReceipts, openViewSource, replyTo,
} from '../../../client/action/navigation';
import { sanitizeCustomHtml } from '../../../util/sanitize';
@@ -30,6 +33,7 @@ import EmojiAddIC from '../../../../public/res/ic/outlined/emoji-add.svg';
import VerticalMenuIC from '../../../../public/res/ic/outlined/vertical-menu.svg';
import PencilIC from '../../../../public/res/ic/outlined/pencil.svg';
import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
import CmdIC from '../../../../public/res/ic/outlined/cmd.svg';
import BinIC from '../../../../public/res/ic/outlined/bin.svg';
function PlaceholderMessage() {
@@ -52,17 +56,14 @@ function PlaceholderMessage() {
}
const MessageAvatar = React.memo(({
roomId, mEvent, userId, username,
}) => {
const avatarSrc = mEvent.sender.getAvatarUrl(initMatrix.matrixClient.baseUrl, 36, 36, 'crop');
return (
<div className="message__avatar-container">
<button type="button" onClick={() => openProfileViewer(userId, roomId)}>
<Avatar imageSrc={avatarSrc} text={username} bgColor={colorMXID(userId)} size="small" />
</button>
</div>
);
});
roomId, avatarSrc, userId, username,
}) => (
<div className="message__avatar-container">
<button type="button" onClick={() => openProfileViewer(userId, roomId)}>
<Avatar imageSrc={avatarSrc} text={username} bgColor={colorMXID(userId)} size="small" />
</button>
</div>
));
const MessageHeader = React.memo(({
userId, username, time,
@@ -116,22 +117,31 @@ const MessageReplyWrapper = React.memo(({ roomTimeline, eventId }) => {
const mx = initMatrix.matrixClient;
const timelineSet = roomTimeline.getUnfilteredTimelineSet();
const loadReply = async () => {
const eTimeline = await mx.getEventTimeline(timelineSet, eventId);
await roomTimeline.decryptAllEventsOfTimeline(eTimeline);
try {
const eTimeline = await mx.getEventTimeline(timelineSet, eventId);
await roomTimeline.decryptAllEventsOfTimeline(eTimeline);
const mEvent = eTimeline.getTimelineSet().findEventById(eventId);
const mEvent = eTimeline.getTimelineSet().findEventById(eventId);
const rawBody = mEvent.getContent().body;
const username = getUsernameOfRoomMember(mEvent.sender);
const rawBody = mEvent.getContent().body;
const username = getUsernameOfRoomMember(mEvent.sender);
if (isMountedRef.current === false) return;
const fallbackBody = mEvent.isRedacted() ? '*** This message has been deleted ***' : '*** Unable to load reply content ***';
setReply({
to: username,
color: colorMXID(mEvent.getSender()),
body: parseReply(rawBody)?.body ?? rawBody ?? fallbackBody,
event: mEvent,
});
if (isMountedRef.current === false) return;
const fallbackBody = mEvent.isRedacted() ? '*** This message has been deleted ***' : '*** Unable to load reply ***';
setReply({
to: username,
color: colorMXID(mEvent.getSender()),
body: parseReply(rawBody)?.body ?? rawBody ?? fallbackBody,
event: mEvent,
});
} catch {
setReply({
to: '** Unknown user **',
color: 'var(--tc-danger-normal)',
body: '*** Unable to load reply ***',
event: null,
});
}
};
loadReply();
@@ -141,6 +151,7 @@ const MessageReplyWrapper = React.memo(({ roomTimeline, eventId }) => {
}, []);
const focusReply = () => {
if (reply?.event === null) return;
if (reply?.event.isRedacted()) return;
roomTimeline.loadEventTimeline(eventId);
};
@@ -172,13 +183,42 @@ const MessageBody = React.memo(({
// if body is not string it is a React element.
if (typeof body !== 'string') return <div className="message__body">{body}</div>;
const content = isCustomHTML
let content = isCustomHTML
? twemojify(sanitizeCustomHtml(body), undefined, true, false)
: <p>{twemojify(body, undefined, true)}</p>;
: twemojify(body, undefined, true);
// Determine if this message should render with large emojis
// Criteria:
// - Contains only emoji
// - Contains no more than 10 emoji
let emojiOnly = false;
if (content.type === 'img') {
// If this messages contains only a single (inline) image
emojiOnly = true;
} else if (content.constructor.name === 'Array') {
// Otherwise, it might be an array of images / texb
// Count the number of emojis
const nEmojis = content.filter((e) => e.type === 'img').length;
// Make sure there's no text besides whitespace
if (nEmojis <= 10 && content.every((element) => (
(typeof element === 'object' && element.type === 'img')
|| (typeof element === 'string' && /^\s*$/g.test(element))
))) {
emojiOnly = true;
}
}
if (!isCustomHTML) {
// If this is a plaintext message, wrap it in a <p> element (automatically applying
// white-space: pre-wrap) in order to preserve newlines
content = (<p>{content}</p>);
}
return (
<div className="message__body">
<div className="text text-b1">
<div className={`text ${emojiOnly ? 'text-h1' : 'text-b1'}`}>
{ msgType === 'm.emote' && (
<>
{'* '}
@@ -208,6 +248,12 @@ MessageBody.propTypes = {
function MessageEdit({ body, onSave, onCancel }) {
const editInputRef = useRef(null);
useEffect(() => {
// makes the cursor end up at the end of the line instead of the beginning
editInputRef.current.value = '';
editInputRef.current.value = body;
}, []);
const handleKeyDown = (e) => {
if (e.keyCode === 13 && e.shiftKey === false) {
e.preventDefault();
@@ -224,6 +270,7 @@ function MessageEdit({ body, onSave, onCancel }) {
placeholder="Edit message"
required
resizable
autoFocus
/>
<div className="message__edit-btns">
<Button type="submit" variant="primary">Save</Button>
@@ -272,27 +319,33 @@ function pickEmoji(e, roomId, eventId, roomTimeline) {
}
function genReactionMsg(userIds, reaction) {
const genLessContText = (text) => <span style={{ opacity: '.6' }}>{text}</span>;
let msg = <></>;
userIds.forEach((userId, index) => {
if (index === 0) msg = <>{getUsername(userId)}</>;
// eslint-disable-next-line react/jsx-one-expression-per-line
else if (index === userIds.length - 1) msg = <>{msg}{genLessContText(' and ')}{getUsername(userId)}</>;
// eslint-disable-next-line react/jsx-one-expression-per-line
else msg = <>{msg}{genLessContText(', ')}{getUsername(userId)}</>;
});
return (
<>
{msg}
{genLessContText(' reacted with')}
{userIds.map((userId, index) => (
<React.Fragment key={userId}>
{twemojify(getUsername(userId))}
{index < userIds.length - 1 && (
<span style={{ opacity: '.6' }}>
{index === userIds.length - 2 ? ' and ' : ', '}
</span>
)}
</React.Fragment>
))}
<span style={{ opacity: '.6' }}>{' reacted with '}</span>
{twemojify(reaction, { className: 'react-emoji' })}
</>
);
}
function MessageReaction({
reaction, count, users, isActive, onClick,
shortcodeToEmoji, reaction, count, users, isActive, onClick,
}) {
const customEmojiMatch = reaction.match(/^:(\S+):$/);
let customEmojiUrl = null;
if (customEmojiMatch) {
const customEmoji = shortcodeToEmoji.get(customEmojiMatch[1]);
customEmojiUrl = initMatrix.matrixClient.mxcUrlToHttp(customEmoji?.mxc);
}
return (
<Tooltip
className="msg__reaction-tooltip"
@@ -303,13 +356,18 @@ function MessageReaction({
type="button"
className={`msg__reaction${isActive ? ' msg__reaction--active' : ''}`}
>
{ twemojify(reaction, { className: 'react-emoji' }) }
{
customEmojiUrl
? <img className="react-emoji" draggable="false" alt={reaction} src={customEmojiUrl} />
: twemojify(reaction, { className: 'react-emoji' })
}
<Text variant="b3" className="msg__reaction-count">{count}</Text>
</button>
</Tooltip>
);
}
MessageReaction.propTypes = {
shortcodeToEmoji: PropTypes.shape({}).isRequired,
reaction: PropTypes.node.isRequired,
count: PropTypes.number.isRequired,
users: PropTypes.arrayOf(PropTypes.string).isRequired,
@@ -318,12 +376,13 @@ MessageReaction.propTypes = {
};
function MessageReactionGroup({ roomTimeline, mEvent }) {
const { roomId, reactionTimeline } = roomTimeline;
const eventId = mEvent.getId();
const { roomId, room, reactionTimeline } = roomTimeline;
const mx = initMatrix.matrixClient;
const reactions = {};
const shortcodeToEmoji = getShortcodeToCustomEmoji(room);
const canSendReaction = room.currentState.maySendEvent('m.reaction', mx.getUserId());
const eventReactions = reactionTimeline.get(eventId);
const eventReactions = reactionTimeline.get(mEvent.getId());
const addReaction = (key, count, senderId, isActive) => {
let reaction = reactions[key];
if (reaction === undefined) {
@@ -368,24 +427,27 @@ function MessageReactionGroup({ roomTimeline, mEvent }) {
Object.keys(reactions).map((key) => (
<MessageReaction
key={key}
shortcodeToEmoji={shortcodeToEmoji}
reaction={key}
count={reactions[key].count}
users={reactions[key].users}
isActive={reactions[key].isActive}
onClick={() => {
toggleEmoji(roomId, eventId, key, roomTimeline);
toggleEmoji(roomId, mEvent.getId(), key, roomTimeline);
}}
/>
))
}
<IconButton
onClick={(e) => {
pickEmoji(e, roomId, eventId, roomTimeline);
}}
src={EmojiAddIC}
size="extra-small"
tooltip="Add reaction"
/>
{canSendReaction && (
<IconButton
onClick={(e) => {
pickEmoji(e, roomId, mEvent.getId(), roomTimeline);
}}
src={EmojiAddIC}
size="extra-small"
tooltip="Add reaction"
/>
)}
</div>
);
}
@@ -409,20 +471,22 @@ const MessageOptions = React.memo(({
}) => {
const { roomId, room } = roomTimeline;
const mx = initMatrix.matrixClient;
const eventId = mEvent.getId();
const senderId = mEvent.getSender();
const myPowerlevel = room.getMember(mx.getUserId())?.powerLevel;
const canIRedact = room.currentState.hasSufficientPowerLevelFor('redact', myPowerlevel);
const canSendReaction = room.currentState.maySendEvent('m.reaction', mx.getUserId());
return (
<div className="message__options">
<IconButton
onClick={(e) => pickEmoji(e, roomId, eventId, roomTimeline)}
src={EmojiAddIC}
size="extra-small"
tooltip="Add reaction"
/>
{canSendReaction && (
<IconButton
onClick={(e) => pickEmoji(e, roomId, mEvent.getId(), roomTimeline)}
src={EmojiAddIC}
size="extra-small"
tooltip="Add reaction"
/>
)}
<IconButton
onClick={() => reply()}
src={ReplyArrowIC}
@@ -447,6 +511,12 @@ const MessageOptions = React.memo(({
>
Read receipts
</MenuItem>
<MenuItem
iconSrc={CmdIC}
onClick={() => openViewSource(mEvent)}
>
View source
</MenuItem>
{(canIRedact || senderId === mx.getUserId()) && (
<>
<MenuBorder />
@@ -455,7 +525,7 @@ const MessageOptions = React.memo(({
iconSrc={BinIC}
onClick={() => {
if (window.confirm('Are you sure you want to delete this event')) {
redactEvent(roomId, eventId);
redactEvent(roomId, mEvent.getId());
}
}}
>
@@ -568,7 +638,8 @@ function Message({
mEvent, isBodyOnly, roomTimeline, focus, time,
}) {
const [isEditing, setIsEditing] = useState(false);
const { roomId, editedTimeline, reactionTimeline } = roomTimeline;
const roomId = mEvent.getRoomId();
const { editedTimeline, reactionTimeline } = roomTimeline ?? {};
const className = ['message', (isBodyOnly ? 'message--body-only' : 'message--full')];
if (focus) className.push('message--focus');
@@ -577,21 +648,24 @@ function Message({
const msgType = content?.msgtype;
const senderId = mEvent.getSender();
let { body } = content;
const username = getUsernameOfRoomMember(mEvent.sender);
const username = mEvent.sender ? getUsernameOfRoomMember(mEvent.sender) : getUsername(senderId);
const avatarSrc = mEvent.sender?.getAvatarUrl(initMatrix.matrixClient.baseUrl, 36, 36, 'crop') ?? null;
const edit = useCallback(() => {
setIsEditing(true);
}, []);
const reply = useCallback(() => {
replyTo(senderId, eventId, body);
replyTo(senderId, mEvent.getId(), body);
}, [body]);
if (body === undefined) return null;
if (msgType === 'm.emote') className.push('message--type-emote');
let isCustomHTML = content.format === 'org.matrix.custom.html';
const isEdited = editedTimeline.has(eventId);
const haveReactions = reactionTimeline.has(eventId) || !!mEvent.getServerAggregatedRelation('m.annotation');
const isEdited = roomTimeline ? editedTimeline.has(eventId) : false;
const haveReactions = roomTimeline
? reactionTimeline.has(eventId) || !!mEvent.getServerAggregatedRelation('m.annotation')
: false;
const isReply = !!mEvent.replyEventId;
let customHTML = isCustomHTML ? content.formatted_body : null;
@@ -611,13 +685,20 @@ function Message({
{
isBodyOnly
? <div className="message__avatar-container" />
: <MessageAvatar roomId={roomId} mEvent={mEvent} userId={senderId} username={username} />
: (
<MessageAvatar
roomId={roomId}
avatarSrc={avatarSrc}
userId={senderId}
username={username}
/>
)
}
<div className="message__main-container">
{!isBodyOnly && (
<MessageHeader userId={senderId} username={username} time={time} />
)}
{isReply && (
{roomTimeline && isReply && (
<MessageReplyWrapper
roomTimeline={roomTimeline}
eventId={mEvent.replyEventId}
@@ -647,7 +728,7 @@ function Message({
{haveReactions && (
<MessageReactionGroup roomTimeline={roomTimeline} mEvent={mEvent} />
)}
{!isEditing && (
{roomTimeline && !isEditing && (
<MessageOptions
roomTimeline={roomTimeline}
mEvent={mEvent}
@@ -662,11 +743,12 @@ function Message({
Message.defaultProps = {
isBodyOnly: false,
focus: false,
roomTimeline: null,
};
Message.propTypes = {
mEvent: PropTypes.shape({}).isRequired,
isBodyOnly: PropTypes.bool,
roomTimeline: PropTypes.shape({}).isRequired,
roomTimeline: PropTypes.shape({}),
focus: PropTypes.bool,
time: PropTypes.string.isRequired,
};

View File

@@ -95,6 +95,9 @@
.message__reactions {
max-width: calc(100% - 88px);
min-width: 0;
@media (max-width: 1124px) {
max-width: 100%;
}
}
@@ -161,6 +164,10 @@
& a {
word-break: break-word;
}
& > .text > a {
white-space: initial !important;
}
& span[data-mx-pill] {
background-color: hsla(0, 0%, 64%, 0.15);
padding: 0 2px;
@@ -195,6 +202,7 @@
opacity: 0;
}
}
.data-mx-spoiler--visible {
background-color: var(--bg-surface-active) !important;
color: inherit !important;
@@ -241,8 +249,8 @@
cursor: pointer;
& .react-emoji {
width: 14px;
height: 14px;
width: 16px;
height: 16px;
margin: 2px;
}
&-count {
@@ -250,8 +258,8 @@
color: var(--tc-surface-normal)
}
&-tooltip .react-emoji {
width: 14px;
height: 14px;
width: 16px;
height: 16px;
margin: 0 var(--sp-ultra-tight);
margin-bottom: -2px;
}
@@ -285,7 +293,7 @@
@include dir.prop(left, unset, 60px);
z-index: 99;
transform: translateY(-50%);
transform: translateY(-100%);
border-radius: var(--bo-radius);
box-shadow: var(--bs-surface-border);
@@ -295,23 +303,40 @@
// markdown formating
.message__body {
& h1, h2, h3, h4, h5, h6 {
margin: 0;
margin-bottom: var(--sp-ultra-tight);
font-weight: var(--fw-medium);
&:first-child {
margin-top: 0;
}
&:last-child {
margin-bottom: 0;
}
}
& h1,
& h2 {
color: var(--tc-surface-high);
margin: var(--sp-loose) 0 var(--sp-normal);
line-height: var(--lh-h1);
margin-top: var(--sp-normal);
font-size: var(--fs-h2);
line-height: var(--lh-h2);
letter-spacing: var(--ls-h2);
}
& h3,
& h4 {
color: var(--tc-surface-high);
margin: var(--sp-normal) 0 var(--sp-tight);
line-height: var(--lh-h2);
margin-top: var(--sp-tight);
font-size: var(--fs-s1);
line-height: var(--lh-s1);
letter-spacing: var(--ls-s1);
}
& h5,
& h6 {
color: var(--tc-surface-high);
margin: var(--sp-tight) 0 var(--sp-extra-tight);
line-height: var(--lh-s1);
margin-top: var(--sp-extra-tight);
font-size: var(--fs-b1);
line-height: var(--lh-b1);
letter-spacing: var(--ls-b1);
}
& hr {
border-color: var(--bg-divider);
@@ -357,7 +382,7 @@
@include scrollbar.scroll--auto-hide;
}
& pre {
display: inline-block;
width: fit-content;
max-width: 100%;
@include scrollbar.scroll;
@include scrollbar.scroll__h;
@@ -368,9 +393,8 @@
}
}
& blockquote {
display: inline-block;
width: fit-content;
max-width: 100%;
@include dir.side(padding, var(--sp-extra-tight), 0);
@include dir.side(border, 4px solid var(--bg-surface-active), 0);
white-space: initial !important;
@@ -383,10 +407,6 @@
margin: var(--sp-ultra-tight) 0;
@include dir.side(padding, 24px, 0);
white-space: initial !important;
& > * {
white-space: pre-wrap;
}
}
& ul.contains-task-list {
padding: 0;

View File

@@ -32,5 +32,6 @@
min-width: 0;
margin: 0 var(--sp-tight);
word-break: break-word;
}
}

View File

@@ -1,14 +1,16 @@
@use '../../partials/text';
@use '../../partials/dir';
.people-selector {
width: 100%;
padding: var(--sp-extra-tight);
@include dir.side(padding, var(--sp-normal), var(--sp-extra-tight));
padding: var(--sp-extra-tight) var(--sp-normal);
display: flex;
align-items: center;
cursor: pointer;
&__container {
display: flex;
}
@media (hover: hover) {
&:hover {
background-color: var(--bg-surface-hover);

View File

@@ -51,14 +51,16 @@ PWContentSelector.propTypes = {
function PopupWindow({
className, isOpen, title, contentTitle,
drawer, drawerOptions, contentOptions,
onRequestClose, children,
onAfterClose, onRequestClose, children,
}) {
const haveDrawer = drawer !== null;
const cTitle = contentTitle !== null ? contentTitle : title;
return (
<RawModal
className={`${className === null ? '' : `${className} `}pw-model`}
isOpen={isOpen}
onAfterClose={onAfterClose}
onRequestClose={onRequestClose}
size={haveDrawer ? 'large' : 'medium'}
>
@@ -68,7 +70,11 @@ function PopupWindow({
<Header>
<IconButton size="small" src={ChevronLeftIC} onClick={onRequestClose} tooltip="Back" />
<TitleWrapper>
<Text variant="s1" weight="medium" primary>{twemojify(title)}</Text>
{
typeof title === 'string'
? <Text variant="s1" weight="medium" primary>{twemojify(title)}</Text>
: title
}
</TitleWrapper>
{drawerOptions}
</Header>
@@ -84,7 +90,11 @@ function PopupWindow({
<div className="pw__content">
<Header>
<TitleWrapper>
<Text variant="h2" weight="medium" primary>{twemojify(contentTitle !== null ? contentTitle : title)}</Text>
{
typeof cTitle === 'string'
? <Text variant="h2" weight="medium" primary>{twemojify(cTitle)}</Text>
: cTitle
}
</TitleWrapper>
{contentOptions}
</Header>
@@ -107,17 +117,19 @@ PopupWindow.defaultProps = {
contentTitle: null,
drawerOptions: null,
contentOptions: null,
onAfterClose: null,
onRequestClose: null,
};
PopupWindow.propTypes = {
className: PropTypes.string,
isOpen: PropTypes.bool.isRequired,
title: PropTypes.string.isRequired,
contentTitle: PropTypes.string,
title: PropTypes.node.isRequired,
contentTitle: PropTypes.node,
drawer: PropTypes.node,
drawerOptions: PropTypes.node,
contentOptions: PropTypes.node,
onAfterClose: PropTypes.func,
onRequestClose: PropTypes.func,
children: PropTypes.node.isRequired,
};

View File

@@ -7,8 +7,6 @@
}
.pw {
--popup-window-drawer-width: 280px;
width: 100%;
height: 100%;
background-color: var(--bg-surface);

View File

@@ -0,0 +1,49 @@
import React from 'react';
import PropTypes from 'prop-types';
import './PowerLevelSelector.scss';
import IconButton from '../../atoms/button/IconButton';
import { MenuHeader, MenuItem } from '../../atoms/context-menu/ContextMenu';
import CheckIC from '../../../../public/res/ic/outlined/check.svg';
function PowerLevelSelector({
value, max, onSelect,
}) {
const handleSubmit = (e) => {
const powerLevel = e.target.elements['power-level']?.value;
if (!powerLevel) return;
onSelect(Number(powerLevel));
};
return (
<div className="power-level-selector">
<MenuHeader>Power level selector</MenuHeader>
<form onSubmit={(e) => { e.preventDefault(); handleSubmit(e); }}>
<input
className="input"
defaultValue={value}
type="number"
name="power-level"
placeholder="Power level"
max={max}
autoComplete="off"
required
/>
<IconButton variant="primary" src={CheckIC} type="submit" />
</form>
{max >= 0 && <MenuHeader>Presets</MenuHeader>}
{max >= 100 && <MenuItem variant={value === 100 ? 'positive' : 'surface'} onClick={() => onSelect(100)}>Admin - 100</MenuItem>}
{max >= 50 && <MenuItem variant={value === 50 ? 'positive' : 'surface'} onClick={() => onSelect(50)}>Mod - 50</MenuItem>}
{max >= 0 && <MenuItem variant={value === 0 ? 'positive' : 'surface'} onClick={() => onSelect(0)}>Member - 0</MenuItem>}
</div>
);
}
PowerLevelSelector.propTypes = {
value: PropTypes.number.isRequired,
max: PropTypes.number.isRequired,
onSelect: PropTypes.func.isRequired,
};
export default PowerLevelSelector;

View File

@@ -0,0 +1,20 @@
@use '../../partials/flex';
@use '../../partials/dir';
.power-level-selector {
& .context-menu__item .text {
margin: 0 !important;
}
& form {
margin: var(--sp-normal);
display: flex;
& input {
@extend .cp-fx__item-one;
@include dir.side(margin, 0, var(--sp-tight));
width: 148px;
padding: 9px var(--sp-tight);
}
}
}

View File

@@ -0,0 +1,356 @@
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import './RoomAliases.scss';
import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import { Debounce } from '../../../util/common';
import { isRoomAliasAvailable } from '../../../util/matrixUtil';
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
import Input from '../../atoms/input/Input';
import Checkbox from '../../atoms/button/Checkbox';
import Toggle from '../../atoms/button/Toggle';
import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
import SettingTile from '../setting-tile/SettingTile';
import { useStore } from '../../hooks/useStore';
function useValidate(hsString) {
const [debounce] = useState(new Debounce());
const [validate, setValidate] = useState({ alias: null, status: cons.status.PRE_FLIGHT });
const setValidateToDefault = () => {
setValidate({
alias: null,
status: cons.status.PRE_FLIGHT,
});
};
const checkValueOK = (value) => {
if (value.trim() === '') {
setValidateToDefault();
return false;
}
if (!value.match(/^[a-zA-Z0-9_-]+$/)) {
setValidate({
alias: null,
status: cons.status.ERROR,
msg: 'Invalid character: only letter, numbers and _- are allowed.',
});
return false;
}
return true;
};
const handleAliasChange = (e) => {
const input = e.target;
if (validate.status !== cons.status.PRE_FLIGHT) {
setValidateToDefault();
}
if (checkValueOK(input.value) === false) return;
debounce._(async () => {
const { value } = input;
const alias = `#${value}:${hsString}`;
if (checkValueOK(value) === false) return;
setValidate({
alias,
status: cons.status.IN_FLIGHT,
msg: `validating ${alias}...`,
});
const isValid = await isRoomAliasAvailable(alias);
setValidate(() => {
if (e.target.value !== value) {
return { alias: null, status: cons.status.PRE_FLIGHT };
}
return {
alias,
status: isValid ? cons.status.SUCCESS : cons.status.ERROR,
msg: isValid ? `${alias} is available.` : `${alias} is already in use.`,
};
});
}, 600)();
};
return [validate, setValidateToDefault, handleAliasChange];
}
function getAliases(roomId) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const main = room.getCanonicalAlias();
const published = room.getAltAliases();
if (main && !published.includes(main)) published.splice(0, 0, main);
return {
main,
published: [...new Set(published)],
local: [],
};
}
function RoomAliases({ roomId }) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const userId = mx.getUserId();
const hsString = userId.slice(userId.indexOf(':') + 1);
const isMountedStore = useStore();
const [isPublic, setIsPublic] = useState(false);
const [isLocalVisible, setIsLocalVisible] = useState(false);
const [aliases, setAliases] = useState(getAliases(roomId));
const [selectedAlias, setSelectedAlias] = useState(null);
const [deleteAlias, setDeleteAlias] = useState(null);
const [validate, setValidateToDefault, handleAliasChange] = useValidate(hsString);
const canPublishAlias = room.currentState.maySendStateEvent('m.room.canonical_alias', userId);
useEffect(() => isMountedStore.setItem(true), []);
useEffect(() => {
let isUnmounted = false;
const loadLocalAliases = async () => {
let local = [];
try {
const result = await mx.unstableGetLocalAliases(roomId);
local = result.aliases.filter((alias) => !aliases.published.includes(alias));
} catch {
local = [];
}
aliases.local = [...new Set(local.reverse())];
if (isUnmounted) return;
setAliases({ ...aliases });
};
const loadVisibility = async () => {
const result = await mx.getRoomDirectoryVisibility(roomId);
if (isUnmounted) return;
setIsPublic(result.visibility === 'public');
};
loadLocalAliases();
loadVisibility();
return () => {
isUnmounted = true;
};
}, [roomId]);
const toggleDirectoryVisibility = () => {
mx.setRoomDirectoryVisibility(roomId, isPublic ? 'private' : 'public');
setIsPublic(!isPublic);
};
const handleAliasSubmit = async (e) => {
e.preventDefault();
if (validate.status === cons.status.ERROR) return;
if (!validate.alias) return;
const { alias } = validate;
const aliasInput = e.target.elements['alias-input'];
aliasInput.value = '';
setValidateToDefault();
try {
aliases.local.push(alias);
setAliases({ ...aliases });
await mx.createAlias(alias, roomId);
} catch {
if (isMountedStore.getItem()) {
const lIndex = alias.local.indexOf(alias);
if (lIndex === -1) return;
aliases.local.splice(lIndex, 1);
setAliases({ ...aliases });
}
}
};
const handleAliasSelect = (alias) => {
setSelectedAlias(alias === selectedAlias ? null : alias);
};
const handlePublishAlias = (alias) => {
const { main, published } = aliases;
let { local } = aliases;
if (!published.includes(aliases)) {
published.push(alias);
local = local.filter((al) => al !== alias);
mx.sendStateEvent(roomId, 'm.room.canonical_alias', {
alias: main,
alt_aliases: published.filter((al) => al !== main),
});
setAliases({ main, published, local });
setSelectedAlias(null);
}
};
const handleUnPublishAlias = (alias) => {
let { main, published } = aliases;
const { local } = aliases;
if (published.includes(alias) || main === alias) {
if (main === alias) main = null;
published = published.filter((al) => al !== alias);
local.push(alias);
mx.sendStateEvent(roomId, 'm.room.canonical_alias', {
alias: main,
alt_aliases: published.filter((al) => al !== main),
});
setAliases({ main, published, local });
setSelectedAlias(null);
}
};
const handleSetMainAlias = (alias) => {
let { main, local } = aliases;
const { published } = aliases;
if (main !== alias) {
main = alias;
if (!published.includes(alias)) published.splice(0, 0, alias);
local = local.filter((al) => al !== alias);
mx.sendStateEvent(roomId, 'm.room.canonical_alias', {
alias: main,
alt_aliases: published.filter((al) => al !== main),
});
setAliases({ main, published, local });
setSelectedAlias(null);
}
};
const handleDeleteAlias = async (alias) => {
try {
setDeleteAlias({ alias, status: cons.status.IN_FLIGHT, msg: 'deleting...' });
await mx.deleteAlias(alias);
let { main, published, local } = aliases;
if (published.includes(alias)) {
handleUnPublishAlias(alias);
if (main === alias) main = null;
published = published.filter((al) => al !== alias);
}
local = local.filter((al) => al !== alias);
setAliases({ main, published, local });
setDeleteAlias(null);
setSelectedAlias(null);
} catch (err) {
setDeleteAlias({ alias, status: cons.status.ERROR, msg: err.message });
}
};
const renderAliasBtns = (alias) => {
const isPublished = aliases.published.includes(alias);
const isMain = aliases.main === alias;
if (deleteAlias?.alias === alias) {
const isError = deleteAlias.status === cons.status.ERROR;
return (
<div className="room-aliases__item-btns">
<Text variant="b2">
<span style={{ color: isError ? 'var(--tc-danger-high' : 'inherit' }}>{deleteAlias.msg}</span>
</Text>
</div>
);
}
return (
<div className="room-aliases__item-btns">
{canPublishAlias && !isMain && <Button onClick={() => handleSetMainAlias(alias)} variant="primary">Set as Main</Button>}
{!isPublished && canPublishAlias && <Button onClick={() => handlePublishAlias(alias)} variant="positive">Publish</Button>}
{isPublished && canPublishAlias && <Button onClick={() => handleUnPublishAlias(alias)} variant="caution">Un-Publish</Button>}
<Button onClick={() => handleDeleteAlias(alias)} variant="danger">Delete</Button>
</div>
);
};
const renderAlias = (alias) => {
const isActive = selectedAlias === alias;
const disabled = !canPublishAlias && aliases.published.includes(alias);
const isMain = aliases.main === alias;
return (
<React.Fragment key={`${alias}-wrapper`}>
<div className="room-aliases__alias-item" key={alias}>
<Checkbox variant="positive" disabled={disabled} isActive={isActive} onToggle={() => handleAliasSelect(alias)} />
<Text>
{alias}
{isMain && <span>Main</span>}
</Text>
</div>
{isActive && renderAliasBtns(alias)}
</React.Fragment>
);
};
let inputState = 'normal';
if (validate.status === cons.status.ERROR) inputState = 'error';
if (validate.status === cons.status.SUCCESS) inputState = 'success';
return (
<div className="room-aliases">
<SettingTile
title="Publish to room directory"
content={<Text variant="b3">{`Publish this ${room.isSpaceRoom() ? 'space' : 'room'} to the ${hsString}'s public room directory?`}</Text>}
options={(
<Toggle
isActive={isPublic}
onToggle={toggleDirectoryVisibility}
disabled={!canPublishAlias}
/>
)}
/>
<div className="room-aliases__content">
<MenuHeader>Published addresses</MenuHeader>
{(aliases.published.length === 0) && <Text className="room-aliases__message">No published addresses</Text>}
{(aliases.published.length > 0 && !aliases.main) && <Text className="room-aliases__message">No Main address (select one from below)</Text>}
{aliases.published.map(renderAlias)}
<Text className="room-aliases__message" variant="b3">
{`Published addresses can be used by anyone on any server to join your ${room.isSpaceRoom() ? 'space' : 'room'}. To publish an address, it needs to be set as a local address first.`}
</Text>
</div>
{ isLocalVisible && (
<div className="room-aliases__content">
<MenuHeader>Local addresses</MenuHeader>
{(aliases.local.length === 0) && <Text className="room-aliases__message">No local addresses</Text>}
{aliases.local.map(renderAlias)}
<Text className="room-aliases__message" variant="b3">
{`Set local addresses for this ${room.isSpaceRoom() ? 'space' : 'room'} so users can find this ${room.isSpaceRoom() ? 'space' : 'room'} through your homeserver.`}
</Text>
<Text className="room-aliases__form-label" variant="b2">Add local address</Text>
<form className="room-aliases__form" onSubmit={handleAliasSubmit}>
<div className="room-aliases__input-wrapper">
<Input
name="alias-input"
state={inputState}
onChange={handleAliasChange}
placeholder={`my_${room.isSpaceRoom() ? 'space' : 'room'}_address`}
required
/>
</div>
<Button variant="primary" type="submit">Add</Button>
</form>
<div className="room-aliases__input-status">
{validate.status === cons.status.SUCCESS && <Text className="room-aliases__valid" variant="b2">{validate.msg}</Text>}
{validate.status === cons.status.ERROR && <Text className="room-aliases__invalid" variant="b2">{validate.msg}</Text>}
</div>
</div>
)}
<div className="room-aliases__content">
<Button onClick={() => setIsLocalVisible(!isLocalVisible)}>
{`${isLocalVisible ? 'Hide' : 'Add / View'} local address`}
</Button>
</div>
</div>
);
}
RoomAliases.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomAliases;

View File

@@ -0,0 +1,84 @@
@use '../../partials/flex';
@use '../../partials/dir';
@use '../../partials/text';
.room-aliases {
&__message,
& .setting-tile {
margin: var(--sp-tight) var(--sp-normal);
}
& .setting-tile {
margin-bottom: var(--sp-loose);
}
&__alias-item {
padding: var(--sp-extra-tight) var(--sp-normal);
@extend .cp-fx__row--s-c;
&.checkbox {
@include dir.side(margin, 0 , var(--sp-tight));
}
& .text {
@extend .cp-fx__item-one;
@extend .cp-txt__ellipsis;
color: var(--tc-surface-high);
span {
margin: 0 var(--sp-extra-tight);
padding: 0 var(--sp-ultra-tight);
color: var(--bg-surface);
background-color: var(--tc-surface-low);
border-radius: 4px;
}
}
}
&__item-btns {
@include dir.side(margin, 48px, 0);
& button {
padding: var(--sp-ultra-tight) var(--sp-tight);
margin-bottom: var(--sp-tight);
@include dir.side(margin, 0, var(--sp-tight));
}
}
&__content {
margin-bottom: var(--sp-normal);
& .checkbox {
@include dir.side(margin, 0, var(--sp-tight));
min-width: 20px;
}
& > button {
margin: 0 var(--sp-normal);
}
}
&__form {
padding: var(--sp-normal);
padding-top: 0;
display: flex;
&-label {
padding: var(--sp-normal) var(--sp-normal) var(--sp-ultra-tight);
}
}
&__input-wrapper {
display: flex;
@extend .cp-fx__item-one;
@include dir.side(margin, 0, var(--sp-tight));
& .input-container {
@extend .cp-fx__item-one;
}
}
&__input-status {
padding: 0 var(--sp-normal);
}
&__valid {
color: var(--tc-positive-high);
padding-bottom: var(--sp-normal);
}
&__invalid {
color: var(--tc-danger-high);
padding-bottom: var(--sp-normal);
}
}

View File

@@ -0,0 +1,55 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import './RoomEncryption.scss';
import initMatrix from '../../../client/initMatrix';
import Text from '../../atoms/text/Text';
import Toggle from '../../atoms/button/Toggle';
import SettingTile from '../setting-tile/SettingTile';
function RoomEncryption({ roomId }) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const encryptionEvents = room.currentState.getStateEvents('m.room.encryption');
const [isEncrypted, setIsEncrypted] = useState(encryptionEvents.length > 0);
const canEnableEncryption = room.currentState.maySendStateEvent('m.room.encryption', mx.getUserId());
const handleEncryptionEnable = () => {
const joinRule = room.getJoinRule();
const confirmMsg1 = 'It is not recommended to add encryption in public room. Anyone can find and join public rooms, so anyone can read messages in them.';
const confirmMsg2 = 'Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly';
if (joinRule === 'public' ? confirm(confirmMsg1) : true) {
if (confirm(confirmMsg2)) {
setIsEncrypted(true);
mx.sendStateEvent(roomId, 'm.room.encryption', {
algorithm: 'm.megolm.v1.aes-sha2',
});
}
}
};
return (
<div className="room-encryption">
<SettingTile
title="Enable room encryption"
content={(
<Text variant="b3">Once enabled, encryption cannot be disabled.</Text>
)}
options={(
<Toggle
isActive={isEncrypted}
onToggle={handleEncryptionEnable}
disabled={isEncrypted || !canEnableEncryption}
/>
)}
/>
</div>
);
}
RoomEncryption.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomEncryption;

View File

@@ -0,0 +1,5 @@
.room-encryption {
& .setting-tile {
margin: var(--sp-normal);
}
}

View File

@@ -0,0 +1,99 @@
import React, { useState, useEffect, useCallback } from 'react';
import PropTypes from 'prop-types';
import './RoomHistoryVisibility.scss';
import initMatrix from '../../../client/initMatrix';
import Text from '../../atoms/text/Text';
import RadioButton from '../../atoms/button/RadioButton';
import { MenuItem } from '../../atoms/context-menu/ContextMenu';
const visibility = {
WORLD_READABLE: 'world_readable',
SHARED: 'shared',
INVITED: 'invited',
JOINED: 'joined',
};
const items = [{
iconSrc: null,
text: 'World readable (anyone can read)',
type: visibility.WORLD_READABLE,
}, {
iconSrc: null,
text: 'Member shared (since the point in time of selecting this option)',
type: visibility.SHARED,
}, {
iconSrc: null,
text: 'Member invited (since they were invited)',
type: visibility.INVITED,
}, {
iconSrc: null,
text: 'Member joined (since they joined)',
type: visibility.JOINED,
}];
function setHistoryVisibility(roomId, type) {
const mx = initMatrix.matrixClient;
return mx.sendStateEvent(
roomId, 'm.room.history_visibility',
{
history_visibility: type,
},
);
}
function useVisibility(roomId) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const [activeType, setActiveType] = useState(room.getHistoryVisibility());
useEffect(() => setActiveType(room.getHistoryVisibility()), [roomId]);
const setVisibility = useCallback((item) => {
if (item.type === activeType.type) return;
setActiveType(item.type);
setHistoryVisibility(roomId, item.type);
}, [activeType, roomId]);
return [activeType, setVisibility];
}
function RoomHistoryVisibility({ roomId }) {
const [activeType, setVisibility] = useVisibility(roomId);
const mx = initMatrix.matrixClient;
const userId = mx.getUserId();
const room = mx.getRoom(roomId);
const { currentState } = room;
const canChange = currentState.maySendStateEvent('m.room.history_visibility', userId);
return (
<div className="room-history-visibility">
{
items.map((item) => (
<MenuItem
variant={activeType === item.type ? 'positive' : 'surface'}
key={item.type}
iconSrc={item.iconSrc}
onClick={() => setVisibility(item)}
disabled={(!canChange)}
>
<Text varient="b1">
<span>{item.text}</span>
<RadioButton isActive={activeType === item.type} />
</Text>
</MenuItem>
))
}
<Text variant="b3">Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.</Text>
</div>
);
}
RoomHistoryVisibility.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomHistoryVisibility;

View File

@@ -0,0 +1,25 @@
@use '../../partials/flex';
@use '../../partials/dir';
@use '../../partials/text';
.room-history-visibility {
& .context-menu__item .text {
margin: 0 !important;
@extend .cp-fx__item-one;
@extend .cp-fx__row--s-c;
& span:first-child {
@extend .cp-fx__item-one;
@extend .cp-txt__ellipsis;
}
& .radio-btn {
@include dir.side(margin, var(--sp-tight), 0);
}
}
& > .text {
margin: var(--sp-normal);
margin-top: var(--sp-ultra-tight);
}
}

View File

@@ -0,0 +1,204 @@
import React, {
useState, useEffect, useCallback,
} from 'react';
import PropTypes from 'prop-types';
import './RoomMembers.scss';
import initMatrix from '../../../client/initMatrix';
import colorMXID from '../../../util/colorMXID';
import { openProfileViewer } from '../../../client/action/navigation';
import { getUsernameOfRoomMember, getPowerLabel } from '../../../util/matrixUtil';
import AsyncSearch from '../../../util/AsyncSearch';
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
import Input from '../../atoms/input/Input';
import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
import SegmentedControls from '../../atoms/segmented-controls/SegmentedControls';
import PeopleSelector from '../people-selector/PeopleSelector';
const PER_PAGE_MEMBER = 50;
function AtoZ(m1, m2) {
const aName = m1.name;
const bName = m2.name;
if (aName.toLowerCase() < bName.toLowerCase()) {
return -1;
}
if (aName.toLowerCase() > bName.toLowerCase()) {
return 1;
}
return 0;
}
function sortByPowerLevel(m1, m2) {
const pl1 = m1.powerLevel;
const pl2 = m2.powerLevel;
if (pl1 > pl2) return -1;
if (pl1 < pl2) return 1;
return 0;
}
function normalizeMembers(members) {
const mx = initMatrix.matrixClient;
return members.map((member) => ({
userId: member.userId,
name: getUsernameOfRoomMember(member),
username: member.userId.slice(1, member.userId.indexOf(':')),
avatarSrc: member.getAvatarUrl(mx.baseUrl, 24, 24, 'crop'),
peopleRole: getPowerLabel(member.powerLevel),
powerLevel: members.powerLevel,
}));
}
function useMemberOfMembership(roomId, membership) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const [members, setMembers] = useState([]);
useEffect(() => {
let isMounted = true;
let isLoadingMembers = false;
const updateMemberList = (event) => {
if (isLoadingMembers) return;
if (event && event?.getRoomId() !== roomId) return;
const memberOfMembership = normalizeMembers(
room.getMembersWithMembership(membership)
.sort(AtoZ).sort(sortByPowerLevel),
);
setMembers(memberOfMembership);
};
updateMemberList();
isLoadingMembers = true;
room.loadMembersIfNeeded().then(() => {
isLoadingMembers = false;
if (!isMounted) return;
updateMemberList();
});
mx.on('RoomMember.membership', updateMemberList);
mx.on('RoomMember.powerLevel', updateMemberList);
return () => {
isMounted = false;
mx.removeListener('RoomMember.membership', updateMemberList);
mx.removeListener('RoomMember.powerLevel', updateMemberList);
};
}, [membership]);
return [members];
}
function useSearchMembers(members) {
const [searchMembers, setSearchMembers] = useState(null);
const [asyncSearch] = useState(new AsyncSearch());
const reSearch = useCallback(() => {
if (searchMembers) {
asyncSearch.search(searchMembers.term);
}
}, [searchMembers, asyncSearch]);
useEffect(() => {
asyncSearch.setup(members, {
keys: ['name', 'username', 'userId'],
limit: PER_PAGE_MEMBER,
});
reSearch();
}, [members, asyncSearch]);
useEffect(() => {
const handleSearchData = (data, term) => setSearchMembers({ data, term });
asyncSearch.on(asyncSearch.RESULT_SENT, handleSearchData);
return () => {
asyncSearch.removeListener(asyncSearch.RESULT_SENT, handleSearchData);
};
}, [asyncSearch]);
const handleSearch = (e) => {
const term = e.target.value;
if (term === '' || term === undefined) {
setSearchMembers(null);
} else asyncSearch.search(term);
};
return [searchMembers, handleSearch];
}
function RoomMembers({ roomId }) {
const [itemCount, setItemCount] = useState(PER_PAGE_MEMBER);
const [membership, setMembership] = useState('join');
const [members] = useMemberOfMembership(roomId, membership);
const [searchMembers, handleSearch] = useSearchMembers(members);
useEffect(() => {
setItemCount(PER_PAGE_MEMBER);
}, [searchMembers]);
const loadMorePeople = () => {
setItemCount(itemCount + PER_PAGE_MEMBER);
};
const mList = searchMembers ? searchMembers.data : members.slice(0, itemCount);
return (
<div className="room-members">
<MenuHeader>Search member</MenuHeader>
<Input
onChange={handleSearch}
placeholder="Search for name"
autoFocus
/>
<div className="room-members__header">
<MenuHeader>{`${searchMembers ? `Found — ${mList.length}` : members.length} members`}</MenuHeader>
<SegmentedControls
selected={
(() => {
const getSegmentIndex = { join: 0, invite: 1, ban: 2 };
return getSegmentIndex[membership];
})()
}
segments={[{ text: 'Joined' }, { text: 'Invited' }, { text: 'Banned' }]}
onSelect={(index) => {
const memberships = ['join', 'invite', 'ban'];
setMembership(memberships[index]);
}}
/>
</div>
<div className="room-members__list">
{mList.map((member) => (
<PeopleSelector
key={member.userId}
onClick={() => openProfileViewer(member.userId, roomId)}
avatarSrc={member.avatarSrc}
name={member.name}
color={colorMXID(member.userId)}
peopleRole={member.peopleRole}
/>
))}
{
(searchMembers?.data.length === 0 || members.length === 0)
&& (
<div className="room-members__status">
<Text variant="b2">
{searchMembers ? `No results found for "${searchMembers.term}"` : 'No members to display'}
</Text>
</div>
)
}
{
mList.length !== 0
&& members.length > itemCount
&& searchMembers === null
&& <Button onClick={loadMorePeople}>View more</Button>
}
</div>
</div>
);
}
RoomMembers.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomMembers;

View File

@@ -0,0 +1,39 @@
@use '../../partials/flex';
@use '../../partials/dir';
.room-members {
& .input-container {
margin: var(--sp-normal);
}
&__header {
display: flex;
align-items: flex-start;
& .context-menu__header {
@extend .cp-fx__item-one;
margin-top: 14px;
border-top: 1px solid var(--bg-surface-border);
border-bottom: none;
}
& .segmented-controls {
@include dir.side(margin, 0, var(--sp-normal));
& > button {
padding: var(--sp-ultra-tight) 0;
}
}
}
&__list {
& .people-selector__container:last-child {
margin-bottom: var(--sp-extra-tight);
}
& > .btn-surface {
width: calc(100% - 32px);
margin: var(--sp-normal);
}
}
&__status {
margin: var(--sp-normal);
}
}

View File

@@ -0,0 +1,157 @@
import React, { useState, useEffect, useCallback } from 'react';
import PropTypes from 'prop-types';
import './RoomNotification.scss';
import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import Text from '../../atoms/text/Text';
import RadioButton from '../../atoms/button/RadioButton';
import { MenuItem } from '../../atoms/context-menu/ContextMenu';
import BellIC from '../../../../public/res/ic/outlined/bell.svg';
import BellRingIC from '../../../../public/res/ic/outlined/bell-ring.svg';
import BellPingIC from '../../../../public/res/ic/outlined/bell-ping.svg';
import BellOffIC from '../../../../public/res/ic/outlined/bell-off.svg';
const items = [{
iconSrc: BellIC,
text: 'Global',
type: cons.notifs.DEFAULT,
}, {
iconSrc: BellRingIC,
text: 'All message',
type: cons.notifs.ALL_MESSAGES,
}, {
iconSrc: BellPingIC,
text: 'Mentions & Keywords',
type: cons.notifs.MENTIONS_AND_KEYWORDS,
}, {
iconSrc: BellOffIC,
text: 'Mute',
type: cons.notifs.MUTE,
}];
function getNotifType(roomId) {
const mx = initMatrix.matrixClient;
const pushRule = mx.getRoomPushRule('global', roomId);
if (typeof pushRule === 'undefined') {
const overridePushRules = mx.getAccountData('m.push_rules')?.getContent()?.global?.override;
if (typeof overridePushRules === 'undefined') return 0;
const isMuteOverride = overridePushRules.find((rule) => (
rule.rule_id === roomId
&& rule.actions[0] === 'dont_notify'
&& rule.conditions[0].kind === 'event_match'
));
return isMuteOverride ? cons.notifs.MUTE : cons.notifs.DEFAULT;
}
if (pushRule.actions[0] === 'notify') return cons.notifs.ALL_MESSAGES;
return cons.notifs.MENTIONS_AND_KEYWORDS;
}
function setRoomNotifType(roomId, newType) {
const mx = initMatrix.matrixClient;
const roomPushRule = mx.getRoomPushRule('global', roomId);
const promises = [];
if (newType === cons.notifs.MUTE) {
if (roomPushRule) {
promises.push(mx.deletePushRule('global', 'room', roomPushRule.rule_id));
}
promises.push(mx.addPushRule('global', 'override', roomId, {
conditions: [
{
kind: 'event_match',
key: 'room_id',
pattern: roomId,
},
],
actions: [
'dont_notify',
],
}));
return promises;
}
const oldState = getNotifType(roomId);
if (oldState === cons.notifs.MUTE) {
promises.push(mx.deletePushRule('global', 'override', roomId));
}
if (newType === cons.notifs.DEFAULT) {
if (roomPushRule) {
promises.push(mx.deletePushRule('global', 'room', roomPushRule.rule_id));
}
return Promise.all(promises);
}
if (newType === cons.notifs.MENTIONS_AND_KEYWORDS) {
promises.push(mx.addPushRule('global', 'room', roomId, {
actions: [
'dont_notify',
],
}));
promises.push(mx.setPushRuleEnabled('global', 'room', roomId, true));
return Promise.all(promises);
}
// cons.notifs.ALL_MESSAGES
promises.push(mx.addPushRule('global', 'room', roomId, {
actions: [
'notify',
{
set_tweak: 'sound',
value: 'default',
},
],
}));
promises.push(mx.setPushRuleEnabled('global', 'room', roomId, true));
return Promise.all(promises);
}
function useNotifications(roomId) {
const [activeType, setActiveType] = useState(getNotifType(roomId));
useEffect(() => setActiveType(getNotifType(roomId)), [roomId]);
const setNotification = useCallback((item) => {
if (item.type === activeType.type) return;
setActiveType(item.type);
setRoomNotifType(roomId, item.type);
}, [activeType, roomId]);
return [activeType, setNotification];
}
function RoomNotification({ roomId }) {
const [activeType, setNotification] = useNotifications(roomId);
return (
<div className="room-notification">
{
items.map((item) => (
<MenuItem
variant={activeType === item.type ? 'positive' : 'surface'}
key={item.type}
iconSrc={item.iconSrc}
onClick={() => setNotification(item)}
>
<Text varient="b1">
<span>{item.text}</span>
<RadioButton isActive={activeType === item.type} />
</Text>
</MenuItem>
))
}
</div>
);
}
RoomNotification.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomNotification;

View File

@@ -0,0 +1,19 @@
@use '../../partials/flex';
@use '../../partials/dir';
@use '../../partials/text';
.room-notification {
& .context-menu__item .text {
@extend .cp-fx__item-one;
@extend .cp-fx__row--s-c;
& span:first-child {
@extend .cp-fx__item-one;
@extend .cp-txt__ellipsis;
}
& .radio-btn {
@include dir.side(margin, var(--sp-tight), 0);
}
}
}

View File

@@ -0,0 +1,67 @@
import React from 'react';
import PropTypes from 'prop-types';
import { twemojify } from '../../../util/twemojify';
import initMatrix from '../../../client/initMatrix';
import { openInviteUser } from '../../../client/action/navigation';
import * as roomActions from '../../../client/action/room';
import { MenuHeader, MenuItem } from '../../atoms/context-menu/ContextMenu';
import RoomNotification from '../room-notification/RoomNotification';
import TickMarkIC from '../../../../public/res/ic/outlined/tick-mark.svg';
import AddUserIC from '../../../../public/res/ic/outlined/add-user.svg';
import LeaveArrowIC from '../../../../public/res/ic/outlined/leave-arrow.svg';
function RoomOptions({ roomId, afterOptionSelect }) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const canInvite = room?.canInvite(mx.getUserId());
const handleMarkAsRead = () => {
afterOptionSelect();
if (!room) return;
const events = room.getLiveTimeline().getEvents();
mx.sendReadReceipt(events[events.length - 1]);
};
const handleInviteClick = () => {
openInviteUser(roomId);
afterOptionSelect();
};
const handleLeaveClick = () => {
if (confirm('Are you really want to leave this room?')) {
roomActions.leave(roomId);
afterOptionSelect();
}
};
return (
<div style={{ maxWidth: '256px' }}>
<MenuHeader>{twemojify(`Options for ${initMatrix.matrixClient.getRoom(roomId)?.name}`)}</MenuHeader>
<MenuItem iconSrc={TickMarkIC} onClick={handleMarkAsRead}>Mark as read</MenuItem>
<MenuItem
iconSrc={AddUserIC}
onClick={handleInviteClick}
disabled={!canInvite}
>
Invite
</MenuItem>
<MenuItem iconSrc={LeaveArrowIC} variant="danger" onClick={handleLeaveClick}>Leave</MenuItem>
<MenuHeader>Notification</MenuHeader>
<RoomNotification roomId={roomId} />
</div>
);
}
RoomOptions.defaultProps = {
afterOptionSelect: null,
};
RoomOptions.propTypes = {
roomId: PropTypes.string.isRequired,
afterOptionSelect: PropTypes.func,
};
export default RoomOptions;

View File

@@ -0,0 +1,281 @@
import React, { useEffect } from 'react';
import PropTypes from 'prop-types';
import './RoomPermissions.scss';
import initMatrix from '../../../client/initMatrix';
import { getPowerLabel } from '../../../util/matrixUtil';
import { openReusableContextMenu } from '../../../client/action/navigation';
import { getEventCords } from '../../../util/common';
import Text from '../../atoms/text/Text';
import Button from '../../atoms/button/Button';
import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
import PowerLevelSelector from '../power-level-selector/PowerLevelSelector';
import SettingTile from '../setting-tile/SettingTile';
import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
import { useForceUpdate } from '../../hooks/useForceUpdate';
const permissionsInfo = {
users_default: {
name: 'Default role',
description: 'Set default role for all members.',
default: 0,
},
events_default: {
name: 'Send messages',
description: 'Set minimum power level to send messages in room.',
default: 0,
},
'm.reaction': {
parent: 'events',
name: 'Send reactions',
description: 'Set minimum power level to send reactions in room.',
default: 0,
},
redact: {
name: 'Delete messages sent by others',
description: 'Set minimum power level to delete messages in room.',
default: 50,
},
notifications: {
name: 'Ping room',
description: 'Set minimum power level to ping room.',
default: {
room: 50,
},
},
'm.space.child': {
parent: 'events',
name: 'Manage rooms in space',
description: 'Set minimum power level to manage rooms in space.',
default: 50,
},
invite: {
name: 'Invite',
description: 'Set minimum power level to invite members.',
default: 50,
},
kick: {
name: 'Kick',
description: 'Set minimum power level to kick members.',
default: 50,
},
ban: {
name: 'Ban',
description: 'Set minimum power level to ban members.',
default: 50,
},
'm.room.avatar': {
parent: 'events',
name: 'Change avatar',
description: 'Set minimum power level to change room/space avatar.',
default: 50,
},
'm.room.name': {
parent: 'events',
name: 'Change name',
description: 'Set minimum power level to change room/space name.',
default: 50,
},
'm.room.topic': {
parent: 'events',
name: 'Change topic',
description: 'Set minimum power level to change room/space topic.',
default: 50,
},
state_default: {
name: 'Change settings',
description: 'Set minimum power level to change settings.',
default: 50,
},
'm.room.canonical_alias': {
parent: 'events',
name: 'Change published address',
description: 'Set minimum power level to publish and set main address.',
default: 50,
},
'm.room.power_levels': {
parent: 'events',
name: 'Change permissions',
description: 'Set minimum power level to change permissions.',
default: 50,
},
'm.room.encryption': {
parent: 'events',
name: 'Enable room encryption',
description: 'Set minimum power level to enable room encryption.',
default: 50,
},
'm.room.history_visibility': {
parent: 'events',
name: 'Change history visibility',
description: 'Set minimum power level to change room messages history visibility.',
default: 50,
},
'm.room.tombstone': {
parent: 'events',
name: 'Upgrade room',
description: 'Set minimum power level to upgrade room.',
default: 50,
},
'm.room.pinned_events': {
parent: 'events',
name: 'Pin messages',
description: 'Set minimum power level to pin messages in room.',
default: 50,
},
'm.room.server_acl': {
parent: 'events',
name: 'Change server ACLs',
description: 'Set minimum power level to change server ACLs.',
default: 50,
},
'im.vector.modular.widgets': {
parent: 'events',
name: 'Modify widgets',
description: 'Set minimum power level to modify room widgets.',
default: 50,
},
};
const roomPermsGroups = {
'General Permissions': ['users_default', 'events_default', 'm.reaction', 'redact', 'notifications'],
'Manage members permissions': ['invite', 'kick', 'ban'],
'Room profile permissions': ['m.room.avatar', 'm.room.name', 'm.room.topic'],
'Settings permissions': ['state_default', 'm.room.canonical_alias', 'm.room.power_levels', 'm.room.encryption', 'm.room.history_visibility'],
'Other permissions': ['m.room.tombstone', 'm.room.pinned_events', 'm.room.server_acl', 'im.vector.modular.widgets'],
};
const spacePermsGroups = {
'General Permissions': ['users_default', 'm.space.child'],
'Manage members permissions': ['invite', 'kick', 'ban'],
'Space profile permissions': ['m.room.avatar', 'm.room.name', 'm.room.topic'],
'Settings permissions': ['state_default', 'm.room.canonical_alias', 'm.room.power_levels'],
};
function useRoomStateUpdate(roomId) {
const [, forceUpdate] = useForceUpdate();
const mx = initMatrix.matrixClient;
useEffect(() => {
const handleStateEvent = (event) => {
if (event.getRoomId() !== roomId) return;
forceUpdate();
};
mx.on('RoomState.events', handleStateEvent);
return () => {
mx.removeListener('RoomState.events', handleStateEvent);
};
}, [roomId]);
}
function RoomPermissions({ roomId }) {
useRoomStateUpdate(roomId);
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const pLEvent = room.currentState.getStateEvents('m.room.power_levels')[0];
const permissions = pLEvent.getContent();
const canChangePermission = room.currentState.maySendStateEvent('m.room.power_levels', mx.getUserId());
const handlePowerSelector = (e, permKey, parentKey, powerLevel) => {
const handlePowerLevelChange = (newPowerLevel) => {
if (powerLevel === newPowerLevel) return;
const newPermissions = { ...permissions };
if (parentKey) {
newPermissions[parentKey] = {
...permissions[parentKey],
[permKey]: newPowerLevel,
};
} else if (permKey === 'notifications') {
newPermissions[permKey] = {
...permissions[permKey],
room: newPowerLevel,
};
} else {
newPermissions[permKey] = newPowerLevel;
}
mx.sendStateEvent(roomId, 'm.room.power_levels', newPermissions);
};
openReusableContextMenu(
'bottom',
getEventCords(e, '.btn-surface'),
(closeMenu) => (
<PowerLevelSelector
value={powerLevel}
max={100}
onSelect={(pl) => {
closeMenu();
handlePowerLevelChange(pl);
}}
/>
),
);
};
const permsGroups = room.isSpaceRoom() ? spacePermsGroups : roomPermsGroups;
return (
<div className="room-permissions">
{
Object.keys(permsGroups).map((groupKey) => {
const groupedPermKeys = permsGroups[groupKey];
return (
<div className="room-permissions__card" key={groupKey}>
<MenuHeader>{groupKey}</MenuHeader>
{
groupedPermKeys.map((permKey) => {
const permInfo = permissionsInfo[permKey];
let powerLevel = 0;
let permValue = permInfo.parent
? permissions[permInfo.parent]?.[permKey]
: permissions[permKey];
if (!permValue) permValue = permInfo.default;
if (typeof permValue === 'number') {
powerLevel = permValue;
} else if (permKey === 'notifications') {
powerLevel = permValue.room || 50;
}
return (
<SettingTile
key={permKey}
title={permInfo.name}
content={<Text variant="b3">{permInfo.description}</Text>}
options={(
<Button
onClick={
canChangePermission
? (e) => handlePowerSelector(e, permKey, permInfo.parent, powerLevel)
: null
}
iconSrc={canChangePermission ? ChevronBottomIC : null}
>
<Text variant="b2">
{`${getPowerLabel(powerLevel) || 'Member'} - ${powerLevel}`}
</Text>
</Button>
)}
/>
);
})
}
</div>
);
})
}
</div>
);
}
RoomPermissions.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomPermissions;

View File

@@ -0,0 +1,11 @@
.room-permissions {
& .setting-tile {
margin: 0 var(--sp-normal);
margin-top: var(--sp-tight);
padding-bottom: var(--sp-tight);
border-bottom: 1px solid var(--bg-surface-border);
&:last-child {
border-bottom: none;
}
}
}

View File

@@ -0,0 +1,185 @@
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import './RoomProfile.scss';
import { twemojify } from '../../../util/twemojify';
import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import colorMXID from '../../../util/colorMXID';
import Text from '../../atoms/text/Text';
import Avatar from '../../atoms/avatar/Avatar';
import Button from '../../atoms/button/Button';
import Input from '../../atoms/input/Input';
import IconButton from '../../atoms/button/IconButton';
import ImageUpload from '../image-upload/ImageUpload';
import PencilIC from '../../../../public/res/ic/outlined/pencil.svg';
import { useStore } from '../../hooks/useStore';
import { useForceUpdate } from '../../hooks/useForceUpdate';
function RoomProfile({ roomId }) {
const isMountStore = useStore();
const [isEditing, setIsEditing] = useState(false);
const [, forceUpdate] = useForceUpdate();
const [status, setStatus] = useState({
msg: null,
type: cons.status.PRE_FLIGHT,
});
const mx = initMatrix.matrixClient;
const isDM = initMatrix.roomList.directs.has(roomId);
let avatarSrc = mx.getRoom(roomId).getAvatarUrl(mx.baseUrl, 36, 36, 'crop');
avatarSrc = isDM ? mx.getRoom(roomId).getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 36, 36, 'crop') : avatarSrc;
const room = mx.getRoom(roomId);
const { currentState } = room;
const roomName = room.name;
const roomTopic = currentState.getStateEvents('m.room.topic')[0]?.getContent().topic;
const userId = mx.getUserId();
const canChangeAvatar = currentState.maySendStateEvent('m.room.avatar', userId);
const canChangeName = currentState.maySendStateEvent('m.room.name', userId);
const canChangeTopic = currentState.maySendStateEvent('m.room.topic', userId);
useEffect(() => {
isMountStore.setItem(true);
const { roomList } = initMatrix;
const handleProfileUpdate = (rId) => {
if (roomId !== rId) return;
forceUpdate();
};
roomList.on(cons.events.roomList.ROOM_PROFILE_UPDATED, handleProfileUpdate);
return () => {
roomList.removeListener(cons.events.roomList.ROOM_PROFILE_UPDATED, handleProfileUpdate);
isMountStore.setItem(false);
setStatus({
msg: null,
type: cons.status.PRE_FLIGHT,
});
setIsEditing(false);
};
}, [roomId]);
const handleOnSubmit = async (e) => {
e.preventDefault();
const { target } = e;
const roomNameInput = target.elements['room-name'];
const roomTopicInput = target.elements['room-topic'];
try {
if (canChangeName) {
const newName = roomNameInput.value;
if (newName !== roomName && roomName.trim() !== '') {
setStatus({
msg: 'Saving room name...',
type: cons.status.IN_FLIGHT,
});
await mx.setRoomName(roomId, newName);
}
}
if (canChangeTopic) {
const newTopic = roomTopicInput.value;
if (newTopic !== roomTopic) {
if (isMountStore.getItem()) {
setStatus({
msg: 'Saving room topic...',
type: cons.status.IN_FLIGHT,
});
}
await mx.setRoomTopic(roomId, newTopic);
}
}
if (!isMountStore.getItem()) return;
setStatus({
msg: 'Saved successfully',
type: cons.status.SUCCESS,
});
} catch (err) {
if (!isMountStore.getItem()) return;
setStatus({
msg: err.message || 'Unable to save.',
type: cons.status.ERROR,
});
}
};
const handleCancelEditing = () => {
setStatus({
msg: null,
type: cons.status.PRE_FLIGHT,
});
setIsEditing(false);
};
const handleAvatarUpload = async (url) => {
if (url === null) {
if (confirm('Are you sure you want to remove avatar?')) {
await mx.sendStateEvent(roomId, 'm.room.avatar', { url }, '');
}
} else await mx.sendStateEvent(roomId, 'm.room.avatar', { url }, '');
};
const renderEditNameAndTopic = () => (
<form className="room-profile__edit-form" onSubmit={handleOnSubmit}>
{canChangeName && <Input value={roomName} name="room-name" disabled={status.type === cons.status.IN_FLIGHT} label="Name" required />}
{canChangeTopic && <Input value={roomTopic} name="room-topic" disabled={status.type === cons.status.IN_FLIGHT} minHeight={100} resizable label="Topic" />}
{(!canChangeName || !canChangeTopic) && <Text variant="b3">{`You have permission to change ${room.isSpaceRoom() ? 'space' : 'room'} ${canChangeName ? 'name' : 'topic'} only.`}</Text>}
{ status.type === cons.status.IN_FLIGHT && <Text variant="b2">{status.msg}</Text>}
{ status.type === cons.status.SUCCESS && <Text style={{ color: 'var(--tc-positive-high)' }} variant="b2">{status.msg}</Text>}
{ status.type === cons.status.ERROR && <Text style={{ color: 'var(--tc-danger-high)' }} variant="b2">{status.msg}</Text>}
{ status.type !== cons.status.IN_FLIGHT && (
<div>
<Button type="submit" variant="primary">Save</Button>
<Button onClick={handleCancelEditing}>Cancel</Button>
</div>
)}
</form>
);
const renderNameAndTopic = () => (
<div className="room-profile__display" style={{ marginBottom: avatarSrc && canChangeAvatar ? '24px' : '0' }}>
<div>
<Text variant="h2" weight="medium" primary>{twemojify(roomName)}</Text>
{ (canChangeName || canChangeTopic) && (
<IconButton
src={PencilIC}
size="extra-small"
tooltip="Edit"
onClick={() => setIsEditing(true)}
/>
)}
</div>
<Text variant="b3">{room.getCanonicalAlias() || room.roomId}</Text>
{roomTopic && <Text variant="b2">{twemojify(roomTopic, undefined, true)}</Text>}
</div>
);
return (
<div className="room-profile">
<div className="room-profile__content">
{ !canChangeAvatar && <Avatar imageSrc={avatarSrc} text={roomName} bgColor={colorMXID(roomId)} size="large" />}
{ canChangeAvatar && (
<ImageUpload
text={roomName}
bgColor={colorMXID(roomId)}
imageSrc={avatarSrc}
onUpload={handleAvatarUpload}
onRequestRemove={() => handleAvatarUpload(null)}
/>
)}
{!isEditing && renderNameAndTopic()}
{isEditing && renderEditNameAndTopic()}
</div>
</div>
);
}
RoomProfile.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomProfile;

View File

@@ -0,0 +1,53 @@
@use '../../partials/flex';
@use '../../partials/dir';
.room-profile {
&__content {
@extend .cp-fx__row;
& .avatar-container {
min-width: var(--av-large);
}
}
&__display {
align-self: flex-end;
@include dir.side(margin, var(--sp-loose), 0);
& > div:first-child {
@extend .cp-fx__row--s-c;
& > .text {
@include dir.side(margin, 0, var(--sp-extra-tight));
}
}
& > *:not(:first-child) {
margin-top: var(--sp-ultra-tight);
white-space: pre-wrap;
word-break: break-word;
}
}
&__edit-form {
@extend .cp-fx__item-one;
@include dir.side(margin, var(--sp-loose), 0);
& .input-container {
margin-bottom: var(--sp-extra-tight);
}
& > .text {
margin-bottom: var(--sp-tight);
}
& > *:last-child {
@extend .cp-fx__item-one;
@extend .cp-fx__row;
margin-top: var(--sp-tight);
.btn-primary {
@include dir.side(margin, 0, var(--sp-tight));
}
}
}
}

View File

@@ -0,0 +1,202 @@
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import './RoomSearch.scss';
import dateFormat from 'dateformat';
import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import { selectRoom } from '../../../client/action/navigation';
import Text from '../../atoms/text/Text';
import RawIcon from '../../atoms/system-icons/RawIcon';
import Button from '../../atoms/button/Button';
import Input from '../../atoms/input/Input';
import Spinner from '../../atoms/spinner/Spinner';
import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
import { Message } from '../message/Message';
import SearchIC from '../../../../public/res/ic/outlined/search.svg';
import { useStore } from '../../hooks/useStore';
const roomIdToBackup = new Map();
function useRoomSearch(roomId) {
const [searchData, setSearchData] = useState(roomIdToBackup.get(roomId) ?? null);
const [status, setStatus] = useState({
type: cons.status.PRE_FLIGHT,
term: null,
});
const mountStore = useStore(roomId);
const mx = initMatrix.matrixClient;
useEffect(() => mountStore.setItem(true), [roomId]);
useEffect(() => {
if (searchData?.results?.length > 0) {
roomIdToBackup.set(roomId, searchData);
} else {
roomIdToBackup.delete(roomId);
}
}, [searchData]);
const search = async (term) => {
setSearchData(null);
if (term === '') {
setStatus({ type: cons.status.PRE_FLIGHT, term: null });
return;
}
setStatus({ type: cons.status.IN_FLIGHT, term });
const body = {
search_categories: {
room_events: {
search_term: term,
filter: {
limit: 10,
rooms: [roomId],
},
order_by: 'recent',
event_context: {
before_limit: 0,
after_limit: 0,
include_profile: true,
},
},
},
};
try {
const res = await mx.search({ body });
const data = mx.processRoomEventsSearch({
_query: body,
results: [],
highlights: [],
}, res);
if (!mountStore.getItem()) return;
setStatus({ type: cons.status.SUCCESS, term });
setSearchData(data);
if (!mountStore.getItem()) return;
} catch (error) {
setSearchData(null);
setStatus({ type: cons.status.ERROR, term });
}
};
const paginate = async () => {
if (searchData === null) return;
const term = searchData._query.search_categories.room_events.search_term;
setStatus({ type: cons.status.IN_FLIGHT, term });
try {
const data = await mx.backPaginateRoomEventsSearch(searchData);
if (!mountStore.getItem()) return;
setStatus({ type: cons.status.SUCCESS, term });
setSearchData(data);
} catch (error) {
if (!mountStore.getItem()) return;
setSearchData(null);
setStatus({ type: cons.status.ERROR, term });
}
};
return [searchData, search, paginate, status];
}
function RoomSearch({ roomId }) {
const [searchData, search, paginate, status] = useRoomSearch(roomId);
const mx = initMatrix.matrixClient;
const isRoomEncrypted = mx.isRoomEncrypted(roomId);
const searchTerm = searchData?._query.search_categories.room_events.search_term ?? '';
const handleSearch = (e) => {
e.preventDefault();
if (isRoomEncrypted) return;
const searchTermInput = e.target.elements['room-search-input'];
const term = searchTermInput.value.trim();
search(term);
};
const renderTimeline = (timeline) => (
<div className="room-search__result-item" key={timeline[0].getId()}>
{ timeline.map((mEvent) => {
const time = dateFormat(mEvent.getDate(), 'dd/mm/yyyy - hh:MM TT');
const id = mEvent.getId();
return (
<React.Fragment key={id}>
<Message
mEvent={mEvent}
isBodyOnly={false}
time={time}
/>
<Button onClick={() => selectRoom(roomId, id)}>View</Button>
</React.Fragment>
);
})}
</div>
);
return (
<div className="room-search">
<form className="room-search__form" onSubmit={handleSearch}>
<MenuHeader>Room search</MenuHeader>
<div>
<Input
placeholder="Search for keywords"
name="room-search-input"
disabled={isRoomEncrypted}
autoFocus
/>
<Button iconSrc={SearchIC} variant="primary" type="submit">Search</Button>
</div>
{searchData?.results.length > 0 && (
<Text>{`${searchData.count} results for "${searchTerm}"`}</Text>
)}
{!isRoomEncrypted && searchData === null && (
<div className="room-search__help">
{status.type === cons.status.IN_FLIGHT && <Spinner />}
{status.type === cons.status.IN_FLIGHT && <Text>Searching room messages...</Text>}
{status.type === cons.status.PRE_FLIGHT && <RawIcon src={SearchIC} size="large" />}
{status.type === cons.status.PRE_FLIGHT && <Text>Search room messages</Text>}
{status.type === cons.status.ERROR && <Text>Failed to search messages</Text>}
</div>
)}
{!isRoomEncrypted && searchData?.results.length === 0 && (
<div className="room-search__help">
<Text>No results found</Text>
</div>
)}
{isRoomEncrypted && (
<div className="room-search__help">
<Text>Search does not work in encrypted room</Text>
</div>
)}
</form>
{searchData?.results.length > 0 && (
<>
<div className="room-search__content">
{searchData.results.map((searchResult) => {
const { timeline } = searchResult.context;
return renderTimeline(timeline);
})}
</div>
{searchData?.next_batch && (
<div className="room-search__more">
{status.type !== cons.status.IN_FLIGHT && (
<Button onClick={paginate}>Load more</Button>
)}
{status.type === cons.status.IN_FLIGHT && <Spinner />}
</div>
)}
</>
)}
</div>
);
}
RoomSearch.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomSearch;

View File

@@ -0,0 +1,62 @@
@use '../../partials/flex';
@use '../../partials/dir';
.room-search {
&__form {
& div:nth-child(2) {
display: flex;
align-items: flex-end;
padding: var(--sp-normal);;
& .input-container {
@extend .cp-fx__item-one;
@include dir.side(margin, 0, var(--sp-normal));
}
& button {
height: 46px;
}
}
& .context-menu__header {
margin-bottom: 0;
}
& > .text {
padding: 0 var(--sp-normal) var(--sp-tight);
}
}
&__help {
height: 248px;
@extend .cp-fx__column--c-c;
& .ic-raw {
opacity: .5;
}
.text {
margin-top: var(--sp-normal);
}
}
&__more {
margin-bottom: var(--sp-normal);
@extend .cp-fx__row--c-c;
button {
width: 100%;
}
}
&__result-item {
padding: var(--sp-tight) var(--sp-normal);
display: flex;
align-items: flex-start;
.message {
@include dir.side(margin, 0, var(--sp-normal));
@extend .cp-fx__item-one;
padding: 0;
&:hover {
background-color: transparent;
}
& .message__time {
flex: 0;
}
}
}
}

View File

@@ -11,7 +11,8 @@ import NotificationBadge from '../../atoms/badge/NotificationBadge';
import { blurOnBubbling } from '../../atoms/button/script';
function RoomSelectorWrapper({
isSelected, isUnread, onClick, content, options,
isSelected, isUnread, onClick,
content, options, onContextMenu,
}) {
let myClass = isUnread ? ' room-selector--unread' : '';
myClass += isSelected ? ' room-selector--selected' : '';
@@ -21,7 +22,8 @@ function RoomSelectorWrapper({
className="room-selector__content"
type="button"
onClick={onClick}
onMouseUp={(e) => blurOnBubbling(e, '.room-selector')}
onMouseUp={(e) => blurOnBubbling(e, '.room-selector__content')}
onContextMenu={onContextMenu}
>
{content}
</button>
@@ -31,6 +33,7 @@ function RoomSelectorWrapper({
}
RoomSelectorWrapper.defaultProps = {
options: null,
onContextMenu: null,
};
RoomSelectorWrapper.propTypes = {
isSelected: PropTypes.bool.isRequired,
@@ -38,12 +41,13 @@ RoomSelectorWrapper.propTypes = {
onClick: PropTypes.func.isRequired,
content: PropTypes.node.isRequired,
options: PropTypes.node,
onContextMenu: PropTypes.func,
};
function RoomSelector({
name, parentName, roomId, imageSrc, iconSrc,
isSelected, isUnread, notificationCount, isAlert,
options, onClick,
options, onClick, onContextMenu,
}) {
return (
<RoomSelectorWrapper
@@ -78,6 +82,7 @@ function RoomSelector({
)}
options={options}
onClick={onClick}
onContextMenu={onContextMenu}
/>
);
}
@@ -87,6 +92,7 @@ RoomSelector.defaultProps = {
imageSrc: null,
iconSrc: null,
options: null,
onContextMenu: null,
};
RoomSelector.propTypes = {
name: PropTypes.string.isRequired,
@@ -103,6 +109,7 @@ RoomSelector.propTypes = {
isAlert: PropTypes.bool.isRequired,
options: PropTypes.node,
onClick: PropTypes.func.isRequired,
onContextMenu: PropTypes.func,
};
export default RoomSelector;

View File

@@ -0,0 +1,121 @@
import React, { useState, useEffect, useCallback } from 'react';
import PropTypes from 'prop-types';
import './RoomVisibility.scss';
import initMatrix from '../../../client/initMatrix';
import Text from '../../atoms/text/Text';
import RadioButton from '../../atoms/button/RadioButton';
import { MenuItem } from '../../atoms/context-menu/ContextMenu';
import HashIC from '../../../../public/res/ic/outlined/hash.svg';
import HashLockIC from '../../../../public/res/ic/outlined/hash-lock.svg';
import HashGlobeIC from '../../../../public/res/ic/outlined/hash-globe.svg';
import SpaceIC from '../../../../public/res/ic/outlined/space.svg';
import SpaceLockIC from '../../../../public/res/ic/outlined/space-lock.svg';
import SpaceGlobeIC from '../../../../public/res/ic/outlined/space-globe.svg';
const visibility = {
INVITE: 'invite',
RESTRICTED: 'restricted',
PUBLIC: 'public',
};
function setJoinRule(roomId, type) {
const mx = initMatrix.matrixClient;
let allow;
if (type === visibility.RESTRICTED) {
const { currentState } = mx.getRoom(roomId);
const mEvent = currentState.getStateEvents('m.space.parent')[0];
if (!mEvent) return Promise.resolve(undefined);
allow = [{
room_id: mEvent.getStateKey(),
type: 'm.room_membership',
}];
}
return mx.sendStateEvent(
roomId,
'm.room.join_rules',
{
join_rule: type,
allow,
},
);
}
function useVisibility(roomId) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const [activeType, setActiveType] = useState(room.getJoinRule());
useEffect(() => setActiveType(room.getJoinRule()), [roomId]);
const setNotification = useCallback((item) => {
if (item.type === activeType.type) return;
setActiveType(item.type);
setJoinRule(roomId, item.type);
}, [activeType, roomId]);
return [activeType, setNotification];
}
function RoomVisibility({ roomId }) {
const [activeType, setVisibility] = useVisibility(roomId);
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const isSpace = room.isSpaceRoom();
const { currentState } = room;
const noSpaceParent = currentState.getStateEvents('m.space.parent').length === 0;
const mCreate = currentState.getStateEvents('m.room.create')[0]?.getContent();
const roomVersion = Number(mCreate.room_version);
const myPowerlevel = room.getMember(mx.getUserId())?.powerLevel || 0;
const canChange = room.currentState.hasSufficientPowerLevelFor('state_default', myPowerlevel);
const items = [{
iconSrc: isSpace ? SpaceLockIC : HashLockIC,
text: 'Private (invite only)',
type: visibility.INVITE,
unsupported: false,
}, {
iconSrc: isSpace ? SpaceIC : HashIC,
text: roomVersion < 8 ? 'Restricted (unsupported: required room upgrade)' : 'Restricted (space member can join)',
type: visibility.RESTRICTED,
unsupported: roomVersion < 8 || noSpaceParent,
}, {
iconSrc: isSpace ? SpaceGlobeIC : HashGlobeIC,
text: 'Public (anyone can join)',
type: visibility.PUBLIC,
unsupported: false,
}];
return (
<div className="room-visibility">
{
items.map((item) => (
<MenuItem
variant={activeType === item.type ? 'positive' : 'surface'}
key={item.type}
iconSrc={item.iconSrc}
onClick={() => setVisibility(item)}
disabled={(!canChange || item.unsupported)}
>
<Text varient="b1">
<span>{item.text}</span>
<RadioButton isActive={activeType === item.type} />
</Text>
</MenuItem>
))
}
</div>
);
}
RoomVisibility.propTypes = {
roomId: PropTypes.string.isRequired,
};
export default RoomVisibility;

View File

@@ -0,0 +1,19 @@
@use '../../partials/flex';
@use '../../partials/dir';
@use '../../partials/text';
.room-visibility {
& .context-menu__item .text {
@extend .cp-fx__item-one;
@extend .cp-fx__row--s-c;
& span:first-child {
@extend .cp-fx__item-one;
@extend .cp-txt__ellipsis;
}
& .radio-btn {
@include dir.side(margin, var(--sp-tight), 0);
}
}
}

View File

@@ -7,13 +7,13 @@ import Text from '../../atoms/text/Text';
function SettingTile({ title, options, content }) {
return (
<div className="setting-tile">
<div className="setting-tile__title__wrapper">
<div className="setting-tile__content">
<div className="setting-tile__title">
<Text variant="b1">{title}</Text>
</div>
{options !== null && <div className="setting-tile__options">{options}</div>}
{content}
</div>
{content !== null && <div className="setting-tile__content">{content}</div>}
{options !== null && <div className="setting-tile__options">{options}</div>}
</div>
);
}

Some files were not shown because too many files have changed in this diff Show More