mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-06-14 19:39:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into apub-lib-example

Browse source
This commit is contained in:
Felix Ableitner 2022-06-02 13:38:27 +02:00
parent 807d75c4df 1bd57ee5ca
commit acb621909d
18 changed files with 132 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Cargo.lock generated
View file

@ -1856,7 +1856,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lemmy_api"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"activitypub_federation",
"actix-web",
@ -1883,7 +1883,7 @@ dependencies = [
[[package]]
name = "lemmy_api_common"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"actix-rt",
"actix-web",
@ -1907,7 +1907,7 @@ dependencies = [
[[package]]
name = "lemmy_api_crud"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"activitypub_federation",
"actix-web",
@ -1929,7 +1929,7 @@ dependencies = [
[[package]]
name = "lemmy_apub"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"activitypub_federation",
"activitystreams-kinds",
@ -1969,7 +1969,7 @@ dependencies = [
[[package]]
name = "lemmy_db_schema"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"activitypub_federation",
"bcrypt",
@ -1991,7 +1991,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"diesel",
"lemmy_db_schema",
@ -2002,7 +2002,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_actor"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"diesel",
"lemmy_db_schema",
@ -2011,7 +2011,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_moderator"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"diesel",
"lemmy_db_schema",
@ -2020,7 +2020,7 @@ dependencies = [
[[package]]
name = "lemmy_routes"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"actix-web",
"anyhow",
@ -2047,7 +2047,7 @@ dependencies = [
[[package]]
name = "lemmy_server"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"activitypub_federation",
"actix",
@ -2084,7 +2084,7 @@ dependencies = [
[[package]]
name = "lemmy_utils"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"actix-web",
"anyhow",
@ -2120,7 +2120,7 @@ dependencies = [
[[package]]
name = "lemmy_websocket"
version = "0.16.4-rc.11"
version = "0.16.5"
dependencies = [
"actix",
"actix-web",

18
Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_server"
version = "0.16.4-rc.11"
version = "0.16.5"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -34,14 +34,14 @@ members = [
]
[dependencies]
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_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" }
lemmy_api = { version = "=0.16.5", path = "./crates/api" }
lemmy_api_crud = { version = "=0.16.5", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.16.5", path = "./crates/apub" }
lemmy_utils = { version = "=0.16.5", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.16.5", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.16.5", path = "crates/api_common" }
lemmy_websocket = { version = "=0.16.5", path = "./crates/websocket" }
lemmy_routes = { version = "=0.16.5", path = "./crates/routes" }
activitypub_federation = "0.1.0"
diesel = "1.4.8"
diesel_migrations = "1.4.0"

18
crates/api/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_api"
version = "0.16.4-rc.11"
version = "0.16.5"
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.4-rc.11", path = "../apub" }
lemmy_apub = { version = "=0.16.5", path = "../apub" }
lemmy_utils = { version = "=0.16.5", path = "../utils" }
lemmy_db_schema = { version = "=0.16.5", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.5", path = "../db_views", features = ["full"] }
lemmy_db_views_moderator = { version = "=0.16.5", path = "../db_views_moderator", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.5", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.5", path = "../websocket" }
activitypub_federation = "0.1.0"
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.4-rc.11"
version = "0.16.5"
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.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 }
lemmy_db_views = { version = "=0.16.5", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.16.5", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.16.5", path = "../db_schema", default-features = false }
lemmy_utils = { version = "=0.16.5", 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 }

16
crates/api_crud/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_api_crud"
version = "0.16.4-rc.11"
version = "0.16.5"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -8,13 +8,13 @@ homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html"
[dependencies]
lemmy_apub = { version = "=0.16.4-rc.11", path = "../apub" }
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" }
lemmy_apub = { version = "=0.16.5", path = "../apub" }
lemmy_utils = { version = "=0.16.5", path = "../utils" }
lemmy_db_schema = { version = "=0.16.5", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.5", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.5", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.5", path = "../websocket" }
activitypub_federation = "0.1.0"
bcrypt = "0.12.1"
serde_json = { version = "1.0.79", features = ["preserve_order"] }

14
crates/apub/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_apub"
version = "0.16.4-rc.11"
version = "0.16.5"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -13,12 +13,12 @@ path = "src/lib.rs"
doctest = false
[dependencies]
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" }
lemmy_utils = { version = "=0.16.5", path = "../utils" }
lemmy_db_schema = { version = "=0.16.5", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.5", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor", features = ["full"] }
lemmy_api_common = { version = "=0.16.5", path = "../api_common", features = ["full"] }
lemmy_websocket = { version = "=0.16.5", path = "../websocket" }
activitypub_federation = "0.1.0"
diesel = "1.4.8"
activitystreams-kinds = "0.2.1"

31
crates/apub_lib/Cargo.toml Normal file
View file

@ -0,0 +1,31 @@
[package]
name = "lemmy_apub_lib"
version = "0.16.5"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html"
[dependencies]
lemmy_utils = { version = "=0.16.5", path = "../utils" }
lemmy_apub_lib_derive = { version = "=0.16.5", 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"] }
serde_json = { version = "1.0.79", features = ["preserve_order"] }
anyhow = "1.0.56"
reqwest = { version = "0.11.10", features = ["json"] }
reqwest-middleware = "0.1.5"
tracing = "0.1.32"
base64 = "0.13.0"
openssl = "0.10.38"
once_cell = "1.10.0"
http = "0.2.6"
sha2 = "0.10.2"
actix-web = { version = "4.0.1", default-features = false }
http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["server", "sha-2"] }
http-signature-normalization-reqwest = { version = "0.5.0", default-features = false, features = ["sha-2", "middleware"] }
background-jobs = "0.12.0"
diesel = "1.4.8"

19
crates/apub_lib_derive/Cargo.toml Normal file
View file

@ -0,0 +1,19 @@
[package]
name = "lemmy_apub_lib_derive"
version = "0.16.5"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html"
[lib]
proc-macro = true
[dev-dependencies]
trybuild = { version = "1.0.57", features = ["diff"] }
[dependencies]
proc-macro2 = "1.0.36"
syn = "1.0.90"
quote = "1.0.17"

4
crates/db_schema/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_schema"
version = "0.16.4-rc.11"
version = "0.16.5"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -24,7 +24,7 @@ strum = "0.24.0"
strum_macros = "0.24.0"
serde_json = { version = "1.0.79", features = ["preserve_order"], optional = true }
activitypub_federation = { version = "0.1.0", optional = true }
lemmy_utils = { version = "=0.16.4-rc.11", path = "../utils", optional = true }
lemmy_utils = { version = "=0.16.5", 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.4-rc.11"
version = "0.16.5"
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.4-rc.11", path = "../db_schema" }
lemmy_db_schema = { version = "=0.16.5", 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.4-rc.11"
version = "0.16.5"
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.4-rc.11", path = "../db_schema" }
lemmy_db_schema = { version = "=0.16.5", 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.4-rc.11"
version = "0.16.5"
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.4-rc.11", path = "../db_schema" }
lemmy_db_schema = { version = "=0.16.5", 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.4-rc.11"
version = "0.16.5"
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.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" }
lemmy_utils = { version = "=0.16.5", path = "../utils" }
lemmy_websocket = { version = "=0.16.5", path = "../websocket" }
lemmy_db_views = { version = "=0.16.5", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.16.5", path = "../db_schema" }
lemmy_api_common = { version = "=0.16.5", path = "../api_common" }
lemmy_apub = { version = "=0.16.5", path = "../apub" }
diesel = "1.4.8"
actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] }
anyhow = "1.0.56"

2
crates/utils/Cargo.toml
View file

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

12
crates/websocket/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_websocket"
version = "0.16.4-rc.11"
version = "0.16.5"
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.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"] }
lemmy_utils = { version = "=0.16.5", path = "../utils" }
lemmy_api_common = { version = "=0.16.5", path = "../api_common" }
lemmy_db_schema = { version = "=0.16.5", path = "../db_schema", features = ["full"] }
lemmy_db_views = { version = "=0.16.5", path = "../db_views", features = ["full"] }
lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor", features = ["full"] }
reqwest-middleware = "0.1.5"
tracing = "0.1.32"
rand = "0.8.5"

2
docker/dev/docker-compose.yml
View file

@ -28,7 +28,7 @@ services:
- otel
lemmy-ui:
image: dessalines/lemmy-ui:0.16.3
image: dessalines/lemmy-ui:0.16.5
restart: always
environment:
- LEMMY_INTERNAL_HOST=lemmy:8536

10
docker/federation/docker-compose.yml
View file

@ -28,7 +28,7 @@ services:
- ./volumes/pictrs_alpha:/mnt
lemmy-alpha-ui:
image: dessalines/lemmy-ui:0.16.3
image: dessalines/lemmy-ui:0.16.5
environment:
- LEMMY_INTERNAL_HOST=lemmy-alpha:8541
- LEMMY_EXTERNAL_HOST=localhost:8541
@ -57,7 +57,7 @@ services:
- ./volumes/postgres_alpha:/var/lib/postgresql/data
lemmy-beta-ui:
image: dessalines/lemmy-ui:0.16.3
image: dessalines/lemmy-ui:0.16.5
environment:
- LEMMY_INTERNAL_HOST=lemmy-beta:8551
- LEMMY_EXTERNAL_HOST=localhost:8551
@ -86,7 +86,7 @@ services:
- ./volumes/postgres_beta:/var/lib/postgresql/data
lemmy-gamma-ui:
image: dessalines/lemmy-ui:0.16.3
image: dessalines/lemmy-ui:0.16.5
environment:
- LEMMY_INTERNAL_HOST=lemmy-gamma:8561
- LEMMY_EXTERNAL_HOST=localhost:8561
@ -116,7 +116,7 @@ services:
# An instance with only an allowlist for beta
lemmy-delta-ui:
image: dessalines/lemmy-ui:0.16.3
image: dessalines/lemmy-ui:0.16.5
environment:
- LEMMY_INTERNAL_HOST=lemmy-delta:8571
- LEMMY_EXTERNAL_HOST=localhost:8571
@ -146,7 +146,7 @@ services:
# An instance who has a blocklist, with lemmy-alpha blocked
lemmy-epsilon-ui:
image: dessalines/lemmy-ui:0.16.3
image: dessalines/lemmy-ui:0.16.5
environment:
- LEMMY_INTERNAL_HOST=lemmy-epsilon:8581
- LEMMY_EXTERNAL_HOST=localhost:8581

4
docker/prod/docker-compose.yml
View file

@ -12,7 +12,7 @@ services:
restart: always
lemmy:
image: dessalines/lemmy:0.16.3
image: dessalines/lemmy:0.16.5
ports:
- "127.0.0.1:8536:8536"
- "127.0.0.1:6669:6669"
@ -26,7 +26,7 @@ services:
- pictrs
lemmy-ui:
image: dessalines/lemmy-ui:0.16.3
image: dessalines/lemmy-ui:0.16.5
ports:
- "127.0.0.1:1235:1234"
restart: always