FilePanel/EventIndex: Fix lint errors.

This commit is contained in:
Damir Jelić 2020-01-17 11:52:20 +01:00
parent 95b86b42d0
commit ccfe3c7e70
2 changed files with 16 additions and 17 deletions

View file

@ -64,7 +64,8 @@ const FilePanel = createReactClass({
// FIXME: we shouldn't be doing this every time we change room - see comment above. // FIXME: we shouldn't be doing this every time we change room - see comment above.
// TODO: Remove this stale comment? Which comment above? // TODO: Remove this stale comment? Which comment above?
const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId, filter) const filterId = await client.getOrCreateFilter("FILTER_FILES_" + client.credentials.userId,
filter);
filter.filterId = filterId; filter.filterId = filterId;
const timelineSet = room.getOrCreateFilteredTimelineSet(filter); const timelineSet = room.getOrCreateFilteredTimelineSet(filter);
@ -96,7 +97,7 @@ const FilePanel = createReactClass({
let timelineSet; let timelineSet;
try { try {
timelineSet = await this.fetchFileEventsServer(room) timelineSet = await this.fetchFileEventsServer(room);
if (client.isRoomEncrypted(roomId) && eventIndex !== null) { if (client.isRoomEncrypted(roomId) && eventIndex !== null) {
const timeline = timelineSet.getLiveTimeline(); const timeline = timelineSet.getLiveTimeline();
@ -104,7 +105,6 @@ const FilePanel = createReactClass({
} }
this.setState({ timelineSet: timelineSet }); this.setState({ timelineSet: timelineSet });
} catch (error) { } catch (error) {
console.error("Failed to get or create file panel filter", error); console.error("Failed to get or create file panel filter", error);
} }

View file

@ -18,7 +18,6 @@ import PlatformPeg from "../PlatformPeg";
import {MatrixClientPeg} from "../MatrixClientPeg"; import {MatrixClientPeg} from "../MatrixClientPeg";
import * as Matrix from 'matrix-js-sdk'; import * as Matrix from 'matrix-js-sdk';
import {EventTimelineSet} from 'matrix-js-sdk';
import {EventTimeline} from 'matrix-js-sdk'; import {EventTimeline} from 'matrix-js-sdk';
/* /*
@ -420,27 +419,27 @@ export default class EventIndex {
const client = MatrixClientPeg.get(); const client = MatrixClientPeg.get();
const indexManager = PlatformPeg.get().getEventIndexingManager(); const indexManager = PlatformPeg.get().getEventIndexingManager();
let loadArgs = { const loadArgs = {
roomId: room.roomId, roomId: room.roomId,
limit: limit limit: limit,
} };
if (fromEvent) { if (fromEvent) {
loadArgs.fromEvent = fromEvent; loadArgs.fromEvent = fromEvent;
loadArgs.direction = direction; loadArgs.direction = direction;
} }
let events let events;
// Get our events from the event index. // Get our events from the event index.
try { try {
events = await indexManager.loadFileEvents(loadArgs); events = await indexManager.loadFileEvents(loadArgs);
} catch (e) { } catch (e) {
console.log("EventIndex: Error getting file events", e); console.log("EventIndex: Error getting file events", e);
return [] return [];
} }
let eventMapper = client.getEventMapper(); const eventMapper = client.getEventMapper();
// Turn the events into MatrixEvent objects. // Turn the events into MatrixEvent objects.
const matrixEvents = events.map(e => { const matrixEvents = events.map(e => {
@ -466,8 +465,8 @@ export default class EventIndex {
room_id: matrixEvent.getRoomId(), room_id: matrixEvent.getRoomId(),
sender: matrixEvent.getSender(), sender: matrixEvent.getSender(),
origin_server_ts: matrixEvent.getTs(), origin_server_ts: matrixEvent.getTs(),
state_key: matrixEvent.getSender() state_key: matrixEvent.getSender(),
} },
); );
// We set this manually to avoid emitting RoomMember.membership and // We set this manually to avoid emitting RoomMember.membership and
@ -483,13 +482,13 @@ export default class EventIndex {
async populateFileTimeline(timelineSet, timeline, room, limit = 10, async populateFileTimeline(timelineSet, timeline, room, limit = 10,
fromEvent = null, direction = EventTimeline.BACKWARDS) { fromEvent = null, direction = EventTimeline.BACKWARDS) {
let matrixEvents = await this.loadFileEvents(room, limit, fromEvent, direction); const matrixEvents = await this.loadFileEvents(room, limit, fromEvent, direction);
// Add the events to the live timeline of the file panel. // Add the events to the live timeline of the file panel.
matrixEvents.forEach(e => { matrixEvents.forEach(e => {
if (!timelineSet.eventIdToTimeline(e.getId())) { if (!timelineSet.eventIdToTimeline(e.getId())) {
timelineSet.addEventToTimeline(e, timeline, timelineSet.addEventToTimeline(e, timeline,
direction == EventTimeline.BACKWARDS) direction == EventTimeline.BACKWARDS);
} }
}); });
@ -510,12 +509,12 @@ export default class EventIndex {
// TODO this is from the js-sdk, this should probably be exposed to // TODO this is from the js-sdk, this should probably be exposed to
// us through the js-sdk. // us through the js-sdk.
const moveWindowCap = (titmelineWindow, timeline, direction, limit) => { const moveWindowCap = (titmelineWindow, timeline, direction, limit) => {
var count = (direction == EventTimeline.BACKWARDS) ? const count = (direction == EventTimeline.BACKWARDS) ?
timeline.retreat(limit) : timeline.advance(limit); timeline.retreat(limit) : timeline.advance(limit);
if (count) { if (count) {
timelineWindow._eventCount += count; timelineWindow._eventCount += count;
var excess = timelineWindow._eventCount - timelineWindow._windowLimit; const excess = timelineWindow._eventCount - timelineWindow._windowLimit;
if (excess > 0) { if (excess > 0) {
timelineWindow.unpaginate(3, direction != EventTimeline.BACKWARDS); timelineWindow.unpaginate(3, direction != EventTimeline.BACKWARDS);
@ -544,7 +543,7 @@ export default class EventIndex {
const ret = await this.populateFileTimeline(timelineSet, timeline.timeline, const ret = await this.populateFileTimeline(timelineSet, timeline.timeline,
room, limit, token, direction); room, limit, token, direction);
moveWindowCap(timelineWindow, timeline, direction, limit) moveWindowCap(timelineWindow, timeline, direction, limit);
timeline.pendingPaginate = null; timeline.pendingPaginate = null;
return ret; return ret;