aboutsummaryrefslogtreecommitdiff
path: root/src/model/event.rs
diff options
context:
space:
mode:
authorLakelezz <[email protected]>2017-10-23 21:10:47 +0200
committerZeyla Hellyer <[email protected]>2017-10-23 12:10:47 -0700
commite02d5fb8171b11214e1502c6754fef1972bbf1b9 (patch)
tree180de3f7201d36d2a81a8d85d9d4870d82efddc6 /src/model/event.rs
parentUpdate dependencies (diff)
downloadserenity-e02d5fb8171b11214e1502c6754fef1972bbf1b9.tar.xz
serenity-e02d5fb8171b11214e1502c6754fef1972bbf1b9.zip
Properly update emojis, fix shard retries, fix cs
* If a guild's emojis are being altered, Serenity will straight up use the new `HashMap` instead of just extending. If `connect()` returns an `Err`, it will retry connecting. Cleaned up `help_command.rs`.
Diffstat (limited to 'src/model/event.rs')
-rw-r--r--src/model/event.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/model/event.rs b/src/model/event.rs
index 086f422..d4148b9 100644
--- a/src/model/event.rs
+++ b/src/model/event.rs
@@ -404,7 +404,9 @@ impl CacheUpdate for GuildEmojisUpdateEvent {
fn update(&mut self, cache: &mut Cache) -> Option<()> {
cache.guilds.get_mut(&self.guild_id).map(|guild| {
- guild.with_mut(|g| g.emojis.extend(self.emojis.clone()))
+ guild.with_mut(|g| {
+ g.emojis.clone_from(&self.emojis)
+ });
});
None