diff --git a/kernel/model/emojis_watcher.go b/kernel/model/emojis_watcher.go index 855d972f4..046b4e470 100644 --- a/kernel/model/emojis_watcher.go +++ b/kernel/model/emojis_watcher.go @@ -56,28 +56,17 @@ func watchEmojis() { go func() { defer logging.Recover() - var ( - timer *time.Timer - lastEvent fsnotify.Event - ) - timer = time.NewTimer(100 * time.Millisecond) + timer := time.NewTimer(100 * time.Millisecond) <-timer.C // timer should be expired at first for { select { - case event, ok := <-emojisWatcher.Events: + case _, ok := <-emojisWatcher.Events: if !ok { return } - lastEvent = event timer.Reset(time.Millisecond * 100) - - if lastEvent.Op&fsnotify.Rename == fsnotify.Rename || lastEvent.Op&fsnotify.Write == fsnotify.Write { - util.PushReloadEmojiConf() - } else if lastEvent.Op&fsnotify.Remove == fsnotify.Remove { - util.PushReloadEmojiConf() - } case err, ok := <-emojisWatcher.Errors: if !ok { return @@ -85,11 +74,7 @@ func watchEmojis() { logging.LogErrorf("watch emojis failed: %s", err) case <-timer.C: //logging.LogInfof("emojis changed: %s", lastEvent) - if lastEvent.Op&fsnotify.Remove == fsnotify.Remove { - util.PushReloadEmojiConf() - } else { - util.PushReloadEmojiConf() - } + util.PushReloadEmojiConf() } } }() diff --git a/kernel/model/emojis_watcher_darwin.go b/kernel/model/emojis_watcher_darwin.go index 5c12590bd..3bdf06a8e 100644 --- a/kernel/model/emojis_watcher_darwin.go +++ b/kernel/model/emojis_watcher_darwin.go @@ -52,15 +52,7 @@ func watchEmojis() { } //logging.LogInfof("emojis changed: %s", event) - if watcher.Write == event.Op { - IncSync() - } - - if watcher.Remove == event.Op { - util.PushReloadEmojiConf() - } else { - util.PushReloadEmojiConf() - } + util.PushReloadEmojiConf() case err, ok := <-emojisWatcher.Error: if !ok { return