From 857b4454a82312e045bf4a4fdfbd6f88593d3b63 Mon Sep 17 00:00:00 2001 From: Moses Miller Date: Thu, 4 Jan 2018 18:20:59 -0800 Subject: [PATCH] Fix IndexError instead of StopIteration when MessageIterator is done (#69) * Fix IndexError instead of StopIteration when MessageIterator is done * Make fill() return a boolean based on whether items were added to the buffer, and update __next__() accordingly --- disco/types/channel.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/disco/types/channel.py b/disco/types/channel.py index 2419bec..edaaef1 100644 --- a/disco/types/channel.py +++ b/disco/types/channel.py @@ -518,6 +518,8 @@ class MessageIterator(object): def fill(self): """ Fills the internal buffer up with :class:`disco.types.message.Message` objects from the API. + + Returns a boolean indicating whether items were added to the buffer. """ self._buffer = self.client.api.channels_messages_list( self.channel.id, @@ -526,7 +528,7 @@ class MessageIterator(object): limit=self.chunk_size) if not len(self._buffer): - return + return False self.after = None self.before = None @@ -538,6 +540,8 @@ class MessageIterator(object): self._buffer.reverse() self.after = self._buffer[-1].id + return True + def next(self): return self.__next__() @@ -546,7 +550,9 @@ class MessageIterator(object): def __next__(self): if not len(self._buffer): - self.fill() + filled = self.fill() + if not filled: + raise StopIteration if self.bulk: res = self._buffer