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
17 changes: 8 additions & 9 deletions Sources/NextcloudKit/NextcloudKit+AssistantV2.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
supportedTaskType: String = "Text",
options: NKRequestOptions = NKRequestOptions(),
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ types: [TaskTypeData]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
completion: @escaping (_ account: String, _ types: [TaskTypeData]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "ocs/v2.php/taskprocessing/tasktypes"
guard let nkSession = nkCommonInstance.getSession(account: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
Expand Down Expand Up @@ -40,7 +40,6 @@
var filteredResult = result?
.filter({ $0.inputShape?.input?.type == supportedTaskType && $0.outputShape?.output?.type == supportedTaskType })
.sorted(by: {$0.id! < $1.id!})

options.queue.async { completion(account, filteredResult, response, .success) }
} else {
options.queue.async { completion(account, nil, response, NKError(rootJson: json, fallbackStatusCode: response.response?.statusCode)) }
Expand Down Expand Up @@ -91,9 +90,9 @@
}

func textProcessingGetTasksV2(taskType: String,
account: String,
options: NKRequestOptions = NKRequestOptions(),
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
account: String,
options: NKRequestOptions = NKRequestOptions(),
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ tasks: TaskList?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "/ocs/v2.php/taskprocessing/tasks?taskType=\(taskType)"
guard let nkSession = nkCommonInstance.getSession(account: account),
Expand Down Expand Up @@ -128,10 +127,10 @@
}

func textProcessingDeleteTaskV2(taskId: Int64,
account: String,
options: NKRequestOptions = NKRequestOptions(),
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
account: String,
options: NKRequestOptions = NKRequestOptions(),
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "/ocs/v2.php/taskprocessing/task/\(taskId)"
guard let nkSession = nkCommonInstance.getSession(account: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
Expand Down Expand Up @@ -163,4 +162,4 @@
}
}


Check warning on line 165 in Sources/NextcloudKit/NextcloudKit+AssistantV2.swift

View workflow job for this annotation

GitHub Actions / Lint

Trailing Newline Violation: Files should have a single trailing newline (trailing_newline)

Check warning on line 165 in Sources/NextcloudKit/NextcloudKit+AssistantV2.swift

View workflow job for this annotation

GitHub Actions / Lint

Vertical Whitespace Violation: Limit vertical whitespace to a single empty line; currently 2 (vertical_whitespace)
Loading