comparing 3646ff6d6606153795ff8fa615835a7a983c8407 and notnite/knot-hosting-paths on notnite.com/core

+35 -20

appview/db/issues.go

···

       5
       5
        
       	"time"

     

       6
       6
        
       

     

       7
       7
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       8
       8
       +
       	"tangled.sh/tangled.sh/core/appview/pagination"

     

       8
       9
        
       )

     

       9
       10
        
       

     

       10
       11
        
       type Issue struct {

     
···

       102
       103
        
       	return ownerDid, err

     

       103
       104
        
       }

     

       104
       105
        
       

     

       105
       105
       -
       func GetIssues(e Execer, repoAt syntax.ATURI, isOpen bool) ([]Issue, error) {

     

       106
       106
       +
       func GetIssues(e Execer, repoAt syntax.ATURI, isOpen bool, page pagination.Page) ([]Issue, error) {

     

       106
       107
        
       	var issues []Issue

     

       107
       108
        
       	openValue := 0

     

       108
       109
        
       	if isOpen {

     
···

       110
       111
        
       	}

     

       111
       112
        
       

     

       112
       113
        
       	rows, err := e.Query(

     

       113
       113
       -
       		`select

     

       114
       114
       -
       			i.owner_did,

     

       115
       115
       -
       			i.issue_id,

     

       116
       116
       -
       			i.created,

     

       117
       117
       -
       			i.title,

     

       118
       118
       -
       			i.body,

     

       119
       119
       -
       			i.open,

     

       120
       120
       -
       			count(c.id)

     

       121
       121
       -
       		from

     

       122
       122
       -
       		    issues i

     

       123
       123
       -
       		left join

     

       124
       124
       -
       			comments c on i.repo_at = c.repo_at and i.issue_id = c.issue_id

     

       125
       125
       -
       		where

     

       126
       126
       -
       		    i.repo_at = ? and i.open = ?

     

       127
       127
       -
       		group by

     

       128
       128
       -
       			i.id, i.owner_did, i.issue_id, i.created, i.title, i.body, i.open

     

       129
       129
       -
       		order by

     

       130
       130
       -
       			i.created desc`,

     

       131
       131
       -
       		repoAt, openValue)

     

       114
       114
       +
       		`

     

       115
       115
       +
       		with numbered_issue as (

     

       116
       116
       +
       			select

     

       117
       117
       +
       				i.owner_did,

     

       118
       118
       +
       				i.issue_id,

     

       119
       119
       +
       				i.created,

     

       120
       120
       +
       				i.title,

     

       121
       121
       +
       				i.body,

     

       122
       122
       +
       				i.open,

     

       123
       123
       +
       				count(c.id) as comment_count,

     

       124
       124
       +
       				row_number() over (order by i.created desc) as row_num

     

       125
       125
       +
       			from

     

       126
       126
       +
       				issues i

     

       127
       127
       +
       			left join

     

       128
       128
       +
       				comments c on i.repo_at = c.repo_at and i.issue_id = c.issue_id

     

       129
       129
       +
       			where

     

       130
       130
       +
       				i.repo_at = ? and i.open = ?

     

       131
       131
       +
       			group by

     

       132
       132
       +
       				i.id, i.owner_did, i.issue_id, i.created, i.title, i.body, i.open

     

       133
       133
       +
       		)

     

       134
       134
       +
       		select

     

       135
       135
       +
       			owner_did,

     

       136
       136
       +
       			issue_id,

     

       137
       137
       +
       			created,

     

       138
       138
       +
       			title,

     

       139
       139
       +
       			body,

     

       140
       140
       +
       			open,

     

       141
       141
       +
       			comment_count

     

       142
       142
       +
       		from 

     

       143
       143
       +
       			numbered_issue

     

       144
       144
       +
       		where 

     

       145
       145
       +
       			row_num between ? and ?`,

     

       146
       146
       +
       		repoAt, openValue, page.Offset+1, page.Offset+page.Limit)

     

       132
       147
        
       	if err != nil {

     

       133
       148
        
       		return nil, err

     

       134
       149
        
       	}

+32

appview/middleware/middleware.go

···

       1
       1
        
       package middleware

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"context"

     

       4
       5
        
       	"log"

     

       5
       6
        
       	"net/http"

     

       7
       7
       +
       	"strconv"

     

       6
       8
        
       	"time"

     

       7
       9
        
       

     

       8
       10
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       9
       11
        
       	"github.com/bluesky-social/indigo/xrpc"

     

       10
       12
        
       	"tangled.sh/tangled.sh/core/appview"

     

       11
       13
        
       	"tangled.sh/tangled.sh/core/appview/auth"

     

       14
       14
       +
       	"tangled.sh/tangled.sh/core/appview/pagination"

     

       12
       15
        
       )

     

       13
       16
        
       

     

       14
       17
        
       type Middleware func(http.Handler) http.Handler

     
···

       92
       95
        
       		})

     

       93
       96
        
       	}

     

       94
       97
        
       }

     

       98
       98
       +
       

     

       99
       99
       +
       func Paginate(next http.Handler) http.Handler {

     

       100
       100
       +
       	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       101
       101
       +
       		page := pagination.FirstPage()

     

       102
       102
       +
       

     

       103
       103
       +
       		offsetVal := r.URL.Query().Get("offset")

     

       104
       104
       +
       		if offsetVal != "" {

     

       105
       105
       +
       			offset, err := strconv.Atoi(offsetVal)

     

       106
       106
       +
       			if err != nil {

     

       107
       107
       +
       				log.Println("invalid offset")

     

       108
       108
       +
       			} else {

     

       109
       109
       +
       				page.Offset = offset

     

       110
       110
       +
       			}

     

       111
       111
       +
       		}

     

       112
       112
       +
       

     

       113
       113
       +
       		limitVal := r.URL.Query().Get("limit")

     

       114
       114
       +
       		if limitVal != "" {

     

       115
       115
       +
       			limit, err := strconv.Atoi(limitVal)

     

       116
       116
       +
       			if err != nil {

     

       117
       117
       +
       				log.Println("invalid limit")

     

       118
       118
       +
       			} else {

     

       119
       119
       +
       				page.Limit = limit

     

       120
       120
       +
       			}

     

       121
       121
       +
       		}

     

       122
       122
       +
       

     

       123
       123
       +
       		ctx := context.WithValue(r.Context(), "page", page)

     

       124
       124
       +
       		next.ServeHTTP(w, r.WithContext(ctx))

     

       125
       125
       +
       	})

     

       126
       126
       +
       }

+7 -6

appview/pages/pages.go

···

       20
       20
        
       	"tangled.sh/tangled.sh/core/appview/auth"

     

       21
       21
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       22
       22
        
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       23
       23
       +
       	"tangled.sh/tangled.sh/core/appview/pagination"

     

       23
       24
        
       	"tangled.sh/tangled.sh/core/appview/state/userutil"

     

       24
       25
        
       	"tangled.sh/tangled.sh/core/patchutil"

     

       25
       26
        
       	"tangled.sh/tangled.sh/core/types"

     
···

       651
       652
        
       }

     

       652
       653
        
       

     

       653
       654
        
       type RepoIssuesParams struct {

     

       654
       654
       -
       	LoggedInUser *auth.User

     

       655
       655
       -
       	RepoInfo     RepoInfo

     

       656
       656
       -
       	Active       string

     

       657
       657
       -
       	Issues       []db.Issue

     

       658
       658
       -
       	DidHandleMap map[string]string

     

       659
       659
       -
       

     

       655
       655
       +
       	LoggedInUser    *auth.User

     

       656
       656
       +
       	RepoInfo        RepoInfo

     

       657
       657
       +
       	Active          string

     

       658
       658
       +
       	Issues          []db.Issue

     

       659
       659
       +
       	DidHandleMap    map[string]string

     

       660
       660
       +
       	Page            pagination.Page

     

       660
       661
        
       	FilteringByOpen bool

     

       661
       662
        
       }

     

       662
       663

