chore: Refactored thread reloading

spuxx1701 · Jan 29, 2024 · e856982 · e856982
1 parent 1c03478
commit e856982
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/app/components/nav/routes/thread/index.ts b/app/components/nav/routes/thread/index.ts
@@ -105,18 +105,11 @@ export default class NavRoutesThreadComponent extends Component<Signature> {
   reload = async () => {
     this.renderer.showLoadingIndicator();
     this.renderer.preventNextScrollReset();
-    this.threadStore.isReloading = true;
-    if (!this.currentPage) return;
-    this.threadStore
-      .loadThread(this.args.threadId, {
-        page: this.currentPage,
-        keepPreviousThread: true,
-      })
-      .finally(() => {
-        this.threadStore.isReloading = false;
-        this.renderer.hideLoadingIndicator();
-        this.renderer.waitAndScrollToBottom();
-      });
+    this.threadStore.reload().finally(() => {
+      this.threadStore.isReloading = false;
+      this.renderer.hideLoadingIndicator();
+      this.renderer.waitAndScrollToBottom();
+    });
   };
 
   handleGoToPage = () => {

diff --git a/app/components/routes/thread/page/index.ts b/app/components/routes/thread/page/index.ts
@@ -42,7 +42,7 @@ export default class ThreadPage extends Component<Signature> {
   handleOverscroll = () => {
     this.renderer.preventNextScrollReset();
     this.renderer.showLoadingIndicator();
-    this.threadStore.refresh()?.finally(() => {
+    this.threadStore.reload()?.finally(() => {
       this.renderer.hideLoadingIndicator();
       this.renderer.waitAndScrollToBottom();
     });

diff --git a/app/services/stores/thread.ts b/app/services/stores/thread.ts
@@ -72,9 +72,16 @@ export default class ThreadStore extends Service {
    * Refreshes the currently loaded thread if there is one.
    * @param options The options to pass to `loadThread`.
    */
-  refresh(options?: LoadThreadOptions) {
-    if (!this.currentThread) return;
-    return this.loadThread(this.currentThread.id, options);
+  async reload(options?: LoadThreadOptions) {
+    if (!this.currentThread || !this.currentThread.page) return;
+    this.isReloading = true;
+    const thread = await this.loadThread(this.currentThread.id, {
+      page: this.currentThread.page.number,
+      keepPreviousThread: true,
+      ...options,
+    });
+    this.isReloading = false;
+    return thread;
   }
 
   /**