therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix back button size, fix missing chat notifications being marked as read too eagerly, fix promiseinterval erroring when not getting a promise

Browse source
This commit is contained in:
Shpuld Shpuldson 2020-10-27 10:03:04 +02:00
parent e2c4816feb
commit 2c441c7922
4 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/services/chat_utils/chat_utils.js
View file

@ -3,7 +3,7 @@ import { showDesktopNotification } from '../desktop_notification_utils/desktop_n
export const maybeShowChatNotification = (store, chat) => {
if (!chat.lastMessage) return
if (store.rootState.chats.currentChatId === chat.id && !document.hidden) return
if (store.rootState.users.currentUser.id === chat.lastMessage.account.id) return
if (store.rootState.users.currentUser.id === chat.lastMessage.account_id) return
const opts = {
tag: chat.lastMessage.id,

9
src/services/promise_interval/promise_interval.js
View file

@ -10,7 +10,14 @@ export const promiseInterval = (promiseCall, interval) => {
let timeout = null
const func = () => {
promiseCall().finally(() => {
const promise = promiseCall()
// something unexpected happened and promiseCall did not
// return a promise, abort the loop.
if (!(promise && promise.finally)) {
console.warn('promiseInterval: promise call did not return a promise, stopping interval.')
return
}
promise.finally(() => {
if (stopped) return
timeout = window.setTimeout(func, interval)
})