Compare commits
182 Commits
0bd5404342
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| a0ef96aa1a | |||
| 9d05f74280 | |||
| b9df41559f | |||
| 4bb5307904 | |||
| 0cbe860d0d | |||
| 6eaedfaae8 | |||
| d1787bac32 | |||
| 58554e7f40 | |||
| fa6fe673bd | |||
| 44961f6ef1 | |||
| cd09594347 | |||
| 3d09ab7c15 | |||
| 0cf3e3ce05 | |||
| d10a34e32e | |||
| f311e517a9 | |||
| aacee2f537 | |||
| e2bec7760b | |||
| a4ef7e48a6 | |||
| 1aa6f22461 | |||
| 2f5026c75b | |||
| dcb90ca2c8 | |||
| 772548f10d | |||
| c62e925016 | |||
| 4570a6ea1c | |||
| ae06df21a0 | |||
| 02d43feb79 | |||
| 0e6508498a | |||
| a94bd8a341 | |||
| 788baf9e86 | |||
| fdf910b1a1 | |||
| 714c94e40b | |||
| 667893b6a3 | |||
| 687b050410 | |||
| 48bad8cbb0 | |||
| d156fe8282 | |||
| fc66759e92 | |||
| fcdc2d56a9 | |||
| 60993abd6f | |||
| c1112e5538 | |||
| 1b59c7a287 | |||
| 17cdae7bfb | |||
| f89135fce5 | |||
| 38c1d140bd | |||
| 197ea049b2 | |||
| f843166147 | |||
| 943dd5c142 | |||
| a1cf16350b | |||
| 626eca5619 | |||
| cb77f83607 | |||
| b2f1431664 | |||
| c541f4bd00 | |||
| 4a20b1d4ba | |||
| d54c90dc7b | |||
| f8a4a5d5b4 | |||
| 8c99bb3ba1 | |||
| c1a66fc548 | |||
| f45bf002ba | |||
| 630e9b68b7 | |||
| 787e10a989 | |||
| 7de6a5f0fc | |||
| 83230ba962 | |||
| 6ef786c4e7 | |||
| d4c29d7b98 | |||
| 95a4f2e630 | |||
| faa35dd65a | |||
| 7c54c6b9c3 | |||
| 2d1e38bdff | |||
| 33bb355975 | |||
| 2f20a3a8ed | |||
| 8b3bfe253f | |||
| 22b9646ac4 | |||
| 1df8ad8a0c | |||
| bb7721dbc6 | |||
| 475c552e3a | |||
| c85832c93b | |||
| 7e991186fe | |||
| 95d06ec669 | |||
| 84810d8644 | |||
| 8a86f0d0b2 | |||
| eab4986fd3 | |||
| 3c644c570e | |||
| 7a9df3c15c | |||
| f9d8acf744 | |||
| 75f3770f3e | |||
| 85dd61a272 | |||
| 1c5412de14 | |||
| 034027ddd5 | |||
| 81a07a8172 | |||
| d9e8c2133e | |||
| 99aa7a7071 | |||
| bf7418339e | |||
| cc585cc63f | |||
| 293f90fde5 | |||
| a06e4b3454 | |||
| 6e5145e21b | |||
| d41f3e9fd1 | |||
| 5519018043 | |||
| e3121219b6 | |||
| 7272bbb6b0 | |||
| dc741f421b | |||
| 69d3b8a210 | |||
| f5c4067291 | |||
| 930a45cbad | |||
| ef612c0d4f | |||
| 723e9c5ff5 | |||
| 0fdcfabfbe | |||
| b6c3f014cb | |||
| 1937bb4c99 | |||
| cdd5d9befc | |||
| 232a14fd96 | |||
| 3038c98a7a | |||
| 4dd240c358 | |||
| c66e876ab7 | |||
| a7762595fa | |||
| 1ac471dfe7 | |||
| 72a549ea0f | |||
| 878afd695f | |||
| 50b23731df | |||
| 95df6b54ea | |||
| ee626eb631 | |||
| 26f805738d | |||
| 30b89c2418 | |||
| b933b2a113 | |||
| dfbe6d67aa | |||
| 8cca562a33 | |||
| b1e207765f | |||
| b140c15fc8 | |||
| 859564c476 | |||
| 3c48076996 | |||
| 01fd53e467 | |||
| 8001c37c91 | |||
| f139dd391a | |||
| 27588b44c3 | |||
| 79c78615f5 | |||
| 3971228fc3 | |||
| 5dbce7642e | |||
| f0d14f6bdc | |||
| 18e8802299 | |||
| 51ff0b8e14 | |||
| 8ea3ac2745 | |||
| a4c9850d8e | |||
| 9e7522951c | |||
| b43a025d1a | |||
| 2aa82f09c6 | |||
| 27f800356c | |||
| 20ddf25605 | |||
| c79ffee6e4 | |||
| 1972e9ec20 | |||
| 2a238b0b02 | |||
| 639b6c9f0a | |||
| 2d6bf544da | |||
| a56b6d72f6 | |||
| c03de14b79 | |||
| 44fc422aa3 | |||
| 58880c17aa | |||
| 2be3b9ed07 | |||
| 9dfaa11cc6 | |||
| 49492f9f21 | |||
| 84e120df95 | |||
| b21f0bc398 | |||
| d8463c3178 | |||
| e1681edda3 | |||
| 25ee8522ad | |||
| df356e8711 | |||
| 2e43700cd7 | |||
| b3769d99bf | |||
| 2aa85a03f8 | |||
| c0982e82c6 | |||
| 8971fe3b6b | |||
| 243e35ec15 | |||
| 4cf1f882b8 | |||
| a8129e4685 | |||
| 50a4bfcac7 | |||
| 90ac9a1e43 | |||
| 52b19365d7 | |||
| 399865f5f7 | |||
| 2eb4784e83 | |||
| be2085b397 | |||
| 2837ea835a | |||
| a84e673d88 | |||
| 2bc840a4e2 | |||
| aa6f99f32e |
@@ -7,7 +7,7 @@ jobs:
|
|||||||
name: Check
|
name: Check
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
- run: cargo check
|
- run: cargo check
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
name: Test Suite
|
name: Test Suite
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
- run: cargo test
|
- run: cargo test
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@ jobs:
|
|||||||
name: Trunk
|
name: Trunk
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: nightly
|
toolchain: nightly
|
||||||
@@ -35,7 +35,7 @@ jobs:
|
|||||||
name: Rustfmt
|
name: Rustfmt
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
components: rustfmt
|
components: rustfmt
|
||||||
@@ -46,7 +46,7 @@ jobs:
|
|||||||
name: build
|
name: build
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
- run: cargo build
|
- run: cargo build
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ jobs:
|
|||||||
name: Disallow unused dependencies
|
name: Disallow unused dependencies
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v6
|
||||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
toolchain: nightly
|
toolchain: nightly
|
||||||
|
|||||||
2242
Cargo.lock
generated
2242
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "UNLICENSED"
|
license = "UNLICENSED"
|
||||||
publish = ["xinu"]
|
publish = ["xinu"]
|
||||||
version = "0.17.45"
|
version = "0.17.66"
|
||||||
repository = "https://git.z.xinu.tv/wathiede/letterbox"
|
repository = "https://git.z.xinu.tv/wathiede/letterbox"
|
||||||
|
|
||||||
[profile.dev]
|
[profile.dev]
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ version.workspace = true
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0.98"
|
anyhow = "1.0.98"
|
||||||
clap = { version = "4.5.37", features = ["derive", "env"] }
|
clap = { version = "4.5.37", features = ["derive", "env"] }
|
||||||
letterbox-notmuch = { version = "0.17.9", registry = "xinu" }
|
letterbox-notmuch = { version = "0.17", registry = "xinu" }
|
||||||
letterbox-shared = { version = "0.17.9", registry = "xinu" }
|
letterbox-shared = { version = "0.17", registry = "xinu" }
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio"] }
|
sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio"] }
|
||||||
tokio = { version = "1.44.2", features = ["rt", "macros", "rt-multi-thread"] }
|
tokio = { version = "1.44.2", features = ["rt", "macros", "rt-multi-thread"] }
|
||||||
|
|||||||
14
server/.sqlx/query-77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795.json
generated
Normal file
14
server/.sqlx/query-77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795.json
generated
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"db_name": "PostgreSQL",
|
||||||
|
"query": "DELETE FROM snooze WHERE id = $1",
|
||||||
|
"describe": {
|
||||||
|
"columns": [],
|
||||||
|
"parameters": {
|
||||||
|
"Left": [
|
||||||
|
"Int4"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"nullable": []
|
||||||
|
},
|
||||||
|
"hash": "77f79f981a9736d18ffd4b87d3aec34d6a048162154a3aba833370c58a860795"
|
||||||
|
}
|
||||||
26
server/.sqlx/query-c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084.json
generated
Normal file
26
server/.sqlx/query-c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084.json
generated
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"db_name": "PostgreSQL",
|
||||||
|
"query": "\nSELECT id, message_id\nFROM snooze\nWHERE wake < NOW();\n ",
|
||||||
|
"describe": {
|
||||||
|
"columns": [
|
||||||
|
{
|
||||||
|
"ordinal": 0,
|
||||||
|
"name": "id",
|
||||||
|
"type_info": "Int4"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"ordinal": 1,
|
||||||
|
"name": "message_id",
|
||||||
|
"type_info": "Text"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"parameters": {
|
||||||
|
"Left": []
|
||||||
|
},
|
||||||
|
"nullable": [
|
||||||
|
false,
|
||||||
|
false
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"hash": "c8383663124a5cc5912b54553f18f7064d33087ebfdf3c0c1c43cbe6d3577084"
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"db_name": "PostgreSQL",
|
"db_name": "PostgreSQL",
|
||||||
"query": "SELECT\n p.id,\n link,\n clean_summary\nFROM\n post AS p\nINNER JOIN feed AS f ON p.site = f.slug -- necessary to weed out nzb posts\nWHERE\n search_summary IS NULL\n -- TODO remove AND link ~ '^<'\nORDER BY\n ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)\nLIMIT 100;\n",
|
"query": "SELECT\n p.id,\n link,\n clean_summary\nFROM\n post AS p\nINNER JOIN feed AS f ON p.site = f.slug -- necessary to weed out nzb posts\nWHERE\n search_summary IS NULL\n -- TODO remove AND link ~ '^<'\nORDER BY\n ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)\nLIMIT 1000;\n",
|
||||||
"describe": {
|
"describe": {
|
||||||
"columns": [
|
"columns": [
|
||||||
{
|
{
|
||||||
@@ -28,5 +28,5 @@
|
|||||||
true
|
true
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"hash": "3d271b404f06497a5dcde68cf6bf07291d70fa56058ea736ac24e91d33050c04"
|
"hash": "cf369e3d5547f400cb54004dd03783ef6998a000aec91c50a79405dcf1c53b17"
|
||||||
}
|
}
|
||||||
15
server/.sqlx/query-effd0d0d91e6ad84546f7177f1fd39d4fad736b471eb5e55fd5ac74f7adff664.json
generated
Normal file
15
server/.sqlx/query-effd0d0d91e6ad84546f7177f1fd39d4fad736b471eb5e55fd5ac74f7adff664.json
generated
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"db_name": "PostgreSQL",
|
||||||
|
"query": "\n INSERT INTO snooze (message_id, wake)\n VALUES ($1, $2)\n ON CONFLICT (message_id) DO UPDATE\n SET wake = $2\n ",
|
||||||
|
"describe": {
|
||||||
|
"columns": [],
|
||||||
|
"parameters": {
|
||||||
|
"Left": [
|
||||||
|
"Text",
|
||||||
|
"Timestamptz"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"nullable": []
|
||||||
|
},
|
||||||
|
"hash": "effd0d0d91e6ad84546f7177f1fd39d4fad736b471eb5e55fd5ac74f7adff664"
|
||||||
|
}
|
||||||
@@ -16,8 +16,8 @@ chrono-tz = "0.10"
|
|||||||
html2text = "0.16"
|
html2text = "0.16"
|
||||||
ammonia = "4.1.0"
|
ammonia = "4.1.0"
|
||||||
anyhow = "1.0.98"
|
anyhow = "1.0.98"
|
||||||
askama = { version = "0.14.0", features = ["derive"] }
|
askama = { version = "0.15.0", features = ["derive"] }
|
||||||
async-graphql = { version = "7", features = ["log"] }
|
async-graphql = { version = "7", features = ["log", "chrono"] }
|
||||||
async-graphql-axum = "7.0.16"
|
async-graphql-axum = "7.0.16"
|
||||||
async-trait = "0.1.88"
|
async-trait = "0.1.88"
|
||||||
axum = { version = "0.8.3", features = ["ws"] }
|
axum = { version = "0.8.3", features = ["ws"] }
|
||||||
@@ -26,26 +26,26 @@ build-info = "0.0.42"
|
|||||||
cacher = { version = "0.2.0", registry = "xinu" }
|
cacher = { version = "0.2.0", registry = "xinu" }
|
||||||
chrono = "0.4.40"
|
chrono = "0.4.40"
|
||||||
clap = { version = "4.5.37", features = ["derive"] }
|
clap = { version = "4.5.37", features = ["derive"] }
|
||||||
css-inline = "0.17.0"
|
css-inline = "0.19.0"
|
||||||
flate2 = "1.1.2"
|
flate2 = "1.1.2"
|
||||||
futures = "0.3.31"
|
futures = "0.3.31"
|
||||||
headers = "0.4.0"
|
headers = "0.4.0"
|
||||||
html-escape = "0.2.13"
|
html-escape = "0.2.13"
|
||||||
ical = "0.11"
|
ical = "0.11"
|
||||||
letterbox-notmuch = { path = "../notmuch", version = "0.17.45", registry = "xinu" }
|
letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
|
||||||
letterbox-shared = { path = "../shared", version = "0.17.45", registry = "xinu" }
|
letterbox-shared = { path = "../shared", version = "0.17", registry = "xinu" }
|
||||||
linkify = "0.10.0"
|
linkify = "0.10.0"
|
||||||
lol_html = "2.3.0"
|
lol_html = "2.3.0"
|
||||||
mailparse = "0.16.1"
|
mailparse = "0.16.1"
|
||||||
maplit = "1.0.2"
|
maplit = "1.0.2"
|
||||||
memmap = "0.7.0"
|
memmap = "0.7.0"
|
||||||
quick-xml = { version = "0.38.1", features = ["serialize"] }
|
quick-xml = { version = "0.39.0", features = ["serialize"] }
|
||||||
regex = "1.11.1"
|
regex = "1.11.1"
|
||||||
reqwest = { version = "0.12.15", features = ["blocking"] }
|
reqwest = { version = "0.13.0", features = ["blocking"] }
|
||||||
scraper = "0.24.0"
|
scraper = "0.25.0"
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
serde_json = "1.0.140"
|
serde_json = "1.0.140"
|
||||||
sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "time"] }
|
sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "chrono"] }
|
||||||
tantivy = { version = "0.25.0", optional = true }
|
tantivy = { version = "0.25.0", optional = true }
|
||||||
thiserror = "2.0.12"
|
thiserror = "2.0.12"
|
||||||
tokio = "1.44.2"
|
tokio = "1.44.2"
|
||||||
@@ -56,7 +56,7 @@ urlencoding = "2.1.3"
|
|||||||
#xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
|
#xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
|
||||||
#xtracing = { path = "../../xtracing" }
|
#xtracing = { path = "../../xtracing" }
|
||||||
xtracing = { version = "0.3.2", registry = "xinu" }
|
xtracing = { version = "0.3.2", registry = "xinu" }
|
||||||
zip = "5.0.0"
|
zip = { version = "7.0.0", default-features = false, features = ["aes-crypto", "bzip2", "deflate64", "deflate", "time", "zstd"] }
|
||||||
|
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
|
|||||||
2
server/migrations/20250630023836_snooze.down.sql
Normal file
2
server/migrations/20250630023836_snooze.down.sql
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
-- Add down migration script here
|
||||||
|
DROP TABLE IF EXISTS snooze;
|
||||||
6
server/migrations/20250630023836_snooze.up.sql
Normal file
6
server/migrations/20250630023836_snooze.up.sql
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
-- Add up migration script here
|
||||||
|
CREATE TABLE IF NOT EXISTS snooze (
|
||||||
|
id integer NOT NULL GENERATED ALWAYS AS IDENTITY,
|
||||||
|
message_id text NOT NULL UNIQUE,
|
||||||
|
wake timestamptz NOT NULL
|
||||||
|
);
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
DROP INDEX IF EXISTS movie_sets_year_id_idx;
|
||||||
|
DROP INDEX IF EXISTS movie_sets_year_idx;
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
-- Add index on movie_sets.year to speed up year-based queries
|
||||||
|
CREATE INDEX movie_sets_year_idx ON movie_sets(year);
|
||||||
|
|
||||||
|
-- Composite index for queries that filter by year and return id
|
||||||
|
-- This can make the subquery in UPDATE statements even faster
|
||||||
|
CREATE INDEX movie_sets_year_id_idx ON movie_sets(year, id);
|
||||||
@@ -10,4 +10,4 @@ WHERE
|
|||||||
-- TODO remove AND link ~ '^<'
|
-- TODO remove AND link ~ '^<'
|
||||||
ORDER BY
|
ORDER BY
|
||||||
ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)
|
ROW_NUMBER() OVER (PARTITION BY site ORDER BY date DESC)
|
||||||
LIMIT 100;
|
LIMIT 1000;
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ const TEXT_PLAIN: &'static str = "text/plain";
|
|||||||
// Inline Askama filters module for template use
|
// Inline Askama filters module for template use
|
||||||
mod filters {
|
mod filters {
|
||||||
// Usage: {{ items|batch(7) }}
|
// Usage: {{ items|batch(7) }}
|
||||||
|
#[askama::filter_fn]
|
||||||
pub fn batch<T: Clone>(
|
pub fn batch<T: Clone>(
|
||||||
items: &[T],
|
items: &[T],
|
||||||
_: &dyn ::askama::Values,
|
_: &dyn ::askama::Values,
|
||||||
@@ -148,7 +149,7 @@ pub fn extract_calendar_metadata_from_mail(
|
|||||||
|
|
||||||
// Fallback extraction: if iCal did not provide metadata, extract from subject/body before generating fallback HTML
|
// Fallback extraction: if iCal did not provide metadata, extract from subject/body before generating fallback HTML
|
||||||
if body_html.is_none() {
|
if body_html.is_none() {
|
||||||
// Try to extract summary from subject (e.g., "New event: <summary> @ ...")
|
// Try to extract summary from subject (e.g., "New event: <summary> @ ..." or "Updated invitation: <summary> @ ...")
|
||||||
if summary.is_none() {
|
if summary.is_none() {
|
||||||
if let Some(subject) = m.headers.get_first_value("Subject") {
|
if let Some(subject) = m.headers.get_first_value("Subject") {
|
||||||
if let Some(caps) = regex::Regex::new(r"New event: ([^@]+) @")
|
if let Some(caps) = regex::Regex::new(r"New event: ([^@]+) @")
|
||||||
@@ -161,22 +162,52 @@ pub fn extract_calendar_metadata_from_mail(
|
|||||||
.and_then(|re| re.captures(&subject))
|
.and_then(|re| re.captures(&subject))
|
||||||
{
|
{
|
||||||
summary = Some(caps[1].trim().to_string());
|
summary = Some(caps[1].trim().to_string());
|
||||||
|
} else if let Some(caps) = regex::Regex::new(r"Updated invitation: ([^@]+) @")
|
||||||
|
.ok()
|
||||||
|
.and_then(|re| re.captures(&subject))
|
||||||
|
{
|
||||||
|
summary = Some(caps[1].trim().to_string());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Try to extract start/end dates from subject
|
// Try to extract start/end dates from subject
|
||||||
if start_date.is_none() || end_date.is_none() {
|
if start_date.is_none() || end_date.is_none() {
|
||||||
if let Some(subject) = m.headers.get_first_value("Subject") {
|
if let Some(subject) = m.headers.get_first_value("Subject") {
|
||||||
// Pattern: New event: Dentist appt @ Tue Sep 23, 2025 3pm - 4pm (PDT) (tconvertino@gmail.com)
|
// Pattern: @ Tue Sep 23, 2025 3pm - 4pm (works for New event, Invitation, Updated invitation, etc.)
|
||||||
if let Some(caps) = regex::Regex::new(r"New event: [^@]+@ ([A-Za-z]{3}) ([A-Za-z]{3}) (\d{1,2}), (\d{4}) (\d{1,2})(?::(\d{2}))? ?([ap]m) ?- ?(\d{1,2})(?::(\d{2}))? ?([ap]m)").ok().and_then(|re| re.captures(&subject)) {
|
if let Some(caps) = regex::Regex::new(r"@ ([A-Za-z]{3}) ([A-Za-z]{3}) (\d{1,2}), (\d{4}) (\d{1,2})(?::(\d{2}))? ?([ap]m) ?- ?(\d{1,2})(?::(\d{2}))? ?([ap]m)").ok().and_then(|re| re.captures(&subject)) {
|
||||||
let month = &caps[2];
|
let month = &caps[2];
|
||||||
let day = &caps[3];
|
let day = &caps[3];
|
||||||
let year = &caps[4];
|
let year = &caps[4];
|
||||||
|
let start_hour: u32 = caps[5].parse().unwrap_or(0);
|
||||||
|
let start_min: u32 = caps.get(6).map(|m| m.as_str().parse().unwrap_or(0)).unwrap_or(0);
|
||||||
|
let start_ampm = &caps[7];
|
||||||
|
let end_hour: u32 = caps[8].parse().unwrap_or(0);
|
||||||
|
let end_min: u32 = caps.get(9).map(|m| m.as_str().parse().unwrap_or(0)).unwrap_or(0);
|
||||||
|
let end_ampm = &caps[10];
|
||||||
|
|
||||||
|
// Convert 12-hour to 24-hour format
|
||||||
|
let start_hour_24 = if start_ampm == "pm" && start_hour != 12 {
|
||||||
|
start_hour + 12
|
||||||
|
} else if start_ampm == "am" && start_hour == 12 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
start_hour
|
||||||
|
};
|
||||||
|
let end_hour_24 = if end_ampm == "pm" && end_hour != 12 {
|
||||||
|
end_hour + 12
|
||||||
|
} else if end_ampm == "am" && end_hour == 12 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
end_hour
|
||||||
|
};
|
||||||
|
|
||||||
let date_str = format!("{} {} {}", month, day, year);
|
let date_str = format!("{} {} {}", month, day, year);
|
||||||
if let Ok(date) = chrono::NaiveDate::parse_from_str(&date_str, "%b %d %Y") {
|
if let Ok(date) = chrono::NaiveDate::parse_from_str(&date_str, "%b %d %Y") {
|
||||||
let ymd = date.format("%Y%m%d").to_string();
|
// Store date with time in YYYYMMDDTHHMMSS format for start/end
|
||||||
start_date = Some(ymd.clone());
|
let start_dt = format!("{}T{:02}{:02}00", date.format("%Y%m%d"), start_hour_24, start_min);
|
||||||
end_date = Some(ymd);
|
let end_dt = format!("{}T{:02}{:02}00", date.format("%Y%m%d"), end_hour_24, end_min);
|
||||||
|
start_date = Some(start_dt);
|
||||||
|
end_date = Some(end_dt);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Pattern: from Thu Sep 11 to Fri Jan 30, 2026
|
// Pattern: from Thu Sep 11 to Fri Jan 30, 2026
|
||||||
@@ -195,8 +226,16 @@ pub fn extract_calendar_metadata_from_mail(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let (Some(sm), Some(em)) = (month_num(start_month), month_num(end_month)) {
|
if let (Some(sm), Some(em)) = (month_num(start_month), month_num(end_month)) {
|
||||||
let current_year = chrono::Local::now().year().to_string();
|
// If start month is later in calendar year than end month, start is in previous year
|
||||||
let start = format!("{}{}{}", current_year, sm, format!("{:0>2}", start_day));
|
let sm_num: u32 = sm.parse().unwrap_or(1);
|
||||||
|
let em_num: u32 = em.parse().unwrap_or(1);
|
||||||
|
let end_year = year.parse::<i32>().unwrap_or_else(|_| chrono::Local::now().year());
|
||||||
|
let start_year: i32 = if sm_num > em_num {
|
||||||
|
end_year - 1
|
||||||
|
} else {
|
||||||
|
end_year
|
||||||
|
};
|
||||||
|
let start = format!("{}{}{}", start_year, sm, format!("{:0>2}", start_day));
|
||||||
let mut end_date_val = chrono::NaiveDate::parse_from_str(&format!("{}-{}-{}", year, em, format!("{:0>2}", end_day)), "%Y-%m-%d").ok();
|
let mut end_date_val = chrono::NaiveDate::parse_from_str(&format!("{}-{}-{}", year, em, format!("{:0>2}", end_day)), "%Y-%m-%d").ok();
|
||||||
if let Some(d) = end_date_val.as_mut() {
|
if let Some(d) = end_date_val.as_mut() {
|
||||||
*d = d.succ_opt().unwrap_or(*d);
|
*d = d.succ_opt().unwrap_or(*d);
|
||||||
@@ -232,6 +271,31 @@ pub fn extract_calendar_metadata_from_mail(
|
|||||||
if end_date.is_none() { end_date = Some(end); }
|
if end_date.is_none() { end_date = Some(end); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Pattern: single all-day event: @ Sun Jan 18, 2026 (no time range)
|
||||||
|
if start_date.is_none() {
|
||||||
|
if let Some(caps) = regex::Regex::new(r"@ [A-Za-z]{3} ([A-Za-z]{3}) (\d{1,2}), (\d{4})(?:\s*\(|$)").ok().and_then(|re| re.captures(&subject)) {
|
||||||
|
let month = &caps[1];
|
||||||
|
let day = &caps[2];
|
||||||
|
let year = &caps[3];
|
||||||
|
fn month_num(mon: &str) -> Option<&'static str> {
|
||||||
|
match mon {
|
||||||
|
"Jan" => Some("01"), "Feb" => Some("02"), "Mar" => Some("03"), "Apr" => Some("04"),
|
||||||
|
"May" => Some("05"), "Jun" => Some("06"), "Jul" => Some("07"), "Aug" => Some("08"),
|
||||||
|
"Sep" => Some("09"), "Oct" => Some("10"), "Nov" => Some("11"), "Dec" => Some("12"),
|
||||||
|
_ => None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(mm) = month_num(month) {
|
||||||
|
let start = format!("{}{}{:0>2}", year, mm, day);
|
||||||
|
// For all-day events, end date is the next day (exclusive)
|
||||||
|
if let Ok(d) = chrono::NaiveDate::parse_from_str(&format!("{}-{}-{:0>2}", year, mm, day), "%Y-%m-%d") {
|
||||||
|
let end = d.succ_opt().unwrap_or(d).format("%Y%m%d").to_string();
|
||||||
|
start_date = Some(start);
|
||||||
|
end_date = Some(end);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -319,6 +383,8 @@ pub fn extract_calendar_metadata_from_mail(
|
|||||||
let needs_ical_flex =
|
let needs_ical_flex =
|
||||||
summary.is_some() || start_date.is_some() || end_date.is_some() || has_recurrence;
|
summary.is_some() || start_date.is_some() || end_date.is_some() || has_recurrence;
|
||||||
if needs_ical_flex {
|
if needs_ical_flex {
|
||||||
|
use chrono::{Datelike, NaiveDate};
|
||||||
|
|
||||||
let summary_val = summary.clone().unwrap_or_default();
|
let summary_val = summary.clone().unwrap_or_default();
|
||||||
let organizer_val = organizer.clone().unwrap_or_default();
|
let organizer_val = organizer.clone().unwrap_or_default();
|
||||||
let start_val = start_date.clone().unwrap_or_default();
|
let start_val = start_date.clone().unwrap_or_default();
|
||||||
@@ -328,15 +394,133 @@ pub fn extract_calendar_metadata_from_mail(
|
|||||||
} else {
|
} else {
|
||||||
String::new()
|
String::new()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Compute event_days and all_days for calendar grid rendering
|
||||||
|
let mut event_days: Vec<NaiveDate> = Vec::new();
|
||||||
|
let (local_fmt_start, local_fmt_end) = if let (Some(ref start_str), Some(ref end_str)) =
|
||||||
|
(&start_date, &end_date)
|
||||||
|
{
|
||||||
|
// Parse dates - try YYYYMMDDTHHMMSS format first (with time), then YYYYMMDD (date only)
|
||||||
|
let (start_d, start_time) = if start_str.contains('T') {
|
||||||
|
let parts: Vec<&str> = start_str.split('T').collect();
|
||||||
|
let date = NaiveDate::parse_from_str(parts[0], "%Y%m%d").ok();
|
||||||
|
let time = if parts.len() > 1 {
|
||||||
|
chrono::NaiveTime::parse_from_str(parts[1], "%H%M%S").ok()
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
(date, time)
|
||||||
|
} else {
|
||||||
|
(NaiveDate::parse_from_str(start_str, "%Y%m%d").ok(), None)
|
||||||
|
};
|
||||||
|
|
||||||
|
let (end_d, end_time) = if end_str.contains('T') {
|
||||||
|
let parts: Vec<&str> = end_str.split('T').collect();
|
||||||
|
let date = NaiveDate::parse_from_str(parts[0], "%Y%m%d").ok();
|
||||||
|
let time = if parts.len() > 1 {
|
||||||
|
chrono::NaiveTime::parse_from_str(parts[1], "%H%M%S").ok()
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
(date, time)
|
||||||
|
} else {
|
||||||
|
(NaiveDate::parse_from_str(end_str, "%Y%m%d").ok(), None)
|
||||||
|
};
|
||||||
|
|
||||||
|
if let (Some(start), Some(end)) = (start_d, end_d) {
|
||||||
|
// For all-day events (no time), end date is exclusive, so we need to subtract one day
|
||||||
|
let is_allday = start_time.is_none() && end_time.is_none();
|
||||||
|
let display_end = if is_allday && end > start {
|
||||||
|
end.pred_opt().unwrap_or(end)
|
||||||
|
} else {
|
||||||
|
end
|
||||||
|
};
|
||||||
|
|
||||||
|
// Add all days from start to display_end (inclusive) to event_days
|
||||||
|
let mut day_iter = start;
|
||||||
|
while day_iter <= display_end {
|
||||||
|
event_days.push(day_iter);
|
||||||
|
day_iter = day_iter.succ_opt().unwrap_or(day_iter);
|
||||||
|
if day_iter == display_end && day_iter == start {
|
||||||
|
// Single day event
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Format dates for display - include time if available
|
||||||
|
let fmt_start = if let Some(t) = start_time {
|
||||||
|
format!("{} {}", start.format("%a %b %e, %Y"), t.format("%-I:%M %p"))
|
||||||
|
} else {
|
||||||
|
start.format("%a %b %e, %Y").to_string()
|
||||||
|
};
|
||||||
|
let fmt_end = if let Some(t) = end_time {
|
||||||
|
format!("{} {}", display_end.format("%a %b %e, %Y"), t.format("%-I:%M %p"))
|
||||||
|
} else {
|
||||||
|
display_end.format("%a %b %e, %Y").to_string()
|
||||||
|
};
|
||||||
|
(fmt_start, fmt_end)
|
||||||
|
} else {
|
||||||
|
(start_val.clone(), end_val.clone())
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
(start_val.clone(), end_val.clone())
|
||||||
|
};
|
||||||
|
|
||||||
|
// Compute calendar grid (all_days) from event_days
|
||||||
|
let (all_days, caption) = if !event_days.is_empty() {
|
||||||
|
let first_event = event_days.first().unwrap();
|
||||||
|
let last_event = event_days.last().unwrap();
|
||||||
|
|
||||||
|
let first_of_month =
|
||||||
|
NaiveDate::from_ymd_opt(first_event.year(), first_event.month(), 1).unwrap();
|
||||||
|
let last_of_month = {
|
||||||
|
let next_month = if last_event.month() == 12 {
|
||||||
|
NaiveDate::from_ymd_opt(last_event.year() + 1, 1, 1).unwrap()
|
||||||
|
} else {
|
||||||
|
NaiveDate::from_ymd_opt(last_event.year(), last_event.month() + 1, 1).unwrap()
|
||||||
|
};
|
||||||
|
next_month.pred_opt().unwrap()
|
||||||
|
};
|
||||||
|
|
||||||
|
// Start from Sunday of the week containing first_of_month
|
||||||
|
let mut cal_start = first_of_month;
|
||||||
|
while cal_start.weekday() != chrono::Weekday::Sun {
|
||||||
|
cal_start = cal_start.pred_opt().unwrap();
|
||||||
|
}
|
||||||
|
// End on Saturday of the week containing last_of_month
|
||||||
|
let mut cal_end = last_of_month;
|
||||||
|
while cal_end.weekday() != chrono::Weekday::Sat {
|
||||||
|
cal_end = cal_end.succ_opt().unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut all_days = vec![];
|
||||||
|
let mut d = cal_start;
|
||||||
|
while d <= cal_end {
|
||||||
|
all_days.push(d);
|
||||||
|
d = d.succ_opt().unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
let start_month = first_event.format("%B %Y");
|
||||||
|
let end_month = last_event.format("%B %Y");
|
||||||
|
let caption = if start_month.to_string() == end_month.to_string() {
|
||||||
|
start_month.to_string()
|
||||||
|
} else {
|
||||||
|
format!("{} – {}", start_month, end_month)
|
||||||
|
};
|
||||||
|
(all_days, caption)
|
||||||
|
} else {
|
||||||
|
(vec![], String::new())
|
||||||
|
};
|
||||||
|
|
||||||
let template = IcalSummaryTemplate {
|
let template = IcalSummaryTemplate {
|
||||||
summary: &summary_val,
|
summary: &summary_val,
|
||||||
local_fmt_start: &start_val,
|
local_fmt_start: &local_fmt_start,
|
||||||
local_fmt_end: &end_val,
|
local_fmt_end: &local_fmt_end,
|
||||||
organizer: &organizer_val,
|
organizer: &organizer_val,
|
||||||
organizer_cn: "",
|
organizer_cn: "",
|
||||||
all_days: vec![],
|
all_days,
|
||||||
event_days: vec![],
|
event_days,
|
||||||
caption: String::new(),
|
caption,
|
||||||
description_paragraphs: &[],
|
description_paragraphs: &[],
|
||||||
today: Some(chrono::Local::now().date_naive()),
|
today: Some(chrono::Local::now().date_naive()),
|
||||||
recurrence_display,
|
recurrence_display,
|
||||||
@@ -2268,17 +2452,18 @@ mod tests {
|
|||||||
assert_eq!(meta.summary, Some("Dentist appt".to_string()));
|
assert_eq!(meta.summary, Some("Dentist appt".to_string()));
|
||||||
// Organizer: from From header, extract email address
|
// Organizer: from From header, extract email address
|
||||||
assert_eq!(meta.organizer, Some("tconvertino@gmail.com".to_string()));
|
assert_eq!(meta.organizer, Some("tconvertino@gmail.com".to_string()));
|
||||||
// Dates: should extract Sep 23, 2025, 3pm-4pm
|
// Dates: should extract Sep 23, 2025, 3pm-4pm (15:00-16:00)
|
||||||
assert_eq!(meta.start_date, Some("20250923".to_string()));
|
assert_eq!(meta.start_date, Some("20250923T150000".to_string()));
|
||||||
assert_eq!(meta.end_date, Some("20250923".to_string()));
|
assert_eq!(meta.end_date, Some("20250923T160000".to_string()));
|
||||||
// Should not be recurring
|
// Should not be recurring
|
||||||
if let Some(ref html) = meta.body_html {
|
if let Some(ref html) = meta.body_html {
|
||||||
assert!(
|
assert!(
|
||||||
html.contains("Dentist appt"),
|
html.contains("Dentist appt"),
|
||||||
"HTML should contain the summary"
|
"HTML should contain the summary"
|
||||||
);
|
);
|
||||||
|
// Date is now formatted as human-readable "Tue Sep 23, 2025"
|
||||||
assert!(
|
assert!(
|
||||||
html.contains("20250923"),
|
html.contains("Sep 23, 2025") || html.contains("20250923"),
|
||||||
"HTML should contain the event date"
|
"HTML should contain the event date"
|
||||||
);
|
);
|
||||||
assert!(
|
assert!(
|
||||||
@@ -2307,8 +2492,8 @@ mod tests {
|
|||||||
Some("calendar-notification@google.com".to_string())
|
Some("calendar-notification@google.com".to_string())
|
||||||
);
|
);
|
||||||
// Dates: from subject, Thu Sep 11 to Fri Jan 30, 2026
|
// Dates: from subject, Thu Sep 11 to Fri Jan 30, 2026
|
||||||
let current_year = chrono::Local::now().year();
|
// Start date is Sep 11, 2025 (one year before end since Sep > Jan)
|
||||||
assert_eq!(meta.start_date, Some(format!("{}0911", current_year)));
|
assert_eq!(meta.start_date, Some("20250911".to_string()));
|
||||||
assert_eq!(meta.end_date, Some("20260131".to_string()));
|
assert_eq!(meta.end_date, Some("20260131".to_string()));
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
@@ -2332,12 +2517,13 @@ mod tests {
|
|||||||
html.contains("<b>Organizer:</b> calendar-notification@google.com"),
|
html.contains("<b>Organizer:</b> calendar-notification@google.com"),
|
||||||
"HTML should contain the labeled organizer"
|
"HTML should contain the labeled organizer"
|
||||||
);
|
);
|
||||||
|
// Dates are now formatted as human-readable
|
||||||
assert!(
|
assert!(
|
||||||
html.contains("<b>Start:</b> 20250911"),
|
html.contains("<b>Start:</b> Thu Sep 11, 2025") || html.contains("<b>Start:</b> 20250911"),
|
||||||
"HTML should contain the labeled start time"
|
"HTML should contain the labeled start time"
|
||||||
);
|
);
|
||||||
assert!(
|
assert!(
|
||||||
html.contains("<b>End:</b> 20260131"),
|
html.contains("<b>End:</b> Fri Jan 30, 2026") || html.contains("<b>End:</b> 20260131"),
|
||||||
"HTML should contain the labeled end time"
|
"HTML should contain the labeled end time"
|
||||||
);
|
);
|
||||||
if !html.contains("ical-flex") {
|
if !html.contains("ical-flex") {
|
||||||
@@ -2408,8 +2594,8 @@ mod tests {
|
|||||||
Some("calendar-notification@google.com".to_string())
|
Some("calendar-notification@google.com".to_string())
|
||||||
);
|
);
|
||||||
// Dates: from subject, Thu Sep 11 to Fri Jan 30, 2026
|
// Dates: from subject, Thu Sep 11 to Fri Jan 30, 2026
|
||||||
let current_year = chrono::Local::now().year();
|
// Start date is Sep 11, 2025 (one year before end since Sep > Jan)
|
||||||
assert_eq!(meta.start_date, Some(format!("{}0911", current_year)));
|
assert_eq!(meta.start_date, Some("20250911".to_string()));
|
||||||
assert_eq!(meta.end_date, Some("20260131".to_string()));
|
assert_eq!(meta.end_date, Some("20260131".to_string()));
|
||||||
// Debug: print the rendered HTML for inspection
|
// Debug: print the rendered HTML for inspection
|
||||||
if let Some(ref html) = meta.body_html {
|
if let Some(ref html) = meta.body_html {
|
||||||
@@ -2442,8 +2628,8 @@ mod tests {
|
|||||||
Some("calendar-notification@google.com".to_string())
|
Some("calendar-notification@google.com".to_string())
|
||||||
);
|
);
|
||||||
// Assert that the start and end dates are present
|
// Assert that the start and end dates are present
|
||||||
let current_year = chrono::Local::now().year();
|
// Start date is Sep 11, 2025 (one year before end since Sep > Jan)
|
||||||
assert_eq!(meta.start_date, Some(format!("{}0911", current_year)));
|
assert_eq!(meta.start_date, Some("20250911".to_string()));
|
||||||
assert_eq!(meta.end_date, Some("20260131".to_string()));
|
assert_eq!(meta.end_date, Some("20260131".to_string()));
|
||||||
// Assert that the HTML body contains recurrence info
|
// Assert that the HTML body contains recurrence info
|
||||||
if let Some(ref html) = meta.body_html {
|
if let Some(ref html) = meta.body_html {
|
||||||
@@ -2459,6 +2645,56 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn google_calendar_email_4_single_allday_event() {
|
||||||
|
use mailparse::parse_mail;
|
||||||
|
let raw_email = include_str!("../../server/testdata/google-calendar-example-4.eml");
|
||||||
|
let parsed = parse_mail(raw_email.as_bytes()).expect("parse_mail");
|
||||||
|
let mut part_addr = vec![];
|
||||||
|
let body = extract_body(&parsed, &mut part_addr).expect("extract_body");
|
||||||
|
let meta = extract_calendar_metadata_from_mail(&parsed, &body);
|
||||||
|
// Assert detection as Google Calendar
|
||||||
|
assert!(meta.is_google_calendar_event);
|
||||||
|
// Assert metadata extraction for single all-day event
|
||||||
|
assert_eq!(meta.summary, Some("Emery Sleeps Over".to_string()));
|
||||||
|
assert_eq!(meta.organizer, Some("tconvertino@gmail.com".to_string()));
|
||||||
|
// Dates: Sunday Jan 18, 2026 (all-day event)
|
||||||
|
assert_eq!(meta.start_date, Some("20260118".to_string()));
|
||||||
|
assert_eq!(meta.end_date, Some("20260119".to_string())); // All-day events end next day
|
||||||
|
// Assert ical summary is rendered and shows Jan 18 highlighted
|
||||||
|
let html = meta.body_html.expect("body_html");
|
||||||
|
println!("Rendered HTML: {}", html);
|
||||||
|
assert!(html.contains("ical-flex"), "Calendar widget should be rendered");
|
||||||
|
assert!(html.contains(r#"data-event-day="2026-01-18""#), "Jan 18 should be highlighted");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn google_calendar_email_5_updated_invitation() {
|
||||||
|
use mailparse::parse_mail;
|
||||||
|
let raw_email = include_str!("../../server/testdata/google-calendar-example-5.eml");
|
||||||
|
let parsed = parse_mail(raw_email.as_bytes()).expect("parse_mail");
|
||||||
|
let mut part_addr = vec![];
|
||||||
|
let body = extract_body(&parsed, &mut part_addr).expect("extract_body");
|
||||||
|
let meta = extract_calendar_metadata_from_mail(&parsed, &body);
|
||||||
|
// Assert detection as Google Calendar
|
||||||
|
assert!(meta.is_google_calendar_event);
|
||||||
|
// Assert metadata extraction for updated invitation
|
||||||
|
assert_eq!(meta.summary, Some("painting class".to_string()));
|
||||||
|
assert_eq!(meta.organizer, Some("tconvertino@gmail.com".to_string()));
|
||||||
|
// Dates: Thursday Feb 12, 2026 7pm - 9pm (same day event with time)
|
||||||
|
// Start: 7pm = 19:00, End: 9pm = 21:00
|
||||||
|
assert_eq!(meta.start_date, Some("20260212T190000".to_string()));
|
||||||
|
assert_eq!(meta.end_date, Some("20260212T210000".to_string()));
|
||||||
|
// Assert ical summary is rendered and shows Feb 12 highlighted
|
||||||
|
let html = meta.body_html.expect("body_html");
|
||||||
|
println!("Rendered HTML: {}", html);
|
||||||
|
assert!(html.contains("ical-flex"), "Calendar widget should be rendered");
|
||||||
|
assert!(html.contains(r#"data-event-day="2026-02-12""#), "Feb 12 should be highlighted");
|
||||||
|
// Verify time is displayed in the HTML
|
||||||
|
assert!(html.contains("7:00 PM") || html.contains("7pm") || html.contains("19:00"),
|
||||||
|
"HTML should contain the start time");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn recurring_event_rrule_metadata_and_highlight() {
|
fn recurring_event_rrule_metadata_and_highlight() {
|
||||||
use super::render_ical_summary;
|
use super::render_ical_summary;
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use async_graphql::{
|
|||||||
Union,
|
Union,
|
||||||
};
|
};
|
||||||
use cacher::FilesystemCacher;
|
use cacher::FilesystemCacher;
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
use futures::stream;
|
use futures::stream;
|
||||||
use letterbox_notmuch::Notmuch;
|
use letterbox_notmuch::Notmuch;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
@@ -628,6 +629,42 @@ impl MutationRoot {
|
|||||||
nm.tag_remove(&tag, &query)?;
|
nm.tag_remove(&tag, &query)?;
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
#[instrument(skip_all, fields(query=query, wake_time=wake_time.to_string(), rid=request_id()))]
|
||||||
|
async fn snooze<'ctx>(
|
||||||
|
&self,
|
||||||
|
ctx: &Context<'ctx>,
|
||||||
|
query: String,
|
||||||
|
wake_time: DateTime<Utc>,
|
||||||
|
) -> Result<bool, Error> {
|
||||||
|
info!("TODO snooze {query} until {wake_time})");
|
||||||
|
let pool = ctx.data_unchecked::<PgPool>();
|
||||||
|
sqlx::query!(
|
||||||
|
r#"
|
||||||
|
INSERT INTO snooze (message_id, wake)
|
||||||
|
VALUES ($1, $2)
|
||||||
|
ON CONFLICT (message_id) DO UPDATE
|
||||||
|
SET wake = $2
|
||||||
|
"#,
|
||||||
|
query,
|
||||||
|
wake_time
|
||||||
|
)
|
||||||
|
.execute(pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let nm = ctx.data_unchecked::<Notmuch>();
|
||||||
|
let pool = ctx.data_unchecked::<PgPool>();
|
||||||
|
#[cfg(feature = "tantivy")]
|
||||||
|
let tantivy = ctx.data_unchecked::<TantivyConnection>();
|
||||||
|
|
||||||
|
let unread = false;
|
||||||
|
let query: Query = query.parse()?;
|
||||||
|
newsreader::set_read_status(pool, &query, unread).await?;
|
||||||
|
#[cfg(feature = "tantivy")]
|
||||||
|
tantivy.reindex_thread(pool, &query).await?;
|
||||||
|
nm::set_read_status(nm, &query, unread).await?;
|
||||||
|
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
/// Drop and recreate tantivy index. Warning this is slow
|
/// Drop and recreate tantivy index. Warning this is slow
|
||||||
#[cfg(feature = "tantivy")]
|
#[cfg(feature = "tantivy")]
|
||||||
async fn drop_and_load_index<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
|
async fn drop_and_load_index<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
|
||||||
@@ -639,6 +676,18 @@ impl MutationRoot {
|
|||||||
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
#[instrument(skip_all, fields(rid=request_id()))]
|
||||||
|
async fn label_unprocessed<'ctx>(
|
||||||
|
&self,
|
||||||
|
ctx: &Context<'ctx>,
|
||||||
|
limit: Option<usize>,
|
||||||
|
) -> Result<bool, Error> {
|
||||||
|
let nm = ctx.data_unchecked::<Notmuch>();
|
||||||
|
let pool = ctx.data_unchecked::<PgPool>();
|
||||||
|
label_unprocessed(&nm, &pool, false, limit, "tag:unprocessed").await?;
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
|
|
||||||
#[instrument(skip_all, fields(rid=request_id()))]
|
#[instrument(skip_all, fields(rid=request_id()))]
|
||||||
async fn refresh<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
|
async fn refresh<'ctx>(&self, ctx: &Context<'ctx>) -> Result<bool, Error> {
|
||||||
let nm = ctx.data_unchecked::<Notmuch>();
|
let nm = ctx.data_unchecked::<Notmuch>();
|
||||||
@@ -648,7 +697,10 @@ impl MutationRoot {
|
|||||||
newsreader::refresh(pool, cacher).await?;
|
newsreader::refresh(pool, cacher).await?;
|
||||||
|
|
||||||
// Process email labels
|
// Process email labels
|
||||||
label_unprocessed(&nm, &pool, false, Some(10), "tag:unprocessed").await?;
|
label_unprocessed(&nm, &pool, false, Some(1000), "tag:unprocessed").await?;
|
||||||
|
|
||||||
|
// Look for snoozed messages and mark unread
|
||||||
|
wakeup(&nm, &pool).await?;
|
||||||
|
|
||||||
#[cfg(feature = "tantivy")]
|
#[cfg(feature = "tantivy")]
|
||||||
{
|
{
|
||||||
@@ -670,6 +722,33 @@ impl SubscriptionRoot {
|
|||||||
|
|
||||||
pub type GraphqlSchema = Schema<QueryRoot, MutationRoot, SubscriptionRoot>;
|
pub type GraphqlSchema = Schema<QueryRoot, MutationRoot, SubscriptionRoot>;
|
||||||
|
|
||||||
|
#[instrument(name = "wakeup", skip_all)]
|
||||||
|
pub async fn wakeup(nm: &Notmuch, pool: &PgPool) -> Result<(), Error> {
|
||||||
|
for row in sqlx::query!(
|
||||||
|
r#"
|
||||||
|
SELECT id, message_id
|
||||||
|
FROM snooze
|
||||||
|
WHERE wake < NOW();
|
||||||
|
"#
|
||||||
|
)
|
||||||
|
.fetch_all(pool)
|
||||||
|
.await?
|
||||||
|
{
|
||||||
|
let query: Query = row.message_id.parse()?;
|
||||||
|
info!("need to wake {query}");
|
||||||
|
let unread = true;
|
||||||
|
newsreader::set_read_status(pool, &query, unread).await?;
|
||||||
|
#[cfg(feature = "tantivy")]
|
||||||
|
tantivy.reindex_thread(pool, &query).await?;
|
||||||
|
nm::set_read_status(nm, &query, unread).await?;
|
||||||
|
|
||||||
|
sqlx::query!("DELETE FROM snooze WHERE id = $1", row.id)
|
||||||
|
.execute(pool)
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[instrument(skip_all, fields(query=query))]
|
#[instrument(skip_all, fields(query=query))]
|
||||||
pub async fn compute_catchup_ids(
|
pub async fn compute_catchup_ids(
|
||||||
nm: &Notmuch,
|
nm: &Notmuch,
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ use std::{
|
|||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use cacher::{Cacher, FilesystemCacher};
|
use cacher::{Cacher, FilesystemCacher};
|
||||||
|
use chrono::NaiveDateTime;
|
||||||
use css_inline::{CSSInliner, InlineError, InlineOptions};
|
use css_inline::{CSSInliner, InlineError, InlineOptions};
|
||||||
pub use error::ServerError;
|
pub use error::ServerError;
|
||||||
use linkify::{LinkFinder, LinkKind};
|
use linkify::{LinkFinder, LinkKind};
|
||||||
@@ -30,7 +31,6 @@ use maplit::{hashmap, hashset};
|
|||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use reqwest::StatusCode;
|
use reqwest::StatusCode;
|
||||||
use scraper::{Html, Selector};
|
use scraper::{Html, Selector};
|
||||||
use sqlx::types::time::PrimitiveDateTime;
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
use tracing::{debug, error, info, warn};
|
use tracing::{debug, error, info, warn};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
@@ -44,6 +44,8 @@ use crate::{
|
|||||||
const NEWSREADER_TAG_PREFIX: &'static str = "News/";
|
const NEWSREADER_TAG_PREFIX: &'static str = "News/";
|
||||||
const NEWSREADER_THREAD_PREFIX: &'static str = "news:";
|
const NEWSREADER_THREAD_PREFIX: &'static str = "news:";
|
||||||
|
|
||||||
|
const USER_AGENT: &'static str = "letterbox news reader (letterbox-ua@xinu.tv)";
|
||||||
|
|
||||||
// TODO: figure out how to use Cow
|
// TODO: figure out how to use Cow
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
trait Transformer: Send + Sync {
|
trait Transformer: Send + Sync {
|
||||||
@@ -318,7 +320,8 @@ impl<'c> Transformer for SlurpContents<'c> {
|
|||||||
let body = if let Some(body) = cacher.get(link.as_str()) {
|
let body = if let Some(body) = cacher.get(link.as_str()) {
|
||||||
String::from_utf8_lossy(&body).to_string()
|
String::from_utf8_lossy(&body).to_string()
|
||||||
} else {
|
} else {
|
||||||
let resp = reqwest::get(link.as_str()).await?;
|
let client = reqwest::Client::builder().user_agent(USER_AGENT).build()?;
|
||||||
|
let resp = client.get(link.as_str()).send().await?;
|
||||||
let status = resp.status();
|
let status = resp.status();
|
||||||
if status.is_server_error() {
|
if status.is_server_error() {
|
||||||
error!("status error for {link}: {status}");
|
error!("status error for {link}: {status}");
|
||||||
@@ -754,6 +757,7 @@ pub struct Query {
|
|||||||
pub is_notmuch: bool,
|
pub is_notmuch: bool,
|
||||||
pub is_newsreader: bool,
|
pub is_newsreader: bool,
|
||||||
pub is_tantivy: bool,
|
pub is_tantivy: bool,
|
||||||
|
pub is_snoozed: bool,
|
||||||
pub corpus: Option<Corpus>,
|
pub corpus: Option<Corpus>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -777,6 +781,9 @@ impl fmt::Display for Query {
|
|||||||
if self.is_newsreader {
|
if self.is_newsreader {
|
||||||
write!(f, "is:news ")?;
|
write!(f, "is:news ")?;
|
||||||
}
|
}
|
||||||
|
if self.is_snoozed {
|
||||||
|
write!(f, "is:snoozed ")?;
|
||||||
|
}
|
||||||
match self.corpus {
|
match self.corpus {
|
||||||
Some(c) => write!(f, "corpus:{c:?}")?,
|
Some(c) => write!(f, "corpus:{c:?}")?,
|
||||||
_ => (),
|
_ => (),
|
||||||
@@ -833,6 +840,7 @@ impl FromStr for Query {
|
|||||||
let mut is_notmuch = false;
|
let mut is_notmuch = false;
|
||||||
let mut is_newsreader = false;
|
let mut is_newsreader = false;
|
||||||
let mut is_tantivy = false;
|
let mut is_tantivy = false;
|
||||||
|
let mut is_snoozed = false;
|
||||||
let mut corpus = None;
|
let mut corpus = None;
|
||||||
for word in s.split_whitespace() {
|
for word in s.split_whitespace() {
|
||||||
if word == "is:unread" {
|
if word == "is:unread" {
|
||||||
@@ -872,6 +880,8 @@ impl FromStr for Query {
|
|||||||
is_newsreader = true;
|
is_newsreader = true;
|
||||||
} else if word == "is:newsreader" {
|
} else if word == "is:newsreader" {
|
||||||
is_newsreader = true;
|
is_newsreader = true;
|
||||||
|
} else if word == "is:snoozed" {
|
||||||
|
is_snoozed = true;
|
||||||
} else {
|
} else {
|
||||||
remainder.push(word.to_string());
|
remainder.push(word.to_string());
|
||||||
}
|
}
|
||||||
@@ -890,13 +900,14 @@ impl FromStr for Query {
|
|||||||
is_notmuch,
|
is_notmuch,
|
||||||
is_newsreader,
|
is_newsreader,
|
||||||
is_tantivy,
|
is_tantivy,
|
||||||
|
is_snoozed,
|
||||||
corpus,
|
corpus,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub struct ThreadSummaryRecord {
|
pub struct ThreadSummaryRecord {
|
||||||
pub site: Option<String>,
|
pub site: Option<String>,
|
||||||
pub date: Option<PrimitiveDateTime>,
|
pub date: Option<NaiveDateTime>,
|
||||||
pub is_read: Option<bool>,
|
pub is_read: Option<bool>,
|
||||||
pub title: Option<String>,
|
pub title: Option<String>,
|
||||||
pub uid: String,
|
pub uid: String,
|
||||||
@@ -914,11 +925,7 @@ async fn thread_summary_from_row(r: ThreadSummaryRecord) -> ThreadSummary {
|
|||||||
title = clean_title(&title).await.expect("failed to clean title");
|
title = clean_title(&title).await.expect("failed to clean title");
|
||||||
ThreadSummary {
|
ThreadSummary {
|
||||||
thread: format!("{NEWSREADER_THREAD_PREFIX}{}", r.uid),
|
thread: format!("{NEWSREADER_THREAD_PREFIX}{}", r.uid),
|
||||||
timestamp: r
|
timestamp: r.date.expect("post missing date").and_utc().timestamp() as isize,
|
||||||
.date
|
|
||||||
.expect("post missing date")
|
|
||||||
.assume_utc()
|
|
||||||
.unix_timestamp() as isize,
|
|
||||||
date_relative: format!("{:?}", r.date),
|
date_relative: format!("{:?}", r.date),
|
||||||
//date_relative: "TODO date_relative".to_string(),
|
//date_relative: "TODO date_relative".to_string(),
|
||||||
matched: 0,
|
matched: 0,
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use letterbox_shared::compute_color;
|
|||||||
use maplit::hashmap;
|
use maplit::hashmap;
|
||||||
use scraper::Selector;
|
use scraper::Selector;
|
||||||
use sqlx::postgres::PgPool;
|
use sqlx::postgres::PgPool;
|
||||||
use tracing::{error, info, instrument};
|
use tracing::{error, info, instrument, warn};
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
@@ -86,6 +86,10 @@ pub async fn search(
|
|||||||
query: &Query,
|
query: &Query,
|
||||||
) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
|
) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
|
||||||
info!("search({after:?} {before:?} {first:?} {last:?} {query:?}");
|
info!("search({after:?} {before:?} {first:?} {last:?} {query:?}");
|
||||||
|
if query.is_snoozed {
|
||||||
|
warn!("TODO implement snooze for newsreader::search");
|
||||||
|
return Ok(Vec::new());
|
||||||
|
}
|
||||||
if !is_newsreader_query(query) {
|
if !is_newsreader_query(query) {
|
||||||
return Ok(Vec::new());
|
return Ok(Vec::new());
|
||||||
}
|
}
|
||||||
@@ -211,11 +215,7 @@ pub async fn thread(
|
|||||||
}
|
}
|
||||||
let title = clean_title(&r.title.unwrap_or("NO TITLE".to_string())).await?;
|
let title = clean_title(&r.title.unwrap_or("NO TITLE".to_string())).await?;
|
||||||
let is_read = r.is_read.unwrap_or(false);
|
let is_read = r.is_read.unwrap_or(false);
|
||||||
let timestamp = r
|
let timestamp = r.date.expect("post missing date").and_utc().timestamp();
|
||||||
.date
|
|
||||||
.expect("post missing date")
|
|
||||||
.assume_utc()
|
|
||||||
.unix_timestamp();
|
|
||||||
Ok(Thread::News(NewsPost {
|
Ok(Thread::News(NewsPost {
|
||||||
thread_id,
|
thread_id,
|
||||||
is_read,
|
is_read,
|
||||||
|
|||||||
@@ -64,6 +64,10 @@ pub async fn search(
|
|||||||
last: Option<i32>,
|
last: Option<i32>,
|
||||||
query: &Query,
|
query: &Query,
|
||||||
) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
|
) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
|
||||||
|
if query.is_snoozed {
|
||||||
|
warn!("TODO implement snooze for nm::search");
|
||||||
|
return Ok(Vec::new());
|
||||||
|
}
|
||||||
if !is_notmuch_query(query) {
|
if !is_notmuch_query(query) {
|
||||||
return Ok(Vec::new());
|
return Ok(Vec::new());
|
||||||
}
|
}
|
||||||
|
|||||||
728
server/testdata/google-calendar-example-4.eml
vendored
Normal file
728
server/testdata/google-calendar-example-4.eml
vendored
Normal file
@@ -0,0 +1,728 @@
|
|||||||
|
Return-Path: <couchmoney+caf_=gmail=xinu.tv@gmail.com>
|
||||||
|
Delivered-To: bill@xinu.tv
|
||||||
|
Received: from phx.xinu.tv [74.207.253.222]
|
||||||
|
by nixos-01.h.xinu.tv with IMAP (fetchmail-6.5.6)
|
||||||
|
for <wathiede@localhost> (single-drop); Sat, 17 Jan 2026 09:25:58 -0800 (PST)
|
||||||
|
Received: from phx.xinu.tv
|
||||||
|
by phx.xinu.tv with LMTP
|
||||||
|
id YIkZKyXGa2k93xMAJR8clQ
|
||||||
|
(envelope-from <couchmoney+caf_=gmail=xinu.tv@gmail.com>)
|
||||||
|
for <bill@xinu.tv>; Sat, 17 Jan 2026 09:25:57 -0800
|
||||||
|
X-Original-To: gmail@xinu.tv
|
||||||
|
Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48])
|
||||||
|
by phx.xinu.tv (Postfix) with ESMTPS id B744880023
|
||||||
|
for <gmail@xinu.tv>; Sat, 17 Jan 2026 09:25:56 -0800 (PST)
|
||||||
|
Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-59b78886454so3800941e87.2
|
||||||
|
for <gmail@xinu.tv>; Sat, 17 Jan 2026 09:25:56 -0800 (PST)
|
||||||
|
ARC-Seal: i=2; a=rsa-sha256; t=1768670755; cv=pass;
|
||||||
|
d=google.com; s=arc-20240605;
|
||||||
|
b=UCMG36NoEclyVlwzV5KDOA6Fq75afR1kZ6QZQ8A0CR9RJMMEnPEpiuhheiGH7csZWs
|
||||||
|
HEZJmrLtTX/e5qiZ0k5njtm8694d+44YtpWRS54bwcAvwWBeCnHstTFkuOB4J2GWvT6G
|
||||||
|
R9MwX2lwlaGj118bn6aIQTWLB6KyWzUmGdq9AO52fvWTkzlPFDN54/AUYdhx4r+dG5k3
|
||||||
|
tqmDhE87DYIPTtNwYeUZpyEvcKuXYqlRmkHEL+qkixmj6yFX9jReNcHypO3QOj8StGqu
|
||||||
|
H/WKwOSnM5Yupv4EblgGPF8ib8tczyxoi+q73sv7iRtQy8wgyAC1gG6T6/qXuY/+1V1K
|
||||||
|
lyfw==
|
||||||
|
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:dkim-signature:dkim-signature:delivered-to;
|
||||||
|
bh=Hw6hGQbUlNGCz02STp2P+s244T5EBOLlXrfxnO0S/+U=;
|
||||||
|
fh=mUux9OA2+hLns/mBVi/4Nr5W8MsoxjQs+3G2LAg1TZo=;
|
||||||
|
b=V+AKgzj8GN/DZNHWPE/MY0blPHHM1Kp85OCTTacCIk/G6dNhx+WmLnIyExrC3i4wmU
|
||||||
|
i62upyA0a18rhHZRhV1FB4oMMhQVroYLKwh5dFuqFtTARua9DgwYeN6YALL9+rr84n2b
|
||||||
|
eZe0txkO5dyJgxByumgOymYFgbevrEtd1GWfK2v1BxtQXzqNZ0SKj5PhVCc5WD+toeHu
|
||||||
|
OEqUuCoHRWpeXYD19OUqv/+MwhPC4t5R5fz8nlPcjxa/fYINuI5+iLhSP7Ki4gzAZFRK
|
||||||
|
T3zMitsxIv/8zKMrhG5K0cm7Nntn2XBT5zrIDURZW9HEKYLww0yJ8qKXPNL+RtbfGgMq
|
||||||
|
TiRw==;
|
||||||
|
darn=xinu.tv
|
||||||
|
ARC-Authentication-Results: i=2; mx.google.com;
|
||||||
|
dkim=pass header.i=@google.com header.s=20230601 header.b=bNGW+EgT;
|
||||||
|
dkim=pass header.i=@gmail.com header.s=20230601 header.b=QfHaLAXu;
|
||||||
|
spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
|
||||||
|
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
|
||||||
|
dara=pass header.i=@gmail.com
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20230601; t=1768670755; x=1769275555;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:dkim-signature:dkim-signature:delivered-to
|
||||||
|
:x-forwarded-for:x-forwarded-to:x-gm-message-state:from:to:cc
|
||||||
|
:subject:date:message-id:reply-to;
|
||||||
|
bh=Hw6hGQbUlNGCz02STp2P+s244T5EBOLlXrfxnO0S/+U=;
|
||||||
|
b=eTx/TzBvNH8F83uUTAONl5k6vTRn2Id8TE91Mnl0cbJd6GaM9J4DgWVxmBoqfep8nA
|
||||||
|
hN3H5r01YLOdQNWTWmAV2RUrylBtLMQRqW7xeVnIIUKQNXfavZZKaFpwsuudvjDWGKBo
|
||||||
|
zesMFCOaEstK+nCpo/bPurb9kprcOh5y/WZjgL7OqtpnnyzhN6DhkhaYbGetIwW4osj5
|
||||||
|
aCFPOcoMcCYYW8OxEZC6bv2hJzehnV93g8IDY8tBQ88TIf1Kl3uDM8v3oLwMGgmEX+te
|
||||||
|
PYznnWbJF0vG00cWauIsTnjzUt8SSpnaUXw6PXbHlZxn5Roa/l6hg/tuhs699btYOJm/
|
||||||
|
izbQ==
|
||||||
|
X-Forwarded-Encrypted: i=2; AJvYcCUWtYAXLj/f6NFhD1jVOvyY1Jd5fsiQkXHwDFfYixYixyUvud2GXNENdLwj08ultHSVt74PwA==@xinu.tv
|
||||||
|
X-Gm-Message-State: AOJu0Yx6pI6AZXNq1lGFocBmt39kF0MuPDwo3WPcPrcCg8s1e8EF0iF0
|
||||||
|
0jOlOq3z4d3WKZqbpCpMIczBtHf5wHUzS1TFiPfYcoHfhnoxLm+dVYhdf0B5b39G2NSwnHIRAcZ
|
||||||
|
HPVGwj7Cl8dNJOMBLPOevH4CYTDEubbDxDmQOvWE0bhVDk2P+UIU53lYzGkLCnQ==
|
||||||
|
X-Received: by 2002:a05:6512:4016:b0:59b:7888:62c8 with SMTP id 2adb3069b0e04-59baeed63a1mr2407719e87.33.1768670754691;
|
||||||
|
Sat, 17 Jan 2026 09:25:54 -0800 (PST)
|
||||||
|
X-Forwarded-To: gmail@xinu.tv
|
||||||
|
X-Forwarded-For: couchmoney@gmail.com gmail@xinu.tv
|
||||||
|
Delivered-To: couchmoney@gmail.com
|
||||||
|
Received: by 2002:a05:6504:2382:b0:2d3:710a:2457 with SMTP id h2csp2362813lty;
|
||||||
|
Sat, 17 Jan 2026 09:25:53 -0800 (PST)
|
||||||
|
X-Received: by 2002:a05:6808:4f0e:b0:450:ac57:48a7 with SMTP id 5614622812f47-45c9c14fc0fmr2557499b6e.59.1768670753179;
|
||||||
|
Sat, 17 Jan 2026 09:25:53 -0800 (PST)
|
||||||
|
ARC-Seal: i=1; a=rsa-sha256; t=1768670753; cv=none;
|
||||||
|
d=google.com; s=arc-20240605;
|
||||||
|
b=V+T4U8NWyAR1p4yC5XY/I8vxXwtdkLXkIEO6gNBVvJyYi4XbjMMEnoRPAqOULwONFT
|
||||||
|
7q1V9vArMoZrvS4GNL3dg05tLr0Ug+Frm39+Vp1Wp3UxhQ/yxiby8jhRYkMyaKLZxhR3
|
||||||
|
2kihw8UgFjdUteHHwKoTDnIkTeKrMKZK8N4bTEzf9LoIXHMZcVaeC5XItuuOUdX6TPXr
|
||||||
|
xEQKfzCfz3UHY1piusFov9YIr8iBLGnNp6bXJqbRKmnLhOGkt9HQOT9rBl1nmBg5bqQj
|
||||||
|
4qxTu8Le/CE5qljInXX5iXNYXp1eMD1G6PZ9Hah1hr/wen1VPM6ysNynBlDzlNQUyEMJ
|
||||||
|
8lNw==
|
||||||
|
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:dkim-signature:dkim-signature;
|
||||||
|
bh=Hw6hGQbUlNGCz02STp2P+s244T5EBOLlXrfxnO0S/+U=;
|
||||||
|
fh=mbzrMIWIgWMC0ni1xEx+ViW4J0RLAdLdPT2cX81nTlk=;
|
||||||
|
b=UhcC2/PG/1T8wb5AzN1QNoaEXR7rs82O/P2CXN7vMVR9JoE3selJIzwIpyWxuKDPK3
|
||||||
|
GQtEmc8Bqcvcqu//9mWJxsklCkxSXrYnJ0UvykvbmZT7xPhM4r2mpWPluvfxLfEEdbqg
|
||||||
|
aNgJM1bn4QoYvnjmIF638/SN9dK5TI9seZ04BzbqQxd7Vw5OeccovSpPerSP7ya7l+4k
|
||||||
|
wOHhvP4mAlB/0bUae8xN/bqS0SIgy+V+cRr3tYEsRb21gJgTT757rHIV0aQu5LSO9t2N
|
||||||
|
UilB/hh4qvPhaCWmj6I+30ZYD02m9WKPYkwteLA9NXtggMw9WGeywxPZ//pHazzbq7iQ
|
||||||
|
im+A==;
|
||||||
|
dara=google.com
|
||||||
|
ARC-Authentication-Results: i=1; mx.google.com;
|
||||||
|
dkim=pass header.i=@google.com header.s=20230601 header.b=bNGW+EgT;
|
||||||
|
dkim=pass header.i=@gmail.com header.s=20230601 header.b=QfHaLAXu;
|
||||||
|
spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
|
||||||
|
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
|
||||||
|
dara=pass header.i=@gmail.com
|
||||||
|
Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73])
|
||||||
|
by mx.google.com with SMTPS id 5614622812f47-45c9e03dfa5sor2738469b6e.10.2026.01.17.09.25.53
|
||||||
|
for <couchmoney@gmail.com>
|
||||||
|
(Google Transport Security);
|
||||||
|
Sat, 17 Jan 2026 09:25:53 -0800 (PST)
|
||||||
|
Received-SPF: pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
|
||||||
|
Authentication-Results: mx.google.com;
|
||||||
|
dkim=pass header.i=@google.com header.s=20230601 header.b=bNGW+EgT;
|
||||||
|
dkim=pass header.i=@gmail.com header.s=20230601 header.b=QfHaLAXu;
|
||||||
|
spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
|
||||||
|
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
|
||||||
|
dara=pass header.i=@gmail.com
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=google.com; s=20230601; t=1768670752; x=1769275552; dara=google.com;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:from:to:cc:subject:date:message-id:reply-to;
|
||||||
|
bh=Hw6hGQbUlNGCz02STp2P+s244T5EBOLlXrfxnO0S/+U=;
|
||||||
|
b=bNGW+EgTmg1v7auBVBEmmFGyg6QDqI536axgkCb2SIiknIljcxZLx2KR0hrFlA3lSz
|
||||||
|
Z89Q1JdMU37Tx8upXXkAQYBe0A42UgQjXEYYfjykMl/PNg7XppVWzevLwkKLmmr/dZ7f
|
||||||
|
YMcE1DQogEr3RNXJeD92NfJxyOQGskvnzb4rhy22QonzF2UyGy/QX2UtFSz1cZi+35Yq
|
||||||
|
vTkaernNWU3hf5pAXigHisJTtoJeTRgVNY4ch+gru1X1LmZZzrTgWt6e7hGtsbvlV7cZ
|
||||||
|
CBM8gqf1LrVLV0Y1PdvS50yack5EFKbyKtmQWAwHBlOABVDwPHbPD9/6N4973C9juedx
|
||||||
|
HnNg==
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=gmail.com; s=20230601; t=1768670753; x=1769275553; dara=google.com;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:from:to:cc:subject:date:message-id:reply-to;
|
||||||
|
bh=Hw6hGQbUlNGCz02STp2P+s244T5EBOLlXrfxnO0S/+U=;
|
||||||
|
b=QfHaLAXuHdf594PTfEIjd3XOTBUaUaqHXtEArT1QZBEi1Vpf8NyYD6cPKPbjnln3CZ
|
||||||
|
q5s/sBjI6bmtszfVecPTEv3SEnFgQqQS/PCw3YbMNteemsw4rDNccwV6DSiX/BYMRZIM
|
||||||
|
4HEgMoLbXrlMlFnjEpWkfb7Kon5Y39C2DNx3sZ3TX/s8fLgYC8JpdUXdZ+LRlr8QzoNH
|
||||||
|
VLvVwW2iBYOzX9QdBtLdghvnmgvuSxIq1xB0zQNvDixOuG/egq1nDjHna4T75W8qzNEq
|
||||||
|
+hl8Rng1G2oqWAWUASkwSRvrUvV/NJA3gE+tGD2Isj9d/r4Ppll4jBWOu7KVRPM8Yrld
|
||||||
|
MYcg==
|
||||||
|
MIME-Version: 1.0
|
||||||
|
X-Received: by 2002:a05:6820:1993:b0:65f:67b7:95c2 with SMTP id
|
||||||
|
006d021491bc7-661179f382fmr2914920eaf.55.1768670752809; Sat, 17 Jan 2026
|
||||||
|
09:25:52 -0800 (PST)
|
||||||
|
Reply-To: tconvertino@gmail.com
|
||||||
|
Sender: Google Calendar <calendar-notification@google.com>
|
||||||
|
Auto-Submitted: auto-generated
|
||||||
|
Message-ID: <calendar-c95e83d6-7062-41ea-8c57-5b7bc2a79c76@google.com>
|
||||||
|
Date: Sat, 17 Jan 2026 17:25:52 +0000
|
||||||
|
Subject: New event: Emery Sleeps Over @ Sun Jan 18, 2026 (tconvertino@gmail.com)
|
||||||
|
From: tconvertino@gmail.com
|
||||||
|
To: couchmoney@gmail.com
|
||||||
|
Content-Type: multipart/alternative; boundary="000000000000f22916064898bf45"
|
||||||
|
X-Rspamd-Queue-Id: B744880023
|
||||||
|
X-Rspamd-Server: phx
|
||||||
|
X-Spamd-Result: default: False [-0.90 / 15.00];
|
||||||
|
URI_COUNT_ODD(1.00)[1];
|
||||||
|
ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=2];
|
||||||
|
DMARC_POLICY_ALLOW(-0.50)[gmail.com,none];
|
||||||
|
R_DKIM_ALLOW(-0.20)[google.com:s=20230601,gmail.com:s=20230601];
|
||||||
|
R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17];
|
||||||
|
MANY_INVISIBLE_PARTS(0.10)[2];
|
||||||
|
MIME_GOOD(-0.10)[multipart/alternative,text/plain];
|
||||||
|
FREEMAIL_TO(0.00)[gmail.com];
|
||||||
|
RCVD_COUNT_THREE(0.00)[3];
|
||||||
|
RCVD_TLS_LAST(0.00)[];
|
||||||
|
FORGED_SENDER(0.00)[tconvertino@gmail.com,couchmoney@gmail.com];
|
||||||
|
RCPT_COUNT_ONE(0.00)[1];
|
||||||
|
RCVD_IN_DNSWL_NONE(0.00)[209.85.220.73:received];
|
||||||
|
TAGGED_FROM(0.00)[caf_=gmail=xinutv];
|
||||||
|
FREEMAIL_REPLYTO(0.00)[gmail.com];
|
||||||
|
MIME_TRACE(0.00)[0:+,1:+,2:~];
|
||||||
|
FREEMAIL_FROM(0.00)[gmail.com];
|
||||||
|
FROM_NEQ_ENVFROM(0.00)[tconvertino@gmail.com,couchmoney@gmail.com];
|
||||||
|
MISSING_XM_UA(0.00)[];
|
||||||
|
HAS_REPLYTO(0.00)[tconvertino@gmail.com];
|
||||||
|
DNSWL_BLOCKED(0.00)[209.85.167.48:from];
|
||||||
|
DWL_DNSWL_NONE(0.00)[gmail.com:dkim];
|
||||||
|
TO_DN_NONE(0.00)[];
|
||||||
|
FREEMAIL_ENVFROM(0.00)[gmail.com];
|
||||||
|
FORGED_SENDER_FORWARDING(0.00)[];
|
||||||
|
DKIM_TRACE(0.00)[google.com:+,gmail.com:+];
|
||||||
|
DWL_DNSWL_BLOCKED(0.00)[google.com:dkim];
|
||||||
|
TO_DOM_EQ_FROM_DOM(0.00)[];
|
||||||
|
FROM_NO_DN(0.00)[];
|
||||||
|
FWD_GOOGLE(0.00)[couchmoney@gmail.com];
|
||||||
|
ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US];
|
||||||
|
RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.48:from];
|
||||||
|
REPLYTO_EQ_FROM(0.00)[]
|
||||||
|
X-Rspamd-Action: no action
|
||||||
|
X-TUID: GNj+V6W3PxE3
|
||||||
|
|
||||||
|
--000000000000f22916064898bf45
|
||||||
|
Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes
|
||||||
|
|
||||||
|
Emery Sleeps Over
|
||||||
|
Sunday Jan 18, 2026
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Organizer
|
||||||
|
tconvertino@gmail.com
|
||||||
|
tconvertino@gmail.com
|
||||||
|
|
||||||
|
~~//~~
|
||||||
|
Invitation from Google Calendar: https://calendar.google.com/calendar/
|
||||||
|
|
||||||
|
You are receiving this email because you are subscribed to calendar
|
||||||
|
notifications. To stop receiving these emails, go to
|
||||||
|
https://calendar.google.com/calendar/r/settings, select this calendar, and
|
||||||
|
change "Other notifications".
|
||||||
|
|
||||||
|
Forwarding this invitation could allow any recipient to send a response to
|
||||||
|
the organizer, be added to the guest list, invite others regardless of
|
||||||
|
their own invitation status, or modify your RSVP.
|
||||||
|
|
||||||
|
Learn more https://support.google.com/calendar/answer/37135#forwarding
|
||||||
|
|
||||||
|
--000000000000f22916064898bf45
|
||||||
|
Content-Type: text/html; charset="UTF-8"
|
||||||
|
Content-Transfer-Encoding: quoted-printable
|
||||||
|
|
||||||
|
<!doctype html><html xmlns=3D"http://www.w3.org/1999/xhtml" xmlns:v=3D"urn:=
|
||||||
|
schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-microsoft-com:office:offi=
|
||||||
|
ce"><head><title></title><!--[if !mso]><meta http-equiv=3D"X-UA-Compatible"=
|
||||||
|
content=3D"IE=3Dedge"><![endif]--><meta http-equiv=3D"Content-Type" conten=
|
||||||
|
t=3D"text/html; charset=3DUTF-8"><meta name=3D"viewport" content=3D"width=
|
||||||
|
=3Ddevice-width,initial-scale=3D1"><meta name=3D"color-scheme" content=3D"l=
|
||||||
|
ight dark"><meta name=3D"supported-color-schemes" content=3D"light dark">
|
||||||
|
<style>
|
||||||
|
body, html {
|
||||||
|
font-family: Roboto, Helvetica, Arial, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-webkit-text-size-adjust: 100%;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#outlook a {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ReadMsgBody {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ExternalClass {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ExternalClass * {
|
||||||
|
line-height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
table,
|
||||||
|
td {
|
||||||
|
mso-table-lspace: 0pt;
|
||||||
|
mso-table-rspace: 0pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
img {
|
||||||
|
border: 0;
|
||||||
|
height: auto;
|
||||||
|
line-height: 100%;
|
||||||
|
outline: none;
|
||||||
|
text-decoration: none;
|
||||||
|
-ms-interpolation-mode: bicubic;
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
display: block;
|
||||||
|
margin: 13px 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--[if !mso]><!-->
|
||||||
|
<style>
|
||||||
|
@media only screen and (max-width:580px) {
|
||||||
|
@-ms-viewport {
|
||||||
|
width: 320px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@viewport {
|
||||||
|
width: 320px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--<![endif]-->
|
||||||
|
<!--[if mso]>
|
||||||
|
<xml>
|
||||||
|
<o:OfficeDocumentSettings>
|
||||||
|
<o:AllowPNG/>
|
||||||
|
<o:PixelsPerInch>96</o:PixelsPerInch>
|
||||||
|
</o:OfficeDocumentSettings>
|
||||||
|
</xml>
|
||||||
|
<![endif]-->
|
||||||
|
<!--[if lte mso 11]>
|
||||||
|
<style>
|
||||||
|
.outlook-group-fix { width:100% !important; }
|
||||||
|
</style>
|
||||||
|
<![endif]-->
|
||||||
|
|
||||||
|
<!--[if !mso]><!-- -->
|
||||||
|
<style>body, html {font-family:Roboto,Helvetica,Arial,sans-serif;}@font-f=
|
||||||
|
ace {
|
||||||
|
font-family: 'Roboto';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
font-stretch: normal;
|
||||||
|
src: url(//fonts.gstatic.com/s/roboto/v48/KFOMCnqEu92Fr1ME7kSn66aGLdTylUA=
|
||||||
|
MQXC89YmC2DPNWubEbVmUiA8.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Roboto';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 500;
|
||||||
|
font-stretch: normal;
|
||||||
|
src: url(//fonts.gstatic.com/s/roboto/v48/KFOMCnqEu92Fr1ME7kSn66aGLdTylUA=
|
||||||
|
MQXC89YmC2DPNWub2bVmUiA8.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Roboto';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 700;
|
||||||
|
font-stretch: normal;
|
||||||
|
src: url(//fonts.gstatic.com/s/roboto/v48/KFOMCnqEu92Fr1ME7kSn66aGLdTylUA=
|
||||||
|
MQXC89YmC2DPNWuYjalmUiA8.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Material Icons Extended';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url(//fonts.gstatic.com/s/materialiconsextended/v154/kJEjBvgX7BgnkSr=
|
||||||
|
UwT8UnLVc38YydejYY-oE_LvM.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Material Icons';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlematerialicons/v144/Gw6kwdfw6UnXLJCcm=
|
||||||
|
afZyFRXb3BL9rvi0QZG3g.otf) format('opentype');
|
||||||
|
}
|
||||||
|
|
||||||
|
.google-material-icons {
|
||||||
|
font-family: 'Google Material Icons';
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
font-size: 24px;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: normal;
|
||||||
|
text-transform: none;
|
||||||
|
display: inline-block;
|
||||||
|
white-space: nowrap;
|
||||||
|
word-wrap: normal;
|
||||||
|
direction: ltr;
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Material Icons Filled';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlematerialiconsfilled/v118/WWXFlimHYg6=
|
||||||
|
HKI3TavMkbKdhBmDvgach8TVpeGsuueSZJH4.otf) format('opentype');
|
||||||
|
}
|
||||||
|
|
||||||
|
.google-material-icons-filled {
|
||||||
|
font-family: 'Google Material Icons Filled';
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
font-size: 24px;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: normal;
|
||||||
|
text-transform: none;
|
||||||
|
display: inline-block;
|
||||||
|
white-space: nowrap;
|
||||||
|
word-wrap: normal;
|
||||||
|
direction: ltr;
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Sans';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlesans/v14/4UaGrENHsxJlGDuGo1OIlL3Owps=
|
||||||
|
.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Sans';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 500;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlesans/v14/4UabrENHsxJlGDuGo1OIlLU94Yt=
|
||||||
|
zCwM.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Sans';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 700;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlesans/v14/4UabrENHsxJlGDuGo1OIlLV154t=
|
||||||
|
zCwM.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
</style><!--<![endif]-->
|
||||||
|
<style>
|
||||||
|
.body-container {
|
||||||
|
padding-left: 16px;
|
||||||
|
padding-right: 16px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
=20
|
||||||
|
<style>
|
||||||
|
u+.body .body-container,
|
||||||
|
body[data-outlook-cycle] .body-container,
|
||||||
|
#MessageViewBody .body-container {
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
=20
|
||||||
|
<style>
|
||||||
|
@media only screen and (min-width:580px) {
|
||||||
|
.column-per-37 {
|
||||||
|
width: 37% !important;
|
||||||
|
max-width: 37%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.column-per-63 {
|
||||||
|
width: 63% !important;
|
||||||
|
max-width: 63%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
=20
|
||||||
|
<style>
|
||||||
|
.appointment-buttons th {
|
||||||
|
display: block;
|
||||||
|
clear: both;
|
||||||
|
float: left;
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.appointment-buttons th a {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
#MessageViewBody .appointment-buttons th {
|
||||||
|
margin-top: 24px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
=20
|
||||||
|
<style>
|
||||||
|
@media only screen and (max-width:580px) {
|
||||||
|
table.full-width-mobile {
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.full-width-mobile {
|
||||||
|
width: auto !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<style>
|
||||||
|
.main-container-inner,
|
||||||
|
.info-bar-inner {
|
||||||
|
padding: 12px 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-column-table-ltr {
|
||||||
|
padding-right: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-column-table-rtl {
|
||||||
|
padding-left: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (min-width:580px) {
|
||||||
|
.main-container-inner {
|
||||||
|
padding: 24px 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-bar-inner {
|
||||||
|
padding: 12px 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-column-table-ltr {
|
||||||
|
padding-right: 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-column-table-rtl {
|
||||||
|
padding-left: 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.appointment-buttons th {
|
||||||
|
display: table-cell;
|
||||||
|
clear: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-text {
|
||||||
|
color: #3c4043 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.secondary-text,
|
||||||
|
.phone-number a {
|
||||||
|
color: #70757a !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accent-text {
|
||||||
|
color: #1a73e8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accent-text-dark {
|
||||||
|
color: #185abc !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grey-button-text,
|
||||||
|
.attachment-chip a {
|
||||||
|
color: #5f6368 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-button {
|
||||||
|
background-color: #1a73e8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-button-text {
|
||||||
|
color: #fff !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.underline-on-hover:hover {
|
||||||
|
text-decoration: underline !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grey-infobar-text {
|
||||||
|
color: #202124 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
.primary-text:not([class^=3D"x_"]) {
|
||||||
|
color: #e8eaed !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.secondary-text:not([class^=3D"x_"]),
|
||||||
|
.phone-number:not([class^=3D"x_"]) a {
|
||||||
|
color: #9aa0a6 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grey-button-text:not([class^=3D"x_"]),
|
||||||
|
.attachment-chip:not([class^=3D"x_"]) a {
|
||||||
|
color: #bdc1c6 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accent-text:not([class^=3D"x_"]),
|
||||||
|
.hairline-button-text:not([class^=3D"x_"]) {
|
||||||
|
color: #8ab4f8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-button:not([class^=3D"x_"]) {
|
||||||
|
background-color: #8ab4f8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-button-text:not([class^=3D"x_"]) {
|
||||||
|
color: #202124 !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<style>
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
.cse-banner:not([class^=3D"x_"]) {
|
||||||
|
background-color: #3c4043 !important; /* Google Grey 800 */
|
||||||
|
}
|
||||||
|
|
||||||
|
.encryption-icon:not([class^=3D"x_"]) {
|
||||||
|
/* WARNING: This causes the whole style tag to get stripped in Gm=
|
||||||
|
ail. */
|
||||||
|
background-image: url('https://fonts.gstatic.com/s/i/googlemateri=
|
||||||
|
aliconsfilled/encrypted/v3/gm_grey200-24dp/2x/gm_filled_encrypted_gm_grey20=
|
||||||
|
0_24dp.png') !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--[if !mso]><!-->
|
||||||
|
<style>
|
||||||
|
.prevent-link a {
|
||||||
|
color: inherit !important;
|
||||||
|
text-decoration: none !important;
|
||||||
|
font-size: inherit !important;
|
||||||
|
font-family: inherit !important;
|
||||||
|
font-weight: inherit !important;
|
||||||
|
line-height: inherit !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--<![endif]-->
|
||||||
|
|
||||||
|
<!--[if mso | IE]>
|
||||||
|
<style>
|
||||||
|
.main-container-inner {
|
||||||
|
padding: 24px 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-bar-inner {
|
||||||
|
padding: 12px 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cse-banner .encryption-icon {
|
||||||
|
/* We use the IE workaround instead. */
|
||||||
|
background-image: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cse-banner .encryption-icon .ms-fallback {
|
||||||
|
display: block !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* NB: Some MS clients ignore dark-scheme styling and apply their o=
|
||||||
|
wn, so there's nothing we can do to help there. */
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
.cse-banner:not([class^=3D"x_"]) .encryption-icon .ms-fallback {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cse-banner:not([class^=3D"x_"]) .encryption-icon .ms-fallback-da=
|
||||||
|
rk {
|
||||||
|
display: block !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<![endif]-->
|
||||||
|
</head><body class=3D"body"><span itemscope itemtype=3D"http://schema.org=
|
||||||
|
/InformAction"><span style=3D"display:none" itemprop=3D"about" itemscope it=
|
||||||
|
emtype=3D"http://schema.org/Person"><meta itemprop=3D"description" content=
|
||||||
|
=3D"Invitation from tconvertino@gmail.com"/></span><span itemprop=3D"object=
|
||||||
|
" itemscope itemtype=3D"http://schema.org/Event"><meta itemprop=3D"eventSta=
|
||||||
|
tus" content=3D"http://schema.org/EventScheduled"/><span itemprop=3D"publis=
|
||||||
|
her" itemscope itemtype=3D"http://schema.org/Organization"><meta itemprop=
|
||||||
|
=3D"name" content=3D"Google Calendar"/></span><meta itemprop=3D"eventId/goo=
|
||||||
|
gleCalendar" content=3D"7bsl09rb144q35feflbl0q2v58"/><span style=3D"display=
|
||||||
|
: none; font-size: 1px; color: #fff; line-height: 1px; height: 0; max-heigh=
|
||||||
|
t: 0; width: 0; max-width: 0; opacity: 0; overflow: hidden;" itemprop=3D"na=
|
||||||
|
me">Emery Sleeps Over</span><meta itemprop=3D"url" content=3D"https://calen=
|
||||||
|
dar.google.com/calendar/r?eid=3DN2JzbDA5cmIxNDRxMzVmZWZsYmwwcTJ2NTggdGNvbnZ=
|
||||||
|
lcnRpbm9AbQ&es=3D1"/><span aria-hidden=3D"true"><time itemprop=3D"start=
|
||||||
|
Date" datetime=3D"20260118"></time><time itemprop=3D"endDate" datetime=3D"2=
|
||||||
|
0260119"></time></span><div style=3D"display: none; font-size: 1px; color: =
|
||||||
|
#fff; line-height: 1px; height: 0; max-height: 0; width: 0; max-width: 0; o=
|
||||||
|
pacity: 0; overflow: hidden;">You have been invited by tconvertino@gmail.co=
|
||||||
|
m to attend an event named Emery Sleeps Over on Sunday Jan 18, 2026.</div><=
|
||||||
|
table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D"presentation=
|
||||||
|
" align=3D"center" style=3D"width:100%;" class=3D"body-container"><tbody><t=
|
||||||
|
r><td style=3D"" class=3D"" align=3D"left"><!--[if mso | IE]><table border=
|
||||||
|
=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D"presentation"><tr><td he=
|
||||||
|
ight=3D"16" style=3D"height:16px;"><![endif]--><div style=3D"height:16px;" =
|
||||||
|
aria-hidden=3D"true"> </div><!--[if mso | IE]></td></tr></table><![e=
|
||||||
|
ndif]--><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D"pre=
|
||||||
|
sentation" align=3D"center" style=3D"width:100%;" class=3D""><tbody><tr><td=
|
||||||
|
style=3D"border: solid 1px #dadce0; border-radius: 8px; direction: rtl; fo=
|
||||||
|
nt-size: 0; padding: 24px 32px; text-align: left; vertical-align: top;" cla=
|
||||||
|
ss=3D"main-container-inner"><!--[if mso | IE]><table border=3D"0" cellpaddi=
|
||||||
|
ng=3D"0" cellspacing=3D"0" role=3D"presentation"><tr><![endif]--><div class=
|
||||||
|
=3D"" style=3D"font-size: 13px; text-align: left; direction: ltr; display: =
|
||||||
|
inline-block; vertical-align: top; width: 100%;overflow: hidden; word-wrap:=
|
||||||
|
break-word;"><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=
|
||||||
|
=3D"presentation" width=3D"100%" class=3D"main-column-table-ltr" style=3D"p=
|
||||||
|
adding-right: 32px; padding-left: 0;;table-layout: fixed;"><tbody><tr><td c=
|
||||||
|
lass=3D"main-column-td" style=3D"padding:0; vertical-align:top;"><table bor=
|
||||||
|
der=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D"presentation" width=
|
||||||
|
=3D"100%" style=3D"table-layout: fixed;"><tr><td style=3D"font-size: 0; pad=
|
||||||
|
ding: 0; text-align: left; word-break: break-word;;padding-bottom:24px;"><d=
|
||||||
|
iv style=3D"font-family: Roboto, sans-serif;font-style: normal; font-weight=
|
||||||
|
: 400; font-size: 14px; line-height: 20px; letter-spacing: 0.2px;color: #3c=
|
||||||
|
4043; text-decoration: none;" class=3D"primary-text" role=3D"presentation">=
|
||||||
|
<span aria-hidden=3D"true"><time itemprop=3D"startDate" datetime=3D"2026011=
|
||||||
|
8"></time><time itemprop=3D"endDate" datetime=3D"20260119"></time></span><t=
|
||||||
|
able border=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D"presentation"=
|
||||||
|
style=3D"padding-bottom: 4px;"><tr><td><h2 class=3D"primary-text" style=3D=
|
||||||
|
"font-size: 14px;color: #3c4043; text-decoration: none;font-weight: 700;-we=
|
||||||
|
bkit-font-smoothing: antialiased;margin: 0; padding: 0;">When</h2></td></tr=
|
||||||
|
></table><span>Sunday Jan 18, 2026</span></div></td></tr><tr><td style=3D"f=
|
||||||
|
ont-size: 0; padding: 0; text-align: left; word-break: break-word;;padding-=
|
||||||
|
bottom:24px;"><div style=3D"font-family: Roboto, sans-serif;font-style: nor=
|
||||||
|
mal; font-weight: 400; font-size: 14px; line-height: 20px; letter-spacing: =
|
||||||
|
0.2px;color: #3c4043; text-decoration: none;" class=3D"primary-text" role=
|
||||||
|
=3D"presentation"><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" r=
|
||||||
|
ole=3D"presentation" style=3D"padding-bottom: 4px;"><tr><td><h2 class=3D"pr=
|
||||||
|
imary-text" style=3D"font-size: 14px;color: #3c4043; text-decoration: none;=
|
||||||
|
font-weight: 700;-webkit-font-smoothing: antialiased;margin: 0; padding: 0;=
|
||||||
|
">Calendar</h2></td></tr></table>tconvertino@gmail.com</div></td></tr><tr><=
|
||||||
|
td style=3D"font-size: 0; padding: 0; text-align: left; word-break: break-w=
|
||||||
|
ord;;padding-bottom:24px;"><div style=3D"font-family: Roboto, sans-serif;fo=
|
||||||
|
nt-style: normal; font-weight: 400; font-size: 14px; line-height: 20px; let=
|
||||||
|
ter-spacing: 0.2px;color: #3c4043; text-decoration: none;" class=3D"primary=
|
||||||
|
-text" role=3D"presentation"><table border=3D"0" cellpadding=3D"0" cellspac=
|
||||||
|
ing=3D"0" role=3D"presentation" style=3D"padding-bottom: 4px;"><tr><td><h2 =
|
||||||
|
class=3D"primary-text" style=3D"font-size: 14px;color: #3c4043; text-decora=
|
||||||
|
tion: none;font-weight: 700;-webkit-font-smoothing: antialiased;margin: 0; =
|
||||||
|
padding: 0;">Organizer</h2></td></tr></table><div style=3D"color: #3c4042;"=
|
||||||
|
><span class=3D"notranslate"><a class=3D"primary-text underline-on-hover" s=
|
||||||
|
tyle=3D"display: inline-block;;color: #3c4043; text-decoration: none;" href=
|
||||||
|
=3D"mailto:tconvertino@gmail.com">tconvertino@gmail.com</a></span><span ite=
|
||||||
|
mprop=3D"organizer" itemscope itemtype=3D"http://schema.org/Person"><meta i=
|
||||||
|
temprop=3D"name" content=3D"tconvertino@gmail.com"/><meta itemprop=3D"email=
|
||||||
|
" content=3D"tconvertino@gmail.com"/></span></div></div></td></tr><tr><td s=
|
||||||
|
tyle=3D"font-size: 0; padding: 0; text-align: left; word-break: break-word;=
|
||||||
|
;padding-bottom:24px;"><div style=3D"font-family: Roboto, sans-serif;font-s=
|
||||||
|
tyle: normal; font-weight: 400; font-size: 14px; line-height: 20px; letter-=
|
||||||
|
spacing: 0.2px;color: #3c4043; text-decoration: none;" class=3D"primary-tex=
|
||||||
|
t" role=3D"presentation"><table border=3D"0" cellpadding=3D"0" cellspacing=
|
||||||
|
=3D"0" role=3D"presentation" style=3D"padding-bottom: 4px;"><tr><td><h2 cla=
|
||||||
|
ss=3D"primary-text" style=3D"font-size: 14px;color: #3c4043; text-decoratio=
|
||||||
|
n: none;font-weight: 700;-webkit-font-smoothing: antialiased;margin: 0; pad=
|
||||||
|
ding: 0;">Guests</h2></td></tr></table><div style=3D"padding-bottom: 4px; t=
|
||||||
|
ext-align: left;;color: #3c4042;"></div><a href=3D"https://calendar.google.=
|
||||||
|
com/calendar/r?eid=3DN2JzbDA5cmIxNDRxMzVmZWZsYmwwcTJ2NTggdGNvbnZlcnRpbm9AbQ=
|
||||||
|
&es=3D1" style=3D"display: inline-block;;color: #1a73e8; text-decoratio=
|
||||||
|
n: none;font-weight: 700;" target=3D"_blank" class=3D"accent-text underline=
|
||||||
|
-on-hover">View all guest info</a></div></td></tr></table></td></tr></tbody=
|
||||||
|
></table></div><!--[if mso | IE]></tr></table><![endif]--></td></tr></tbody=
|
||||||
|
></table><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D"pr=
|
||||||
|
esentation" align=3D"center" style=3D"width:100%;" class=3D""><tbody><tr><t=
|
||||||
|
d style=3D"font-size: 0; padding: 0; text-align: left; word-break: break-wo=
|
||||||
|
rd;;padding:4px 12px;" class=3D"" align=3D"left"><div class=3D"secondary-te=
|
||||||
|
xt" style=3D"color: #70757a; text-decoration: none;font-family: Roboto, san=
|
||||||
|
s-serif;font-size: 12px; line-height: 16px; mso-line-height-rule: exactly; =
|
||||||
|
text-align: left;"><p>Invitation from <a href=3D"https://calendar.google.co=
|
||||||
|
m/calendar/" class=3D"accent-text underline-on-hover" style=3D"font-family:=
|
||||||
|
Roboto, sans-serif;font-size: 12px; line-height: 16px; mso-line-height-rul=
|
||||||
|
e: exactly;;color: #1a73e8; text-decoration: none;" target=3D"_blank">Googl=
|
||||||
|
e Calendar</a></p><p>You are receiving this email because you are subscribe=
|
||||||
|
d to calendar notifications. To stop receiving these emails, go to <a href=
|
||||||
|
=3D"https://calendar.google.com/calendar/r/settings" class=3D"accent-text u=
|
||||||
|
nderline-on-hover" style=3D"font-family: Roboto, sans-serif;font-size: 12px=
|
||||||
|
; line-height: 16px; mso-line-height-rule: exactly;;color: #1a73e8; text-de=
|
||||||
|
coration: none;" target=3D"_blank">Calendar settings</a>, select this calen=
|
||||||
|
dar, and change "Other notifications".</p><p>Forwarding this invitation cou=
|
||||||
|
ld allow any recipient to send a response to the organizer, be added to the=
|
||||||
|
guest list, invite others regardless of their own invitation status, or mo=
|
||||||
|
dify your RSVP. <a class=3D"accent-text underline-on-hover" style=3D"font-f=
|
||||||
|
amily: Roboto, sans-serif;font-size: 12px; line-height: 16px; mso-line-heig=
|
||||||
|
ht-rule: exactly;;color: #1a73e8; text-decoration: none;" href=3D"https://s=
|
||||||
|
upport.google.com/calendar/answer/37135#forwarding">Learn more</a></p></div=
|
||||||
|
></td></tr></tbody></table></td></tr></tbody></table></span></span></body><=
|
||||||
|
/html>
|
||||||
|
--000000000000f22916064898bf45--
|
||||||
733
server/testdata/google-calendar-example-5.eml
vendored
Normal file
733
server/testdata/google-calendar-example-5.eml
vendored
Normal file
@@ -0,0 +1,733 @@
|
|||||||
|
Return-Path: <couchmoney+caf_=gmail=xinu.tv@gmail.com>
|
||||||
|
Delivered-To: bill@xinu.tv
|
||||||
|
Received: from phx.xinu.tv [74.207.253.222]
|
||||||
|
by nixos-01.h.xinu.tv with IMAP (fetchmail-6.5.6)
|
||||||
|
for <wathiede@localhost> (single-drop); Sat, 17 Jan 2026 07:15:51 -0800 (PST)
|
||||||
|
Received: from phx.xinu.tv
|
||||||
|
by phx.xinu.tv with LMTP
|
||||||
|
id EBhFKaana2lD2BMAJR8clQ
|
||||||
|
(envelope-from <couchmoney+caf_=gmail=xinu.tv@gmail.com>)
|
||||||
|
for <bill@xinu.tv>; Sat, 17 Jan 2026 07:15:50 -0800
|
||||||
|
X-Original-To: gmail@xinu.tv
|
||||||
|
Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47])
|
||||||
|
by phx.xinu.tv (Postfix) with ESMTPS id 9ED9E80023
|
||||||
|
for <gmail@xinu.tv>; Sat, 17 Jan 2026 07:15:49 -0800 (PST)
|
||||||
|
Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-59b72a1e2f0so3298670e87.0
|
||||||
|
for <gmail@xinu.tv>; Sat, 17 Jan 2026 07:15:49 -0800 (PST)
|
||||||
|
ARC-Seal: i=2; a=rsa-sha256; t=1768662948; cv=pass;
|
||||||
|
d=google.com; s=arc-20240605;
|
||||||
|
b=P8ukIhKVppSoOtIG2772uR9xtbgbpQjTdNpTjI3WHjWj7WKqgmV4ndotO/y7GwqvOX
|
||||||
|
OwYJbwY9cIR/PPOGf0/UfUSfPTp6iWwfapN3B5YDoSrOk3ef8e0HXRcSMeIG9D0JWfKB
|
||||||
|
YTFLsg6dqxdrPLsyDhFeJQQFK4+qb4gndM7SEw9UZtvvEbzGmGro9QFcO+uXsPZ6jQsb
|
||||||
|
UNn7VJhOqi3sc+mNAmPSNN1KSjeZ5wQoJDKHAhc39P7HlCI6Upm3UgyejjToTNa5pFUH
|
||||||
|
YfqgrPEU0NsJWZNUfnItYhChHXZyHE9iUcK8eDO7qRyvVAwkEdxmc34EC4hOJsHxdLli
|
||||||
|
ik4A==
|
||||||
|
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:dkim-signature:dkim-signature:delivered-to;
|
||||||
|
bh=DSYDWRwqF5i+Yosvco75LpPB3hH2JqH2JZElsHalDcM=;
|
||||||
|
fh=opiyoKXgWpm8kcAa3Nw4m5S9DBRIdfMLcfsQwVK5zKs=;
|
||||||
|
b=hyfgpNzlhW6aPYNzOd5CkaqQ2qYr/Sb25Qti1ez7y+n0SxJM/QbpyMCafAFv1s6vSR
|
||||||
|
jdbmeaofRjmDkL0uDdoQb0E5TnycNKP3r4FWEKc2KZkfnKEtWWOivFDIvQDPF4NpYNn3
|
||||||
|
9SFZkfmVa2TSfrnH4wRG37gCQgc6gzDpl6a2oZRmM4T44xbIXCIseFSalR+oUTFCJU3M
|
||||||
|
XSBCNjV7w/V8S2hiH72Ace8enjUG+DRbeE8aYiNwu0XkECojPxGgBuM9OJPSmYzNt3LW
|
||||||
|
7M+weqkx0Byoi6UDaI2NQqXH4wkSrjmIFcX+84jglfl2zOsPGwgehJYdo/QcPMXtQohY
|
||||||
|
sMZA==;
|
||||||
|
darn=xinu.tv
|
||||||
|
ARC-Authentication-Results: i=2; mx.google.com;
|
||||||
|
dkim=pass header.i=@google.com header.s=20230601 header.b=UV12BjMR;
|
||||||
|
dkim=pass header.i=@gmail.com header.s=20230601 header.b=HTQ+XWtf;
|
||||||
|
spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
|
||||||
|
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
|
||||||
|
dara=pass header.i=@gmail.com
|
||||||
|
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=1e100.net; s=20230601; t=1768662948; x=1769267748;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:dkim-signature:dkim-signature:delivered-to
|
||||||
|
:x-forwarded-for:x-forwarded-to:x-gm-message-state:from:to:cc
|
||||||
|
:subject:date:message-id:reply-to;
|
||||||
|
bh=DSYDWRwqF5i+Yosvco75LpPB3hH2JqH2JZElsHalDcM=;
|
||||||
|
b=wCE8iOXwi+1PwnSvMIbzsg5Pdo1jXyrqQjqZN3UN9bXyLJmoKV+a5l4cE7La2TkWIe
|
||||||
|
zdw/qcgetdMWPrJncmnLYptNMOMhHf8OmgDbtKbZLo1WVnY6OcnTTCWljhm9l3p1sNCJ
|
||||||
|
NNvrE79CNsi4mB30/gh5GUSFldNs4CKXLoX5U1JyaR0URBNSdgTtWHQEk9Zip6lzSJ/W
|
||||||
|
3myHdqXjlFIBn8JdN2F+Uvpe4SOcpUYivDzRzGgKBVBybgL+7/B2FVxu1DSqImvvdnew
|
||||||
|
G45//ZKZLk1NZTwB9b3fVu1ZRrtVwXykyTsLWQs/L+h2RatzY5cbRknOUEg+Sh12glbJ
|
||||||
|
Mvzg==
|
||||||
|
X-Forwarded-Encrypted: i=2; AJvYcCWTlZh7K3d3elcvXPqK9OnJxLWgTqppYJqLWqVOMFJDYDcmSN8i4AmT2kLKruApNvLk5mchcQ==@xinu.tv
|
||||||
|
X-Gm-Message-State: AOJu0YzRCKajwo80HG2ZJYkIh92JNKbnNkbFqaG5Dye25AAdsFY1p/Sa
|
||||||
|
HUpoeDQQxTSXezOEygAE9wR8sFTjlB4uRgVqtHJ5s0ml5G9sQVG9Ir31aJU5vBs4OpeeAa01KHq
|
||||||
|
OqoyqsCDybPJBW43d/qWOxpcpIORkUKMmPkNGNzU1+hFlox6fAt4TasNy8lbiLw==
|
||||||
|
X-Received: by 2002:a05:6512:2507:b0:59b:b55a:a293 with SMTP id 2adb3069b0e04-59bb55aa3b5mr1328824e87.34.1768662947779;
|
||||||
|
Sat, 17 Jan 2026 07:15:47 -0800 (PST)
|
||||||
|
X-Forwarded-To: gmail@xinu.tv
|
||||||
|
X-Forwarded-For: couchmoney@gmail.com gmail@xinu.tv
|
||||||
|
Delivered-To: couchmoney@gmail.com
|
||||||
|
Received: by 2002:a05:6504:2382:b0:2d3:710a:2457 with SMTP id h2csp2302771lty;
|
||||||
|
Sat, 17 Jan 2026 07:15:46 -0800 (PST)
|
||||||
|
X-Received: by 2002:a05:6808:221e:b0:45a:6ef9:79 with SMTP id 5614622812f47-45c9d86c3acmr2292013b6e.52.1768662946398;
|
||||||
|
Sat, 17 Jan 2026 07:15:46 -0800 (PST)
|
||||||
|
ARC-Seal: i=1; a=rsa-sha256; t=1768662946; cv=none;
|
||||||
|
d=google.com; s=arc-20240605;
|
||||||
|
b=KdiLKIN7OQmPF5O3bozzB9t0JL/To2npnCMuMVg4Iawwtni3NbkM+Y4nXB3Wtm5kAj
|
||||||
|
Sa6HsrnbgNz3D8lp3nJB8bXexvVTc73ZQFDKtKnDRj7sv/8eK0qMpCkRb3Rhgu2cQEfa
|
||||||
|
lYv7E0pEj0qcMxDM5osGhdhrwsV8BnEboHL38bCfhDxSmcmGsmPgiC5IWiyhcWq8G2W6
|
||||||
|
XwwPDdcHXk4wLwy4AQ1/NR5q130ELNP1f2e1Xq+xxLhfuV7GzhgOCTxYBIzrzJdM0kC/
|
||||||
|
Sxd1ejz+WLbowjVP2s4rStRtCvHU/g1LlPGmdnmyN9wQ+Tkya+Q7LjRWWB99e04qENOE
|
||||||
|
3E9g==
|
||||||
|
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:dkim-signature:dkim-signature;
|
||||||
|
bh=DSYDWRwqF5i+Yosvco75LpPB3hH2JqH2JZElsHalDcM=;
|
||||||
|
fh=mbzrMIWIgWMC0ni1xEx+ViW4J0RLAdLdPT2cX81nTlk=;
|
||||||
|
b=R24D+rdvNBJO+lAlMBX/5KkpnryHlsj/t5x1rJvWsKG/yrKJe81Epa9aDOWh5pljV4
|
||||||
|
Cg7IH6KrYLzYYMNQ83stCE7zIBs7sjtBl81bd/OpWCoXgJEAnE2bYs958fk3z8jINzBv
|
||||||
|
huNTL3ijCNiZeI/y5Ye/S8avkRfWf1tNn7nNc7oVf6Xc+ujGIk28KL3EGerj29au519E
|
||||||
|
MqL6BVYlSAx9VcBXY2vRZft2xDJo+JiKIw2n+XJT7+Ax0LubBX5BCfcRinBFT/XsVFTD
|
||||||
|
zxNaxxq9DbbAtr78NgacXMOxmo8bJYi/MD0wo0BVZBxd3kXhKF367iEKBreXu7tYPp5i
|
||||||
|
d7tg==;
|
||||||
|
dara=google.com
|
||||||
|
ARC-Authentication-Results: i=1; mx.google.com;
|
||||||
|
dkim=pass header.i=@google.com header.s=20230601 header.b=UV12BjMR;
|
||||||
|
dkim=pass header.i=@gmail.com header.s=20230601 header.b=HTQ+XWtf;
|
||||||
|
spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
|
||||||
|
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
|
||||||
|
dara=pass header.i=@gmail.com
|
||||||
|
Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73])
|
||||||
|
by mx.google.com with SMTPS id 5614622812f47-45ca0e0d20dsor1067583b6e.18.2026.01.17.07.15.46
|
||||||
|
for <couchmoney@gmail.com>
|
||||||
|
(Google Transport Security);
|
||||||
|
Sat, 17 Jan 2026 07:15:46 -0800 (PST)
|
||||||
|
Received-SPF: pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73;
|
||||||
|
Authentication-Results: mx.google.com;
|
||||||
|
dkim=pass header.i=@google.com header.s=20230601 header.b=UV12BjMR;
|
||||||
|
dkim=pass header.i=@gmail.com header.s=20230601 header.b=HTQ+XWtf;
|
||||||
|
spf=pass (google.com: domain of tconvertino@gmail.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=tconvertino@gmail.com;
|
||||||
|
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com;
|
||||||
|
dara=pass header.i=@gmail.com
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=google.com; s=20230601; t=1768662946; x=1769267746; dara=google.com;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:from:to:cc:subject:date:message-id:reply-to;
|
||||||
|
bh=DSYDWRwqF5i+Yosvco75LpPB3hH2JqH2JZElsHalDcM=;
|
||||||
|
b=UV12BjMRpTIHG34HTOnEB4ApBu4DnXlft6fU+aIV2TzL1HFmpDf9rz1riEoHyaWSGU
|
||||||
|
P7ydXwhdNhl1b9SVRu+jhtsd0Wt7vLGTb/ru1OZEnxC8P2A9jCdqjT3J9GwtpZxcv4nh
|
||||||
|
ipdJF6LYZ6yt1H2AftMJf59/9L1HbiwMs3MceHqj+R0AlU4KNtuevB/ImTump5XiSH/8
|
||||||
|
iDgvVfqyvm2kYwp9yV4cMXWUIQG6bWHB/No01kLG2PtgOy45chmfp/P22/ZyY3wEFd/U
|
||||||
|
044fReZdGmqwqGfhM81y2+WVwuzQltjv8dZ2yf1SeSVOLmrc8Uc5lYFvzQJK7NiaVsyv
|
||||||
|
sYWQ==
|
||||||
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||||
|
d=gmail.com; s=20230601; t=1768662946; x=1769267746; dara=google.com;
|
||||||
|
h=to:from:subject:date:message-id:auto-submitted:sender:reply-to
|
||||||
|
:mime-version:from:to:cc:subject:date:message-id:reply-to;
|
||||||
|
bh=DSYDWRwqF5i+Yosvco75LpPB3hH2JqH2JZElsHalDcM=;
|
||||||
|
b=HTQ+XWtfciYuHpwOHCqsF6ctCQc5eRWblgRxVdEfjGFYy2TmgSb/jA5+HldQ7hxk5S
|
||||||
|
mfppkAhF82R1zQM96e2QMnoamqslIpum/+pvdIfxbvXiAytCNOmQZoc1xhlTz5CCkpni
|
||||||
|
g23H0O3kiXSdzhG4uLJgsGMaNR/rAkslbMW7ARNTluvuWM60d9At9ZCazZCVLq2C0nhS
|
||||||
|
0HvaBa5uxi19A6l/55NmEbhPvAHXSw7V9SEUF8TTBuGLfZEkrjUF+RxfAgN/+NuZR5o7
|
||||||
|
yOAlNI/iEi+F8T7Is+ZmjbHYysZu01/nzldZnZEQamYuUQBeKpbNHSEGbVrpD3+AuT6f
|
||||||
|
/t8w==
|
||||||
|
MIME-Version: 1.0
|
||||||
|
X-Received: by 2002:a05:6820:1ca1:b0:65f:7009:d6e5 with SMTP id
|
||||||
|
006d021491bc7-661188b9d4bmr1995718eaf.22.1768662945924; Sat, 17 Jan 2026
|
||||||
|
07:15:45 -0800 (PST)
|
||||||
|
Reply-To: tconvertino@gmail.com
|
||||||
|
Sender: Google Calendar <calendar-notification@google.com>
|
||||||
|
Auto-Submitted: auto-generated
|
||||||
|
Message-ID: <calendar-3c0029f2-74ee-41a1-b1f0-0716665ce0d3@google.com>
|
||||||
|
Date: Sat, 17 Jan 2026 15:15:45 +0000
|
||||||
|
Subject: Updated invitation: painting class @ Thu Feb 12, 2026 7pm - 9pm (PST) (tconvertino@gmail.com)
|
||||||
|
From: tconvertino@gmail.com
|
||||||
|
To: couchmoney@gmail.com
|
||||||
|
Content-Type: multipart/alternative; boundary="0000000000009e8d3e064896eeed"
|
||||||
|
X-Rspamd-Queue-Id: 9ED9E80023
|
||||||
|
X-Rspamd-Server: phx
|
||||||
|
X-Spamd-Result: default: False [-0.70 / 15.00];
|
||||||
|
URI_COUNT_ODD(1.00)[1];
|
||||||
|
ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=2];
|
||||||
|
DMARC_POLICY_ALLOW(-0.50)[gmail.com,none];
|
||||||
|
MANY_INVISIBLE_PARTS(0.20)[3];
|
||||||
|
R_DKIM_ALLOW(-0.20)[google.com:s=20230601,gmail.com:s=20230601];
|
||||||
|
R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c];
|
||||||
|
MIME_GOOD(-0.10)[multipart/alternative,text/plain];
|
||||||
|
MIME_BASE64_TEXT(0.10)[];
|
||||||
|
FREEMAIL_ENVFROM(0.00)[gmail.com];
|
||||||
|
RCVD_TLS_LAST(0.00)[];
|
||||||
|
RCVD_COUNT_THREE(0.00)[3];
|
||||||
|
FREEMAIL_TO(0.00)[gmail.com];
|
||||||
|
TAGGED_FROM(0.00)[caf_=gmail=xinutv];
|
||||||
|
FREEMAIL_FROM(0.00)[gmail.com];
|
||||||
|
FREEMAIL_REPLYTO(0.00)[gmail.com];
|
||||||
|
MIME_TRACE(0.00)[0:+,1:+,2:~];
|
||||||
|
RCPT_COUNT_ONE(0.00)[1];
|
||||||
|
FORGED_SENDER(0.00)[tconvertino@gmail.com,couchmoney@gmail.com];
|
||||||
|
RCVD_IN_DNSWL_NONE(0.00)[209.85.220.73:received];
|
||||||
|
MISSING_XM_UA(0.00)[];
|
||||||
|
HAS_REPLYTO(0.00)[tconvertino@gmail.com];
|
||||||
|
TO_DN_NONE(0.00)[];
|
||||||
|
DNSWL_BLOCKED(0.00)[209.85.167.47:from];
|
||||||
|
FORGED_SENDER_FORWARDING(0.00)[];
|
||||||
|
FROM_NEQ_ENVFROM(0.00)[tconvertino@gmail.com,couchmoney@gmail.com];
|
||||||
|
DWL_DNSWL_NONE(0.00)[google.com:dkim];
|
||||||
|
DKIM_TRACE(0.00)[google.com:+,gmail.com:+];
|
||||||
|
DWL_DNSWL_BLOCKED(0.00)[gmail.com:dkim];
|
||||||
|
TO_DOM_EQ_FROM_DOM(0.00)[];
|
||||||
|
FROM_NO_DN(0.00)[];
|
||||||
|
FWD_GOOGLE(0.00)[couchmoney@gmail.com];
|
||||||
|
ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US];
|
||||||
|
RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.47:from];
|
||||||
|
REPLYTO_EQ_FROM(0.00)[]
|
||||||
|
X-Rspamd-Action: no action
|
||||||
|
X-TUID: SJoEMVYLjYPK
|
||||||
|
|
||||||
|
--0000000000009e8d3e064896eeed
|
||||||
|
Content-Type: text/plain; charset="UTF-8"; format=flowed; delsp=yes
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
|
||||||
|
VGhpcyBldmVudCBoYXMgYmVlbiB1cGRhdGVkDQpDaGFuZ2VkOiB0aW1lDQoNCg0KcGFpbnRpbmcg
|
||||||
|
Y2xhc3MNClRodXJzZGF5IEZlYiAxMiwgMjAyNiDii4UgN3BtIOKAkyA5cG0NClBhY2lmaWMgVGlt
|
||||||
|
ZSAtIExvcyBBbmdlbGVzDQoNCg0KDQpPcmdhbml6ZXINCnRjb252ZXJ0aW5vQGdtYWlsLmNvbQ0K
|
||||||
|
dGNvbnZlcnRpbm9AZ21haWwuY29tDQoNCn5+Ly9+fg0KSW52aXRhdGlvbiBmcm9tIEdvb2dsZSBD
|
||||||
|
YWxlbmRhcjogaHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29tL2NhbGVuZGFyLw0KDQpZb3UgYXJl
|
||||||
|
IHJlY2VpdmluZyB0aGlzIGVtYWlsIGJlY2F1c2UgeW91IGFyZSBzdWJzY3JpYmVkIHRvIGNhbGVu
|
||||||
|
ZGFyICANCm5vdGlmaWNhdGlvbnMuIFRvIHN0b3AgcmVjZWl2aW5nIHRoZXNlIGVtYWlscywgZ28g
|
||||||
|
dG8gIA0KaHR0cHM6Ly9jYWxlbmRhci5nb29nbGUuY29tL2NhbGVuZGFyL3Ivc2V0dGluZ3MsIHNl
|
||||||
|
bGVjdCB0aGlzIGNhbGVuZGFyLCBhbmQgIA0KY2hhbmdlICJPdGhlciBub3RpZmljYXRpb25zIi4N
|
||||||
|
Cg0KRm9yd2FyZGluZyB0aGlzIGludml0YXRpb24gY291bGQgYWxsb3cgYW55IHJlY2lwaWVudCB0
|
||||||
|
byBzZW5kIGEgcmVzcG9uc2UgdG8gIA0KdGhlIG9yZ2FuaXplciwgYmUgYWRkZWQgdG8gdGhlIGd1
|
||||||
|
ZXN0IGxpc3QsIGludml0ZSBvdGhlcnMgcmVnYXJkbGVzcyBvZiAgDQp0aGVpciBvd24gaW52aXRh
|
||||||
|
dGlvbiBzdGF0dXMsIG9yIG1vZGlmeSB5b3VyIFJTVlAuDQoNCkxlYXJuIG1vcmUgaHR0cHM6Ly9z
|
||||||
|
dXBwb3J0Lmdvb2dsZS5jb20vY2FsZW5kYXIvYW5zd2VyLzM3MTM1I2ZvcndhcmRpbmcNCg==
|
||||||
|
--0000000000009e8d3e064896eeed
|
||||||
|
Content-Type: text/html; charset="UTF-8"
|
||||||
|
Content-Transfer-Encoding: quoted-printable
|
||||||
|
|
||||||
|
<!doctype html><html xmlns=3D"http://www.w3.org/1999/xhtml" xmlns:v=3D"urn:=
|
||||||
|
schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-microsoft-com:office:offi=
|
||||||
|
ce"><head><title></title><!--[if !mso]><meta http-equiv=3D"X-UA-Compatible"=
|
||||||
|
content=3D"IE=3Dedge"><![endif]--><meta http-equiv=3D"Content-Type" conten=
|
||||||
|
t=3D"text/html; charset=3DUTF-8"><meta name=3D"viewport" content=3D"width=
|
||||||
|
=3Ddevice-width,initial-scale=3D1"><meta name=3D"color-scheme" content=3D"l=
|
||||||
|
ight dark"><meta name=3D"supported-color-schemes" content=3D"light dark">
|
||||||
|
<style>
|
||||||
|
body, html {
|
||||||
|
font-family: Roboto, Helvetica, Arial, sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-webkit-text-size-adjust: 100%;
|
||||||
|
-ms-text-size-adjust: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
#outlook a {
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ReadMsgBody {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ExternalClass {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ExternalClass * {
|
||||||
|
line-height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
table,
|
||||||
|
td {
|
||||||
|
mso-table-lspace: 0pt;
|
||||||
|
mso-table-rspace: 0pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
img {
|
||||||
|
border: 0;
|
||||||
|
height: auto;
|
||||||
|
line-height: 100%;
|
||||||
|
outline: none;
|
||||||
|
text-decoration: none;
|
||||||
|
-ms-interpolation-mode: bicubic;
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
display: block;
|
||||||
|
margin: 13px 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--[if !mso]><!-->
|
||||||
|
<style>
|
||||||
|
@media only screen and (max-width:580px) {
|
||||||
|
@-ms-viewport {
|
||||||
|
width: 320px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@viewport {
|
||||||
|
width: 320px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--<![endif]-->
|
||||||
|
<!--[if mso]>
|
||||||
|
<xml>
|
||||||
|
<o:OfficeDocumentSettings>
|
||||||
|
<o:AllowPNG/>
|
||||||
|
<o:PixelsPerInch>96</o:PixelsPerInch>
|
||||||
|
</o:OfficeDocumentSettings>
|
||||||
|
</xml>
|
||||||
|
<![endif]-->
|
||||||
|
<!--[if lte mso 11]>
|
||||||
|
<style>
|
||||||
|
.outlook-group-fix { width:100% !important; }
|
||||||
|
</style>
|
||||||
|
<![endif]-->
|
||||||
|
|
||||||
|
<!--[if !mso]><!-- -->
|
||||||
|
<style>body, html {font-family:Roboto,Helvetica,Arial,sans-serif;}@font-f=
|
||||||
|
ace {
|
||||||
|
font-family: 'Roboto';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
font-stretch: normal;
|
||||||
|
src: url(//fonts.gstatic.com/s/roboto/v48/KFOMCnqEu92Fr1ME7kSn66aGLdTylUA=
|
||||||
|
MQXC89YmC2DPNWubEbVmUiA8.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Roboto';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 500;
|
||||||
|
font-stretch: normal;
|
||||||
|
src: url(//fonts.gstatic.com/s/roboto/v48/KFOMCnqEu92Fr1ME7kSn66aGLdTylUA=
|
||||||
|
MQXC89YmC2DPNWub2bVmUiA8.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Roboto';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 700;
|
||||||
|
font-stretch: normal;
|
||||||
|
src: url(//fonts.gstatic.com/s/roboto/v48/KFOMCnqEu92Fr1ME7kSn66aGLdTylUA=
|
||||||
|
MQXC89YmC2DPNWuYjalmUiA8.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Material Icons Extended';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url(//fonts.gstatic.com/s/materialiconsextended/v154/kJEjBvgX7BgnkSr=
|
||||||
|
UwT8UnLVc38YydejYY-oE_LvM.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Material Icons';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlematerialicons/v144/Gw6kwdfw6UnXLJCcm=
|
||||||
|
afZyFRXb3BL9rvi0QZG3g.otf) format('opentype');
|
||||||
|
}
|
||||||
|
|
||||||
|
.google-material-icons {
|
||||||
|
font-family: 'Google Material Icons';
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
font-size: 24px;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: normal;
|
||||||
|
text-transform: none;
|
||||||
|
display: inline-block;
|
||||||
|
white-space: nowrap;
|
||||||
|
word-wrap: normal;
|
||||||
|
direction: ltr;
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Material Icons Filled';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlematerialiconsfilled/v118/WWXFlimHYg6=
|
||||||
|
HKI3TavMkbKdhBmDvgach8TVpeGsuueSZJH4.otf) format('opentype');
|
||||||
|
}
|
||||||
|
|
||||||
|
.google-material-icons-filled {
|
||||||
|
font-family: 'Google Material Icons Filled';
|
||||||
|
font-weight: normal;
|
||||||
|
font-style: normal;
|
||||||
|
font-size: 24px;
|
||||||
|
line-height: 1;
|
||||||
|
letter-spacing: normal;
|
||||||
|
text-transform: none;
|
||||||
|
display: inline-block;
|
||||||
|
white-space: nowrap;
|
||||||
|
word-wrap: normal;
|
||||||
|
direction: ltr;
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Sans';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 400;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlesans/v14/4UaGrENHsxJlGDuGo1OIlL3Owps=
|
||||||
|
.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Sans';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 500;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlesans/v14/4UabrENHsxJlGDuGo1OIlLU94Yt=
|
||||||
|
zCwM.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
@font-face {
|
||||||
|
font-family: 'Google Sans';
|
||||||
|
font-style: normal;
|
||||||
|
font-weight: 700;
|
||||||
|
src: url(//fonts.gstatic.com/s/googlesans/v14/4UabrENHsxJlGDuGo1OIlLV154t=
|
||||||
|
zCwM.ttf) format('truetype');
|
||||||
|
}
|
||||||
|
</style><!--<![endif]-->
|
||||||
|
<style>
|
||||||
|
.body-container {
|
||||||
|
padding-left: 16px;
|
||||||
|
padding-right: 16px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
=20
|
||||||
|
<style>
|
||||||
|
u+.body .body-container,
|
||||||
|
body[data-outlook-cycle] .body-container,
|
||||||
|
#MessageViewBody .body-container {
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
=20
|
||||||
|
<style>
|
||||||
|
@media only screen and (min-width:580px) {
|
||||||
|
.column-per-37 {
|
||||||
|
width: 37% !important;
|
||||||
|
max-width: 37%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.column-per-63 {
|
||||||
|
width: 63% !important;
|
||||||
|
max-width: 63%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
=20
|
||||||
|
<style>
|
||||||
|
.appointment-buttons th {
|
||||||
|
display: block;
|
||||||
|
clear: both;
|
||||||
|
float: left;
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.appointment-buttons th a {
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
#MessageViewBody .appointment-buttons th {
|
||||||
|
margin-top: 24px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
=20
|
||||||
|
<style>
|
||||||
|
@media only screen and (max-width:580px) {
|
||||||
|
table.full-width-mobile {
|
||||||
|
width: 100% !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
td.full-width-mobile {
|
||||||
|
width: auto !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<style>
|
||||||
|
.main-container-inner,
|
||||||
|
.info-bar-inner {
|
||||||
|
padding: 12px 16px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-column-table-ltr {
|
||||||
|
padding-right: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-column-table-rtl {
|
||||||
|
padding-left: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media only screen and (min-width:580px) {
|
||||||
|
.main-container-inner {
|
||||||
|
padding: 24px 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-bar-inner {
|
||||||
|
padding: 12px 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-column-table-ltr {
|
||||||
|
padding-right: 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.main-column-table-rtl {
|
||||||
|
padding-left: 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.appointment-buttons th {
|
||||||
|
display: table-cell;
|
||||||
|
clear: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-text {
|
||||||
|
color: #3c4043 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.secondary-text,
|
||||||
|
.phone-number a {
|
||||||
|
color: #70757a !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accent-text {
|
||||||
|
color: #1a73e8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accent-text-dark {
|
||||||
|
color: #185abc !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grey-button-text,
|
||||||
|
.attachment-chip a {
|
||||||
|
color: #5f6368 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-button {
|
||||||
|
background-color: #1a73e8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-button-text {
|
||||||
|
color: #fff !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.underline-on-hover:hover {
|
||||||
|
text-decoration: underline !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grey-infobar-text {
|
||||||
|
color: #202124 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
.primary-text:not([class^=3D"x_"]) {
|
||||||
|
color: #e8eaed !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.secondary-text:not([class^=3D"x_"]),
|
||||||
|
.phone-number:not([class^=3D"x_"]) a {
|
||||||
|
color: #9aa0a6 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.grey-button-text:not([class^=3D"x_"]),
|
||||||
|
.attachment-chip:not([class^=3D"x_"]) a {
|
||||||
|
color: #bdc1c6 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accent-text:not([class^=3D"x_"]),
|
||||||
|
.hairline-button-text:not([class^=3D"x_"]) {
|
||||||
|
color: #8ab4f8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-button:not([class^=3D"x_"]) {
|
||||||
|
background-color: #8ab4f8 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.primary-button-text:not([class^=3D"x_"]) {
|
||||||
|
color: #202124 !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<style>
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
.cse-banner:not([class^=3D"x_"]) {
|
||||||
|
background-color: #3c4043 !important; /* Google Grey 800 */
|
||||||
|
}
|
||||||
|
|
||||||
|
.encryption-icon:not([class^=3D"x_"]) {
|
||||||
|
/* WARNING: This causes the whole style tag to get stripped in Gm=
|
||||||
|
ail. */
|
||||||
|
background-image: url('https://fonts.gstatic.com/s/i/googlemateri=
|
||||||
|
aliconsfilled/encrypted/v3/gm_grey200-24dp/2x/gm_filled_encrypted_gm_grey20=
|
||||||
|
0_24dp.png') !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--[if !mso]><!-->
|
||||||
|
<style>
|
||||||
|
.prevent-link a {
|
||||||
|
color: inherit !important;
|
||||||
|
text-decoration: none !important;
|
||||||
|
font-size: inherit !important;
|
||||||
|
font-family: inherit !important;
|
||||||
|
font-weight: inherit !important;
|
||||||
|
line-height: inherit !important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<!--<![endif]-->
|
||||||
|
|
||||||
|
<!--[if mso | IE]>
|
||||||
|
<style>
|
||||||
|
.main-container-inner {
|
||||||
|
padding: 24px 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-bar-inner {
|
||||||
|
padding: 12px 32px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cse-banner .encryption-icon {
|
||||||
|
/* We use the IE workaround instead. */
|
||||||
|
background-image: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cse-banner .encryption-icon .ms-fallback {
|
||||||
|
display: block !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* NB: Some MS clients ignore dark-scheme styling and apply their o=
|
||||||
|
wn, so there's nothing we can do to help there. */
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
.cse-banner:not([class^=3D"x_"]) .encryption-icon .ms-fallback {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cse-banner:not([class^=3D"x_"]) .encryption-icon .ms-fallback-da=
|
||||||
|
rk {
|
||||||
|
display: block !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
<![endif]-->
|
||||||
|
</head><body class=3D"body"><span itemscope itemtype=3D"http://schema.org=
|
||||||
|
/InformAction"><span itemprop=3D"object" itemscope itemtype=3D"http://schem=
|
||||||
|
a.org/Event"><meta itemprop=3D"eventStatus" content=3D"http://schema.org/Ev=
|
||||||
|
entRescheduled"/><span itemprop=3D"publisher" itemscope itemtype=3D"http://=
|
||||||
|
schema.org/Organization"><meta itemprop=3D"name" content=3D"Google Calendar=
|
||||||
|
"/></span><meta itemprop=3D"eventId/googleCalendar" content=3D"4octcgvhijqj=
|
||||||
|
m45h8d9dr4iq1m"/><span style=3D"display: none; font-size: 1px; color: #fff;=
|
||||||
|
line-height: 1px; height: 0; max-height: 0; width: 0; max-width: 0; opacit=
|
||||||
|
y: 0; overflow: hidden;" itemprop=3D"name">painting class</span><meta itemp=
|
||||||
|
rop=3D"url" content=3D"https://calendar.google.com/calendar/r?eid=3DNG9jdGN=
|
||||||
|
ndmhpanFqbTQ1aDhkOWRyNGlxMW0gdGNvbnZlcnRpbm9AbQ&es=3D1"/><span aria-hid=
|
||||||
|
den=3D"true"><time itemprop=3D"startDate" datetime=3D"20260213T030000Z"></t=
|
||||||
|
ime><time itemprop=3D"endDate" datetime=3D"20260213T050000Z"></time></span>=
|
||||||
|
<div style=3D"display: none; font-size: 1px; color: #fff; line-height: 1px;=
|
||||||
|
height: 0; max-height: 0; width: 0; max-width: 0; opacity: 0; overflow: hi=
|
||||||
|
dden;">You have been invited by tconvertino@gmail.com to attend an event na=
|
||||||
|
med painting class on Thursday Feb 12, 2026 =E2=8B=85 7pm =E2=80=93 9pm (Pa=
|
||||||
|
cific Time - Los Angeles).</div><table border=3D"0" cellpadding=3D"0" cells=
|
||||||
|
pacing=3D"0" role=3D"presentation" align=3D"center" style=3D"width:100%;" c=
|
||||||
|
lass=3D"body-container"><tbody><tr><td style=3D"" class=3D"" align=3D"left"=
|
||||||
|
><!--[if mso | IE]><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" =
|
||||||
|
role=3D"presentation"><tr><td height=3D"16" style=3D"height:16px;"><![endif=
|
||||||
|
]--><div style=3D"height:16px;" aria-hidden=3D"true"> </div><!--[if =
|
||||||
|
mso | IE]></td></tr></table><![endif]--><table border=3D"0" cellpadding=3D"=
|
||||||
|
0" cellspacing=3D"0" role=3D"presentation" align=3D"center" style=3D"width:=
|
||||||
|
100%;" class=3D""><tbody><tr><td style=3D"background-color: #e6f4ea;color: =
|
||||||
|
#0d5327;padding: 12px 32px; border-radius: 8px;font-family: Roboto, sans-se=
|
||||||
|
rif;font-size: 14px; line-height: 20px;text-align: left;" class=3D"info-bar=
|
||||||
|
-inner"><span style=3D"font-weight: 700;">This event has been updated</span=
|
||||||
|
><br/><span style=3D"display:none" itemprop=3D"about" itemscope itemtype=3D=
|
||||||
|
"http://schema.org/Thing/Clock"><meta itemprop=3D"description" content=3D"T=
|
||||||
|
ime updated"/></span><div style=3D""><span style=3D"font-weight: 700;">Chan=
|
||||||
|
ged:</span> time</div></td></tr></tbody></table><!--[if mso | IE]><table bo=
|
||||||
|
rder=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D"presentation"><tr><t=
|
||||||
|
d height=3D"12" style=3D"height:12px;"><![endif]--><div style=3D"height:12p=
|
||||||
|
x;" aria-hidden=3D"true"> </div><!--[if mso | IE]></td></tr></table>=
|
||||||
|
<![endif]--><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D=
|
||||||
|
"presentation" align=3D"center" style=3D"width:100%;" class=3D""><tbody><tr=
|
||||||
|
><td style=3D"border: solid 1px #dadce0; border-radius: 8px; direction: rtl=
|
||||||
|
; font-size: 0; padding: 24px 32px; text-align: left; vertical-align: top;"=
|
||||||
|
class=3D"main-container-inner"><!--[if mso | IE]><table border=3D"0" cellp=
|
||||||
|
adding=3D"0" cellspacing=3D"0" role=3D"presentation"><tr><![endif]--><div c=
|
||||||
|
lass=3D"" style=3D"font-size: 13px; text-align: left; direction: ltr; displ=
|
||||||
|
ay: inline-block; vertical-align: top; width: 100%;overflow: hidden; word-w=
|
||||||
|
rap: break-word;"><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" r=
|
||||||
|
ole=3D"presentation" width=3D"100%" class=3D"main-column-table-ltr" style=
|
||||||
|
=3D"padding-right: 32px; padding-left: 0;;table-layout: fixed;"><tbody><tr>=
|
||||||
|
<td class=3D"main-column-td" style=3D"padding:0; vertical-align:top;"><tabl=
|
||||||
|
e border=3D"0" cellpadding=3D"0" cellspacing=3D"0" role=3D"presentation" wi=
|
||||||
|
dth=3D"100%" style=3D"table-layout: fixed;"><tr><td style=3D"font-size: 0; =
|
||||||
|
padding: 0; text-align: left; word-break: break-word;;padding-bottom:24px;"=
|
||||||
|
><div style=3D"font-family: Roboto, sans-serif;font-style: normal; font-wei=
|
||||||
|
ght: 400; font-size: 14px; line-height: 20px; letter-spacing: 0.2px;color: =
|
||||||
|
#3c4043; text-decoration: none;" class=3D"primary-text" role=3D"presentatio=
|
||||||
|
n"><span aria-hidden=3D"true"><time itemprop=3D"startDate" datetime=3D"2026=
|
||||||
|
0213T030000Z"></time><time itemprop=3D"endDate" datetime=3D"20260213T050000=
|
||||||
|
Z"></time></span><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" ro=
|
||||||
|
le=3D"presentation" style=3D"padding-bottom: 4px;"><tr><td><h2 class=3D"pri=
|
||||||
|
mary-text" style=3D"font-size: 14px;color: #3c4043; text-decoration: none;f=
|
||||||
|
ont-weight: 700;-webkit-font-smoothing: antialiased;margin: 0; padding: 0;"=
|
||||||
|
>When</h2></td><td style=3D"width: 8px;"></td><td style=3D"padding-top: 2px=
|
||||||
|
; padding-bottom: 3px;"><div style=3D"background-color: #1e8e3e; border-rad=
|
||||||
|
ius: 10px; padding: 1px 5px; line-height: 13px;"><span style=3D"color: whit=
|
||||||
|
e; font-size: 11px; font-weight: 700; letter-spacing: 0.8px; text-transform=
|
||||||
|
: uppercase; vertical-align: top;">CHANGED</span></div></td></tr></table><s=
|
||||||
|
pan>Thursday Feb 12, 2026 =E2=8B=85 7pm =E2=80=93 9pm (Pacific Time - Los A=
|
||||||
|
ngeles)<br/><span style=3D"text-decoration: line-through;"><del><span style=
|
||||||
|
=3D"display: none; font-size: 1px; color: #fff; line-height: 1px; height: 0=
|
||||||
|
; max-height: 0; width: 0; max-width: 0; opacity: 0; overflow: hidden;font-=
|
||||||
|
size: 0; display: block;">Old: </span>Thursday Jan 22, 2026 =E2=8B=85 7pm =
|
||||||
|
=E2=80=93 9pm (Pacific Time - Los Angeles)</del></span></span></div></td></=
|
||||||
|
tr><tr><td style=3D"font-size: 0; padding: 0; text-align: left; word-break:=
|
||||||
|
break-word;;padding-bottom:24px;"><div style=3D"font-family: Roboto, sans-=
|
||||||
|
serif;font-style: normal; font-weight: 400; font-size: 14px; line-height: 2=
|
||||||
|
0px; letter-spacing: 0.2px;color: #3c4043; text-decoration: none;" class=3D=
|
||||||
|
"primary-text" role=3D"presentation"><table border=3D"0" cellpadding=3D"0" =
|
||||||
|
cellspacing=3D"0" role=3D"presentation" style=3D"padding-bottom: 4px;"><tr>=
|
||||||
|
<td><h2 class=3D"primary-text" style=3D"font-size: 14px;color: #3c4043; tex=
|
||||||
|
t-decoration: none;font-weight: 700;-webkit-font-smoothing: antialiased;mar=
|
||||||
|
gin: 0; padding: 0;">Organizer</h2></td></tr></table><div style=3D"color: #=
|
||||||
|
3c4042;"><span class=3D"notranslate"><a class=3D"primary-text underline-on-=
|
||||||
|
hover" style=3D"display: inline-block;;color: #3c4043; text-decoration: non=
|
||||||
|
e;" href=3D"mailto:tconvertino@gmail.com">tconvertino@gmail.com</a></span><=
|
||||||
|
span itemprop=3D"organizer" itemscope itemtype=3D"http://schema.org/Person"=
|
||||||
|
><meta itemprop=3D"name" content=3D"tconvertino@gmail.com"/><meta itemprop=
|
||||||
|
=3D"email" content=3D"tconvertino@gmail.com"/></span></div></div></td></tr>=
|
||||||
|
<tr><td style=3D"font-size: 0; padding: 0; text-align: left; word-break: br=
|
||||||
|
eak-word;;padding-bottom:24px;"><div style=3D"font-family: Roboto, sans-ser=
|
||||||
|
if;font-style: normal; font-weight: 400; font-size: 14px; line-height: 20px=
|
||||||
|
; letter-spacing: 0.2px;color: #3c4043; text-decoration: none;" class=3D"pr=
|
||||||
|
imary-text" role=3D"presentation"><table border=3D"0" cellpadding=3D"0" cel=
|
||||||
|
lspacing=3D"0" role=3D"presentation" style=3D"padding-bottom: 4px;"><tr><td=
|
||||||
|
><h2 class=3D"primary-text" style=3D"font-size: 14px;color: #3c4043; text-d=
|
||||||
|
ecoration: none;font-weight: 700;-webkit-font-smoothing: antialiased;margin=
|
||||||
|
: 0; padding: 0;">Guests</h2></td></tr></table><div style=3D"padding-bottom=
|
||||||
|
: 4px; text-align: left;;color: #3c4042;"></div><a href=3D"https://calendar=
|
||||||
|
.google.com/calendar/r?eid=3DNG9jdGNndmhpanFqbTQ1aDhkOWRyNGlxMW0gdGNvbnZlcn=
|
||||||
|
Rpbm9AbQ&es=3D1" style=3D"display: inline-block;;color: #1a73e8; text-d=
|
||||||
|
ecoration: none;font-weight: 700;" target=3D"_blank" class=3D"accent-text u=
|
||||||
|
nderline-on-hover">View all guest info</a></div></td></tr></table></td></tr=
|
||||||
|
></tbody></table></div><!--[if mso | IE]></tr></table><![endif]--></td></tr=
|
||||||
|
></tbody></table><table border=3D"0" cellpadding=3D"0" cellspacing=3D"0" ro=
|
||||||
|
le=3D"presentation" align=3D"center" style=3D"width:100%;" class=3D""><tbod=
|
||||||
|
y><tr><td style=3D"font-size: 0; padding: 0; text-align: left; word-break: =
|
||||||
|
break-word;;padding:4px 12px;" class=3D"" align=3D"left"><div class=3D"seco=
|
||||||
|
ndary-text" style=3D"color: #70757a; text-decoration: none;font-family: Rob=
|
||||||
|
oto, sans-serif;font-size: 12px; line-height: 16px; mso-line-height-rule: e=
|
||||||
|
xactly; text-align: left;"><p>Invitation from <a href=3D"https://calendar.g=
|
||||||
|
oogle.com/calendar/" class=3D"accent-text underline-on-hover" style=3D"font=
|
||||||
|
-family: Roboto, sans-serif;font-size: 12px; line-height: 16px; mso-line-he=
|
||||||
|
ight-rule: exactly;;color: #1a73e8; text-decoration: none;" target=3D"_blan=
|
||||||
|
k">Google Calendar</a></p><p>You are receiving this email because you are s=
|
||||||
|
ubscribed to calendar notifications. To stop receiving these emails, go to =
|
||||||
|
<a href=3D"https://calendar.google.com/calendar/r/settings" class=3D"accent=
|
||||||
|
-text underline-on-hover" style=3D"font-family: Roboto, sans-serif;font-siz=
|
||||||
|
e: 12px; line-height: 16px; mso-line-height-rule: exactly;;color: #1a73e8; =
|
||||||
|
text-decoration: none;" target=3D"_blank">Calendar settings</a>, select thi=
|
||||||
|
s calendar, and change "Other notifications".</p><p>Forwarding this invitat=
|
||||||
|
ion could allow any recipient to send a response to the organizer, be added=
|
||||||
|
to the guest list, invite others regardless of their own invitation status=
|
||||||
|
, or modify your RSVP. <a class=3D"accent-text underline-on-hover" style=3D=
|
||||||
|
"font-family: Roboto, sans-serif;font-size: 12px; line-height: 16px; mso-li=
|
||||||
|
ne-height-rule: exactly;;color: #1a73e8; text-decoration: none;" href=3D"ht=
|
||||||
|
tps://support.google.com/calendar/answer/37135#forwarding">Learn more</a></=
|
||||||
|
p></div></td></tr></tbody></table></td></tr></tbody></table></span></span><=
|
||||||
|
/body></html>
|
||||||
|
--0000000000009e8d3e064896eeed--
|
||||||
@@ -12,7 +12,7 @@ version.workspace = true
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
build-info = "0.0.42"
|
build-info = "0.0.42"
|
||||||
letterbox-notmuch = { path = "../notmuch", version = "0.17.45", registry = "xinu" }
|
letterbox-notmuch = { path = "../notmuch", version = "0.17", registry = "xinu" }
|
||||||
regex = "1.11.1"
|
regex = "1.11.1"
|
||||||
serde = { version = "1.0.219", features = ["derive"] }
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
sqlx = "0.8.5"
|
sqlx = "0.8.5"
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ serde = { version = "1.0.219", features = ["derive"] }
|
|||||||
itertools = "0.14.0"
|
itertools = "0.14.0"
|
||||||
serde_json = { version = "1.0.140", features = ["unbounded_depth"] }
|
serde_json = { version = "1.0.140", features = ["unbounded_depth"] }
|
||||||
chrono = "0.4.40"
|
chrono = "0.4.40"
|
||||||
graphql_client = "0.14.0"
|
graphql_client = "0.16.0"
|
||||||
thiserror = "2.0.12"
|
thiserror = "2.0.12"
|
||||||
gloo-net = { version = "0.6.0", features = ["json", "serde_json"] }
|
gloo-net = { version = "0.6.0", features = ["json", "serde_json"] }
|
||||||
human_format = "1.1.0"
|
human_format = "1.1.0"
|
||||||
@@ -33,7 +33,7 @@ wasm-bindgen = "=0.2.100"
|
|||||||
uuid = { version = "1.16.0", features = [
|
uuid = { version = "1.16.0", features = [
|
||||||
"js",
|
"js",
|
||||||
] } # direct dep to set js feature, prevents Rng issues
|
] } # direct dep to set js feature, prevents Rng issues
|
||||||
letterbox-shared = { path = "../shared/", version = "0.17.45", registry = "xinu" }
|
letterbox-shared = { path = "../shared/", version = "0.17", registry = "xinu" }
|
||||||
seed_hooks = { version = "0.4.1", registry = "xinu" }
|
seed_hooks = { version = "0.4.1", registry = "xinu" }
|
||||||
strum_macros = "0.27.1"
|
strum_macros = "0.27.1"
|
||||||
gloo-console = "0.3.0"
|
gloo-console = "0.3.0"
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"args": [],
|
"args": [],
|
||||||
"description": "Indicates that an Input Object is a OneOf Input Object (and thus requires\n exactly one of its field be provided)",
|
"description": "Indicates that an Input Object is a OneOf Input Object (and thus requires exactly one of its field be provided)",
|
||||||
"locations": [
|
"locations": [
|
||||||
"INPUT_OBJECT"
|
"INPUT_OBJECT"
|
||||||
],
|
],
|
||||||
@@ -107,12 +107,14 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"mutationType": {
|
"mutationType": {
|
||||||
"name": "Mutation"
|
"name": "MutationRoot"
|
||||||
},
|
},
|
||||||
"queryType": {
|
"queryType": {
|
||||||
"name": "QueryRoot"
|
"name": "QueryRoot"
|
||||||
},
|
},
|
||||||
"subscriptionType": null,
|
"subscriptionType": {
|
||||||
|
"name": "SubscriptionRoot"
|
||||||
|
},
|
||||||
"types": [
|
"types": [
|
||||||
{
|
{
|
||||||
"description": null,
|
"description": null,
|
||||||
@@ -314,6 +316,16 @@
|
|||||||
"name": "Corpus",
|
"name": "Corpus",
|
||||||
"possibleTypes": null
|
"possibleTypes": null
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": "Implement the DateTime<Utc> scalar\n\nThe input/output is a string in RFC3339 format.",
|
||||||
|
"enumValues": null,
|
||||||
|
"fields": null,
|
||||||
|
"inputFields": null,
|
||||||
|
"interfaces": null,
|
||||||
|
"kind": "SCALAR",
|
||||||
|
"name": "DateTime",
|
||||||
|
"possibleTypes": null
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": null,
|
"description": null,
|
||||||
"enumValues": [
|
"enumValues": [
|
||||||
@@ -969,6 +981,51 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"args": [
|
||||||
|
{
|
||||||
|
"defaultValue": null,
|
||||||
|
"description": null,
|
||||||
|
"name": "query",
|
||||||
|
"type": {
|
||||||
|
"kind": "NON_NULL",
|
||||||
|
"name": null,
|
||||||
|
"ofType": {
|
||||||
|
"kind": "SCALAR",
|
||||||
|
"name": "String",
|
||||||
|
"ofType": null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"defaultValue": null,
|
||||||
|
"description": null,
|
||||||
|
"name": "wakeTime",
|
||||||
|
"type": {
|
||||||
|
"kind": "NON_NULL",
|
||||||
|
"name": null,
|
||||||
|
"ofType": {
|
||||||
|
"kind": "SCALAR",
|
||||||
|
"name": "DateTime",
|
||||||
|
"ofType": null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"deprecationReason": null,
|
||||||
|
"description": null,
|
||||||
|
"isDeprecated": false,
|
||||||
|
"name": "snooze",
|
||||||
|
"type": {
|
||||||
|
"kind": "NON_NULL",
|
||||||
|
"name": null,
|
||||||
|
"ofType": {
|
||||||
|
"kind": "SCALAR",
|
||||||
|
"name": "Boolean",
|
||||||
|
"ofType": null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"args": [],
|
"args": [],
|
||||||
"deprecationReason": null,
|
"deprecationReason": null,
|
||||||
@@ -989,7 +1046,7 @@
|
|||||||
"inputFields": null,
|
"inputFields": null,
|
||||||
"interfaces": [],
|
"interfaces": [],
|
||||||
"kind": "OBJECT",
|
"kind": "OBJECT",
|
||||||
"name": "Mutation",
|
"name": "MutationRoot",
|
||||||
"possibleTypes": null
|
"possibleTypes": null
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -1474,6 +1531,33 @@
|
|||||||
"name": "String",
|
"name": "String",
|
||||||
"possibleTypes": null
|
"possibleTypes": null
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"description": null,
|
||||||
|
"enumValues": null,
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"args": [],
|
||||||
|
"deprecationReason": null,
|
||||||
|
"description": null,
|
||||||
|
"isDeprecated": false,
|
||||||
|
"name": "values",
|
||||||
|
"type": {
|
||||||
|
"kind": "NON_NULL",
|
||||||
|
"name": null,
|
||||||
|
"ofType": {
|
||||||
|
"kind": "SCALAR",
|
||||||
|
"name": "Int",
|
||||||
|
"ofType": null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"inputFields": null,
|
||||||
|
"interfaces": [],
|
||||||
|
"kind": "OBJECT",
|
||||||
|
"name": "SubscriptionRoot",
|
||||||
|
"possibleTypes": null
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"description": null,
|
"description": null,
|
||||||
"enumValues": null,
|
"enumValues": null,
|
||||||
|
|||||||
4
web/graphql/snooze.graphql
Normal file
4
web/graphql/snooze.graphql
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
|
||||||
|
mutation SnoozeMutation($query: String!, $wakeTime: DateTime!) {
|
||||||
|
snooze(query: $query, wakeTime: $wakeTime)
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
DEV_HOST=localhost
|
DEV_HOST=localhost
|
||||||
DEV_PORT=9345
|
DEV_PORT=9345
|
||||||
graphql-client introspect-schema http://${DEV_HOST:?}:${DEV_PORT:?}/api/graphql --output schema.json
|
graphql-client introspect-schema http://${DEV_HOST:?}:${DEV_PORT:?}/api/graphql/ --output schema.json
|
||||||
git diff schema.json
|
git diff schema.json
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
|
use chrono::Utc;
|
||||||
use gloo_net::{http::Request, Error};
|
use gloo_net::{http::Request, Error};
|
||||||
use graphql_client::GraphQLQuery;
|
use graphql_client::GraphQLQuery;
|
||||||
use serde::{de::DeserializeOwned, Serialize};
|
use serde::{de::DeserializeOwned, Serialize};
|
||||||
|
|
||||||
|
type DateTime = chrono::DateTime<Utc>;
|
||||||
// The paths are relative to the directory where your `Cargo.toml` is located.
|
// The paths are relative to the directory where your `Cargo.toml` is located.
|
||||||
// Both json and the GraphQL schema language are supported as sources for the schema
|
// Both json and the GraphQL schema language are supported as sources for the schema
|
||||||
#[derive(GraphQLQuery)]
|
#[derive(GraphQLQuery)]
|
||||||
@@ -52,6 +54,14 @@ pub struct AddTagMutation;
|
|||||||
)]
|
)]
|
||||||
pub struct RemoveTagMutation;
|
pub struct RemoveTagMutation;
|
||||||
|
|
||||||
|
#[derive(GraphQLQuery)]
|
||||||
|
#[graphql(
|
||||||
|
schema_path = "graphql/schema.json",
|
||||||
|
query_path = "graphql/snooze.graphql",
|
||||||
|
response_derives = "Debug"
|
||||||
|
)]
|
||||||
|
pub struct SnoozeMutation;
|
||||||
|
|
||||||
#[derive(GraphQLQuery)]
|
#[derive(GraphQLQuery)]
|
||||||
#[graphql(
|
#[graphql(
|
||||||
schema_path = "graphql/schema.json",
|
schema_path = "graphql/schema.json",
|
||||||
|
|||||||
103
web/src/state.rs
103
web/src/state.rs
@@ -1,5 +1,6 @@
|
|||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
|
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
use graphql_client::GraphQLQuery;
|
use graphql_client::GraphQLQuery;
|
||||||
use letterbox_shared::WebsocketMessage;
|
use letterbox_shared::WebsocketMessage;
|
||||||
use log::{debug, error, info, warn};
|
use log::{debug, error, info, warn};
|
||||||
@@ -223,6 +224,24 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
Msg::AddTag(query, tag) => {
|
Msg::AddTag(query, tag) => {
|
||||||
|
orders.skip().perform_cmd(async move {
|
||||||
|
let res: Result<
|
||||||
|
graphql_client::Response<graphql::add_tag_mutation::ResponseData>,
|
||||||
|
gloo_net::Error,
|
||||||
|
> = send_graphql(graphql::AddTagMutation::build_query(
|
||||||
|
graphql::add_tag_mutation::Variables {
|
||||||
|
query: query.clone(),
|
||||||
|
tag: tag.clone(),
|
||||||
|
},
|
||||||
|
))
|
||||||
|
.await;
|
||||||
|
if let Err(e) = res {
|
||||||
|
error!("Failed to add tag {tag} to {query}: {e}");
|
||||||
|
}
|
||||||
|
Msg::Refresh
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Msg::AddTagAndGoToSearch(query, tag) => {
|
||||||
orders.skip().perform_cmd(async move {
|
orders.skip().perform_cmd(async move {
|
||||||
let res: Result<
|
let res: Result<
|
||||||
graphql_client::Response<graphql::add_tag_mutation::ResponseData>,
|
graphql_client::Response<graphql::add_tag_mutation::ResponseData>,
|
||||||
@@ -255,10 +274,50 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
if let Err(e) = res {
|
if let Err(e) = res {
|
||||||
error!("Failed to remove tag {tag} to {query}: {e}");
|
error!("Failed to remove tag {tag} to {query}: {e}");
|
||||||
}
|
}
|
||||||
// TODO: reconsider this behavior
|
Msg::Refresh
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Msg::RemoveTagAndGoToSearch(query, tag) => {
|
||||||
|
orders.skip().perform_cmd(async move {
|
||||||
|
let res: Result<
|
||||||
|
graphql_client::Response<graphql::remove_tag_mutation::ResponseData>,
|
||||||
|
gloo_net::Error,
|
||||||
|
> = send_graphql(graphql::RemoveTagMutation::build_query(
|
||||||
|
graphql::remove_tag_mutation::Variables {
|
||||||
|
query: query.clone(),
|
||||||
|
tag: tag.clone(),
|
||||||
|
},
|
||||||
|
))
|
||||||
|
.await;
|
||||||
|
if let Err(e) = res {
|
||||||
|
error!("Failed to remove tag {tag} to {query}: {e}");
|
||||||
|
}
|
||||||
Msg::GoToSearchResults
|
Msg::GoToSearchResults
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
Msg::Snooze(query, wake_time) => {
|
||||||
|
let is_catchup = model.catchup.is_some();
|
||||||
|
orders.skip().perform_cmd(async move {
|
||||||
|
let res: Result<
|
||||||
|
graphql_client::Response<graphql::snooze_mutation::ResponseData>,
|
||||||
|
gloo_net::Error,
|
||||||
|
> = send_graphql(graphql::SnoozeMutation::build_query(
|
||||||
|
graphql::snooze_mutation::Variables {
|
||||||
|
query: query.clone(),
|
||||||
|
wake_time,
|
||||||
|
},
|
||||||
|
))
|
||||||
|
.await;
|
||||||
|
if let Err(e) = res {
|
||||||
|
error!("Failed to snooze {query} until {wake_time}: {e}");
|
||||||
|
}
|
||||||
|
if is_catchup {
|
||||||
|
Msg::CatchupMarkAsRead
|
||||||
|
} else {
|
||||||
|
Msg::GoToSearchResults
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
Msg::FrontPageRequest {
|
Msg::FrontPageRequest {
|
||||||
query,
|
query,
|
||||||
@@ -267,6 +326,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
first,
|
first,
|
||||||
last,
|
last,
|
||||||
} => {
|
} => {
|
||||||
|
model.refreshing_state = RefreshingState::Loading;
|
||||||
let (after, before, first, last) = match (after.as_ref(), before.as_ref(), first, last)
|
let (after, before, first, last) = match (after.as_ref(), before.as_ref(), first, last)
|
||||||
{
|
{
|
||||||
// If no pagination set, set reasonable defaults
|
// If no pagination set, set reasonable defaults
|
||||||
@@ -292,25 +352,32 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
Msg::FrontPageResult(Err(e)) => {
|
Msg::FrontPageResult(Err(e)) => {
|
||||||
error!("error FrontPageResult: {e:?}");
|
let msg = format!("error FrontPageResult: {e:?}");
|
||||||
|
error!("{msg}");
|
||||||
|
model.refreshing_state = RefreshingState::Error(msg);
|
||||||
}
|
}
|
||||||
Msg::FrontPageResult(Ok(graphql_client::Response {
|
Msg::FrontPageResult(Ok(graphql_client::Response {
|
||||||
data: None,
|
data: None,
|
||||||
errors: None,
|
errors: None,
|
||||||
..
|
..
|
||||||
})) => {
|
})) => {
|
||||||
error!("FrontPageResult no data or errors, should not happen");
|
let msg = format!("FrontPageResult no data or errors, should not happen");
|
||||||
|
error!("{msg}");
|
||||||
|
model.refreshing_state = RefreshingState::Error(msg);
|
||||||
}
|
}
|
||||||
Msg::FrontPageResult(Ok(graphql_client::Response {
|
Msg::FrontPageResult(Ok(graphql_client::Response {
|
||||||
data: None,
|
data: None,
|
||||||
errors: Some(e),
|
errors: Some(e),
|
||||||
..
|
..
|
||||||
})) => {
|
})) => {
|
||||||
error!("FrontPageResult error: {e:?}");
|
let msg = format!("FrontPageResult error: {e:?}");
|
||||||
|
error!("{msg}");
|
||||||
|
model.refreshing_state = RefreshingState::Error(msg);
|
||||||
}
|
}
|
||||||
Msg::FrontPageResult(Ok(graphql_client::Response {
|
Msg::FrontPageResult(Ok(graphql_client::Response {
|
||||||
data: Some(data), ..
|
data: Some(data), ..
|
||||||
})) => {
|
})) => {
|
||||||
|
model.refreshing_state = RefreshingState::None;
|
||||||
model.tags = Some(
|
model.tags = Some(
|
||||||
data.tags
|
data.tags
|
||||||
.into_iter()
|
.into_iter()
|
||||||
@@ -350,6 +417,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Msg::ShowThreadRequest { thread_id } => {
|
Msg::ShowThreadRequest { thread_id } => {
|
||||||
|
model.refreshing_state = RefreshingState::Loading;
|
||||||
orders.skip().perform_cmd(async move {
|
orders.skip().perform_cmd(async move {
|
||||||
Msg::ShowThreadResult(
|
Msg::ShowThreadResult(
|
||||||
send_graphql(graphql::ShowThreadQuery::build_query(
|
send_graphql(graphql::ShowThreadQuery::build_query(
|
||||||
@@ -362,6 +430,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
Msg::ShowThreadResult(Ok(graphql_client::Response {
|
Msg::ShowThreadResult(Ok(graphql_client::Response {
|
||||||
data: Some(data), ..
|
data: Some(data), ..
|
||||||
})) => {
|
})) => {
|
||||||
|
model.refreshing_state = RefreshingState::None;
|
||||||
model.tags = Some(
|
model.tags = Some(
|
||||||
data.tags
|
data.tags
|
||||||
.into_iter()
|
.into_iter()
|
||||||
@@ -401,9 +470,12 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
orders.send_msg(Msg::WindowScrolled);
|
orders.send_msg(Msg::WindowScrolled);
|
||||||
}
|
}
|
||||||
Msg::ShowThreadResult(bad) => {
|
Msg::ShowThreadResult(bad) => {
|
||||||
error!("show_thread_query error: {bad:#?}");
|
let msg = format!("show_thread_query error: {bad:#?}");
|
||||||
|
error!("{msg}");
|
||||||
|
model.refreshing_state = RefreshingState::Error(msg);
|
||||||
}
|
}
|
||||||
Msg::CatchupRequest { query } => {
|
Msg::CatchupRequest { query } => {
|
||||||
|
model.refreshing_state = RefreshingState::Loading;
|
||||||
orders.perform_cmd(async move {
|
orders.perform_cmd(async move {
|
||||||
Msg::CatchupResult(
|
Msg::CatchupResult(
|
||||||
send_graphql::<_, graphql::catchup_query::ResponseData>(
|
send_graphql::<_, graphql::catchup_query::ResponseData>(
|
||||||
@@ -418,6 +490,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
Msg::CatchupResult(Ok(graphql_client::Response {
|
Msg::CatchupResult(Ok(graphql_client::Response {
|
||||||
data: Some(data), ..
|
data: Some(data), ..
|
||||||
})) => {
|
})) => {
|
||||||
|
model.refreshing_state = RefreshingState::None;
|
||||||
let items = data.catchup;
|
let items = data.catchup;
|
||||||
if items.is_empty() {
|
if items.is_empty() {
|
||||||
orders.send_msg(Msg::GoToSearchResults);
|
orders.send_msg(Msg::GoToSearchResults);
|
||||||
@@ -433,7 +506,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Msg::CatchupResult(bad) => {
|
Msg::CatchupResult(bad) => {
|
||||||
error!("catchup_query error: {bad:#?}");
|
let msg = format!("catchup_query error: {bad:#?}");
|
||||||
|
error!("{msg}");
|
||||||
|
model.refreshing_state = RefreshingState::Error(msg);
|
||||||
}
|
}
|
||||||
Msg::SelectionSetNone => {
|
Msg::SelectionSetNone => {
|
||||||
if let Context::SearchResult {
|
if let Context::SearchResult {
|
||||||
@@ -465,7 +540,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
.join(" ");
|
.join(" ");
|
||||||
orders
|
orders
|
||||||
.skip()
|
.skip()
|
||||||
.perform_cmd(async move { Msg::AddTag(threads, tag) });
|
.perform_cmd(async move { Msg::AddTagAndGoToSearch(threads, tag) });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Msg::SelectionRemoveTag(tag) => {
|
Msg::SelectionRemoveTag(tag) => {
|
||||||
@@ -480,7 +555,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
.join(" ");
|
.join(" ");
|
||||||
orders
|
orders
|
||||||
.skip()
|
.skip()
|
||||||
.perform_cmd(async move { Msg::RemoveTag(threads, tag) });
|
.perform_cmd(async move { Msg::RemoveTagAndGoToSearch(threads, tag) });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Msg::SelectionMarkAsRead => {
|
Msg::SelectionMarkAsRead => {
|
||||||
@@ -652,6 +727,13 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
|
|||||||
};
|
};
|
||||||
orders.send_msg(Msg::CatchupNext);
|
orders.send_msg(Msg::CatchupNext);
|
||||||
}
|
}
|
||||||
|
Msg::CatchupMarkAsSpam => {
|
||||||
|
if let Some(thread_id) = current_thread_id(&model.context) {
|
||||||
|
orders.send_msg(Msg::AddTag(thread_id.clone(), "Spam".to_string()));
|
||||||
|
orders.send_msg(Msg::SetUnread(thread_id, false));
|
||||||
|
};
|
||||||
|
orders.send_msg(Msg::CatchupNext);
|
||||||
|
}
|
||||||
Msg::CatchupNext => {
|
Msg::CatchupNext => {
|
||||||
orders.send_msg(Msg::ScrollToTop);
|
orders.send_msg(Msg::ScrollToTop);
|
||||||
let Some(catchup) = &mut model.catchup else {
|
let Some(catchup) = &mut model.catchup else {
|
||||||
@@ -812,7 +894,11 @@ pub enum Msg {
|
|||||||
|
|
||||||
SetUnread(String, bool),
|
SetUnread(String, bool),
|
||||||
AddTag(String, String),
|
AddTag(String, String),
|
||||||
|
AddTagAndGoToSearch(String, String),
|
||||||
|
#[allow(dead_code)]
|
||||||
RemoveTag(String, String),
|
RemoveTag(String, String),
|
||||||
|
RemoveTagAndGoToSearch(String, String),
|
||||||
|
Snooze(String, DateTime<Utc>),
|
||||||
|
|
||||||
FrontPageRequest {
|
FrontPageRequest {
|
||||||
query: String,
|
query: String,
|
||||||
@@ -861,6 +947,7 @@ pub enum Msg {
|
|||||||
CatchupStart,
|
CatchupStart,
|
||||||
CatchupKeepUnread,
|
CatchupKeepUnread,
|
||||||
CatchupMarkAsRead,
|
CatchupMarkAsRead,
|
||||||
|
CatchupMarkAsSpam,
|
||||||
CatchupNext,
|
CatchupNext,
|
||||||
CatchupExit,
|
CatchupExit,
|
||||||
|
|
||||||
|
|||||||
@@ -78,13 +78,16 @@ mod tw_classes {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn view(model: &Model) -> Node<Msg> {
|
pub fn view(model: &Model) -> Node<Msg> {
|
||||||
|
let is_loading = match model.refreshing_state {
|
||||||
|
RefreshingState::Loading => true,
|
||||||
|
_ => false,
|
||||||
|
};
|
||||||
match &model.context {
|
match &model.context {
|
||||||
Context::None => normal_view(
|
Context::None => normal_view(
|
||||||
div![h1!["Loading"]],
|
div![h1!["Loading"]],
|
||||||
&model.versions,
|
&model.versions,
|
||||||
&model.query,
|
&model.query,
|
||||||
&model.refreshing_state,
|
&model.refreshing_state,
|
||||||
model.read_completion_ratio,
|
|
||||||
&model.tags,
|
&model.tags,
|
||||||
),
|
),
|
||||||
Context::ThreadResult {
|
Context::ThreadResult {
|
||||||
@@ -93,17 +96,24 @@ pub fn view(model: &Model) -> Node<Msg> {
|
|||||||
} => {
|
} => {
|
||||||
if let Some(catchup) = &model.catchup {
|
if let Some(catchup) = &model.catchup {
|
||||||
catchup_view(
|
catchup_view(
|
||||||
thread(thread_data, open_messages, &model.content_el, true),
|
thread(thread_data, open_messages, &model.content_el, true, 0.),
|
||||||
&catchup.items,
|
&catchup.items,
|
||||||
|
is_loading,
|
||||||
model.read_completion_ratio,
|
model.read_completion_ratio,
|
||||||
|
true, // show spam button for email
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
normal_view(
|
normal_view(
|
||||||
thread(thread_data, open_messages, &model.content_el, false),
|
thread(
|
||||||
|
thread_data,
|
||||||
|
open_messages,
|
||||||
|
&model.content_el,
|
||||||
|
false,
|
||||||
|
model.read_completion_ratio,
|
||||||
|
),
|
||||||
&model.versions,
|
&model.versions,
|
||||||
&model.query,
|
&model.query,
|
||||||
&model.refreshing_state,
|
&model.refreshing_state,
|
||||||
model.read_completion_ratio,
|
|
||||||
&model.tags,
|
&model.tags,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -114,17 +124,18 @@ pub fn view(model: &Model) -> Node<Msg> {
|
|||||||
} => {
|
} => {
|
||||||
if let Some(catchup) = &model.catchup {
|
if let Some(catchup) = &model.catchup {
|
||||||
catchup_view(
|
catchup_view(
|
||||||
news_post(post, &model.content_el, true),
|
news_post(post, &model.content_el, true, 0.),
|
||||||
&catchup.items,
|
&catchup.items,
|
||||||
|
is_loading,
|
||||||
model.read_completion_ratio,
|
model.read_completion_ratio,
|
||||||
|
false, // no spam button for news
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
normal_view(
|
normal_view(
|
||||||
news_post(post, &model.content_el, false),
|
news_post(post, &model.content_el, false, model.read_completion_ratio),
|
||||||
&model.versions,
|
&model.versions,
|
||||||
&model.query,
|
&model.query,
|
||||||
&model.refreshing_state,
|
&model.refreshing_state,
|
||||||
model.read_completion_ratio,
|
|
||||||
&model.tags,
|
&model.tags,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -140,7 +151,6 @@ pub fn view(model: &Model) -> Node<Msg> {
|
|||||||
&model.versions,
|
&model.versions,
|
||||||
&model.query,
|
&model.query,
|
||||||
&model.refreshing_state,
|
&model.refreshing_state,
|
||||||
model.read_completion_ratio,
|
|
||||||
&model.tags,
|
&model.tags,
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
@@ -151,7 +161,6 @@ fn normal_view(
|
|||||||
versions: &Version,
|
versions: &Version,
|
||||||
query: &str,
|
query: &str,
|
||||||
refreshing_state: &RefreshingState,
|
refreshing_state: &RefreshingState,
|
||||||
read_completion_ratio: f64,
|
|
||||||
tags: &Option<Vec<Tag>>,
|
tags: &Option<Vec<Tag>>,
|
||||||
) -> Node<Msg> {
|
) -> Node<Msg> {
|
||||||
div![
|
div![
|
||||||
@@ -178,14 +187,15 @@ fn normal_view(
|
|||||||
content,
|
content,
|
||||||
view_header(query, refreshing_state, false),
|
view_header(query, refreshing_state, false),
|
||||||
],
|
],
|
||||||
reading_progress(read_completion_ratio),
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn catchup_view(
|
fn catchup_view(
|
||||||
content: Node<Msg>,
|
content: Node<Msg>,
|
||||||
items: &[CatchupItem],
|
items: &[CatchupItem],
|
||||||
|
is_loading: bool,
|
||||||
read_completion_ratio: f64,
|
read_completion_ratio: f64,
|
||||||
|
show_spam_button: bool,
|
||||||
) -> Node<Msg> {
|
) -> Node<Msg> {
|
||||||
div![
|
div![
|
||||||
C!["w-full", "relative", "text-white"],
|
C!["w-full", "relative", "text-white"],
|
||||||
@@ -201,13 +211,34 @@ fn catchup_view(
|
|||||||
"bg-black/50",
|
"bg-black/50",
|
||||||
],
|
],
|
||||||
div![
|
div![
|
||||||
C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
|
C!["absolute", "top-0", "left-4", "text-green-200", "p-4"],
|
||||||
span![i![C!["fas", "fa-x"]]],
|
IF!(is_loading=>span![i![C!["animate-spin", "fas", "fa-spinner"]]])
|
||||||
ev(Ev::Click, move |_| Msg::CatchupExit)
|
|
||||||
],
|
],
|
||||||
h1![
|
h1![
|
||||||
C!["text-center"],
|
C!["text-center"],
|
||||||
format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
|
format!("{} left ", items.iter().filter(|i| !i.seen).count(),)
|
||||||
|
],
|
||||||
|
div![
|
||||||
|
C!["absolute", "top-0", "right-4", "text-gray-500", "p-4"],
|
||||||
|
span![i![C!["fas", "fa-x"]]],
|
||||||
|
ev(Ev::Click, move |_| Msg::CatchupExit)
|
||||||
|
],
|
||||||
|
div![
|
||||||
|
C![
|
||||||
|
"absolute",
|
||||||
|
"left-0",
|
||||||
|
"right-0",
|
||||||
|
"bottom-0",
|
||||||
|
"w-full",
|
||||||
|
"h-1",
|
||||||
|
"bg-gray-200"
|
||||||
|
],
|
||||||
|
div![
|
||||||
|
C!["h-1", "bg-green-500"],
|
||||||
|
style! {
|
||||||
|
St::Width => format!("{}%", read_completion_ratio*100.)
|
||||||
|
}
|
||||||
|
]
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
div![C!["mt-12", "mb-20"], content],
|
div![C!["mt-12", "mb-20"], content],
|
||||||
@@ -240,6 +271,14 @@ fn catchup_view(
|
|||||||
Msg::GoToSearchResults
|
Msg::GoToSearchResults
|
||||||
]))
|
]))
|
||||||
],
|
],
|
||||||
|
IF!(show_spam_button => button![
|
||||||
|
tw_classes::button(),
|
||||||
|
C!["text-red-500"],
|
||||||
|
attrs! {At::Title => "Mark as spam"},
|
||||||
|
span![i![C!["far", "fa-hand"]]],
|
||||||
|
span![C!["pl-2"], "Spam"],
|
||||||
|
ev(Ev::Click, |_| Msg::CatchupMarkAsSpam)
|
||||||
|
]),
|
||||||
button![
|
button![
|
||||||
tw_classes::button_with_color("bg-green-800", "hover:bg-green-700"),
|
tw_classes::button_with_color("bg-green-800", "hover:bg-green-700"),
|
||||||
span![i![C!["far", "fa-envelope-open"]]],
|
span![i![C!["far", "fa-envelope-open"]]],
|
||||||
@@ -247,7 +286,6 @@ fn catchup_view(
|
|||||||
ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
|
ev(Ev::Click, |_| Msg::CatchupMarkAsRead)
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
reading_progress(read_completion_ratio)
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -324,8 +362,8 @@ fn search_results(
|
|||||||
attrs! {
|
attrs! {
|
||||||
At::Href => urls::thread(&tid)
|
At::Href => urls::thread(&tid)
|
||||||
},
|
},
|
||||||
div![title_break, &r.subject],
|
div![C!["line-clamp-2"], title_break, &r.subject],
|
||||||
span![C!["text-xs"], pretty_authors(&r.authors)],
|
span![C!["line-clamp-2", "text-xs"], pretty_authors(&r.authors)],
|
||||||
div![
|
div![
|
||||||
C!["flex", "flex-wrap", "justify-between"],
|
C!["flex", "flex-wrap", "justify-between"],
|
||||||
span![tags_chiclet(&tags)],
|
span![tags_chiclet(&tags)],
|
||||||
@@ -423,7 +461,7 @@ fn removable_tags_chiclet<'a>(thread_id: &'a str, tags: &'a [String]) -> Node<Ms
|
|||||||
a![
|
a![
|
||||||
C![&tw_classes::TAG_X],
|
C![&tw_classes::TAG_X],
|
||||||
span![i![C!["fa-solid", "fa-xmark"]]],
|
span![i![C!["fa-solid", "fa-xmark"]]],
|
||||||
ev(Ev::Click, move |_| Msg::RemoveTag(thread_id, rm_tag))
|
ev(Ev::Click, move |_| Msg::RemoveTagAndGoToSearch(thread_id, rm_tag))
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
@@ -727,15 +765,19 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
|
|||||||
C!["flex", "p-4", "bg-neutral-800"],
|
C!["flex", "p-4", "bg-neutral-800"],
|
||||||
div![avatar],
|
div![avatar],
|
||||||
div![
|
div![
|
||||||
C!["px-4", "mr-auto"],
|
C!["px-4", "flex-1"],
|
||||||
span![
|
div![
|
||||||
C!["font-semibold", "text-sm"],
|
C!["flex"],
|
||||||
from_detail.as_ref().map(|addr| attrs! {
|
div![
|
||||||
At::Title => addr
|
C!["font-semibold", "text-sm", "flex-1"],
|
||||||
}),
|
from_detail.as_ref().map(|addr| attrs! {
|
||||||
&from,
|
At::Title => addr
|
||||||
" ",
|
}),
|
||||||
from_detail.as_ref().map(|text| copy_text_widget(&text))
|
&from,
|
||||||
|
" ",
|
||||||
|
from_detail.as_ref().map(|text| copy_text_widget(&text))
|
||||||
|
],
|
||||||
|
snooze_buttons(msg.timestamp, &id),
|
||||||
],
|
],
|
||||||
IF!(!msg.to.is_empty() =>div![
|
IF!(!msg.to.is_empty() =>div![
|
||||||
C!["text-xs"],
|
C!["text-xs"],
|
||||||
@@ -1144,6 +1186,7 @@ fn thread(
|
|||||||
open_messages: &HashSet<String>,
|
open_messages: &HashSet<String>,
|
||||||
content_el: &ElRef<HtmlElement>,
|
content_el: &ElRef<HtmlElement>,
|
||||||
catchup_mode: bool,
|
catchup_mode: bool,
|
||||||
|
read_completion_ratio: f64,
|
||||||
) -> Node<Msg> {
|
) -> Node<Msg> {
|
||||||
// TODO(wathiede): show per-message subject if it changes significantly from top-level subject
|
// TODO(wathiede): show per-message subject if it changes significantly from top-level subject
|
||||||
let subject = if thread.subject.is_empty() {
|
let subject = if thread.subject.is_empty() {
|
||||||
@@ -1228,7 +1271,8 @@ fn thread(
|
|||||||
el_ref(content_el),
|
el_ref(content_el),
|
||||||
messages,
|
messages,
|
||||||
IF!(!catchup_mode => click_to_top())
|
IF!(!catchup_mode => click_to_top())
|
||||||
]
|
],
|
||||||
|
reading_progress(read_completion_ratio)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1371,7 +1415,7 @@ pub fn view_tags(tags: &Option<Vec<Tag>>) -> Node<Msg> {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
a![
|
a![
|
||||||
C!["grow", "truncate"],
|
C![indent_cls, "grow", "truncate"],
|
||||||
attrs! {
|
attrs! {
|
||||||
At::Href => href
|
At::Href => href
|
||||||
},
|
},
|
||||||
@@ -1472,6 +1516,7 @@ fn news_post(
|
|||||||
post: &ShowThreadQueryThreadOnNewsPost,
|
post: &ShowThreadQueryThreadOnNewsPost,
|
||||||
content_el: &ElRef<HtmlElement>,
|
content_el: &ElRef<HtmlElement>,
|
||||||
catchup_mode: bool,
|
catchup_mode: bool,
|
||||||
|
read_completion_ratio: f64,
|
||||||
) -> Node<Msg> {
|
) -> Node<Msg> {
|
||||||
let subject = &post.title;
|
let subject = &post.title;
|
||||||
set_title(subject);
|
set_title(subject);
|
||||||
@@ -1559,6 +1604,7 @@ fn news_post(
|
|||||||
]
|
]
|
||||||
],
|
],
|
||||||
IF!(!catchup_mode => click_to_top()),
|
IF!(!catchup_mode => click_to_top()),
|
||||||
|
reading_progress(read_completion_ratio)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg> {
|
fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg> {
|
||||||
@@ -1594,9 +1640,13 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
|
|||||||
C!["flex", "p-4", "bg-neutral-800"],
|
C!["flex", "p-4", "bg-neutral-800"],
|
||||||
div![favicon],
|
div![favicon],
|
||||||
div![
|
div![
|
||||||
C!["px-4", "mr-auto"],
|
C!["px-4", "mr-auto", "flex-1"],
|
||||||
div![
|
div![
|
||||||
div![C!["font-semibold", "text-sm"], from],
|
div![
|
||||||
|
C!["flex"],
|
||||||
|
div![C!["font-semibold", "text-sm", "flex-1"], from],
|
||||||
|
snooze_buttons(Some(post.timestamp), &id),
|
||||||
|
],
|
||||||
div![
|
div![
|
||||||
C!["flex", "gap-2", "pt-2", "text-sm"],
|
C!["flex", "gap-2", "pt-2", "text-sm"],
|
||||||
a![
|
a![
|
||||||
@@ -1691,3 +1741,47 @@ fn click_to_top() -> Node<Msg> {
|
|||||||
ev(Ev::Click, |_| Msg::ScrollToTop)
|
ev(Ev::Click, |_| Msg::ScrollToTop)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn snooze_buttons(timestamp: Option<i64>, id: &str) -> Node<Msg> {
|
||||||
|
div![
|
||||||
|
span![C!["px-2"], "⏰"],
|
||||||
|
button![
|
||||||
|
tw_classes::button(),
|
||||||
|
C!["rounded-r-none"],
|
||||||
|
"1d",
|
||||||
|
ev(Ev::Click, {
|
||||||
|
let id = id.to_string();
|
||||||
|
move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
Msg::Snooze(id, Utc::now() + chrono::Days::new(1))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
],
|
||||||
|
button![
|
||||||
|
tw_classes::button(),
|
||||||
|
C!["rounded-none"],
|
||||||
|
"7d",
|
||||||
|
ev(Ev::Click, {
|
||||||
|
let id = id.to_string();
|
||||||
|
move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
Msg::Snooze(id, Utc::now() + chrono::Days::new(7))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
],
|
||||||
|
timestamp.map(
|
||||||
|
|ts| chrono::DateTime::from_timestamp(ts, 0).map(|ts| button![
|
||||||
|
tw_classes::button(),
|
||||||
|
C!["rounded-l-none"],
|
||||||
|
"+6m",
|
||||||
|
ev(Ev::Click, {
|
||||||
|
let id = id.to_string();
|
||||||
|
move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
Msg::Snooze(id, ts + chrono::Days::new(180))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
])
|
||||||
|
),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user