Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

pass all viewmodel options to tile view models

Browse source
This commit is contained in:
Bruno Windels 2020-10-28 17:37:45 +01:00
parent d7ccdd3304
commit fe6e4464fd
4 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/domain/session/room/timeline/TimelineViewModel.js
View file

@ -43,7 +43,7 @@ export class TimelineViewModel extends ViewModel {
// once we support sending messages we could do
// timeline.entries.concat(timeline.pendingEvents)
// for an ObservableList that also contains local echos
this._tiles = new TilesCollection(timeline.entries, tilesCreator({room, ownUserId, platform: this.platform}));
this._tiles = new TilesCollection(timeline.entries, tilesCreator(this.childOptions({room, ownUserId})));
}
async load() {

11
src/domain/session/room/timeline/tiles/GapTile.js
View file

@ -18,22 +18,25 @@ import {SimpleTile} from "./SimpleTile.js";
import {UpdateAction} from "../UpdateAction.js";
export class GapTile extends SimpleTile {
constructor(options, timeline) {
constructor(options) {
super(options);
this._timeline = timeline;
this._loading = false;
this._error = null;
}
get _room() {
return this.getOption("room");
}
async fill() {
// prevent doing this twice
if (!this._loading) {
this._loading = true;
this.emitChange("isLoading");
try {
await this._timeline.fillGap(this._entry, 10);
await this._room.fillGap(this._entry, 10);
} catch (err) {
console.error(`timeline.fillGap(): ${err.message}:\n${err.stack}`);
console.error(`room.fillGap(): ${err.message}:\n${err.stack}`);
this._error = err;
this.emitChange("error");
// rethrow so caller of this method

9
src/domain/session/room/timeline/tiles/MessageTile.js
View file

@ -20,12 +20,19 @@ import {getIdentifierColorNumber, avatarInitials} from "../../../../avatar.js";
export class MessageTile extends SimpleTile {
constructor(options) {
super(options);
this._mediaRepository = options.mediaRepository;
this._isOwn = this._entry.sender === options.ownUserId;
this._date = this._entry.timestamp ? new Date(this._entry.timestamp) : null;
this._isContinuation = false;
}
get _room() {
return this.getOption("room");
}
get _mediaRepository() {
return this._room.mediaRepository;
}
get shape() {
return "message";
}

7
src/domain/session/room/timeline/tilesCreator.js
View file

@ -23,12 +23,11 @@ import {RoomMemberTile} from "./tiles/RoomMemberTile.js";
import {EncryptedEventTile} from "./tiles/EncryptedEventTile.js";
import {EncryptionEnabledTile} from "./tiles/EncryptionEnabledTile.js";
export function tilesCreator({room, ownUserId, platform}) {
export function tilesCreator(baseOptions) {
return function tilesCreator(entry, emitUpdate) {
const options = {entry, emitUpdate, ownUserId, platform,
mediaRepository: room.mediaRepository};
const options = Object.assign({entry, emitUpdate}, baseOptions);
if (entry.isGap) {
return new GapTile(options, room);
return new GapTile(options);
} else if (entry.eventType) {
switch (entry.eventType) {
case "m.room.message": {