HyperNet/Passport
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: HyperNet:742edaa9e2b160c821bce753c3896bdbaa04c69f
Branches Tags
HyperNet:master
..
compare: HyperNet:f8a4924d5637ad9e7550dda455330df76ef02573
Branches Tags
HyperNet:master

No commits in common. "742edaa9e2b160c821bce753c3896bdbaa04c69f" and "f8a4924d5637ad9e7550dda455330df76ef02573" have entirely different histories.
742edaa9e2 ... f8a4924d56

4 changed files with 14 additions and 9 deletions
Show Stats Expand all files Collapse all files

11
pkg/internal/services/programs.go
View File

@ -82,14 +82,15 @@ func ChargeForProgram(member models.ProgramMember) error {
func PeriodicChargeProgramFee() {
var members []models.ProgramMember
// Every month paid once
if err := database.C.Where("last_paid IS NULL OR last_paid < ?", time.Now().AddDate(0, 0, -30)).
Preload("Program").Find(&members).Error; err != nil {
if err := database.C.Preload("Program").Find(&members).Error; err != nil {
return
}
for _, member := range members {
if err := ChargeForProgram(member); err == nil {
database.C.Model(&member).Update("last_paid", time.Now())
// every month paid once
if member.LastPaid == nil || time.Since(*member.LastPaid) < time.Hour*24*30 {
if err := ChargeForProgram(member); err == nil {
database.C.Model(&member).Update("last_paid", time.Now())
}
}
}
}

2
pkg/internal/web/api/accounts_api.go
View File

@ -113,7 +113,7 @@ func getUserinfo(c *fiber.Ctx) error {
return c.JSON(resp)
}
func editUserinfo(c *fiber.Ctx) error {
func updateUserinfo(c *fiber.Ctx) error {
if err := exts.EnsureAuthenticated(c); err != nil {
return err
}

8
pkg/internal/web/api/avatar_api.go
View File

@ -26,7 +26,9 @@ func setAvatar(c *fiber.Ctx) error {
}
og := user.Avatar
if err := database.C.Model(&user).Update("avatar", data.AttachmentID).Error; err != nil {
user.Avatar = &data.AttachmentID
if err := database.C.Save(&user).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
} else {
services.AddEvent(user.ID, "profile.edit.avatar", nil, c.IP(), c.Get(fiber.HeaderUserAgent))
@ -62,7 +64,9 @@ func setBanner(c *fiber.Ctx) error {
}
og := user.Banner
if err := database.C.Model(&user).Update("banner", data.AttachmentID).Error; err != nil {
user.Banner = &data.AttachmentID
if err := database.C.Save(&user).Error; err != nil {
return fiber.NewError(fiber.StatusInternalServerError, err.Error())
} else {
services.AddEvent(user.ID, "profile.edit.banner", nil, c.IP(), c.Get(fiber.HeaderUserAgent))

2
pkg/internal/web/api/index.go
View File

@ -67,7 +67,7 @@ func MapControllers(app *fiber.App, baseURL string) {
me.Get("/", getUserinfo)
me.Get("/oidc", getUserinfoForOidc)
me.Put("/", editUserinfo)
me.Put("/", updateUserinfo)
me.Put("/language", updateAccountLanguage)
me.Get("/events", getEvents)
me.Get("/tickets", getTickets)