prevent sorting on keys that can have None values from breaking albums

DamourYouKnow · Dec 2, 2018 · 59d976d · 59d976d
1 parent 66724e0
commit 59d976d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.3.1 | 2018-12-02
+
+### Fixed
+- Sorting by main unit and sub unit no longer breaks your album.
+
 ## 1.3.0 | 2018-12-01
 
 ### Added

diff --git a/commands/album_commands.py b/commands/album_commands.py
@@ -290,7 +290,11 @@ def _apply_sort(album: list, user: User) -> list:
         'sub_unit'
     ]
 
-    return sorted(album, key=itemgetter(sort, 'id'), reverse=sort_descending)
+    sorted_list = sorted(
+            filter(lambda card: card[sort], album), 
+            key=itemgetter(sort, 'id'), 
+            reverse=sort_descending)
+    return sorted_list + [card for card in album if not card[sort]]
 
 
 def _splice_page(album: list, user: User) -> list: