Skip to content

Commit 20fbbb1

Browse files
XinayderXinayder
committedJul 30, 2017
Fix build errors
SpaceDock -> app
1 parent 3a634b0 commit 20fbbb1

12 files changed

+180
-180
lines changed
 

Diff for: ‎objects/gameversion.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@ type GameVersion struct {
2323
}
2424

2525
func (s *GameVersion) AfterFind() {
26-
SpaceDock.DBRecursionLock.Lock()
27-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
28-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
26+
app.DBRecursionLock.Lock()
27+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
28+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
2929
}
30-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
31-
SpaceDock.DBRecursionLock.Unlock()
30+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
31+
app.DBRecursionLock.Unlock()
3232
return
3333
}
34-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
35-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
36-
SpaceDock.DBRecursionLock.Unlock()
34+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
35+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
36+
app.DBRecursionLock.Unlock()
3737

38-
SpaceDock.Database.Model(s).Related(&(s.Game), "Game")
38+
app.Database.Model(s).Related(&(s.Game), "Game")
3939

40-
SpaceDock.DBRecursionLock.Lock()
41-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
40+
app.DBRecursionLock.Lock()
41+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
4242
if isRoot {
43-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
43+
delete(app.DBRecursion, utils.CurrentGoroutineID())
4444
}
45-
SpaceDock.DBRecursionLock.Unlock()
45+
app.DBRecursionLock.Unlock()
4646
}
4747

4848
func NewGameVersion(friendly_version string, game Game, beta bool) *GameVersion {

Diff for: ‎objects/init.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ import "github.com/KSP-SpaceDock/SpaceDock-Backend/app"
1414
This function creates tables for all datatypes
1515
*/
1616
func init() {
17-
SpaceDock.CreateTable(&Ability{})
18-
SpaceDock.CreateTable(&DownloadEvent{})
19-
SpaceDock.CreateTable(&FollowEvent{})
20-
SpaceDock.CreateTable(&ReferralEvent{})
21-
SpaceDock.CreateTable(&Featured{})
22-
SpaceDock.CreateTable(&Game{})
23-
SpaceDock.CreateTable(&GameVersion{})
24-
SpaceDock.CreateTable(&Mod{})
25-
SpaceDock.CreateTable(&ModList{})
26-
SpaceDock.CreateTable(&ModListItem{})
27-
SpaceDock.CreateTable(&ModVersion{})
28-
SpaceDock.CreateTable(&Publisher{})
29-
SpaceDock.CreateTable(&Rating{})
30-
SpaceDock.CreateTable(&Role{})
31-
SpaceDock.CreateTable(&SharedAuthor{})
32-
SpaceDock.CreateTable(&Token{})
33-
SpaceDock.CreateTable(&User{})
17+
app.CreateTable(&Ability{})
18+
app.CreateTable(&DownloadEvent{})
19+
app.CreateTable(&FollowEvent{})
20+
app.CreateTable(&ReferralEvent{})
21+
app.CreateTable(&Featured{})
22+
app.CreateTable(&Game{})
23+
app.CreateTable(&GameVersion{})
24+
app.CreateTable(&Mod{})
25+
app.CreateTable(&ModList{})
26+
app.CreateTable(&ModListItem{})
27+
app.CreateTable(&ModVersion{})
28+
app.CreateTable(&Publisher{})
29+
app.CreateTable(&Rating{})
30+
app.CreateTable(&Role{})
31+
app.CreateTable(&SharedAuthor{})
32+
app.CreateTable(&Token{})
33+
app.CreateTable(&User{})
3434
}

Diff for: ‎objects/mod.go

+19-19
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,32 @@ type Mod struct {
4040
}
4141

4242
func (s *Mod) AfterFind() {
43-
SpaceDock.DBRecursionLock.Lock()
44-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
45-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
43+
app.DBRecursionLock.Lock()
44+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
45+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
4646
}
47-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
48-
SpaceDock.DBRecursionLock.Unlock()
47+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
48+
app.DBRecursionLock.Unlock()
4949
return
5050
}
51-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
52-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
53-
SpaceDock.DBRecursionLock.Unlock()
51+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
52+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
53+
app.DBRecursionLock.Unlock()
5454

