Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 224c165d72 | |||
| bf7d2514f2 | |||
| 4e37bc5ab9 |
@ -409,9 +409,9 @@ def todoist_scrobble_task(
|
|||||||
user_id: int,
|
user_id: int,
|
||||||
started: bool = False,
|
started: bool = False,
|
||||||
stopped: bool = False,
|
stopped: bool = False,
|
||||||
context_list: list[str] = [],
|
user_context_list: list[str] = [],
|
||||||
) -> Scrobble:
|
) -> Scrobble:
|
||||||
title = get_title_from_labels(todoist_task.get("todoist_label_list", []), context_list)
|
title = get_title_from_labels(todoist_task.get("todoist_label_list", []), user_context_list)
|
||||||
task = Task.find_or_create(title)
|
task = Task.find_or_create(title)
|
||||||
|
|
||||||
timestamp = pendulum.parse(todoist_task.get("updated_at", timezone.now()))
|
timestamp = pendulum.parse(todoist_task.get("updated_at", timezone.now()))
|
||||||
@ -533,10 +533,10 @@ def emacs_scrobble_task(
|
|||||||
user_id: int,
|
user_id: int,
|
||||||
started: bool = False,
|
started: bool = False,
|
||||||
stopped: bool = False,
|
stopped: bool = False,
|
||||||
context_list: list[str] = [],
|
user_context_list: list[str] = [],
|
||||||
) -> Scrobble | None:
|
) -> Scrobble | None:
|
||||||
source_id = task_data.get("source_id")
|
source_id = task_data.get("source_id")
|
||||||
title = get_title_from_labels(task_data.get("labels", []), context_list)
|
title = get_title_from_labels(task_data.get("labels", []), user_context_list)
|
||||||
|
|
||||||
task = Task.find_or_create(title)
|
task = Task.find_or_create(title)
|
||||||
|
|
||||||
|
|||||||
@ -9,12 +9,14 @@ def get_title_from_labels(labels: list[str], user_context_labels: list[str] = []
|
|||||||
task_context_labels: list = user_context_labels or settings.DEFAULT_TASK_CONTEXT_TAG_LIST
|
task_context_labels: list = user_context_labels or settings.DEFAULT_TASK_CONTEXT_TAG_LIST
|
||||||
for label in labels:
|
for label in labels:
|
||||||
# TODO We may also want to take a user list of labels instead
|
# TODO We may also want to take a user list of labels instead
|
||||||
|
label = label.capitalize()
|
||||||
if label in task_context_labels:
|
if label in task_context_labels:
|
||||||
title = label.capitalize()
|
title = label
|
||||||
|
continue
|
||||||
|
|
||||||
if title == "Unknown":
|
if title == "Unknown":
|
||||||
logger.warning(
|
logger.warning(
|
||||||
"Missing a prefix and suffix tag for task",
|
"Missing a configured title context for task",
|
||||||
extra={"labels": labels},
|
extra={"labels": labels, "task_context_labels": task_context_labels},
|
||||||
)
|
)
|
||||||
return title
|
return title
|
||||||
|
|||||||
@ -100,7 +100,7 @@ def todoist_webhook(request):
|
|||||||
todoist_task,
|
todoist_task,
|
||||||
user_profile.user_id,
|
user_profile.user_id,
|
||||||
stopped=task_stopped,
|
stopped=task_stopped,
|
||||||
context_list=user_profile.task_context_tags,
|
user_context_list=user_profile.task_context_tags,
|
||||||
)
|
)
|
||||||
|
|
||||||
if todoist_note:
|
if todoist_note:
|
||||||
@ -144,7 +144,7 @@ def emacs_webhook(request):
|
|||||||
if not user_id:
|
if not user_id:
|
||||||
user_id = 1
|
user_id = 1
|
||||||
|
|
||||||
user_profile = UserProfile.objects.filter(user_id=user_id)
|
user_profile = UserProfile.objects.filter(user_id=user_id).first()
|
||||||
|
|
||||||
scrobble = None
|
scrobble = None
|
||||||
if post_data.get("source_id"):
|
if post_data.get("source_id"):
|
||||||
@ -153,7 +153,7 @@ def emacs_webhook(request):
|
|||||||
user_id,
|
user_id,
|
||||||
started=task_in_progress,
|
started=task_in_progress,
|
||||||
stopped=task_stopped,
|
stopped=task_stopped,
|
||||||
context_list=user_profile.task_context_tags,
|
user_context_list=user_profile.task_context_tags,
|
||||||
)
|
)
|
||||||
|
|
||||||
if not scrobble:
|
if not scrobble:
|
||||||
|
|||||||
Reference in New Issue
Block a user