From 8f46d0d85a1fe651898db7603b68e2c1d2fcd794 Mon Sep 17 00:00:00 2001
From: Patrick Schratz <patrick.schratz@gmail.com>
Date: Fri, 10 Jan 2025 18:48:32 +0100
Subject: [PATCH] [release/v2.8] Fix addon `nil` values (#4666) (#4693)

Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
---
 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 c0ef43d46..5ba502b8b 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.Token = m.Token
 	m.User.Secret = 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,