Infra-Mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-10-01 01:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/LemmyNet/lemmy

Browse Source
This commit is contained in:
Dessalines 2022-05-27 09:49:40 -04:00
commit 9b9b7b16c8
15 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Cargo.lock generated
View File

@ -1762,7 +1762,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lemmy_api"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"actix-web",
"anyhow",
@ -1789,7 +1789,7 @@ dependencies = [
[[package]]
name = "lemmy_api_common"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"actix-rt",
"actix-web",
@ -1813,7 +1813,7 @@ dependencies = [
[[package]]
name = "lemmy_api_crud"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"actix-web",
"async-trait",
@ -1835,7 +1835,7 @@ dependencies = [
[[package]]
name = "lemmy_apub"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"activitystreams-kinds",
"actix",
@ -1875,7 +1875,7 @@ dependencies = [
[[package]]
name = "lemmy_apub_lib"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"actix-web",
"anyhow",
@ -1902,7 +1902,7 @@ dependencies = [
[[package]]
name = "lemmy_apub_lib_derive"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"proc-macro2 1.0.36",
"quote 1.0.17",
@ -1912,7 +1912,7 @@ dependencies = [
[[package]]
name = "lemmy_db_schema"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"bcrypt",
"chrono",
@ -1934,7 +1934,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"diesel",
"lemmy_db_schema",
@ -1945,7 +1945,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_actor"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"diesel",
"lemmy_db_schema",
@ -1954,7 +1954,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_moderator"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"diesel",
"lemmy_db_schema",
@ -1963,7 +1963,7 @@ dependencies = [
[[package]]
name = "lemmy_routes"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"actix-web",
"anyhow",
@ -1990,7 +1990,7 @@ dependencies = [
[[package]]
name = "lemmy_server"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"actix",
"actix-web",
@ -2026,7 +2026,7 @@ dependencies = [
[[package]]
name = "lemmy_utils"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"actix-web",
"anyhow",
@ -2062,7 +2062,7 @@ dependencies = [
[[package]]
name = "lemmy_websocket"
version = "0.16.3"
version = "0.16.4-rc.11"
dependencies = [
"actix",
"actix-web",

20
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_server"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -36,15 +36,15 @@ members = [
]
[dependencies]
lemmy_api = { version = "=0.16.3", path = "./crates/api" }
lemmy_api_crud = { version = "=0.16.3", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.16.3", path = "./crates/apub" }
lemmy_apub_lib = { version = "=0.16.3", path = "./crates/apub_lib" }
lemmy_utils = { version = "=0.16.3", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.16.3", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.16.3", path = "crates/api_common" }
lemmy_websocket = { version = "=0.16.3", path = "./crates/websocket" }
lemmy_routes = { version = "=0.16.3", path = "./crates/routes" }
lemmy_api = { version = "=0.16.4-rc.11", path = "./crates/api" }
lemmy_api_crud = { version = "=0.16.4-rc.11", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.16.4-rc.11", path = "./crates/apub" }
lemmy_apub_lib = { version = "=0.16.4-rc.11", path = "./crates/apub_lib" }
lemmy_utils = { version = "=0.16.4-rc.11", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.16.4-rc.11", path = "crates/api_common" }
lemmy_websocket = { version = "=0.16.4-rc.11", path = "./crates/websocket" }
lemmy_routes = { version = "=0.16.4-rc.11", path = "./crates/routes" }
diesel = "1.4.8"
diesel_migrations = "1.4.0"
serde = { version = "1.0.136", features = ["derive"] }

20
crates/api/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_api"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -13,15 +13,15 @@ path = "src/lib.rs"
doctest = false
[dependencies]
lemmy_apub = { version = "=0.16.3", path = "../apub" }
lemmy_apub_lib = { version = "=0.16.3", path = "../apub_lib" }
lemmy_utils = { version = "=0.16.3", path = "../utils" }
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.3", path = "../db_views", features = ["full"] }
lemmy_db_views_moderator = { version = "=0.16.3", path = "../db_views_moderator", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.3", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.3", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.3", path = "../websocket" }
lemmy_apub = { version = "=0.16.4-rc.11", path = "../apub" }
lemmy_apub_lib = { version = "=0.16.4-rc.11", path = "../apub_lib" }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.4-rc.11", path = "../db_views", features = ["full"] }
lemmy_db_views_moderator = { version = "=0.16.4-rc.11", path = "../db_views_moderator", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.4-rc.11", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.4-rc.11", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.4-rc.11", path = "../websocket" }
diesel = "1.4.8"
bcrypt = "0.12.1"
chrono = { version = "0.4.19", features = ["serde"], default-features = false }

12
crates/api_common/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_api_common"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -18,11 +18,11 @@ full = ["diesel", "tracing", "rosetta-i18n", "chrono", "actix-web", "lemmy_utils
"percent-encoding", "encoding", "reqwest-middleware", "webpage"]
[dependencies]
lemmy_db_views = { version = "=0.16.3", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.16.3", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.16.3", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema", default-features = false }
lemmy_utils = { version = "=0.16.3", path = "../utils", optional = true }
lemmy_db_views = { version = "=0.16.4-rc.11", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.16.4-rc.11", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.16.4-rc.11", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema", default-features = false }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils", optional = true }
serde = { version = "1.0.136", features = ["derive"] }
url = "2.2.2"
actix-web = { version = "4.0.1", default-features = false, features = ["cookies"], optional = true }

18
crates/api_crud/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_api_crud"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -8,14 +8,14 @@ homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html"
[dependencies]
lemmy_apub = { version = "=0.16.3", path = "../apub" }
lemmy_apub_lib = { version = "=0.16.3", path = "../apub_lib" }
lemmy_utils = { version = "=0.16.3", path = "../utils" }
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.3", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.3", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.3", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.3", path = "../websocket" }
lemmy_apub = { version = "=0.16.4-rc.11", path = "../apub" }
lemmy_apub_lib = { version = "=0.16.4-rc.11", path = "../apub_lib" }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.4-rc.11", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.4-rc.11", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.4-rc.11", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.4-rc.11", path = "../websocket" }
bcrypt = "0.12.1"
serde_json = { version = "1.0.79", features = ["preserve_order"] }
serde = { version = "1.0.136", features = ["derive"] }

16
crates/apub/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_apub"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -13,13 +13,13 @@ path = "src/lib.rs"
doctest = false
[dependencies]
lemmy_utils = { version = "=0.16.3", path = "../utils" }
lemmy_apub_lib = { version = "=0.16.3", path = "../apub_lib" }
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.3", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.3", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.3", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.3", path = "../websocket" }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils" }
lemmy_apub_lib = { version = "=0.16.4-rc.11", path = "../apub_lib" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.4-rc.11", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.4-rc.11", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.4-rc.11", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.4-rc.11", path = "../websocket" }
diesel = "1.4.8"
activitystreams-kinds = "0.2.1"
chrono = { version = "0.4.19", features = ["serde"], default-features = false }

8
crates/apub_lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_apub_lib"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -8,9 +8,9 @@ homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html"
[dependencies]
lemmy_utils = { version = "=0.16.3", path = "../utils" }
lemmy_apub_lib_derive = { version = "=0.16.3", path = "../apub_lib_derive" }
chrono = { version = "0.4.19", default-features = false }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils" }
lemmy_apub_lib_derive = { version = "=0.16.4-rc.11", path = "../apub_lib_derive" }
chrono = { version = "0.4.19", features = ["clock"], default-features = false }
serde = { version = "1.0.136", features = ["derive"] }
async-trait = "0.1.53"
url = { version = "2.2.2", features = ["serde"] }

2
crates/apub_lib_derive/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_apub_lib_derive"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"

6
crates/db_schema/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_schema"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -23,8 +23,8 @@ url = { version = "2.2.2", features = ["serde"] }
strum = "0.24.0"
strum_macros = "0.24.0"
serde_json = { version = "1.0.79", features = ["preserve_order"], optional = true }
lemmy_apub_lib = { version = "=0.16.3", path = "../apub_lib", optional = true }
lemmy_utils = { version = "=0.16.3", path = "../utils", optional = true }
lemmy_apub_lib = { version = "=0.16.4-rc.11", path = "../apub_lib", optional = true }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils", optional = true }
bcrypt = { version = "0.12.1", optional = true }
diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"], optional = true }
diesel-derive-newtype = { version = "0.1.2", optional = true }

4
crates/db_views/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_views"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -14,7 +14,7 @@ doctest = false
full = ["lemmy_db_schema/full", "diesel", "tracing"]
[dependencies]
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema" }
diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"], optional = true }
serde = { version = "1.0.136", features = ["derive"] }
tracing = { version = "0.1.32", optional = true }

4
crates/db_views_actor/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_views_actor"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -14,6 +14,6 @@ doctest = false
full = ["lemmy_db_schema/full", "diesel"]
[dependencies]
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema" }
diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"], optional = true }
serde = { version = "1.0.136", features = ["derive"] }

4
crates/db_views_moderator/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_views_moderator"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -14,6 +14,6 @@ doctest = false
full = ["lemmy_db_schema/full", "diesel"]
[dependencies]
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema" }
diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"], optional = true }
serde = { version = "1.0.136", features = ["derive"] }

16
crates/routes/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_routes"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -11,13 +11,13 @@ documentation = "https://join-lemmy.org/docs/en/index.html"
doctest = false
[dependencies]
lemmy_utils = { version = "=0.16.3", path = "../utils" }
lemmy_websocket = { version = "=0.16.3", path = "../websocket" }
lemmy_db_views = { version = "=0.16.3", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.16.3", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema" }
lemmy_api_common = { version = "=0.16.3", path = "../api_common" }
lemmy_apub = { version = "=0.16.3", path = "../apub" }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils" }
lemmy_websocket = { version = "=0.16.4-rc.11", path = "../websocket" }
lemmy_db_views = { version = "=0.16.4-rc.11", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.16.4-rc.11", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema" }
lemmy_api_common = { version = "=0.16.4-rc.11", path = "../api_common" }
lemmy_apub = { version = "=0.16.4-rc.11", path = "../apub" }
diesel = "1.4.8"
actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] }
anyhow = "1.0.56"

4
crates/utils/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_utils"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -14,7 +14,7 @@ doctest = false
[dependencies]
regex = "1.5.5"
chrono = { version = "0.4.19", features = ["serde"], default-features = false }
chrono = { version = "0.4.19", features = ["serde", "clock"], default-features = false }
lettre = "0.10.0-rc.6"
tracing = "0.1.32"
tracing-error = "0.2.0"

12
crates/websocket/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "lemmy_websocket"
version = "0.16.3"
version = "0.16.4-rc.11"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -13,11 +13,11 @@ path = "src/lib.rs"
doctest = false
[dependencies]
lemmy_utils = { version = "=0.16.3", path = "../utils" }
lemmy_api_common = { version = "=0.16.3", path = "../api_common" }
lemmy_db_schema = { version = "=0.16.3", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.3", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.3", path = "../db_views_actor", features = ["full"] }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils" }
lemmy_api_common = { version = "=0.16.4-rc.11", path = "../api_common" }
lemmy_db_schema = { version = "=0.16.4-rc.11", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.4-rc.11", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.4-rc.11", path = "../db_views_actor", features = ["full"] }
reqwest-middleware = "0.1.5"
tracing = "0.1.32"
rand = "0.8.5"