Compare commits

...

5 Commits

Author SHA1 Message Date
Dessalines
0c8fd240a6 Adding 0.17.1 Release notes. 2023-02-03 14:30:26 -05:00
Nutomic
4dddc3f717
Disable pictrs feature in CI to make it faster (#2698) 2023-02-04 03:32:44 +09:00
Dessalines
5ae409d4e4 Version 0.17.1 2023-02-03 09:36:18 -05:00
Dessalines
ed95c61bca
Fixing admin application email subject. Fixes #2688 (#2695) 2023-02-03 09:24:19 -05:00
Dessalines
b1e121b5ba
Fixing person block views. Fixes #2693 (#2694) 2023-02-03 14:45:32 +01:00
9 changed files with 84 additions and 61 deletions

View File

@ -29,26 +29,8 @@ steps:
- rustup component add rustfmt --toolchain nightly
- cargo +nightly fmt -- --check
- name: cargo clippy
image: clux/muslrust:1.67.0
environment:
CARGO_HOME: .cargo
commands:
# latest rust for clippy to get extra checks
# when adding new clippy lints, make sure to also add them in scripts/fix-clippy.sh
- rustup component add clippy
- cargo clippy --workspace --tests --all-targets --all-features --
-D warnings -D deprecated -D clippy::perf -D clippy::complexity
-D clippy::style -D clippy::correctness -D clippy::suspicious
-D clippy::dbg_macro -D clippy::inefficient_to_string
-D clippy::items-after-statements -D clippy::implicit_clone
-D clippy::wildcard_imports -D clippy::cast_lossless
-D clippy::manual_string_new -D clippy::redundant_closure_for_method_calls
-D clippy::unused_self
-A clippy::uninlined_format_args
- cargo clippy --workspace --all-features -- -D clippy::unwrap_used
# check each package to make sure they compile with default features.
# this is required for crates.io
- name: cargo check
image: clux/muslrust:1.67.0
environment:
@ -64,8 +46,29 @@ steps:
- cargo check --package lemmy_api_crud
- cargo check --package lemmy_apub
- cargo check --package lemmy_routes
- cargo check --workspace --no-default-features
- cargo check --workspace --all-features
- cargo check --workspace
- cargo check --workspace --features console
# disabled because it takes too long with pict-rs
#- cargo check --workspace --all-features
- name: cargo clippy
image: clux/muslrust:1.67.0
environment:
CARGO_HOME: .cargo
commands:
# latest rust for clippy to get extra checks
# when adding new clippy lints, make sure to also add them in scripts/fix-clippy.sh
- rustup component add clippy
- cargo clippy --workspace --tests --all-targets --features console --
-D warnings -D deprecated -D clippy::perf -D clippy::complexity
-D clippy::style -D clippy::correctness -D clippy::suspicious
-D clippy::dbg_macro -D clippy::inefficient_to_string
-D clippy::items-after-statements -D clippy::implicit_clone
-D clippy::wildcard_imports -D clippy::cast_lossless
-D clippy::manual_string_new -D clippy::redundant_closure_for_method_calls
-D clippy::unused_self
-A clippy::uninlined_format_args
- cargo clippy --workspace --features console -- -D clippy::unwrap_used
- name: lemmy_api_common doesnt depend on diesel
image: clux/muslrust:1.67.0

22
Cargo.lock generated
View File

@ -2344,7 +2344,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lemmy_api"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"actix-web",
"anyhow",
@ -2370,7 +2370,7 @@ dependencies = [
[[package]]
name = "lemmy_api_common"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"actix-rt",
"actix-web",
@ -2406,7 +2406,7 @@ dependencies = [
[[package]]
name = "lemmy_api_crud"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"activitypub_federation",
"actix-web",
@ -2426,7 +2426,7 @@ dependencies = [
[[package]]
name = "lemmy_apub"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"activitypub_federation",
"activitystreams-kinds",
@ -2466,7 +2466,7 @@ dependencies = [
[[package]]
name = "lemmy_db_schema"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"activitypub_federation",
"async-trait",
@ -2496,7 +2496,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"diesel",
"diesel-async",
@ -2512,7 +2512,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_actor"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"diesel",
"diesel-async",
@ -2523,7 +2523,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_moderator"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"diesel",
"diesel-async",
@ -2533,7 +2533,7 @@ dependencies = [
[[package]]
name = "lemmy_routes"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"actix-web",
"anyhow",
@ -2558,7 +2558,7 @@ dependencies = [
[[package]]
name = "lemmy_server"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"activitypub_federation",
"actix-rt",
@ -2602,7 +2602,7 @@ dependencies = [
[[package]]
name = "lemmy_utils"
version = "0.17.0"
version = "0.17.1"
dependencies = [
"actix-web",
"anyhow",

View File

@ -1,5 +1,5 @@
[workspace.package]
version = "0.17.0"
version = "0.17.1"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -49,16 +49,16 @@ members = [
]
[workspace.dependencies]
lemmy_api = { version = "=0.17.0", path = "./crates/api" }
lemmy_api_crud = { version = "=0.17.0", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.17.0", path = "./crates/apub" }
lemmy_utils = { version = "=0.17.0", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.17.0", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.17.0", path = "./crates/api_common" }
lemmy_routes = { version = "=0.17.0", path = "./crates/routes" }
lemmy_db_views = { version = "=0.17.0", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.17.0", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.17.0", path = "./crates/db_views_moderator" }
lemmy_api = { version = "=0.17.1", path = "./crates/api" }
lemmy_api_crud = { version = "=0.17.1", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.17.1", path = "./crates/apub" }
lemmy_utils = { version = "=0.17.1", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.17.1", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.17.1", path = "./crates/api_common" }
lemmy_routes = { version = "=0.17.1", path = "./crates/routes" }
lemmy_db_views = { version = "=0.17.1", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.17.1", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.17.1", path = "./crates/db_views_moderator" }
activitypub_federation = "0.3.4"
diesel = "2.0.2"
diesel_migrations = "2.0.0"

View File

@ -1,3 +1,23 @@
# Lemmy v0.17.1 Release (2023-02-03)
## Bugfixes
### Lemmy
- Fixing admin application email subject. Fixes [#2688](https://github.com/LemmyNet/lemmy/issues/2688) ([#2695](https://github.com/LemmyNet/lemmy/issues/2695))
- Fixing person block views. Fixes [#2693](https://github.com/LemmyNet/lemmy/issues/2693) ([#2694](https://github.com/LemmyNet/lemmy/issues/2694))
- Fixing GetPosts active sort index. Fixes [#2683](https://github.com/LemmyNet/lemmy/issues/2683) ([#2684](https://github.com/LemmyNet/lemmy/issues/2684))
- Publish without verify ([#2681](https://github.com/LemmyNet/lemmy/issues/2681))
- Fix paths in release script, update crate versions ([#2680](https://github.com/LemmyNet/lemmy/issues/2680))
### Lemmy-UI
- Fix comment box closing. Fixes [#904](https://github.com/LemmyNet/lemmy-ui/issues/904) ([#914](https://github.com/LemmyNet/lemmy-ui/issues/914))
- Fix showing crosspost dupes. Fixes [#900](https://github.com/LemmyNet/lemmy-ui/issues/900) ([#912](https://github.com/LemmyNet/lemmy-ui/issues/912))
- Fix live updating postres edit. Fixes [#908](https://github.com/LemmyNet/lemmy-ui/issues/908) ([#911](https://github.com/LemmyNet/lemmy-ui/issues/911))
- Removing extra themes. Fixes [#905](https://github.com/LemmyNet/lemmy-ui/issues/905) ([#910](https://github.com/LemmyNet/lemmy-ui/issues/910))
- Fixing post setState error. Fixes [#902](https://github.com/LemmyNet/lemmy-ui/issues/902) ([#903](https://github.com/LemmyNet/lemmy-ui/issues/903))
# Lemmy v0.17.0 Release (2023-01-31)
## What is Lemmy?

View File

@ -476,7 +476,7 @@ pub async fn send_new_applicant_email_to_admins(
for admin in &admins {
let email = &admin.local_user.email.clone().expect("email");
let lang = get_interface_language_from_settings(admin);
let subject = lang.new_application_subject(applicant_username, &settings.hostname);
let subject = lang.new_application_subject(&settings.hostname, applicant_username);
let body = lang.new_application_body(applications_link);
send_email(&subject, email, &admin.person.name, &body, settings)?;
}

View File

@ -1,5 +1,5 @@
use crate::structs::PersonBlockView;
use diesel::{result::Error, ExpressionMethods, QueryDsl};
use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
use diesel_async::RunQueryDsl;
use lemmy_db_schema::{
newtypes::PersonId,
@ -14,17 +14,19 @@ type PersonBlockViewTuple = (PersonSafe, PersonSafe);
impl PersonBlockView {
pub async fn for_person(pool: &DbPool, person_id: PersonId) -> Result<Vec<Self>, Error> {
let conn = &mut get_conn(pool).await?;
let person_alias_1 = diesel::alias!(person as person1);
let target_person_alias = diesel::alias!(person as person1);
let res = person_block::table
.inner_join(person::table)
.inner_join(person_alias_1)
.inner_join(
target_person_alias.on(person_block::target_id.eq(target_person_alias.field(person::id))),
)
.select((
Person::safe_columns_tuple(),
person_alias_1.fields(Person::safe_columns_tuple()),
target_person_alias.fields(Person::safe_columns_tuple()),
))
.filter(person_block::person_id.eq(person_id))
.filter(person_alias_1.field(person::deleted).eq(false))
.filter(target_person_alias.field(person::deleted).eq(false))
.order_by(person_block::published)
.load::<PersonBlockViewTuple>(conn)
.await?;

View File

@ -47,7 +47,7 @@ services:
- pictrs
lemmy-ui:
image: dessalines/lemmy-ui:0.17.0
image: dessalines/lemmy-ui:0.17.1
# use this to build your local lemmy ui image for development
# run docker compose up --build
# assuming lemmy-ui is cloned besides lemmy directory
@ -97,8 +97,7 @@ services:
"postgres",
"-c", "session_preload_libraries=auto_explain",
"-c", "auto_explain.log_min_duration=5ms",
"-c", "auto_explain.log_analyze=true",
"-c", "config_file=/etc/postgresql.conf"
"-c", "auto_explain.log_analyze=true"
]
networks:
- lemmyinternal
@ -113,7 +112,6 @@ services:
- POSTGRES_DB=lemmy
volumes:
- ./volumes/postgres:/var/lib/postgresql/data
- ./customPostgresql.conf:/etc/postgresql.conf
restart: always
otel:

View File

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

View File

@ -29,7 +29,7 @@ services:
- lemmy-ui
lemmy:
image: dessalines/lemmy:0.17.0
image: dessalines/lemmy:0.17.1
hostname: lemmy
networks:
- lemmyinternal
@ -43,7 +43,7 @@ services:
- pictrs
lemmy-ui:
image: dessalines/lemmy-ui:0.17.0
image: dessalines/lemmy-ui:0.17.1
networks:
- lemmyinternal
environment: