Merge pull request #28 from owenrumney/add-additionalq-query

Add additional query args
menubar-apps · Sep 16, 2024 · b473cee · b473cee
2 parents 4c1ded8 + 9247401
commit b473cee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/pullBar/Extensions/DefaultsExtensions.swift b/pullBar/Extensions/DefaultsExtensions.swift
@@ -11,6 +11,7 @@ import Defaults
 extension Defaults.Keys {
     static let githubApiBaseUrl = Key<String>("githubApiBaseUrl", default: "https://api.github.com")
     static let githubUsername = Key<String>("githubUsername", default: "")
+    static let githubAdditionalQuery = Key<String>("githubAdditionalQuery", default:"")
 
     static let showAssigned = Key<Bool>("showAssigned", default: false)
     static let showCreated = Key<Bool>("showCreated", default: false)

diff --git a/pullBar/GitHub/GitHubClient.swift b/pullBar/GitHub/GitHubClient.swift
@@ -14,6 +14,7 @@ public class GitHubClient {
 
     @Default(.githubApiBaseUrl) var githubApiBaseUrl
     @Default(.githubUsername) var githubUsername
+    @Default(.githubAdditionalQuery) var githubAdditionalQuery
     @FromKeychain(.githubToken) var githubToken
 
     @Default(.buildType) var buildType
@@ -29,7 +30,7 @@ public class GitHubClient {
             .accept("application/json")
         ]
 
-        let graphQlQuery = buildGraphQlQuery(queryString: "is:open is:pr assignee:\(githubUsername) archived:false")
+        let graphQlQuery = buildGraphQlQuery(queryString: "is:open is:pr assignee:\(githubUsername) archived:false \(githubAdditionalQuery)")
 
         let parameters = [
             "query": graphQlQuery,
@@ -60,7 +61,7 @@ public class GitHubClient {
             .authorization(bearerToken: githubToken),
             .accept("application/json")
         ]
-        let graphQlQuery = buildGraphQlQuery(queryString: "is:open is:pr author:\(githubUsername) archived:false")
+        let graphQlQuery = buildGraphQlQuery(queryString: "is:open is:pr author:\(githubUsername) archived:false \(githubAdditionalQuery)")
 
         let parameters = [
             "query": graphQlQuery,
@@ -90,7 +91,7 @@ public class GitHubClient {
             .authorization(bearerToken: githubToken),
             .accept("application/json")
         ]
-        let graphQlQuery = buildGraphQlQuery(queryString: "is:open is:pr review-requested:\(githubUsername) archived:false")
+        let graphQlQuery = buildGraphQlQuery(queryString: "is:open is:pr review-requested:\(githubUsername) archived:false \(githubAdditionalQuery)")
 
         let parameters = [
             "query": graphQlQuery,

diff --git a/pullBar/Views/PreferencesView.swift b/pullBar/Views/PreferencesView.swift
@@ -14,6 +14,7 @@ struct PreferencesView: View {
 
     @Default(.githubApiBaseUrl) var githubApiBaseUrl
     @Default(.githubUsername) var githubUsername
+    @Default(.githubAdditionalQuery) var githubAdditionalQuery
     @FromKeychain(.githubToken) var githubToken
 
     @Default(.showAssigned) var showAssigned
@@ -52,7 +53,14 @@ struct PreferencesView: View {
                         .textContentType(.password)
                         .frame(width: 200)
                 }
-
+                HStack(alignment: .center) {
+                    Text("Additional Query:").frame(width: 120, alignment: .trailing)
+                    TextField("", text: $githubAdditionalQuery)
+                        .textFieldStyle(RoundedBorderTextFieldStyle())
+                        .disableAutocorrection(true)
+                        .textContentType(.password)
+                        .frame(width: 380)
+                }
                 HStack(alignment: .center) {
                     Text("Token:").frame(width: 120, alignment: .trailing)
                     VStack(alignment: .leading) {