fix: sort channel recurring reminders among recurrent reminders

Before, channel recurring reminders where categorized as channel
reminders, which gave them a "Complete" action.

But it doesn't make sense to complete a recurring reminder – and it even
causes the reminder not to be scheduled again, and eventually to stop
working.

This commit, by categorizing channel recurring reminders as recurring
reminders, make sure they won't be marked as "Completed" by mistake.

Probably closes scottleedavis#167

Author: kemenaran

server/list.go

@@ -154,8 +154,7 @@ func (p *Plugin) categorizeOccurrences(reminders []Reminder) (
 				((occurrence.Repeat == "" && isFuture) ||
 					(s != p.emptyTime && s.After(time.Now().UTC()))) {
 				upcomingOccurrences = append(upcomingOccurrences, occurrence)
-			} else if !isChannelReminder &&
-				occurrence.Repeat != "" && isFuture {
+			} else if occurrence.Repeat != "" && isFuture {
 				recurringOccurrences = append(recurringOccurrences, occurrence)
 			} else if !isCompleted &&
 				isPast &&

server/list_test.go

@@ -99,6 +99,23 @@ func TestListReminders(t *testing.T) {
 		Completed: p.emptyTime,
 	}
 
+	channelRecurringReminder := Reminder{
+		Id:          model.NewId(),
+		Username:    user.Username,
+		Target:      "~" + publicChannel.Name,
+		Message:     "This reminder triggers in a channel several times",
+		When:        "every Tuesday at 10:00AM",
+		Occurrences: []Occurrence{
+			{
+				Id:         model.NewId(),
+				ReminderId: model.NewId(),
+				Repeat:     "every Tuesday at 10:00AM",
+				Occurrence: futureOccurrenceDate,
+			},
+		},
+		Completed: p.emptyTime,
+	}
+
 	setupAPI := func(reminders []Reminder) *plugintest.API {
 		serializedReminders, _ := json.Marshal(reminders)
 		api := &plugintest.API{}
@@ -126,6 +143,16 @@ func TestListReminders(t *testing.T) {
 		assert.Contains(t, attachments[3].Text, T("list.channel"), "The next displayed reminders must be channel reminders")
 		assert.Contains(t, attachments[len(attachments)-1].Text, T("reminders.page.numbers"), "The last attachment must be list pagination and controls")
 	})
+
+	t.Run("the list categorizes channel-and-recurring reminders with recurring reminders", func(t *testing.T) {
+		reminders := []Reminder { channelRecurringReminder }
+		p.API = setupAPI(reminders)
+
+		post := p.ListReminders(user, originChannel.Id)
+
+		attachments := post.Attachments()
+		assert.Contains(t, attachments[0].Text, T("list.recurring"), "Reminders both channel and recurring must be categorized with recurring reminders")
+	})
 }
 
 func TestUpdateListReminders(t *testing.T) {