remove magic strings

pubnub · Jun 6, 2024 · 4c5ae5d · 4c5ae5d
1 parent 3596777
commit 4c5ae5d
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 11 deletions.
diff --git a/src/Api/PubnubApi/Constants.cs b/src/Api/PubnubApi/Constants.cs
@@ -0,0 +1,9 @@
+using System;
+namespace PubnubApi
+{
+	public static class Constants
+	{
+		public static readonly string Pnpres = "-pnpres";
+	}
+}
+
diff --git a/src/Api/PubnubApi/EndPoint/PubSub/SubscribeEndpoint.cs b/src/Api/PubnubApi/EndPoint/PubSub/SubscribeEndpoint.cs
@@ -5,7 +5,6 @@
 using PubnubApi.EventEngine.Subscribe;
 using PubnubApi.EventEngine.Core;
 using PubnubApi.EventEngine.Subscribe.States;
-using PubnubApi.EventEngine.Subscribe.Common;
 using PubnubApi.EventEngine.Common;
 
 namespace PubnubApi.EndPoint
@@ -134,7 +133,7 @@ private void Subscribe(string[] channels, string[] channelGroups, SubscriptionCu
 			}
 			subscribeEventEngine.Subscribe<T>(channels, channelGroups, cursor);
 			if (this.presenceOperation != null) {
-				presenceOperation.Start(channels?.Where(c => !c.EndsWith("-pnpres")).ToArray(), channelGroups?.Where(cg => !cg.EndsWith("-pnpres")).ToArray());
+				presenceOperation.Start(channels?.Where(c => !c.EndsWith(Constants.Pnpres)).ToArray(), channelGroups?.Where(cg => !cg.EndsWith(Constants.Pnpres)).ToArray());
 			}
 		}
 

diff --git a/src/Api/PubnubApi/EndPoint/PubSub/UnsubscribeEndpoint.cs b/src/Api/PubnubApi/EndPoint/PubSub/UnsubscribeEndpoint.cs
@@ -78,12 +78,12 @@ private void Unsubscribe(string[] channels, string[] channelGroups)
 				subscribeEventEngine = subscribeEventEngineFactory.GetEventEngine(instanceId);
 				channels = channels ?? new string[] { };
 				channelGroups = channelGroups ?? new string[] { };
-				var channelsWithPresence = channels.Concat(channels.Select((c) => $"{c}-pnpres")).ToList();
+				var channelsWithPresence = channels.Concat(channels.Select((c) => $"{c}{Constants.Pnpres}")).ToList();
 				var filteredChannelNames = new List<string>(subscribeEventEngine.Channels);
 				foreach (var c in channelsWithPresence) {
 					filteredChannelNames.Remove(c);
 				}
-				var channelGroupsWithPresence = channelGroups.Concat(channelGroups.Select((cg) => $"{cg}-pnpres")).ToList();
+				var channelGroupsWithPresence = channelGroups.Concat(channelGroups.Select((cg) => $"{cg}{Constants.Pnpres}")).ToList();
 				var filteredChannelGroupNames = new List<string>(subscribeEventEngine.ChannelGroups);
 				foreach (var g in channelGroupsWithPresence) {
 					filteredChannelGroupNames.Remove(g);

diff --git a/src/Api/PubnubApi/Entity/Channel.cs b/src/Api/PubnubApi/Entity/Channel.cs
@@ -19,7 +19,7 @@ public Channel(string name, Pubnub pubnub, EventEmitter eventEmitter)
 
 		public Subscription Subscription(SubscriptionOptions? options = SubscriptionOptions.None)
 		{
-			return new Subscription(options == SubscriptionOptions.ReceivePresenceEvents ? new string[] { Name, $"{Name}-pnpres" } : new string[] { Name }, new string[] { }, options, this.Pubnub, this.EventEmitter);
+			return new Subscription(options == SubscriptionOptions.ReceivePresenceEvents ? new string[] { Name, $"{Name}{Constants.Pnpres}" } : new string[] { Name }, new string[] { }, options, this.Pubnub, this.EventEmitter);
 		}
 	}
 }
diff --git a/src/Api/PubnubApi/Entity/ChannelGroup.cs b/src/Api/PubnubApi/Entity/ChannelGroup.cs
@@ -18,7 +18,7 @@ public ChannelGroup(string name, Pubnub pubnub, EventEmitter eventEmitter)
 
 		public Subscription Subscription(SubscriptionOptions? options = SubscriptionOptions.None)
 		{
-			return new Subscription(new string[] { }, options == SubscriptionOptions.ReceivePresenceEvents ? new string[] { Name, $"{Name}-pnpres" } : new string[] { Name }, options, this.Pubnub, this.EventEmitter);
+			return new Subscription(new string[] { }, options == SubscriptionOptions.ReceivePresenceEvents ? new string[] { Name, $"{Name}{Constants.Pnpres}" } : new string[] { Name }, options, this.Pubnub, this.EventEmitter);
 		}
 	}
 }