55-
SpaceDock.Database.Model(s).Related(&(s.User), "User")
56-
SpaceDock.Database.Model(s).Related(&(s.Game), "Game")
57-
SpaceDock.Database.Model(s).Related(&(s.DefaultVersion), "DefaultVersion")
58-
SpaceDock.Database.Model(s).Related(&(s.Versions), "Versions")
59-
SpaceDock.Database.Model(s).Related(&(s.Followers), "Followers")
60-
SpaceDock.Database.Model(s).Related(&(s.Ratings), "Ratings")
61-
SpaceDock.Database.Model(s).Related(&(s.SharedAuthors), "SharedAuthors")
55+
app.Database.Model(s).Related(&(s.User), "User")
56+
app.Database.Model(s).Related(&(s.Game), "Game")
57+
app.Database.Model(s).Related(&(s.DefaultVersion), "DefaultVersion")
58+
app.Database.Model(s).Related(&(s.Versions), "Versions")
59+
app.Database.Model(s).Related(&(s.Followers), "Followers")
60+
app.Database.Model(s).Related(&(s.Ratings), "Ratings")
61+
app.Database.Model(s).Related(&(s.SharedAuthors), "SharedAuthors")
6262

63-
SpaceDock.DBRecursionLock.Lock()
64-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
63+
app.DBRecursionLock.Lock()
64+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
6565
if isRoot {
66-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
66+
delete(app.DBRecursion, utils.CurrentGoroutineID())
6767
}
68-
SpaceDock.DBRecursionLock.Unlock()
68+
app.DBRecursionLock.Unlock()
6969
}
7070

7171
func (mod *Mod) CalculateScore() {

Diff for: ‎objects/modlist.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,28 @@ type ModList struct {
2727
}
2828

2929
func (s *ModList) AfterFind() {
30-
SpaceDock.DBRecursionLock.Lock()
31-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
32-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
30+
app.DBRecursionLock.Lock()
31+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
32+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
3333
}
34-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
35-
SpaceDock.DBRecursionLock.Unlock()
34+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
35+
app.DBRecursionLock.Unlock()
3636
return
3737
}
38-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
39-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
40-
SpaceDock.DBRecursionLock.Unlock()
38+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
39+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
40+
app.DBRecursionLock.Unlock()
4141

42-
SpaceDock.Database.Model(s).Related(&(s.User), "User")
43-
SpaceDock.Database.Model(s).Related(&(s.Game), "Game")
44-
SpaceDock.Database.Model(s).Related(&(s.Mods), "Mods")
42+
app.Database.Model(s).Related(&(s.User), "User")
43+
app.Database.Model(s).Related(&(s.Game), "Game")
44+
app.Database.Model(s).Related(&(s.Mods), "Mods")
4545

46-
SpaceDock.DBRecursionLock.Lock()
47-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
46+
app.DBRecursionLock.Lock()
47+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
4848
if isRoot {
49-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
49+
delete(app.DBRecursion, utils.CurrentGoroutineID())
5050
}
51-
SpaceDock.DBRecursionLock.Unlock()
51+
app.DBRecursionLock.Unlock()
5252
}
5353

5454
func NewModList(name string, user User, game Game) *ModList {

Diff for: ‎objects/modlistitem.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ type ModListItem struct {
2424
}
2525

2626
func (s *ModListItem) AfterFind() {
27-
SpaceDock.DBRecursionLock.Lock()
28-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
29-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
27+
app.DBRecursionLock.Lock()
28+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
29+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
3030
}
31-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
32-
SpaceDock.DBRecursionLock.Unlock()
31+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
32+
app.DBRecursionLock.Unlock()
3333
return
3434
}
35-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
36-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
37-
SpaceDock.DBRecursionLock.Unlock()
35+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
36+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
37+
app.DBRecursionLock.Unlock()
3838

