Skip to content

Commit

Permalink
add element web search count hack (?)
Browse files Browse the repository at this point in the history
Signed-off-by: strawberry <[email protected]>
  • Loading branch information
girlbossceo committed Mar 24, 2024
1 parent 2a789eb commit f2209b8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/api/client_server/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ pub async fn get_message_events_route(
* https://github.com/vector-im/element-android/issues/3417
* https://github.com/vector-im/element-web/issues/21034
*/
if !cfg!(features = "element_hacks")
if !cfg!(feature = "element_hacks")
&& !services().rooms.lazy_loading.lazy_load_was_sent_before(
sender_user,
sender_device,
Expand Down Expand Up @@ -237,7 +237,7 @@ pub async fn get_message_events_route(
* https://github.com/vector-im/element-android/issues/3417
* https://github.com/vector-im/element-web/issues/21034
*/
if !cfg!(features = "element_hacks")
if !cfg!(feature = "element_hacks")
&& !services().rooms.lazy_loading.lazy_load_was_sent_before(
sender_user,
sender_device,
Expand Down
8 changes: 6 additions & 2 deletions src/api/client_server/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,12 @@ pub async fn search_events_route(body: Ruma<search_events::v3::Request>) -> Resu

Ok(search_events::v3::Response::new(ResultCategories {
room_events: ResultRoomEvents {
count: Some((results.len() as u32).into()), // TODO: set this to none. Element shouldn't depend on it
groups: BTreeMap::new(), // TODO
count: if cfg!(feature = "element_hacks") {
Some((results.len() as u32).into())
} else {
None
}, // TODO: set this to none. Element shouldn't depend on it (strawberry: why not?)
groups: BTreeMap::new(), // TODO
next_batch,
results,
state: BTreeMap::new(), // TODO
Expand Down
4 changes: 2 additions & 2 deletions src/api/client_server/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ async fn sync_helper(
|| event_type != StateEventType::RoomMember
|| full_state
// TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
|| (cfg!(features = "element_hacks") && *sender_user == state_key)
|| (cfg!(feature = "element_hacks") && *sender_user == state_key)
{
let Some(pdu) = services().rooms.timeline.get_pdu(&id)? else {
error!("Pdu in state not found: {}", id);
Expand Down Expand Up @@ -627,7 +627,7 @@ async fn load_joined_room(
|| full_state
|| timeline_users.contains(&state_key)
// TODO: Delete the following line when this is resolved: https://github.com/vector-im/element-web/issues/22565
|| (cfg!(features = "element_hacks") && *sender_user == state_key)
|| (cfg!(feature = "element_hacks") && *sender_user == state_key)
{
let pdu = match services().rooms.timeline.get_pdu(&id)? {
Some(pdu) => pdu,
Expand Down

0 comments on commit f2209b8

Please sign in to comment.