From 3fb35e8123d3a8cd151571b315b7ec4d7e0875c7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 4 Sep 2020 11:19:53 +0300
Subject: rename to promiseInterval

---
 src/services/fetcher/fetcher.js                    | 28 ----------------------
 .../follow_request_fetcher.service.js              |  4 ++--
 .../notifications_fetcher.service.js               |  4 ++--
 src/services/promise_interval/promise_interval.js  | 28 ++++++++++++++++++++++
 .../timeline_fetcher/timeline_fetcher.service.js   |  4 ++--
 5 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 src/services/fetcher/fetcher.js
 create mode 100644 src/services/promise_interval/promise_interval.js

(limited to 'src/services')

diff --git a/src/services/fetcher/fetcher.js b/src/services/fetcher/fetcher.js
deleted file mode 100644
index aae1c2cc..00000000
--- a/src/services/fetcher/fetcher.js
+++ /dev/null
@@ -1,28 +0,0 @@
-
-// makeFetcher - replacement for setInterval for fetching, starts counting
-// the interval only after a request is done instead of immediately.
-// - promiseCall is a function that returns a promise, it's called the first
-// time after the first interval.
-// - interval is the interval delay in ms.
-
-export const makeFetcher = (promiseCall, interval) => {
-  let stopped = false
-  let timeout = null
-  let func = () => {}
-
-  func = () => {
-    promiseCall().finally(() => {
-      if (stopped) return
-      timeout = window.setTimeout(func, interval)
-    })
-  }
-
-  const stopFetcher = () => {
-    stopped = true
-    window.clearTimeout(timeout)
-  }
-
-  timeout = window.setTimeout(func, interval)
-
-  return stopFetcher
-}
diff --git a/src/services/follow_request_fetcher/follow_request_fetcher.service.js b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
index bec434aa..74af4081 100644
--- a/src/services/follow_request_fetcher/follow_request_fetcher.service.js
+++ b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
@@ -1,5 +1,5 @@
 import apiService from '../api/api.service.js'
-import { makeFetcher } from '../fetcher/fetcher.js'
+import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 const fetchAndUpdate = ({ store, credentials }) => {
   return apiService.fetchFollowRequests({ credentials })
@@ -13,7 +13,7 @@ const fetchAndUpdate = ({ store, credentials }) => {
 const startFetching = ({ credentials, store }) => {
   const boundFetchAndUpdate = () => fetchAndUpdate({ credentials, store })
   boundFetchAndUpdate()
-  return makeFetcher(boundFetchAndUpdate, 10000)
+  return promiseInterval(boundFetchAndUpdate, 10000)
 }
 
 const followRequestFetcher = {
diff --git a/src/services/notifications_fetcher/notifications_fetcher.service.js b/src/services/notifications_fetcher/notifications_fetcher.service.js
index 90988fc4..c908b644 100644
--- a/src/services/notifications_fetcher/notifications_fetcher.service.js
+++ b/src/services/notifications_fetcher/notifications_fetcher.service.js
@@ -1,5 +1,5 @@
 import apiService from '../api/api.service.js'
-import { makeFetcher } from '../fetcher/fetcher.js'
+import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 const update = ({ store, notifications, older }) => {
   store.dispatch('setNotificationsError', { value: false })
@@ -61,7 +61,7 @@ const startFetching = ({ credentials, store }) => {
   setTimeout(() => store.dispatch('setNotificationsSilence', false), 10000)
   const boundFetchAndUpdate = () => fetchAndUpdate({ credentials, store })
   boundFetchAndUpdate()
-  return makeFetcher(boundFetchAndUpdate, 10000)
+  return promiseInterval(boundFetchAndUpdate, 10000)
 }
 
 const notificationsFetcher = {
diff --git a/src/services/promise_interval/promise_interval.js b/src/services/promise_interval/promise_interval.js
new file mode 100644
index 00000000..ee46a236
--- /dev/null
+++ b/src/services/promise_interval/promise_interval.js
@@ -0,0 +1,28 @@
+
+// promiseInterval - replacement for setInterval for promises, starts counting
+// the interval only after a promise is done instead of immediately.
+// - promiseCall is a function that returns a promise, it's called the first
+// time after the first interval.
+// - interval is the interval delay in ms.
+
+export const promiseInterval = (promiseCall, interval) => {
+  let stopped = false
+  let timeout = null
+  let func = () => {}
+
+  func = () => {
+    promiseCall().finally(() => {
+      if (stopped) return
+      timeout = window.setTimeout(func, interval)
+    })
+  }
+
+  const stopFetcher = () => {
+    stopped = true
+    window.clearTimeout(timeout)
+  }
+
+  timeout = window.setTimeout(func, interval)
+
+  return { stop: stopFetcher }
+}
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 9f585f68..72ea4890 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -1,7 +1,7 @@
 import { camelCase } from 'lodash'
 
 import apiService from '../api/api.service.js'
-import { makeFetcher } from '../fetcher/fetcher.js'
+import { promiseInterval } from '../promise_interval/promise_interval.js'
 
 const update = ({ store, statuses, timeline, showImmediately, userId, pagination }) => {
   const ccTimeline = camelCase(timeline)
@@ -74,7 +74,7 @@ const startFetching = ({ timeline = 'friends', credentials, store, userId = fals
   fetchAndUpdate({ timeline, credentials, store, showImmediately, userId, tag })
   const boundFetchAndUpdate = () =>
     fetchAndUpdate({ timeline, credentials, store, userId, tag })
-  return makeFetcher(boundFetchAndUpdate, 10000)
+  return promiseInterval(boundFetchAndUpdate, 10000)
 }
 const timelineFetcher = {
   fetchAndUpdate,
-- 
cgit v1.2.3-70-g09d2