src/common/services/feeds.service.js

@@ -138,6 +138,13 @@ export default class FeedsService {
  return this;
  }
 
+ /**
+ * Abort pending fetch
+ */
+ abort() {
+ abort(this);
+ }
+
  /**
  * Fetch
  */

src/common/stores/FeedStore.js

@@ -236,9 +236,17 @@ export default class FeedStore {
  .setLoading(true)
  .setErrorLoading(false);
 
+ const endpoint = this.feedsService.endpoint;
+ const params = this.feedsService.params;
+
  try {
  await this.feedsService.fetch();
- this.addEntities(await this.feedsService.getEntities());
+ const entities = await this.feedsService.getEntities();
+
+ // if the endpoint or the params are changed we ignore the result
+ if (endpoint !== this.feedsService.endpoint || params !== this.feedsService.params) return;
+
+ this.addEntities(entities);
  } catch (err) {
  // ignore aborts
  if (err.code === 'Abort') return;
@@ -276,10 +284,17 @@ export default class FeedStore {
  .setLoading(true)
  .setErrorLoading(false);
 
+ const endpoint = this.feedsService.endpoint;
+ const params = this.feedsService.params;
+
  try {
  await this.feedsService.fetchLocalOrRemote();
  if (refresh) this.setOffset(0);
  const entities = await this.feedsService.getEntities();
+
+ // if the endpoint or the params are changed we ignore the result
+ if (endpoint !== this.feedsService.endpoint || params !== this.feedsService.params) return;
+
  if (refresh) this.clear();
  this.addEntities(entities);
  } catch (err) {
@@ -301,10 +316,17 @@ export default class FeedStore {
  .setLoading(true)
  .setErrorLoading(false);
 
+ const endpoint = this.feedsService.endpoint;
+ const params = this.feedsService.params;
+
  try {
  await this.feedsService.fetchRemoteOrLocal();
  if (refresh) this.setOffset(0);
  const entities = await this.feedsService.getEntities();
+
+ // if the endpoint or the params are changed we ignore the result
+ if (endpoint !== this.feedsService.endpoint || params !== this.feedsService.params) return;
+
  if (refresh) this.clear();
  this.addEntities(entities);
  } catch (err) {
@@ -322,18 +344,27 @@ export default class FeedStore {
  * Load next page
  */
  async loadMore() {
- if (this.loading || !this.loaded || !this.feedsService.hasMore) return;
+ if (this.loading || !this.loaded || !this.feedsService.hasMore) {
+ return;
+ }
+
+ const endpoint = this.feedsService.endpoint;
+ const params = this.feedsService.params;
 
  this
  .setLoading(true)
  .setErrorLoading(false);
 
  try {
- this.addEntities(
- await this.feedsService
- .next()
- .getEntities()
- );
+ const entities = await this.feedsService
+ .next()
+ .getEntities();
+
+ // if the endpoint or the params are changed we ignore the result
+ if (endpoint !== this.feedsService.endpoint || params !== this.feedsService.params) return;
+
+ this.addEntities(entities);
+
  } catch (err) {
  // ignore aborts
  if (err.code === 'Abort') return;

src/discovery/DiscoveryStore.js

@@ -116,6 +116,7 @@ class DiscoveryStore {
  * @param {string} searchtext
  */
  onFilterChange = (filter, type, period, nsfw) => {
+ this.listStore.feedsService.abort();
  this.listStore.clear();
  this.fetch();
  }