+38

appview/pages/templates/repo/issues/issues.html

···

       70
       70
        
         </div>

     

       71
       71
        
         {{ end }}

     

       72
       72
        
       </div>

     

       73
       73
       +
       

     

       74
       74
       +
       {{ block "pagination" . }} {{ end }}

     

       75
       75
       +
       

     

       76
       76
       +
       {{ end }}

     

       77
       77
       +
       

     

       78
       78
       +
       {{ define "pagination" }}

     

       79
       79
       +
       <div class="flex justify-end mt-4 gap-2">

     

       80
       80
       +
           {{ $currentState := "closed" }}

     

       81
       81
       +
           {{ if .FilteringByOpen }}

     

       82
       82
       +
             {{ $currentState = "open" }}

     

       83
       83
       +
           {{ end }}

     

       84
       84
       +
       

     

       85
       85
       +
           {{ if gt .Page.Offset 0 }}

     

       86
       86
       +
              {{ $prev := .Page.Previous }}

     

       87
       87
       +
               <a

     

       88
       88
       +
                   class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       89
       89
       +
                   hx-boost="true"

     

       90
       90
       +
                   href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&offset={{ $prev.Offset }}&limit={{ $prev.Limit }}"

     

       91
       91
       +
               >

     

       92
       92
       +
                   {{ i "chevron-left" "w-4 h-4" }}

     

       93
       93
       +
                   previous

     

       94
       94
       +
               </a>

     

       95
       95
       +
           {{ else }}

     

       96
       96
       +
               <div></div>

     

       97
       97
       +
           {{ end }}

     

       98
       98
       +
       

     

       99
       99
       +
           {{ if eq (len .Issues) .Page.Limit }}

     

       100
       100
       +
              {{ $next := .Page.Next }}

     

       101
       101
       +
               <a

     

       102
       102
       +
                   class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       103
       103
       +
                   hx-boost="true"

     

       104
       104
       +
                   href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&offset={{ $next.Offset }}&limit={{ $next.Limit }}"

     

       105
       105
       +
               >

     

       106
       106
       +
                   next

     

       107
       107
       +
                   {{ i "chevron-right" "w-4 h-4" }}

     

       108
       108
       +
               </a>

     

       109
       109
       +
           {{ end }}

     

       110
       110
       +
       </div>

     

       73
       111
        
       {{ end }}

+31

appview/pagination/page.go

