From ba68b446c0d187b94b4fcc11adb5a0278ff8b0fb Mon Sep 17 00:00:00 2001 From: qwerty287 <80460567+qwerty287@users.noreply.github.com> Date: Sun, 5 Jan 2025 13:45:53 +0200 Subject: [PATCH] Fix addon `nil` values (#4666) --- server/forge/addon/args.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/forge/addon/args.go b/server/forge/addon/args.go index 9760124a3..a8677c6b1 100644 --- a/server/forge/addon/args.go +++ b/server/forge/addon/args.go @@ -110,6 +110,9 @@ type modelUser struct { } func (m *modelUser) asModel() *model.User { + if m == nil { + return nil + } m.User.ForgeRemoteID = m.ForgeRemoteID m.User.AccessToken = m.Token m.User.RefreshToken = m.Secret @@ -119,6 +122,9 @@ func (m *modelUser) asModel() *model.User { } func modelUserFromModel(u *model.User) *modelUser { + if u == nil { + return nil + } return &modelUser{ User: u, ForgeRemoteID: u.ForgeRemoteID, @@ -138,6 +144,9 @@ type modelRepo struct { } func (m *modelRepo) asModel() *model.Repo { + if m == nil { + return nil + } m.Repo.UserID = m.UserID m.Repo.Hash = m.Hash m.Repo.Perm = m.Perm @@ -145,6 +154,9 @@ func (m *modelRepo) asModel() *model.Repo { } func modelRepoFromModel(r *model.Repo) *modelRepo { + if r == nil { + return nil + } return &modelRepo{ Repo: r, UserID: r.UserID,