Don't urlencode event types just yet so older HSes don't 500.

Skip the tests which test for urlencoding, and add a TODO
in matrixService.

2 files changed, 5 insertions, 3 deletions

diff --git a/syweb/webclient/components/matrix/matrix-service.js b/syweb/webclient/components/matrix/matrix-service.js

index e1e5b88b3e..8ff2999e2d 100644
--- a/syweb/webclient/components/matrix/matrix-service.js
+++ b/syweb/webclient/components/matrix/matrix-service.js
@@ -375,7 +375,9 @@ angular.module('matrixService', [])
         
         
         sendStateEvent: function(room_id, eventType, content, state_key) {
-            var path = "/rooms/$room_id/state/"+ encodeURIComponent(eventType);
+            var path = "/rooms/$room_id/state/"+ eventType;
+            // TODO: uncomment this when matrix.org is updated, else all state events 500.
+            // var path = "/rooms/$room_id/state/"+ encodeURIComponent(eventType);
             if (state_key !== undefined) {
                 path += "/" + encodeURIComponent(state_key);
             }
diff --git a/syweb/webclient/test/unit/matrix-service.spec.js b/syweb/webclient/test/unit/matrix-service.spec.js

index b54163a641..ed290f2ff3 100644
--- a/syweb/webclient/test/unit/matrix-service.spec.js
+++ b/syweb/webclient/test/unit/matrix-service.spec.js
@@ -231,7 +231,7 @@ describe('MatrixService', function() {
         httpBackend.flush();
     }));
     
-    it('should be able to send generic state events without a state key', inject(
+    xit('should be able to send generic state events without a state key', inject(
     function(matrixService) {
         matrixService.setConfig({
             access_token: "foobar",
@@ -255,7 +255,7 @@ describe('MatrixService', function() {
         httpBackend.flush();
     }));
     
-    it('should be able to send generic state events with a state key', inject(
+    xit('should be able to send generic state events with a state key', inject(
     function(matrixService) {
         matrixService.setConfig({
             access_token: "foobar",