Skip to content

Commit 2a9aa90

Browse files
committed
fix(rust): fix bindings after matrix-org/matrix-rust-sdk#4716
1 parent b4d3c7b commit 2a9aa90

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

internal/api/rust/rust.go

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,11 @@ func (c *RustClient) SendMessage(t ct.TestLike, roomID, text string) (eventID st
567567
err = fmt.Errorf("SendMessage(rust) %s: failed to find room %s", c.userID, roomID)
568568
return
569569
}
570-
timeline, err := r.Timeline()
570+
timeline, err := r.TimelineWithConfiguration(matrix_sdk_ffi.TimelineConfiguration {
571+
Focus: matrix_sdk_ffi.TimelineFocusLive,
572+
AllowedMessageTypes: matrix_sdk_ffi.AllowedMessageTypesAll,
573+
DateDividerMode: matrix_sdk_ffi.DateDividerModeDaily
574+
})
571575
if err != nil {
572576
err = fmt.Errorf("SendMessage(rust) %s: %s", c.userID, err)
573577
return
@@ -635,17 +639,13 @@ func (c *RustClient) findRoom(t ct.TestLike, roomID string) *matrix_sdk_ffi.Room
635639
c.Logf(t, "allRooms.InitTimeline(%s) err: %s", roomID, err)
636640
}
637641
}
638-
room, err := roomListItem.FullRoom()
639-
if err != nil {
640-
c.Logf(t, "allRooms.FullRoom(%s) err: %s", roomID, err)
641-
} else {
642-
c.roomsMu.Lock()
643-
c.rooms[roomID] = &RustRoomInfo{
644-
room: room,
645-
}
646-
c.roomsMu.Unlock()
647-
return room
648-
}
642+
room := roomListItem.Room()
643+
c.roomsMu.Lock()
644+
c.rooms[roomID] = &RustRoomInfo{
645+
room: room,
646+
}
647+
c.roomsMu.Unlock()
648+
return room
649649
}
650650
}
651651
// try to find it from FFI
@@ -907,7 +907,11 @@ func mustGetTimeline(t ct.TestLike, room *matrix_sdk_ffi.Room) *matrix_sdk_ffi.T
907907
if room == nil {
908908
ct.Fatalf(t, "mustGetTimeline: room does not exist")
909909
}
910-
timeline, err := room.Timeline()
910+
timeline, err := r.TimelineWithConfiguration(matrix_sdk_ffi.TimelineConfiguration {
911+
Focus: matrix_sdk_ffi.TimelineFocusLive,
912+
AllowedMessageTypes: matrix_sdk_ffi.AllowedMessageTypesAll,
913+
DateDividerMode: matrix_sdk_ffi.DateDividerModeDaily
914+
})
911915
must.NotError(t, "failed to get room timeline", err)
912916
return timeline
913917
}

0 commit comments

Comments
 (0)