39-
SpaceDock.Database.Model(s).Related(&(s.Mod), "Mod")
40-
SpaceDock.Database.Model(s).Related(&(s.ModList), "ModList")
39+
app.Database.Model(s).Related(&(s.Mod), "Mod")
40+
app.Database.Model(s).Related(&(s.ModList), "ModList")
4141

42-
SpaceDock.DBRecursionLock.Lock()
43-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
42+
app.DBRecursionLock.Lock()
43+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
4444
if isRoot {
45-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
45+
delete(app.DBRecursion, utils.CurrentGoroutineID())
4646
}
47-
SpaceDock.DBRecursionLock.Unlock()
47+
app.DBRecursionLock.Unlock()
4848
}
4949

5050
func NewModListItem(mod Mod, list ModList) *ModListItem {

Diff for: ‎objects/modversion.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,26 @@ type ModVersion struct {
3030
}
3131

3232
func (s *ModVersion) AfterFind() {
33-
SpaceDock.DBRecursionLock.Lock()
34-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
35-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
33+
app.DBRecursionLock.Lock()
34+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
35+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
3636
}
37-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
38-
SpaceDock.DBRecursionLock.Unlock()
37+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
38+
app.DBRecursionLock.Unlock()
3939
return
4040
}
41-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
42-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
43-
SpaceDock.DBRecursionLock.Unlock()
41+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
42+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
43+
app.DBRecursionLock.Unlock()
4444

45-
SpaceDock.Database.Model(s).Related(&(s.GameVersion), "GameVersion")
45+
app.Database.Model(s).Related(&(s.GameVersion), "GameVersion")
4646

47-
SpaceDock.DBRecursionLock.Lock()
48-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
47+
app.DBRecursionLock.Lock()
48+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
4949
if isRoot {
50-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
50+
delete(app.DBRecursion, utils.CurrentGoroutineID())
5151
}
52-
SpaceDock.DBRecursionLock.Unlock()
52+
app.DBRecursionLock.Unlock()
5353
}
5454

5555
func NewModVersion(mod Mod, friendly_version string, gameversion GameVersion, download_path string, beta bool) *ModVersion {
@@ -66,7 +66,7 @@ func NewModVersion(mod Mod, friendly_version string, gameversion GameVersion, do
6666
}
6767
mv.Meta = "{}"
6868
if mv.DownloadPath != "" {
69-
f, err := os.Open(filepath.Join(SpaceDock.Settings.Storage, mv.DownloadPath))
69+
f, err := os.Open(filepath.Join(app.Settings.Storage, mv.DownloadPath))
7070
defer f.Close()
7171
if err == nil {
7272
info, err := f.Stat()

Diff for: ‎objects/publisher.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@ type Publisher struct {
2323
}
2424

2525
func (s *Publisher) AfterFind() {
26-
SpaceDock.DBRecursionLock.Lock()
27-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
28-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
26+
app.DBRecursionLock.Lock()
27+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
28+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
2929
}
30-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
31-
SpaceDock.DBRecursionLock.Unlock()
30+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
31+
app.DBRecursionLock.Unlock()
3232
return
3333
}
34-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
35-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
36-
SpaceDock.DBRecursionLock.Unlock()
34+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
35+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
36+
app.DBRecursionLock.Unlock()
3737

38-
SpaceDock.Database.Model(s).Related(&(s.Games), "Games")
38+
app.Database.Model(s).Related(&(s.Games), "Games")
3939

40-
SpaceDock.DBRecursionLock.Lock()
41-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
40+
app.DBRecursionLock.Lock()
41+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
4242
if isRoot {
43-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
43+
delete(app.DBRecursion, utils.CurrentGoroutineID())
4444
}
45-
SpaceDock.DBRecursionLock.Unlock()
45+
app.DBRecursionLock.Unlock()
4646
}
4747

4848
func NewPublisher(name string) *Publisher {

Diff for: ‎objects/rating.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@ type Rating struct {
2525
}
2626

2727
func (s *Rating) AfterFind() {
28-
SpaceDock.DBRecursionLock.Lock()
29-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
30-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
28+
app.DBRecursionLock.Lock()
29+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
30+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
3131
}
32-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
33-
SpaceDock.DBRecursionLock.Unlock()
32+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
33+
app.DBRecursionLock.Unlock()
3434
return
3535
}
36-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
37-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
38-
SpaceDock.DBRecursionLock.Unlock()
36+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
37+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
38+
app.DBRecursionLock.Unlock()
3939

40-
SpaceDock.Database.Model(s).Related(&(s.User), "User")
41-
SpaceDock.Database.Model(s).Related(&(s.Mod), "Mod")
40+
app.Database.Model(s).Related(&(s.User), "User")
41+
app.Database.Model(s).Related(&(s.Mod), "Mod")
4242

43-
SpaceDock.DBRecursionLock.Lock()
44-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
43+
app.DBRecursionLock.Lock()
44+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
4545
if isRoot {
46-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
46+
delete(app.DBRecursion, utils.CurrentGoroutineID())
4747
}
48-
SpaceDock.DBRecursionLock.Unlock()
48+
app.DBRecursionLock.Unlock()
4949
}
5050

