diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..4660d0f
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,75 @@
+# What software is installed by default:
+# https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
+
+name: build
+
+on:
+ push:
+ pull_request:
+
+defaults:
+ run:
+ shell: bash
+
+jobs:
+ build:
+ strategy:
+ matrix:
+ os:
+ - ubuntu-22.04
+ - windows-latest
+ - macos-latest
+ - macos-13
+ runs-on: ${{ matrix.os }}
+ steps:
+ - name: Check out repo
+ uses: actions/checkout@v4
+
+ - name: Set up rust
+ run: rustup update
+
+ - name: Build
+ run: cargo build --release
+
+ - name: Test
+ run: cargo test --release
+
+ - name: Record target triple
+ run: rustc -vV | awk '/^host/ { print $2 }' > target/release/host
+
+ - name: Upload
+ uses: actions/upload-artifact@v4
+ with:
+ name: cove-${{ matrix.os }}
+ path: |
+ target/release/cove
+ target/release/cove.exe
+ target/release/host
+
+ release:
+ runs-on: ubuntu-latest
+ if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+ needs:
+ - build
+ permissions:
+ contents: write
+ steps:
+ - name: Download artifacts
+ uses: actions/download-artifact@v4
+
+ - name: Zip artifacts
+ run: |
+ chmod +x cove-ubuntu-22.04/cove
+ chmod +x cove-windows-latest/cove.exe
+ chmod +x cove-macos-latest/cove
+ chmod +x cove-macos-13/cove
+ zip -jr "cove-$(cat cove-ubuntu-22.04/host).zip" cove-ubuntu-22.04/cove
+ zip -jr "cove-$(cat cove-windows-latest/host).zip" cove-windows-latest/cove.exe
+ zip -jr "cove-$(cat cove-macos-latest/host).zip" cove-macos-latest/cove
+ zip -jr "cove-$(cat cove-macos-13/host).zip" cove-macos-13/cove
+
+ - name: Create new release
+ uses: softprops/action-gh-release@v2
+ with:
+ body: Automated release, see [CHANGELOG.md](CHANGELOG.md) for more details.
+ files: "*.zip"
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7a89179..4e428aa 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,7 +2,7 @@
"files.insertFinalNewline": true,
"rust-analyzer.cargo.features": "all",
"rust-analyzer.imports.granularity.enforce": true,
- "rust-analyzer.imports.granularity.group": "module",
+ "rust-analyzer.imports.granularity.group": "crate",
"rust-analyzer.imports.group.enable": true,
"evenBetterToml.formatter.columnWidth": 100,
}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47d75a8..3f9ce8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,25 +4,135 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
Procedure when bumping the version number:
+
1. Update dependencies in a separate commit
2. Set version number in `Cargo.toml`
3. Add new section in this changelog
4. Run `cargo run help-config > CONFIG.md`
5. Commit with message `Bump version to X.Y.Z`
6. Create tag named `vX.Y.Z`
-7. Fast-forward branch `latest`
-8. Push `master`, `latest` and the new tag
+7. Push `master` and the new tag
## Unreleased
+### Changed
+
+- Display emoji user id hashes in the nick list
+- Compile linux binary with older glibc version
+
+## v0.9.3 - 2025-05-31
+
+### Added
+
+- Key bindings for emoji-based user id hashing
+
+### Fixed
+
+- `keys.rooms.action.connect_autojoin` connecting to non-autojoin rooms
+
+## v0.9.2 - 2025-03-14
+
+### Added
+
+- `bell_on_mention` config option
+
+## v0.9.1 - 2025-03-01
+
+### Fixed
+
+- Rendering glitches with unicode-based width estimation
+
+## v0.9.0 - 2025-02-23
+
+### Added
+
+- Unicode-based grapheme width estimation method
+ - `width_estimation_method` config option
+ - `--width-estimation-method` option
+- Room links are now included in the `I` message links list
+
+### Changed
+
+- Updated documentation for `time_zone` config option
+- When connecting to a room using `n` in the room list, the cursor now moves to that room
+- Updated list of emoji names
+
+### Removed
+
+- Special handling of &rl2dev
+
+### Fixed
+
+- Nick color in rare edge cases
+- Message link list rendering bug
+
+## v0.8.3 - 2024-05-20
+
+### Changed
+
+- Updated list of emoji names
+
+## v0.8.2 - 2024-04-25
+
+### Changed
+
+- Renamed `json-stream` export format to `json-lines` (see )
+- Changed `json-lines` file extension from `.json` to `.jsonl`
+
+### Fixed
+
+- Crash when window is too small while empty message editor is visible
+- Mistakes in output and docs
+- Cove not cleaning up terminal state properly
+
+## v0.8.1 - 2024-01-11
+
+### Added
+
+- Support for setting window title
+- More information to room list heading
+- Key bindings for live caesar cipher de- and encoding
+
+### Removed
+
+- Key binding to open present page
+
+## v0.8.0 - 2024-01-04
+
+### Added
+
+- Support for multiple euph server domains
+- Support for `TZ` environment variable
+- `time_zone` config option
+- `--domain` option to `cove export` command
+- `--domain` option to `cove clear-cookies` command
+- Domain field to "connect to new room" popup
+- Welcome info box next to room list
+
+### Changed
+
+- The default euph domain is now https://euphoria.leet.nu/ everywhere
+- The config file format was changed to support multiple euph servers with different domains.
+ Options previously located at `euph.rooms.*` should be reviewed and moved to `euph.servers."euphoria.leet.nu".rooms.*`.
+- Tweaked F1 popup
+- Tweaked chat message editor when nick list is foused
+- Reduced connection timeout from 30 seconds to 10 seconds
+
+### Fixed
+
+- Room deletion popup accepting any room name
+- Duplicated key presses on Windows
+
## v0.7.1 - 2023-08-31
### Changed
+
- Updated dependencies
## v0.7.0 - 2023-05-14
### Added
+
- Auto-generated config documentation
- in [CONFIG.md](CONFIG.md)
- via `help-config` CLI command
@@ -30,6 +140,7 @@ Procedure when bumping the version number:
- `measure_widths` config option
### Changed
+
- Overhauled widget system and extracted generic widgets to [toss](https://github.com/Garmelon/toss)
- Overhauled config system to support auto-generating documentation
- Overhauled key binding system to make key bindings configurable
@@ -43,15 +154,18 @@ Procedure when bumping the version number:
## v0.6.1 - 2023-04-10
### Changed
+
- Improved JSON export performance
- Always show rooms from config file in room list
### Fixed
+
- Rooms reconnecting instead of showing error popups
## v0.6.0 - 2023-04-04
### Added
+
- Emoji support
- `flake.nix`, making cove available as a nix flake
- `json-stream` room export format
@@ -59,31 +173,37 @@ Procedure when bumping the version number:
- `--verbose` flag
### Changed
+
- Non-export info is now printed to stderr instead of stdout
- Recognizes links without scheme (e.g. `euphoria.io` instead of `https://euphoria.io`)
- Rooms waiting for reconnect are no longer sorted to bottom in default sort order
### Fixed
+
- Mentions not being stopped by `>`
## v0.5.2 - 2023-01-14
### Added
+
- Key binding to open present page
### Changed
+
- Always connect to &rl2dev in ephemeral mode
- Reduce amount of messages per &rl2dev log request
## v0.5.1 - 2022-11-27
### Changed
+
- Increase reconnect delay to one minute
- Print errors that occurred while cove was running more compactly
## v0.5.0 - 2022-09-26
### Added
+
- Key bindings to navigate nick list
- Room deletion confirmation popup
- Message inspection popup
@@ -92,10 +212,12 @@ Procedure when bumping the version number:
- `rooms_sort_order` config option
### Changed
+
- Use nick changes to detect sessions for nick list
- Support Unicode 15
### Fixed
+
- Cursor being visible through popups
- Cursor in lists when highlighted item moves off-screen
- User disappearing from nick list when only one of their sessions disconnects
@@ -103,6 +225,7 @@ Procedure when bumping the version number:
## v0.4.0 - 2022-09-01
### Added
+
- Config file and `--config` cli option
- `data_dir` config option
- `ephemeral` config option
@@ -118,14 +241,17 @@ Procedure when bumping the version number:
- Key bindings to view and open links in a message
### Changed
+
- Some key bindings in the rooms list
### Fixed
+
- Rooms being stuck in "Connecting" state
## v0.3.0 - 2022-08-22
### Added
+
- Account login and logout
- Authentication dialog for password-protected rooms
- Error popups in rooms when something goes wrong
@@ -133,10 +259,12 @@ Procedure when bumping the version number:
- Key binding to download more logs
### Changed
+
- Reduced amount of unnecessary redraws
- Description of `export` CLI command
### Fixed
+
- Crash when connecting to nonexistent rooms
- Crash when connecting to rooms that require authentication
- Pasting multi-line strings into the editor
@@ -144,15 +272,18 @@ Procedure when bumping the version number:
## v0.2.1 - 2022-08-11
### Added
+
- Support for modifiers on special keys via the [kitty keyboard protocol](https://sw.kovidgoyal.net/kitty/keyboard-protocol/)
### Fixed
+
- Joining new rooms no longer crashes cove
- Scrolling when exiting message editor
## v0.2.0 - 2022-08-10
### Added
+
- New messages are now marked as unseen
- Sub-trees can now be folded
- Support for pasting text into editors
@@ -165,10 +296,12 @@ Procedure when bumping the version number:
- Support for exporting multiple/all rooms at once
### Changed
+
- Reorganized export command
- Slowed down room history download speed
### Fixed
+
- Chat rendering when deleting and re-joining a room
- Spacing in some popups
diff --git a/CONFIG.md b/CONFIG.md
index a3f25ac..82a7242 100644
--- a/CONFIG.md
+++ b/CONFIG.md
@@ -8,15 +8,11 @@ Here is an example config that changes a few different options:
measure_widths = true
rooms_sort_order = "importance"
-[euph.rooms.welcome]
-autojoin = true
-
-[euph.rooms.test]
-username = "badingle"
-force_username = true
-
-[euph.rooms.private]
-password = "foobar"
+[euph.servers."euphoria.leet.nu".rooms]
+welcome.autojoin = true
+test.username = "badingle"
+test.force_username = true
+private.password = "foobar"
[keys]
general.abort = ["esc", "ctrl+c"]
@@ -24,17 +20,6 @@ general.exit = "ctrl+q"
tree.action.fold_tree = "f"
```
-If you want to configure lots of rooms, TOML lets you write this in a more
-compact way:
-
-```toml
-[euph.rooms]
-foo = { autojoin = true }
-bar = { autojoin = true }
-baz = { autojoin = true }
-private = { autojoin = true, password = "foobar" }
-```
-
## Key bindings
Key bindings are specified as strings or lists of strings. Each string specifies
@@ -68,6 +53,14 @@ Available modifiers:
## Available options
+### `bell_on_mention`
+
+**Required:** yes
+**Type:** boolean
+**Default:** `false`
+
+Ring the bell (character 0x07) when you are mentioned in a room.
+
### `data_dir`
**Required:** no
@@ -94,7 +87,7 @@ any options related to the data dir.
See also the `--ephemeral` command line option.
-### `euph.rooms..autojoin`
+### `euph.servers..rooms..autojoin`
**Required:** yes
**Type:** boolean
@@ -102,17 +95,17 @@ See also the `--ephemeral` command line option.
Whether to automatically join this room on startup.
-### `euph.rooms..force_username`
+### `euph.servers..rooms..force_username`
**Required:** yes
**Type:** boolean
**Default:** `false`
-If `euph.rooms..username` is set, this will force cove to set the
-username even if there is already a different username associated with
-the current session.
+If `euph.servers..rooms..username` is set, this will force
+cove to set the username even if there is already a different username
+associated with the current session.
-### `euph.rooms..password`
+### `euph.servers..rooms..password`
**Required:** no
**Type:** string
@@ -120,7 +113,7 @@ the current session.
If set, cove will try once to use this password to authenticate, should
the room be password-protected.
-### `euph.rooms..username`
+### `euph.servers..rooms..username`
**Required:** no
**Type:** string
@@ -336,14 +329,6 @@ Download more messages.
Change nick.
-### `keys.room.action.present`
-
-**Required:** yes
-**Type:** key binding
-**Default:** `"ctrl+p"`
-
-Open room's plugh.de/present page.
-
### `keys.rooms.action.change_sort_order`
**Required:** yes
@@ -472,6 +457,14 @@ Scroll up half a screen.
Scroll up one line.
+### `keys.tree.action.decrease_caesar`
+
+**Required:** yes
+**Type:** key binding
+**Default:** `"C"`
+
+Decrease caesar cipher rotation.
+
### `keys.tree.action.fold_tree`
**Required:** yes
@@ -480,6 +473,14 @@ Scroll up one line.
Fold current message's subtree.
+### `keys.tree.action.increase_caesar`
+
+**Required:** yes
+**Type:** key binding
+**Default:** `"c"`
+
+Increase caesar cipher rotation.
+
### `keys.tree.action.inspect`
**Required:** yes
@@ -536,6 +537,14 @@ Reply to message, inline if possible.
Reply opposite to normal reply.
+### `keys.tree.action.toggle_nick_emoji`
+
+**Required:** yes
+**Type:** key binding
+**Default:** `"e"`
+
+Toggle agent id based nick emoji.
+
### `keys.tree.action.toggle_seen`
**Required:** yes
@@ -614,14 +623,13 @@ Move to root.
**Type:** boolean
**Default:** `false`
-Whether to measure the width of characters as displayed by the terminal
-emulator instead of guessing the width.
+Whether to measure the width of graphemes (i.e. characters) as displayed
+by the terminal emulator instead of estimating the width.
Enabling this makes rendering a bit slower but more accurate. The screen
-might also flash when encountering new characters (or, more accurately,
-graphemes).
+might also flash when encountering new graphemes.
-See also the `--measure-graphemes` command line option.
+See also the `--measure-widths` command line option.
### `offline`
@@ -642,15 +650,62 @@ See also the `--offline` command line option.
**Required:** yes
**Type:** string
**Values:** `"alphabet"`, `"importance"`
-**Default:** `alphabet`
+**Default:** `"alphabet"`
Initial sort order of rooms list.
-`alphabet` sorts rooms in alphabetic order.
+`"alphabet"` sorts rooms in alphabetic order.
-`importance` sorts rooms by the following criteria (in descending order
-of priority):
+`"importance"` sorts rooms by the following criteria (in descending
+order of priority):
1. connected rooms before unconnected rooms
2. rooms with unread messages before rooms without
3. alphabetic order
+
+### `time_zone`
+
+**Required:** no
+**Type:** string
+**Default:** `$TZ` or local system time zone
+
+Time zone that chat timestamps should be displayed in.
+
+This option can either be the string `"localtime"`, a [POSIX TZ string],
+or a [tz identifier] from the [tz database].
+
+When not set or when set to `"localtime"`, cove attempts to use your
+system's configured time zone, falling back to UTC.
+
+When the string begins with a colon or doesn't match the a POSIX TZ
+string format, it is interpreted as a tz identifier and looked up in
+your system's tz database (or a bundled tz database on Windows).
+
+If the `TZ` environment variable exists, it overrides this option.
+
+[POSIX TZ string]: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
+[tz identifier]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+[tz database]: https://en.wikipedia.org/wiki/Tz_database
+
+### `width_estimation_method`
+
+**Required:** yes
+**Type:** string
+**Values:** `"legacy"`, `"unicode"`
+**Default:** `"legacy"`
+
+How to estimate the width of graphemes (i.e. characters) as displayed by
+the terminal emulator.
+
+`"legacy"`: Use a legacy method that should mostly work on most terminal
+emulators. This method will never be correct in all cases since every
+terminal emulator handles grapheme widths slightly differently. However,
+those cases are usually rare (unless you view a lot of emoji).
+
+`"unicode"`: Use the unicode standard in a best-effort manner to
+determine grapheme widths. Some terminals (e.g. ghostty) can make use of
+this.
+
+This method is used when `measure_widths` is set to `false`.
+
+See also the `--width-estimation-method` command line option.
diff --git a/Cargo.lock b/Cargo.lock
index b029739..2f45a5a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,107 +1,104 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-version = 3
+version = 4
[[package]]
name = "addr2line"
-version = "0.21.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
dependencies = [
"gimli",
]
[[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "ahash"
-version = "0.8.3"
+version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"once_cell",
"version_check",
+ "zerocopy 0.7.35",
]
[[package]]
name = "aho-corasick"
-version = "1.0.5"
+version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
-[[package]]
-name = "allocator-api2"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-
[[package]]
name = "anstream"
-version = "0.5.0"
+version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
+ "is_terminal_polyfill",
"utf8parse",
]
[[package]]
name = "anstyle"
-version = "1.0.2"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
[[package]]
name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
-version = "1.0.0"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
dependencies = [
- "windows-sys",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
dependencies = [
"anstyle",
- "windows-sys",
+ "once_cell",
+ "windows-sys 0.59.0",
]
[[package]]
name = "anyhow"
-version = "1.0.75"
+version = "1.0.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
[[package]]
name = "async-trait"
-version = "0.1.73"
+version = "0.1.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
dependencies = [
"proc-macro2",
"quote",
@@ -110,48 +107,76 @@ dependencies = [
[[package]]
name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "aws-lc-rs"
+version = "1.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dabb68eb3a7aa08b46fddfd59a3d55c978243557a90ab804769f7e20e67d2b01"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bbe221bbf523b625a4dd8585c7f38166e31167ec2ca98051dbcb4c3b6e825d2"
+dependencies = [
+ "bindgen",
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
[[package]]
name = "backtrace"
-version = "0.3.69"
+version = "0.3.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
dependencies = [
"addr2line",
- "cc",
"cfg-if",
"libc",
"miniz_oxide",
"object",
"rustc-demangle",
+ "windows-targets",
]
[[package]]
-name = "base64"
-version = "0.13.1"
+name = "bindgen"
+version = "0.69.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
+dependencies = [
+ "bitflags",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "syn",
+ "which",
+]
[[package]]
name = "bitflags"
-version = "1.3.2"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
[[package]]
name = "block-buffer"
@@ -162,47 +187,39 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "bumpalo"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
[[package]]
name = "bytes"
-version = "1.4.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
-
-[[package]]
-name = "case"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
[[package]]
name = "caseless"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808dab3318747be122cb31d36de18d4d1c81277a76f8332a02b81a3d73463d7f"
+checksum = "8b6fd507454086c8edfd769ca6ada439193cdb209c7681712ef6275cccbfe5d8"
dependencies = [
- "regex",
"unicode-normalization",
]
[[package]]
name = "cc"
-version = "1.0.83"
+version = "1.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
dependencies = [
+ "jobserver",
"libc",
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
]
[[package]]
@@ -212,21 +229,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
-name = "clap"
-version = "4.4.1"
+name = "clang-sys"
+version = "1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
dependencies = [
"clap_builder",
"clap_derive",
- "once_cell",
]
[[package]]
name = "clap_builder"
-version = "4.4.1"
+version = "4.5.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
dependencies = [
"anstream",
"anstyle",
@@ -236,9 +263,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.4.0"
+version = "4.5.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
dependencies = [
"heck",
"proc-macro2",
@@ -248,21 +275,30 @@ dependencies = [
[[package]]
name = "clap_lex"
-version = "0.5.1"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+
+[[package]]
+name = "cmake"
+version = "0.1.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+dependencies = [
+ "cc",
+]
[[package]]
name = "colorchoice"
-version = "1.0.0"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
[[package]]
name = "cookie"
-version = "0.17.0"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
dependencies = [
"time",
"version_check",
@@ -270,9 +306,9 @@ dependencies = [
[[package]]
name = "core-foundation"
-version = "0.9.3"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
dependencies = [
"core-foundation-sys",
"libc",
@@ -280,13 +316,13 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "cove"
-version = "0.7.1"
+version = "0.9.3"
dependencies = [
"anyhow",
"async-trait",
@@ -297,26 +333,24 @@ dependencies = [
"crossterm",
"directories",
"euphoxide",
+ "jiff",
"linkify",
"log",
- "once_cell",
"open",
"parking_lot",
"rusqlite",
+ "rustls",
"serde_json",
"thiserror",
- "time",
"tokio",
- "tokio-tungstenite 0.20.0",
"toss",
- "unicode-segmentation",
"unicode-width",
"vault",
]
[[package]]
name = "cove-config"
-version = "0.7.1"
+version = "0.9.3"
dependencies = [
"cove-input",
"cove-macro",
@@ -327,7 +361,7 @@ dependencies = [
[[package]]
name = "cove-input"
-version = "0.7.1"
+version = "0.9.3"
dependencies = [
"cove-macro",
"crossterm",
@@ -341,9 +375,8 @@ dependencies = [
[[package]]
name = "cove-macro"
-version = "0.7.1"
+version = "0.9.3"
dependencies = [
- "case",
"proc-macro2",
"quote",
"syn",
@@ -351,24 +384,24 @@ dependencies = [
[[package]]
name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
dependencies = [
"libc",
]
[[package]]
name = "crossterm"
-version = "0.27.0"
+version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
+checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags",
"crossterm_winapi",
- "libc",
"mio",
"parking_lot",
+ "rustix 0.38.44",
"signal-hook",
"signal-hook-mio",
"winapi",
@@ -395,17 +428,17 @@ dependencies = [
[[package]]
name = "data-encoding"
-version = "2.4.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
[[package]]
name = "deranged"
-version = "0.3.8"
+version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
dependencies = [
- "serde",
+ "powerfmt",
]
[[package]]
@@ -420,30 +453,36 @@ dependencies = [
[[package]]
name = "directories"
-version = "5.0.1"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
dependencies = [
"libc",
"option-ext",
"redox_users",
- "windows-sys",
+ "windows-sys 0.59.0",
]
[[package]]
-name = "edit"
-version = "0.1.4"
+name = "dunce"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c562aa71f7bc691fde4c6bf5f93ae5a5298b617c2eb44c76c87832299a17fbb4"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "edit"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f364860e764787163c8c8f58231003839be31276e821e2ad2092ddf496b1aa09"
dependencies = [
"tempfile",
"which",
@@ -451,62 +490,51 @@ dependencies = [
[[package]]
name = "either"
-version = "1.9.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
[[package]]
name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]]
name = "errno"
-version = "0.3.3"
+version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
"libc",
+ "windows-sys 0.59.0",
]
[[package]]
name = "euphoxide"
-version = "0.4.0"
-source = "git+https://github.com/Garmelon/euphoxide.git?tag=v0.4.0#fa6c8cdce9dd7e5f38e333e35ca975cfcdd60cd2"
+version = "0.6.1"
+source = "git+https://github.com/Garmelon/euphoxide.git?tag=v0.6.1#7a292c429ad44aa6aa52fc381e3168841d6303b0"
dependencies = [
"async-trait",
"caseless",
"clap",
"cookie",
"futures-util",
+ "jiff",
"log",
"serde",
"serde_json",
- "time",
"tokio",
"tokio-stream",
- "tokio-tungstenite 0.18.0",
+ "tokio-tungstenite",
"unicode-normalization",
]
[[package]]
name = "fallible-iterator"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
[[package]]
name = "fallible-streaming-iterator"
@@ -516,9 +544,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
[[package]]
name = "fastrand"
-version = "2.0.0"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
[[package]]
name = "fnv"
@@ -527,37 +555,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
-name = "form_urlencoded"
-version = "1.2.0"
+name = "fs_extra"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
-dependencies = [
- "percent-encoding",
-]
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
name = "futures-core"
-version = "0.3.28"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-sink"
-version = "0.3.28"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]]
name = "futures-task"
-version = "0.3.28"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
-version = "0.3.28"
+version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-core",
"futures-sink",
@@ -579,57 +604,83 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.10"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
]
[[package]]
name = "gimli"
-version = "0.28.0"
+version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "glob"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
[[package]]
name = "hashbrown"
-version = "0.14.0"
+version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
"ahash",
- "allocator-api2",
]
[[package]]
-name = "hashlink"
-version = "0.8.4"
+name = "hashbrown"
+version = "0.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "hashlink"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
dependencies = [
- "hashbrown",
+ "hashbrown 0.14.5",
]
[[package]]
name = "heck"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
-name = "hermit-abi"
-version = "0.3.2"
+name = "home"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
[[package]]
name = "http"
-version = "0.2.9"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
dependencies = [
"bytes",
"fnv",
@@ -638,28 +689,18 @@ dependencies = [
[[package]]
name = "httparse"
-version = "1.8.0"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
[[package]]
name = "indexmap"
-version = "2.0.0"
+version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
dependencies = [
"equivalent",
- "hashbrown",
+ "hashbrown 0.15.2",
]
[[package]]
@@ -682,31 +723,119 @@ dependencies = [
]
[[package]]
-name = "itoa"
-version = "1.0.9"
+name = "is_terminal_polyfill"
+version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
[[package]]
-name = "js-sys"
-version = "0.3.64"
+name = "itertools"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
- "wasm-bindgen",
+ "either",
]
[[package]]
-name = "libc"
-version = "0.2.147"
+name = "itoa"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jiff"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e"
+dependencies = [
+ "jiff-static",
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "962e1dfe9b2d75a84536cf5bf5eaaa4319aa7906c7160134a22883ac316d5f31"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a63c62e404e7b92979d2792352d885a7f8f83fd1d0d31eea582d77b2ceca697e"
+dependencies = [
+ "jiff-tzdb",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "libc"
+version = "0.2.171"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+
+[[package]]
+name = "libloading"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
+dependencies = [
+ "cfg-if",
+ "windows-targets",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags",
+ "libc",
+]
[[package]]
name = "libsqlite3-sys"
-version = "0.26.0"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
dependencies = [
"cc",
"pkg-config",
@@ -724,15 +853,21 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
[[package]]
name = "lock_api"
-version = "0.4.10"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [
"autocfg",
"scopeguard",
@@ -740,76 +875,88 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.20"
+version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
[[package]]
name = "memchr"
-version = "2.6.2"
+version = "2.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.7.1"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
dependencies = [
- "adler",
+ "adler2",
]
[[package]]
name = "mio"
-version = "0.8.8"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
dependencies = [
"libc",
"log",
- "wasi",
- "windows-sys",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
]
[[package]]
-name = "num-traits"
-version = "0.2.16"
+name = "nom"
+version = "7.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
[[package]]
name = "object"
-version = "0.32.0"
+version = "0.36.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.18.0"
+version = "1.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
[[package]]
name = "open"
-version = "5.0.0"
+version = "5.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8"
+checksum = "e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95"
dependencies = [
"is-wsl",
"libc",
@@ -818,9 +965,9 @@ dependencies = [
[[package]]
name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
[[package]]
name = "option-ext"
@@ -830,18 +977,18 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "ordered-float"
-version = "2.10.0"
+version = "2.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
dependencies = [
"num-traits",
]
[[package]]
name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -849,34 +996,28 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.3.5",
+ "redox_syscall",
"smallvec",
"windows-targets",
]
[[package]]
name = "pathdiff"
-version = "0.2.1"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
[[package]]
name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
[[package]]
name = "pin-utils"
@@ -886,50 +1027,84 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "pkg-config"
-version = "0.3.27"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy 0.8.23",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb"
+dependencies = [
+ "proc-macro2",
+ "syn",
+]
[[package]]
name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.94"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
-version = "1.0.33"
+version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rand"
-version = "0.8.5"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
dependencies = [
- "libc",
"rand_chacha",
"rand_core",
+ "zerocopy 0.8.23",
]
[[package]]
name = "rand_chacha"
-version = "0.3.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
"rand_core",
@@ -937,47 +1112,38 @@ dependencies = [
[[package]]
name = "rand_core"
-version = "0.6.4"
+version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
dependencies = [
- "getrandom",
+ "getrandom 0.3.1",
]
[[package]]
name = "redox_syscall"
-version = "0.2.16"
+version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
]
[[package]]
name = "redox_users"
-version = "0.4.3"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
dependencies = [
- "getrandom",
- "redox_syscall 0.2.16",
+ "getrandom 0.2.15",
+ "libredox",
"thiserror",
]
[[package]]
name = "regex"
-version = "1.9.4"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
@@ -987,9 +1153,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.3.7"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
dependencies = [
"aho-corasick",
"memchr",
@@ -998,32 +1164,31 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]]
name = "ring"
-version = "0.16.20"
+version = "0.17.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
dependencies = [
"cc",
+ "cfg-if",
+ "getrandom 0.2.15",
"libc",
- "once_cell",
- "spin",
"untrusted",
- "web-sys",
- "winapi",
+ "windows-sys 0.52.0",
]
[[package]]
name = "rusqlite"
-version = "0.29.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
+checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags",
"fallible-iterator",
"fallible-streaming-iterator",
"hashlink",
@@ -1034,91 +1199,100 @@ dependencies = [
[[package]]
name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustix"
-version = "0.38.10"
+version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags",
"errno",
"libc",
- "linux-raw-sys",
- "windows-sys",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.3",
+ "windows-sys 0.59.0",
]
[[package]]
name = "rustls"
-version = "0.20.9"
+version = "0.23.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
+checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
dependencies = [
+ "aws-lc-rs",
"log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
-dependencies = [
- "log",
- "ring",
+ "once_cell",
+ "rustls-pki-types",
"rustls-webpki",
- "sct",
+ "subtle",
+ "zeroize",
]
[[package]]
name = "rustls-native-certs"
-version = "0.6.3"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
dependencies = [
"openssl-probe",
- "rustls-pemfile",
+ "rustls-pki-types",
"schannel",
"security-framework",
]
[[package]]
-name = "rustls-pemfile"
-version = "1.0.3"
+name = "rustls-pki-types"
+version = "1.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
-dependencies = [
- "base64 0.21.3",
-]
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
[[package]]
name = "rustls-webpki"
-version = "0.101.4"
+version = "0.102.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
dependencies = [
+ "aws-lc-rs",
"ring",
+ "rustls-pki-types",
"untrusted",
]
[[package]]
name = "ryu"
-version = "1.0.15"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
[[package]]
name = "schannel"
-version = "0.1.22"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
dependencies = [
- "windows-sys",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -1127,23 +1301,13 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring",
- "untrusted",
-]
-
[[package]]
name = "security-framework"
-version = "2.9.2"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
"core-foundation",
"core-foundation-sys",
"libc",
@@ -1152,9 +1316,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
-version = "2.9.1"
+version = "2.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
dependencies = [
"core-foundation-sys",
"libc",
@@ -1162,9 +1326,9 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.188"
+version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
dependencies = [
"serde_derive",
]
@@ -1181,9 +1345,9 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.188"
+version = "1.0.219"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
dependencies = [
"proc-macro2",
"quote",
@@ -1202,35 +1366,42 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.105"
+version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
[[package]]
name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
[[package]]
name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
dependencies = [
"cfg-if",
"cpufeatures",
"digest",
]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
[[package]]
name = "signal-hook"
version = "0.3.17"
@@ -1243,9 +1414,9 @@ dependencies = [
[[package]]
name = "signal-hook-mio"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
dependencies = [
"libc",
"mio",
@@ -1254,9 +1425,9 @@ dependencies = [
[[package]]
name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
dependencies = [
"libc",
]
@@ -1272,37 +1443,37 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.11.0"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
[[package]]
name = "socket2"
-version = "0.5.3"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
dependencies = [
"libc",
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
-name = "spin"
-version = "0.5.2"
+name = "strsim"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
-name = "strsim"
-version = "0.10.0"
+name = "subtle"
+version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "syn"
-version = "2.0.29"
+version = "2.0.100"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
dependencies = [
"proc-macro2",
"quote",
@@ -1311,31 +1482,31 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.8.0"
+version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
dependencies = [
- "cfg-if",
"fastrand",
- "redox_syscall 0.3.5",
- "rustix",
- "windows-sys",
+ "getrandom 0.3.1",
+ "once_cell",
+ "rustix 1.0.2",
+ "windows-sys 0.59.0",
]
[[package]]
name = "thiserror"
-version = "1.0.47"
+version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.47"
+version = "2.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
dependencies = [
"proc-macro2",
"quote",
@@ -1344,12 +1515,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.28"
+version = "0.3.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
+checksum = "dad298b01a40a23aac4580b67e3dbedb7cc8402f3592d7f49469de2ea4aecdd8"
dependencies = [
"deranged",
"itoa",
+ "num-conv",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -1357,24 +1530,25 @@ dependencies = [
[[package]]
name = "time-core"
-version = "0.1.1"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
[[package]]
name = "time-macros"
-version = "0.2.14"
+version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
+checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
dependencies = [
+ "num-conv",
"time-core",
]
[[package]]
name = "tinyvec"
-version = "1.6.0"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
dependencies = [
"tinyvec_macros",
]
@@ -1387,28 +1561,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.32.0"
+version = "1.44.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
dependencies = [
"backtrace",
"bytes",
"libc",
"mio",
- "num_cpus",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
"tokio-macros",
- "windows-sys",
+ "windows-sys 0.52.0",
]
[[package]]
name = "tokio-macros"
-version = "2.1.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
dependencies = [
"proc-macro2",
"quote",
@@ -1417,30 +1590,19 @@ dependencies = [
[[package]]
name = "tokio-rustls"
-version = "0.23.4"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
dependencies = [
- "rustls 0.20.9",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.7",
+ "rustls",
"tokio",
]
[[package]]
name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -1449,40 +1611,25 @@ dependencies = [
[[package]]
name = "tokio-tungstenite"
-version = "0.18.0"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd"
+checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
dependencies = [
"futures-util",
"log",
- "rustls 0.20.9",
+ "rustls",
"rustls-native-certs",
+ "rustls-pki-types",
"tokio",
- "tokio-rustls 0.23.4",
- "tungstenite 0.18.0",
- "webpki",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2"
-dependencies = [
- "futures-util",
- "log",
- "rustls 0.21.7",
- "rustls-native-certs",
- "tokio",
- "tokio-rustls 0.24.1",
- "tungstenite 0.20.0",
+ "tokio-rustls",
+ "tungstenite",
]
[[package]]
name = "toml"
-version = "0.7.6"
+version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
dependencies = [
"serde",
"serde_spanned",
@@ -1492,18 +1639,18 @@ dependencies = [
[[package]]
name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
-version = "0.19.14"
+version = "0.22.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
dependencies = [
"indexmap",
"serde",
@@ -1514,8 +1661,8 @@ dependencies = [
[[package]]
name = "toss"
-version = "0.2.0"
-source = "git+https://github.com/Garmelon/toss.git?tag=v0.2.0#2c7888fa413c9b12bec7d55a73051aa96d59386f"
+version = "0.3.4"
+source = "git+https://github.com/Garmelon/toss.git?tag=v0.3.4#57aa8c59308f6f0aa82bde415a42b56c3d6f7c4d"
dependencies = [
"async-trait",
"crossterm",
@@ -1526,62 +1673,34 @@ dependencies = [
[[package]]
name = "tungstenite"
-version = "0.18.0"
+version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788"
+checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
dependencies = [
- "base64 0.13.1",
- "byteorder",
- "bytes",
- "http",
- "httparse",
- "log",
- "rand",
- "rustls 0.20.9",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
- "webpki",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649"
-dependencies = [
- "byteorder",
"bytes",
"data-encoding",
"http",
"httparse",
"log",
"rand",
- "rustls 0.21.7",
+ "rustls",
+ "rustls-pki-types",
"sha1",
"thiserror",
- "url",
"utf-8",
]
[[package]]
name = "typenum"
-version = "1.16.0"
+version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
[[package]]
name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
[[package]]
name = "unicode-linebreak"
@@ -1591,41 +1710,30 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
[[package]]
name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
dependencies = [
"tinyvec",
]
[[package]]
name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-width"
-version = "0.1.10"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
[[package]]
name = "untrusted"
-version = "0.7.1"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "utf-8"
@@ -1635,14 +1743,14 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "vault"
-version = "0.2.0"
-source = "git+https://github.com/Garmelon/vault.git?tag=v0.2.0#6fd284fed71ece886db9b8aab659f454ba4858b6"
+version = "0.4.0"
+source = "git+https://github.com/Garmelon/vault.git?tag=v0.4.0#a53254d2e787d15fd2d00584fddf9b84e79572ee"
dependencies = [
"rusqlite",
"tokio",
@@ -1656,9 +1764,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "wasi"
@@ -1667,88 +1775,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
-name = "wasm-bindgen"
-version = "0.2.87"
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-
-[[package]]
-name = "web-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
-dependencies = [
- "ring",
- "untrusted",
+ "wit-bindgen-rt",
]
[[package]]
name = "which"
-version = "4.4.0"
+version = "4.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
dependencies = [
"either",
- "libc",
+ "home",
"once_cell",
+ "rustix 0.38.44",
]
[[package]]
@@ -1775,22 +1819,32 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
-version = "0.48.0"
+version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
dependencies = [
"windows-targets",
]
[[package]]
name = "windows-targets"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
+ "windows_i686_gnullvm",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
@@ -1799,51 +1853,112 @@ dependencies = [
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
[[package]]
name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
[[package]]
name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.52.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.5.15"
+version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
dependencies = [
"memchr",
]
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+dependencies = [
+ "zerocopy-derive 0.8.23",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/Cargo.toml b/Cargo.toml
index b9cff62..33f245f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,21 +1,72 @@
[workspace]
-resolver = "2"
+resolver = "3"
members = ["cove", "cove-*"]
[workspace.package]
-version = "0.7.1"
-edition = "2021"
+version = "0.9.3"
+edition = "2024"
[workspace.dependencies]
-crossterm = "0.27.0"
-parking_lot = "0.12.1"
-serde = { version = "1.0.188", features = ["derive"] }
+anyhow = "1.0.97"
+async-trait = "0.1.87"
+clap = { version = "4.5.32", features = ["derive", "deprecated"] }
+cookie = "0.18.1"
+crossterm = "0.28.1"
+directories = "6.0.0"
+edit = "0.1.5"
+jiff = "0.2.4"
+linkify = "0.10.0"
+log = { version = "0.4.26", features = ["std"] }
+open = "5.3.2"
+parking_lot = "0.12.3"
+proc-macro2 = "1.0.94"
+quote = "1.0.40"
+rusqlite = { version = "0.31.0", features = ["bundled", "time"] }
+rustls = "0.23.23"
+serde = { version = "1.0.219", features = ["derive"] }
serde_either = "0.2.1"
-thiserror = "1.0.47"
+serde_json = "1.0.140"
+syn = "2.0.100"
+thiserror = "2.0.12"
+tokio = { version = "1.44.1", features = ["full"] }
+toml = "0.8.20"
+unicode-width = "0.2.0"
+
+[workspace.dependencies.euphoxide]
+git = "https://github.com/Garmelon/euphoxide.git"
+tag = "v0.6.1"
+features = ["bot"]
[workspace.dependencies.toss]
git = "https://github.com/Garmelon/toss.git"
-tag = "v0.2.0"
+tag = "v0.3.4"
+
+[workspace.dependencies.vault]
+git = "https://github.com/Garmelon/vault.git"
+tag = "v0.4.0"
+features = ["tokio"]
+
+[workspace.lints]
+rust.unsafe_code = { level = "forbid", priority = 1 }
+# Lint groups
+rust.deprecated_safe = "warn"
+rust.future_incompatible = "warn"
+rust.keyword_idents = "warn"
+rust.rust_2018_idioms = "warn"
+rust.unused = "warn"
+# Individual lints
+rust.non_local_definitions = "warn"
+rust.redundant_imports = "warn"
+rust.redundant_lifetimes = "warn"
+rust.single_use_lifetimes = "warn"
+rust.unit_bindings = "warn"
+rust.unnameable_types = "warn"
+rust.unused_crate_dependencies = "warn"
+rust.unused_import_braces = "warn"
+rust.unused_lifetimes = "warn"
+rust.unused_qualifications = "warn"
+# Clippy
+clippy.use_self = "warn"
[profile.dev.package."*"]
opt-level = 3
diff --git a/README.md b/README.md
index e5ee2c8..22fef83 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,17 @@
# cove
-Cove is a TUI client for [euphoria.io](https://euphoria.io/), a threaded
+Cove is a TUI client for [euphoria.leet.nu](https://euphoria.leet.nu/), a threaded
real-time chat platform.
It runs on Linux, Windows, and macOS.
+## Installing cove
+
+Download a binary of your choice from the
+[latest release on GitHub](https://github.com/Garmelon/cove/releases/latest).
+
## Using cove
To start cove, simply run `cove` in your terminal. For more info about the
@@ -26,61 +31,3 @@ file or via `cove help-config`.
When launched, cove prints the location it is loading its config file from. To
configure cove, create a config file at that location. This location can be
changed via the `--config` command line option.
-
-## Installation
-
-At this point, cove is not available via any package manager.
-
-Cove is available as a Nix Flake. To try it out, you can use
-```bash
-$ nix run --override-input nixpkgs nixpkgs github:Garmelon/cove/latest
-```
-
-## Manual installation
-
-This section contains instructions on how to install cove by compiling it yourself.
-It doesn't assume you know how to program, but it does assume basic familiarity with the command line on your platform of choice.
-Cove runs in the terminal, after all.
-
-### Installing rustup
-
-Cove is written in Rust, so the first step is to install rustup. Either install
-it from your package manager of choice (if you have one) or use the
-[installer](https://rustup.rs/).
-
-Test your installation by running `rustup --version` and `cargo --version`. If
-rustup is installed correctly, both of these should show a version number.
-
-Cove is designed on the current version of the stable toolchain. If cove doesn't
-compile, you can try switching to the stable toolchain and updating it using the
-following commands:
-```bash
-$ rustup default stable
-$ rustup update
-```
-
-### Installing cove
-
-To install or update to the latest release of cove, run the following command:
-
-```bash
-$ cargo install --force --git https://github.com/Garmelon/cove --branch latest
-```
-
-If you like to live dangerously and want to install or update to the latest,
-bleeding-edge, possibly-broken commit from the repo's main branch, run the
-following command.
-
-**Warning:** This could corrupt your vault. Make sure to make a backup before
-running the command.
-
-```bash
-$ cargo install --force --git https://github.com/Garmelon/cove
-```
-
-To install a specific version of cove, run the following command and substitute
-in the full version you want to install:
-
-```bash
-$ cargo install --force --git https://github.com/Garmelon/cove --tag v0.1.0
-```
diff --git a/cove-config/CONFIG.md b/cove-config/CONFIG.md
new file mode 100644
index 0000000..e69de29
diff --git a/cove-config/Cargo.toml b/cove-config/Cargo.toml
index 37ef5bd..9102bfd 100644
--- a/cove-config/Cargo.toml
+++ b/cove-config/Cargo.toml
@@ -1,13 +1,15 @@
[package]
name = "cove-config"
-version = { workspace = true }
-edition = { workspace = true }
+version.workspace = true
+edition.workspace = true
[dependencies]
cove-input = { path = "../cove-input" }
cove-macro = { path = "../cove-macro" }
-serde = { workspace = true }
-thiserror = { workspace = true }
+serde.workspace = true
+thiserror.workspace = true
+toml.workspace = true
-toml = "0.7.6"
+[lints]
+workspace = true
diff --git a/cove-config/src/doc.rs b/cove-config/src/doc.rs
index 3221eb5..35f6074 100644
--- a/cove-config/src/doc.rs
+++ b/cove-config/src/doc.rs
@@ -1,7 +1,6 @@
//! Auto-generate markdown documentation.
-use std::collections::HashMap;
-use std::path::PathBuf;
+use std::{collections::HashMap, path::PathBuf};
use cove_input::KeyBinding;
pub use cove_macro::Document;
@@ -17,15 +16,11 @@ Here is an example config that changes a few different options:
measure_widths = true
rooms_sort_order = "importance"
-[euph.rooms.welcome]
-autojoin = true
-
-[euph.rooms.test]
-username = "badingle"
-force_username = true
-
-[euph.rooms.private]
-password = "foobar"
+[euph.servers."euphoria.leet.nu".rooms]
+welcome.autojoin = true
+test.username = "badingle"
+test.force_username = true
+private.password = "foobar"
[keys]
general.abort = ["esc", "ctrl+c"]
@@ -33,17 +28,6 @@ general.exit = "ctrl+q"
tree.action.fold_tree = "f"
```
-If you want to configure lots of rooms, TOML lets you write this in a more
-compact way:
-
-```toml
-[euph.rooms]
-foo = { autojoin = true }
-bar = { autojoin = true }
-baz = { autojoin = true }
-private = { autojoin = true, password = "foobar" }
-```
-
## Key bindings
Key bindings are specified as strings or lists of strings. Each string specifies
diff --git a/cove-config/src/euph.rs b/cove-config/src/euph.rs
index 0584933..5ed0fb5 100644
--- a/cove-config/src/euph.rs
+++ b/cove-config/src/euph.rs
@@ -23,9 +23,9 @@ pub struct EuphRoom {
/// associated with the current session.
pub username: Option,
- /// If `euph.rooms..username` is set, this will force cove to set the
- /// username even if there is already a different username associated with
- /// the current session.
+ /// If `euph.servers..rooms..username` is set, this will force
+ /// cove to set the username even if there is already a different username
+ /// associated with the current session.
#[serde(default)]
pub force_username: bool,
@@ -35,7 +35,13 @@ pub struct EuphRoom {
}
#[derive(Debug, Default, Deserialize, Document)]
-pub struct Euph {
+pub struct EuphServer {
#[document(metavar = "room")]
pub rooms: HashMap,
}
+
+#[derive(Debug, Default, Deserialize, Document)]
+pub struct Euph {
+ #[document(metavar = "domain")]
+ pub servers: HashMap,
+}
diff --git a/cove-config/src/keys.rs b/cove-config/src/keys.rs
index 3ecbb5b..47c171c 100644
--- a/cove-config/src/keys.rs
+++ b/cove-config/src/keys.rs
@@ -81,7 +81,6 @@ default_bindings! {
pub fn nick => ["n"];
pub fn more_messages => ["m"];
pub fn account => ["A"];
- pub fn present => ["ctrl+p"];
}
pub mod tree_cursor {
@@ -105,6 +104,9 @@ default_bindings! {
pub fn mark_older_seen => ["ctrl+s"];
pub fn info => ["i"];
pub fn links => ["I"];
+ pub fn toggle_nick_emoji => ["e"];
+ pub fn increase_caesar => ["c"];
+ pub fn decrease_caesar => ["C"];
}
}
@@ -122,7 +124,6 @@ pub struct General {
#[serde(default = "default::general::confirm")]
pub confirm: KeyBinding,
/// Advance focus.
- // TODO Mention examples where this is used
#[serde(default = "default::general::focus")]
pub focus: KeyBinding,
/// Show this help.
@@ -287,9 +288,6 @@ pub struct RoomAction {
/// Manage account.
#[serde(default = "default::room_action::account")]
pub account: KeyBinding,
- /// Open room's plugh.de/present page.
- #[serde(default = "default::room_action::present")]
- pub present: KeyBinding,
}
#[derive(Debug, Default, Deserialize, Document)]
@@ -359,6 +357,15 @@ pub struct TreeAction {
/// List links found in message.
#[serde(default = "default::tree_action::links")]
pub links: KeyBinding,
+ /// Toggle agent id based nick emoji.
+ #[serde(default = "default::tree_action::toggle_nick_emoji")]
+ pub toggle_nick_emoji: KeyBinding,
+ /// Increase caesar cipher rotation.
+ #[serde(default = "default::tree_action::increase_caesar")]
+ pub increase_caesar: KeyBinding,
+ /// Decrease caesar cipher rotation.
+ #[serde(default = "default::tree_action::decrease_caesar")]
+ pub decrease_caesar: KeyBinding,
}
#[derive(Debug, Default, Deserialize, Document)]
diff --git a/cove-config/src/lib.rs b/cove-config/src/lib.rs
index d2a773a..0cb6cc7 100644
--- a/cove-config/src/lib.rs
+++ b/cove-config/src/lib.rs
@@ -1,28 +1,18 @@
-#![forbid(unsafe_code)]
-// Rustc lint groups
-#![warn(future_incompatible)]
-#![warn(rust_2018_idioms)]
-#![warn(unused)]
-// Rustc lints
-#![warn(noop_method_call)]
-#![warn(single_use_lifetimes)]
-// Clippy lints
-#![warn(clippy::use_self)]
+use std::{
+ fs,
+ io::{self, ErrorKind},
+ path::{Path, PathBuf},
+};
+
+use doc::Document;
+use serde::{Deserialize, Serialize};
+
+pub use crate::{euph::*, keys::*};
pub mod doc;
mod euph;
mod keys;
-use std::io::ErrorKind;
-use std::path::{Path, PathBuf};
-use std::{fs, io};
-
-use doc::Document;
-use serde::Deserialize;
-
-pub use crate::euph::*;
-pub use crate::keys::*;
-
#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error("failed to read config file")]
@@ -31,6 +21,14 @@ pub enum Error {
Toml(#[from] toml::de::Error),
}
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, Document)]
+#[serde(rename_all = "snake_case")]
+pub enum WidthEstimationMethod {
+ #[default]
+ Legacy,
+ Unicode,
+}
+
#[derive(Debug, Default, Deserialize, Document)]
pub struct Config {
/// The directory that cove stores its data in when not running in ephemeral
@@ -49,19 +47,34 @@ pub struct Config {
///
/// See also the `--ephemeral` command line option.
#[serde(default)]
- #[document(default = "`false`")]
pub ephemeral: bool,
- /// Whether to measure the width of characters as displayed by the terminal
- /// emulator instead of guessing the width.
+ /// How to estimate the width of graphemes (i.e. characters) as displayed by
+ /// the terminal emulator.
+ ///
+ /// `"legacy"`: Use a legacy method that should mostly work on most terminal
+ /// emulators. This method will never be correct in all cases since every
+ /// terminal emulator handles grapheme widths slightly differently. However,
+ /// those cases are usually rare (unless you view a lot of emoji).
+ ///
+ /// `"unicode"`: Use the unicode standard in a best-effort manner to
+ /// determine grapheme widths. Some terminals (e.g. ghostty) can make use of
+ /// this.
+ ///
+ /// This method is used when `measure_widths` is set to `false`.
+ ///
+ /// See also the `--width-estimation-method` command line option.
+ #[serde(default)]
+ pub width_estimation_method: WidthEstimationMethod,
+
+ /// Whether to measure the width of graphemes (i.e. characters) as displayed
+ /// by the terminal emulator instead of estimating the width.
///
/// Enabling this makes rendering a bit slower but more accurate. The screen
- /// might also flash when encountering new characters (or, more accurately,
- /// graphemes).
+ /// might also flash when encountering new graphemes.
///
- /// See also the `--measure-graphemes` command line option.
+ /// See also the `--measure-widths` command line option.
#[serde(default)]
- #[document(default = "`false`")]
pub measure_widths: bool,
/// Whether to start in offline mode.
@@ -72,23 +85,46 @@ pub struct Config {
///
/// See also the `--offline` command line option.
#[serde(default)]
- #[document(default = "`false`")]
pub offline: bool,
/// Initial sort order of rooms list.
///
- /// `alphabet` sorts rooms in alphabetic order.
+ /// `"alphabet"` sorts rooms in alphabetic order.
///
- /// `importance` sorts rooms by the following criteria (in descending order
- /// of priority):
+ /// `"importance"` sorts rooms by the following criteria (in descending
+ /// order of priority):
///
/// 1. connected rooms before unconnected rooms
/// 2. rooms with unread messages before rooms without
/// 3. alphabetic order
#[serde(default)]
- #[document(default = "`alphabet`")]
pub rooms_sort_order: RoomsSortOrder,
+ /// Ring the bell (character 0x07) when you are mentioned in a room.
+ #[serde(default)]
+ pub bell_on_mention: bool,
+
+ /// Time zone that chat timestamps should be displayed in.
+ ///
+ /// This option can either be the string `"localtime"`, a [POSIX TZ string],
+ /// or a [tz identifier] from the [tz database].
+ ///
+ /// When not set or when set to `"localtime"`, cove attempts to use your
+ /// system's configured time zone, falling back to UTC.
+ ///
+ /// When the string begins with a colon or doesn't match the a POSIX TZ
+ /// string format, it is interpreted as a tz identifier and looked up in
+ /// your system's tz database (or a bundled tz database on Windows).
+ ///
+ /// If the `TZ` environment variable exists, it overrides this option.
+ ///
+ /// [POSIX TZ string]: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
+ /// [tz identifier]: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+ /// [tz database]: https://en.wikipedia.org/wiki/Tz_database
+ #[serde(default)]
+ #[document(default = "`$TZ` or local system time zone")]
+ pub time_zone: Option,
+
#[serde(default)]
#[document(no_default)]
pub euph: Euph,
@@ -107,7 +143,16 @@ impl Config {
})
}
- pub fn euph_room(&self, name: &str) -> EuphRoom {
- self.euph.rooms.get(name).cloned().unwrap_or_default()
+ pub fn euph_room(&self, domain: &str, name: &str) -> EuphRoom {
+ if let Some(server) = self.euph.servers.get(domain) {
+ if let Some(room) = server.rooms.get(name) {
+ return room.clone();
+ }
+ }
+ EuphRoom::default()
+ }
+
+ pub fn time_zone_ref(&self) -> Option<&str> {
+ self.time_zone.as_ref().map(|s| s as &str)
}
}
diff --git a/cove-input/Cargo.toml b/cove-input/Cargo.toml
index f3dcc64..5005be2 100644
--- a/cove-input/Cargo.toml
+++ b/cove-input/Cargo.toml
@@ -1,16 +1,18 @@
[package]
name = "cove-input"
-version = { workspace = true }
-edition = { workspace = true }
+version.workspace = true
+edition.workspace = true
[dependencies]
cove-macro = { path = "../cove-macro" }
-crossterm = { workspace = true }
-parking_lot = { workspace = true }
-serde = { workspace = true }
-serde_either = { workspace = true }
-thiserror = { workspace = true }
-toss = { workspace = true }
+crossterm.workspace = true
+edit.workspace = true
+parking_lot.workspace = true
+serde.workspace = true
+serde_either.workspace = true
+thiserror.workspace = true
+toss.workspace = true
-edit = "0.1.4"
+[lints]
+workspace = true
diff --git a/cove-input/src/keys.rs b/cove-input/src/keys.rs
index 4ede713..8d2fdf1 100644
--- a/cove-input/src/keys.rs
+++ b/cove-input/src/keys.rs
@@ -1,10 +1,7 @@
-use std::fmt;
-use std::num::ParseIntError;
-use std::str::FromStr;
+use std::{fmt, num::ParseIntError, str::FromStr};
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
-use serde::{de::Error, Deserialize, Deserializer};
-use serde::{Serialize, Serializer};
+use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Error};
use serde_either::SingleOrVec;
#[derive(Debug, thiserror::Error)]
@@ -117,7 +114,7 @@ impl KeyPress {
"alt" if !self.alt => self.alt = true,
"any" if !self.shift && !self.ctrl && !self.alt => self.any = true,
m @ ("shift" | "ctrl" | "alt" | "any") => {
- return Err(ParseKeysError::ConflictingModifier(m.to_string()))
+ return Err(ParseKeysError::ConflictingModifier(m.to_string()));
}
m => return Err(ParseKeysError::UnknownModifier(m.to_string())),
}
@@ -151,7 +148,7 @@ impl FromStr for KeyPress {
let mut parts = s.split('+');
let code = parts.next_back().ok_or(ParseKeysError::NoKeyCode)?;
- let mut keys = KeyPress::parse_key_code(code)?;
+ let mut keys = Self::parse_key_code(code)?;
let shift_allowed = !conflicts_with_shift(keys.code);
for modifier in parts {
keys.parse_modifier(modifier, shift_allowed)?;
diff --git a/cove-input/src/lib.rs b/cove-input/src/lib.rs
index b42fdcb..f6b2e92 100644
--- a/cove-input/src/lib.rs
+++ b/cove-input/src/lib.rs
@@ -1,15 +1,14 @@
-mod keys;
-
-use std::io;
-use std::sync::Arc;
+use std::{io, sync::Arc};
pub use cove_macro::KeyGroup;
-use crossterm::event::{Event, KeyEvent};
+use crossterm::event::{Event, KeyEvent, KeyEventKind};
use parking_lot::FairMutex;
use toss::{Frame, Terminal, WidthDb};
pub use crate::keys::*;
+mod keys;
+
pub struct KeyBindingInfo<'a> {
pub name: &'static str,
pub binding: &'a KeyBinding,
@@ -40,7 +39,7 @@ impl<'a> KeyGroupInfo<'a> {
}
pub struct InputEvent<'a> {
- event: crossterm::event::Event,
+ event: Event,
terminal: &'a mut Terminal,
crossterm_lock: Arc>,
}
@@ -58,11 +57,15 @@ impl<'a> InputEvent<'a> {
}
}
+ /// If the current event represents a key press, returns the [`KeyEvent`]
+ /// associated with that key press.
pub fn key_event(&self) -> Option {
- match &self.event {
- Event::Key(event) => Some(*event),
- _ => None,
+ if let Event::Key(event) = &self.event {
+ if matches!(event.kind, KeyEventKind::Press | KeyEventKind::Repeat) {
+ return Some(*event);
+ }
}
+ None
}
pub fn paste_event(&self) -> Option<&str> {
diff --git a/cove-macro/Cargo.toml b/cove-macro/Cargo.toml
index 07541a9..6c01b7d 100644
--- a/cove-macro/Cargo.toml
+++ b/cove-macro/Cargo.toml
@@ -1,13 +1,15 @@
[package]
name = "cove-macro"
-version = { workspace = true }
-edition = { workspace = true }
+version.workspace = true
+edition.workspace = true
[dependencies]
-case = "1.0.0"
-proc-macro2 = "1.0.66"
-quote = "1.0.33"
-syn = "2.0.29"
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
[lib]
proc-macro = true
+
+[lints]
+workspace = true
diff --git a/cove-macro/src/document.rs b/cove-macro/src/document.rs
index e8e248e..afec84d 100644
--- a/cove-macro/src/document.rs
+++ b/cove-macro/src/document.rs
@@ -1,7 +1,6 @@
use proc_macro2::TokenStream;
use quote::quote;
-use syn::spanned::Spanned;
-use syn::{Data, DataEnum, DataStruct, DeriveInput, Field, Ident, LitStr};
+use syn::{Data, DataEnum, DataStruct, DeriveInput, Field, Ident, LitStr, spanned::Spanned};
use crate::util::{self, SerdeDefault};
diff --git a/cove-macro/src/key_group.rs b/cove-macro/src/key_group.rs
index bc7bdea..832bfd3 100644
--- a/cove-macro/src/key_group.rs
+++ b/cove-macro/src/key_group.rs
@@ -1,9 +1,8 @@
use proc_macro2::TokenStream;
use quote::quote;
-use syn::spanned::Spanned;
-use syn::{Data, DeriveInput};
+use syn::{Data, DeriveInput, spanned::Spanned};
-use crate::util::{self, bail};
+use crate::util;
fn decapitalize(s: &str) -> String {
let mut chars = s.chars();
@@ -34,7 +33,7 @@ pub fn derive_impl(input: DeriveInput) -> syn::Result {
let default = util::serde_default(field)?;
let Some(default) = default else {
- return bail(field_ident.span(), "must have serde default");
+ return util::bail(field_ident.span(), "must have serde default");
};
let default_value = default.value();
diff --git a/cove-macro/src/lib.rs b/cove-macro/src/lib.rs
index 82ef61a..c655f2a 100644
--- a/cove-macro/src/lib.rs
+++ b/cove-macro/src/lib.rs
@@ -1,15 +1,4 @@
-#![forbid(unsafe_code)]
-// Rustc lint groups
-#![warn(future_incompatible)]
-#![warn(rust_2018_idioms)]
-#![warn(unused)]
-// Rustc lints
-#![warn(noop_method_call)]
-#![warn(single_use_lifetimes)]
-// Clippy lints
-#![warn(clippy::use_self)]
-
-use syn::{parse_macro_input, DeriveInput};
+use syn::{DeriveInput, parse_macro_input};
mod document;
mod key_group;
diff --git a/cove-macro/src/util.rs b/cove-macro/src/util.rs
index b7bf62a..d73b7ca 100644
--- a/cove-macro/src/util.rs
+++ b/cove-macro/src/util.rs
@@ -1,8 +1,9 @@
use proc_macro2::{Span, TokenStream};
use quote::quote;
-use syn::parse::Parse;
-use syn::punctuated::Punctuated;
-use syn::{Attribute, Expr, ExprLit, ExprPath, Field, Lit, LitStr, Path, Token, Type};
+use syn::{
+ Attribute, Expr, ExprLit, ExprPath, Field, Lit, LitStr, Path, Token, Type, parse::Parse,
+ punctuated::Punctuated,
+};
pub fn bail(span: Span, message: &str) -> syn::Result {
Err(syn::Error::new(span, message))
diff --git a/cove/Cargo.toml b/cove/Cargo.toml
index ca556a2..3a60a5d 100644
--- a/cove/Cargo.toml
+++ b/cove/Cargo.toml
@@ -1,46 +1,32 @@
[package]
name = "cove"
-version = { workspace = true }
-edition = { workspace = true }
+version.workspace = true
+edition.workspace = true
[dependencies]
cove-config = { path = "../cove-config" }
cove-input = { path = "../cove-input" }
-crossterm = { workspace = true }
-parking_lot = { workspace = true }
-thiserror = { workspace = true }
-toss = { workspace = true }
+anyhow.workspace = true
+async-trait.workspace = true
+clap.workspace = true
+cookie.workspace = true
+crossterm.workspace = true
+directories.workspace = true
+euphoxide.workspace = true
+jiff.workspace = true
+linkify.workspace = true
+log.workspace = true
+open.workspace = true
+parking_lot.workspace = true
+rusqlite.workspace = true
+serde_json.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
+toss.workspace = true
+unicode-width.workspace = true
+vault.workspace = true
+rustls.workspace = true
-anyhow = "1.0.75"
-async-trait = "0.1.73"
-clap = { version = "4.4.1", features = ["derive", "deprecated"] }
-cookie = "0.17.0"
-directories = "5.0.1"
-linkify = "0.10.0"
-log = { version = "0.4.20", features = ["std"] }
-once_cell = "1.18.0"
-open = "5.0.0"
-rusqlite = { version = "0.29.0", features = ["bundled", "time"] }
-serde_json = "1.0.105"
-tokio = { version = "1.32.0", features = ["full"] }
-unicode-segmentation = "1.10.1"
-unicode-width = "0.1.10"
-
-[dependencies.time]
-version = "0.3.28"
-features = ["macros", "formatting", "parsing", "serde"]
-
-[dependencies.tokio-tungstenite]
-version = "0.20.0"
-features = ["rustls-tls-native-roots"]
-
-[dependencies.euphoxide]
-git = "https://github.com/Garmelon/euphoxide.git"
-tag = "v0.4.0"
-features = ["bot"]
-
-[dependencies.vault]
-git = "https://github.com/Garmelon/vault.git"
-tag = "v0.2.0"
-features = ["tokio"]
+[lints]
+workspace = true
diff --git a/cove/src/euph.rs b/cove/src/euph.rs
index ab93753..77bf1db 100644
--- a/cove/src/euph.rs
+++ b/cove/src/euph.rs
@@ -1,7 +1,9 @@
-mod room;
-mod small_message;
-mod util;
-
+pub use highlight::*;
pub use room::*;
pub use small_message::*;
pub use util::*;
+
+mod highlight;
+mod room;
+mod small_message;
+mod util;
diff --git a/cove/src/euph/highlight.rs b/cove/src/euph/highlight.rs
new file mode 100644
index 0000000..1c9abd0
--- /dev/null
+++ b/cove/src/euph/highlight.rs
@@ -0,0 +1,211 @@
+use std::ops::Range;
+
+use crossterm::style::Stylize;
+use toss::{Style, Styled};
+
+use crate::euph::util;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum SpanType {
+ Mention,
+ Room,
+ Emoji,
+}
+
+fn nick_char(ch: char) -> bool {
+ // Closely following the heim mention regex:
+ // https://github.com/euphoria-io/heim/blob/978c921063e6b06012fc8d16d9fbf1b3a0be1191/client/lib/stores/chat.js#L14-L15
+ // `>` has been experimentally confirmed to delimit mentions as well.
+ match ch {
+ ',' | '.' | '!' | '?' | ';' | '&' | '<' | '>' | '\'' | '"' => false,
+ _ => !ch.is_whitespace(),
+ }
+}
+
+fn room_char(ch: char) -> bool {
+ // Basically just \w, see also
+ // https://github.com/euphoria-io/heim/blob/978c921063e6b06012fc8d16d9fbf1b3a0be1191/client/lib/ui/MessageText.js#L66
+ ch.is_ascii_alphanumeric() || ch == '_'
+}
+
+struct SpanFinder<'a> {
+ content: &'a str,
+
+ span: Option<(SpanType, usize)>,
+ room_or_mention_possible: bool,
+
+ result: Vec<(SpanType, Range)>,
+}
+
+impl<'a> SpanFinder<'a> {
+ fn is_valid_span(&self, span: SpanType, range: Range) -> bool {
+ let text = &self.content[range.start..range.end];
+ match span {
+ SpanType::Mention => range.len() > 1 && text.starts_with('@'),
+ SpanType::Room => range.len() > 1 && text.starts_with('&'),
+ SpanType::Emoji => {
+ if range.len() <= 2 {
+ return false;
+ }
+
+ let Some(name) = Some(text)
+ .and_then(|it| it.strip_prefix(':'))
+ .and_then(|it| it.strip_suffix(':'))
+ else {
+ return false;
+ };
+
+ util::EMOJI.get(name).is_some()
+ }
+ }
+ }
+
+ fn close_span(&mut self, end: usize) {
+ let Some((span, start)) = self.span else {
+ return;
+ };
+ if self.is_valid_span(span, start..end) {
+ self.result.push((span, start..end));
+ }
+ self.span = None;
+ }
+
+ fn open_span(&mut self, span: SpanType, start: usize) {
+ self.close_span(start);
+ self.span = Some((span, start))
+ }
+
+ fn step(&mut self, idx: usize, char: char) {
+ match (char, self.span) {
+ ('@', Some((SpanType::Mention, _))) => {} // Continue the mention
+ ('@', _) if self.room_or_mention_possible => self.open_span(SpanType::Mention, idx),
+ ('&', _) if self.room_or_mention_possible => self.open_span(SpanType::Room, idx),
+ (':', None) => self.open_span(SpanType::Emoji, idx),
+ (':', Some((SpanType::Emoji, _))) => self.close_span(idx + 1),
+ (c, Some((SpanType::Mention, _))) if !nick_char(c) => self.close_span(idx),
+ (c, Some((SpanType::Room, _))) if !room_char(c) => self.close_span(idx),
+ _ => {}
+ }
+
+ // More permissive than the heim web client
+ self.room_or_mention_possible = !char.is_alphanumeric();
+ }
+
+ fn find(content: &'a str) -> Vec<(SpanType, Range)> {
+ let mut this = Self {
+ content,
+ span: None,
+ room_or_mention_possible: true,
+ result: vec![],
+ };
+
+ for (idx, char) in content.char_indices() {
+ this.step(idx, char);
+ }
+
+ this.close_span(content.len());
+
+ this.result
+ }
+}
+
+pub fn find_spans(content: &str) -> Vec<(SpanType, Range)> {
+ SpanFinder::find(content)
+}
+
+/// Highlight spans in a string.
+///
+/// The list of spans must be non-overlapping and in ascending order.
+///
+/// If `exact` is specified, colon-delimited emoji are not replaced with their
+/// unicode counterparts.
+pub fn apply_spans(
+ content: &str,
+ spans: &[(SpanType, Range)],
+ base: Style,
+ exact: bool,
+) -> Styled {
+ let mut result = Styled::default();
+ let mut i = 0;
+
+ for (span, range) in spans {
+ assert!(i <= range.start);
+ assert!(range.end <= content.len());
+
+ if i < range.start {
+ result = result.then(&content[i..range.start], base);
+ }
+
+ let text = &content[range.start..range.end];
+ result = match span {
+ SpanType::Mention if exact => result.and_then(util::style_mention_exact(text, base)),
+ SpanType::Mention => result.and_then(util::style_mention(text, base)),
+ SpanType::Room => result.then(text, base.blue().bold()),
+ SpanType::Emoji if exact => result.then(text, base.magenta()),
+ SpanType::Emoji => {
+ let name = text.strip_prefix(':').unwrap_or(text);
+ let name = name.strip_suffix(':').unwrap_or(name);
+ if let Some(Some(replacement)) = util::EMOJI.get(name) {
+ result.then(replacement, base)
+ } else {
+ result.then(text, base.magenta())
+ }
+ }
+ };
+
+ i = range.end;
+ }
+
+ if i < content.len() {
+ result = result.then(&content[i..], base);
+ }
+
+ result
+}
+
+/// Highlight an euphoria message's content.
+///
+/// If `exact` is specified, colon-delimited emoji are not replaced with their
+/// unicode counterparts.
+pub fn highlight(content: &str, base: Style, exact: bool) -> Styled {
+ apply_spans(content, &find_spans(content), base, exact)
+}
+
+#[cfg(test)]
+mod tests {
+
+ use crate::euph::SpanType;
+
+ use super::find_spans;
+
+ #[test]
+ fn mentions() {
+ assert_eq!(find_spans("@foo"), vec![(SpanType::Mention, 0..4)]);
+ assert_eq!(find_spans("&@foo"), vec![(SpanType::Mention, 1..5)]);
+ assert_eq!(find_spans("a @foo b"), vec![(SpanType::Mention, 2..6)]);
+ assert_eq!(find_spans("@@foo@@"), vec![(SpanType::Mention, 0..7)]);
+ assert_eq!(find_spans("a @b@c d"), vec![(SpanType::Mention, 2..6)]);
+ assert_eq!(
+ find_spans("a @b @c d"),
+ vec![(SpanType::Mention, 2..4), (SpanType::Mention, 5..7)]
+ );
+ }
+
+ #[test]
+ fn rooms() {
+ assert_eq!(find_spans("&foo"), vec![(SpanType::Room, 0..4)]);
+ assert_eq!(find_spans("@&foo"), vec![(SpanType::Room, 1..5)]);
+ assert_eq!(find_spans("a &foo b"), vec![(SpanType::Room, 2..6)]);
+ assert_eq!(find_spans("&&foo&&"), vec![(SpanType::Room, 1..5)]);
+ assert_eq!(find_spans("a &b&c d"), vec![(SpanType::Room, 2..4)]);
+ assert_eq!(
+ find_spans("a &b &c d"),
+ vec![(SpanType::Room, 2..4), (SpanType::Room, 5..7)]
+ );
+ }
+
+ #[test]
+ fn emoji_in_mentions() {
+ assert_eq!(find_spans(" @a:b:c "), vec![(SpanType::Mention, 1..7)]);
+ }
+}
diff --git a/cove/src/euph/room.rs b/cove/src/euph/room.rs
index 2b7d861..a4e29cf 100644
--- a/cove/src/euph/room.rs
+++ b/cove/src/euph/room.rs
@@ -1,24 +1,21 @@
-// TODO Stop if room does not exist (e.g. 404)
+use std::{convert::Infallible, time::Duration};
-use std::convert::Infallible;
-use std::time::Duration;
-
-use euphoxide::api::packet::ParsedPacket;
-use euphoxide::api::{
- Auth, AuthOption, Data, Log, Login, Logout, MessageId, Nick, Send, SendEvent, SendReply, Time,
- UserId,
+use euphoxide::{
+ api::{
+ Auth, AuthOption, Data, Log, Login, Logout, MessageId, Nick, Send, SendEvent, SendReply,
+ Time, UserId, packet::ParsedPacket,
+ },
+ bot::instance::{ConnSnapshot, Event, Instance, InstanceConfig},
+ conn::{self, ConnTx, Joined},
};
-use euphoxide::bot::instance::{ConnSnapshot, Event, Instance, InstanceConfig};
-use euphoxide::conn::{self, ConnTx};
-use log::{debug, error, info, warn};
-use tokio::select;
-use tokio::sync::oneshot;
+use log::{debug, info, warn};
+use tokio::{select, sync::oneshot};
-use crate::macros::logging_unwrap;
-use crate::vault::EuphRoomVault;
+use crate::{macros::logging_unwrap, vault::EuphRoomVault};
const LOG_INTERVAL: Duration = Duration::from_secs(10);
+#[allow(clippy::large_enum_variant)]
#[derive(Debug)]
pub enum State {
Disconnected,
@@ -35,6 +32,13 @@ impl State {
None
}
}
+
+ pub fn joined(&self) -> Option<&Joined> {
+ match self {
+ Self::Connected(_, conn::State::Joined(joined)) => Some(joined),
+ _ => None,
+ }
+ }
}
#[derive(Debug, thiserror::Error)]
@@ -65,19 +69,13 @@ impl Room {
where
F: Fn(Event) + std::marker::Send + Sync + 'static,
{
- // &rl2dev's message history is broken and requesting old messages past
- // a certain point results in errors. Cove should not keep retrying log
- // requests when hitting that limit, so &rl2dev is always opened in
- // ephemeral mode.
- let ephemeral = vault.vault().vault().ephemeral() || vault.room() == "rl2dev";
-
Self {
- vault,
- ephemeral,
+ ephemeral: vault.vault().vault().ephemeral(),
instance: instance_config.build(on_event),
state: State::Disconnected,
last_msg_id: None,
log_request_canary: None,
+ vault,
}
}
@@ -125,7 +123,8 @@ impl Room {
let cookies = &*self.instance.config().server.cookies;
let cookies = cookies.lock().unwrap().clone();
- logging_unwrap!(self.vault.vault().set_cookies(cookies).await);
+ let domain = self.vault.room().domain.clone();
+ logging_unwrap!(self.vault.vault().set_cookies(domain, cookies).await);
}
Event::Packet(_, packet, ConnSnapshot { conn_tx, state }) => {
self.state = State::Connected(conn_tx, state);
@@ -137,7 +136,6 @@ impl Room {
self.log_request_canary = None;
}
Event::Stopped(_) => {
- // TODO Remove room somewhere if this happens? If it doesn't already happen during stabilization
self.state = State::Stopped;
}
}
@@ -183,15 +181,9 @@ impl Room {
None => None,
};
- debug!("{}: requesting logs", vault.room());
+ debug!("{:?}: requesting logs", vault.room());
- // &rl2dev's message history is broken and requesting old messages past
- // a certain point results in errors. By reducing the amount of messages
- // in each log request, we can get closer to this point. Since &rl2dev
- // is fairly low in activity, this should be fine.
- let n = if vault.room() == "rl2dev" { 50 } else { 1000 };
-
- let _ = conn_tx.send(Log { n, before }).await;
+ let _ = conn_tx.send(Log { n: 1000, before }).await;
// The code handling incoming events and replies also handles
// `LogReply`s, so we don't need to do anything special here.
}
diff --git a/cove/src/euph/small_message.rs b/cove/src/euph/small_message.rs
index 2751058..5db1790 100644
--- a/cove/src/euph/small_message.rs
+++ b/cove/src/euph/small_message.rs
@@ -1,212 +1,18 @@
-use std::mem;
-
use crossterm::style::Stylize;
-use euphoxide::api::{MessageId, Snowflake, Time};
-use time::OffsetDateTime;
+use euphoxide::api::{MessageId, Snowflake, Time, UserId};
+use jiff::Timestamp;
use toss::{Style, Styled};
-use crate::store::Msg;
-use crate::ui::ChatMsg;
+use crate::{store::Msg, ui::ChatMsg};
use super::util;
-fn nick_char(ch: char) -> bool {
- // Closely following the heim mention regex:
- // https://github.com/euphoria-io/heim/blob/978c921063e6b06012fc8d16d9fbf1b3a0be1191/client/lib/stores/chat.js#L14-L15
- // `>` has been experimentally confirmed to delimit mentions as well.
- match ch {
- ',' | '.' | '!' | '?' | ';' | '&' | '<' | '>' | '\'' | '"' => false,
- _ => !ch.is_whitespace(),
- }
-}
-
-fn room_char(ch: char) -> bool {
- // Basically just \w, see also
- // https://github.com/euphoria-io/heim/blob/978c921063e6b06012fc8d16d9fbf1b3a0be1191/client/lib/ui/MessageText.js#L66
- ch.is_ascii_alphanumeric() || ch == '_'
-}
-
-enum Span {
- Nothing,
- Mention,
- Room,
- Emoji,
-}
-
-struct Highlighter<'a> {
- content: &'a str,
- base_style: Style,
- exact: bool,
-
- span: Span,
- span_start: usize,
- room_or_mention_possible: bool,
-
- result: Styled,
-}
-
-impl<'a> Highlighter<'a> {
- /// Does *not* guarantee `self.span_start == idx` after running!
- fn close_mention(&mut self, idx: usize) {
- let span_length = idx.saturating_sub(self.span_start);
- if span_length <= 1 {
- // We can repurpose the current span
- self.span = Span::Nothing;
- return;
- }
-
- let text = &self.content[self.span_start..idx]; // Includes @
- self.result = mem::take(&mut self.result).and_then(if self.exact {
- util::style_nick_exact(text, self.base_style)
- } else {
- util::style_nick(text, self.base_style)
- });
-
- self.span = Span::Nothing;
- self.span_start = idx;
- }
-
- /// Does *not* guarantee `self.span_start == idx` after running!
- fn close_room(&mut self, idx: usize) {
- let span_length = idx.saturating_sub(self.span_start);
- if span_length <= 1 {
- // We can repurpose the current span
- self.span = Span::Nothing;
- return;
- }
-
- self.result = mem::take(&mut self.result).then(
- &self.content[self.span_start..idx],
- self.base_style.blue().bold(),
- );
-
- self.span = Span::Nothing;
- self.span_start = idx;
- }
-
- // Warning: `idx` is the index of the closing colon.
- fn close_emoji(&mut self, idx: usize) {
- let name = &self.content[self.span_start + 1..idx];
- if let Some(replace) = util::EMOJI.get(name) {
- match replace {
- Some(replace) if !self.exact => {
- self.result = mem::take(&mut self.result).then(replace, self.base_style);
- }
- _ => {
- let text = &self.content[self.span_start..=idx];
- let style = self.base_style.magenta();
- self.result = mem::take(&mut self.result).then(text, style);
- }
- }
-
- self.span = Span::Nothing;
- self.span_start = idx + 1;
- } else {
- self.close_plain(idx);
- self.span = Span::Emoji;
- }
- }
-
- /// Guarantees `self.span_start == idx` after running.
- fn close_plain(&mut self, idx: usize) {
- if self.span_start == idx {
- // Span has length 0
- return;
- }
-
- self.result =
- mem::take(&mut self.result).then(&self.content[self.span_start..idx], self.base_style);
-
- self.span = Span::Nothing;
- self.span_start = idx;
- }
-
- fn close_span_before_current_char(&mut self, idx: usize, char: char) {
- match self.span {
- Span::Mention if !nick_char(char) => self.close_mention(idx),
- Span::Room if !room_char(char) => self.close_room(idx),
- Span::Emoji if char == '&' || char == '@' => {
- self.span = Span::Nothing;
- }
- _ => {}
- }
- }
-
- fn update_span_with_current_char(&mut self, idx: usize, char: char) {
- match self.span {
- Span::Nothing if char == '@' && self.room_or_mention_possible => {
- self.close_plain(idx);
- self.span = Span::Mention;
- }
- Span::Nothing if char == '&' && self.room_or_mention_possible => {
- self.close_plain(idx);
- self.span = Span::Room;
- }
- Span::Nothing if char == ':' => {
- self.close_plain(idx);
- self.span = Span::Emoji;
- }
- Span::Emoji if char == ':' => self.close_emoji(idx),
- _ => {}
- }
- }
-
- fn close_final_span(&mut self) {
- let idx = self.content.len();
- if self.span_start >= idx {
- return; // Span has no contents
- }
-
- match self.span {
- Span::Mention => self.close_mention(idx),
- Span::Room => self.close_room(idx),
- _ => {}
- }
-
- self.close_plain(idx);
- }
-
- fn step(&mut self, idx: usize, char: char) {
- if self.span_start < idx {
- self.close_span_before_current_char(idx, char);
- }
-
- self.update_span_with_current_char(idx, char);
-
- // More permissive than the heim web client
- self.room_or_mention_possible = !char.is_alphanumeric();
- }
-
- fn highlight(content: &'a str, base_style: Style, exact: bool) -> Styled {
- let mut this = Self {
- content: if exact { content } else { content.trim() },
- base_style,
- exact,
- span: Span::Nothing,
- span_start: 0,
- room_or_mention_possible: true,
- result: Styled::default(),
- };
-
- for (idx, char) in (if exact { content } else { content.trim() }).char_indices() {
- this.step(idx, char);
- }
-
- this.close_final_span();
-
- this.result
- }
-}
-
-fn highlight_content(content: &str, base_style: Style, exact: bool) -> Styled {
- Highlighter::highlight(content, base_style, exact)
-}
-
#[derive(Debug, Clone)]
pub struct SmallMessage {
pub id: MessageId,
pub parent: Option,
pub time: Time,
+ pub user_id: UserId,
pub nick: String,
pub content: String,
pub seen: bool,
@@ -222,22 +28,22 @@ fn style_me() -> Style {
fn styled_nick(nick: &str) -> Styled {
Styled::new_plain("[")
- .and_then(util::style_nick(nick, Style::new()))
+ .and_then(super::style_nick(nick, Style::new()))
.then_plain("]")
}
fn styled_nick_me(nick: &str) -> Styled {
let style = style_me();
- Styled::new("*", style).and_then(util::style_nick(nick, style))
+ Styled::new("*", style).and_then(super::style_nick(nick, style))
}
fn styled_content(content: &str) -> Styled {
- highlight_content(content.trim(), Style::new(), false)
+ super::highlight(content.trim(), Style::new(), false)
}
fn styled_content_me(content: &str) -> Styled {
let style = style_me();
- highlight_content(content.trim(), style, false).then("*", style)
+ super::highlight(content.trim(), style, false).then("*", style)
}
fn styled_editor_content(content: &str) -> Styled {
@@ -246,7 +52,7 @@ fn styled_editor_content(content: &str) -> Styled {
} else {
Style::new()
};
- highlight_content(content, style, true)
+ super::highlight(content, style, true)
}
impl Msg for SmallMessage {
@@ -267,11 +73,15 @@ impl Msg for SmallMessage {
fn last_possible_id() -> Self::Id {
MessageId(Snowflake::MAX)
}
+
+ fn nick_emoji(&self) -> Option {
+ Some(util::user_id_emoji(&self.user_id))
+ }
}
impl ChatMsg for SmallMessage {
- fn time(&self) -> OffsetDateTime {
- self.time.0
+ fn time(&self) -> Option {
+ Some(self.time.as_timestamp())
}
fn styled(&self) -> (Styled, Styled) {
diff --git a/cove/src/euph/util.rs b/cove/src/euph/util.rs
index fdf11a3..ea1782a 100644
--- a/cove/src/euph/util.rs
+++ b/cove/src/euph/util.rs
@@ -1,9 +1,27 @@
+use std::{
+ collections::HashSet,
+ hash::{DefaultHasher, Hash, Hasher},
+ sync::LazyLock,
+};
+
use crossterm::style::{Color, Stylize};
-use euphoxide::Emoji;
-use once_cell::sync::Lazy;
+use euphoxide::{Emoji, api::UserId};
use toss::{Style, Styled};
-pub static EMOJI: Lazy = Lazy::new(Emoji::load);
+pub static EMOJI: LazyLock = LazyLock::new(Emoji::load);
+
+pub static EMOJI_LIST: LazyLock> = LazyLock::new(|| {
+ let mut list = EMOJI
+ .0
+ .values()
+ .flatten()
+ .cloned()
+ .collect::>()
+ .into_iter()
+ .collect::>();
+ list.sort_unstable();
+ list
+});
/// Convert HSL to RGB following [this approach from wikipedia][1].
///
@@ -54,3 +72,25 @@ pub fn style_nick(nick: &str, base: Style) -> Styled {
pub fn style_nick_exact(nick: &str, base: Style) -> Styled {
Styled::new(nick, nick_style(nick, base))
}
+
+pub fn style_mention(mention: &str, base: Style) -> Styled {
+ let nick = mention
+ .strip_prefix('@')
+ .expect("mention must start with @");
+ Styled::new(EMOJI.replace(mention), nick_style(nick, base))
+}
+
+pub fn style_mention_exact(mention: &str, base: Style) -> Styled {
+ let nick = mention
+ .strip_prefix('@')
+ .expect("mention must start with @");
+ Styled::new(mention, nick_style(nick, base))
+}
+
+pub fn user_id_emoji(user_id: &UserId) -> String {
+ let mut hasher = DefaultHasher::new();
+ user_id.0.hash(&mut hasher);
+ let hash = hasher.finish();
+ let emoji = &EMOJI_LIST[hash as usize % EMOJI_LIST.len()];
+ emoji.clone()
+}
diff --git a/cove/src/export.rs b/cove/src/export.rs
index 545f48b..80db7b6 100644
--- a/cove/src/export.rs
+++ b/cove/src/export.rs
@@ -1,21 +1,24 @@
//! Export logs from the vault to plain text files.
+use std::{
+ fs::File,
+ io::{self, BufWriter, Write},
+};
+
+use crate::vault::{EuphRoomVault, EuphVault, RoomIdentifier};
+
mod json;
mod text;
-use std::fs::File;
-use std::io::{self, BufWriter, Write};
-
-use crate::vault::{EuphRoomVault, EuphVault};
-
#[derive(Debug, Clone, Copy, clap::ValueEnum)]
pub enum Format {
/// Human-readable tree-structured messages.
Text,
/// Array of message objects in the same format as the euphoria API uses.
Json,
- /// Message objects in the same format as the euphoria API uses, one per line.
- JsonStream,
+ /// Message objects in the same format as the euphoria API uses, one per
+ /// line (https://jsonlines.org/).
+ JsonLines,
}
impl Format {
@@ -23,14 +26,15 @@ impl Format {
match self {
Self::Text => "text",
Self::Json => "json",
- Self::JsonStream => "json stream",
+ Self::JsonLines => "json lines",
}
}
fn extension(&self) -> &'static str {
match self {
Self::Text => "txt",
- Self::Json | Self::JsonStream => "json",
+ Self::Json => "json",
+ Self::JsonLines => "jsonl",
}
}
}
@@ -43,6 +47,10 @@ pub struct Args {
#[arg(long, short)]
all: bool,
+ /// Domain to resolve the room names with.
+ #[arg(long, short, default_value = "euphoria.leet.nu")]
+ domain: String,
+
/// Format of the output file.
#[arg(long, short, value_enum, default_value_t = Format::Text)]
format: Format,
@@ -74,7 +82,7 @@ async fn export_room(
match format {
Format::Text => text::export(vault, out).await?,
Format::Json => json::export(vault, out).await?,
- Format::JsonStream => json::export_stream(vault, out).await?,
+ Format::JsonLines => json::export_lines(vault, out).await?,
}
Ok(())
}
@@ -85,7 +93,12 @@ pub async fn export(vault: &EuphVault, mut args: Args) -> anyhow::Result<()> {
}
let rooms = if args.all {
- let mut rooms = vault.rooms().await?;
+ let mut rooms = vault
+ .rooms()
+ .await?
+ .into_iter()
+ .map(|id| id.name)
+ .collect::>();
rooms.sort_unstable();
rooms
} else {
@@ -101,14 +114,14 @@ pub async fn export(vault: &EuphVault, mut args: Args) -> anyhow::Result<()> {
for room in rooms {
if args.out == "-" {
eprintln!("Exporting &{room} as {} to stdout", args.format.name());
- let vault = vault.room(room);
+ let vault = vault.room(RoomIdentifier::new(args.domain.clone(), room));
let mut stdout = BufWriter::new(io::stdout());
export_room(&vault, &mut stdout, args.format).await?;
stdout.flush()?;
} else {
let out = format_out(&args.out, &room, args.format);
eprintln!("Exporting &{room} as {} to {out}", args.format.name());
- let vault = vault.room(room);
+ let vault = vault.room(RoomIdentifier::new(args.domain.clone(), room));
let mut file = BufWriter::new(File::create(out)?);
export_room(&vault, &mut file, args.format).await?;
file.flush()?;
diff --git a/cove/src/export/json.rs b/cove/src/export/json.rs
index e72a0b8..9c16e46 100644
--- a/cove/src/export/json.rs
+++ b/cove/src/export/json.rs
@@ -37,7 +37,7 @@ pub async fn export(vault: &EuphRoomVault, file: &mut W) -> anyhow::Re
Ok(())
}
-pub async fn export_stream(vault: &EuphRoomVault, file: &mut W) -> anyhow::Result<()> {
+pub async fn export_lines(vault: &EuphRoomVault, file: &mut W) -> anyhow::Result<()> {
let mut total = 0;
let mut last_msg_id = None;
loop {
diff --git a/cove/src/export/text.rs b/cove/src/export/text.rs
index bb3cfa1..2ca6687 100644
--- a/cove/src/export/text.rs
+++ b/cove/src/export/text.rs
@@ -1,16 +1,11 @@
use std::io::Write;
use euphoxide::api::MessageId;
-use time::format_description::FormatItem;
-use time::macros::format_description;
use unicode_width::UnicodeWidthStr;
-use crate::euph::SmallMessage;
-use crate::store::Tree;
-use crate::vault::EuphRoomVault;
+use crate::{euph::SmallMessage, store::Tree, vault::EuphRoomVault};
-const TIME_FORMAT: &[FormatItem<'_>] =
- format_description!("[year]-[month]-[day] [hour]:[minute]:[second]");
+const TIME_FORMAT: &str = "%Y-%m-%d %H:%M:%S";
const TIME_EMPTY: &str = " ";
pub async fn export(vault: &EuphRoomVault, out: &mut W) -> anyhow::Result<()> {
@@ -67,11 +62,7 @@ fn write_msg(
for (i, line) in msg.content.lines().enumerate() {
if i == 0 {
- let time = msg
- .time
- .0
- .format(TIME_FORMAT)
- .expect("time can be formatted");
+ let time = msg.time.as_timestamp().strftime(TIME_FORMAT);
writeln!(file, "{time} {indent_string}[{nick}] {line}")?;
} else {
writeln!(file, "{TIME_EMPTY} {indent_string}| {nick_empty} {line}")?;
diff --git a/cove/src/logger.rs b/cove/src/logger.rs
index 731a000..940e1a9 100644
--- a/cove/src/logger.rs
+++ b/cove/src/logger.rs
@@ -1,22 +1,22 @@
-use std::convert::Infallible;
-use std::sync::Arc;
-use std::vec;
+use std::{convert::Infallible, sync::Arc, vec};
use async_trait::async_trait;
use crossterm::style::Stylize;
+use jiff::Timestamp;
use log::{Level, LevelFilter, Log};
use parking_lot::Mutex;
-use time::OffsetDateTime;
use tokio::sync::mpsc;
use toss::{Style, Styled};
-use crate::store::{Msg, MsgStore, Path, Tree};
-use crate::ui::ChatMsg;
+use crate::{
+ store::{Msg, MsgStore, Path, Tree},
+ ui::ChatMsg,
+};
#[derive(Debug, Clone)]
pub struct LogMsg {
id: usize,
- time: OffsetDateTime,
+ time: Timestamp,
level: Level,
content: String,
}
@@ -42,8 +42,8 @@ impl Msg for LogMsg {
}
impl ChatMsg for LogMsg {
- fn time(&self) -> OffsetDateTime {
- self.time
+ fn time(&self) -> Option {
+ Some(self.time)
}
fn styled(&self) -> (Styled, Styled) {
@@ -209,7 +209,7 @@ impl Log for Logger {
let mut guard = self.messages.lock();
let msg = LogMsg {
id: guard.len(),
- time: OffsetDateTime::now_utc(),
+ time: Timestamp::now(),
level: record.level(),
content: format!("<{}> {}", record.target(), record.args()),
};
diff --git a/cove/src/macros.rs b/cove/src/macros.rs
index a20cec9..bb5834c 100644
--- a/cove/src/macros.rs
+++ b/cove/src/macros.rs
@@ -1,4 +1,3 @@
-// TODO Get rid of this macro as much as possible
macro_rules! logging_unwrap {
($e:expr) => {
match $e {
diff --git a/cove/src/main.rs b/cove/src/main.rs
index e9dc920..51bc502 100644
--- a/cove/src/main.rs
+++ b/cove/src/main.rs
@@ -1,19 +1,23 @@
-#![forbid(unsafe_code)]
-// Rustc lint groups
-#![warn(future_incompatible)]
-#![warn(rust_2018_idioms)]
-#![warn(unused)]
-// Rustc lints
-#![warn(noop_method_call)]
-#![warn(single_use_lifetimes)]
-// Clippy lints
-#![warn(clippy::use_self)]
-
-// TODO Enable warn(unreachable_pub)?
// TODO Remove unnecessary Debug impls and compare compile times
-// TODO Time zones other than UTC
// TODO Invoke external notification command?
+use std::path::PathBuf;
+
+use anyhow::Context;
+use clap::Parser;
+use cove_config::{Config, doc::Document};
+use directories::{BaseDirs, ProjectDirs};
+use log::info;
+use tokio::sync::mpsc;
+use toss::Terminal;
+
+use crate::{
+ logger::Logger,
+ ui::Ui,
+ vault::Vault,
+ version::{NAME, VERSION},
+};
+
mod euph;
mod export;
mod logger;
@@ -22,21 +26,7 @@ mod store;
mod ui;
mod util;
mod vault;
-
-use std::path::PathBuf;
-
-use clap::Parser;
-use cookie::CookieJar;
-use cove_config::doc::Document;
-use cove_config::Config;
-use directories::{BaseDirs, ProjectDirs};
-use log::info;
-use tokio::sync::mpsc;
-use toss::Terminal;
-
-use crate::logger::Logger;
-use crate::ui::Ui;
-use crate::vault::Vault;
+mod version;
#[derive(Debug, clap::Parser)]
enum Command {
@@ -47,11 +37,21 @@ enum Command {
/// Compact and clean up vault.
Gc,
/// Clear euphoria session cookies.
- ClearCookies,
+ ClearCookies {
+ /// Clear cookies for a specific domain only.
+ #[arg(long, short)]
+ domain: Option,
+ },
/// Print config documentation as markdown.
HelpConfig,
}
+#[derive(Debug, Clone, Copy, clap::ValueEnum)]
+enum WidthEstimationMethod {
+ Legacy,
+ Unicode,
+}
+
impl Default for Command {
fn default() -> Self {
Self::Run
@@ -85,6 +85,11 @@ struct Args {
#[arg(long, short)]
offline: bool,
+ /// Method for estimating the width of characters as displayed by the
+ /// terminal emulator.
+ #[arg(long, short)]
+ width_estimation_method: Option,
+
/// Measure the width of characters as displayed by the terminal emulator
/// instead of guessing the width.
#[arg(long, short)]
@@ -120,18 +125,26 @@ fn update_config_with_args(config: &mut Config, args: &Args) {
}
config.ephemeral |= args.ephemeral;
+ if let Some(method) = args.width_estimation_method {
+ config.width_estimation_method = match method {
+ WidthEstimationMethod::Legacy => cove_config::WidthEstimationMethod::Legacy,
+ WidthEstimationMethod::Unicode => cove_config::WidthEstimationMethod::Unicode,
+ }
+ }
config.measure_widths |= args.measure_widths;
config.offline |= args.offline;
}
-fn open_vault(config: &Config, dirs: &ProjectDirs) -> rusqlite::Result {
- if config.ephemeral {
- vault::launch_in_memory()
+fn open_vault(config: &Config, dirs: &ProjectDirs) -> anyhow::Result {
+ let vault = if config.ephemeral {
+ vault::launch_in_memory()?
} else {
let data_dir = data_dir(config, dirs);
eprintln!("Data dir: {}", data_dir.to_string_lossy());
- vault::launch(&data_dir.join("vault.db"))
- }
+ vault::launch(&data_dir.join("vault.db"))?
+ };
+
+ Ok(vault)
}
#[tokio::main]
@@ -141,6 +154,11 @@ async fn main() -> anyhow::Result<()> {
let (logger, logger_guard, logger_rx) = Logger::init(args.verbose);
let dirs = ProjectDirs::from("de", "plugh", "cove").expect("failed to find config directory");
+ // https://github.com/snapview/tokio-tungstenite/issues/353#issuecomment-2455247837
+ rustls::crypto::aws_lc_rs::default_provider()
+ .install_default()
+ .unwrap();
+
// Locate config
let config_path = config_path(&args, &dirs);
eprintln!("Config file: {}", config_path.to_string_lossy());
@@ -154,7 +172,7 @@ async fn main() -> anyhow::Result<()> {
Command::Run => run(logger, logger_rx, config, &dirs).await?,
Command::Export(args) => export(config, &dirs, args).await?,
Command::Gc => gc(config, &dirs).await?,
- Command::ClearCookies => clear_cookies(config, &dirs).await?,
+ Command::ClearCookies { domain } => clear_cookies(config, &dirs, domain).await?,
Command::HelpConfig => help_config(),
}
@@ -173,17 +191,19 @@ async fn run(
config: &'static Config,
dirs: &ProjectDirs,
) -> anyhow::Result<()> {
- info!(
- "Welcome to {} {}",
- env!("CARGO_PKG_NAME"),
- env!("CARGO_PKG_VERSION")
- );
+ info!("Welcome to {NAME} {VERSION}",);
+
+ let tz = util::load_time_zone(config.time_zone_ref()).context("failed to load time zone")?;
let vault = open_vault(config, dirs)?;
let mut terminal = Terminal::new()?;
terminal.set_measuring(config.measure_widths);
- Ui::run(config, &mut terminal, vault.clone(), logger, logger_rx).await?;
+ terminal.set_width_estimation_method(match config.width_estimation_method {
+ cove_config::WidthEstimationMethod::Legacy => toss::WidthEstimationMethod::Legacy,
+ cove_config::WidthEstimationMethod::Unicode => toss::WidthEstimationMethod::Unicode,
+ });
+ Ui::run(config, tz, &mut terminal, vault.clone(), logger, logger_rx).await?;
drop(terminal);
vault.close().await;
@@ -214,11 +234,15 @@ async fn gc(config: &'static Config, dirs: &ProjectDirs) -> anyhow::Result<()> {
Ok(())
}
-async fn clear_cookies(config: &'static Config, dirs: &ProjectDirs) -> anyhow::Result<()> {
+async fn clear_cookies(
+ config: &'static Config,
+ dirs: &ProjectDirs,
+ domain: Option,
+) -> anyhow::Result<()> {
let vault = open_vault(config, dirs)?;
eprintln!("Clearing cookies");
- vault.euph().set_cookies(CookieJar::new()).await?;
+ vault.euph().clear_cookies(domain).await?;
vault.close().await;
Ok(())
diff --git a/cove/src/store.rs b/cove/src/store.rs
index 35e02a6..b7031c1 100644
--- a/cove/src/store.rs
+++ b/cove/src/store.rs
@@ -1,7 +1,4 @@
-use std::collections::HashMap;
-use std::fmt::Debug;
-use std::hash::Hash;
-use std::vec;
+use std::{collections::HashMap, fmt::Debug, hash::Hash, vec};
use async_trait::async_trait;
@@ -11,6 +8,10 @@ pub trait Msg {
fn parent(&self) -> Option;
fn seen(&self) -> bool;
+ fn nick_emoji(&self) -> Option {
+ None
+ }
+
fn last_possible_id() -> Self::Id;
}
@@ -27,10 +28,6 @@ impl Path {
self.0.iter().take(self.0.len() - 1)
}
- pub fn push(&mut self, segment: I) {
- self.0.push(segment)
- }
-
pub fn first(&self) -> &I {
self.0.first().expect("path is empty")
}
@@ -134,6 +131,7 @@ impl Tree {
}
}
+#[allow(dead_code)]
#[async_trait]
pub trait MsgStore {
type Error;
diff --git a/cove/src/ui.rs b/cove/src/ui.rs
index cb85876..5ebd540 100644
--- a/cove/src/ui.rs
+++ b/cove/src/ui.rs
@@ -1,3 +1,30 @@
+use std::{
+ convert::Infallible,
+ io,
+ sync::{Arc, Weak},
+ time::{Duration, Instant},
+};
+
+use cove_config::Config;
+use cove_input::InputEvent;
+use jiff::tz::TimeZone;
+use parking_lot::FairMutex;
+use tokio::{
+ sync::mpsc::{self, UnboundedReceiver, UnboundedSender, error::TryRecvError},
+ task,
+};
+use toss::{Terminal, WidgetExt, widgets::BoxedAsync};
+
+use crate::{
+ logger::{LogMsg, Logger},
+ macros::logging_unwrap,
+ util::InfallibleExt,
+ vault::Vault,
+};
+
+pub use self::chat::ChatMsg;
+use self::{chat::ChatState, rooms::Rooms, widgets::ListState};
+
mod chat;
mod euph;
mod key_bindings;
@@ -5,30 +32,6 @@ mod rooms;
mod util;
mod widgets;
-use std::convert::Infallible;
-use std::io;
-use std::sync::{Arc, Weak};
-use std::time::{Duration, Instant};
-
-use cove_config::Config;
-use cove_input::InputEvent;
-use parking_lot::FairMutex;
-use tokio::sync::mpsc::error::TryRecvError;
-use tokio::sync::mpsc::{self, UnboundedReceiver, UnboundedSender};
-use tokio::task;
-use toss::widgets::BoxedAsync;
-use toss::{Terminal, WidgetExt};
-
-use crate::logger::{LogMsg, Logger};
-use crate::macros::logging_unwrap;
-use crate::util::InfallibleExt;
-use crate::vault::Vault;
-
-pub use self::chat::ChatMsg;
-use self::chat::ChatState;
-use self::rooms::Rooms;
-use self::widgets::ListState;
-
/// Time to spend batch processing events before redrawing the screen.
const EVENT_PROCESSING_TIME: Duration = Duration::from_millis(1000 / 15); // 15 fps
@@ -47,6 +50,7 @@ impl From for UiError {
}
}
+#[expect(clippy::large_enum_variant)]
pub enum UiEvent {
GraphemeWidthsChanged,
LogChanged,
@@ -84,6 +88,7 @@ impl Ui {
pub async fn run(
config: &'static Config,
+ tz: TimeZone,
terminal: &mut Terminal,
vault: Vault,
logger: Logger,
@@ -112,8 +117,8 @@ impl Ui {
config,
event_tx: event_tx.clone(),
mode: Mode::Main,
- rooms: Rooms::new(config, vault, event_tx.clone()).await,
- log_chat: ChatState::new(logger),
+ rooms: Rooms::new(config, tz.clone(), vault, event_tx.clone()).await,
+ log_chat: ChatState::new(logger, tz),
key_bindings_visible: false,
key_bindings_list: ListState::new(),
};
@@ -181,9 +186,8 @@ impl Ui {
}
// Handle events (in batches)
- let mut event = match event_rx.recv().await {
- Some(event) => event,
- None => return Ok(()),
+ let Some(mut event) = event_rx.recv().await else {
+ return Ok(());
};
let end_time = Instant::now() + EVENT_PROCESSING_TIME;
loop {
diff --git a/cove/src/ui/chat.rs b/cove/src/ui/chat.rs
index 24ea82e..1116935 100644
--- a/cove/src/ui/chat.rs
+++ b/cove/src/ui/chat.rs
@@ -1,24 +1,28 @@
+use cove_config::Keys;
+use cove_input::InputEvent;
+use jiff::{Timestamp, tz::TimeZone};
+use toss::{
+ Styled, WidgetExt,
+ widgets::{BoxedAsync, EditorState},
+};
+
+use crate::{
+ store::{Msg, MsgStore},
+ util,
+};
+
+use super::UiError;
+
+use self::{cursor::Cursor, tree::TreeViewState};
+
mod blocks;
mod cursor;
mod renderer;
mod tree;
mod widgets;
-use cove_config::Keys;
-use cove_input::InputEvent;
-use time::OffsetDateTime;
-use toss::widgets::{BoxedAsync, EditorState};
-use toss::{Styled, WidgetExt};
-
-use crate::store::{Msg, MsgStore};
-
-use self::cursor::Cursor;
-use self::tree::TreeViewState;
-
-use super::UiError;
-
pub trait ChatMsg {
- fn time(&self) -> OffsetDateTime;
+ fn time(&self) -> Option;
fn styled(&self) -> (Styled, Styled);
fn edit(nick: &str, content: &str) -> (Styled, Styled);
fn pseudo(nick: &str, content: &str) -> (Styled, Styled);
@@ -33,23 +37,31 @@ pub struct ChatState> {
cursor: Cursor,
editor: EditorState,
+ nick_emoji: bool,
+ caesar: i8,
mode: Mode,
tree: TreeViewState,
}
impl + Clone> ChatState {
- pub fn new(store: S) -> Self {
+ pub fn new(store: S, tz: TimeZone) -> Self {
Self {
cursor: Cursor::Bottom,
editor: EditorState::new(),
+ nick_emoji: false,
+ caesar: 0,
mode: Mode::Tree,
- tree: TreeViewState::new(store.clone()),
+ tree: TreeViewState::new(store.clone(), tz),
store,
}
}
+
+ pub fn nick_emoji(&self) -> bool {
+ self.nick_emoji
+ }
}
impl> ChatState {
@@ -68,7 +80,14 @@ impl> ChatState {
match self.mode {
Mode::Tree => self
.tree
- .widget(&mut self.cursor, &mut self.editor, nick, focused)
+ .widget(
+ &mut self.cursor,
+ &mut self.editor,
+ nick,
+ focused,
+ self.nick_emoji,
+ self.caesar,
+ )
.boxed_async(),
}
}
@@ -85,7 +104,7 @@ impl> ChatState {
S: Send + Sync,
S::Error: Send,
{
- match self.mode {
+ let reaction = match self.mode {
Mode::Tree => {
self.tree
.handle_input_event(
@@ -95,9 +114,33 @@ impl> ChatState {
&mut self.editor,
can_compose,
)
- .await
+ .await?
}
- }
+ };
+
+ Ok(match reaction {
+ Reaction::Composed { parent, content } if self.caesar != 0 => {
+ let content = util::caesar(&content, self.caesar);
+ Reaction::Composed { parent, content }
+ }
+
+ Reaction::NotHandled if event.matches(&keys.tree.action.toggle_nick_emoji) => {
+ self.nick_emoji = !self.nick_emoji;
+ Reaction::Handled
+ }
+
+ Reaction::NotHandled if event.matches(&keys.tree.action.increase_caesar) => {
+ self.caesar = (self.caesar + 1).rem_euclid(26);
+ Reaction::Handled
+ }
+
+ Reaction::NotHandled if event.matches(&keys.tree.action.decrease_caesar) => {
+ self.caesar = (self.caesar - 1).rem_euclid(26);
+ Reaction::Handled
+ }
+
+ reaction => reaction,
+ })
}
pub fn cursor(&self) -> Option<&M::Id> {
diff --git a/cove/src/ui/chat/blocks.rs b/cove/src/ui/chat/blocks.rs
index 2a9eb0a..8360e83 100644
--- a/cove/src/ui/chat/blocks.rs
+++ b/cove/src/ui/chat/blocks.rs
@@ -1,6 +1,6 @@
//! Common rendering logic.
-use std::collections::{vec_deque, VecDeque};
+use std::collections::{VecDeque, vec_deque};
use toss::widgets::Predrawn;
@@ -161,14 +161,6 @@ impl Blocks {
pub fn shift(&mut self, delta: i32) {
self.range = self.range.shifted(delta);
}
-
- pub fn set_top(&mut self, top: i32) {
- self.shift(top - self.range.top);
- }
-
- pub fn set_bottom(&mut self, bottom: i32) {
- self.shift(bottom - self.range.bottom);
- }
}
pub struct Iter<'a, Id> {
diff --git a/cove/src/ui/chat/cursor.rs b/cove/src/ui/chat/cursor.rs
index 561f4ed..87bd8fc 100644
--- a/cove/src/ui/chat/cursor.rs
+++ b/cove/src/ui/chat/cursor.rs
@@ -1,7 +1,6 @@
//! Common cursor movement logic.
-use std::collections::HashSet;
-use std::hash::Hash;
+use std::{collections::HashSet, hash::Hash};
use crate::store::{Msg, MsgStore, Tree};
diff --git a/cove/src/ui/chat/renderer.rs b/cove/src/ui/chat/renderer.rs
index 1edde46..a619e7c 100644
--- a/cove/src/ui/chat/renderer.rs
+++ b/cove/src/ui/chat/renderer.rs
@@ -14,7 +14,6 @@ pub trait Renderer {
fn blocks(&self) -> &Blocks;
fn blocks_mut(&mut self) -> &mut Blocks;
- fn into_blocks(self) -> Blocks;
async fn expand_top(&mut self) -> Result<(), Self::Error>;
async fn expand_bottom(&mut self) -> Result<(), Self::Error>;
@@ -275,27 +274,6 @@ where
}
}
-pub fn clamp_scroll_biased_upwards(r: &mut R)
-where
- R: Renderer,
-{
- let area = visible_area(r);
- let blocks = r.blocks().range();
-
- // Delta that moves blocks.top to the top of the screen. If this is
- // negative, we need to move the blocks because they're too low.
- let move_to_top = blocks.top - area.top;
-
- // Delta that moves blocks.bottom to the bottom of the screen. If this is
- // positive, we need to move the blocks because they're too high.
- let move_to_bottom = blocks.bottom - area.bottom;
-
- // If the screen is higher, the blocks should rather be moved to the top
- // than the bottom because of the upwards bias.
- let delta = 0.max(move_to_bottom).min(move_to_top);
- r.blocks_mut().shift(delta);
-}
-
pub fn clamp_scroll_biased_downwards(r: &mut R)
where
R: Renderer,
diff --git a/cove/src/ui/chat/tree.rs b/cove/src/ui/chat/tree.rs
index 772363f..d9905fc 100644
--- a/cove/src/ui/chat/tree.rs
+++ b/cove/src/ui/chat/tree.rs
@@ -2,29 +2,31 @@
// TODO Focusing on sub-trees
-mod renderer;
-mod scroll;
-mod widgets;
-
use std::collections::HashSet;
use async_trait::async_trait;
use cove_config::Keys;
use cove_input::InputEvent;
-use toss::widgets::EditorState;
-use toss::{AsyncWidget, Frame, Pos, Size, WidgetExt, WidthDb};
+use jiff::tz::TimeZone;
+use toss::{AsyncWidget, Frame, Pos, Size, WidgetExt, WidthDb, widgets::EditorState};
-use crate::store::{Msg, MsgStore};
-use crate::ui::{util, ChatMsg, UiError};
-use crate::util::InfallibleExt;
+use crate::{
+ store::{Msg, MsgStore},
+ ui::{UiError, util},
+ util::InfallibleExt,
+};
+
+use super::{ChatMsg, Reaction, cursor::Cursor};
use self::renderer::{TreeContext, TreeRenderer};
-use super::cursor::Cursor;
-use super::Reaction;
+mod renderer;
+mod scroll;
+mod widgets;
pub struct TreeViewState> {
store: S,
+ tz: TimeZone,
last_size: Size,
last_nick: String,
@@ -36,9 +38,10 @@ pub struct TreeViewState> {
}
impl> TreeViewState {
- pub fn new(store: S) -> Self {
+ pub fn new(store: S, tz: TimeZone) -> Self {
Self {
store,
+ tz,
last_size: Size::ZERO,
last_nick: String::new(),
last_cursor: Cursor::Bottom,
@@ -386,6 +389,8 @@ impl> TreeViewState {
editor: &'a mut EditorState,
nick: String,
focused: bool,
+ nick_emoji: bool,
+ caesar: i8,
) -> TreeView<'a, M, S> {
TreeView {
state: self,
@@ -393,6 +398,8 @@ impl> TreeViewState {
editor,
nick,
focused,
+ nick_emoji,
+ caesar,
}
}
}
@@ -405,6 +412,9 @@ pub struct TreeView<'a, M: Msg, S: MsgStore> {
nick: String,
focused: bool,
+
+ nick_emoji: bool,
+ caesar: i8,
}
#[async_trait]
@@ -432,6 +442,8 @@ where
size,
nick: self.nick.clone(),
focused: self.focused,
+ nick_emoji: self.nick_emoji,
+ caesar: self.caesar,
last_cursor: self.state.last_cursor.clone(),
last_cursor_top: self.state.last_cursor_top,
};
@@ -439,6 +451,7 @@ where
let mut renderer = TreeRenderer::new(
context,
&self.state.store,
+ &self.state.tz,
&mut self.state.folded,
self.cursor,
self.editor,
diff --git a/cove/src/ui/chat/tree/renderer.rs b/cove/src/ui/chat/tree/renderer.rs
index e6753c7..225191b 100644
--- a/cove/src/ui/chat/tree/renderer.rs
+++ b/cove/src/ui/chat/tree/renderer.rs
@@ -1,18 +1,26 @@
//! A [`Renderer`] for message trees.
-use std::collections::HashSet;
-use std::convert::Infallible;
+use std::{collections::HashSet, convert::Infallible};
use async_trait::async_trait;
-use toss::widgets::{EditorState, Empty, Predrawn, Resize};
-use toss::{Size, Widget, WidthDb};
+use jiff::tz::TimeZone;
+use toss::{
+ Size, Widget, WidthDb,
+ widgets::{EditorState, Empty, Predrawn, Resize},
+};
-use crate::store::{Msg, MsgStore, Tree};
-use crate::ui::chat::blocks::{Block, Blocks, Range};
-use crate::ui::chat::cursor::Cursor;
-use crate::ui::chat::renderer::{self, overlaps, Renderer};
-use crate::ui::ChatMsg;
-use crate::util::InfallibleExt;
+use crate::{
+ store::{Msg, MsgStore, Tree},
+ ui::{
+ ChatMsg,
+ chat::{
+ blocks::{Block, Blocks, Range},
+ cursor::Cursor,
+ renderer::{self, Renderer, overlaps},
+ },
+ },
+ util::InfallibleExt,
+};
use super::widgets;
@@ -72,6 +80,8 @@ pub struct TreeContext {
pub size: Size,
pub nick: String,
pub focused: bool,
+ pub nick_emoji: bool,
+ pub caesar: i8,
pub last_cursor: Cursor,
pub last_cursor_top: i32,
}
@@ -80,6 +90,7 @@ pub struct TreeRenderer<'a, M: Msg, S: MsgStore> {
context: TreeContext,
store: &'a S,
+ tz: &'a TimeZone,
folded: &'a mut HashSet,
cursor: &'a mut Cursor,
editor: &'a mut EditorState,
@@ -107,6 +118,7 @@ where
pub fn new(
context: TreeContext,
store: &'a S,
+ tz: &'a TimeZone,
folded: &'a mut HashSet,
cursor: &'a mut Cursor,
editor: &'a mut EditorState,
@@ -115,6 +127,7 @@ where
Self {
context,
store,
+ tz,
folded,
cursor,
editor,
@@ -148,8 +161,12 @@ where
None => TreeBlockId::Bottom,
};
- // TODO Unhighlighted version when focusing on nick list
- let widget = widgets::editor::(indent, &self.context.nick, self.editor);
+ let widget = widgets::editor::(
+ indent,
+ &self.context.nick,
+ self.context.focused,
+ self.editor,
+ );
let widget = Self::predraw(widget, self.context.size, self.widthdb);
let mut block = Block::new(id, widget, false);
@@ -167,7 +184,6 @@ where
None => TreeBlockId::Bottom,
};
- // TODO Unhighlighted version when focusing on nick list
let widget = widgets::pseudo::(indent, &self.context.nick, self.editor);
let widget = Self::predraw(widget, self.context.size, self.widthdb);
Block::new(id, widget, false)
@@ -187,7 +203,15 @@ where
};
let highlighted = highlighted && self.context.focused;
- let widget = widgets::msg(highlighted, indent, msg, folded_info);
+ let widget = widgets::msg(
+ highlighted,
+ self.tz.clone(),
+ indent,
+ msg,
+ self.context.nick_emoji,
+ self.context.caesar,
+ folded_info,
+ );
let widget = Self::predraw(widget, self.context.size, self.widthdb);
Block::new(TreeBlockId::Msg(msg_id), widget, true)
}
@@ -422,7 +446,7 @@ where
pub fn into_visible_blocks(
self,
- ) -> impl Iterator- , Block>)> {
+ ) -> impl Iterator
- , Block>)> + use {
let area = renderer::visible_area(&self);
self.blocks
.into_iter()
@@ -456,10 +480,6 @@ where
&mut self.blocks
}
- fn into_blocks(self) -> TreeBlocks {
- self.blocks
- }
-
async fn expand_top(&mut self) -> Result<(), Self::Error> {
let prev_root_id = if let Some(top_root_id) = &self.top_root_id {
self.store.prev_root_id(top_root_id).await?
diff --git a/cove/src/ui/chat/tree/scroll.rs b/cove/src/ui/chat/tree/scroll.rs
index 482c7ca..a8a1305 100644
--- a/cove/src/ui/chat/tree/scroll.rs
+++ b/cove/src/ui/chat/tree/scroll.rs
@@ -1,12 +1,14 @@
-use toss::widgets::EditorState;
-use toss::WidthDb;
+use toss::{WidthDb, widgets::EditorState};
-use crate::store::{Msg, MsgStore};
-use crate::ui::chat::cursor::Cursor;
-use crate::ui::ChatMsg;
+use crate::{
+ store::{Msg, MsgStore},
+ ui::{ChatMsg, chat::cursor::Cursor},
+};
-use super::renderer::{TreeContext, TreeRenderer};
-use super::TreeViewState;
+use super::{
+ TreeViewState,
+ renderer::{TreeContext, TreeRenderer},
+};
impl TreeViewState
where
@@ -20,6 +22,8 @@ where
size: self.last_size,
nick: self.last_nick.clone(),
focused: true,
+ nick_emoji: false,
+ caesar: 0,
last_cursor: self.last_cursor.clone(),
last_cursor_top: self.last_cursor_top,
}
@@ -36,6 +40,7 @@ where
let mut renderer = TreeRenderer::new(
context,
&self.store,
+ &self.tz,
&mut self.folded,
cursor,
editor,
@@ -63,6 +68,7 @@ where
let mut renderer = TreeRenderer::new(
context,
&self.store,
+ &self.tz,
&mut self.folded,
cursor,
editor,
diff --git a/cove/src/ui/chat/tree/widgets.rs b/cove/src/ui/chat/tree/widgets.rs
index ecdb7f4..dd7fa89 100644
--- a/cove/src/ui/chat/tree/widgets.rs
+++ b/cove/src/ui/chat/tree/widgets.rs
@@ -1,12 +1,20 @@
use std::convert::Infallible;
use crossterm::style::Stylize;
-use toss::widgets::{Boxed, EditorState, Join2, Join4, Join5, Text};
-use toss::{Style, Styled, WidgetExt};
+use jiff::tz::TimeZone;
+use toss::{
+ Style, Styled, WidgetExt,
+ widgets::{Boxed, EditorState, Join2, Join4, Join5, Text},
+};
-use crate::store::Msg;
-use crate::ui::chat::widgets::{Indent, Seen, Time};
-use crate::ui::ChatMsg;
+use crate::{
+ store::Msg,
+ ui::{
+ ChatMsg,
+ chat::widgets::{Indent, Seen, Time},
+ },
+ util,
+};
pub const PLACEHOLDER: &str = "[...]";
@@ -30,6 +38,10 @@ fn style_indent(highlighted: bool) -> Style {
}
}
+fn style_caesar() -> Style {
+ Style::new().green()
+}
+
fn style_info() -> Style {
Style::new().italic().dark_grey()
}
@@ -44,11 +56,28 @@ fn style_pseudo_highlight() -> Style {
pub fn msg(
highlighted: bool,
+ tz: TimeZone,
indent: usize,
msg: &M,
+ nick_emoji: bool,
+ caesar: i8,
folded_info: Option,
) -> Boxed<'static, Infallible> {
- let (nick, mut content) = msg.styled();
+ let (mut nick, mut content) = msg.styled();
+
+ if nick_emoji {
+ if let Some(emoji) = msg.nick_emoji() {
+ nick = nick.then_plain("(").then_plain(emoji).then_plain(")");
+ }
+ }
+
+ if caesar != 0 {
+ // Apply caesar in inverse because we're decoding
+ let rotated = util::caesar(content.text(), -caesar);
+ content = content
+ .then_plain("\n")
+ .then(format!("{rotated} [rot{caesar}]"), style_caesar());
+ }
if let Some(amount) = folded_info {
content = content
@@ -58,7 +87,7 @@ pub fn msg(
Join5::horizontal(
Seen::new(msg.seen()).segment().with_fixed(true),
- Time::new(Some(msg.time()), style_time(highlighted))
+ Time::new(msg.time().map(|t| t.to_zoned(tz)), style_time(highlighted))
.padding()
.with_right(1)
.with_stretch(true)
@@ -116,10 +145,14 @@ pub fn msg_placeholder(
pub fn editor<'a, M: ChatMsg>(
indent: usize,
nick: &str,
+ focus: bool,
editor: &'a mut EditorState,
) -> Boxed<'a, Infallible> {
let (nick, content) = M::edit(nick, editor.text());
- let editor = editor.widget().with_highlight(|_| content);
+ let editor = editor
+ .widget()
+ .with_highlight(|_| content)
+ .with_focus(focus);
Join5::horizontal(
Seen::new(true).segment().with_fixed(true),
diff --git a/cove/src/ui/chat/widgets.rs b/cove/src/ui/chat/widgets.rs
index 5d35e9c..e0e2fe5 100644
--- a/cove/src/ui/chat/widgets.rs
+++ b/cove/src/ui/chat/widgets.rs
@@ -1,11 +1,11 @@
use std::convert::Infallible;
use crossterm::style::Stylize;
-use time::format_description::FormatItem;
-use time::macros::format_description;
-use time::OffsetDateTime;
-use toss::widgets::{Boxed, Empty, Text};
-use toss::{Frame, Pos, Size, Style, Widget, WidgetExt, WidthDb};
+use jiff::Zoned;
+use toss::{
+ Frame, Pos, Size, Style, Widget, WidgetExt, WidthDb,
+ widgets::{Boxed, Empty, Text},
+};
use crate::util::InfallibleExt;
@@ -46,15 +46,15 @@ impl Widget for Indent {
}
}
-const TIME_FORMAT: &[FormatItem<'_>] = format_description!("[year]-[month]-[day] [hour]:[minute]");
+const TIME_FORMAT: &str = "%Y-%m-%d %H:%M";
const TIME_WIDTH: u16 = 16;
pub struct Time(Boxed<'static, Infallible>);
impl Time {
- pub fn new(time: Option, style: Style) -> Self {
+ pub fn new(time: Option, style: Style) -> Self {
let widget = if let Some(time) = time {
- let text = time.format(TIME_FORMAT).expect("could not format time");
+ let text = time.strftime(TIME_FORMAT).to_string();
Text::new((text, style))
.background()
.with_style(style)
diff --git a/cove/src/ui/euph/account.rs b/cove/src/ui/euph/account.rs
index 359e9d5..7aa776f 100644
--- a/cove/src/ui/euph/account.rs
+++ b/cove/src/ui/euph/account.rs
@@ -1,14 +1,16 @@
use cove_config::Keys;
use cove_input::InputEvent;
use crossterm::style::Stylize;
-use euphoxide::api::PersonalAccountView;
-use euphoxide::conn;
-use toss::widgets::{EditorState, Empty, Join3, Join4, Join5, Text};
-use toss::{Style, Widget, WidgetExt};
+use euphoxide::{api::PersonalAccountView, conn};
+use toss::{
+ Style, Widget, WidgetExt,
+ widgets::{EditorState, Empty, Join3, Join4, Join5, Text},
+};
-use crate::euph::{self, Room};
-use crate::ui::widgets::Popup;
-use crate::ui::{util, UiError};
+use crate::{
+ euph::{self, Room},
+ ui::{UiError, util, widgets::Popup},
+};
use super::popup::PopupResult;
@@ -33,7 +35,7 @@ impl LoggedOut {
}
}
- fn widget(&mut self) -> impl Widget + '_ {
+ fn widget(&mut self) -> impl Widget {
let bold = Style::new().bold();
Join4::vertical(
Text::new(("Not logged in", bold.yellow())).segment(),
@@ -66,7 +68,7 @@ impl LoggedOut {
pub struct LoggedIn(PersonalAccountView);
impl LoggedIn {
- fn widget(&self) -> impl Widget {
+ fn widget(&self) -> impl Widget + use<> {
let bold = Style::new().bold();
Join5::vertical(
Text::new(("Logged in", bold.green())).segment(),
@@ -109,7 +111,7 @@ impl AccountUiState {
}
}
- pub fn widget(&mut self) -> impl Widget + '_ {
+ pub fn widget(&mut self) -> impl Widget {
let inner = match self {
Self::LoggedOut(logged_out) => logged_out.widget().first2(),
Self::LoggedIn(logged_in) => logged_in.widget().second2(),
diff --git a/cove/src/ui/euph/auth.rs b/cove/src/ui/euph/auth.rs
index b938ff1..15f8fe1 100644
--- a/cove/src/ui/euph/auth.rs
+++ b/cove/src/ui/euph/auth.rs
@@ -1,11 +1,11 @@
use cove_config::Keys;
use cove_input::InputEvent;
-use toss::widgets::EditorState;
-use toss::Widget;
+use toss::{Widget, widgets::EditorState};
-use crate::euph::Room;
-use crate::ui::widgets::Popup;
-use crate::ui::{util, UiError};
+use crate::{
+ euph::Room,
+ ui::{UiError, util, widgets::Popup},
+};
use super::popup::PopupResult;
@@ -13,7 +13,7 @@ pub fn new() -> EditorState {
EditorState::new()
}
-pub fn widget(editor: &mut EditorState) -> impl Widget + '_ {
+pub fn widget(editor: &mut EditorState) -> impl Widget {
Popup::new(
editor.widget().with_hidden_default_placeholder(),
"Enter password",
diff --git a/cove/src/ui/euph/inspect.rs b/cove/src/ui/euph/inspect.rs
index 25620a2..b3c4e0e 100644
--- a/cove/src/ui/euph/inspect.rs
+++ b/cove/src/ui/euph/inspect.rs
@@ -1,13 +1,13 @@
use cove_config::Keys;
use cove_input::InputEvent;
use crossterm::style::Stylize;
-use euphoxide::api::{Message, NickEvent, SessionView};
-use euphoxide::conn::SessionInfo;
-use toss::widgets::Text;
-use toss::{Style, Styled, Widget};
+use euphoxide::{
+ api::{Message, NickEvent, SessionView},
+ conn::SessionInfo,
+};
+use toss::{Style, Styled, Widget, widgets::Text};
-use crate::ui::widgets::Popup;
-use crate::ui::UiError;
+use crate::ui::{UiError, widgets::Popup};
use super::popup::PopupResult;
@@ -91,7 +91,7 @@ fn message_lines(mut text: Styled, msg: &Message) -> Styled {
text
}
-pub fn session_widget(session: &SessionInfo) -> impl Widget {
+pub fn session_widget(session: &SessionInfo) -> impl Widget + use<> {
let heading_style = Style::new().bold();
let text = match session {
@@ -108,7 +108,7 @@ pub fn session_widget(session: &SessionInfo) -> impl Widget {
Popup::new(Text::new(text), "Inspect session")
}
-pub fn message_widget(msg: &Message) -> impl Widget {
+pub fn message_widget(msg: &Message) -> impl Widget + use<> {
let heading_style = Style::new().bold();
let mut text = Styled::new("Message", heading_style).then_plain("\n");
diff --git a/cove/src/ui/euph/links.rs b/cove/src/ui/euph/links.rs
index 8e3f535..c64830d 100644
--- a/cove/src/ui/euph/links.rs
+++ b/cove/src/ui/euph/links.rs
@@ -1,19 +1,31 @@
use cove_config::{Config, Keys};
use cove_input::InputEvent;
-use crossterm::event::KeyCode;
-use crossterm::style::Stylize;
+use crossterm::{event::KeyCode, style::Stylize};
use linkify::{LinkFinder, LinkKind};
-use toss::widgets::{Join2, Text};
-use toss::{Style, Styled, Widget, WidgetExt};
+use toss::{
+ Style, Styled, Widget, WidgetExt,
+ widgets::{Join2, Text},
+};
-use crate::ui::widgets::{ListBuilder, ListState, Popup};
-use crate::ui::{key_bindings, util, UiError};
+use crate::{
+ euph::{self, SpanType},
+ ui::{
+ UiError, key_bindings, util,
+ widgets::{ListBuilder, ListState, Popup},
+ },
+};
use super::popup::PopupResult;
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+enum Link {
+ Url(String),
+ Room(String),
+}
+
pub struct LinksState {
config: &'static Config,
- links: Vec,
+ links: Vec,
list: ListState,
}
@@ -21,12 +33,34 @@ const NUMBER_KEYS: [char; 10] = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0
impl LinksState {
pub fn new(config: &'static Config, content: &str) -> Self {
- let links = LinkFinder::new()
+ let mut links = vec![];
+
+ // Collect URL-like links
+ for link in LinkFinder::new()
.url_must_have_scheme(false)
.kinds(&[LinkKind::Url])
.links(content)
- .map(|l| l.as_str().to_string())
- .collect();
+ {
+ links.push((
+ link.start(),
+ link.end(),
+ Link::Url(link.as_str().to_string()),
+ ));
+ }
+
+ // Collect room links
+ for (span, range) in euph::find_spans(content) {
+ if span == SpanType::Room {
+ let name = &content[range.start + 1..range.end];
+ links.push((range.start, range.end, Link::Room(name.to_string())));
+ }
+ }
+
+ links.sort();
+ let links = links
+ .into_iter()
+ .map(|(_, _, link)| link)
+ .collect::>();
Self {
config,
@@ -35,7 +69,7 @@ impl LinksState {
}
}
- pub fn widget(&mut self) -> impl Widget + '_ {
+ pub fn widget(&mut self) -> impl Widget {
let style_selected = Style::new().black().on_white();
let mut list_builder = ListBuilder::new();
@@ -46,29 +80,29 @@ impl LinksState {
for (id, link) in self.links.iter().enumerate() {
let link = link.clone();
- if let Some(&number_key) = NUMBER_KEYS.get(id) {
- list_builder.add_sel(id, move |selected| {
- let text = if selected {
- Styled::new(format!("[{number_key}]"), style_selected.bold())
- .then(" ", style_selected)
- .then(link, style_selected)
- } else {
- Styled::new(format!("[{number_key}]"), Style::new().dark_grey().bold())
- .then_plain(" ")
- .then_plain(link)
- };
- Text::new(text)
- });
- } else {
- list_builder.add_sel(id, move |selected| {
- let text = if selected {
- Styled::new(format!(" {link}"), style_selected)
- } else {
- Styled::new_plain(format!(" {link}"))
- };
- Text::new(text)
- });
- }
+ list_builder.add_sel(id, move |selected| {
+ let mut text = Styled::default();
+
+ // Number key indicator
+ text = match NUMBER_KEYS.get(id) {
+ None if selected => text.then(" ", style_selected),
+ None => text.then_plain(" "),
+ Some(key) if selected => text.then(format!("[{key}] "), style_selected.bold()),
+ Some(key) => text.then(format!("[{key}] "), Style::new().dark_grey().bold()),
+ };
+
+ // The link itself
+ text = match link {
+ Link::Url(url) if selected => text.then(url, style_selected),
+ Link::Url(url) => text.then_plain(url),
+ Link::Room(name) if selected => {
+ text.then(format!("&{name}"), style_selected.bold())
+ }
+ Link::Room(name) => text.then(format!("&{name}"), Style::new().blue().bold()),
+ };
+
+ Text::new(text).with_wrap(false)
+ });
}
let hint_style = Style::new().grey().italic();
@@ -92,18 +126,24 @@ impl LinksState {
}
fn open_link_by_id(&self, id: usize) -> PopupResult {
- if let Some(link) = self.links.get(id) {
- // The `http://` or `https://` schema is necessary for open::that to
- // successfully open the link in the browser.
- let link = if link.starts_with("http://") || link.starts_with("https://") {
- link.clone()
- } else {
- format!("https://{link}")
- };
+ match self.links.get(id) {
+ Some(Link::Url(url)) => {
+ // The `http://` or `https://` schema is necessary for
+ // open::that to successfully open the link in the browser.
+ let link = if url.starts_with("http://") || url.starts_with("https://") {
+ url.clone()
+ } else {
+ format!("https://{url}")
+ };
- if let Err(error) = open::that(&link) {
- return PopupResult::ErrorOpeningLink { link, error };
+ if let Err(error) = open::that(&link) {
+ return PopupResult::ErrorOpeningLink { link, error };
+ }
}
+
+ Some(Link::Room(name)) => return PopupResult::SwitchToRoom { name: name.clone() },
+
+ _ => {}
}
PopupResult::Handled
}
diff --git a/cove/src/ui/euph/nick.rs b/cove/src/ui/euph/nick.rs
index 0bb1062..707e992 100644
--- a/cove/src/ui/euph/nick.rs
+++ b/cove/src/ui/euph/nick.rs
@@ -1,12 +1,12 @@
use cove_config::Keys;
use cove_input::InputEvent;
use euphoxide::conn::Joined;
-use toss::widgets::EditorState;
-use toss::{Style, Widget};
+use toss::{Style, Widget, widgets::EditorState};
-use crate::euph::{self, Room};
-use crate::ui::widgets::Popup;
-use crate::ui::{util, UiError};
+use crate::{
+ euph::{self, Room},
+ ui::{UiError, util, widgets::Popup},
+};
use super::popup::PopupResult;
@@ -14,7 +14,7 @@ pub fn new(joined: Joined) -> EditorState {
EditorState::with_initial_text(joined.session.name)
}
-pub fn widget(editor: &mut EditorState) -> impl Widget + '_ {
+pub fn widget(editor: &mut EditorState) -> impl Widget {
let inner = editor
.widget()
.with_highlight(|s| euph::style_nick_exact(s, Style::new()));
diff --git a/cove/src/ui/euph/nick_list.rs b/cove/src/ui/euph/nick_list.rs
index 23160bd..8fbdb7b 100644
--- a/cove/src/ui/euph/nick_list.rs
+++ b/cove/src/ui/euph/nick_list.rs
@@ -1,22 +1,31 @@
use std::iter;
use crossterm::style::{Color, Stylize};
-use euphoxide::api::{NickEvent, SessionId, SessionType, SessionView, UserId};
-use euphoxide::conn::{Joined, SessionInfo};
-use toss::widgets::{Background, Text};
-use toss::{Style, Styled, Widget, WidgetExt};
+use euphoxide::{
+ api::{NickEvent, SessionId, SessionType, SessionView, UserId},
+ conn::{Joined, SessionInfo},
+};
+use toss::{
+ Style, Styled, Widget, WidgetExt,
+ widgets::{Background, Text},
+};
-use crate::euph;
-use crate::ui::widgets::{ListBuilder, ListState};
-use crate::ui::UiError;
+use crate::{
+ euph,
+ ui::{
+ UiError,
+ widgets::{ListBuilder, ListState},
+ },
+};
pub fn widget<'a>(
list: &'a mut ListState,
joined: &Joined,
focused: bool,
-) -> impl Widget + 'a {
+ nick_emoji: bool,
+) -> impl Widget + use<'a> {
let mut list_builder = ListBuilder::new();
- render_rows(&mut list_builder, joined, focused);
+ render_rows(&mut list_builder, joined, focused, nick_emoji);
list_builder.build(list)
}
@@ -62,6 +71,7 @@ fn render_rows(
list_builder: &mut ListBuilder<'_, SessionId, Background>,
joined: &Joined,
focused: bool,
+ nick_emoji: bool,
) {
let mut people = vec![];
let mut bots = vec![];
@@ -87,10 +97,38 @@ fn render_rows(
lurkers.sort_unstable();
nurkers.sort_unstable();
- render_section(list_builder, "People", &people, &joined.session, focused);
- render_section(list_builder, "Bots", &bots, &joined.session, focused);
- render_section(list_builder, "Lurkers", &lurkers, &joined.session, focused);
- render_section(list_builder, "Nurkers", &nurkers, &joined.session, focused);
+ render_section(
+ list_builder,
+ "People",
+ &people,
+ &joined.session,
+ focused,
+ nick_emoji,
+ );
+ render_section(
+ list_builder,
+ "Bots",
+ &bots,
+ &joined.session,
+ focused,
+ nick_emoji,
+ );
+ render_section(
+ list_builder,
+ "Lurkers",
+ &lurkers,
+ &joined.session,
+ focused,
+ nick_emoji,
+ );
+ render_section(
+ list_builder,
+ "Nurkers",
+ &nurkers,
+ &joined.session,
+ focused,
+ nick_emoji,
+ );
}
fn render_section(
@@ -99,6 +137,7 @@ fn render_section(
sessions: &[HalfSession],
own_session: &SessionView,
focused: bool,
+ nick_emoji: bool,
) {
if sessions.is_empty() {
return;
@@ -116,7 +155,7 @@ fn render_section(
list_builder.add_unsel(Text::new(row).background());
for session in sessions {
- render_row(list_builder, session, own_session, focused);
+ render_row(list_builder, session, own_session, focused, nick_emoji);
}
}
@@ -125,6 +164,7 @@ fn render_row(
session: &HalfSession,
own_session: &SessionView,
focused: bool,
+ nick_emoji: bool,
) {
let (name, style, style_inv, perms_style_inv) = if session.name.is_empty() {
let name = "lurk".to_string();
@@ -158,16 +198,24 @@ fn render_row(
" "
};
+ let emoji = if nick_emoji {
+ format!(" ({})", euph::user_id_emoji(&session.id))
+ } else {
+ "".to_string()
+ };
+
list_builder.add_sel(session.session_id.clone(), move |selected| {
if focused && selected {
let text = Styled::new_plain(owner)
.then(name, style_inv)
- .then(perms, perms_style_inv);
+ .then(perms, perms_style_inv)
+ .then(emoji, perms_style_inv);
Text::new(text).background().with_style(style_inv)
} else {
let text = Styled::new_plain(owner)
.then(&name, style)
- .then_plain(perms);
+ .then_plain(perms)
+ .then_plain(emoji);
Text::new(text).background()
}
});
diff --git a/cove/src/ui/euph/popup.rs b/cove/src/ui/euph/popup.rs
index f70e999..c434fb6 100644
--- a/cove/src/ui/euph/popup.rs
+++ b/cove/src/ui/euph/popup.rs
@@ -1,18 +1,16 @@
use std::io;
use crossterm::style::Stylize;
-use toss::widgets::Text;
-use toss::{Style, Styled, Widget};
+use toss::{Style, Styled, Widget, widgets::Text};
-use crate::ui::widgets::Popup;
-use crate::ui::UiError;
+use crate::ui::{UiError, widgets::Popup};
pub enum RoomPopup {
Error { description: String, reason: String },
}
impl RoomPopup {
- fn server_error_widget(description: &str, reason: &str) -> impl Widget {
+ fn server_error_widget(description: &str, reason: &str) -> impl Widget + use<> {
let border_style = Style::new().red().bold();
let text = Styled::new_plain(description)
.then_plain("\n\n")
@@ -23,7 +21,7 @@ impl RoomPopup {
Popup::new(Text::new(text), ("Error", border_style)).with_border_style(border_style)
}
- pub fn widget(&self) -> impl Widget {
+ pub fn widget(&self) -> impl Widget + use<> {
match self {
Self::Error {
description,
@@ -37,5 +35,6 @@ pub enum PopupResult {
NotHandled,
Handled,
Close,
+ SwitchToRoom { name: String },
ErrorOpeningLink { link: String, error: io::Error },
}
diff --git a/cove/src/ui/euph/room.rs b/cove/src/ui/euph/room.rs
index 5f26304..7e8ff99 100644
--- a/cove/src/ui/euph/room.rs
+++ b/cove/src/ui/euph/room.rs
@@ -3,25 +3,40 @@ use std::collections::VecDeque;
use cove_config::{Config, Keys};
use cove_input::InputEvent;
use crossterm::style::Stylize;
-use euphoxide::api::{Data, Message, MessageId, PacketType, SessionId};
-use euphoxide::bot::instance::{Event, ServerConfig};
-use euphoxide::conn::{self, Joined, Joining, SessionInfo};
-use tokio::sync::oneshot::error::TryRecvError;
-use tokio::sync::{mpsc, oneshot};
-use toss::widgets::{BoxedAsync, EditorState, Join2, Layer, Text};
-use toss::{Style, Styled, Widget, WidgetExt};
+use euphoxide::{
+ api::{Data, Message, MessageId, PacketType, SessionId, packet::ParsedPacket},
+ bot::instance::{ConnSnapshot, Event, ServerConfig},
+ conn::{self, Joined, Joining, SessionInfo},
+};
+use jiff::tz::TimeZone;
+use tokio::sync::{
+ mpsc,
+ oneshot::{self, error::TryRecvError},
+};
+use toss::{
+ Style, Styled, Widget, WidgetExt,
+ widgets::{BoxedAsync, EditorState, Join2, Layer, Text},
+};
-use crate::euph;
-use crate::macros::logging_unwrap;
-use crate::ui::chat::{ChatState, Reaction};
-use crate::ui::widgets::ListState;
-use crate::ui::{util, UiError, UiEvent};
-use crate::vault::EuphRoomVault;
+use crate::{
+ euph::{self, SpanType},
+ macros::logging_unwrap,
+ ui::{
+ UiError, UiEvent,
+ chat::{ChatState, Reaction},
+ util,
+ widgets::ListState,
+ },
+ vault::{EuphRoomVault, RoomIdentifier},
+};
-use super::account::AccountUiState;
-use super::links::LinksState;
-use super::popup::{PopupResult, RoomPopup};
-use super::{auth, inspect, nick, nick_list};
+use super::{
+ account::AccountUiState,
+ auth, inspect,
+ links::LinksState,
+ nick, nick_list,
+ popup::{PopupResult, RoomPopup},
+};
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum Focus {
@@ -58,6 +73,8 @@ pub struct EuphRoom {
last_msg_sent: Option>,
nick_list: ListState,
+
+ mentioned: bool,
}
impl EuphRoom {
@@ -66,6 +83,7 @@ impl EuphRoom {
server_config: ServerConfig,
room_config: cove_config::EuphRoom,
vault: EuphRoomVault,
+ tz: TimeZone,
ui_event_tx: mpsc::UnboundedSender,
) -> Self {
Self {
@@ -77,9 +95,10 @@ impl EuphRoom {
focus: Focus::Chat,
state: State::Normal,
popups: VecDeque::new(),
- chat: ChatState::new(vault),
+ chat: ChatState::new(vault, tz),
last_msg_sent: None,
nick_list: ListState::new(),
+ mentioned: false,
}
}
@@ -87,8 +106,12 @@ impl EuphRoom {
self.chat.store()
}
+ fn domain(&self) -> &str {
+ &self.vault().room().domain
+ }
+
fn name(&self) -> &str {
- self.vault().room()
+ &self.vault().room().name
}
pub fn connect(&mut self, next_instance_id: &mut usize) {
@@ -97,8 +120,8 @@ impl EuphRoom {
let instance_config = self
.server_config
.clone()
- .room(self.vault().room().to_string())
- .name(format!("{room}-{}", next_instance_id))
+ .room(self.vault().room().name.clone())
+ .name(format!("{room:?}-{next_instance_id}"))
.human(true)
.username(self.room_config.username.clone())
.force_username(self.room_config.force_username)
@@ -128,7 +151,9 @@ impl EuphRoom {
}
}
- // TODO fn room_state_joined(&self) -> Option<&Joined> {}
+ pub fn room_state_joined(&self) -> Option<&Joined> {
+ self.room_state().and_then(|s| s.joined())
+ }
pub fn stopped(&self) -> bool {
self.room.as_ref().map(|r| r.stopped()).unwrap_or(true)
@@ -142,6 +167,12 @@ impl EuphRoom {
}
}
+ pub fn retrieve_mentioned(&mut self) -> bool {
+ let mentioned = self.mentioned;
+ self.mentioned = false;
+ mentioned
+ }
+
pub async fn unseen_msgs_count(&self) -> usize {
logging_unwrap!(self.vault().unseen_msgs_count().await)
}
@@ -163,9 +194,8 @@ impl EuphRoom {
}
fn stabilize_focus(&mut self) {
- match self.room_state() {
- Some(euph::State::Connected(_, conn::State::Joined(_))) => {}
- _ => self.focus = Focus::Chat, // There is no nick list to focus on
+ if self.room_state_joined().is_none() {
+ self.focus = Focus::Chat; // There is no nick list to focus on
}
}
@@ -207,17 +237,15 @@ impl EuphRoom {
let room_state = self.room.as_ref().map(|room| room.state());
let status_widget = self.status_widget(room_state).await;
- let chat = if let Some(euph::State::Connected(_, conn::State::Joined(joined))) = room_state
- {
- Self::widget_with_nick_list(
+ let chat = match room_state.and_then(|s| s.joined()) {
+ Some(joined) => Self::widget_with_nick_list(
&mut self.chat,
status_widget,
&mut self.nick_list,
joined,
self.focus,
- )
- } else {
- Self::widget_without_nick_list(&mut self.chat, status_widget)
+ ),
+ None => Self::widget_without_nick_list(&mut self.chat, status_widget),
};
let mut layers = vec![chat];
@@ -263,11 +291,16 @@ impl EuphRoom {
joined: &Joined,
focus: Focus,
) -> BoxedAsync<'a, UiError> {
- let nick_list_widget = nick_list::widget(nick_list, joined, focus == Focus::NickList)
- .padding()
- .with_right(1)
- .border()
- .desync();
+ let nick_list_widget = nick_list::widget(
+ nick_list,
+ joined,
+ focus == Focus::NickList,
+ chat.nick_emoji(),
+ )
+ .padding()
+ .with_right(1)
+ .border()
+ .desync();
let chat_widget = chat.widget(joined.session.name.clone(), focus == Focus::Chat);
@@ -282,9 +315,10 @@ impl EuphRoom {
.boxed_async()
}
- async fn status_widget(&self, state: Option<&euph::State>) -> impl Widget {
+ async fn status_widget(&self, state: Option<&euph::State>) -> impl Widget + use<> {
let room_style = Style::new().bold().blue();
- let mut info = Styled::new(format!("&{}", self.name()), room_style);
+ let mut info = Styled::new(format!("{} ", self.domain()), Style::new().grey())
+ .then(format!("&{}", self.name()), room_style);
info = match state {
None | Some(euph::State::Stopped) => info.then_plain(", archive"),
@@ -315,14 +349,21 @@ impl EuphRoom {
.then_plain(")");
}
- Text::new(info).padding().with_horizontal(1).border()
+ let title = if unseen > 0 {
+ format!("&{} ({unseen})", self.name())
+ } else {
+ format!("&{}", self.name())
+ };
+
+ Text::new(info)
+ .padding()
+ .with_horizontal(1)
+ .border()
+ .title(title)
}
async fn handle_chat_input_event(&mut self, event: &mut InputEvent<'_>, keys: &Keys) -> bool {
- let can_compose = matches!(
- self.room_state(),
- Some(euph::State::Connected(_, conn::State::Joined(_)))
- );
+ let can_compose = self.room_state_joined().is_some();
let reaction = self.chat.handle_input_event(event, keys, can_compose).await;
let reaction = logging_unwrap!(reaction);
@@ -381,18 +422,6 @@ impl EuphRoom {
_ => {}
}
- // Always applicable
- if event.matches(&keys.room.action.present) {
- let link = format!("https://plugh.de/present/{}/", self.name());
- if let Err(error) = open::that(&link) {
- self.popups.push_front(RoomPopup::Error {
- description: format!("Failed to open link: {link}"),
- reason: format!("{error}"),
- });
- }
- return true;
- }
-
false
}
@@ -442,8 +471,7 @@ impl EuphRoom {
}
if event.matches(&keys.tree.action.inspect) {
- if let Some(euph::State::Connected(_, conn::State::Joined(joined))) = self.room_state()
- {
+ if let Some(joined) = self.room_state_joined() {
if let Some(id) = self.nick_list.selected() {
if *id == joined.session.session_id {
self.state =
@@ -466,11 +494,9 @@ impl EuphRoom {
return true;
}
- if let Some(euph::State::Connected(_, conn::State::Joined(_))) = self.room_state() {
- if event.matches(&keys.general.focus) {
- self.focus = Focus::NickList;
- return true;
- }
+ if self.room_state_joined().is_some() && event.matches(&keys.general.focus) {
+ self.focus = Focus::NickList;
+ return true;
}
}
Focus::NickList => {
@@ -488,18 +514,22 @@ impl EuphRoom {
false
}
- pub async fn handle_input_event(&mut self, event: &mut InputEvent<'_>, keys: &Keys) -> bool {
+ pub async fn handle_input_event(
+ &mut self,
+ event: &mut InputEvent<'_>,
+ keys: &Keys,
+ ) -> RoomResult {
if !self.popups.is_empty() {
if event.matches(&keys.general.abort) {
self.popups.pop_back();
- return true;
+ return RoomResult::Handled;
}
// Prevent event from reaching anything below the popup
- return false;
+ return RoomResult::NotHandled;
}
let result = match &mut self.state {
- State::Normal => return self.handle_normal_input_event(event, keys).await,
+ State::Normal => return self.handle_normal_input_event(event, keys).await.into(),
State::Auth(editor) => auth::handle_input_event(event, keys, &self.room, editor),
State::Nick(editor) => nick::handle_input_event(event, keys, &self.room, editor),
State::Account(account) => account.handle_input_event(event, keys, &self.room),
@@ -510,27 +540,30 @@ impl EuphRoom {
};
match result {
- PopupResult::NotHandled => false,
- PopupResult::Handled => true,
+ PopupResult::NotHandled => RoomResult::NotHandled,
+ PopupResult::Handled => RoomResult::Handled,
PopupResult::Close => {
self.state = State::Normal;
- true
+ RoomResult::Handled
}
+ PopupResult::SwitchToRoom { name } => RoomResult::SwitchToRoom {
+ room: RoomIdentifier {
+ domain: self.vault().room().domain.clone(),
+ name,
+ },
+ },
PopupResult::ErrorOpeningLink { link, error } => {
self.popups.push_front(RoomPopup::Error {
description: format!("Failed to open link: {link}"),
reason: format!("{error}"),
});
- true
+ RoomResult::Handled
}
}
}
pub async fn handle_event(&mut self, event: Event) -> bool {
- let room = match &self.room {
- None => return false,
- Some(room) => room,
- };
+ let Some(room) = &self.room else { return false };
if event.config().name != room.instance().config().name {
// If we allowed names other than the current one, old instances
@@ -538,6 +571,35 @@ impl EuphRoom {
return false;
}
+ if let Event::Packet(
+ _,
+ ParsedPacket {
+ content: Ok(Data::SendEvent(send)),
+ ..
+ },
+ ConnSnapshot {
+ state: conn::State::Joined(joined),
+ ..
+ },
+ ) = &event
+ {
+ let normalized_name = euphoxide::nick::normalize(&joined.session.name);
+ let content = &*send.0.content;
+ for (rtype, rspan) in euph::find_spans(content) {
+ if rtype != SpanType::Mention {
+ continue;
+ }
+ let Some(mention) = content[rspan].strip_prefix('@') else {
+ continue;
+ };
+ let normalized_mention = euphoxide::nick::normalize(mention);
+ if normalized_name == normalized_mention {
+ self.mentioned = true;
+ break;
+ }
+ }
+ }
+
// We handle the packet internally first because the room event handling
// will consume it while we only need a reference.
let handled = if let Event::Packet(_, packet, _) = &event {
@@ -629,3 +691,18 @@ impl EuphRoom {
true
}
}
+
+pub enum RoomResult {
+ NotHandled,
+ Handled,
+ SwitchToRoom { room: RoomIdentifier },
+}
+
+impl From for RoomResult {
+ fn from(value: bool) -> Self {
+ match value {
+ true => Self::Handled,
+ false => Self::NotHandled,
+ }
+ }
+}
diff --git a/cove/src/ui/key_bindings.rs b/cove/src/ui/key_bindings.rs
index 679c929..daedc16 100644
--- a/cove/src/ui/key_bindings.rs
+++ b/cove/src/ui/key_bindings.rs
@@ -5,11 +5,15 @@ use std::convert::Infallible;
use cove_config::{Config, Keys};
use cove_input::{InputEvent, KeyBinding, KeyBindingInfo, KeyGroupInfo};
use crossterm::style::Stylize;
-use toss::widgets::{Either2, Join2, Padding, Text};
-use toss::{Style, Styled, Widget, WidgetExt};
+use toss::{
+ Style, Styled, Widget, WidgetExt,
+ widgets::{Either2, Join2, Padding, Text},
+};
-use super::widgets::{ListBuilder, ListState, Popup};
-use super::{util, UiError};
+use super::{
+ UiError, util,
+ widgets::{ListBuilder, ListState, Popup},
+};
type Line = Either2, Text>>;
type Builder = ListBuilder<'static, Infallible, Line>;
@@ -69,7 +73,7 @@ fn render_group_info(builder: &mut Builder, group_info: KeyGroupInfo<'_>) {
pub fn widget<'a>(
list: &'a mut ListState,
config: &Config,
-) -> impl Widget + 'a {
+) -> impl Widget + use<'a> {
let mut list_builder = ListBuilder::new();
for group_info in config.keys.groups() {
@@ -79,7 +83,23 @@ pub fn widget<'a>(
render_group_info(&mut list_builder, group_info);
}
- Popup::new(list_builder.build(list), "Key bindings")
+ let scroll_info_style = Style::new().grey().italic();
+ let scroll_info = Styled::new("(Scroll with ", scroll_info_style)
+ .and_then(format_binding(&config.keys.cursor.down))
+ .then(" and ", scroll_info_style)
+ .and_then(format_binding(&config.keys.cursor.up))
+ .then(")", scroll_info_style);
+
+ let inner = Join2::vertical(
+ list_builder.build(list).segment(),
+ Text::new(scroll_info)
+ .float()
+ .with_center_h()
+ .segment()
+ .with_growing(false),
+ );
+
+ Popup::new(inner, "Key bindings")
}
pub fn handle_input_event(
diff --git a/cove/src/ui/rooms.rs b/cove/src/ui/rooms.rs
index 3dfc7e1..c3d6a40 100644
--- a/cove/src/ui/rooms.rs
+++ b/cove/src/ui/rooms.rs
@@ -1,30 +1,52 @@
-use std::collections::{HashMap, HashSet};
-use std::iter;
-use std::sync::{Arc, Mutex};
+use std::{
+ collections::{HashMap, HashSet, hash_map::Entry},
+ iter,
+ sync::{Arc, Mutex},
+ time::Duration,
+};
use cove_config::{Config, Keys, RoomsSortOrder};
use cove_input::InputEvent;
use crossterm::style::Stylize;
-use euphoxide::api::SessionType;
-use euphoxide::bot::instance::{Event, ServerConfig};
-use euphoxide::conn::{self, Joined};
+use euphoxide::{
+ api::SessionType,
+ bot::instance::{Event, ServerConfig},
+ conn::{self, Joined},
+};
+use jiff::tz::TimeZone;
use tokio::sync::mpsc;
-use toss::widgets::{BoxedAsync, EditorState, Empty, Join2, Text};
-use toss::{Style, Styled, Widget, WidgetExt};
+use toss::{
+ Style, Styled, Widget, WidgetExt,
+ widgets::{BellState, BoxedAsync, Empty, Join2, Text},
+};
-use crate::euph;
-use crate::macros::logging_unwrap;
-use crate::vault::Vault;
+use crate::{
+ euph,
+ macros::logging_unwrap,
+ vault::{EuphVault, RoomIdentifier, Vault},
+ version::{NAME, VERSION},
+};
-use super::euph::room::EuphRoom;
-use super::widgets::{ListBuilder, ListState, Popup};
-use super::{key_bindings, util, UiError, UiEvent};
+use super::{
+ UiError, UiEvent,
+ euph::room::{EuphRoom, RoomResult},
+ key_bindings, util,
+ widgets::{ListBuilder, ListState},
+};
+
+use self::{
+ connect::{ConnectResult, ConnectState},
+ delete::{DeleteResult, DeleteState},
+};
+
+mod connect;
+mod delete;
enum State {
ShowList,
- ShowRoom(String),
- Connect(EditorState),
- Delete(String, EditorState),
+ ShowRoom(RoomIdentifier),
+ Connect(ConnectState),
+ Delete(DeleteState),
}
#[derive(Clone, Copy)]
@@ -42,47 +64,70 @@ impl Order {
}
}
+struct EuphServer {
+ config: ServerConfig,
+ next_instance_id: usize,
+}
+
+impl EuphServer {
+ async fn new(vault: &EuphVault, domain: String) -> Self {
+ let cookies = logging_unwrap!(vault.cookies(domain.clone()).await);
+ let config = ServerConfig::default()
+ .domain(domain)
+ .cookies(Arc::new(Mutex::new(cookies)))
+ .timeout(Duration::from_secs(10));
+
+ Self {
+ config,
+ next_instance_id: 0,
+ }
+ }
+}
+
pub struct Rooms {
config: &'static Config,
+ tz: TimeZone,
vault: Vault,
ui_event_tx: mpsc::UnboundedSender,
state: State,
- list: ListState,
+ list: ListState,
order: Order,
+ bell: BellState,
- euph_server_config: ServerConfig,
- euph_next_instance_id: usize,
- euph_rooms: HashMap,
+ euph_servers: HashMap,
+ euph_rooms: HashMap,
}
impl Rooms {
pub async fn new(
config: &'static Config,
+ tz: TimeZone,
vault: Vault,
ui_event_tx: mpsc::UnboundedSender,
) -> Self {
- let cookies = logging_unwrap!(vault.euph().cookies().await);
- let euph_server_config = ServerConfig::default().cookies(Arc::new(Mutex::new(cookies)));
-
let mut result = Self {
config,
+ tz,
vault,
ui_event_tx,
state: State::ShowList,
list: ListState::new(),
order: Order::from_rooms_sort_order(config.rooms_sort_order),
- euph_server_config,
- euph_next_instance_id: 0,
+ bell: BellState::new(),
+ euph_servers: HashMap::new(),
euph_rooms: HashMap::new(),
};
if !config.offline {
- for (name, config) in &config.euph.rooms {
- if config.autojoin {
- result.connect_to_room(name.clone());
+ for (domain, server) in &config.euph.servers {
+ for (name, room) in &server.rooms {
+ if room.autojoin {
+ let id = RoomIdentifier::new(domain.clone(), name.clone());
+ result.connect_to_room(id).await;
+ }
}
}
}
@@ -90,39 +135,68 @@ impl Rooms {
result
}
- fn get_or_insert_room(&mut self, name: String) -> &mut EuphRoom {
- self.euph_rooms.entry(name.clone()).or_insert_with(|| {
+ async fn get_or_insert_server<'a>(
+ vault: &Vault,
+ euph_servers: &'a mut HashMap,
+ domain: String,
+ ) -> &'a mut EuphServer {
+ match euph_servers.entry(domain.clone()) {
+ Entry::Occupied(entry) => entry.into_mut(),
+ Entry::Vacant(entry) => {
+ let server = EuphServer::new(&vault.euph(), domain).await;
+ entry.insert(server)
+ }
+ }
+ }
+
+ async fn get_or_insert_room(&mut self, room: RoomIdentifier) -> &mut EuphRoom {
+ let server =
+ Self::get_or_insert_server(&self.vault, &mut self.euph_servers, room.domain.clone())
+ .await;
+
+ self.euph_rooms.entry(room.clone()).or_insert_with(|| {
EuphRoom::new(
self.config,
- self.euph_server_config.clone(),
- self.config.euph_room(&name),
- self.vault.euph().room(name),
+ server.config.clone(),
+ self.config.euph_room(&room.domain, &room.name),
+ self.vault.euph().room(room),
+ self.tz.clone(),
self.ui_event_tx.clone(),
)
})
}
- fn connect_to_room(&mut self, name: String) {
- let room = self.euph_rooms.entry(name.clone()).or_insert_with(|| {
+ async fn connect_to_room(&mut self, room: RoomIdentifier) {
+ let server =
+ Self::get_or_insert_server(&self.vault, &mut self.euph_servers, room.domain.clone())
+ .await;
+
+ let room = self.euph_rooms.entry(room.clone()).or_insert_with(|| {
EuphRoom::new(
self.config,
- self.euph_server_config.clone(),
- self.config.euph_room(&name),
- self.vault.euph().room(name),
+ server.config.clone(),
+ self.config.euph_room(&room.domain, &room.name),
+ self.vault.euph().room(room),
+ self.tz.clone(),
self.ui_event_tx.clone(),
)
});
- room.connect(&mut self.euph_next_instance_id);
+
+ room.connect(&mut server.next_instance_id);
}
- fn connect_to_all_rooms(&mut self) {
- for room in self.euph_rooms.values_mut() {
- room.connect(&mut self.euph_next_instance_id);
+ async fn connect_to_all_rooms(&mut self) {
+ for (id, room) in &mut self.euph_rooms {
+ let server =
+ Self::get_or_insert_server(&self.vault, &mut self.euph_servers, id.domain.clone())
+ .await;
+
+ room.connect(&mut server.next_instance_id);
}
}
- fn disconnect_from_room(&mut self, name: &str) {
- if let Some(room) = self.euph_rooms.get_mut(name) {
+ fn disconnect_from_room(&mut self, room: &RoomIdentifier) {
+ if let Some(room) = self.euph_rooms.get_mut(room) {
room.disconnect();
}
}
@@ -142,10 +216,21 @@ impl Rooms {
/// - rooms that were deleted from the db.
async fn stabilize_rooms(&mut self) {
// Collect all rooms from the db and config file
- let rooms = logging_unwrap!(self.vault.euph().rooms().await);
- let mut rooms_set = rooms
+ let rooms_from_db = logging_unwrap!(self.vault.euph().rooms().await);
+ let rooms_from_config = self
+ .config
+ .euph
+ .servers
+ .iter()
+ .flat_map(|(domain, server)| {
+ server
+ .rooms
+ .keys()
+ .map(|name| RoomIdentifier::new(domain.clone(), name.clone()))
+ });
+ let mut rooms_set = rooms_from_db
.into_iter()
- .chain(self.config.euph.rooms.keys().cloned())
+ .chain(rooms_from_config)
.collect::>();
// Prevent room that is currently being shown from being removed. This
@@ -161,7 +246,9 @@ impl Rooms {
.retain(|n, r| !r.stopped() || rooms_set.contains(n));
for room in rooms_set {
- self.get_or_insert_room(room).retain();
+ let room = self.get_or_insert_room(room).await;
+ room.retain();
+ self.bell.ring |= room.retrieve_mentioned();
}
}
@@ -171,96 +258,58 @@ impl Rooms {
_ => self.stabilize_rooms().await,
}
- match &mut self.state {
- State::ShowList => {
- Self::rooms_widget(self.config, &mut self.list, self.order, &self.euph_rooms)
- .await
- .desync()
- .boxed_async()
- }
+ let widget = match &mut self.state {
+ State::ShowList => Self::rooms_widget(
+ &self.vault,
+ self.config,
+ &mut self.list,
+ self.order,
+ &self.euph_rooms,
+ )
+ .await
+ .desync()
+ .boxed_async(),
- State::ShowRoom(name) => {
+ State::ShowRoom(id) => {
self.euph_rooms
- .get_mut(name)
+ .get_mut(id)
.expect("room exists after stabilization")
.widget()
.await
}
- State::Connect(editor) => {
- Self::rooms_widget(self.config, &mut self.list, self.order, &self.euph_rooms)
- .await
- .below(Self::new_room_widget(editor))
- .desync()
- .boxed_async()
- }
+ State::Connect(connect) => Self::rooms_widget(
+ &self.vault,
+ self.config,
+ &mut self.list,
+ self.order,
+ &self.euph_rooms,
+ )
+ .await
+ .below(connect.widget())
+ .desync()
+ .boxed_async(),
- State::Delete(name, editor) => {
- Self::rooms_widget(self.config, &mut self.list, self.order, &self.euph_rooms)
- .await
- .below(Self::delete_room_widget(name, editor))
- .desync()
- .boxed_async()
- }
+ State::Delete(delete) => Self::rooms_widget(
+ &self.vault,
+ self.config,
+ &mut self.list,
+ self.order,
+ &self.euph_rooms,
+ )
+ .await
+ .below(delete.widget())
+ .desync()
+ .boxed_async(),
+ };
+
+ if self.config.bell_on_mention {
+ widget.above(self.bell.widget().desync()).boxed_async()
+ } else {
+ widget
}
}
- fn new_room_widget(editor: &mut EditorState) -> impl Widget + '_ {
- let room_style = Style::new().bold().blue();
-
- let inner = Join2::horizontal(
- Text::new(("&", room_style)).segment().with_fixed(true),
- editor
- .widget()
- .with_highlight(|s| Styled::new(s, room_style))
- .segment(),
- );
-
- Popup::new(inner, "Connect to")
- }
-
- fn delete_room_widget<'a>(
- name: &str,
- editor: &'a mut EditorState,
- ) -> impl Widget + 'a {
- let warn_style = Style::new().bold().red();
- let room_style = Style::new().bold().blue();
- let text = Styled::new_plain("Are you sure you want to delete ")
- .then("&", room_style)
- .then(name, room_style)
- .then_plain("?\n\n")
- .then_plain("This will delete the entire room history from your vault. ")
- .then_plain("To shrink your vault afterwards, run ")
- .then("cove gc", Style::new().italic().grey())
- .then_plain(".\n\n")
- .then_plain("To confirm the deletion, ")
- .then_plain("enter the full name of the room and press enter:");
-
- let inner = Join2::vertical(
- // The Join prevents the text from filling up the entire available
- // space if the editor is wider than the text.
- Join2::horizontal(
- Text::new(text)
- .resize()
- .with_max_width(54)
- .segment()
- .with_growing(false),
- Empty::new().segment(),
- )
- .segment(),
- Join2::horizontal(
- Text::new(("&", room_style)).segment().with_fixed(true),
- editor
- .widget()
- .with_highlight(|s| Styled::new(s, room_style))
- .segment(),
- )
- .segment(),
- );
-
- Popup::new(inner, "Delete room").with_border_style(warn_style)
- }
-
fn format_pbln(joined: &Joined) -> String {
let mut p = 0_usize;
let mut b = 0_usize;
@@ -345,48 +394,45 @@ impl Rooms {
}
}
- fn sort_rooms(rooms: &mut [(&String, Option<&euph::State>, usize)], order: Order) {
+ fn sort_rooms(rooms: &mut [(&RoomIdentifier, Option<&euph::State>, usize)], order: Order) {
match order {
- Order::Alphabet => rooms.sort_unstable_by_key(|(name, _, _)| *name),
- Order::Importance => rooms.sort_unstable_by_key(|(name, state, unseen)| {
- (state.is_none(), *unseen == 0, *name)
- }),
+ Order::Alphabet => rooms.sort_unstable_by_key(|(id, _, _)| *id),
+ Order::Importance => rooms
+ .sort_unstable_by_key(|(id, state, unseen)| (state.is_none(), *unseen == 0, *id)),
}
}
async fn render_rows(
- config: &Config,
- list_builder: &mut ListBuilder<'_, String, Text>,
+ list_builder: &mut ListBuilder<'_, RoomIdentifier, Text>,
order: Order,
- euph_rooms: &HashMap,
+ euph_rooms: &HashMap,
) {
- if euph_rooms.is_empty() {
- let style = Style::new().grey().italic();
- list_builder.add_unsel(Text::new(
- Styled::new("Press ", style)
- .and_then(key_bindings::format_binding(&config.keys.general.help))
- .then(" for key bindings", style),
- ));
- }
-
let mut rooms = vec![];
- for (name, room) in euph_rooms {
+ for (id, room) in euph_rooms {
let state = room.room_state();
let unseen = room.unseen_msgs_count().await;
- rooms.push((name, state, unseen));
+ rooms.push((id, state, unseen));
}
Self::sort_rooms(&mut rooms, order);
- for (name, state, unseen) in rooms {
- let name = name.clone();
+ for (id, state, unseen) in rooms {
+ let id = id.clone();
let info = Self::format_room_info(state, unseen);
- list_builder.add_sel(name.clone(), move |selected| {
- let style = if selected {
+ list_builder.add_sel(id.clone(), move |selected| {
+ let domain_style = if selected {
+ Style::new().black().on_white()
+ } else {
+ Style::new().grey()
+ };
+
+ let room_style = if selected {
Style::new().bold().black().on_white()
} else {
Style::new().bold().blue()
};
- let text = Styled::new(format!("&{name}"), style).and_then(info);
+ let text = Styled::new(format!("{} ", id.domain), domain_style)
+ .then(format!("&{}", id.name), room_style)
+ .and_then(info);
Text::new(text)
});
@@ -394,29 +440,66 @@ impl Rooms {
}
async fn rooms_widget<'a>(
+ vault: &Vault,
config: &Config,
- list: &'a mut ListState,
+ list: &'a mut ListState,
order: Order,
- euph_rooms: &HashMap,
- ) -> impl Widget + 'a {
- let heading_style = Style::new().bold();
- let heading_text =
- Styled::new("Rooms", heading_style).then_plain(format!(" ({})", euph_rooms.len()));
+ euph_rooms: &HashMap,
+ ) -> impl Widget + use<'a> {
+ let version_info = Styled::new_plain("Welcome to ")
+ .then(format!("{NAME} {VERSION}"), Style::new().yellow().bold())
+ .then_plain("!");
+ let help_info = Styled::new("Press ", Style::new().grey())
+ .and_then(key_bindings::format_binding(&config.keys.general.help))
+ .then(" for key bindings.", Style::new().grey());
+ let info = Join2::vertical(
+ Text::new(version_info).float().with_center_h().segment(),
+ Text::new(help_info).segment(),
+ )
+ .padding()
+ .with_horizontal(1)
+ .border();
+
+ let mut heading = Styled::new("Rooms", Style::new().bold());
+ let mut title = "Rooms".to_string();
+
+ let total_rooms = euph_rooms.len();
+ let connected_rooms = euph_rooms
+ .iter()
+ .filter(|r| r.1.room_state().is_some())
+ .count();
+ let total_unseen = logging_unwrap!(vault.euph().total_unseen_msgs_count().await);
+ if total_unseen > 0 {
+ heading = heading
+ .then_plain(format!(" ({connected_rooms}/{total_rooms}, "))
+ .then(format!("{total_unseen}"), Style::new().bold().green())
+ .then_plain(")");
+ title.push_str(&format!(" ({total_unseen})"));
+ } else {
+ heading = heading.then_plain(format!(" ({connected_rooms}/{total_rooms})"))
+ }
let mut list_builder = ListBuilder::new();
- Self::render_rows(config, &mut list_builder, order, euph_rooms).await;
+ Self::render_rows(&mut list_builder, order, euph_rooms).await;
- Join2::vertical(
- Text::new(heading_text).segment().with_fixed(true),
- list_builder.build(list).segment(),
+ Join2::horizontal(
+ Join2::vertical(
+ Text::new(heading).segment().with_fixed(true),
+ list_builder.build(list).segment(),
+ )
+ .segment(),
+ Join2::vertical(info.segment().with_growing(false), Empty::new().segment())
+ .segment()
+ .with_growing(false),
)
+ .title(title)
}
- fn room_char(c: char) -> bool {
- c.is_ascii_alphanumeric() || c == '_'
- }
-
- fn handle_showlist_input_event(&mut self, event: &mut InputEvent<'_>, keys: &Keys) -> bool {
+ async fn handle_showlist_input_event(
+ &mut self,
+ event: &mut InputEvent<'_>,
+ keys: &Keys,
+ ) -> bool {
// Open room
if event.matches(&keys.general.confirm) {
if let Some(name) = self.list.selected() {
@@ -433,17 +516,17 @@ impl Rooms {
// Room actions
if event.matches(&keys.rooms.action.connect) {
if let Some(name) = self.list.selected() {
- self.connect_to_room(name.clone());
+ self.connect_to_room(name.clone()).await;
}
return true;
}
if event.matches(&keys.rooms.action.connect_all) {
- self.connect_to_all_rooms();
+ self.connect_to_all_rooms().await;
return true;
}
if event.matches(&keys.rooms.action.disconnect) {
- if let Some(name) = self.list.selected() {
- self.disconnect_from_room(&name.clone());
+ if let Some(room) = self.list.selected() {
+ self.disconnect_from_room(&room.clone());
}
return true;
}
@@ -452,22 +535,20 @@ impl Rooms {
return true;
}
if event.matches(&keys.rooms.action.connect_autojoin) {
- for (name, options) in &self.config.euph.rooms {
- if options.autojoin {
- self.connect_to_room(name.clone());
+ for (domain, server) in &self.config.euph.servers {
+ for (name, room) in &server.rooms {
+ if !room.autojoin {
+ continue;
+ }
+ let id = RoomIdentifier::new(domain.clone(), name.clone());
+ self.connect_to_room(id).await;
}
}
return true;
}
if event.matches(&keys.rooms.action.disconnect_non_autojoin) {
- for (name, room) in &mut self.euph_rooms {
- let autojoin = self
- .config
- .euph
- .rooms
- .get(name)
- .map(|r| r.autojoin)
- .unwrap_or(false);
+ for (id, room) in &mut self.euph_rooms {
+ let autojoin = self.config.euph_room(&id.domain, &id.name).autojoin;
if !autojoin {
room.disconnect();
}
@@ -475,12 +556,12 @@ impl Rooms {
return true;
}
if event.matches(&keys.rooms.action.new) {
- self.state = State::Connect(EditorState::new());
+ self.state = State::Connect(ConnectState::new());
return true;
}
if event.matches(&keys.rooms.action.delete) {
- if let Some(name) = self.list.selected() {
- self.state = State::Delete(name.clone(), EditorState::new());
+ if let Some(room) = self.list.selected() {
+ self.state = State::Delete(DeleteState::new(room.clone()));
}
return true;
}
@@ -500,14 +581,21 @@ impl Rooms {
match &mut self.state {
State::ShowList => {
- if self.handle_showlist_input_event(event, keys) {
+ if self.handle_showlist_input_event(event, keys).await {
return true;
}
}
State::ShowRoom(name) => {
if let Some(room) = self.euph_rooms.get_mut(name) {
- if room.handle_input_event(event, keys).await {
- return true;
+ match room.handle_input_event(event, keys).await {
+ RoomResult::NotHandled => {}
+ RoomResult::Handled => return true,
+ RoomResult::SwitchToRoom { room } => {
+ self.list.move_cursor_to_id(&room);
+ self.connect_to_room(room.clone()).await;
+ self.state = State::ShowRoom(room);
+ return true;
+ }
}
if event.matches(&keys.general.abort) {
self.state = State::ShowList;
@@ -515,53 +603,54 @@ impl Rooms {
}
}
}
- State::Connect(editor) => {
- if event.matches(&keys.general.abort) {
+ State::Connect(connect) => match connect.handle_input_event(event, keys) {
+ ConnectResult::Close => {
self.state = State::ShowList;
return true;
}
- if event.matches(&keys.general.confirm) {
- let name = editor.text().to_string();
- if !name.is_empty() {
- self.connect_to_room(name.clone());
- self.state = State::ShowRoom(name);
- }
+ ConnectResult::Connect(room) => {
+ self.list.move_cursor_to_id(&room);
+ self.connect_to_room(room.clone()).await;
+ self.state = State::ShowRoom(room);
return true;
}
- if util::handle_editor_input_event(editor, event, keys, Self::room_char) {
+ ConnectResult::Handled => {
return true;
}
- }
- State::Delete(name, editor) => {
- if event.matches(&keys.general.abort) {
+ ConnectResult::Unhandled => {}
+ },
+ State::Delete(delete) => match delete.handle_input_event(event, keys) {
+ DeleteResult::Close => {
self.state = State::ShowList;
return true;
}
- if event.matches(&keys.general.confirm) {
- self.euph_rooms.remove(name);
- logging_unwrap!(self.vault.euph().room(name.clone()).delete().await);
+ DeleteResult::Delete(room) => {
+ self.euph_rooms.remove(&room);
+ logging_unwrap!(self.vault.euph().room(room).delete().await);
self.state = State::ShowList;
return true;
}
- if util::handle_editor_input_event(editor, event, keys, Self::room_char) {
+ DeleteResult::Handled => {
return true;
}
- }
+ DeleteResult::Unhandled => {}
+ },
}
false
}
pub async fn handle_euph_event(&mut self, event: Event) -> bool {
- let room_name = event.config().room.clone();
- let Some(room) = self.euph_rooms.get_mut(&room_name) else {
+ let config = event.config();
+ let room_id = RoomIdentifier::new(config.server.domain.clone(), config.room.clone());
+ let Some(room) = self.euph_rooms.get_mut(&room_id) else {
return false;
};
let handled = room.handle_event(event).await;
let room_visible = match &self.state {
- State::ShowRoom(name) => *name == room_name,
+ State::ShowRoom(id) => *id == room_id,
_ => true,
};
handled && room_visible
diff --git a/cove/src/ui/rooms/connect.rs b/cove/src/ui/rooms/connect.rs
new file mode 100644
index 0000000..83a359e
--- /dev/null
+++ b/cove/src/ui/rooms/connect.rs
@@ -0,0 +1,123 @@
+use cove_config::Keys;
+use cove_input::InputEvent;
+use crossterm::style::Stylize;
+use toss::{
+ Style, Styled, Widget, WidgetExt,
+ widgets::{EditorState, Empty, Join2, Join3, Text},
+};
+
+use crate::{
+ ui::{UiError, util, widgets::Popup},
+ vault::RoomIdentifier,
+};
+
+#[derive(Clone, Copy, PartialEq, Eq)]
+enum Focus {
+ Name,
+ Domain,
+}
+
+impl Focus {
+ fn advance(self) -> Self {
+ match self {
+ Self::Name => Self::Domain,
+ Self::Domain => Self::Name,
+ }
+ }
+}
+
+pub struct ConnectState {
+ focus: Focus,
+ name: EditorState,
+ domain: EditorState,
+}
+
+pub enum ConnectResult {
+ Close,
+ Connect(RoomIdentifier),
+ Handled,
+ Unhandled,
+}
+
+impl ConnectState {
+ pub fn new() -> Self {
+ Self {
+ focus: Focus::Name,
+ name: EditorState::new(),
+ domain: EditorState::with_initial_text("euphoria.leet.nu".to_string()),
+ }
+ }
+
+ pub fn handle_input_event(&mut self, event: &mut InputEvent<'_>, keys: &Keys) -> ConnectResult {
+ if event.matches(&keys.general.abort) {
+ return ConnectResult::Close;
+ }
+
+ if event.matches(&keys.general.focus) {
+ self.focus = self.focus.advance();
+ return ConnectResult::Handled;
+ }
+
+ if event.matches(&keys.general.confirm) {
+ let id = RoomIdentifier {
+ domain: self.domain.text().to_string(),
+ name: self.name.text().to_string(),
+ };
+ if !id.domain.is_empty() && !id.name.is_empty() {
+ return ConnectResult::Connect(id);
+ }
+ }
+
+ let handled = match self.focus {
+ Focus::Name => {
+ util::handle_editor_input_event(&mut self.name, event, keys, util::is_room_char)
+ }
+ Focus::Domain => {
+ util::handle_editor_input_event(&mut self.domain, event, keys, |c| c != '\n')
+ }
+ };
+
+ if handled {
+ return ConnectResult::Handled;
+ }
+
+ ConnectResult::Unhandled
+ }
+
+ pub fn widget(&mut self) -> impl Widget {
+ let room_style = Style::new().bold().blue();
+ let domain_style = Style::new().grey();
+
+ let name = Join2::horizontal(
+ Text::new(Styled::new_plain("Room: ").then("&", room_style))
+ .with_wrap(false)
+ .segment()
+ .with_fixed(true),
+ self.name
+ .widget()
+ .with_highlight(|s| Styled::new(s, room_style))
+ .with_focus(self.focus == Focus::Name)
+ .segment(),
+ );
+
+ let domain = Join3::horizontal(
+ Text::new("Domain:")
+ .with_wrap(false)
+ .segment()
+ .with_fixed(true),
+ Empty::new().with_width(1).segment().with_fixed(true),
+ self.domain
+ .widget()
+ .with_highlight(|s| Styled::new(s, domain_style))
+ .with_focus(self.focus == Focus::Domain)
+ .segment(),
+ );
+
+ let inner = Join2::vertical(
+ name.segment().with_fixed(true),
+ domain.segment().with_fixed(true),
+ );
+
+ Popup::new(inner, "Connect to")
+ }
+}
diff --git a/cove/src/ui/rooms/delete.rs b/cove/src/ui/rooms/delete.rs
new file mode 100644
index 0000000..baa96b1
--- /dev/null
+++ b/cove/src/ui/rooms/delete.rs
@@ -0,0 +1,90 @@
+use cove_config::Keys;
+use cove_input::InputEvent;
+use crossterm::style::Stylize;
+use toss::{
+ Style, Styled, Widget, WidgetExt,
+ widgets::{EditorState, Empty, Join2, Text},
+};
+
+use crate::{
+ ui::{UiError, util, widgets::Popup},
+ vault::RoomIdentifier,
+};
+
+pub struct DeleteState {
+ id: RoomIdentifier,
+ name: EditorState,
+}
+
+pub enum DeleteResult {
+ Close,
+ Delete(RoomIdentifier),
+ Handled,
+ Unhandled,
+}
+
+impl DeleteState {
+ pub fn new(id: RoomIdentifier) -> Self {
+ Self {
+ id,
+ name: EditorState::new(),
+ }
+ }
+
+ pub fn handle_input_event(&mut self, event: &mut InputEvent<'_>, keys: &Keys) -> DeleteResult {
+ if event.matches(&keys.general.abort) {
+ return DeleteResult::Close;
+ }
+
+ if event.matches(&keys.general.confirm) && self.name.text() == self.id.name {
+ return DeleteResult::Delete(self.id.clone());
+ }
+
+ if util::handle_editor_input_event(&mut self.name, event, keys, util::is_room_char) {
+ return DeleteResult::Handled;
+ }
+
+ DeleteResult::Unhandled
+ }
+
+ pub fn widget(&mut self) -> impl Widget {
+ let warn_style = Style::new().bold().red();
+ let room_style = Style::new().bold().blue();
+ let text = Styled::new_plain("Are you sure you want to delete ")
+ .then("&", room_style)
+ .then(&self.id.name, room_style)
+ .then_plain(" on the ")
+ .then(&self.id.domain, Style::new().grey())
+ .then_plain(" server?\n\n")
+ .then_plain("This will delete the entire room history from your vault. ")
+ .then_plain("To shrink your vault afterwards, run ")
+ .then("cove gc", Style::new().italic().grey())
+ .then_plain(".\n\n")
+ .then_plain("To confirm the deletion, ")
+ .then_plain("enter the full name of the room and press enter:");
+
+ let inner = Join2::vertical(
+ // The Join prevents the text from filling up the entire available
+ // space if the editor is wider than the text.
+ Join2::horizontal(
+ Text::new(text)
+ .resize()
+ .with_max_width(54)
+ .segment()
+ .with_growing(false),
+ Empty::new().segment(),
+ )
+ .segment(),
+ Join2::horizontal(
+ Text::new(("&", room_style)).segment().with_fixed(true),
+ self.name
+ .widget()
+ .with_highlight(|s| Styled::new(s, room_style))
+ .segment(),
+ )
+ .segment(),
+ );
+
+ Popup::new(inner, "Delete room").with_border_style(warn_style)
+ }
+}
diff --git a/cove/src/ui/util.rs b/cove/src/ui/util.rs
index fa434fe..b358588 100644
--- a/cove/src/ui/util.rs
+++ b/cove/src/ui/util.rs
@@ -5,6 +5,11 @@ use toss::widgets::EditorState;
use super::widgets::ListState;
+/// Test if a character is allowed to be typed in a room name.
+pub fn is_room_char(c: char) -> bool {
+ c.is_ascii_alphanumeric() || c == '_'
+}
+
//////////
// List //
//////////
diff --git a/cove/src/ui/widgets.rs b/cove/src/ui/widgets.rs
index aed063a..c00d26e 100644
--- a/cove/src/ui/widgets.rs
+++ b/cove/src/ui/widgets.rs
@@ -1,5 +1,5 @@
-mod list;
-mod popup;
-
pub use self::list::*;
pub use self::popup::*;
+
+mod list;
+mod popup;
diff --git a/cove/src/ui/widgets/list.rs b/cove/src/ui/widgets/list.rs
index bb27540..3d7c6c8 100644
--- a/cove/src/ui/widgets/list.rs
+++ b/cove/src/ui/widgets/list.rs
@@ -239,6 +239,12 @@ impl ListState {
})
}
+ pub fn move_cursor_to_id(&mut self, id: &Id) {
+ if let Some(new_cursor) = self.selectable_of_id(id) {
+ self.move_cursor_to(new_cursor);
+ }
+ }
+
fn fix_cursor(&mut self) {
let new_cursor = if let Some(cursor) = &self.cursor {
self.selectable_of_id(&cursor.id)
diff --git a/cove/src/ui/widgets/popup.rs b/cove/src/ui/widgets/popup.rs
index 40b41cb..559e283 100644
--- a/cove/src/ui/widgets/popup.rs
+++ b/cove/src/ui/widgets/popup.rs
@@ -1,5 +1,7 @@
-use toss::widgets::{Background, Border, Desync, Float, Layer2, Padding, Text};
-use toss::{Frame, Size, Style, Styled, Widget, WidgetExt, WidthDb};
+use toss::{
+ Frame, Size, Style, Styled, Widget, WidgetExt, WidthDb,
+ widgets::{Background, Border, Desync, Float, Layer2, Padding, Text},
+};
type Body = Background>>;
type Title = Float>>>;
diff --git a/cove/src/util.rs b/cove/src/util.rs
index b6e7c97..c6a572c 100644
--- a/cove/src/util.rs
+++ b/cove/src/util.rs
@@ -1,4 +1,6 @@
-use std::convert::Infallible;
+use std::{convert::Infallible, env};
+
+use jiff::tz::TimeZone;
pub trait InfallibleExt {
type Inner;
@@ -13,3 +15,56 @@ impl InfallibleExt for Result {
self.expect("infallible")
}
}
+
+/// Load a [`TimeZone`] specified by the `TZ` environment varible, or by the
+/// provided string if the environment variable does not exist.
+///
+/// If a string is provided, it is interpreted in the same format that the `TZ`
+/// environment variable uses.
+///
+/// If no `TZ` environment variable could be found and no string is provided,
+/// the system local time (or UTC on Windows) is used.
+pub fn load_time_zone(tz_string: Option<&str>) -> Result {
+ let env_string = env::var("TZ").ok();
+ let tz_string = env_string.as_ref().map(|s| s as &str).or(tz_string);
+
+ let Some(tz_string) = tz_string else {
+ return Ok(TimeZone::system());
+ };
+
+ if tz_string == "localtime" {
+ return Ok(TimeZone::system());
+ }
+
+ if let Some(tz_string) = tz_string.strip_prefix(':') {
+ return TimeZone::get(tz_string);
+ }
+
+ // The time zone is either a manually specified string or a file in the tz
+ // database. We'll try to parse it as a manually specified string first
+ // because that doesn't require a fs lookup.
+ if let Ok(tz) = TimeZone::posix(tz_string) {
+ return Ok(tz);
+ }
+
+ TimeZone::get(tz_string)
+}
+
+pub fn caesar(text: &str, by: i8) -> String {
+ let by = by.rem_euclid(26) as u8;
+ text.chars()
+ .map(|c| {
+ if c.is_ascii_lowercase() {
+ let c = c as u8 - b'a';
+ let c = (c + by) % 26;
+ (c + b'a') as char
+ } else if c.is_ascii_uppercase() {
+ let c = c as u8 - b'A';
+ let c = (c + by) % 26;
+ (c + b'A') as char
+ } else {
+ c
+ }
+ })
+ .collect()
+}
diff --git a/cove/src/vault.rs b/cove/src/vault.rs
index 921ad4d..05bd1a5 100644
--- a/cove/src/vault.rs
+++ b/cove/src/vault.rs
@@ -1,16 +1,14 @@
+use std::{fs, path::Path};
+
+use rusqlite::Connection;
+use vault::{Action, tokio::TokioVault};
+
+pub use self::euph::{EuphRoomVault, EuphVault, RoomIdentifier};
+
mod euph;
mod migrate;
mod prepare;
-use std::fs;
-use std::path::Path;
-
-use rusqlite::Connection;
-use vault::tokio::TokioVault;
-use vault::Action;
-
-pub use self::euph::{EuphRoomVault, EuphVault};
-
#[derive(Debug, Clone)]
pub struct Vault {
tokio_vault: TokioVault,
@@ -50,8 +48,6 @@ fn launch_from_connection(conn: Connection, ephemeral: bool) -> rusqlite::Result
conn.pragma_update(None, "foreign_keys", true)?;
conn.pragma_update(None, "trusted_schema", false)?;
- eprintln!("Opening vault");
-
let tokio_vault = TokioVault::launch_and_prepare(conn, &migrate::MIGRATIONS, prepare::prepare)?;
Ok(Vault {
tokio_vault,
diff --git a/cove/src/vault/euph.rs b/cove/src/vault/euph.rs
index e9f363e..4a4109e 100644
--- a/cove/src/vault/euph.rs
+++ b/cove/src/vault/euph.rs
@@ -1,27 +1,25 @@
-use std::mem;
-use std::str::FromStr;
+use std::{fmt, mem, str::FromStr};
use async_trait::async_trait;
use cookie::{Cookie, CookieJar};
use euphoxide::api::{Message, MessageId, SessionId, SessionView, Snowflake, Time, UserId};
-use rusqlite::types::{FromSql, FromSqlError, ToSqlOutput, Value, ValueRef};
-use rusqlite::{named_params, params, Connection, OptionalExtension, Row, ToSql, Transaction};
-use time::OffsetDateTime;
+use rusqlite::{
+ Connection, OptionalExtension, Row, ToSql, Transaction, named_params, params,
+ types::{FromSql, FromSqlError, ToSqlOutput, Value, ValueRef},
+};
use vault::Action;
-use crate::euph::SmallMessage;
-use crate::store::{MsgStore, Path, Tree};
-
-///////////////////
-// Wrapper types //
-///////////////////
+use crate::{
+ euph::SmallMessage,
+ store::{MsgStore, Path, Tree},
+};
/// Wrapper for [`Snowflake`] that implements useful rusqlite traits.
struct WSnowflake(Snowflake);
impl ToSql for WSnowflake {
fn to_sql(&self) -> rusqlite::Result> {
- self.0 .0.to_sql()
+ self.0.0.to_sql()
}
}
@@ -36,7 +34,7 @@ struct WTime(Time);
impl ToSql for WTime {
fn to_sql(&self) -> rusqlite::Result> {
- let timestamp = self.0 .0.unix_timestamp();
+ let timestamp = self.0.0;
Ok(ToSqlOutput::Owned(Value::Integer(timestamp)))
}
}
@@ -44,9 +42,25 @@ impl ToSql for WTime {
impl FromSql for WTime {
fn column_result(value: ValueRef<'_>) -> rusqlite::types::FromSqlResult {
let timestamp = i64::column_result(value)?;
- Ok(Self(Time(
- OffsetDateTime::from_unix_timestamp(timestamp).expect("timestamp in range"),
- )))
+ Ok(Self(Time(timestamp)))
+ }
+}
+
+#[derive(Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
+pub struct RoomIdentifier {
+ pub domain: String,
+ pub name: String,
+}
+
+impl fmt::Debug for RoomIdentifier {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ write!(f, "&{}@{}", self.name, self.domain)
+ }
+}
+
+impl RoomIdentifier {
+ pub fn new(domain: String, name: String) -> Self {
+ Self { domain, name }
}
}
@@ -68,10 +82,10 @@ impl EuphVault {
&self.vault
}
- pub fn room(&self, name: String) -> EuphRoomVault {
+ pub fn room(&self, room: RoomIdentifier) -> EuphRoomVault {
EuphRoomVault {
vault: self.clone(),
- room: name,
+ room,
}
}
}
@@ -97,9 +111,11 @@ macro_rules! euph_vault_actions {
}
euph_vault_actions! {
- GetCookies : cookies() -> CookieJar;
- SetCookies : set_cookies(cookies: CookieJar) -> ();
- GetRooms : rooms() -> Vec;
+ GetCookies : cookies(domain: String) -> CookieJar;
+ SetCookies : set_cookies(domain: String, cookies: CookieJar) -> ();
+ ClearCookies : clear_cookies(domain: Option) -> ();
+ GetRooms : rooms() -> Vec;
+ GetTotalUnseenMsgsCount : total_unseen_msgs_count() -> usize;
}
impl Action for GetCookies {
@@ -112,9 +128,10 @@ impl Action for GetCookies {
"
SELECT cookie
FROM euph_cookies
+ WHERE domain = ?
",
)?
- .query_map([], |row| {
+ .query_map([self.domain], |row| {
let cookie_str: String = row.get(0)?;
Ok(Cookie::from_str(&cookie_str).expect("cookie in db is valid"))
})?
@@ -137,16 +154,21 @@ impl Action for SetCookies {
// Since euphoria sets all cookies on every response, we can just delete
// all previous cookies.
- tx.execute_batch("DELETE FROM euph_cookies")?;
+ tx.execute(
+ "
+ DELETE FROM euph_cookies
+ WHERE domain = ?",
+ [&self.domain],
+ )?;
let mut insert_cookie = tx.prepare(
"
- INSERT INTO euph_cookies (cookie)
- VALUES (?)
+ INSERT INTO euph_cookies (domain, cookie)
+ VALUES (?, ?)
",
)?;
for cookie in self.cookies.iter() {
- insert_cookie.execute([format!("{cookie}")])?;
+ insert_cookie.execute(params![self.domain, format!("{cookie}")])?;
}
drop(insert_cookie);
@@ -155,22 +177,57 @@ impl Action for SetCookies {
}
}
+impl Action for ClearCookies {
+ type Output = ();
+ type Error = rusqlite::Error;
+
+ fn run(self, conn: &mut Connection) -> Result {
+ if let Some(domain) = self.domain {
+ conn.execute("DELETE FROM euph_cookies WHERE domain = ?", [domain])?;
+ } else {
+ conn.execute_batch("DELETE FROM euph_cookies")?;
+ }
+
+ Ok(())
+ }
+}
+
impl Action for GetRooms {
- type Output = Vec;
+ type Output = Vec;
type Error = rusqlite::Error;
fn run(self, conn: &mut Connection) -> Result {
conn.prepare(
"
- SELECT room
+ SELECT domain, room
FROM euph_rooms
",
)?
- .query_map([], |row| row.get(0))?
+ .query_map([], |row| {
+ Ok(RoomIdentifier {
+ domain: row.get(0)?,
+ name: row.get(1)?,
+ })
+ })?
.collect::>()
}
}
+impl Action for GetTotalUnseenMsgsCount {
+ type Output = usize;
+ type Error = rusqlite::Error;
+
+ fn run(self, conn: &mut Connection) -> Result {
+ conn.prepare(
+ "
+ SELECT COALESCE(SUM(amount), 0)
+ FROM euph_unseen_counts
+ ",
+ )?
+ .query_row([], |row| row.get(0))
+ }
+}
+
///////////////////
// EuphRoomVault //
///////////////////
@@ -178,7 +235,7 @@ impl Action for GetRooms {
#[derive(Debug, Clone)]
pub struct EuphRoomVault {
vault: EuphVault,
- room: String,
+ room: RoomIdentifier,
}
impl EuphRoomVault {
@@ -186,7 +243,7 @@ impl EuphRoomVault {
&self.vault
}
- pub fn room(&self) -> &str {
+ pub fn room(&self) -> &RoomIdentifier {
&self.room
}
}
@@ -197,7 +254,7 @@ macro_rules! euph_room_vault_actions {
)* ) => {
$(
struct $struct {
- room: String,
+ room: RoomIdentifier,
$( $arg: $arg_ty, )*
}
)*
@@ -253,12 +310,16 @@ impl Action for Join {
fn run(self, conn: &mut Connection) -> Result {
conn.execute(
"
- INSERT INTO euph_rooms (room, first_joined, last_joined)
- VALUES (:room, :time, :time)
- ON CONFLICT (room) DO UPDATE
+ INSERT INTO euph_rooms (domain, room, first_joined, last_joined)
+ VALUES (:domain, :room, :time, :time)
+ ON CONFLICT (domain, room) DO UPDATE
SET last_joined = :time
",
- named_params! {":room": self.room, ":time": WTime(self.time)},
+ named_params! {
+ ":domain": self.room.domain,
+ ":room": self.room.name,
+ ":time": WTime(self.time),
+ },
)?;
Ok(())
}
@@ -272,9 +333,10 @@ impl Action for Delete {
conn.execute(
"
DELETE FROM euph_rooms
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
",
- [&self.room],
+ [&self.room.domain, &self.room.name],
)?;
Ok(())
}
@@ -282,29 +344,33 @@ impl Action for Delete {
fn insert_msgs(
tx: &Transaction<'_>,
- room: &str,
+ room: &RoomIdentifier,
own_user_id: &Option,
msgs: Vec,
) -> rusqlite::Result<()> {
let mut insert_msg = tx.prepare(
"
INSERT INTO euph_msgs (
- room, id, parent, previous_edit_id, time, content, encryption_key_id, edited, deleted, truncated,
+ domain, room,
+ id, parent, previous_edit_id, time, content, encryption_key_id, edited, deleted, truncated,
user_id, name, server_id, server_era, session_id, is_staff, is_manager, client_address, real_client_address,
seen
)
VALUES (
- :room, :id, :parent, :previous_edit_id, :time, :content, :encryption_key_id, :edited, :deleted, :truncated,
+ :domain, :room,
+ :id, :parent, :previous_edit_id, :time, :content, :encryption_key_id, :edited, :deleted, :truncated,
:user_id, :name, :server_id, :server_era, :session_id, :is_staff, :is_manager, :client_address, :real_client_address,
(:user_id == :own_user_id OR EXISTS(
SELECT 1
FROM euph_rooms
- WHERE room = :room
+ WHERE domain = :domain
+ AND room = :room
AND :time < first_joined
))
)
- ON CONFLICT (room, id) DO UPDATE
+ ON CONFLICT (domain, room, id) DO UPDATE
SET
+ domain = :domain,
room = :room,
id = :id,
parent = :parent,
@@ -331,7 +397,8 @@ fn insert_msgs(
let own_user_id = own_user_id.as_ref().map(|u| &u.0);
for msg in msgs {
insert_msg.execute(named_params! {
- ":room": room,
+ ":domain": room.domain,
+ ":room": room.name,
":id": WSnowflake(msg.id.0),
":parent": msg.parent.map(|id| WSnowflake(id.0)),
":previous_edit_id": msg.previous_edit_id.map(WSnowflake),
@@ -359,7 +426,7 @@ fn insert_msgs(
fn add_span(
tx: &Transaction<'_>,
- room: &str,
+ room: &RoomIdentifier,
start: Option,
end: Option,
) -> rusqlite::Result<()> {
@@ -369,10 +436,11 @@ fn add_span(
"
SELECT start, end
FROM euph_spans
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
",
)?
- .query_map([room], |row| {
+ .query_map([&room.domain, &room.name], |row| {
let start = row.get::<_, Option>(0)?.map(|s| MessageId(s.0));
let end = row.get::<_, Option>(1)?.map(|s| MessageId(s.0));
Ok((start, end))
@@ -412,21 +480,23 @@ fn add_span(
tx.execute(
"
DELETE FROM euph_spans
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
",
- [room],
+ [&room.domain, &room.name],
)?;
// Re-insert combined spans for the room
let mut stmt = tx.prepare(
"
- INSERT INTO euph_spans (room, start, end)
- VALUES (?, ?, ?)
+ INSERT INTO euph_spans (domain, room, start, end)
+ VALUES (?, ?, ?, ?)
",
)?;
for (start, end) in result {
stmt.execute(params![
- room,
+ room.domain,
+ room.name,
start.map(|id| WSnowflake(id.0)),
end.map(|id| WSnowflake(id.0))
])?;
@@ -485,12 +555,13 @@ impl Action for GetLastSpan {
"
SELECT start, end
FROM euph_spans
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
ORDER BY start DESC
LIMIT 1
",
)?
- .query_row([self.room], |row| {
+ .query_row([&self.room.domain, &self.room.name], |row| {
Ok((
row.get::<_, Option>(0)?.map(|s| MessageId(s.0)),
row.get::<_, Option>(1)?.map(|s| MessageId(s.0)),
@@ -510,12 +581,12 @@ impl Action for GetPath {
.prepare(
"
WITH RECURSIVE
- path (room, id) AS (
- VALUES (?, ?)
+ path (domain, room, id) AS (
+ VALUES (?, ?, ?)
UNION
- SELECT room, parent
+ SELECT domain, room, parent
FROM euph_msgs
- JOIN path USING (room, id)
+ JOIN path USING (domain, room, id)
)
SELECT id
FROM path
@@ -523,9 +594,10 @@ impl Action for GetPath {
ORDER BY id ASC
",
)?
- .query_map(params![self.room, WSnowflake(self.id.0)], |row| {
- row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
- })?
+ .query_map(
+ params![self.room.domain, self.room.name, WSnowflake(self.id.0)],
+ |row| row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0)),
+ )?
.collect::>()?;
Ok(Path::new(path))
}
@@ -539,20 +611,22 @@ impl Action for GetMsg {
let msg = conn
.query_row(
"
- SELECT id, parent, time, name, content, seen
+ SELECT id, parent, time, user_id, name, content, seen
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND id = ?
",
- params![self.room, WSnowflake(self.id.0)],
+ params![self.room.domain, self.room.name, WSnowflake(self.id.0)],
|row| {
Ok(SmallMessage {
id: MessageId(row.get::<_, WSnowflake>(0)?.0),
parent: row.get::<_, Option>(1)?.map(|s| MessageId(s.0)),
time: row.get::<_, WTime>(2)?.0,
- nick: row.get(3)?,
- content: row.get(4)?,
- seen: row.get(5)?,
+ user_id: UserId(row.get(3)?),
+ nick: row.get(4)?,
+ content: row.get(5)?,
+ seen: row.get(6)?,
})
},
)
@@ -572,36 +646,40 @@ impl Action for GetFullMsg {
id, parent, previous_edit_id, time, content, encryption_key_id, edited, deleted, truncated,
user_id, name, server_id, server_era, session_id, is_staff, is_manager, client_address, real_client_address
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND id = ?
"
)?;
let msg = query
- .query_row(params![self.room, WSnowflake(self.id.0)], |row| {
- Ok(Message {
- id: MessageId(row.get::<_, WSnowflake>(0)?.0),
- parent: row.get::<_, Option>(1)?.map(|s| MessageId(s.0)),
- previous_edit_id: row.get::<_, Option>(2)?.map(|s| s.0),
- time: row.get::<_, WTime>(3)?.0,
- content: row.get(4)?,
- encryption_key_id: row.get(5)?,
- edited: row.get::<_, Option>(6)?.map(|t| t.0),
- deleted: row.get::<_, Option>(7)?.map(|t| t.0),
- truncated: row.get(8)?,
- sender: SessionView {
- id: UserId(row.get(9)?),
- name: row.get(10)?,
- server_id: row.get(11)?,
- server_era: row.get(12)?,
- session_id: SessionId(row.get(13)?),
- is_staff: row.get(14)?,
- is_manager: row.get(15)?,
- client_address: row.get(16)?,
- real_client_address: row.get(17)?,
- },
- })
- })
+ .query_row(
+ params![self.room.domain, self.room.name, WSnowflake(self.id.0)],
+ |row| {
+ Ok(Message {
+ id: MessageId(row.get::<_, WSnowflake>(0)?.0),
+ parent: row.get::<_, Option>(1)?.map(|s| MessageId(s.0)),
+ previous_edit_id: row.get::<_, Option>(2)?.map(|s| s.0),
+ time: row.get::<_, WTime>(3)?.0,
+ content: row.get(4)?,
+ encryption_key_id: row.get(5)?,
+ edited: row.get::<_, Option>(6)?.map(|t| t.0),
+ deleted: row.get::<_, Option>(7)?.map(|t| t.0),
+ truncated: row.get(8)?,
+ sender: SessionView {
+ id: UserId(row.get(9)?),
+ name: row.get(10)?,
+ server_id: row.get(11)?,
+ server_era: row.get(12)?,
+ session_id: SessionId(row.get(13)?),
+ is_staff: row.get(14)?,
+ is_manager: row.get(15)?,
+ client_address: row.get(16)?,
+ real_client_address: row.get(17)?,
+ },
+ })
+ },
+ )
.optional()?;
Ok(msg)
}
@@ -616,31 +694,36 @@ impl Action for GetTree {
.prepare(
"
WITH RECURSIVE
- tree (room, id) AS (
- VALUES (?, ?)
+ tree (domain, room, id) AS (
+ VALUES (?, ?, ?)
UNION
- SELECT euph_msgs.room, euph_msgs.id
+ SELECT euph_msgs.domain, euph_msgs.room, euph_msgs.id
FROM euph_msgs
JOIN tree
- ON tree.room = euph_msgs.room
+ ON tree.domain = euph_msgs.domain
+ AND tree.room = euph_msgs.room
AND tree.id = euph_msgs.parent
)
- SELECT id, parent, time, name, content, seen
+ SELECT id, parent, time, user_id, name, content, seen
FROM euph_msgs
- JOIN tree USING (room, id)
+ JOIN tree USING (domain, room, id)
ORDER BY id ASC
",
)?
- .query_map(params![self.room, WSnowflake(self.root_id.0)], |row| {
- Ok(SmallMessage {
- id: MessageId(row.get::<_, WSnowflake>(0)?.0),
- parent: row.get::<_, Option>(1)?.map(|s| MessageId(s.0)),
- time: row.get::<_, WTime>(2)?.0,
- nick: row.get(3)?,
- content: row.get(4)?,
- seen: row.get(5)?,
- })
- })?
+ .query_map(
+ params![self.room.domain, self.room.name, WSnowflake(self.root_id.0)],
+ |row| {
+ Ok(SmallMessage {
+ id: MessageId(row.get::<_, WSnowflake>(0)?.0),
+ parent: row.get::<_, Option>(1)?.map(|s| MessageId(s.0)),
+ time: row.get::<_, WTime>(2)?.0,
+ user_id: UserId(row.get(3)?),
+ nick: row.get(4)?,
+ content: row.get(5)?,
+ seen: row.get(6)?,
+ })
+ },
+ )?
.collect::>()?;
Ok(Tree::new(self.root_id, msgs))
}
@@ -656,12 +739,13 @@ impl Action for GetFirstRootId {
"
SELECT id
FROM euph_trees
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
ORDER BY id ASC
LIMIT 1
",
)?
- .query_row([self.room], |row| {
+ .query_row([&self.room.domain, &self.room.name], |row| {
row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
})
.optional()?;
@@ -679,12 +763,13 @@ impl Action for GetLastRootId {
"
SELECT id
FROM euph_trees
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
ORDER BY id DESC
LIMIT 1
",
)?
- .query_row([self.room], |row| {
+ .query_row([&self.room.domain, &self.room.name], |row| {
row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
})
.optional()?;
@@ -702,15 +787,17 @@ impl Action for GetPrevRootId {
"
SELECT id
FROM euph_trees
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND id < ?
ORDER BY id DESC
LIMIT 1
",
)?
- .query_row(params![self.room, WSnowflake(self.root_id.0)], |row| {
- row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
- })
+ .query_row(
+ params![self.room.domain, self.room.name, WSnowflake(self.root_id.0)],
+ |row| row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0)),
+ )
.optional()?;
Ok(root_id)
}
@@ -726,15 +813,17 @@ impl Action for GetNextRootId {
"
SELECT id
FROM euph_trees
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND id > ?
ORDER BY id ASC
LIMIT 1
",
)?
- .query_row(params![self.room, WSnowflake(self.root_id.0)], |row| {
- row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
- })
+ .query_row(
+ params![self.room.domain, self.room.name, WSnowflake(self.root_id.0)],
+ |row| row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0)),
+ )
.optional()?;
Ok(root_id)
}
@@ -750,12 +839,13 @@ impl Action for GetOldestMsgId {
"
SELECT id
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
ORDER BY id ASC
LIMIT 1
",
)?
- .query_row([self.room], |row| {
+ .query_row([&self.room.domain, &self.room.name], |row| {
row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
})
.optional()?;
@@ -773,12 +863,13 @@ impl Action for GetNewestMsgId {
"
SELECT id
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
ORDER BY id DESC
LIMIT 1
",
)?
- .query_row([self.room], |row| {
+ .query_row([&self.room.domain, &self.room.name], |row| {
row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
})
.optional()?;
@@ -796,15 +887,17 @@ impl Action for GetOlderMsgId {
"
SELECT id
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND id < ?
ORDER BY id DESC
LIMIT 1
",
)?
- .query_row(params![self.room, WSnowflake(self.id.0)], |row| {
- row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
- })
+ .query_row(
+ params![self.room.domain, self.room.name, WSnowflake(self.id.0)],
+ |row| row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0)),
+ )
.optional()?;
Ok(msg_id)
}
@@ -819,15 +912,17 @@ impl Action for GetNewerMsgId {
"
SELECT id
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND id > ?
ORDER BY id ASC
LIMIT 1
",
)?
- .query_row(params![self.room, WSnowflake(self.id.0)], |row| {
- row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
- })
+ .query_row(
+ params![self.room.domain, self.room.name, WSnowflake(self.id.0)],
+ |row| row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0)),
+ )
.optional()?;
Ok(msg_id)
}
@@ -843,13 +938,14 @@ impl Action for GetOldestUnseenMsgId {
"
SELECT id
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND NOT seen
ORDER BY id ASC
LIMIT 1
",
)?
- .query_row([self.room], |row| {
+ .query_row([&self.room.domain, &self.room.name], |row| {
row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
})
.optional()?;
@@ -867,13 +963,14 @@ impl Action for GetNewestUnseenMsgId {
"
SELECT id
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND NOT seen
ORDER BY id DESC
LIMIT 1
",
)?
- .query_row([self.room], |row| {
+ .query_row([&self.room.domain, &self.room.name], |row| {
row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
})
.optional()?;
@@ -891,16 +988,18 @@ impl Action for GetOlderUnseenMsgId {
"
SELECT id
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND NOT seen
AND id < ?
ORDER BY id DESC
LIMIT 1
",
)?
- .query_row(params![self.room, WSnowflake(self.id.0)], |row| {
- row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
- })
+ .query_row(
+ params![self.room.domain, self.room.name, WSnowflake(self.id.0)],
+ |row| row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0)),
+ )
.optional()?;
Ok(msg_id)
}
@@ -916,16 +1015,18 @@ impl Action for GetNewerUnseenMsgId {
"
SELECT id
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND NOT seen
AND id > ?
ORDER BY id ASC
LIMIT 1
",
)?
- .query_row(params![self.room, WSnowflake(self.id.0)], |row| {
- row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0))
- })
+ .query_row(
+ params![self.room.domain, self.room.name, WSnowflake(self.id.0)],
+ |row| row.get::<_, WSnowflake>(0).map(|s| MessageId(s.0)),
+ )
.optional()?;
Ok(msg_id)
}
@@ -941,10 +1042,11 @@ impl Action for GetUnseenMsgsCount {
"
SELECT amount
FROM euph_unseen_counts
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
",
)?
- .query_row(params![self.room], |row| row.get(0))
+ .query_row(params![self.room.domain, self.room.name], |row| row.get(0))
.optional()?
.unwrap_or(0);
Ok(amount)
@@ -960,10 +1062,16 @@ impl Action for SetSeen {
"
UPDATE euph_msgs
SET seen = :seen
- WHERE room = :room
+ WHERE domain = :domain
+ AND room = :room
AND id = :id
",
- named_params! { ":room": self.room, ":id": WSnowflake(self.id.0), ":seen": self.seen },
+ named_params! {
+ ":domain": self.room.domain,
+ ":room": self.room.name,
+ ":id": WSnowflake(self.id.0),
+ ":seen": self.seen,
+ },
)?;
Ok(())
}
@@ -978,11 +1086,17 @@ impl Action for SetOlderSeen {
"
UPDATE euph_msgs
SET seen = :seen
- WHERE room = :room
+ WHERE domain = :domain
+ AND room = :room
AND id <= :id
AND seen != :seen
",
- named_params! { ":room": self.room, ":id": WSnowflake(self.id.0), ":seen": self.seen },
+ named_params! {
+ ":domain": self.room.domain,
+ ":room": self.room.name,
+ ":id": WSnowflake(self.id.0),
+ ":seen": self.seen,
+ },
)?;
Ok(())
}
@@ -1024,12 +1138,13 @@ impl Action for GetChunkAfter {
id, parent, previous_edit_id, time, content, encryption_key_id, edited, deleted, truncated,
user_id, name, server_id, server_era, session_id, is_staff, is_manager, client_address, real_client_address
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
AND id > ?
ORDER BY id ASC
LIMIT ?
")?
- .query_map(params![self.room, WSnowflake(id.0), self.amount], row2msg)?
+ .query_map(params![self.room.domain, self.room.name, WSnowflake(id.0), self.amount], row2msg)?
.collect::>()?
} else {
conn.prepare("
@@ -1037,11 +1152,12 @@ impl Action for GetChunkAfter {
id, parent, previous_edit_id, time, content, encryption_key_id, edited, deleted, truncated,
user_id, name, server_id, server_era, session_id, is_staff, is_manager, client_address, real_client_address
FROM euph_msgs
- WHERE room = ?
+ WHERE domain = ?
+ AND room = ?
ORDER BY id ASC
LIMIT ?
")?
- .query_map(params![self.room, self.amount], row2msg)?
+ .query_map(params![self.room.domain, self.room.name, self.amount], row2msg)?
.collect::>()?
};
diff --git a/cove/src/vault/migrate.rs b/cove/src/vault/migrate.rs
index e5d16da..cc85c2c 100644
--- a/cove/src/vault/migrate.rs
+++ b/cove/src/vault/migrate.rs
@@ -1,10 +1,14 @@
use rusqlite::Transaction;
use vault::Migration;
-pub const MIGRATIONS: [Migration; 2] = [m1, m2];
+pub const MIGRATIONS: [Migration; 3] = [m1, m2, m3];
+
+fn eprint_status(nr: usize, total: usize) {
+ eprintln!("Migrating vault from {} to {} (out of {total})", nr, nr + 1);
+}
fn m1(tx: &mut Transaction<'_>, nr: usize, total: usize) -> rusqlite::Result<()> {
- eprintln!("Migrating vault from {} to {} (out of {total})", nr, nr + 1);
+ eprint_status(nr, total);
tx.execute_batch(
"
CREATE TABLE euph_rooms (
@@ -67,7 +71,7 @@ fn m1(tx: &mut Transaction<'_>, nr: usize, total: usize) -> rusqlite::Result<()>
}
fn m2(tx: &mut Transaction<'_>, nr: usize, total: usize) -> rusqlite::Result<()> {
- eprintln!("Migrating vault from {} to {} (out of {total})", nr, nr + 1);
+ eprint_status(nr, total);
tx.execute_batch(
"
ALTER TABLE euph_msgs
@@ -78,3 +82,143 @@ fn m2(tx: &mut Transaction<'_>, nr: usize, total: usize) -> rusqlite::Result<()>
",
)
}
+
+fn m3(tx: &mut Transaction<'_>, nr: usize, total: usize) -> rusqlite::Result<()> {
+ eprint_status(nr, total);
+ println!(" This migration might take quite a while.");
+ println!(" Aborting it will not corrupt your vault.");
+
+ // Rooms should be identified not just via their name but also their domain.
+ // The domain should be required but there should be no default value.
+ //
+ // To accomplish this, we need to recreate and repopulate all euph related
+ // tables because SQLite's ALTER TABLE is not powerful enough.
+
+ eprintln!(" Preparing tables...");
+ tx.execute_batch(
+ "
+ DROP INDEX euph_idx_msgs_room_id_parent;
+ DROP INDEX euph_idx_msgs_room_parent_id;
+ DROP INDEX euph_idx_msgs_room_id_seen;
+
+ ALTER TABLE euph_rooms RENAME TO old_euph_rooms;
+ ALTER TABLE euph_msgs RENAME TO old_euph_msgs;
+ ALTER TABLE euph_spans RENAME TO old_euph_spans;
+ ALTER TABLE euph_cookies RENAME TO old_euph_cookies;
+
+ CREATE TABLE euph_rooms (
+ domain TEXT NOT NULL,
+ room TEXT NOT NULL,
+ first_joined INT NOT NULL,
+ last_joined INT NOT NULL,
+
+ PRIMARY KEY (domain, room)
+ ) STRICT;
+
+ CREATE TABLE euph_msgs (
+ domain TEXT NOT NULL,
+ room TEXT NOT NULL,
+ seen INT NOT NULL,
+
+ -- Message
+ id INT NOT NULL,
+ parent INT,
+ previous_edit_id INT,
+ time INT NOT NULL,
+ content TEXT NOT NULL,
+ encryption_key_id TEXT,
+ edited INT,
+ deleted INT,
+ truncated INT NOT NULL,
+
+ -- SessionView
+ user_id TEXT NOT NULL,
+ name TEXT,
+ server_id TEXT NOT NULL,
+ server_era TEXT NOT NULL,
+ session_id TEXT NOT NULL,
+ is_staff INT NOT NULL,
+ is_manager INT NOT NULL,
+ client_address TEXT,
+ real_client_address TEXT,
+
+ PRIMARY KEY (domain, room, id),
+ FOREIGN KEY (domain, room) REFERENCES euph_rooms (domain, room)
+ ON DELETE CASCADE
+ ) STRICT;
+
+ CREATE TABLE euph_spans (
+ domain TEXT NOT NULL,
+ room TEXT NOT NULL,
+ start INT,
+ end INT,
+
+ UNIQUE (domain, room, start, end),
+ FOREIGN KEY (domain, room) REFERENCES euph_rooms (domain, room)
+ ON DELETE CASCADE,
+ CHECK (start IS NULL OR end IS NOT NULL)
+ ) STRICT;
+
+ CREATE TABLE euph_cookies (
+ domain TEXT NOT NULL,
+ cookie TEXT NOT NULL
+ ) STRICT;
+ ",
+ )?;
+
+ eprintln!(" Migrating data...");
+ tx.execute_batch(
+ "
+ INSERT INTO euph_rooms (domain, room, first_joined, last_joined)
+ SELECT 'euphoria.io', room, first_joined, last_joined
+ FROM old_euph_rooms;
+
+ INSERT INTO euph_msgs (
+ domain, room, seen,
+ id, parent, previous_edit_id, time, content, encryption_key_id, edited, deleted, truncated,
+ user_id, name, server_id, server_era, session_id, is_staff, is_manager, client_address, real_client_address
+ )
+ SELECT
+ 'euphoria.io', room, seen,
+ id, parent, previous_edit_id, time, content, encryption_key_id, edited, deleted, truncated,
+ user_id, name, server_id, server_era, session_id, is_staff, is_manager, client_address, real_client_address
+ FROM old_euph_msgs;
+
+ INSERT INTO euph_spans (domain, room, start, end)
+ SELECT 'euphoria.io', room, start, end
+ FROM old_euph_spans;
+
+ INSERT INTO euph_cookies (domain, cookie)
+ SELECT 'euphoria.io', cookie
+ FROM old_euph_cookies;
+ ",
+ )?;
+
+ eprintln!(" Recreating indexes...");
+ tx.execute_batch(
+ "
+ CREATE INDEX euph_idx_msgs_domain_room_id_parent
+ ON euph_msgs (domain, room, id, parent);
+
+ CREATE INDEX euph_idx_msgs_domain_room_parent_id
+ ON euph_msgs (domain, room, parent, id);
+
+ CREATE INDEX euph_idx_msgs_domain_room_id_seen
+ ON euph_msgs (domain, room, id, seen);
+ ",
+ )?;
+
+ eprintln!(" Cleaning up loose ends...");
+ tx.execute_batch(
+ "
+ DROP TABLE old_euph_rooms;
+ DROP TABLE old_euph_msgs;
+ DROP TABLE old_euph_spans;
+ DROP TABLE old_euph_cookies;
+
+ ANALYZE;
+ ",
+ )?;
+
+ Ok(())
+}
diff --git a/cove/src/vault/prepare.rs b/cove/src/vault/prepare.rs
index c990e26..8bbcb2b 100644
--- a/cove/src/vault/prepare.rs
+++ b/cove/src/vault/prepare.rs
@@ -1,28 +1,32 @@
use rusqlite::Connection;
pub fn prepare(conn: &mut Connection) -> rusqlite::Result<()> {
+ eprintln!("Preparing vault");
+
// Cache ids of tree roots.
conn.execute_batch(
"
CREATE TEMPORARY TABLE euph_trees (
+ domain TEXT NOT NULL,
room TEXT NOT NULL,
id INT NOT NULL,
- PRIMARY KEY (room, id)
+ PRIMARY KEY (domain, room, id)
) STRICT;
- INSERT INTO euph_trees (room, id)
- SELECT room, id
+ INSERT INTO euph_trees (domain, room, id)
+ SELECT domain, room, id
FROM euph_msgs
WHERE parent IS NULL
UNION
- SELECT room, parent
+ SELECT domain, room, parent
FROM euph_msgs
WHERE parent IS NOT NULL
AND NOT EXISTS(
SELECT *
FROM euph_msgs AS parents
- WHERE parents.room = euph_msgs.room
+ WHERE parents.domain = euph_msgs.domain
+ AND parents.room = euph_msgs.room
AND parents.id = euph_msgs.parent
);
@@ -30,15 +34,16 @@ pub fn prepare(conn: &mut Connection) -> rusqlite::Result<()> {
AFTER DELETE ON main.euph_rooms
BEGIN
DELETE FROM euph_trees
- WHERE room = old.room;
+ WHERE domain = old.domain
+ AND room = old.room;
END;
CREATE TEMPORARY TRIGGER et_insert_msg_without_parent
AFTER INSERT ON main.euph_msgs
WHEN new.parent IS NULL
BEGIN
- INSERT OR IGNORE INTO euph_trees (room, id)
- VALUES (new.room, new.id);
+ INSERT OR IGNORE INTO euph_trees (domain, room, id)
+ VALUES (new.domain, new.room, new.id);
END;
CREATE TEMPORARY TRIGGER et_insert_msg_with_parent
@@ -46,16 +51,18 @@ pub fn prepare(conn: &mut Connection) -> rusqlite::Result<()> {
WHEN new.parent IS NOT NULL
BEGIN
DELETE FROM euph_trees
- WHERE room = new.room
+ WHERE domain = new.domain
+ AND room = new.room
AND id = new.id;
- INSERT OR IGNORE INTO euph_trees (room, id)
+ INSERT OR IGNORE INTO euph_trees (domain, room, id)
SELECT *
- FROM (VALUES (new.room, new.parent))
+ FROM (VALUES (new.domain, new.room, new.parent))
WHERE NOT EXISTS(
SELECT *
FROM euph_msgs
- WHERE room = new.room
+ WHERE domain = new.domain
+ AND room = new.room
AND id = new.parent
AND parent IS NOT NULL
);
@@ -67,35 +74,37 @@ pub fn prepare(conn: &mut Connection) -> rusqlite::Result<()> {
conn.execute_batch(
"
CREATE TEMPORARY TABLE euph_unseen_counts (
+ domain TEXT NOT NULL,
room TEXT NOT NULL,
amount INTEGER NOT NULL,
- PRIMARY KEY (room)
+ PRIMARY KEY (domain, room)
) STRICT;
-- There must be an entry for every existing room.
- INSERT INTO euph_unseen_counts (room, amount)
- SELECT room, 0
+ INSERT INTO euph_unseen_counts (domain, room, amount)
+ SELECT domain, room, 0
FROM euph_rooms;
- INSERT OR REPLACE INTO euph_unseen_counts (room, amount)
- SELECT room, COUNT(*)
+ INSERT OR REPLACE INTO euph_unseen_counts (domain, room, amount)
+ SELECT domain, room, COUNT(*)
FROM euph_msgs
WHERE NOT seen
- GROUP BY room;
+ GROUP BY domain, room;
CREATE TEMPORARY TRIGGER euc_insert_room
AFTER INSERT ON main.euph_rooms
BEGIN
- INSERT INTO euph_unseen_counts (room, amount)
- VALUES (new.room, 0);
+ INSERT INTO euph_unseen_counts (domain, room, amount)
+ VALUES (new.domain, new.room, 0);
END;
CREATE TEMPORARY TRIGGER euc_delete_room
AFTER DELETE ON main.euph_rooms
BEGIN
DELETE FROM euph_unseen_counts
- WHERE room = old.room;
+ WHERE domain = old.domain
+ AND room = old.room;
END;
CREATE TEMPORARY TRIGGER euc_insert_msg
@@ -104,7 +113,8 @@ pub fn prepare(conn: &mut Connection) -> rusqlite::Result<()> {
BEGIN
UPDATE euph_unseen_counts
SET amount = amount + 1
- WHERE room = new.room;
+ WHERE domain = new.domain
+ AND room = new.room;
END;
CREATE TEMPORARY TRIGGER euc_update_msg
@@ -113,7 +123,8 @@ pub fn prepare(conn: &mut Connection) -> rusqlite::Result<()> {
BEGIN
UPDATE euph_unseen_counts
SET amount = CASE WHEN new.seen THEN amount - 1 ELSE amount + 1 END
- WHERE room = new.room;
+ WHERE domain = new.domain
+ AND room = new.room;
END;
",
)?;
diff --git a/cove/src/version.rs b/cove/src/version.rs
new file mode 100644
index 0000000..2a4c731
--- /dev/null
+++ b/cove/src/version.rs
@@ -0,0 +1,2 @@
+pub const NAME: &str = env!("CARGO_PKG_NAME");
+pub const VERSION: &str = env!("CARGO_PKG_VERSION");
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index bc5ec53..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "nodes": {
- "naersk": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1679567394,
- "narHash": "sha256-ZvLuzPeARDLiQUt6zSZFGOs+HZmE+3g4QURc8mkBsfM=",
- "owner": "nix-community",
- "repo": "naersk",
- "rev": "88cd22380154a2c36799fe8098888f0f59861a15",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "naersk",
- "type": "github"
- }
- },
- "nixpkgs": {
- "locked": {
- "lastModified": 1680643271,
- "narHash": "sha256-m76rYcvqs+NzTyETfxh1o/9gKdBuJ/Hl+PI/kp73mDw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "246567a3ad88e3119c2001e2fe78be233474cde0",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "root": {
- "inputs": {
- "naersk": "naersk",
- "nixpkgs": "nixpkgs"
- }
- }
- },
- "root": "root",
- "version": 7
-}
diff --git a/flake.nix b/flake.nix
deleted file mode 100644
index 707e335..0000000
--- a/flake.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- description = "TUI client for euphoria.io, a threaded real-time chat platform";
-
- inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs";
-
- naersk.url = "github:nix-community/naersk";
- naersk.inputs.nixpkgs.follows = "nixpkgs";
- };
-
- outputs = { self, nixpkgs, naersk }:
- let forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
- in {
- packages = forAllSystems (system:
- let
- pkgs = import nixpkgs { inherit system; };
- naersk' = pkgs.callPackage naersk { };
- cargoToml = pkgs.lib.importTOML ./Cargo.toml;
- in
- {
- default = naersk'.buildPackage {
- name = "cove";
- version = cargoToml.workspace.package.version;
- root = ./.;
- };
- }
- );
- };
-}