michael/cinny
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' into feat/key-backup

Browse source
This commit is contained in:
Ajay Bura 2022-04-16 21:29:52 +05:30
commit 5c4b843b49
5 changed files with 603 additions and 870 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/prod-deploy.yml vendored
View file

@ -44,7 +44,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Extract metadata (tags, labels) for Docker - name: Extract metadata (tags, labels) for Docker
id: meta id: meta
uses: docker/metadata-action@v3.6.2 uses: docker/metadata-action@v3.7.0
with: with:
images: ajbura/cinny images: ajbura/cinny
- name: Build and push Docker image - name: Build and push Docker image

1446
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

20
package.json
View file

@ -28,7 +28,7 @@
"formik": "^2.2.9", "formik": "^2.2.9",
"html-react-parser": "^1.4.9", "html-react-parser": "^1.4.9",
"linkifyjs": "^2.1.9", "linkifyjs": "^2.1.9",
"matrix-js-sdk": "^16.0.1", "matrix-js-sdk": "^17.0.0",
"micromark": "^3.0.10", "micromark": "^3.0.10",
"micromark-extension-gfm": "^2.0.1", "micromark-extension-gfm": "^2.0.1",
"micromark-util-chunked": "^1.0.0", "micromark-util-chunked": "^1.0.0",
@ -37,17 +37,17 @@
"prop-types": "^15.8.1", "prop-types": "^15.8.1",
"react": "^17.0.2", "react": "^17.0.2",
"react-autosize-textarea": "^7.1.0", "react-autosize-textarea": "^7.1.0",
"react-dnd": "^15.1.1", "react-dnd": "^15.1.2",
"react-dnd-html5-backend": "^15.1.2", "react-dnd-html5-backend": "^15.1.3",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-google-recaptcha": "^2.1.0", "react-google-recaptcha": "^2.1.0",
"react-modal": "^3.14.4", "react-modal": "^3.14.4",
"sanitize-html": "^2.7.0", "sanitize-html": "^2.7.0",
"tippy.js": "^6.3.7", "tippy.js": "^6.3.7",
"twemoji": "^14.0.1" "twemoji": "^14.0.2"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.17.8", "@babel/core": "^7.17.9",
"@babel/preset-env": "^7.16.11", "@babel/preset-env": "^7.16.11",
"@babel/preset-react": "^7.16.7", "@babel/preset-react": "^7.16.7",
"assert": "^2.0.0", "assert": "^2.0.0",
@ -59,9 +59,9 @@
"crypto-browserify": "^3.12.0", "crypto-browserify": "^3.12.0",
"css-loader": "^6.7.1", "css-loader": "^6.7.1",
"css-minimizer-webpack-plugin": "^3.4.1", "css-minimizer-webpack-plugin": "^3.4.1",
"eslint": "^8.12.0", "eslint": "^8.13.0",
"eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb": "^19.0.4",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.29.4", "eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.2.0", "eslint-plugin-react-hooks": "^4.2.0",
@ -71,15 +71,15 @@
"html-webpack-plugin": "^5.3.1", "html-webpack-plugin": "^5.3.1",
"mini-css-extract-plugin": "^2.6.0", "mini-css-extract-plugin": "^2.6.0",
"path-browserify": "^1.0.1", "path-browserify": "^1.0.1",
"sass": "^1.49.9", "sass": "^1.50.0",
"sass-loader": "^12.6.0", "sass-loader": "^12.6.0",
"stream-browserify": "^3.0.0", "stream-browserify": "^3.0.0",
"style-loader": "^3.3.1", "style-loader": "^3.3.1",
"url": "^0.11.0", "url": "^0.11.0",
"util": "^0.12.4", "util": "^0.12.4",
"webpack": "^5.70.0", "webpack": "^5.72.0",
"webpack-cli": "^4.9.2", "webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.7.4", "webpack-dev-server": "^4.8.1",
"webpack-merge": "^5.7.3" "webpack-merge": "^5.7.3"
} }
} }

3
src/app/molecules/room-permissions/RoomPermissions.jsx
View file

@ -179,6 +179,7 @@ function RoomPermissions({ roomId }) {
const pLEvent = room.currentState.getStateEvents('m.room.power_levels')[0]; const pLEvent = room.currentState.getStateEvents('m.room.power_levels')[0];
const permissions = pLEvent.getContent(); const permissions = pLEvent.getContent();
const canChangePermission = room.currentState.maySendStateEvent('m.room.power_levels', mx.getUserId()); const canChangePermission = room.currentState.maySendStateEvent('m.room.power_levels', mx.getUserId());
const myPowerLevel = room.getMember(mx.getUserId())?.powerLevel ?? 100;
const handlePowerSelector = (e, permKey, parentKey, powerLevel) => { const handlePowerSelector = (e, permKey, parentKey, powerLevel) => {
const handlePowerLevelChange = (newPowerLevel) => { const handlePowerLevelChange = (newPowerLevel) => {
@ -208,7 +209,7 @@ function RoomPermissions({ roomId }) {
(closeMenu) => ( (closeMenu) => (
<PowerLevelSelector <PowerLevelSelector
value={powerLevel} value={powerLevel}
max={100} max={myPowerLevel}
onSelect={(pl) => { onSelect={(pl) => {
closeMenu(); closeMenu();
handlePowerLevelChange(pl); handlePowerLevelChange(pl);

2
src/client/state/RoomList.js
View file

@ -206,7 +206,7 @@ class RoomList extends EventEmitter {
this.matrixClient.getRooms().forEach((room) => { this.matrixClient.getRooms().forEach((room) => {
const { roomId } = room; const { roomId } = room;
const tombstone = room.currentState.events.get('m.room.tombstone'); const tombstone = room.currentState.events.get('m.room.tombstone');
if (typeof tombstone !== 'undefined') { if (tombstone?.get('') !== undefined) {
const repRoomId = tombstone.get('').getContent().replacement_room; const repRoomId = tombstone.get('').getContent().replacement_room;
const repRoomMembership = this.matrixClient.getRoom(repRoomId)?.getMyMembership(); const repRoomMembership = this.matrixClient.getRoom(repRoomId)?.getMyMembership();
if (repRoomMembership === 'join') return; if (repRoomMembership === 'join') return;