5151
func NewRating(user User, mod Mod, score float64) *Rating {

Diff for: ‎objects/role.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -24,57 +24,57 @@ type Role struct {
2424
}
2525

2626
func (s *Role) AfterFind() {
27-
SpaceDock.DBRecursionLock.Lock()
28-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
29-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
27+
app.DBRecursionLock.Lock()
28+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
29+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
3030
}
31-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
32-
SpaceDock.DBRecursionLock.Unlock()
31+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
32+
app.DBRecursionLock.Unlock()
3333
return
3434
}
35-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
36-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
37-
SpaceDock.DBRecursionLock.Unlock()
35+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
36+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
37+
app.DBRecursionLock.Unlock()
3838

39-
SpaceDock.Database.Model(s).Related(&(s.Abilities), "Abilities")
40-
SpaceDock.Database.Model(s).Related(&(s.Users), "Users")
39+
app.Database.Model(s).Related(&(s.Abilities), "Abilities")
40+
app.Database.Model(s).Related(&(s.Users), "Users")
4141

42-
SpaceDock.DBRecursionLock.Lock()
43-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
42+
app.DBRecursionLock.Lock()
43+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
4444
if isRoot {
45-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
45+
delete(app.DBRecursion, utils.CurrentGoroutineID())
4646
}
47-
SpaceDock.DBRecursionLock.Unlock()
47+
app.DBRecursionLock.Unlock()
4848
}
4949

5050
func (role *Role) AddAbility(name string) *Ability {
5151
ability := &Ability {}
52-
SpaceDock.Database.Where("name = ?", name).First(ability)
52+
app.Database.Where("name = ?", name).First(ability)
5353
if ability.Name != name {
5454
ability.Name = name
5555
ability.Meta = "{}"
56-
SpaceDock.Database.Save(ability)
56+
app.Database.Save(ability)
5757
}
5858
role.Abilities = append(role.Abilities, *ability)
59-
SpaceDock.Database.Save(role).Save(ability)
59+
app.Database.Save(role).Save(ability)
6060
return &role.Abilities[len(role.Abilities) - 1]
6161
}
6262

6363
func (role *Role) RemoveAbility(name string) {
6464
ability := &Ability {}
65-
SpaceDock.Database.Where("name = ?", name).First(ability)
65+
app.Database.Where("name = ?", name).First(ability)
6666
if ability.Name == "" {
6767
return
6868
}
6969
if e,i := utils.ArrayContains(ability, role.Abilities); e {
7070
role.Abilities = append(role.Abilities[:i], role.Abilities[i + 1:]...)
71-
SpaceDock.Database.Save(role)
71+
app.Database.Save(role)
7272
}
7373
}
7474

