From 7ed2f250122454c57ec35183baf148633f02966f Mon Sep 17 00:00:00 2001 From: David Grajal Date: Mon, 13 Sep 2021 10:45:08 +0200 Subject: fix(jira): use assignee.name or assignee.displayName On *.atlassian.com hosts the api returns the name on 'displayName' The jira API doesn't seem to send the field name anymore https://docs.atlassian.com/software/jira/docs/api/7.1.0/com/atlassian/jira/user/UserDetails.html After this commit we use one or the other, whatever is available. --- jira-widget/jira.lua | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'jira-widget') diff --git a/jira-widget/jira.lua b/jira-widget/jira.lua index e475246..45c632e 100644 --- a/jira-widget/jira.lua +++ b/jira-widget/jira.lua @@ -167,13 +167,22 @@ local function worker(user_args) local cur_status = '' for _, issue in ipairs(result.issues) do - local path_to_avatar = HOME_DIR ..'/.cache/awmw/jira-widget/avatars/' .. issue.fields.assignee.name + + local path_to_avatar = HOME_DIR ..'/.cache/awmw/jira-widget/avatars/' .. issue.fields.assignee.name or issue.fields.assignee.displayName + local name = '' + if issue.fields.assignee.name == nil then + name = issue.fields.assignee.displayName + else + name = issue.fields.assignee.name + end + + local path_to_avatar = HOME_DIR ..'/.cache/awmw/jira-widget/avatars/' .. name if not gfs.file_readable(path_to_avatar) then spawn.easy_async(string.format( DOWNLOAD_AVATAR_CMD, HOME_DIR, - issue.fields.assignee.name, + name, issue.fields.assignee.avatarUrls['48x48'])) end -- cgit v1.2.3