···

       1
       1
       +
       package pagination

     

       2
       2
       +
       

     

       3
       3
       +
       type Page struct {

     

       4
       4
       +
       	Offset int // where to start from

     

       5
       5
       +
       	Limit  int // number of items in a page

     

       6
       6
       +
       }

     

       7
       7
       +
       

     

       8
       8
       +
       func FirstPage() Page {

     

       9
       9
       +
       	return Page{

     

       10
       10
       +
       		Offset: 0,

     

       11
       11
       +
       		Limit:  10,

     

       12
       12
       +
       	}

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       15
       15
       +
       func (p Page) Previous() Page {

     

       16
       16
       +
       	if p.Offset-p.Limit < 0 {

     

       17
       17
       +
       		return FirstPage()

     

       18
       18
       +
       	} else {

     

       19
       19
       +
       		return Page{

     

       20
       20
       +
       			Offset: p.Offset - p.Limit,

     

       21
       21
       +
       			Limit:  p.Limit,

     

       22
       22
       +
       		}

     

       23
       23
       +
       	}

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       func (p Page) Next() Page {

     

       27
       27
       +
       	return Page{

     

       28
       28
       +
       		Offset: p.Offset + p.Limit,

     

       29
       29
       +
       		Limit:  p.Limit,

     

       30
       30
       +
       	}

     

       31
       31
       +
       }

+9 -1

appview/state/repo.go

···

       28
       28
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       29
       29
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       30
       30
        
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       31
       31
       +
       	"tangled.sh/tangled.sh/core/appview/pagination"

     

       31
       32
        
       	"tangled.sh/tangled.sh/core/types"

     

       32
       33
        
       

     

       33
       34
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     
···

       1559
       1560
        
       		isOpen = true

     

       1560
       1561
        
       	}

     

       1561
       1562
        
       

     

       1563
       1563
       +
       	page, ok := r.Context().Value("page").(pagination.Page)

     

       1564
       1564
       +
       	if !ok {

     

       1565
       1565
       +
       		log.Println("failed to get page")

     

       1566
       1566
       +
       		page = pagination.FirstPage()

     

       1567
       1567
       +
       	}

     

       1568
       1568
       +
       

     

       1562
       1569
        
       	user := s.auth.GetUser(r)

     

       1563
       1570
        
       	f, err := fullyResolvedRepo(r)

     

       1564
       1571
        
       	if err != nil {

     
···

       1566
       1573
        
       		return

     

       1567
       1574
        
       	}

     

       1568
       1575
        
       

     

       1569
       1569
       -
       	issues, err := db.GetIssues(s.db, f.RepoAt, isOpen)

     

       1576
       1576
       +
       	issues, err := db.GetIssues(s.db, f.RepoAt, isOpen, page)

     

       1570
       1577
        
       	if err != nil {

     

       1571
       1578
        
       		log.Println("failed to get issues", err)

     

       1572
       1579
        
       		s.pages.Notice(w, "issues", "Failed to load issues. Try again later.")

     
···

       1593
       1600
        
       		Issues:          issues,

     

       1594
       1601
        
       		DidHandleMap:    didHandleMap,

     

       1595
       1602
        
       		FilteringByOpen: isOpen,

     

       1603
       1603
       +
       		Page:            page,

     

       1596
       1604
        
       	})

     

       1597
       1605
        
       	return

     

       1598
       1606
        
       }

+1 -1

appview/state/router.go

