@@ -12,6 +12,7 @@ import (
12
12
"github.com/KSP-SpaceDock/SpaceDock-Backend/middleware"
13
13
"github.com/KSP-SpaceDock/SpaceDock-Backend/objects"
14
14
"github.com/KSP-SpaceDock/SpaceDock-Backend/routes"
15
+ "github.com/KSP-SpaceDock/SpaceDock-Backend/utils"
15
16
"bytes"
16
17
"context"
17
18
"encoding/json"
@@ -89,7 +90,7 @@ func mods_ckan(ctx *iris.Context) {
89
90
}
90
91
}
91
92
92
- func AddModToCKAN (mod objects.Mod ) string {
93
+ func AddModToCKAN (mod * objects.Mod ) string {
93
94
if cfg .NetkanRepoPath == "" {
94
95
return ""
95
96
}
@@ -155,8 +156,8 @@ Please direct questions about this pull request to [{0}]({4}{3}).`))
155
156
data := map [string ]string {
156
157
"0" : mod .User .Username ,
157
158
"1" : mod .Name ,
158
- "2" : create_mod_url (mod .ID , mod .Name , modURL ),
159
- "3" : create_profile_url (mod .User .ID , mod .User .Username , profileURL ),
159
+ "2" : create_mod_url (mod .ID , mod .Name , cast . ToString ( modURL ) ),
160
+ "3" : create_profile_url (mod .User .ID , mod .User .Username , cast . ToString ( profileURL ) ),
160
161
"4" : app .Settings .Protocol + "://" + app .Settings .Domain ,
161
162
"5" : mod .Description ,
162
163
"6" : mod .ShortDescription ,
@@ -173,12 +174,16 @@ Please direct questions about this pull request to [{0}]({4}{3}).`))
173
174
Password : cfg .GithubPass ,
174
175
}
175
176
client := github .NewClient (tp .Client ())
177
+ title := "Add " + mod .Name + " from " + app .Settings .SiteName
178
+ base := "KSP-CKAN:master"
179
+ head := cfg .GithubUser + ":add-" + json_blob ["identifier" ]
180
+ maintainerCanModify := true
176
181
p , _ , _ := client .PullRequests .Create (context .Background (), "KSP-CKAN" , "NetKAN" , & github.NewPullRequest {
177
- Title : "Add " + mod . Name + " from " + app . Settings . SiteName ,
178
- Base : & "KSP-CKAN:master" ,
179
- Head : & ( cfg . GithubUser + ":add-" + json_blob [ "identifier" ]) ,
182
+ Title : & title ,
183
+ Base : & base ,
184
+ Head : & head ,
180
185
Body : & s ,
181
- MaintainerCanModify : & true ,
186
+ MaintainerCanModify : & maintainerCanModify ,
182
187
})
183
188
return * p .URL
184
189
}
0 commit comments