diff options
| author | 6543 <6543@obermui.de> | 2020-12-25 09:59:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-25 11:59:32 +0200 |
| commit | a19447aed128ecadfcd938d6a80cd4951af1f4ce (patch) | |
| tree | 6312bf946d601aab29731645a4777feeaea66036 /modules/convert/convert.go | |
| parent | 04ae0f2f3f4556c6d0b4adc5f2cffd0cc7d25151 (diff) | |
| download | gitea-a19447aed128ecadfcd938d6a80cd4951af1f4ce.tar.gz gitea-a19447aed128ecadfcd938d6a80cd4951af1f4ce.zip | |
migrate from com.* to alternatives (#14103)
* remove github.com/unknwon/com from models
* dont use "com.ToStr()"
* replace "com.ToStr" with "fmt.Sprint" where its easy to do
* more refactor
* fix test
* just "proxy" Copy func for now
* as per @lunny
Diffstat (limited to 'modules/convert/convert.go')
| -rw-r--r-- | modules/convert/convert.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/convert/convert.go b/modules/convert/convert.go index 63dd072fc4..109931dbc3 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -17,8 +17,6 @@ import ( api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/services/webhook" - - "github.com/unknwon/com" ) // ToEmail convert models.EmailAddress to api.Email @@ -169,7 +167,7 @@ func ToPublicKey(apiLink string, key *models.PublicKey) *api.PublicKey { return &api.PublicKey{ ID: key.ID, Key: key.Content, - URL: apiLink + com.ToStr(key.ID), + URL: fmt.Sprintf("%s%d", apiLink, key.ID), Title: key.Name, Fingerprint: key.Fingerprint, Created: key.CreatedUnix.AsTime(), @@ -263,7 +261,7 @@ func ToDeployKey(apiLink string, key *models.DeployKey) *api.DeployKey { KeyID: key.KeyID, Key: key.Content, Fingerprint: key.Fingerprint, - URL: apiLink + com.ToStr(key.ID), + URL: fmt.Sprintf("%s%d", apiLink, key.ID), Title: key.Name, Created: key.CreatedUnix.AsTime(), ReadOnly: key.Mode == models.AccessModeRead, // All deploy keys are read-only. |