patchii/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Format & remove old todos

Browse source
This commit is contained in:
Michael Jerger 2024-05-24 08:49:08 +02:00
parent 30e2582f24
commit 64be24ed0c
5 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
models/repo/repo.go
View file

@ -138,8 +138,6 @@ type Repository struct {
OriginalURL string `xorm:"VARCHAR(2048)"` OriginalURL string `xorm:"VARCHAR(2048)"`
DefaultBranch string DefaultBranch string
WikiBranch string WikiBranch string
// TODO: Do we still need this here?
FederationRepos string `xorm:"TEXT"`
NumWatches int NumWatches int
NumStars int NumStars int
@ -346,10 +344,8 @@ func (repo *Repository) APIURL() string {
} }
// APActorID returns the activitypub repository API URL // APActorID returns the activitypub repository API URL
// TODO: At least camel case?
// TODO: Mv federation related stuff to federated_repo // TODO: Mv federation related stuff to federated_repo
func (repo *Repository) APActorID() string { func (repo *Repository) APActorID() string {
// TODO: use spintf instead of concat - might mitigate injections
return fmt.Sprintf("%vapi/v1/activitypub/repository-id/%v", setting.AppURL, url.PathEscape(fmt.Sprint(repo.ID))) return fmt.Sprintf("%vapi/v1/activitypub/repository-id/%v", setting.AppURL, url.PathEscape(fmt.Sprint(repo.ID)))
} }

1
models/repo/repo_repository.go
View file

@ -1,6 +1,5 @@
// Copyright 2024 The Forgejo Authors. All rights reserved. // Copyright 2024 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
// ToDo: Is this package the right place for federated repo? May need to diskuss this.
package repo package repo
import ( import (

2
models/repo/star.go
View file

@ -1,5 +1,4 @@
// Copyright 2016 The Gitea Authors. All rights reserved. // Copyright 2016 The Gitea Authors. All rights reserved.
// Copyright 2024 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
package repo package repo
@ -24,6 +23,7 @@ func init() {
db.RegisterModel(new(Star)) db.RegisterModel(new(Star))
} }
// StarRepo or unstar repository.
func StarRepo(ctx context.Context, userID, repoID int64, star bool) error { func StarRepo(ctx context.Context, userID, repoID int64, star bool) error {
ctx, committer, err := db.TxContext(ctx) ctx, committer, err := db.TxContext(ctx)
if err != nil { if err != nil {

7
services/forms/repo_form.go
View file

@ -111,10 +111,9 @@ func ParseRemoteAddr(remoteAddr, authUsername, authPassword string) (string, err
// RepoSettingForm form for changing repository settings // RepoSettingForm form for changing repository settings
type RepoSettingForm struct { type RepoSettingForm struct {
RepoName string `binding:"Required;AlphaDashDot;MaxSize(100)"` RepoName string `binding:"Required;AlphaDashDot;MaxSize(100)"`
Description string `binding:"MaxSize(2048)"` Description string `binding:"MaxSize(2048)"`
Website string `binding:"ValidUrl;MaxSize(1024)"` Website string `binding:"ValidUrl;MaxSize(1024)"`
// ToDo: Refactor in template and i18n labels to Following Repos
FederationRepos string FederationRepos string
Interval string Interval string
MirrorAddress string MirrorAddress string

42
templates/repo/settings/options.tmpl
View file

@ -63,27 +63,27 @@
</form> </form>
</div> </div>
{{if FederationEnabled}} {{if FederationEnabled}}
<h4 class="ui top attached header"> <h4 class="ui top attached header">
{{ctx.Locale.Tr "repo.settings.federation_settings"}} {{ctx.Locale.Tr "repo.settings.federation_settings"}}
</h4> </h4>
<div class="ui attached segment"> <div class="ui attached segment">
<form class="ui form" method="post"> <form class="ui form" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<input type="hidden" name="action" value="federation"> <input type="hidden" name="action" value="federation">
<div class="field {{if .Err_FollowingRepos}}error{{end}}"> <div class="field {{if .Err_FollowingRepos}}error{{end}}">
<p>{{ctx.Locale.Tr "repo.settings.federation_apapiurl"}}</p> <p>{{ctx.Locale.Tr "repo.settings.federation_apapiurl"}}</p>
<p><b>{{.RepositoryAPActorID}}</b></p> <p><b>{{.RepositoryAPActorID}}</b></p>
<div class="divider"></div> <div class="divider"></div>
<label for="following_repos">{{ctx.Locale.Tr "repo.settings.federation_following_repos"}}</label> <label for="following_repos">{{ctx.Locale.Tr "repo.settings.federation_following_repos"}}</label>
<input id="following_repos" name="federation_repos" value="{{.FollowingRepos}}"> <input id="following_repos" name="federation_repos" value="{{.FollowingRepos}}">
</div> </div>
<div class="field"> <div class="field">
<button class="ui primary button">{{ctx.Locale.Tr "repo.settings.update_settings"}}</button> <button class="ui primary button">{{ctx.Locale.Tr "repo.settings.update_settings"}}</button>
</div> </div>
</form> </form>
</div> </div>
{{end}} {{end}}
{{/* These variables exist to make the logic in the Settings window easier to comprehend and are not used later on. */}} {{/* These variables exist to make the logic in the Settings window easier to comprehend and are not used later on. */}}
{{$newMirrorsPartiallyEnabled := or (not .DisableNewPullMirrors) (not .DisableNewPushMirrors)}} {{$newMirrorsPartiallyEnabled := or (not .DisableNewPullMirrors) (not .DisableNewPushMirrors)}}