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

SubscribeDialog use existing user

Browse source
This commit is contained in:
Philipp Heckel 2022-03-04 12:10:11 -05:00
parent 5878d7e5a6
commit e7bd3abadc
6 changed files with 49 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/src/app/NotificationManager.js
View file

@ -1,4 +1,4 @@
import {formatMessage, formatTitleWithFallback, openUrl, topicShortUrl} from "./utils";
import {formatMessage, formatTitleWithDefault, openUrl, topicShortUrl} from "./utils";
import prefs from "./Prefs";
import subscriptionManager from "./SubscriptionManager";
@ -11,7 +11,7 @@ class NotificationManager {
}
const shortUrl = topicShortUrl(subscription.baseUrl, subscription.topic);
const message = formatMessage(notification);
const title = formatTitleWithFallback(notification, shortUrl);
const title = formatTitleWithDefault(notification, shortUrl);
console.log(`[NotificationManager, ${shortUrl}] Displaying notification ${notification.id}: ${message}`);
const n = new Notification(title, {

2
web/src/app/utils.js
View file

@ -33,7 +33,7 @@ const toEmojis = (tags) => {
}
export const formatTitleWithFallback = (m, fallback) => {
export const formatTitleWithDefault = (m, fallback) => {
if (m.title) {
return formatTitle(m);
}