···

       68
       68
        
       			r.Get("/blob/{ref}/raw/*", s.RepoBlobRaw)

     

       69
       69
        
       

     

       70
       70
        
       			r.Route("/issues", func(r chi.Router) {

     

       71
       71
       -
       				r.Get("/", s.RepoIssues)

     

       71
       71
       +
       				r.With(middleware.Paginate).Get("/", s.RepoIssues)

     

       72
       72
        
       				r.Get("/{issue}", s.RepoSingleIssue)

     

       73
       73
        
       

     

       74
       74
        
       				r.Group(func(r chi.Router) {

+82

docs/knot-hosting.md

···

       106
       106
        
       

     

       107
       107
        
       You should now have a running knot server! You can finalize your registration by hitting the

     

       108
       108
        
       `initialize` button on the [/knots](/knots) page.

     

       109
       109
       +
       

     

       110
       110
       +
       ### custom paths

     

       111
       111
       +
       

     

       112
       112
       +
       (This section applies to manual setup only. Docker users should edit the mounts

     

       113
       113
       +
       in `docker-compose.yml` instead.)

     

       114
       114
       +
       

     

       115
       115
       +
       Right now, the database and repositories of your knot lives in `/home/git`. You

     

       116
       116
       +
       can move these paths if you'd like to store them in another folder. Be careful

     

       117
       117
       +
       when adjusting these paths:

     

       118
       118
       +
       

     

       119
       119
       +
       * Stop your knot when moving data (e.g. `systemctl stop knotserver`) to prevent

     

       120
       120
       +
       any possible side effects. Remember to restart it once you're done.

     

       121
       121
       +
       * Make backups before moving in case something goes wrong.

     

       122
       122
       +
       * Make sure the `git` user can read and write from the new paths.

     

       123
       123
       +
       

     

       124
       124
       +
       #### database

     

       125
       125
       +
       

     

       126
       126
       +
       As an example, let's say the current database is at `/home/git/knotserver.db`,

     

       127
       127
       +
       and we want to move it to `/home/git/database/knotserver.db`.

     

       128
       128
       +
       

     

       129
       129
       +
       Copy the current database to the new location. Make sure to copy the `.db-shm`

     

       130
       130
       +
       and `.db-wal` files if they exist.

     

       131
       131
       +
       

     

       132
       132
       +
       ```

     

       133
       133
       +
       mkdir /home/git/database

     

       134
       134
       +
       cp /home/git/knotserver.db* /home/git/database

     

       135
       135
       +
       ```

     

       136
       136
       +
       

     

       137
       137
       +
       In the environment (e.g. `/home/git/.knot.env`), set `KNOT_SERVER_DB_PATH` to

     

       138
       138
       +
       the new file path (_not_ the directory):

     

       139
       139
       +
       

     

       140
       140
       +
       ```

     

       141
       141
       +
       KNOT_SERVER_DB_PATH=/home/git/database/knotserver.db

     

       142
       142
       +
       ```

     

       143
       143
       +
       

     

       144
       144
       +
       #### repositories

     

       145
       145
       +
       

     

       146
       146
       +
       As an example, let's say the repositories are currently in `/home/git`, and we

     

       147
       147
       +
       want to move them into `/home/git/repositories`.

     

       148
       148
       +
       

     

       149
       149
       +
       Create the new folder, then move the existing repositories (if there are any):

     

       150
       150
       +
       

     

       151
       151
       +
       ```

     

       152
       152
       +
       mkdir /home/git/repositories

     

       153
       153
       +
       # move all DIDs into the new folder; these will vary for you!

     

       154
       154
       +
       mv /home/git/did:plc:wshs7t2adsemcrrd4snkeqli /home/git/repositories

     

       155
       155
       +
       ```

     

       156
       156
       +
       

     

       157
       157
       +
       In the environment (e.g. `/home/git/.knot.env`), update `KNOT_REPO_SCAN_PATH`

     

       158
       158
       +
       to the new directory:

     

       159
       159
       +
       

     

       160
       160
       +
       ```

     

       161
       161
       +
       KNOT_REPO_SCAN_PATH=/home/git/repositories

     

       162
       162
       +
       ```

     

       163
       163
       +
       

     

       164
       164
       +
       In your SSH config (e.g. `/etc/ssh/sshd_config.d/authorized_keys_command.conf`),

     

       165
       165
       +
       update the `AuthorizedKeysCommand` line to use the new folder. For example:

     

       166
       166
       +
       

     

       167
       167
       +
       ```

     

       168
       168
       +
       Match User git

     

       169
       169
       +
         AuthorizedKeysCommand /usr/local/libexec/tangled-keyfetch -git-dir /home/git/repositories

     

       170
       170
       +
         AuthorizedKeysCommandUser nobody

     

       171
       171
       +
       ```

     

       172
       172
       +
       

     

       173
       173
       +
       Make sure to restart your SSH server!

     

       174
       174
       +
       

     

       175
       175
       +
       #### git

     

       176
       176
       +
       

     

       177
       177
       +
       The keyfetch executable takes multiple arguments to change certain paths. You

     

       178
       178
       +
       can view a full list by running `/usr/local/libexec/tangled-keyfetch -h`.

     

       179
       179
       +
       

     

       180
       180
       +
       As an example, if you wanted to change the path to the repoguard executable,

     

       181
       181
       +
       you would edit your SSH config (e.g. `/etc/ssh/sshd_config.d/authorized_keys_command.conf`)

     

       182
       182
       +
       and update the `AuthorizedKeysCommand` line:

     

       183
       183
       +
       

     

       184
       184
       +
       ```

     

       185
       185
       +
       Match User git

     

       186
       186
       +
         AuthorizedKeysCommand /usr/local/libexec/tangled-keyfetch -repoguard-path /path/to/repoguard

     

       187
       187
       +
         AuthorizedKeysCommandUser nobody

     

       188
       188
       +
       ```

     

       189
       189
       +
       

     

       190
       190
       +
       Make sure to restart your SSH server!

Compare changes