Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions task_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,21 +289,19 @@ def __set_task_complete(username: str, tier: str, task_id: int, complete: bool):
None

'''
def generate_task_for_tier(username, tier) ->TaskData or None: # type: ignore
def generate_task_for_tier(username, tier) -> TaskData or None: # type: ignore
user = get_user(username)
uncompleted_tasks = []

if user.current_task_for_tier(tier) is None:
all_tasks = tasklists.list_for_tier(tier, user.lms_enabled)
completed_task_ids = list(map(lambda x: x.task_id, user.get_task_list(tier).completed_tasks))
uncompleted_tasks = list(filter(lambda x: x.id not in completed_task_ids, all_tasks))

if len(uncompleted_tasks) != 0:
if tier == "masterTasks" and uncompleted_tasks[0].id == 1:
generated_task = uncompleted_tasks[0]
__set_current_task(username, tier, generated_task.id, True)
return generated_task

generated_task = random.choice(uncompleted_tasks)
__set_current_task(username, tier, generated_task.id, True)
return generated_task
Expand Down Expand Up @@ -410,6 +408,7 @@ def __get_firework_variables(username, tier):

def complete_task_unofficial_tier(username: str, task_id: int, tier: str) -> dict:
__set_task_complete(username, tier, task_id, True)
__set_current_task(username, tier, task_id, False)
return __get_firework_variables(username, tier)


Expand Down