use sticky events from the timeline

Signed-off-by: Timo K <[email protected]>

Author: toger5

src/models/event.ts

@@ -96,7 +96,7 @@ export interface IEvent {
     membership?: Membership;
     unsigned: IUnsigned;
     redacts?: string;
-    sticky?: number;
+    msc4354_sticky?: number;
 }
 
 export interface IAggregatedRelation {

src/models/room.ts

@@ -3454,7 +3454,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
     private getNextStickyExpiryTs(): number | null {
         let nextExpiry = null;
         for (const event of this.stickyEventsMap.values()) {
-            const expiry = event.getTs() + event.event.sticky!;
+            const expiry = event.getTs() + event.event.msc4354_sticky!;
             if (nextExpiry === null || expiry < nextExpiry) {
                 nextExpiry = expiry;
             }
@@ -3467,7 +3467,7 @@ export class Room extends ReadReceipt<RoomEmittedEvents, RoomEventHandlerMap> {
         for (const [key, event] of this.stickyEventsMap.entries()) {
             const creationTs = event.getTs();
             // we only added items with `sticky` into this map so we can assert non-null here
-            if (now > creationTs + event.event.sticky!) {
+            if (now > creationTs + event.event.msc4354_sticky!) {
                 toRemove.push(key);
             }
         }

src/sync.ts

@@ -1405,7 +1405,13 @@ export class SyncApi {
             // we deliberately don't add accountData to the timeline
             room.addAccountData(accountDataEvents);
 
-            room.addStickyEvents(stickyEvents);
+            // events from the sticky section of the sync come first (those are the ones that would be skipped due to gappy syncs)
+            // hence we consider them as older.
+            // and we add the events from the timeline at the end (newer)
+            const stickyEventsAndStickyEventsFromTheTimeline = stickyEvents.concat(
+                timelineEvents.filter((e) => e.event.msc4354_sticky !== undefined),
+            );
+            room.addStickyEvents(stickyEventsAndStickyEventsFromTheTimeline);
 
             room.recalculate();
             if (joinObj.isBrandNewRoom) {