From bbc00edc6508ea1910c4d9e6a272f7859900950d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 16 Aug 2024 22:14:16 -0400
Subject: end of summer refactor (#31)

* crates: `bot-*` -> `discord-bot`

I didn't really need all these crates to be split :/

* discord-bot: revamp http impl

also handles the new errors reported by teawieAPI

* crates: split http backend

this can be reused easily

* git-tracker: short-circuit boolean logic

We don't need to check if the commit is a descendant of the HEAD of the
branch if it *is* the HEAD

* nix: fenix -> nixpkgs

* treefmt: add actionlint

* nix: use docker arch names for containers

* ci: use actions-rust-lang actions

* nix: drop ci dev shell

* git-tracker: init ManagedRepository

this logic can be shared

* ci: use nix for clippy scan

* discord-bot: better handle unmerged PRs

* ci: fix treefmt check

* nix: fix clippy check

* .env.template: update crate names

* git-tracker: use remote name for remote name

i was half asleep

* discord-bot: handle merged PRs that aren't found in any tracked branches

* git-tracker: make collect_statuses_in() return a Vec

* discord-bot: add more PR info with response

fixes #18
---
 Cargo.lock | 113 ++++++++++++++++++++++---------------------------------------
 1 file changed, 40 insertions(+), 73 deletions(-)

(limited to 'Cargo.lock')

diff --git a/Cargo.lock b/Cargo.lock
index ede0690..d33533f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,9 +58,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
@@ -170,67 +170,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "bot-client"
-version = "0.2.0"
-dependencies = [
- "bot-commands",
- "bot-config",
- "bot-consts",
- "bot-error",
- "bot-http",
- "bot-jobs",
- "log",
- "serenity",
- "tokio",
-]
-
-[[package]]
-name = "bot-commands"
-version = "0.2.0"
-dependencies = [
- "bot-config",
- "bot-consts",
- "bot-error",
- "bot-http",
- "git-tracker",
- "log",
- "serenity",
-]
-
-[[package]]
-name = "bot-config"
-version = "0.2.0"
-
-[[package]]
-name = "bot-consts"
-version = "0.2.0"
-
-[[package]]
-name = "bot-error"
-version = "0.2.0"
-
-[[package]]
-name = "bot-http"
-version = "0.2.0"
-dependencies = [
- "log",
- "reqwest 0.12.5",
- "serde",
-]
-
-[[package]]
-name = "bot-jobs"
-version = "0.2.0"
-dependencies = [
- "bot-config",
- "bot-consts",
- "bot-error",
- "git2",
- "log",
- "tokio",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.16.0"
@@ -432,6 +371,20 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "discord-bot"
+version = "0.2.0"
+dependencies = [
+ "dotenvy",
+ "env_logger",
+ "eyre",
+ "git-tracker",
+ "log",
+ "nixpkgs-tracker-http",
+ "serenity",
+ "tokio",
+]
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -495,6 +448,16 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.1.0"
@@ -650,9 +613,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.18.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70"
+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
 dependencies = [
  "bitflags 2.5.0",
  "libc",
@@ -922,6 +885,12 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@@ -982,9 +951,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.16.2+1.7.2"
+version = "0.17.0+1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
 dependencies = [
  "cc",
  "libc",
@@ -1086,14 +1055,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "nixpkgs-tracker-bot"
+name = "nixpkgs-tracker-http"
 version = "0.2.0"
 dependencies = [
- "bot-client",
- "bot-error",
- "dotenvy",
- "env_logger",
- "tokio",
+ "log",
+ "reqwest 0.12.5",
+ "serde",
 ]
 
 [[package]]
-- 
cgit v1.2.3