[GH-36] specify the subscription is relative to the current channel (#63

) channel
mattermost-community · Jul 27, 2020 · 09df443 · 09df443
1 parent 04efd31
commit 09df443
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/server/serializer/channel_subscription.go b/server/serializer/channel_subscription.go
@@ -19,9 +19,9 @@ const (
 	SubscriptionTypeSpace = "space_subscription"
 	SubscriptionTypePage  = "page_subscription"
 
-	aliasAlreadyExist       = "A subscription with the same name already exists."
-	urlSpaceKeyAlreadyExist = "A subscription with the same url and space key already exists."
-	urlPageIDAlreadyExist   = "A subscription with the same url and page id already exists."
+	aliasAlreadyExist       = "A subscription with the same name already exists in this channel."
+	urlSpaceKeyAlreadyExist = "A subscription with the same url and space key already exists in this channel."
+	urlPageIDAlreadyExist   = "A subscription with the same url and page id already exists in this channel."
 )
 
 var eventDisplayName = map[string]string{

diff --git a/server/service/save_subscription.go b/server/service/save_subscription.go
@@ -11,9 +11,9 @@ import (
 
 const (
 	generalSaveError        = "An error occurred attempting to save a subscription."
-	aliasAlreadyExist       = "A subscription with the same name already exists."
-	urlSpaceKeyAlreadyExist = "A subscription with the same url and space key already exists."
-	urlPageIDAlreadyExist   = "A subscription with the same url and page id already exists."
+	aliasAlreadyExist       = "A subscription with the same name already exists in this channel."
+	urlSpaceKeyAlreadyExist = "A subscription with the same url and space key already exists in this channel."
+	urlPageIDAlreadyExist   = "A subscription with the same url and page id already exists in this channel."
 )
 
 func SaveSubscription(subscription serializer.Subscription) (int, error) {