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

Update notifications; canary notifications

Browse source
This commit is contained in:
Philipp Heckel 2022-05-16 13:45:54 -04:00
parent b93d654aca
commit e780b17622
3 changed files with 111 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

46
server/message_cache.go
View file

@ -48,6 +48,11 @@ const (
INSERT INTO messages (mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, attachment_owner, encoding, published)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`
updateMessageQuery = `
UPDATE messages
SET time = ?
WHERE topic = ? AND mid = ? AND published = 0
`
pruneMessagesQuery = `DELETE FROM messages WHERE time < ? AND published = 1`
selectRowIDFromMessageID = `SELECT id FROM messages WHERE topic = ? AND mid = ?`
selectMessagesSinceTimeQuery = `
@ -80,6 +85,11 @@ const (
WHERE time <= ? AND published = 0
ORDER BY time, id
`
selectMessagesScheduledByTagOrID = `
SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, attachment_owner, encoding
FROM messages
WHERE topic = ? AND (tags LIKE ? OR mid = ?) AND published = 0
`
updateMessagePublishedQuery = `UPDATE messages SET published = 1 WHERE mid = ?`
selectMessagesCountQuery = `SELECT COUNT(*) FROM messages`
selectMessageCountForTopicQuery = `SELECT COUNT(*) FROM messages WHERE topic = ?`
@ -219,8 +229,7 @@ func createMemoryFilename() string {
func (c *messageCache) AddMessage(m *message) error {
if m.Event != messageEvent {
return errUnexpectedMessageType
}
if c.nop {
} else if c.nop {
return nil
}
published := m.Time <= time.Now().Unix()
@ -266,6 +275,21 @@ func (c *messageCache) AddMessage(m *message) error {
return err
}
func (c *messageCache) UpdateMessage(m *message) error {
if m.Event != messageEvent {
return errUnexpectedMessageType
} else if c.nop {
return nil
}
_, err := c.db.Exec(
updateMessageQuery,
m.Time,
m.Topic,
m.ID,
)
return err
}
func (c *messageCache) Messages(topic string, since sinceMarker, scheduled bool) ([]*message, error) {
if since.IsNone() {
return make([]*message, 0), nil
@ -409,6 +433,24 @@ func (c *messageCache) AttachmentsExpired() ([]string, error) {
return ids, nil
}
func (c *messageCache) MessagesScheduledByTagOrID(topic, selector string) ([]*message, error) {
rows, err := c.db.Query(selectMessagesScheduledByTagOrID, topic, "%"+selector+"%", selector) // Ugly string matching search first, later match exactly
if err != nil {
return nil, err
}
maybeMatchingMessages, err := readMessages(rows)
if err != nil {
return nil, err
}
messages := make([]*message, 0)
for _, m := range maybeMatchingMessages {
if util.InStringList(m.Tags, selector) || m.ID == selector {
messages = append(messages, m)
}
}
return messages, nil
}
func readMessages(rows *sql.Rows) ([]*message, error) {
defer rows.Close()
messages := make([]*message, 0)