handling of code removal for repeat reminders commented. quick ignore…

… of empty target for triggered reminder

plugin.json

@@ -2,7 +2,7 @@
     "id": "com.github.scottleedavis.mattermost-plugin-remind",
     "name": "Remind Bot Mattermost Plugin",
     "description": "Sets Reminders",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "server": {
         "executables": {
             "linux-amd64": "server/dist/plugin-linux-amd64",

server/manifest.go

@@ -5,5 +5,5 @@ var manifest = struct {
 	Version string
 }{
 	Id:      "com.github.scottleedavis.mattermost-plugin-remind",
-	Version: "0.1.4",
+	Version: "0.1.5",
 }

server/occurrence.go

@@ -18,11 +18,11 @@ type Occurrence struct {
 
 	ReminderId string
 
+	Repeat string
+
 	Occurrence time.Time
 
 	Snoozed time.Time
-
-	Repeat string
 }
 
 func (p *Plugin) ClearScheduledOccurrence(reminder Reminder, occurrence Occurrence) {
@@ -222,7 +222,9 @@ func (p *Plugin) addOccurrences(request *ReminderRequest, occurrences []time.Tim
 		}
 
 		request.Reminder.Occurrences = append(request.Reminder.Occurrences, occurrence)
+
 		p.upsertOccurrence(&occurrence)
+
 	}
 
 	return nil

server/reminder.go

@@ -76,6 +76,11 @@ func (p *Plugin) TriggerReminders() {
 			T, _ := p.translation(user)
 			reminder := p.findReminder(reminders, occurrence)
 
+			if reminder.Target == "" {
+				p.API.LogError("No target found for reminder")
+				continue
+			}
+
 			if strings.HasPrefix(reminder.Target, "@") || strings.HasPrefix(reminder.Target, T("me")) { //@user
 
 				var targetId string
@@ -344,16 +349,17 @@ func (p *Plugin) UpsertReminder(request *ReminderRequest) error {
 	}
 
 	duplicateReminder := false
-	for _, r := range reminders {
-		r.Id = request.Reminder.Id
-		if r.Username == request.Reminder.Username &&
-			r.Target == request.Reminder.Target &&
-			r.Message == request.Reminder.Message &&
-			r.When == request.Reminder.When {
-			duplicateReminder = true
-			break
-		}
-	}
+	// a feature requested by PM.   seems to create undesired results
+	//for _, r := range reminders {
+	//	r.Id = request.Reminder.Id
+	//	if r.Username == request.Reminder.Username &&
+	//		r.Target == request.Reminder.Target &&
+	//		r.Message == request.Reminder.Message &&
+	//		r.When == request.Reminder.When {
+	//		duplicateReminder = true
+	//		break
+	//	}
+	//}
 	if !duplicateReminder {
 		reminders = append(reminders, request.Reminder)
 	}