From 71536f1f2307ff1bd71c80abd985f77fa4173fbc Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 9 Sep 2024 00:35:00 +0000 Subject: [PATCH 1/4] heptapod: fix the imageName/finalImageName/sha256 --- nix/docker/heptapod/image.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/docker/heptapod/image.json b/nix/docker/heptapod/image.json index 8442c4e494..8d052d8cc0 100644 --- a/nix/docker/heptapod/image.json +++ b/nix/docker/heptapod/image.json @@ -1,7 +1,7 @@ { - "imageName": "octobus/heptapod", + "imageName": "heptapod/heptapod", "imageDigest": "sha256:2060ec4a177bd222cca1523f65897071e11cdb39134c63a01fc6cba3eb8ea119", - "sha256": "sha256:0000000000000000000000000000000000000000000000000000", - "finalImageName": "octobus/heptapod", + "sha256": "sha256-drPu16J+RFAF3lgMjW7hX4M22VpqcLsaWIfdMvt+s8E=", + "finalImageName": "heptapod/heptapod", "finalImageTag": "1.5.5" } From 0b7dd5e1b31dc2c1ad5976cc038ffb509e403dcd Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 9 Sep 2024 00:48:22 +0000 Subject: [PATCH 2/4] plex-pass: 1.40.5.8796 -> 1.40.5.8921 --- nix/pkgs/plex-pass.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nix/pkgs/plex-pass.nix b/nix/pkgs/plex-pass.nix index 87cb3fe5c0..1ac30ac86e 100644 --- a/nix/pkgs/plex-pass.nix +++ b/nix/pkgs/plex-pass.nix @@ -4,10 +4,10 @@ { pkgs, ... }: let - version = "1.40.5.8796-3e374e32c"; + version = "1.40.5.8921-836b34c27"; src = pkgs.fetchurl { - url = "https://downloads.plex.tv/plex-media-server-new/1.40.5.8796-3e374e32c/debian/plexmediaserver_1.40.5.8796-3e374e32c_amd64.deb"; - hash = "sha256:0vdf3cilghmi8gd18dw6d4qg6j71ikfp9lqnd2qy6jjw8a3m3jk8"; + url = "https://downloads.plex.tv/plex-media-server-new/1.40.5.8921-836b34c27/debian/plexmediaserver_1.40.5.8921-836b34c27_amd64.deb"; + hash = "sha256:0fia2d6gxlxv1my5031wnp3ihc3knfra1yrwadz44khh03zkvxq7"; }; in (pkgs.plex.override { From 5726067315039a452ab956f739f9cc9377c79d33 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 9 Sep 2024 01:02:48 +0000 Subject: [PATCH 3/4] tumblrandom: some fixups --- go/tumblrandom/tumblrandom.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/go/tumblrandom/tumblrandom.go b/go/tumblrandom/tumblrandom.go index 3811448d62..d022ee4da4 100644 --- a/go/tumblrandom/tumblrandom.go +++ b/go/tumblrandom/tumblrandom.go @@ -205,7 +205,7 @@ type likesResponse struct { } var ( - refreshBuf map[string][]Post + refreshBuf = map[string][]Post{} refreshBufMu sync.Mutex ) @@ -279,6 +279,9 @@ func (a *app) refreshLikes(rw http.ResponseWriter, r *http.Request) { urlSuffix = lr.Response.Links.Next.Href if urlSuffix != "" { + refreshBufMu.Lock() + refreshBuf[refreshSess] = likes + refreshBufMu.Unlock() fmt.Fprintf(rw, ` @@ -286,8 +289,8 @@ func (a *app) refreshLikes(rw http.ResponseWriter, r *http.Request) {
- - + +