7575
func (role *Role) HasAbility(name string) bool {
7676
ability := &Ability {}
77-
SpaceDock.Database.Where("name = ?", name).First(ability)
77+
app.Database.Where("name = ?", name).First(ability)
7878
if ability.Name == "" {
7979
return false
8080
}

Diff for: ‎objects/sharedauthor.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ type SharedAuthor struct {
2424
}
2525

2626
func (s *SharedAuthor) AfterFind() {
27-
SpaceDock.DBRecursionLock.Lock()
28-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
29-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
27+
app.DBRecursionLock.Lock()
28+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
29+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
3030
}
31-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
32-
SpaceDock.DBRecursionLock.Unlock()
31+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
32+
app.DBRecursionLock.Unlock()
3333
return
3434
}
35-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
36-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
37-
SpaceDock.DBRecursionLock.Unlock()
35+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
36+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
37+
app.DBRecursionLock.Unlock()
3838

39-
SpaceDock.Database.Model(s).Related(&(s.User), "User")
40-
SpaceDock.Database.Model(s).Related(&(s.Mod), "Mod")
39+
app.Database.Model(s).Related(&(s.User), "User")
40+
app.Database.Model(s).Related(&(s.Mod), "Mod")
4141

42-
SpaceDock.DBRecursionLock.Lock()
43-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
42+
app.DBRecursionLock.Lock()
43+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
4444
if isRoot {
45-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
45+
delete(app.DBRecursion, utils.CurrentGoroutineID())
4646
}
47-
SpaceDock.DBRecursionLock.Unlock()
47+
app.DBRecursionLock.Unlock()
4848
}
4949

