Coflnet · Ekwav · Jul 11, 2026
diff --git a/api/ApiHelper.tsx b/api/ApiHelper.tsx
@@ -559,7 +559,7 @@ export function initAPI(returnSSRResponse: boolean = false): API {
                                 return {
                                     id: t.id || 0,
                                     name: t.name || '',
-                                    isDisabled: false,
+                                    isDisabled: t.isDisabled ?? false,
                                     priority: 0
                                 }
                             })
@@ -568,6 +568,9 @@ export function initAPI(returnSSRResponse: boolean = false): API {
                                 resolve()
                             })
                             .catch(e => {
+                                // The listener was already created but linking the subscription failed.
+                                // Roll it back so it doesn't linger invisibly and count against the limit.
+                                unsubscribe(listener).catch(() => {})
                                 let errorMessage = typeof e === 'string' ? e : e?.message || ''
                                 if (errorMessage.includes('subscription_limit_reached')) {
                                     toast.error(

diff --git a/components/ArchivedAuctions.tsx/ExportArchivedData/ExportArchivedData.tsx b/components/ArchivedAuctions.tsx/ExportArchivedData/ExportArchivedData.tsx
@@ -6,6 +6,7 @@ import styles from './ExportArchivedData.module.css'
 import HelpIcon from '@mui/icons-material/Help'
 import Tooltip from '../../Tooltip/Tooltip'
 import NumberElement from '../../Number/Number'
+import { isValidDiscordWebhookUrl } from '../../../utils/NotificationChannelUtils'
 
 interface Props {
     itemTag: string
@@ -23,7 +24,7 @@ function ExportArchivedData(props: Props) {
     let [showConfirmDialog, setShowConfirmDialog] = useState(false)
     let [isExportRunning, setIsExportRunning] = useState(false)
 
-    let isDiscordWebhookUrlValid = discordWebhookUrl && (discordWebhookUrl.startsWith('https://discord.com/api/webhooks/') || discordWebhookUrl.startsWith('https://discordapp.com/api/webhooks/'))
+    let isDiscordWebhookUrlValid = !!discordWebhookUrl && isValidDiscordWebhookUrl(discordWebhookUrl)
 
     useEffect(() => {
         setShowModal(props.show)
@@ -80,7 +81,7 @@ function ExportArchivedData(props: Props) {
                             onChange={e => setDiscordWebhookUrl(e.target.value)}
                             placeholder="Discord Webhook Url (https://discord.com/api/... or https://discordapp.com/api/...)"
                         />
-                        {discordWebhookUrl && !discordWebhookUrl?.startsWith('https://discord.com/api/') && !discordWebhookUrl?.startsWith('https://discordapp.com/api/webhooks/') ? (
+                        {discordWebhookUrl && !isValidDiscordWebhookUrl(discordWebhookUrl) ? (
                             <div>
                                 <span style={{ color: 'red' }}>The Discord Webhook URL has to start with "https://discord.com/api/..." or "https://discordapp.com/api/webhooks/..."</span>
                             </div>

diff --git a/components/Favorites/FavoriteItemCard.tsx b/components/Favorites/FavoriteItemCard.tsx
@@ -115,6 +115,7 @@ export default function FavoriteItemCard({ favorite, movement, isMovementLoading
                 <SubscribeButton
                     topic={favorite.tag}
                     type={favorite.bazaar ? 'bazaar' : 'item'}
+                    currentPrice={currentPrice}
                     buttonContent={<span>Notify</span>}
                 />
                 <FavoriteToggle item={item} size="small" />
@@ -135,6 +136,7 @@ export default function FavoriteItemCard({ favorite, movement, isMovementLoading
                             <SubscribeButton
                                 topic={favorite.tag}
                                 type={favorite.bazaar ? 'bazaar' : 'item'}
+                                currentPrice={currentPrice}
                                 buttonContent={
                                     <span className={styles.mobileDropdownItem}>
                                         <NotificationsOutlinedIcon />

diff --git a/components/NotificationTargets/NotificationTargetForm.tsx b/components/NotificationTargets/NotificationTargetForm.tsx
@@ -5,6 +5,7 @@ import { Button, Form } from 'react-bootstrap'
 import api from '../../api/ApiHelper'
 import askForNotificationPermissons from '../../utils/NotificationPermisson'
 import { getNotficationWhenEnumAsString, getNotificationTypeAsString } from '../../utils/NotificationUtils'
+import { isValidDiscordWebhookUrl } from '../../utils/NotificationChannelUtils'
 
 const TYPE_OPTIONS: NotificationType[] = ['DiscordWebhook', 'FIREBASE', 'InGame']
 const WHEN_OPITIONS: NotificationWhen[] = ['NEVER', 'AfterFail', 'ALWAYS']
@@ -22,6 +23,8 @@ function NotificationTargetForm(props: Props) {
     let [when, setWhen] = useState<NotificationWhen | number>(props.defaultNotificationTarget?.when || 'ALWAYS')
     let [disabled, setDisabled] = useState(false)
 
+    let discordUrlInvalid = type === 'DiscordWebhook' && !!target && !isValidDiscordWebhookUrl(target)
+
     async function addNotificationTarget() {
         let targetToSend = target
 
@@ -81,9 +84,9 @@ function NotificationTargetForm(props: Props) {
                             type="text"
                             onChange={e => setTarget(e.target.value)}
                             placeholder={type === 'DiscordWebhook' ? 'Discord Webhook Url (https://discord.com/api/... or https://discordapp.com/api/...)' : 'Webhook Url'}
-                            isInvalid={(type === 'DiscordWebhook' && target && !target?.startsWith('https://discord.com/api/') && !target?.startsWith('https://discordapp.com/api/webhooks/')) === true}
+                            isInvalid={discordUrlInvalid}
                         />
-                        {type === 'DiscordWebhook' && target && !target?.startsWith('https://discord.com/api/') && !target?.startsWith('https://discordapp.com/api/webhooks/') ? (
+                        {discordUrlInvalid ? (
                             <div>
                                 <span style={{ color: 'red' }}>The Discord Webhook URL has to start with "https://discord.com/api/..." or "https://discordapp.com/api/webhooks/..."</span>
                             </div>

diff --git a/components/NotificationTargets/NotificationTargets.tsx b/components/NotificationTargets/NotificationTargets.tsx
@@ -2,6 +2,7 @@
 
 import { useEffect, useState } from 'react'
 import { Button, Table } from 'react-bootstrap'
+import { toast } from 'react-toastify'
 import api from '../../api/ApiHelper'
 import NotificationTargetForm from './NotificationTargetForm'
 import DeleteIcon from '@mui/icons-material/Delete'
@@ -29,9 +30,20 @@ function NotificationTargets() {
     }
 
     function deleteNotificationTarget(target: NotificationTarget) {
-        api.deleteNotificationTarget(target).then(() => {
-            setNotificationTargets(notificationTargets.filter(t => t.name !== target.name))
-        })
+        api.deleteNotificationTarget(target)
+            .then(() => {
+                setNotificationTargets(notificationTargets.filter(t => t.name !== target.name))
+            })
+            .catch(error => {
+                // the http layer rejects with a plain string like `HTTP 500: {"slug":"subscription_depends",...}`,
+                // so apiErrorHandler (which only handles error.message) stays silent - surface it here instead.
+                let message = typeof error === 'string' ? error : error?.message
+                if (message && message.includes('subscription_depends')) {
+                    toast.error(`"${target.name}" is still used by at least one notifier. Switch those notifiers to another channel first, then delete it.`)
+                } else {
+                    toast.error(message || 'Could not delete this channel. Please try again.')
+                }
+            })
     }
 
     function sendTestNotification(target: NotificationTarget) {
@@ -42,7 +54,7 @@ function NotificationTargets() {
         <>
             <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
                 {!showAddNotificationTarget ? (
-                    <Button onClick={() => setShowAddNotificationTarget(true)}>Add Notification Target</Button>
+                    <Button onClick={() => setShowAddNotificationTarget(true)}>Add channel</Button>
                 ) : (
                     <Button
                         onClick={() => {
@@ -87,7 +99,7 @@ function NotificationTargets() {
                     ) : (
                         notificationTargets.map(target => {
                             return (
-                                <tr>
+                                <tr key={target.id ?? target.name}>
                                     <td className="ellipse" style={{ maxWidth: '250px' }} title={target.target || ''}>
                                         {target.name}
                                     </td>

diff --git a/components/PriceGraph/AuctionHousePriceGraph/AuctionHousePriceGraph.tsx b/components/PriceGraph/AuctionHousePriceGraph/AuctionHousePriceGraph.tsx
@@ -583,7 +583,7 @@ function AuctionHousePriceGraph(props: Props) {
                     </div>
 
                     <div className="d-flex align-items-center" style={{ gap: '8px', minWidth: '220px', justifyContent: 'flex-end' }}>
-                        <SubscribeButton type="item" topic={props.item.tag} />
+                        <SubscribeButton type="item" topic={props.item.tag} currentPrice={avgPrice || undefined} />
                         <ShareButton
                             title={'Prices for ' + props.item.name}
                             text="See list, search and filter item prices from the auction house and bazar in Hypixel Skyblock"

diff --git a/components/PriceGraph/BazaarPriceGraph/BazaarPriceGraph.tsx b/components/PriceGraph/BazaarPriceGraph/BazaarPriceGraph.tsx
@@ -469,7 +469,12 @@ function BazaarPriceGraph(props: Props) {
                             ) : null}
                         </div>
                         <div>
-                            <SubscribeButton type="bazaar" topic={props.item.tag} />
+                            <SubscribeButton
+                                type="bazaar"
+                                topic={props.item.tag}
+                                currentPrice={avgBuyPrice || undefined}
+                                currentSellPrice={avgSellPrice || undefined}
+                            />
                         </div>
                         <div>
                             <ShareButton title={'Prices for ' + props.item.name} text="Browse the Bazaar history in Hypixel Skyblock" />

diff --git a/components/SubscribeButton/ChannelPicker/ChannelPicker.module.css b/components/SubscribeButton/ChannelPicker/ChannelPicker.module.css
@@ -0,0 +1,86 @@
+.channelPicker {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    margin-top: 5px;
+}
+
+.channel {
+    display: flex;
+    align-items: center;
+    gap: 11px;
+    border: 1px solid var(--bs-border-color, #444);
+    border-radius: 9px;
+    padding: 10px 12px;
+    margin: 0;
+    cursor: pointer;
+}
+
+.channelColumn {
+    flex-direction: column;
+    align-items: stretch;
+}
+
+.channelRow {
+    display: flex;
+    align-items: center;
+    gap: 11px;
+    margin: 0;
+    cursor: pointer;
+}
+
+.channelActive {
+    border-color: var(--bs-primary, #0d6efd);
+    background-color: rgba(13, 110, 253, 0.08);
+}
+
+.channel :global(.form-check) {
+    margin: 0;
+    min-height: auto;
+    flex: none;
+}
+
+.icon {
+    flex: none;
+    opacity: 0.85;
+}
+
+.spinner {
+    flex: none;
+    margin: 2px;
+}
+
+.text {
+    display: flex;
+    flex-direction: column;
+    min-width: 0;
+}
+
+.title {
+    font-weight: 600;
+    line-height: 1.3;
+}
+
+.subtitle {
+    font-size: 0.8rem;
+    opacity: 0.7;
+}
+
+.error {
+    font-size: 0.8rem;
+    color: var(--bs-danger, #dc3545);
+    margin-top: 2px;
+}
+
+.disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+}
+
+.discordExpand {
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
+    margin-top: 10px;
+    padding-left: 30px;
+}