From acbdbe413eecfa66f22fc0acde4a6cdf02c5891a Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Thu, 23 May 2024 20:04:59 -0400 Subject: [PATCH] Label prefixes are now removed before labels are added to the form data. --- Scripts/server_gitea_api.gd | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Scripts/server_gitea_api.gd b/Scripts/server_gitea_api.gd index 76c3216..a903dd3 100644 --- a/Scripts/server_gitea_api.gd +++ b/Scripts/server_gitea_api.gd @@ -146,14 +146,19 @@ func __prepare_form_thread(callback:Callable) -> void: var priority_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/priority_label_prefix", DEFAULT_PRIORITY_LABEL_PREFIX) for label_in:Dictionary in response_data: if version_prefix and label_in["name"].begins_with(version_prefix): + label_in["name"] = (label_in["name"] as String).replace(version_prefix, "") tag_lists[BugbotTagArray.VERSION].append(label_in) if hardware_prefix and label_in["name"].begins_with(hardware_prefix): + label_in["name"] = (label_in["name"] as String).replace(hardware_prefix, "") tag_lists[BugbotTagArray.HARDWARE].append(label_in) if os_prefix and label_in["name"].begins_with(os_prefix): + label_in["name"] = (label_in["name"] as String).replace(os_prefix, "") tag_lists[BugbotTagArray.OS].append(label_in) if component_prefix and label_in["name"].begins_with(component_prefix): + label_in["name"] = (label_in["name"] as String).replace(component_prefix, "") tag_lists[BugbotTagArray.COMPONENT].append(label_in) if priority_prefix and label_in["name"].begins_with(priority_prefix): + label_in["name"] = (label_in["name"] as String).replace(priority_prefix, "") tag_lists[BugbotTagArray.SEVERITY].append(label_in) tag_lists[BugbotTagArray.VERSION].sort_custom(func(a,b):return a["id"] < b["id"]) tag_lists[BugbotTagArray.HARDWARE].sort_custom(func(a,b):return a["id"] < b["id"]) @@ -183,18 +188,18 @@ func __send_form_data_thread(callback:Callable) -> void: if __validate_server_response(response_data) != Error.OK: return - var response_array : Array + var labels : Array var bug_label : String = ProjectSettings.get_setting("bugbot/reporting/gitea/bug_label", DEFAULT_BUG_LABEL) var status_label : String = ProjectSettings.get_setting("bugbot/reporting/gitea/default_status_label", DEFAULT_STATUS_LABEL) for label_in:Dictionary in response_data: if label_in["name"] == bug_label or label_in["name"] == status_label: - response_array.append(label_in["id"]) + labels.append(label_in["id"]) api_url = __build_url_string("issues") var post_data : Dictionary = { "title": "This is a test bug. Here's some randomness just for fun: " + String.num(randf_range(0.0, 10000000.0)), "body": "Fusce ornare ut felis quis aliquet. Nullam mollis dictum elit, vitae gravida metus blandit eu. Donec mi ipsum, luctus vel arcu in, suscipit hendrerit mi. Morbi imperdiet tellus pretium mi semper, vel lacinia risus mattis. Ut dapibus sed nibh eget suscipit. Vestibulum posuere pellentesque lectus, ac mollis odio congue tempus. Phasellus nisi nunc, tincidunt et bibendum non, ornare quis felis. Donec finibus mauris eu sollicitudin pharetra. Pellentesque interdum mi in augue imperdiet molestie. Nulla venenatis nec libero in feugiat. Donec nec mauris molestie, euismod magna nec, aliquet felis.\n\nAenean suscipit auctor nulla, ac aliquam purus porttitor ut. Curabitur lacinia ullamcorper ligula, sit amet tempor arcu volutpat et. Nulla eget nisi sem. Etiam pharetra at orci ut fermentum. In eu neque purus. Aliquam condimentum gravida porttitor. Nullam sem sapien, semper at hendrerit nec, lobortis sed magna. Duis non pharetra orci. Quisque faucibus, sem vitae laoreet suscipit, orci massa convallis lorem, ut malesuada dui felis ac eros.\n\nPellentesque felis lorem, volutpat eu ullamcorper eu, ultrices sed nulla. Proin ac nunc sit amet ex pellentesque sagittis non ut libero. Maecenas viverra, odio eu elementum convallis, erat purus tempor tortor, non suscipit est enim quis ligula. Praesent vestibulum orci nec enim vehicula, id commodo erat sollicitudin. Sed mauris eros, sollicitudin sit amet volutpat ac, ullamcorper dignissim erat. Aenean vitae turpis quis lorem ultrices varius. Donec pellentesque suscipit nulla id consectetur. Quisque nibh nisl, posuere in sapien eget, vehicula dapibus magna. Integer faucibus ligula ut metus sollicitudin viverra. Vestibulum elementum vitae leo sit amet ornare. Sed dapibus egestas nisi id tempus. Proin lorem erat, euismod quis porttitor ac, tincidunt faucibus nisl. Sed aliquam sem in vehicula mattis. Fusce eu libero ac eros tempus tempor ut eu nunc. Duis a turpis erat. Morbi rutrum gravida volutpat.", - "labels": response_array, + "labels": labels, } var post_data_string : String = JSON.stringify(post_data) header_data = __create_header_data(post_data_string.length())