Merge pull request #662 from robintown/matryoshka-rageshake
Make rageshake requests work in matryoshka mode
This commit is contained in:
		
				commit
				
					
						97c294687e
					
				
			
		
					 3 changed files with 6 additions and 3 deletions
				
			
		| 
						 | 
					@ -44,7 +44,7 @@
 | 
				
			||||||
    "i18next": "^21.10.0",
 | 
					    "i18next": "^21.10.0",
 | 
				
			||||||
    "i18next-browser-languagedetector": "^6.1.8",
 | 
					    "i18next-browser-languagedetector": "^6.1.8",
 | 
				
			||||||
    "i18next-http-backend": "^1.4.4",
 | 
					    "i18next-http-backend": "^1.4.4",
 | 
				
			||||||
    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#1666419beaf08cafefdc34cced417cb0ba120b2e",
 | 
					    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#35f697a04bcbbd20f234531e561997d7f46be762",
 | 
				
			||||||
    "matrix-widget-api": "^1.0.0",
 | 
					    "matrix-widget-api": "^1.0.0",
 | 
				
			||||||
    "mermaid": "^8.13.8",
 | 
					    "mermaid": "^8.13.8",
 | 
				
			||||||
    "normalize.css": "^8.0.1",
 | 
					    "normalize.css": "^8.0.1",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -108,6 +108,7 @@ export const widget: WidgetHelpers | null = (() => {
 | 
				
			||||||
      if (!baseUrl) throw new Error("Base URL must be supplied");
 | 
					      if (!baseUrl) throw new Error("Base URL must be supplied");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      // These are all the event types the app uses
 | 
					      // These are all the event types the app uses
 | 
				
			||||||
 | 
					      const sendRecvEvent = ["org.matrix.rageshake_request"];
 | 
				
			||||||
      const sendState = [
 | 
					      const sendState = [
 | 
				
			||||||
        { eventType: EventType.GroupCallPrefix },
 | 
					        { eventType: EventType.GroupCallPrefix },
 | 
				
			||||||
        { eventType: EventType.GroupCallMemberPrefix, stateKey: userId },
 | 
					        { eventType: EventType.GroupCallMemberPrefix, stateKey: userId },
 | 
				
			||||||
| 
						 | 
					@ -133,6 +134,8 @@ export const widget: WidgetHelpers | null = (() => {
 | 
				
			||||||
      const client = createRoomWidgetClient(
 | 
					      const client = createRoomWidgetClient(
 | 
				
			||||||
        api,
 | 
					        api,
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
					          sendEvent: sendRecvEvent,
 | 
				
			||||||
 | 
					          receiveEvent: sendRecvEvent,
 | 
				
			||||||
          sendState,
 | 
					          sendState,
 | 
				
			||||||
          receiveState,
 | 
					          receiveState,
 | 
				
			||||||
          sendToDevice: sendRecvToDevice,
 | 
					          sendToDevice: sendRecvToDevice,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -8728,9 +8728,9 @@ matrix-events-sdk@^0.0.1-beta.7:
 | 
				
			||||||
  resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
 | 
					  resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
 | 
				
			||||||
  integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
 | 
					  integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
 | 
				
			||||||
 | 
					
 | 
				
			||||||
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#1666419beaf08cafefdc34cced417cb0ba120b2e":
 | 
					"matrix-js-sdk@github:matrix-org/matrix-js-sdk#35f697a04bcbbd20f234531e561997d7f46be762":
 | 
				
			||||||
  version "20.1.0"
 | 
					  version "20.1.0"
 | 
				
			||||||
  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1666419beaf08cafefdc34cced417cb0ba120b2e"
 | 
					  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/35f697a04bcbbd20f234531e561997d7f46be762"
 | 
				
			||||||
  dependencies:
 | 
					  dependencies:
 | 
				
			||||||
    "@babel/runtime" "^7.12.5"
 | 
					    "@babel/runtime" "^7.12.5"
 | 
				
			||||||
    "@types/sdp-transform" "^2.4.5"
 | 
					    "@types/sdp-transform" "^2.4.5"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue