Merge pull request #911 from matrix-org/jryans/aggregations

Redaction and change events for relations

.babelrc

@@ -1,6 +1,8 @@
 {
  "presets": ["es2015"],
  "plugins": [
+ "transform-class-properties",
+
  // this transforms async functions into generator functions, which
  // are then made to use the regenerator module by babel's
  // transform-regnerator plugin (which is enabled by es2015).

.eslintrc.js

@@ -14,6 +14,9 @@ module.exports = {
  es6: true,
  },
  extends: ["eslint:recommended", "google"],
+ plugins: [
+ "babel",
+ ],
  rules: {
  // rules we've always adhered to or now do
  "max-len": ["error", {
@@ -73,5 +76,10 @@ module.exports = {
  "asyncArrow": "always",
  }],
  "arrow-parens": "off",
+
+ // eslint's built in no-invalid-this rule breaks with class properties
+ "no-invalid-this": "off",
+ // so we replace it with a version that is class property aware
+ "babel/no-invalid-this": "error",
  }
 }

package.json

@@ -9,7 +9,7 @@
  "test:watch": "mocha --watch --compilers js:babel-core/register --recursive spec --colors",
  "test": "yarn test:build && yarn test:run",
  "check": "yarn test:build && _mocha --recursive specbuild --colors",
- "gendoc": "babel --no-babelrc -d .jsdocbuild src && jsdoc -r .jsdocbuild -P package.json -R README.md -d .jsdoc",
+ "gendoc": "babel --no-babelrc --plugins transform-class-properties -d .jsdocbuild src && jsdoc -r .jsdocbuild -P package.json -R README.md -d .jsdoc",
  "start": "yarn start:init && yarn start:watch",
  "start:watch": "babel -s -w --skip-initial-build -d lib src",
  "start:init": "babel -s -d lib src",
@@ -67,12 +67,14 @@
  "babel-cli": "^6.18.0",
  "babel-eslint": "^10.0.1",
  "babel-plugin-transform-async-to-bluebird": "^1.1.1",
+ "babel-plugin-transform-class-properties": "^6.24.1",
  "babel-plugin-transform-runtime": "^6.23.0",
  "babel-preset-es2015": "^6.18.0",
  "browserify": "^16.2.3",
  "browserify-shim": "^3.8.13",
  "eslint": "^5.12.0",
  "eslint-config-google": "^0.7.1",
+ "eslint-plugin-babel": "^5.3.0",
  "exorcist": "^0.4.0",
  "expect": "^1.20.2",
  "istanbul": "^0.4.5",

spec/integ/devicelist-integ-spec.js

@@ -87,7 +87,7 @@ describe("DeviceList management:", function() {
  }
 
  beforeEach(async function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
 
  // we create our own sessionStoreBackend so that we can use it for
  // another TestClient.

spec/integ/matrix-client-crypto.spec.js

@@ -405,7 +405,7 @@ describe("MatrixClient crypto", function() {
  }
 
  beforeEach(async function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
 
  aliTestClient = new TestClient(aliUserId, aliDeviceId, aliAccessToken);
  await aliTestClient.client.initCrypto();

spec/integ/matrix-client-event-emitter.spec.js

@@ -15,7 +15,7 @@ describe("MatrixClient events", function() {
  const selfAccessToken = "aseukfgwef";
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new HttpBackend();
  sdk.request(httpBackend.requestFn);
  client = sdk.createClient({

spec/integ/matrix-client-event-timeline.spec.js

@@ -102,7 +102,7 @@ describe("getEventTimeline support", function() {
  let client;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new HttpBackend();
  sdk.request(httpBackend.requestFn);
  });
@@ -227,7 +227,7 @@ describe("MatrixClient event timelines", function() {
  let httpBackend = null;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new HttpBackend();
  sdk.request(httpBackend.requestFn);
 

spec/integ/matrix-client-methods.spec.js

@@ -21,7 +21,7 @@ describe("MatrixClient", function() {
  const accessToken = "aseukfgwef";
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new HttpBackend();
  store = new MemoryStore();
 

spec/integ/matrix-client-opts.spec.js

@@ -58,7 +58,7 @@ describe("MatrixClient opts", function() {
  };
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new HttpBackend();
  });
 

spec/integ/matrix-client-retrying.spec.js

@@ -20,7 +20,7 @@ describe("MatrixClient retrying", function() {
  let room;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new HttpBackend();
  sdk.request(httpBackend.requestFn);
  scheduler = new sdk.MatrixScheduler();

spec/integ/matrix-client-room-timeline.spec.js

@@ -104,7 +104,7 @@ describe("MatrixClient room timelines", function() {
  }
 
  beforeEach(function(done) {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new HttpBackend();
  sdk.request(httpBackend.requestFn);
  client = sdk.createClient({

spec/integ/matrix-client-syncing.spec.js

@@ -23,7 +23,7 @@ describe("MatrixClient syncing", function() {
  const roomTwo = "!bar:localhost";
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new HttpBackend();
  sdk.request(httpBackend.requestFn);
  client = sdk.createClient({

spec/integ/megolm-integ.spec.js

@@ -282,7 +282,7 @@ describe("megolm", function() {
  }
 
  beforeEach(async function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
 
  aliceTestClient = new TestClient(
  "@alice:localhost", "xzcvb", "akjgkrgjs",

spec/unit/autodiscovery.spec.js

@@ -30,7 +30,7 @@ describe("AutoDiscovery", function() {
  let httpBackend = null;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  httpBackend = new MockHttpBackend();
  sdk.request(httpBackend.requestFn);
  });

spec/unit/content-repo.spec.js

@@ -9,7 +9,7 @@ describe("ContentRepo", function() {
  const baseUrl = "https://my.home.server";
 
  beforeEach(function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  });
 
  describe("getHttpUriForMxc", function() {

spec/unit/crypto/DeviceList.spec.js

@@ -59,7 +59,7 @@ describe('DeviceList', function() {
  let deviceLists = [];
 
  beforeEach(function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
 
  deviceLists = [];
 

spec/unit/crypto/algorithms/megolm.spec.js

@@ -31,7 +31,7 @@ describe("MegolmDecryption", function() {
  let mockBaseApis;
 
  beforeEach(async function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
 
  await Olm.init();
 

spec/unit/crypto/algorithms/olm.spec.js

@@ -53,7 +53,7 @@ describe("OlmDecryption", function() {
  let bobOlmDevice;
 
  beforeEach(async function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
 
  await global.Olm.init();
 

spec/unit/crypto/backup.spec.js

@@ -125,7 +125,7 @@ describe("MegolmBackup", function() {
  let megolmDecryption;
  beforeEach(async function() {
  await Olm.init();
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
 
  mockCrypto = testUtils.mock(Crypto, 'Crypto');
  mockCrypto.backupKey = new Olm.PkEncryption();

spec/unit/crypto/verification/util.js

@@ -29,7 +29,7 @@ export async function makeTestClients(userInfos, options) {
  for (const [deviceId, msg] of Object.entries(devMap)) {
  if (deviceId in clientMap[userId]) {
  const event = new MatrixEvent({
- sender: this.getUserId(), // eslint-disable-line no-invalid-this
+ sender: this.getUserId(), // eslint-disable-line babel/no-invalid-this
  type: type,
  content: msg,
  });

spec/unit/event-timeline.spec.js

@@ -18,7 +18,7 @@ describe("EventTimeline", function() {
  let timeline;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
 
  // XXX: this is a horrid hack; should use sinon or something instead to mock
  const timelineSet = { room: { roomId: roomId }};

spec/unit/event.spec.js

@@ -24,7 +24,7 @@ import Promise from 'bluebird';
 
 describe("MatrixEvent", () => {
  beforeEach(function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  });
 
  describe(".attemptDecryption", () => {

spec/unit/filter.spec.js

@@ -12,7 +12,7 @@ describe("Filter", function() {
  let filter;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  filter = new Filter(userId);
  });
 

spec/unit/interactive-auth.spec.js

@@ -35,7 +35,7 @@ class FakeClient {
 
 describe("InteractiveAuth", function() {
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  });
 
  it("should start an auth stage and complete it", function(done) {

spec/unit/matrix-client.spec.js

@@ -124,7 +124,7 @@ describe("MatrixClient", function() {
  }
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  clock = lolex.install();
  scheduler = [
  "getQueueForEvent", "queueEvent", "removeEventFromQueue",

spec/unit/realtime-callbacks.spec.js

@@ -15,7 +15,7 @@ describe("realtime-callbacks", function() {
  }
 
  beforeEach(function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  clock = lolex.install();
  const fakeDate = clock.Date;
  callbacks.setNow(fakeDate.now.bind(fakeDate));
@@ -56,8 +56,8 @@ describe("realtime-callbacks", function() {
  it("should set 'this' to the global object", function() {
  let passed = false;
  const callback = function() {
- expect(this).toBe(global); // eslint-disable-line no-invalid-this
- expect(this.console).toBeTruthy(); // eslint-disable-line no-invalid-this
+ expect(this).toBe(global); // eslint-disable-line babel/no-invalid-this
+ expect(this.console).toBeTruthy(); // eslint-disable-line babel/no-invalid-this
  passed = true;
  };
  callbacks.setTimeout(callback);

spec/unit/room-member.spec.js

@@ -14,7 +14,7 @@ describe("RoomMember", function() {
  let member;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  member = new RoomMember(roomId, userA);
  });
 

spec/unit/room-state.spec.js

@@ -17,7 +17,7 @@ describe("RoomState", function() {
  let state;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  state = new RoomState(roomId);
  state.setStateEvents([
  utils.mkMembership({ // userA joined

spec/unit/room.spec.js

@@ -19,7 +19,7 @@ describe("Room", function() {
  let room;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  room = new Room(roomId);
  // mock RoomStates
  room.oldState = room.getLiveTimeline()._startState =

spec/unit/scheduler.spec.js

@@ -26,7 +26,7 @@ describe("MatrixScheduler", function() {
  });
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  clock = lolex.install();
  scheduler = new MatrixScheduler(function(ev, attempts, err) {
  if (retryFn) {

spec/unit/sync-accumulator.spec.js

@@ -26,7 +26,7 @@ describe("SyncAccumulator", function() {
  let sa;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  sa = new SyncAccumulator({
  maxTimelineEntries: 10,
  });

spec/unit/timeline-window.spec.js

@@ -68,7 +68,7 @@ function createLinkedTimelines() {
 
 describe("TimelineIndex", function() {
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  });
 
  describe("minIndex", function() {
@@ -164,7 +164,7 @@ describe("TimelineWindow", function() {
  }
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  });
 
  describe("load", function() {

spec/unit/user.spec.js

@@ -11,7 +11,7 @@ describe("User", function() {
  let user;
 
  beforeEach(function() {
- utils.beforeEach(this); // eslint-disable-line no-invalid-this
+ utils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  user = new User(userId);
  });
 

spec/unit/utils.spec.js

@@ -7,7 +7,7 @@ import expect from 'expect';
 
 describe("utils", function() {
  beforeEach(function() {
- testUtils.beforeEach(this); // eslint-disable-line no-invalid-this
+ testUtils.beforeEach(this); // eslint-disable-line babel/no-invalid-this
  });
 
  describe("encodeParams", function() {

src/models/event-timeline-set.js

@@ -744,7 +744,12 @@ EventTimelineSet.prototype._aggregateRelations = function(event) {
  relationsWithEventType = relationsWithRelType[eventType] = new Relations(
  relationType,
  eventType,
+ this.room,
  );
+ const relatesToEvent = this.findEventById(relatesToEventId);
+ if (relatesToEvent) {
+ relatesToEvent.emit("Event.relationsCreated", relationType, eventType);
+ }
  }
 
  relationsWithEventType.addEvent(event);