Changed channels cache key to "channel.{id}"

discord-php · Apr 14, 2016 · b76c8c6 · b76c8c6
1 parent 57c576b
commit b76c8c6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/Discord/Parts/Channel/Channel.php b/src/Discord/Parts/Channel/Channel.php
@@ -163,11 +163,11 @@ public function moveMember($member)
      */
     public function getMembersAttribute()
     {
-        if (! Cache::has("channels.{$this->id}.voice.members")) {
-            Cache::set("channels.{$this->id}.voice.members", new Collection([], "channels.{$this->id}.voice.members"));
+        if (! Cache::has("channel.{$this->id}.voice.members")) {
+            Cache::set("channel.{$this->id}.voice.members", new Collection([], "channel.{$this->id}.voice.members"));
         }
 
-        return Cache::get("channels.{$this->id}.voice.members");
+        return Cache::get("channel.{$this->id}.voice.members");
     }
 
     /**
@@ -308,15 +308,15 @@ public function getOverwritesAttribute()
             return $this->attributes_cache['overwrites'];
         }
 
-        if ($overwrites = Cache::get("channels.{$this->id}.overwrites")) {
+        if ($overwrites = Cache::get("channel.{$this->id}.overwrites")) {
             return $overwrites;
         }
 
         $overwrites = [];
 
         // Will return an empty collection when you don't have permission.
         if (is_null($this->attributes['permission_overwrites'])) {
-            return new Collection([], "channels.{$this->id}.overwrites");
+            return new Collection([], "channel.{$this->id}.overwrites");
         }
 
         foreach ($this->attributes['permission_overwrites'] as $index => $data) {
@@ -325,9 +325,9 @@ public function getOverwritesAttribute()
             $overwrites[$index] = new Overwrite($data, true);
         }
 
-        $overwrites = new Collection($overwrites, "channels.{$this->id}.overwrites");
+        $overwrites = new Collection($overwrites, "channel.{$this->id}.overwrites");
 
-        Cache::set("channels.{$this->id}.overwrites", $overwrites);
+        Cache::set("channel.{$this->id}.overwrites", $overwrites);
 
         return $overwrites;
     }

diff --git a/src/Discord/Parts/Channel/Message.php b/src/Discord/Parts/Channel/Message.php
@@ -90,7 +90,7 @@ public function reply($text)
      */
     public function getChannelAttribute()
     {
-        if ($channel = Cache::get("channels.{$this->channel_id}")) {
+        if ($channel = Cache::get("channel.{$this->channel_id}")) {
             return $channel;
         }
 
@@ -109,14 +109,14 @@ public function getChannelAttribute()
      */
     public function getFullChannelAttribute()
     {
-        if ($channel = Cache::get("channels.{$this->channel_id}")) {
+        if ($channel = Cache::get("channel.{$this->channel_id}")) {
             return $channel;
         }
 
         $request = Guzzle::get($this->replaceWithVariables('channels/:channel_id'));
         $channel = new Channel((array) $request, true);
 
-        Cache::set("channels.{$channel->id}", $channel);
+        Cache::set("channel.{$channel->id}", $channel);
 
         return $channel;
     }

diff --git a/src/Discord/Parts/WebSockets/VoiceStateUpdate.php b/src/Discord/Parts/WebSockets/VoiceStateUpdate.php
@@ -64,7 +64,7 @@ public function getMemberAttribute()
      */
     public function getChannelAttribute()
     {
-        return Cache::get("channels.{$this->channel_id}");
+        return Cache::get("channel.{$this->channel_id}");
     }
 
     /**

diff --git a/src/Discord/WebSockets/Events/ChannelCreate.php b/src/Discord/WebSockets/Events/ChannelCreate.php
@@ -35,7 +35,7 @@ public function getData($data, $discord)
      */
     public function updateDiscordInstance($data, $discord)
     {
-        Cache::set("channels.{$data->id}", $data);
+        Cache::set("channel.{$data->id}", $data);
 
         foreach ($discord->guilds as $index => $guild) {
             if ($guild->id == $data->guild_id) {

diff --git a/src/Discord/WebSockets/WebSocket.php b/src/Discord/WebSockets/WebSocket.php
@@ -478,7 +478,7 @@ public function handleReady($data)
 
                 $channels->push($channelPart);
 
-                Cache::set("channels.{$channelPart->id}", $channelPart);
+                Cache::set("channel.{$channelPart->id}", $channelPart);
             }
 
             $channels->setCacheKey("guild.{$guild->id}.channels", true);