Add attachment expiry option

server/cache_sqlite.go

@@ -279,7 +279,7 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
 		var timestamp, attachmentSize, attachmentExpires int64
 		var priority int
 		var id, topic, msg, title, tagsStr, click, attachmentName, attachmentType, attachmentURL, attachmentOwner string
-		if err := rows.Scan(&id, &timestamp, &topic, &msg, &title, &priority, &tagsStr, &click, &attachmentName, &attachmentType, &attachmentSize, &attachmentExpires, &attachmentOwner, &attachmentURL); err != nil {
+		if err := rows.Scan(&id, &timestamp, &topic, &msg, &title, &priority, &tagsStr, &click, &attachmentName, &attachmentType, &attachmentSize, &attachmentExpires, &attachmentURL, &attachmentOwner); err != nil {
 			return nil, err
 		}
 		var tags []string

server/config.go

@@ -27,14 +27,13 @@ const (
 // - per visitor email limit: max number of emails (here: 16 email bucket, replenished at a rate of one per hour)
 // - per visitor attachment size limit:
 const (
-	DefaultTotalTopicLimit                      = 5000
-	DefaultVisitorSubscriptionLimit             = 30
-	DefaultVisitorRequestLimitBurst             = 60
-	DefaultVisitorRequestLimitReplenish         = 10 * time.Second
-	DefaultVisitorEmailLimitBurst               = 16
-	DefaultVisitorEmailLimitReplenish           = time.Hour
-	DefaultVisitorAttachmentTotalSizeLimit      = 50 * 1024 * 1024
-	DefaultVisitorAttachmentBytesLimitReplenish = time.Hour
+	DefaultTotalTopicLimit                 = 5000
+	DefaultVisitorSubscriptionLimit        = 30
+	DefaultVisitorRequestLimitBurst        = 60
+	DefaultVisitorRequestLimitReplenish    = 10 * time.Second
+	DefaultVisitorEmailLimitBurst          = 16
+	DefaultVisitorEmailLimitReplenish      = time.Hour
+	DefaultVisitorAttachmentTotalSizeLimit = 50 * 1024 * 1024
 )
 
 // Config is the main config struct for the application. Use New to instantiate a default config struct.

server/server.go

@@ -637,7 +637,6 @@ func (s *Server) handleBodyAsAttachment(v *visitor, m *message, body *util.Peake
 	if m.Message == "" {
 		m.Message = fmt.Sprintf(defaultAttachmentMessage, m.Attachment.Name)
 	}
-	// TODO do not allowed delayed delivery for attachments
 	visitorAttachmentsSize, err := s.cache.AttachmentsSize(v.ip)
 	if err != nil {
 		return err
@@ -1015,10 +1014,10 @@ func (s *Server) sendDelayedMessages() error {
 			if err := t.Publish(m); err != nil {
 				log.Printf("unable to publish message %s to topic %s: %v", m.ID, m.Topic, err.Error())
 			}
-			if s.firebase != nil {
-				if err := s.firebase(m); err != nil {
-					log.Printf("unable to publish to Firebase: %v", err.Error())
-				}
+		}
+		if s.firebase != nil { // Firebase subscribers may not show up in topics map
+			if err := s.firebase(m); err != nil {
+				log.Printf("unable to publish to Firebase: %v", err.Error())
 			}
 		}
 		if err := s.cache.MarkPublished(m); err != nil {