From 1c501d2cd932d47e0b9b0ae4ac93e3c17637f920 Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Wed, 5 Mar 2025 13:13:18 +0000
Subject: [PATCH] fix timeline cutoff

---
 appview/db/timeline.go    |  8 ++++----
 appview/state/git_http.go | 13 +++++++++----
 flake.nix                 |  8 +++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/appview/db/timeline.go b/appview/db/timeline.go
index 17d29652..3eed91ea 100644
--- a/appview/db/timeline.go
+++ b/appview/db/timeline.go
@@ -40,14 +40,14 @@ func MakeTimeline(e Execer) ([]TimelineEvent, error) {
 		})
 	}
 
+	sort.Slice(events, func(i, j int) bool {
+		return events[i].EventAt.After(events[j].EventAt)
+	})
+
 	// Limit the slice to 100 events
 	if len(events) > 50 {
 		events = events[:50]
 	}
 
-	sort.Slice(events, func(i, j int) bool {
-		return events[i].EventAt.After(events[j].EventAt)
-	})
-
 	return events, nil
 }
diff --git a/appview/state/git_http.go b/appview/state/git_http.go
index 2399f961..d9296fb0 100644
--- a/appview/state/git_http.go
+++ b/appview/state/git_http.go
@@ -14,11 +14,11 @@ func (s *State) InfoRefs(w http.ResponseWriter, r *http.Request) {
 	knot := r.Context().Value("knot").(string)
 	repo := chi.URLParam(r, "repo")
 
-	uri := "https"
+	scheme := "https"
 	if s.config.Dev {
-		uri = "http"
+		scheme = "http"
 	}
-	targetURL := fmt.Sprintf("%s://%s/%s/%s/info/refs?%s", uri, knot, user.DID, repo, r.URL.RawQuery)
+	targetURL := fmt.Sprintf("%s://%s/%s/%s/info/refs?%s", scheme, knot, user.DID, repo, r.URL.RawQuery)
 	resp, err := http.Get(targetURL)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -50,7 +50,12 @@ func (s *State) UploadPack(w http.ResponseWriter, r *http.Request) {
 	}
 	knot := r.Context().Value("knot").(string)
 	repo := chi.URLParam(r, "repo")
-	targetURL := fmt.Sprintf("https://%s/%s/%s/git-upload-pack?%s", knot, user.DID, repo, r.URL.RawQuery)
+
+	scheme := "https"
+	if s.config.Dev {
+		scheme = "http"
+	}
+	targetURL := fmt.Sprintf("%s://%s/%s/%s/git-upload-pack?%s", scheme, knot, user.DID, repo, r.URL.RawQuery)
 	client := &http.Client{}
 
 	// Create new request
diff --git a/flake.nix b/flake.nix
index 00fe58c9..9b8f4256 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,7 @@
     inherit (gitignore.lib) gitignoreSource;
   in {
     overlays.default = final: prev: let
-      goModHash = "sha256-ywhhGrv8KNqy9tCMCnA1PU/RQ/+0Xyitej1L48TcFvI=";
+      goModHash = "sha256-tBhwRT3qnTHoAyasYIDwr9+3V+c7VLPY2LJ6A25l1gA=";
       buildCmdPackage = name:
         final.buildGoModule {
           pname = name;
@@ -282,7 +282,9 @@
         config = mkIf config.services.tangled-knotserver.enable {
           nixpkgs.overlays = [self.overlays.default];
 
-          environment.systemPackages = with pkgs; [git];
+          environment.systemPackages = with pkgs; [
+              git
+          ];
 
           users.users.git = {
             isSystemUser = true;
@@ -300,7 +302,7 @@
             enable = true;
             extraConfig = ''
               Match User git
-              AuthorizedKeysCommand ${pkgs.keyfetch}/bin/keyfetch -repoguard-path ${pkgs.repoguard}/bin/repoguard
+              AuthorizedKeysCommand ${pkgs.keyfetch}/bin/keyfetch -repoguard-path ${pkgs.repoguard}/bin/repoguard -log-path /home/git/repoguard.log
               AuthorizedKeysCommandUser nobody
             '';
           };
-- 
2.51.2