diff --git a/src/Api/PubnubApi/Entity/ChannelMetadata.cs b/src/Api/PubnubApi/Entity/ChannelMetadata.cs
@@ -17,7 +17,7 @@ public ChannelMetadata(string id, Pubnub pubnub, EventEmitter eventEmitter)
 
 		public Subscription Subscription(SubscriptionOptions options = SubscriptionOptions.None)
 		{
-			return new Subscription(options == SubscriptionOptions.ReceivePresenceEvents ? new string[] { Id, $"{Id}-pnpres" } : new string[] { Id }, new string[] { }, options, this.Pubnub, this.EventEmitter);
+			return new Subscription(options == SubscriptionOptions.ReceivePresenceEvents ? new string[] { Id, $"{Id}{Constants.Pnpres}" } : new string[] { Id }, new string[] { }, options, this.Pubnub, this.EventEmitter);
 		}
 	}
 }
diff --git a/src/Api/PubnubApi/Entity/SubscriptionSet.cs b/src/Api/PubnubApi/Entity/SubscriptionSet.cs
@@ -23,14 +23,14 @@ public SubscriptionSet(string[] channels, string[] channelGroups, SubscriptionOp
 			this.Options = options;
 
 			foreach (var c in channels
-				.Where(c => !c.EndsWith("-pnpres"))) {
+				.Where(c => !c.EndsWith(Constants.Pnpres))) {
 				var subscription = this.Pubnub.Channel(c).Subscription(this.Options);
 				this.ChannelNames.AddRange(subscription.ChannelNames);
 				this.SubscriptionList.Add(subscription);
 			}
 
 			foreach (var cg in channelGroups
-				.Where(cg => !cg.EndsWith("-pnpres"))) {
+				.Where(cg => !cg.EndsWith(Constants.Pnpres))) {
 				var subscription = this.Pubnub.ChannelGroup(cg).Subscription(this.Options);
 				this.ChannelGroupNames.AddRange(subscription.ChannelGroupNames);
 				this.SubscriptionList.Add(subscription);

diff --git a/src/Api/PubnubApi/Entity/UserMetadata.cs b/src/Api/PubnubApi/Entity/UserMetadata.cs
@@ -17,7 +17,7 @@ public UserMetadata(string id, Pubnub pubnub, EventEmitter eventEmitter)
 
 		public Subscription Subscription(SubscriptionOptions options = SubscriptionOptions.None)
 		{
-			return new Subscription(options == SubscriptionOptions.ReceivePresenceEvents ? new string[] { Id, $"{Id}-pnpres" } : new string[] { Id }, new string[] { }, options, this.Pubnub, this.EventEmitter);
+			return new Subscription(options == SubscriptionOptions.ReceivePresenceEvents ? new string[] { Id, $"{Id}{Constants.Pnpres}" } : new string[] { Id }, new string[] { }, options, this.Pubnub, this.EventEmitter);
 		}
 	}
 }

diff --git a/src/Api/PubnubApi/EventEngine/Subscribe/SubscribeEventEngine.cs b/src/Api/PubnubApi/EventEngine/Subscribe/SubscribeEventEngine.cs
@@ -3,7 +3,6 @@
 using PubnubApi.EventEngine.Subscribe.States;
 using System.Collections.Generic;
 using System.Linq;
-using PubnubApi.EventEngine.Subscribe.Common;
 using System;
 using PubnubApi.EventEngine.Subscribe.Events;
 using PubnubApi.EventEngine.Common;

diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj
@@ -605,6 +605,9 @@
     <Compile Include="..\PubnubApi\Push\Mpns\MpnsToastNotification.cs">
       <Link>Push\Mpns\MpnsToastNotification.cs</Link>
     </Compile>
+    <Compile Include="..\PubnubApi\Constants.cs">
+      <Link>Constants.cs</Link>
+    </Compile>
     <Compile Include="..\PubnubApi\Security\Crypto\Common\ByteArrayExtensions.cs" Link="Security\Crypto\Common\ByteArrayExtensions.cs" />
     <Compile Include="..\PubnubApi\Security\Crypto\Common\Util.cs" Link="Security\Crypto\Common\Util.cs" />
     <Compile Include="..\PubnubApi\Security\Crypto\CryptoModule.cs" Link="Security\Crypto\CryptoModule.cs" />

diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj
@@ -724,6 +724,9 @@
     <Compile Include="..\PubnubApi\Push\Mpns\MpnsToastNotification.cs">
       <Link>Push\Mpns\MpnsToastNotification.cs</Link>
     </Compile>
+    <Compile Include="..\PubnubApi\Constants.cs">
+      <Link>Constants.cs</Link>
+    </Compile>
     <Compile Include="..\PubnubApi\Security\Crypto\CryptoModule.cs">
       <Link>Security\Crypto\CryptoModule.cs</Link>
     </Compile>

diff --git a/src/Api/PubnubApiUnity/PubnubApiUnity.csproj b/src/Api/PubnubApiUnity/PubnubApiUnity.csproj
@@ -605,6 +605,9 @@
     <Compile Include="..\PubnubApi\Push\Mpns\MpnsToastNotification.cs">
       <Link>Push\Mpns\MpnsToastNotification.cs</Link>
     </Compile>
+    <Compile Include="..\PubnubApi\Constants.cs">
+      <Link>Constants.cs</Link>
+    </Compile>
     <Compile Include="..\PubnubApi\Security\Crypto\Common\ByteArrayExtensions.cs" Link="Security\Crypto\Common\ByteArrayExtensions.cs" />
     <Compile Include="..\PubnubApi\Security\Crypto\Common\Util.cs" Link="Security\Crypto\Common\Util.cs" />
     <Compile Include="..\PubnubApi\Security\Crypto\CryptoModule.cs" Link="Security\Crypto\CryptoModule.cs" />