|
|
@ -340,13 +340,13 @@ class Guild(Hashable): |
|
|
|
|
|
|
|
def key(t): |
|
|
|
k, v = t |
|
|
|
return ((not isinstance(k, TextChannel), k.position, k.id) if k else (-1, -1, -1), v) |
|
|
|
return ((k.position, k.id) if k else (-1, -1), v) |
|
|
|
|
|
|
|
_get = self._channels.get |
|
|
|
as_list = [(_get(k), v) for k, v in grouped.items()] |
|
|
|
as_list.sort(key=key) |
|
|
|
for _, channels in as_list: |
|
|
|
channels.sort(key=lambda c: (c.position, c.id)) |
|
|
|
channels.sort(key=lambda c: (not isinstance(c, TextChannel), c.position, c.id)) |
|
|
|
return as_list |
|
|
|
|
|
|
|
def get_channel(self, channel_id): |
|
|
|