imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix thread filtering and ordering (#7586)

Browse source
This commit is contained in:
Germain 2022-01-21 10:03:08 +00:00 • committed by GitHub
parent 91743c9a1a
commit 35ebca2966
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/components/structures/ThreadPanel.tsx
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import React, { useContext, useEffect, useMemo, useRef, useState } from 'react'; import React, { useContext, useEffect, useRef, useState } from 'react';
import { EventTimelineSet } from 'matrix-js-sdk/src/models/event-timeline-set'; import { EventTimelineSet } from 'matrix-js-sdk/src/models/event-timeline-set';
import { Room } from 'matrix-js-sdk/src/models/room'; import { Room } from 'matrix-js-sdk/src/models/room';
import { RelationType } from 'matrix-js-sdk/src/@types/event'; import { RelationType } from 'matrix-js-sdk/src/@types/event';
@ -25,6 +25,7 @@ import {
UNSTABLE_FILTER_RELATION_SENDERS, UNSTABLE_FILTER_RELATION_SENDERS,
UNSTABLE_FILTER_RELATION_TYPES, UNSTABLE_FILTER_RELATION_TYPES,
} from 'matrix-js-sdk/src/filter'; } from 'matrix-js-sdk/src/filter';
import { ThreadEvent } from 'matrix-js-sdk/src/models/thread';
import BaseCard from "../views/right_panel/BaseCard"; import BaseCard from "../views/right_panel/BaseCard";
import ResizeNotifier from '../../utils/ResizeNotifier'; import ResizeNotifier from '../../utils/ResizeNotifier';
@ -37,6 +38,7 @@ import TimelinePanel from './TimelinePanel';
import { Layout } from '../../settings/enums/Layout'; import { Layout } from '../../settings/enums/Layout';
import { TileShape } from '../views/rooms/EventTile'; import { TileShape } from '../views/rooms/EventTile';
import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks'; import { RoomPermalinkCreator } from '../../utils/permalinks/Permalinks';
import { useEventEmitter } from '../../hooks/useEventEmitter';
async function getThreadTimelineSet( async function getThreadTimelineSet(
client: MatrixClient, client: MatrixClient,
@ -84,12 +86,18 @@ async function getThreadTimelineSet(
// filter fields. We fallback to the threads that have been discovered in // filter fields. We fallback to the threads that have been discovered in
// the main timeline // the main timeline
const timelineSet = new EventTimelineSet(room, {}); const timelineSet = new EventTimelineSet(room, {});
for (const [, thread] of room.threads) {
const isOwnEvent = thread.rootEvent.getSender() === client.getUserId(); Array.from(room.threads)
if (filterType !== ThreadFilterType.My || isOwnEvent) { .sort(([, threadA], [, threadB]) => threadA.lastReply.getTs() - threadB.lastReply.getTs())
timelineSet.getLiveTimeline().addEvent(thread.rootEvent, false); .forEach(([, thread]) => {
} const isOwnEvent = thread.rootEvent.getSender() === client.getUserId();
} if (filterType !== ThreadFilterType.My || isOwnEvent) {
timelineSet.getLiveTimeline().addEvent(thread.rootEvent, false);
}
});
// for (const [, thread] of room.threads) {
// }
return timelineSet; return timelineSet;
} }
} }
@ -210,18 +218,18 @@ const ThreadPanel: React.FC<IProps> = ({ roomId, onClose, permalinkCreator }) =>
const ref = useRef<TimelinePanel>(); const ref = useRef<TimelinePanel>();
const [timelineSet, setTimelineSet] = useState<EventTimelineSet | null>(null); const [timelineSet, setTimelineSet] = useState<EventTimelineSet | null>(null);
const timelineSetPromise = useMemo(
async () => {
const timelineSet = getThreadTimelineSet(mxClient, room, filterOption);
return timelineSet;
},
[mxClient, room, filterOption],
);
useEffect(() => { useEffect(() => {
timelineSetPromise getThreadTimelineSet(mxClient, room, filterOption)
.then(timelineSet => { setTimelineSet(timelineSet); }) .then(timelineSet => { setTimelineSet(timelineSet); })
.catch(() => setTimelineSet(null)); .catch(() => setTimelineSet(null));
}, [timelineSetPromise]); }, [mxClient, room, filterOption]);
useEffect(() => {
if (timelineSet) ref.current.refreshTimeline();
}, [timelineSet, ref]);
useEventEmitter(room, ThreadEvent.Update, () => {
if (timelineSet) ref.current.refreshTimeline();
});
return ( return (
<RoomContext.Provider value={{ <RoomContext.Provider value={{