Merge pull request #6391 from matrix-org/t3chguy/fix/14508.1

Author: t3chguy

src/components/views/rooms/RoomSublist.tsx

@@ -408,10 +408,10 @@ export default class RoomSublist extends React.Component<IProps, IState> {
  this.setState({ addRoomContextMenuPosition: null });
  };
 
- private onUnreadFirstChanged = async () => {
+ private onUnreadFirstChanged = () => {
  const isUnreadFirst = RoomListStore.instance.getListOrder(this.props.tagId) === ListAlgorithm.Importance;
  const newAlgorithm = isUnreadFirst ? ListAlgorithm.Natural : ListAlgorithm.Importance;
- await RoomListStore.instance.setListOrder(this.props.tagId, newAlgorithm);
+ RoomListStore.instance.setListOrder(this.props.tagId, newAlgorithm);
  this.forceUpdate(); // because if the sublist doesn't have any changes then we will miss the list order change
  };
 

src/stores/room-list/RoomListStore.ts

@@ -132,8 +132,8 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  // Update any settings here, as some may have happened before we were logically ready.
  console.log("Regenerating room lists: Startup");
  await this.readAndCacheSettingsFromStore();
- await this.regenerateAllLists({ trigger: false });
- await this.handleRVSUpdate({ trigger: false }); // fake an RVS update to adjust sticky room, if needed
+ this.regenerateAllLists({ trigger: false });
+ this.handleRVSUpdate({ trigger: false }); // fake an RVS update to adjust sticky room, if needed
 
  this.updateFn.mark(); // we almost certainly want to trigger an update.
  this.updateFn.trigger();
@@ -150,31 +150,31 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  await this.updateState({
  tagsEnabled,
  });
- await this.updateAlgorithmInstances();
+ this.updateAlgorithmInstances();
  }
 
  /**
  * Handles suspected RoomViewStore changes.
  * @param trigger Set to false to prevent a list update from being sent. Should only
  * be used if the calling code will manually trigger the update.
  */
- private async handleRVSUpdate({ trigger = true }) {
+ private handleRVSUpdate({ trigger = true }) {
  if (!this.matrixClient) return; // We assume there won't be RVS updates without a client
 
  const activeRoomId = RoomViewStore.getRoomId();
  if (!activeRoomId && this.algorithm.stickyRoom) {
- await this.algorithm.setStickyRoom(null);
+ this.algorithm.setStickyRoom(null);
  } else if (activeRoomId) {
  const activeRoom = this.matrixClient.getRoom(activeRoomId);
  if (!activeRoom) {
  console.warn(`${activeRoomId} is current in RVS but missing from client - clearing sticky room`);
- await this.algorithm.setStickyRoom(null);
+ this.algorithm.setStickyRoom(null);
  } else if (activeRoom !== this.algorithm.stickyRoom) {
  if (SettingsStore.getValue("advancedRoomListLogging")) {
  // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
  console.log(`Changing sticky room to ${activeRoomId}`);
  }
- await this.algorithm.setStickyRoom(activeRoom);
+ this.algorithm.setStickyRoom(activeRoom);
  }
  }
 
@@ -226,7 +226,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  console.log("Regenerating room lists: Settings changed");
  await this.readAndCacheSettingsFromStore();
 
- await this.regenerateAllLists({ trigger: false }); // regenerate the lists now
+ this.regenerateAllLists({ trigger: false }); // regenerate the lists now
  this.updateFn.trigger();
  }
  }
@@ -368,7 +368,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
  console.log(`[RoomListDebug] Clearing sticky room due to room upgrade`);
  }
- await this.algorithm.setStickyRoom(null);
+ this.algorithm.setStickyRoom(null);
  }
 
  // Note: we hit the algorithm instead of our handleRoomUpdate() function to
@@ -377,7 +377,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
  console.log(`[RoomListDebug] Removing previous room from room list`);
  }
- await this.algorithm.handleRoomUpdate(prevRoom, RoomUpdateCause.RoomRemoved);
+ this.algorithm.handleRoomUpdate(prevRoom, RoomUpdateCause.RoomRemoved);
  }
  }
 
@@ -433,7 +433,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  return; // don't do anything on new/moved rooms which ought not to be shown
  }
 
