astra
/
ntfy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not store notifications in localStorage anymore

pull/149/head
Philipp Heckel 2022-03-01 22:41:49 -05:00
parent effc1f42eb
commit 39f4613719
5 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/app/NotificationManager.js
View File

@ -2,8 +2,9 @@ import {formatMessage, formatTitleWithFallback, topicShortUrl} from "./utils";
import repository from "./Repository";
class NotificationManager {
notify(subscription, notification, onClickFallback) {
if (!this.shouldNotify(subscription, notification)) {
async notify(subscription, notification, onClickFallback) {
const shouldNotify = await this.shouldNotify(subscription, notification);
if (!shouldNotify) {
return;
}
const message = formatMessage(notification);
@ -32,9 +33,10 @@ class NotificationManager {
}
}
shouldNotify(subscription, notification) {
async shouldNotify(subscription, notification) {
const priority = (notification.priority) ? notification.priority : 3;
if (priority < repository.getMinPriority()) {
const minPriority = await repository.getMinPriority();
if (priority < minPriority) {
return false;
}
return true;

1
web/src/app/Repository.js
View File

@ -35,7 +35,6 @@ class Repository {
return {
baseUrl: subscription.baseUrl,
topic: subscription.topic,
notifications: subscription.getNotifications(),
last: subscription.last
}
}));

20
web/src/app/Subscription.js
View File

@ -5,15 +5,13 @@ class Subscription {
this.id = topicUrl(baseUrl, topic);
this.baseUrl = baseUrl;
this.topic = topic;
this.notifications = new Map(); // notification ID -> notification object
this.last = null; // Last message ID
}
addNotification(notification) {
if (!notification.event || notification.event !== 'message' || this.notifications.has(notification.id)) {
if (!notification.event || notification.event !== 'message') {
return false;
}
this.notifications.set(notification.id, notification);
this.last = notification.id;
return true;
}
@ -23,22 +21,6 @@ class Subscription {
return this;
}
deleteNotification(notificationId) {
this.notifications.delete(notificationId);
return this;
}
deleteAllNotifications() {
for (const [id] of this.notifications) {
this.deleteNotification(id);
}
return this;
}
getNotifications() {
return Array.from(this.notifications.values());
}
url() {
return topicUrl(this.baseUrl, this.topic);
}

16
web/src/components/App.js
View File

@ -17,6 +17,7 @@ import NoTopics from "./NoTopics";
import Preferences from "./Preferences";
import db from "../app/db";
import {useLiveQuery} from "dexie-react-hooks";
import {topicUrl} from "../app/utils";
// TODO subscribe dialog:
// - check/use existing user
@ -49,17 +50,11 @@ const App = () => {
};
const handleDeleteNotification = (subscriptionId, notificationId) => {
console.log(`[App] Deleting notification ${notificationId} from ${subscriptionId}`);
setSubscriptions(prev => {
const newSubscription = prev.get(subscriptionId).deleteNotification(notificationId);
return prev.update(newSubscription).clone();
});
db.notifications.delete(notificationId); // FIXME
};
const handleDeleteAllNotifications = (subscriptionId) => {
console.log(`[App] Deleting all notifications from ${subscriptionId}`);
setSubscriptions(prev => {
const newSubscription = prev.get(subscriptionId).deleteAllNotifications();
return prev.update(newSubscription).clone();
});
db.notifications.where({subscriptionId}).delete(); // FIXME
};
const handleUnsubscribe = (subscriptionId) => {
console.log(`[App] Unsubscribing from ${subscriptionId}`);
@ -84,6 +79,10 @@ const App = () => {
.then(notifications => {
setSubscriptions(prev => {
subscription.addNotifications(notifications);
const subscriptionId = topicUrl(subscription.baseUrl, subscription.topic);
const notificationsWithSubscriptionId = notifications
.map(notification => ({ ...notification, subscriptionId }));
db.notifications.bulkPut(notificationsWithSubscriptionId); // FIXME
return prev.update(subscription).clone();
});
});
@ -114,6 +113,7 @@ const App = () => {
useEffect(() => {
const notificationClickFallback = (subscription) => setSelectedSubscription(subscription);
const handleNotification = (subscriptionId, notification) => {
db.notifications.put({ ...notification, subscriptionId }); // FIXME
setSubscriptions(prev => {
const subscription = prev.get(subscriptionId);
if (subscription.addNotification(notification)) {

15
web/src/components/Notifications.js
View File

@ -3,18 +3,25 @@ import {CardContent, Link, Stack} from "@mui/material";
import Card from "@mui/material/Card";
import Typography from "@mui/material/Typography";
import * as React from "react";
import {formatMessage, formatTitle, unmatchedTags} from "../app/utils";
import {formatMessage, formatTitle, topicUrl, unmatchedTags} from "../app/utils";
import IconButton from "@mui/material/IconButton";
import CloseIcon from '@mui/icons-material/Close';
import {Paragraph, VerticallyCenteredContainer} from "./styles";
import {useLiveQuery} from "dexie-react-hooks";
import db from "../app/db";
const Notifications = (props) => {
const subscription = props.subscription;
const sortedNotifications = subscription.getNotifications()
.sort((a, b) => a.time < b.time ? 1 : -1);
if (sortedNotifications.length === 0) {
const subscriptionId = topicUrl(subscription.baseUrl, subscription.topic);
const notifications = useLiveQuery(() => {
return db.notifications
.where({ subscriptionId: subscriptionId })
.toArray();
}, [subscription]);
if (!notifications || notifications.length === 0) {
return <NothingHereYet subscription={subscription}/>;
}
const sortedNotifications = Array.from(notifications).sort((a, b) => a.time < b.time ? 1 : -1);
return (
<Container maxWidth="lg" sx={{marginTop: 3, marginBottom: 3}}>
<Stack spacing={3}>