5050
func NewSharedAuthor(user User, mod Mod) *SharedAuthor {

Diff for: ‎objects/user.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,28 @@ type User struct {
3535
}
3636

3737
func (s *User) AfterFind() {
38-
SpaceDock.DBRecursionLock.Lock()
39-
if _, ok := SpaceDock.DBRecursion[utils.CurrentGoroutineID()]; !ok {
40-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] = 0
38+
app.DBRecursionLock.Lock()
39+
if _, ok := app.DBRecursion[utils.CurrentGoroutineID()]; !ok {
40+
app.DBRecursion[utils.CurrentGoroutineID()] = 0
4141
}
42-
if SpaceDock.DBRecursion[utils.CurrentGoroutineID()] >= SpaceDock.DBRecursionMax {
43-
SpaceDock.DBRecursionLock.Unlock()
42+
if app.DBRecursion[utils.CurrentGoroutineID()] >= app.DBRecursionMax {
43+
app.DBRecursionLock.Unlock()
4444
return
4545
}
46-
isRoot := SpaceDock.DBRecursion[utils.CurrentGoroutineID()] == 0
47-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] += 1
48-
SpaceDock.DBRecursionLock.Unlock()
46+
isRoot := app.DBRecursion[utils.CurrentGoroutineID()] == 0
47+
app.DBRecursion[utils.CurrentGoroutineID()] += 1
48+
app.DBRecursionLock.Unlock()
4949

50-
SpaceDock.Database.Model(s).Related(&(s.Roles), "Roles")
51-
SpaceDock.Database.Model(s).Related(&(s.SharedAuthors), "SharedAuthors")
52-
SpaceDock.Database.Model(s).Related(&(s.Following), "Following")
50+
app.Database.Model(s).Related(&(s.Roles), "Roles")
51+
app.Database.Model(s).Related(&(s.SharedAuthors), "SharedAuthors")
52+
app.Database.Model(s).Related(&(s.Following), "Following")
5353

54-
SpaceDock.DBRecursionLock.Lock()
55-
SpaceDock.DBRecursion[utils.CurrentGoroutineID()] -= 1
54+
app.DBRecursionLock.Lock()
55+
app.DBRecursion[utils.CurrentGoroutineID()] -= 1
5656
if isRoot {
57-
delete(SpaceDock.DBRecursion, utils.CurrentGoroutineID())
57+
delete(app.DBRecursion, utils.CurrentGoroutineID())
5858
}
59-
SpaceDock.DBRecursionLock.Unlock()
59+
app.DBRecursionLock.Unlock()
6060
}
6161

6262
func NewUser(name string, email string, password string) *User {
@@ -97,7 +97,7 @@ func (user *User) Logout() {
9797
}
9898

9999
func (user *User) GetById(id uint) error {
100-
SpaceDock.Database.Where("id = ?", id).First(user)
100+
app.Database.Where("id = ?", id).First(user)
101101
if user.ID != id {
102102
return errors.New("Invalid user ID")
103103
}
@@ -108,34 +108,34 @@ func (user *User) GetById(id uint) error {
108108

109109
func (user *User) AddRole(name string) *Role {
110110
role := &Role {}
111-
SpaceDock.Database.Where("name = ?", name).First(role)
111+
app.Database.Where("name = ?", name).First(role)
112112
if role.Name != name {
113113
role.Name = name
114114
role.Params = "{}"
115115
role.Meta = "{}"
116-
SpaceDock.Database.Save(role)
116+
app.Database.Save(role)
117117
}
118-
SpaceDock.Database.Model(user).Related(&(user.Roles), "Roles")
118+
app.Database.Model(user).Related(&(user.Roles), "Roles")
119119
user.Roles = append(user.Roles, *role)
120-
SpaceDock.Database.Save(user).Save(role)
120+
app.Database.Save(user).Save(role)
121121
return &user.Roles[len(user.Roles) - 1]
122122
}
123123

124124
func (user *User) RemoveRole(name string) {
125125
role := &Role{}
126-
SpaceDock.Database.Where("name = ?", name).First(role)
126+
app.Database.Where("name = ?", name).First(role)
127127
if role.Name == "" {
128128
return
129129
}
130130
if e,i := utils.ArrayContains(role, user.Roles); e {
131131
user.Roles = append(user.Roles[:i], user.Roles[i + 1:]...)
132-
SpaceDock.Database.Save(user)
132+
app.Database.Save(user)
133133
}
134134
}
135135

136136
func (user *User) HasRole(name string) bool {
137137
role := &Role {}
138-
SpaceDock.Database.Where("name = ?", name).First(role)
138+
app.Database.Where("name = ?", name).First(role)
139139
if role.Name == "" {
140140
return false
141141
}
@@ -144,7 +144,7 @@ func (user *User) HasRole(name string) bool {
144144
}
145145

146146
func (user *User) GetAbilities() []string {
147-
SpaceDock.Database.Model(user).Related(&(user.Roles), "Roles")
147+
app.Database.Model(user).Related(&(user.Roles), "Roles")
148148
value := []string{}
149149
for _,element := range user.Roles {
150150
for _,element2 := range element.Abilities {

Diff for: ‎routes/featured.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func remove_featured(ctx *iris.Context) {
128128

129129
// Get the mod
130130
mod := &objects.Mod{}
131-
SpaceDock.Database.Where("id = ?", modid).First(mod)
131+
app.Database.Where("id = ?", modid).First(mod)
132132
if mod.ID != modid {
133133
utils.WriteJSON(ctx, iris.StatusNotFound, utils.Error("The modid is invalid.").Code(2130))
134134
return
@@ -142,14 +142,14 @@ func remove_featured(ctx *iris.Context) {
142142

143143
// Check if the mod is already featured
144144
feature := &objects.Featured{}
145-
SpaceDock.Database.Where("mod_id = ?", modid).First(feature)
145+
app.Database.Where("mod_id = ?", modid).First(feature)
146146
if feature.ModID != modid {
147147
utils.WriteJSON(ctx, iris.StatusBadRequest, utils.Error("This mod isn't featured.").Code(3015))
148148
return
149149
}
150150

151151
// Everything is fine, lets remove the feature
152-
SpaceDock.Database.Delete(feature)
152+
app.Database.Delete(feature)
153153
utils.ClearFeaturedCache(gameshort)
154154
utils.WriteJSON(ctx, iris.StatusOK, iris.Map{"error": false})
155155
}

0 commit comments

Comments
 (0)
Please sign in to comment.