- const shouldUpdate = await this.algorithm.handleRoomUpdate(room, cause);
+ const shouldUpdate = this.algorithm.handleRoomUpdate(room, cause);
  if (shouldUpdate) {
  if (SettingsStore.getValue("advancedRoomListLogging")) {
  // TODO: Remove debug: https://github.com/vector-im/element-web/issues/14602
@@ -462,13 +462,13 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
 
  // Reset the sticky room before resetting the known rooms so the algorithm
  // doesn't freak out.
- await this.algorithm.setStickyRoom(null);
- await this.algorithm.setKnownRooms(rooms);
+ this.algorithm.setStickyRoom(null);
+ this.algorithm.setKnownRooms(rooms);
 
  // Set the sticky room back, if needed, now that we have updated the store.
  // This will use relative stickyness to the new room set.
  if (stickyIsStillPresent) {
- await this.algorithm.setStickyRoom(currentSticky);
+ this.algorithm.setStickyRoom(currentSticky);
  }
 
  // Finally, mark an update and resume updates from the algorithm
@@ -477,12 +477,12 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  }
 
  public async setTagSorting(tagId: TagID, sort: SortAlgorithm) {
- await this.setAndPersistTagSorting(tagId, sort);
+ this.setAndPersistTagSorting(tagId, sort);
  this.updateFn.trigger();
  }
 
- private async setAndPersistTagSorting(tagId: TagID, sort: SortAlgorithm) {
- await this.algorithm.setTagSorting(tagId, sort);
+ private setAndPersistTagSorting(tagId: TagID, sort: SortAlgorithm) {
+ this.algorithm.setTagSorting(tagId, sort);
  // TODO: Per-account? https://github.com/vector-im/element-web/issues/14114
  localStorage.setItem(`mx_tagSort_${tagId}`, sort);
  }
@@ -520,13 +520,13 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  return tagSort;
  }
 
- public async setListOrder(tagId: TagID, order: ListAlgorithm) {
- await this.setAndPersistListOrder(tagId, order);
+ public setListOrder(tagId: TagID, order: ListAlgorithm) {
+ this.setAndPersistListOrder(tagId, order);
  this.updateFn.trigger();
  }
 
- private async setAndPersistListOrder(tagId: TagID, order: ListAlgorithm) {
- await this.algorithm.setListOrdering(tagId, order);
+ private setAndPersistListOrder(tagId: TagID, order: ListAlgorithm) {
+ this.algorithm.setListOrdering(tagId, order);
  // TODO: Per-account? https://github.com/vector-im/element-web/issues/14114
  localStorage.setItem(`mx_listOrder_${tagId}`, order);
  }
@@ -563,7 +563,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  return listOrder;
  }
 
- private async updateAlgorithmInstances() {
+ private updateAlgorithmInstances() {
  // We'll require an update, so mark for one. Marking now also prevents the calls
  // to setTagSorting and setListOrder from causing triggers.
  this.updateFn.mark();
@@ -576,10 +576,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  const listOrder = this.calculateListOrder(tag);
 
  if (tagSort !== definedSort) {
- await this.setAndPersistTagSorting(tag, tagSort);
+ this.setAndPersistTagSorting(tag, tagSort);
  }
  if (listOrder !== definedOrder) {
- await this.setAndPersistListOrder(tag, listOrder);
+ this.setAndPersistListOrder(tag, listOrder);
  }
  }
  }
@@ -632,7 +632,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  * @param trigger Set to false to prevent a list update from being sent. Should only
  * be used if the calling code will manually trigger the update.
  */
- public async regenerateAllLists({ trigger = true }) {
+ public regenerateAllLists({ trigger = true }) {
  console.warn("Regenerating all room lists");
 
  const rooms = this.getPlausibleRooms();
@@ -656,8 +656,8 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
  RoomListLayoutStore.instance.ensureLayoutExists(tagId);
  }
 
- await this.algorithm.populateTags(sorts, orders);
- await this.algorithm.setKnownRooms(rooms);
+ this.algorithm.populateTags(sorts, orders);
+ this.algorithm.setKnownRooms(rooms);
 
  this.initialListsGenerated = true;