Compare commits
No commits in common. "main" and "3.0.0-rc.2" have entirely different histories.
main
...
3.0.0-rc.2
9 changed files with 208 additions and 536 deletions
|
|
@ -137,7 +137,7 @@ jobs:
|
|||
run: rm release_blobs/build.env
|
||||
-
|
||||
name: Release New Version
|
||||
uses: actions/forgejo-release@v2
|
||||
uses: actions/forgejo-release@v1
|
||||
with:
|
||||
direction: upload
|
||||
url: https://forgejo.neshweb.net
|
||||
|
|
|
|||
440
Cargo.lock
generated
440
Cargo.lock
generated
|
|
@ -41,18 +41,9 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "aob-lemmy-bot"
|
||||
version = "3.2.0"
|
||||
version = "3.0.0-rc.2"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"chrono",
|
||||
|
|
@ -66,29 +57,18 @@ dependencies = [
|
|||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"strum_macros",
|
||||
"strum_macros 0.26.2",
|
||||
"systemd-journal-logger",
|
||||
"tokio",
|
||||
"toml",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-lock"
|
||||
version = "3.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
|
||||
dependencies = [
|
||||
"event-listener",
|
||||
"event-listener-strategy",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.81"
|
||||
version = "0.1.77"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
|
||||
checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -116,6 +96,12 @@ dependencies = [
|
|||
"rustc-demangle",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.21.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.22.1"
|
||||
|
|
@ -163,9 +149,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
|||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.38"
|
||||
version = "0.4.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
|
||||
checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
|
||||
dependencies = [
|
||||
"android-tzdata",
|
||||
"iana-time-zone",
|
||||
|
|
@ -173,16 +159,7 @@ dependencies = [
|
|||
"num-traits",
|
||||
"serde",
|
||||
"wasm-bindgen",
|
||||
"windows-targets 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "concurrent-queue"
|
||||
version = "2.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
"windows-targets 0.48.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -197,12 +174,6 @@ dependencies = [
|
|||
"toml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "convert_case"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
|
||||
|
||||
[[package]]
|
||||
name = "core-foundation"
|
||||
version = "0.9.4"
|
||||
|
|
@ -228,15 +199,6 @@ dependencies = [
|
|||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.19"
|
||||
|
|
@ -288,17 +250,6 @@ dependencies = [
|
|||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "derive-new"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "directories"
|
||||
version = "5.0.1"
|
||||
|
|
@ -365,27 +316,6 @@ dependencies = [
|
|||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "5.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
|
||||
dependencies = [
|
||||
"concurrent-queue",
|
||||
"parking",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener-strategy"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
|
||||
dependencies = [
|
||||
"event-listener",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "2.0.1"
|
||||
|
|
@ -400,7 +330,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
|
|||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall 0.4.1",
|
||||
"redox_syscall",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
|
|
@ -455,21 +385,21 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.30"
|
||||
version = "0.3.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
|
||||
checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
|
||||
|
||||
[[package]]
|
||||
name = "futures-io"
|
||||
version = "0.3.30"
|
||||
version = "0.3.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
|
||||
checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
|
||||
|
||||
[[package]]
|
||||
name = "futures-macro"
|
||||
version = "0.3.30"
|
||||
version = "0.3.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
||||
checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -478,21 +408,21 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "futures-sink"
|
||||
version = "0.3.30"
|
||||
version = "0.3.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
|
||||
checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
|
||||
|
||||
[[package]]
|
||||
name = "futures-task"
|
||||
version = "0.3.30"
|
||||
version = "0.3.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
|
||||
checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
|
||||
|
||||
[[package]]
|
||||
name = "futures-util"
|
||||
version = "0.3.30"
|
||||
version = "0.3.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
|
||||
checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
|
|
@ -507,9 +437,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.15"
|
||||
version = "0.2.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
|
||||
checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
|
|
@ -557,9 +487,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
|
|||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.5.0"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
|
|
@ -799,11 +729,10 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_api_common"
|
||||
version = "0.19.5"
|
||||
version = "0.19.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0350aefa5e5b7bc90fe5a6f992dbac5a1960c776ff16f4bee18660f11b3b95fc"
|
||||
checksum = "17366fcde90b07f4e5a8fefa62378fe348424ba79c8e9fb3ddc63ef76d687493"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
"enum-map",
|
||||
"getrandom",
|
||||
|
|
@ -811,31 +740,25 @@ dependencies = [
|
|||
"lemmy_db_views",
|
||||
"lemmy_db_views_actor",
|
||||
"lemmy_db_views_moderator",
|
||||
"lemmy_utils",
|
||||
"moka",
|
||||
"regex",
|
||||
"serde",
|
||||
"serde_with",
|
||||
"url",
|
||||
"urlencoding",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lemmy_db_schema"
|
||||
version = "0.19.5"
|
||||
version = "0.19.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4280976725dce988e4750e124a5600ead8d7fca0a07a7cf9e42da3ece946396c"
|
||||
checksum = "5e2d9a0c6f8f3df4664f9479ceca138ee6217b89653bafb753a498cabc5f3ab5"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
"chrono",
|
||||
"derive-new",
|
||||
"futures-util",
|
||||
"moka",
|
||||
"serde",
|
||||
"serde_with",
|
||||
"strum",
|
||||
"strum_macros",
|
||||
"strum_macros 0.25.3",
|
||||
"tracing",
|
||||
"typed-builder",
|
||||
"url",
|
||||
|
|
@ -844,11 +767,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_views"
|
||||
version = "0.19.5"
|
||||
version = "0.19.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7107a8725ed7fd12eb0cb451dff52d969ca5ac445d1aabb77881cfe75715a45"
|
||||
checksum = "02659eb474ab54da6296d4edb5a974c0affa5cfcf8a2fa31bb52793dedef9d5a"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"lemmy_db_schema",
|
||||
"serde",
|
||||
"serde_with",
|
||||
|
|
@ -856,47 +778,34 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_views_actor"
|
||||
version = "0.19.5"
|
||||
version = "0.19.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb7eeb5e65373c37aff03793cf90f8096557af7eb5f41426be9d3bc64b782152"
|
||||
checksum = "5187730858dc808b5cf06aadbb1d1f8ca360d4ed3c375e5606e63be4c9e24e06"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"lemmy_db_schema",
|
||||
"serde",
|
||||
"serde_with",
|
||||
"strum",
|
||||
"strum_macros",
|
||||
"strum_macros 0.25.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lemmy_db_views_moderator"
|
||||
version = "0.19.5"
|
||||
version = "0.19.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "52b9425bb6059979ebe5b4f2124ff5af898ac6e5fcf43053bd2485c504afe39e"
|
||||
checksum = "18f6fab36e1dcadc043b81c5916044ee65219d837f5d221a908296f9c55f3872"
|
||||
dependencies = [
|
||||
"lemmy_db_schema",
|
||||
"serde",
|
||||
"serde_with",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lemmy_utils"
|
||||
version = "0.19.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5afa108b6db73c057eb9aadaecd84269c138500519789c76106c671df684fb5a"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"rosetta-build",
|
||||
"serde",
|
||||
"strum",
|
||||
"strum_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.155"
|
||||
version = "0.2.151"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
||||
checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
|
||||
|
||||
[[package]]
|
||||
name = "libredox"
|
||||
|
|
@ -906,7 +815,7 @@ checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
|
|||
dependencies = [
|
||||
"bitflags 2.4.1",
|
||||
"libc",
|
||||
"redox_syscall 0.4.1",
|
||||
"redox_syscall",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -915,16 +824,6 @@ version = "0.4.12"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.20"
|
||||
|
|
@ -967,30 +866,6 @@ dependencies = [
|
|||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "moka"
|
||||
version = "0.12.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f"
|
||||
dependencies = [
|
||||
"async-lock",
|
||||
"async-trait",
|
||||
"crossbeam-channel",
|
||||
"crossbeam-epoch",
|
||||
"crossbeam-utils",
|
||||
"event-listener",
|
||||
"futures-util",
|
||||
"once_cell",
|
||||
"parking_lot",
|
||||
"quanta",
|
||||
"rustc_version",
|
||||
"smallvec",
|
||||
"tagptr",
|
||||
"thiserror",
|
||||
"triomphe",
|
||||
"uuid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "native-tls"
|
||||
version = "0.2.11"
|
||||
|
|
@ -1028,12 +903,6 @@ dependencies = [
|
|||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-conv"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.17"
|
||||
|
|
@ -1118,35 +987,6 @@ version = "0.2.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
||||
|
||||
[[package]]
|
||||
name = "parking"
|
||||
version = "2.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
|
||||
dependencies = [
|
||||
"lock_api",
|
||||
"parking_lot_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.9.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"redox_syscall 0.5.3",
|
||||
"smallvec",
|
||||
"windows-targets 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "percent-encoding"
|
||||
version = "2.3.1"
|
||||
|
|
@ -1206,21 +1046,6 @@ dependencies = [
|
|||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quanta"
|
||||
version = "0.12.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
|
||||
dependencies = [
|
||||
"crossbeam-utils",
|
||||
"libc",
|
||||
"once_cell",
|
||||
"raw-cpuid",
|
||||
"wasi",
|
||||
"web-sys",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.35"
|
||||
|
|
@ -1230,15 +1055,6 @@ dependencies = [
|
|||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "raw-cpuid"
|
||||
version = "11.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd"
|
||||
dependencies = [
|
||||
"bitflags 2.4.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.4.1"
|
||||
|
|
@ -1248,15 +1064,6 @@ dependencies = [
|
|||
"bitflags 1.3.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
|
||||
dependencies = [
|
||||
"bitflags 2.4.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_users"
|
||||
version = "0.4.4"
|
||||
|
|
@ -1270,9 +1077,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.10.5"
|
||||
version = "1.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
|
||||
checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
|
|
@ -1282,9 +1089,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.7"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
|
||||
checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
|
|
@ -1303,7 +1110,7 @@ version = "0.12.4"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"base64 0.22.1",
|
||||
"bytes",
|
||||
"encoding_rs",
|
||||
"futures-channel",
|
||||
|
|
@ -1340,35 +1147,12 @@ dependencies = [
|
|||
"winreg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rosetta-build"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24191a1fed7ae7a5d89f816366f5c03ebce70a7a4d7158534afdf8dd719749fe"
|
||||
dependencies = [
|
||||
"convert_case",
|
||||
"lazy_static",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"tinyjson",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc-demangle"
|
||||
version = "0.1.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
|
||||
|
||||
[[package]]
|
||||
name = "rustc_version"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
|
||||
dependencies = [
|
||||
"semver",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.28"
|
||||
|
|
@ -1388,7 +1172,7 @@ version = "2.1.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"base64 0.22.1",
|
||||
"rustls-pki-types",
|
||||
]
|
||||
|
||||
|
|
@ -1428,12 +1212,6 @@ dependencies = [
|
|||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||
|
||||
[[package]]
|
||||
name = "security-framework"
|
||||
version = "2.9.2"
|
||||
|
|
@ -1457,26 +1235,20 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.204"
|
||||
version = "1.0.193"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
|
||||
checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.204"
|
||||
version = "1.0.193"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
|
||||
checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1517,17 +1289,16 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_with"
|
||||
version = "3.9.0"
|
||||
version = "3.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
|
||||
checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"base64 0.21.5",
|
||||
"chrono",
|
||||
"hex",
|
||||
"indexmap 1.9.3",
|
||||
"indexmap 2.1.0",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"serde_with_macros",
|
||||
"time",
|
||||
|
|
@ -1535,9 +1306,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "serde_with_macros"
|
||||
version = "3.9.0"
|
||||
version = "3.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
|
||||
checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
|
||||
dependencies = [
|
||||
"darling",
|
||||
"proc-macro2",
|
||||
|
|
@ -1578,15 +1349,28 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
|
|||
|
||||
[[package]]
|
||||
name = "strum"
|
||||
version = "0.26.3"
|
||||
version = "0.25.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
|
||||
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
|
||||
|
||||
[[package]]
|
||||
name = "strum_macros"
|
||||
version = "0.26.4"
|
||||
version = "0.25.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
|
||||
checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"rustversion",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strum_macros"
|
||||
version = "0.26.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
|
|
@ -1643,12 +1427,6 @@ dependencies = [
|
|||
"rustix",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tagptr"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.8.1"
|
||||
|
|
@ -1657,7 +1435,7 @@ checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
|
|||
dependencies = [
|
||||
"cfg-if",
|
||||
"fastrand",
|
||||
"redox_syscall 0.4.1",
|
||||
"redox_syscall",
|
||||
"rustix",
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
|
@ -1684,13 +1462,12 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "time"
|
||||
version = "0.3.36"
|
||||
version = "0.3.30"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
|
||||
checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
|
||||
dependencies = [
|
||||
"deranged",
|
||||
"itoa",
|
||||
"num-conv",
|
||||
"powerfmt",
|
||||
"serde",
|
||||
"time-core",
|
||||
|
|
@ -1705,20 +1482,13 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
|
|||
|
||||
[[package]]
|
||||
name = "time-macros"
|
||||
version = "0.2.18"
|
||||
version = "0.2.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
|
||||
checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
|
||||
dependencies = [
|
||||
"num-conv",
|
||||
"time-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinyjson"
|
||||
version = "2.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ab95735ea2c8fd51154d01e39cf13912a78071c2d89abc49a7ef102a7dd725a"
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec"
|
||||
version = "1.6.0"
|
||||
|
|
@ -1880,12 +1650,6 @@ dependencies = [
|
|||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "triomphe"
|
||||
version = "0.1.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
|
||||
|
||||
[[package]]
|
||||
name = "try-lock"
|
||||
version = "0.2.5"
|
||||
|
|
@ -1894,18 +1658,18 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
|||
|
||||
[[package]]
|
||||
name = "typed-builder"
|
||||
version = "0.18.2"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77739c880e00693faef3d65ea3aad725f196da38b22fdc7ea6ded6e1ce4d3add"
|
||||
checksum = "e47c0496149861b7c95198088cbf36645016b1a0734cf350c50e2a38e070f38a"
|
||||
dependencies = [
|
||||
"typed-builder-macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typed-builder-macro"
|
||||
version = "0.18.2"
|
||||
version = "0.18.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63"
|
||||
checksum = "982ee4197351b5c9782847ef5ec1fdcaf50503fb19d68f9771adae314e72b492"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -1945,17 +1709,11 @@ dependencies = [
|
|||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "urlencoding"
|
||||
version = "2.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
|
||||
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "1.10.0"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
|
||||
checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"serde",
|
||||
|
|
@ -2074,22 +1832,6 @@ dependencies = [
|
|||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.8"
|
||||
|
|
@ -2099,12 +1841,6 @@ dependencies = [
|
|||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-core"
|
||||
version = "0.51.1"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
authors = ["Neshura"]
|
||||
name = "aob-lemmy-bot"
|
||||
version = "3.2.0"
|
||||
version = "3.0.0-rc.2"
|
||||
edition = "2021"
|
||||
description = "Bot for automatically posting new chapters of 'Ascendance of a Bookworm' released by J-Novel Club"
|
||||
license = "GPL-3.0-or-later"
|
||||
|
|
@ -17,8 +17,8 @@ systemd-units = { enable = false }
|
|||
|
||||
[dependencies]
|
||||
chrono = "^0.4"
|
||||
lemmy_api_common = "0.19.5"
|
||||
lemmy_db_schema = "0.19.5"
|
||||
lemmy_api_common = "0.19.3"
|
||||
lemmy_db_schema = "0.19.3"
|
||||
once_cell = "^1.19"
|
||||
reqwest = { version = "^0.12", features = ["blocking", "json"] }
|
||||
serde = "^1.0"
|
||||
|
|
|
|||
19
src/bot.rs
19
src/bot.rs
|
|
@ -1,4 +1,4 @@
|
|||
use crate::{config::{Config}, HTTP_CLIENT};
|
||||
use crate::{config::{Config}};
|
||||
use crate::lemmy::{Lemmy};
|
||||
use crate::post_history::{SeriesHistory};
|
||||
use chrono::{DateTime, Duration, Utc};
|
||||
|
|
@ -7,15 +7,6 @@ use notify::{Event, EventKind, event::{AccessKind, AccessMode}, RecursiveMode, W
|
|||
use tokio::time::sleep;
|
||||
use systemd_journal_logger::connected_to_journal;
|
||||
|
||||
macro_rules! debug {
|
||||
($msg:tt) => {
|
||||
match connected_to_journal() {
|
||||
true => log::debug!("[DEBUG] {}", $msg),
|
||||
false => println!("[DEBUG] {}", $msg),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
macro_rules! info {
|
||||
($msg:tt) => {
|
||||
match connected_to_journal() {
|
||||
|
|
@ -85,8 +76,6 @@ impl Bot {
|
|||
};
|
||||
|
||||
lemmy.get_communities().await;
|
||||
|
||||
self.history = SeriesHistory::load_history();
|
||||
|
||||
let start: DateTime<Utc> = Utc::now();
|
||||
while Utc::now() - start <= Duration::minutes(60) {
|
||||
|
|
@ -95,14 +84,10 @@ impl Bot {
|
|||
let read_copy = self.shared_config.read().expect("Read Lock Failed").clone();
|
||||
for series in read_copy.series {
|
||||
series.update(&mut self.history, &lemmy, &self.shared_config).await;
|
||||
debug!("Done Updating Series");
|
||||
self.wait(1, Wait::Absolute).await;
|
||||
}
|
||||
debug!("Awaiting Timeout");
|
||||
self.wait(30, Wait::Buffer).await;
|
||||
debug!("Pinging Server");
|
||||
self.ping_status().await;
|
||||
debug!("Awaiting Timeout 2");
|
||||
self.wait(30, Wait::Absolute).await;
|
||||
}
|
||||
|
||||
|
|
@ -113,7 +98,7 @@ impl Bot {
|
|||
async fn ping_status(&self) {
|
||||
let read_config = &self.shared_config.read().expect("Read Lock Failed").clone();
|
||||
if let Some(status_url) = &read_config.status_post_url {
|
||||
match HTTP_CLIENT.get(status_url).send().await {
|
||||
match reqwest::get(status_url).await {
|
||||
Ok(_) => {},
|
||||
Err(e) => {
|
||||
let err_msg = format!("While pinging status URL: {e}");
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ use std::path::PathBuf;
|
|||
use std::sync::{Arc, RwLock};
|
||||
use chrono::{Timelike, Utc};
|
||||
use crate::config::PostBody::Description;
|
||||
use lemmy_api_common::sensitive::Sensitive;
|
||||
use lemmy_db_schema::PostFeatureType;
|
||||
use lemmy_db_schema::sensitive::SensitiveString;
|
||||
use serde_derive::{Deserialize, Serialize};
|
||||
use crate::lemmy::{Lemmy, PartInfo, PostType};
|
||||
use crate::post_history::{SeriesHistory};
|
||||
|
|
@ -11,15 +11,6 @@ use systemd_journal_logger::connected_to_journal;
|
|||
use crate::fetchers::{FetcherTrait, Fetcher};
|
||||
use crate::fetchers::jnovel::{JNovelFetcher};
|
||||
|
||||
macro_rules! debug {
|
||||
($msg:tt) => {
|
||||
match connected_to_journal() {
|
||||
true => log::debug!("[DEBUG] {}", $msg),
|
||||
false => println!("[DEBUG] {}", $msg),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
macro_rules! info {
|
||||
($msg:tt) => {
|
||||
match connected_to_journal() {
|
||||
|
|
@ -50,8 +41,8 @@ macro_rules! error {
|
|||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||
pub(crate) struct Config {
|
||||
pub(crate) instance: String,
|
||||
username: SensitiveString,
|
||||
password: SensitiveString,
|
||||
username: String,
|
||||
password: String,
|
||||
pub(crate) status_post_url: Option<String>,
|
||||
pub(crate) config_reload_seconds: u32,
|
||||
pub(crate) protected_communities: Vec<String>,
|
||||
|
|
@ -89,12 +80,12 @@ impl Config {
|
|||
confy::get_configuration_file_path(env!("CARGO_PKG_NAME"), "config").expect("Application will not without confy")
|
||||
}
|
||||
|
||||
pub(crate) fn get_username(&self) -> SensitiveString {
|
||||
self.username.clone()
|
||||
pub(crate) fn get_username(&self) -> Sensitive<String> {
|
||||
Sensitive::new(self.username.clone())
|
||||
}
|
||||
|
||||
pub(crate) fn get_password(&self) -> SensitiveString {
|
||||
self.password.clone()
|
||||
pub(crate) fn get_password(&self) -> Sensitive<String> {
|
||||
Sensitive::new(self.password.clone())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -102,8 +93,8 @@ impl Default for Config {
|
|||
fn default() -> Self {
|
||||
Config {
|
||||
instance: "".to_owned(),
|
||||
username: SensitiveString::from("".to_owned()),
|
||||
password: SensitiveString::from("".to_owned()),
|
||||
username: "".to_owned(),
|
||||
password: "".to_owned(),
|
||||
status_post_url: None,
|
||||
config_reload_seconds: 21600,
|
||||
protected_communities: vec![],
|
||||
|
|
@ -177,8 +168,8 @@ impl SeriesConfig {
|
|||
info!(info);
|
||||
|
||||
let post_id = match lemmy.post(post_data).await {
|
||||
Some(data) => data,
|
||||
None=> {
|
||||
Ok(data) => data,
|
||||
Err(_) => {
|
||||
error!("Error posting chapter");
|
||||
return;
|
||||
}
|
||||
|
|
@ -197,18 +188,31 @@ impl SeriesConfig {
|
|||
post_info.get_post_config(self).name.as_str()
|
||||
);
|
||||
info!(info);
|
||||
let pinned_posts = lemmy.get_community_pinned(lemmy.get_community_id(&post_info.get_post_config(self).name)).await.unwrap_or_else(|| {
|
||||
error!("Pinning of Post to community failed");
|
||||
vec![]
|
||||
});
|
||||
let pinned_posts = match lemmy.get_community_pinned(lemmy.get_community_id(&post_info.get_post_config(self).name)).await {
|
||||
Ok(data) => data,
|
||||
Err(_) => {
|
||||
error!("Pinning of Post to community failed");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
if !pinned_posts.is_empty() {
|
||||
let community_pinned_post = &pinned_posts[0];
|
||||
if lemmy.unpin(community_pinned_post.post.id, PostFeatureType::Community).await.is_none() {
|
||||
error!("Error un-pinning post");
|
||||
match lemmy
|
||||
.unpin(community_pinned_post.post.id, PostFeatureType::Community)
|
||||
.await {
|
||||
Ok(_) => {}
|
||||
Err(_) => {
|
||||
error!("Error un-pinning post");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
if lemmy.pin(post_id, PostFeatureType::Community).await.is_none() {
|
||||
error!("Error pinning post");
|
||||
match lemmy.pin(post_id, PostFeatureType::Community).await {
|
||||
Ok(_) => {}
|
||||
Err(_) => {
|
||||
error!("Error pinning post");
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else if read_config
|
||||
.protected_communities
|
||||
|
|
@ -225,10 +229,10 @@ impl SeriesConfig {
|
|||
let info = format!("Pinning '{}' to Instance", post_info.get_info().title);
|
||||
info!(info);
|
||||
let pinned_posts = match lemmy.get_local_pinned().await {
|
||||
Some(data) => {data}
|
||||
None => {
|
||||
Ok(data) => {data}
|
||||
Err(_) => {
|
||||
error!("Error fetching pinned posts");
|
||||
vec![]
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -241,16 +245,25 @@ impl SeriesConfig {
|
|||
continue;
|
||||
} else {
|
||||
let community_pinned_post = &pinned_post;
|
||||
if lemmy.unpin(community_pinned_post.post.id, PostFeatureType::Local).await.is_none() {
|
||||
error!("Error pinning post");
|
||||
continue;
|
||||
match lemmy
|
||||
.unpin(community_pinned_post.post.id, PostFeatureType::Local)
|
||||
.await {
|
||||
Ok(_) => {}
|
||||
Err(_) => {
|
||||
error!("Error pinning post");
|
||||
return;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if lemmy.pin(post_id, PostFeatureType::Local).await.is_none() {
|
||||
error!("Error pinning post");
|
||||
match lemmy.pin(post_id, PostFeatureType::Local).await {
|
||||
Ok(_) => {}
|
||||
Err(_) => {
|
||||
error!("Error pinning post");
|
||||
return;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -270,7 +283,6 @@ impl SeriesConfig {
|
|||
series_history.set_part(post_info.get_part_info().unwrap_or(PartInfo::NoParts).as_string().as_str(), part_history);
|
||||
history
|
||||
.set_series(self.slug.as_str(), series_history);
|
||||
debug!("Saving History");
|
||||
history.save_history();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ use serde_derive::{Deserialize, Serialize};
|
|||
use std::collections::HashMap;
|
||||
use std::ops::Sub;
|
||||
use async_trait::async_trait;
|
||||
use url::Url;
|
||||
use crate::fetchers::{FetcherTrait};
|
||||
use crate::lemmy::{PartInfo, PostInfo, PostInfoInner, PostType};
|
||||
use systemd_journal_logger::connected_to_journal;
|
||||
|
|
@ -31,7 +32,7 @@ static PAST_DAYS_ELIGIBLE: u8 = 4;
|
|||
|
||||
macro_rules! api_url {
|
||||
() => {
|
||||
"https://labs.j-novel.club/app/v2".to_owned()
|
||||
"https://labs.j-novel.club/app/v1".to_owned()
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -94,15 +95,6 @@ pub(crate) struct JNovelFetcher {
|
|||
series_has_parts: bool
|
||||
}
|
||||
|
||||
impl Default for JNovelFetcher {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
series_slug: "".to_owned(),
|
||||
series_has_parts: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl JNovelFetcher {
|
||||
pub(crate) fn set_series(&mut self, series: String) {
|
||||
self.series_slug = series;
|
||||
|
|
@ -200,8 +192,7 @@ impl FetcherTrait for JNovelFetcher {
|
|||
);
|
||||
let post_details = PostInfoInner {
|
||||
title: volume.title.clone(),
|
||||
url: post_url.clone(),
|
||||
thumbnail: Some(volume.cover.thumbnail.clone())
|
||||
url: Url::parse(&post_url).unwrap(),
|
||||
};
|
||||
|
||||
let new_post_info = PostInfo {
|
||||
|
|
@ -224,7 +215,7 @@ impl FetcherTrait for JNovelFetcher {
|
|||
.or_insert(new_post_info);
|
||||
}
|
||||
|
||||
if let Some(prepub_info) = get_latest_prepub(&volume.slug).await {
|
||||
if let Some(prepub_info) = get_latest_prepub(&volume.slug).await? {
|
||||
let prepub_post_info = PostInfo {
|
||||
post_type: Some(PostType::Chapter),
|
||||
part: Some(new_part_info),
|
||||
|
|
@ -252,7 +243,7 @@ impl FetcherTrait for JNovelFetcher {
|
|||
}
|
||||
|
||||
|
||||
async fn get_latest_prepub(volume_slug: &str) -> Option<PostInfoInner> {
|
||||
async fn get_latest_prepub(volume_slug: &str) -> Result<Option<PostInfoInner>, ()> {
|
||||
let response = match HTTP_CLIENT
|
||||
.get(api_url!() + "/volumes/" + volume_slug + "/parts?format=json")
|
||||
.send()
|
||||
|
|
@ -263,13 +254,13 @@ async fn get_latest_prepub(volume_slug: &str) -> Option<PostInfoInner> {
|
|||
Err(e) => {
|
||||
let err_msg = format!("While getting latest PrePub: {e}");
|
||||
error!(err_msg);
|
||||
return None;
|
||||
return Err(());
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
let err_msg = format!("{e}");
|
||||
error!(err_msg);
|
||||
return None;
|
||||
return Err(());
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -278,7 +269,7 @@ async fn get_latest_prepub(volume_slug: &str) -> Option<PostInfoInner> {
|
|||
Err(e) => {
|
||||
let err_msg = format!("{e}");
|
||||
error!(err_msg);
|
||||
return None;
|
||||
return Err(());
|
||||
}
|
||||
};
|
||||
volume_prepub_parts_data.parts.reverse(); // Makes breaking out of the parts loop easier
|
||||
|
|
@ -293,15 +284,12 @@ async fn get_latest_prepub(volume_slug: &str) -> Option<PostInfoInner> {
|
|||
continue;
|
||||
}
|
||||
|
||||
let thumbnail = prepub_part.cover.as_ref().map(|cover| cover.thumbnail.clone());
|
||||
|
||||
let post_url = format!("{}/read/{}", jnc_base_url!(), prepub_part.slug);
|
||||
post_details = Some(PostInfoInner {
|
||||
title: prepub_part.title.clone(),
|
||||
url: post_url.clone(),
|
||||
thumbnail
|
||||
url: Url::parse(&post_url).unwrap(),
|
||||
});
|
||||
}
|
||||
|
||||
post_details
|
||||
Ok(post_details)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,5 +29,5 @@ impl Fetcher {
|
|||
#[derive(Deserialize, Serialize, Debug, Clone, Display)]
|
||||
pub(crate) enum Fetcher {
|
||||
#[serde(rename = "jnc")]
|
||||
Jnc(#[serde(skip)] JNovelFetcher)
|
||||
Jnc(JNovelFetcher)
|
||||
}
|
||||
|
|
|
|||
145
src/lemmy.rs
145
src/lemmy.rs
|
|
@ -5,24 +5,16 @@ use lemmy_api_common::community::{ListCommunities, ListCommunitiesResponse};
|
|||
use lemmy_api_common::lemmy_db_views::structs::PostView;
|
||||
use lemmy_api_common::person::{Login, LoginResponse};
|
||||
use lemmy_api_common::post::{CreatePost, FeaturePost, GetPosts, GetPostsResponse};
|
||||
use lemmy_api_common::sensitive::Sensitive;
|
||||
use lemmy_db_schema::newtypes::{CommunityId, LanguageId, PostId};
|
||||
use lemmy_db_schema::{ListingType, PostFeatureType};
|
||||
use reqwest::StatusCode;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::{RwLock};
|
||||
use lemmy_db_schema::sensitive::SensitiveString;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use url::Url;
|
||||
use systemd_journal_logger::connected_to_journal;
|
||||
|
||||
macro_rules! debug {
|
||||
($msg:tt) => {
|
||||
match connected_to_journal() {
|
||||
true => log::debug!("[DEBUG] {}", $msg),
|
||||
false => println!("[DEBUG] {}", $msg),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
macro_rules! error {
|
||||
($msg:tt) => {
|
||||
match connected_to_journal() {
|
||||
|
|
@ -33,7 +25,7 @@ macro_rules! error {
|
|||
}
|
||||
|
||||
pub(crate) struct Lemmy {
|
||||
jwt_token: SensitiveString,
|
||||
jwt_token: Sensitive<String>,
|
||||
instance: String,
|
||||
communities: HashMap<String, CommunityId>,
|
||||
}
|
||||
|
|
@ -42,8 +34,7 @@ pub(crate) struct Lemmy {
|
|||
#[derive(Debug, Clone)]
|
||||
pub(crate) struct PostInfoInner {
|
||||
pub(crate) title: String,
|
||||
pub(crate) url: String,
|
||||
pub(crate) thumbnail: Option<String>
|
||||
pub(crate) url: Url,
|
||||
}
|
||||
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
|
|
@ -133,7 +124,7 @@ impl PostInfo {
|
|||
pub(crate) fn get_part_info(&self) -> Option<PartInfo> {
|
||||
self.part
|
||||
}
|
||||
|
||||
|
||||
pub(crate) fn get_post_config(&self, series: &SeriesConfig) -> PostConfig {
|
||||
match self.post_type {
|
||||
Some(post_type) => {
|
||||
|
|
@ -145,10 +136,10 @@ impl PostInfo {
|
|||
None => series.prepub_community.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub(crate) fn get_post_data(&self, series: &SeriesConfig, lemmy: &Lemmy) -> CreatePost {
|
||||
let post_config = self.get_post_config(series);
|
||||
|
||||
|
||||
let post_body = match &post_config.post_body {
|
||||
PostBody::None => None,
|
||||
PostBody::Description => self.get_description(),
|
||||
|
|
@ -161,13 +152,11 @@ impl PostInfo {
|
|||
name: self.get_info().title.clone(),
|
||||
community_id,
|
||||
url: Some(self.get_info().url),
|
||||
custom_thumbnail: self.get_info().thumbnail,
|
||||
body: post_body,
|
||||
alt_text: None,
|
||||
honeypot: None,
|
||||
nsfw: None,
|
||||
language_id: Some(LanguageId(37)), // TODO get this id once every few hours per API request, the ordering of IDs suggests that the EN Id might change in the future
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -263,33 +252,21 @@ impl Lemmy {
|
|||
}
|
||||
|
||||
|
||||
pub(crate) async fn post(&self, post: CreatePost) -> Option<PostId> {
|
||||
let response: String = match self.post_data_json("/api/v3/post", &post).await {
|
||||
Some(data) => data,
|
||||
None => return None,
|
||||
};
|
||||
let json_data: PostView = match self.parse_json_map(&response).await {
|
||||
Some(data) => data,
|
||||
None => return None,
|
||||
};
|
||||
pub(crate) async fn post(&self, post: CreatePost) -> Result<PostId, ()> {
|
||||
let response: String = self.post_data_json("/api/v3/post", &post).await?;
|
||||
let json_data: PostView = self.parse_json_map(&response).await?;
|
||||
|
||||
Some(json_data.post.id)
|
||||
Ok(json_data.post.id)
|
||||
}
|
||||
|
||||
async fn feature(&self, params: FeaturePost) -> Option<PostView> {
|
||||
let response: String = match self.post_data_json("/api/v3/post/feature", ¶ms).await {
|
||||
Some(data) => data,
|
||||
None => return None,
|
||||
};
|
||||
let json_data: PostView = match self.parse_json_map(&response).await {
|
||||
Some(data) => data,
|
||||
None => return None,
|
||||
};
|
||||
async fn feature(&self, params: FeaturePost) -> Result<PostView, ()> {
|
||||
let response: String = self.post_data_json("/api/v3/post/feature", ¶ms).await?;
|
||||
let json_data: PostView = self.parse_json_map(&response).await?;
|
||||
|
||||
Some(json_data)
|
||||
Ok(json_data)
|
||||
}
|
||||
|
||||
pub(crate) async fn unpin(&self, post_id: PostId, location: PostFeatureType) -> Option<PostView> {
|
||||
pub(crate) async fn unpin(&self, post_id: PostId, location: PostFeatureType) -> Result<PostView, ()> {
|
||||
let pin_params = FeaturePost {
|
||||
post_id,
|
||||
featured: false,
|
||||
|
|
@ -298,7 +275,7 @@ impl Lemmy {
|
|||
self.feature(pin_params).await
|
||||
}
|
||||
|
||||
pub(crate) async fn pin(&self, post_id: PostId, location: PostFeatureType) -> Option<PostView> {
|
||||
pub(crate) async fn pin(&self, post_id: PostId, location: PostFeatureType) -> Result<PostView, ()> {
|
||||
let pin_params = FeaturePost {
|
||||
post_id,
|
||||
featured: true,
|
||||
|
|
@ -307,23 +284,17 @@ impl Lemmy {
|
|||
self.feature(pin_params).await
|
||||
}
|
||||
|
||||
pub(crate) async fn get_community_pinned(&self, community: CommunityId) -> Option<Vec<PostView>> {
|
||||
pub(crate) async fn get_community_pinned(&self, community: CommunityId) -> Result<Vec<PostView>, ()> {
|
||||
let list_params = GetPosts {
|
||||
community_id: Some(community),
|
||||
type_: Some(ListingType::Local),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let response: String = match self.get_data_query("/api/v3/post/list", &list_params).await {
|
||||
Some(data) => data,
|
||||
None => return None,
|
||||
};
|
||||
let json_data: GetPostsResponse = match self.parse_json(&response).await {
|
||||
Some(data) => data,
|
||||
None => return None,
|
||||
};
|
||||
let response: String = self.get_data_query("/api/v3/post/list", &list_params).await?;
|
||||
let json_data: GetPostsResponse = self.parse_json(&response).await?;
|
||||
|
||||
Some(json_data
|
||||
Ok(json_data
|
||||
.posts
|
||||
.iter()
|
||||
.filter(|post| post.post.featured_community)
|
||||
|
|
@ -331,22 +302,16 @@ impl Lemmy {
|
|||
.collect())
|
||||
}
|
||||
|
||||
pub(crate) async fn get_local_pinned(&self) -> Option<Vec<PostView>> {
|
||||
pub(crate) async fn get_local_pinned(&self) -> Result<Vec<PostView>, ()> {
|
||||
let list_params = GetPosts {
|
||||
type_: Some(ListingType::Local),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let response: String = match self.get_data_query("/api/v3/post/list", &list_params).await {
|
||||
Some(data) => data,
|
||||
None => return None,
|
||||
};
|
||||
let json_data: GetPostsResponse = match self.parse_json(&response).await {
|
||||
Some(data) => data,
|
||||
None => return None,
|
||||
};
|
||||
let response: String = self.get_data_query("/api/v3/post/list", &list_params).await?;
|
||||
let json_data: GetPostsResponse = self.parse_json(&response).await?;
|
||||
|
||||
Some(json_data
|
||||
Ok(json_data
|
||||
.posts
|
||||
.iter()
|
||||
.filter(|post| post.post.featured_local)
|
||||
|
|
@ -361,12 +326,18 @@ impl Lemmy {
|
|||
};
|
||||
|
||||
let response: String = match self.get_data_query("/api/v3/community/list", &list_params).await {
|
||||
Some(data) => data,
|
||||
None => return,
|
||||
Ok(data) => data,
|
||||
Err(_) => {
|
||||
error!("Unable to extract data from request");
|
||||
return;
|
||||
}
|
||||
};
|
||||
let json_data: ListCommunitiesResponse = match self.parse_json::<ListCommunitiesResponse>(&response).await {
|
||||
Some(data) => data,
|
||||
None => return,
|
||||
Ok(data) => data,
|
||||
Err(_) => {
|
||||
error!("Unable to parse data from json");
|
||||
return;
|
||||
},
|
||||
};
|
||||
|
||||
let mut communities: HashMap<String, CommunityId> = HashMap::new();
|
||||
|
|
@ -378,7 +349,7 @@ impl Lemmy {
|
|||
self.communities = communities;
|
||||
}
|
||||
|
||||
async fn post_data_json<T: Serialize>(&self, route: &str, json: &T ) -> Option<String> {
|
||||
async fn post_data_json<T: Serialize>(&self, route: &str, json: &T ) -> Result<String,()> {
|
||||
let res = HTTP_CLIENT
|
||||
.post(format!("{}{route}", &self.instance))
|
||||
.bearer_auth(&self.jwt_token.to_string())
|
||||
|
|
@ -388,7 +359,7 @@ impl Lemmy {
|
|||
self.extract_data(res).await
|
||||
}
|
||||
|
||||
async fn get_data_query<T: Serialize>(&self, route: &str, param: &T ) -> Option<String> {
|
||||
async fn get_data_query<T: Serialize>(&self, route: &str, param: &T ) -> Result<String,()> {
|
||||
let res = HTTP_CLIENT
|
||||
.get(format!("{}{route}", &self.instance))
|
||||
.bearer_auth(&self.jwt_token.to_string())
|
||||
|
|
@ -398,52 +369,42 @@ impl Lemmy {
|
|||
self.extract_data(res).await
|
||||
}
|
||||
|
||||
async fn extract_data(&self, response: Result<reqwest::Response, reqwest::Error>) -> Option<String> {
|
||||
async fn extract_data(&self, response: Result<reqwest::Response, reqwest::Error>) -> Result<String,()> {
|
||||
match response {
|
||||
Ok(data) => {
|
||||
if data.status().is_success() {
|
||||
match data.text().await {
|
||||
Ok(data) => Some(data),
|
||||
Err(e) => {
|
||||
let err_msg = format!("{e}");
|
||||
error!(err_msg);
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
let err_msg = format!("HTTP Request failed: {}", data.text().await.unwrap());
|
||||
Ok(data) => match data.text().await {
|
||||
Ok(data) => Ok(data),
|
||||
Err(e) => {
|
||||
let err_msg = format!("{e}");
|
||||
error!(err_msg);
|
||||
None
|
||||
Err(())
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
let err_msg = format!("{e}");
|
||||
error!(err_msg);
|
||||
None
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn parse_json<'a, T: Deserialize<'a>>(&self, response: &'a str) -> Option<T> {
|
||||
async fn parse_json<'a, T: Deserialize<'a>>(&self, response: &'a str) -> Result<T,()> {
|
||||
match serde_json::from_str::<T>(response) {
|
||||
Ok(data) => Some(data),
|
||||
Ok(data) => Ok(data),
|
||||
Err(e) => {
|
||||
let err_msg = format!("while parsing JSON: {e} ");
|
||||
let err_msg = format!("{e} while parsing JSON");
|
||||
error!(err_msg);
|
||||
None
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn parse_json_map<'a, T: Deserialize<'a>>(&self, response: &'a str) -> Option<T> {
|
||||
debug!(response);
|
||||
async fn parse_json_map<'a, T: Deserialize<'a>>(&self, response: &'a str) -> Result<T,()> {
|
||||
match serde_json::from_str::<HashMap<&str, T>>(response) {
|
||||
Ok(mut data) => Some(data.remove("post_view").expect("Element should be present")),
|
||||
Ok(mut data) => Ok(data.remove("post_view").expect("Element should be present")),
|
||||
Err(e) => {
|
||||
let err_msg = format!("while parsing JSON HashMap: {e}");
|
||||
let err_msg = format!("{e} while parsing JSON HashMap");
|
||||
error!(err_msg);
|
||||
None
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
12
src/main.rs
12
src/main.rs
|
|
@ -25,17 +25,7 @@ async fn main() {
|
|||
.expect("Systemd-Logger crate error")
|
||||
.install()
|
||||
.expect("Systemd-Logger crate error");
|
||||
match std::env::var("LOG_LEVEL") {
|
||||
Ok(level) => {
|
||||
match level.as_str() {
|
||||
"debug" => log::set_max_level(LevelFilter::Debug),
|
||||
"info" => log::set_max_level(LevelFilter::Info),
|
||||
_ => log::set_max_level(LevelFilter::Info),
|
||||
}
|
||||
}
|
||||
_ => log::set_max_level(LevelFilter::Info),
|
||||
}
|
||||
|
||||
log::set_max_level(LevelFilter::Info);
|
||||
let mut bot = Bot::new();
|
||||
bot.run().await;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue