Merge branch 'main' into change_password_api

This commit is contained in:
Dessalines 2021-04-06 12:09:26 -04:00
commit d97129e7ae
41 changed files with 311 additions and 228 deletions

View file

@ -29,6 +29,7 @@ steps:
image: ekidd/rust-musl-builder:1.50.0 image: ekidd/rust-musl-builder:1.50.0
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
LEMMY_CONFIG_LOCATION: ../../config/config.hjson
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
RUST_TEST_THREADS: 1 RUST_TEST_THREADS: 1
commands: commands:
@ -107,6 +108,7 @@ steps:
image: rust:1.50-slim-buster image: rust:1.50-slim-buster
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
LEMMY_CONFIG_LOCATION: ../../config/config.hjson
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
RUST_TEST_THREADS: 1 RUST_TEST_THREADS: 1
commands: commands:

View file

@ -1,3 +1,95 @@
# Lemmy v0.10.2 Release (2021-04-05)
- Forcing a crash if config.hjson fails to load. Should show errors easier.
# Lemmy v0.10.0 Release (2021-04-05)
## Changes
Since our last release in February, we've had [~150](https://github.com/LemmyNet/lemmy/compare/0.9.9...main) commits to Lemmy. The biggest changes, as we'll outline below, are a split of Lemmy's user tables into federated and local tables, necessitating a `v3` of Lemmy's API, federated moderation, i18n support in join.lemmy.ml, and lots of back-end cleanup.
### Lemmy Server
#### General
- Rewrote config implementation, finally allowing us to use newer Rust versions.
- Removed categories.
- Various refactors.
#### API
- A full list of the API changes can be seen on this diff of [lemmy-js-client: 0.9.9 -> 0.10.0](https://github.com/LemmyNet/lemmy-js-client/compare/0.9.9...0.10.0-rc.13) .
- Login invalidation on password change, thanks to @Mart-Bogdan
#### Federation
- It is now possible to add users from other instances as community mods.
- Federating Matrix ID.
- Many changes for better compatibility with ActivityPub standard.
#### Database
- Split the `user_` into `person` and `local_user` tables.
- Strictly typed commonly used ID columns, to prevent DB errors using `i32` as ids.
- Strictly typed URL fields, thanks to ajyoon.
- Created default DB forms, now used in all the unit tests.
### Lemmy UI
- Now using utf-8 emojis.
- Support for all the above changes to Lemmy.
- Typescript-safe i18n strings, thanks to @shilangyu.
- Added expandable post text (click on open book icon).
- Prettier cross-posting, which does smart quoting.
- Bugfixes for restoring scroll position on post page, custom site favicons, and autocomplete for login fields.
### Lemmy Docs
- Gazconroy built an [Async API spec for Lemmy](https://join.lemmy.ml/api/index.html), that now serves as our main API docs.
### join.lemmy.ml
- Rewrote in inferno isomorphic, added i18n support via [weblate](https://weblate.yerbamate.ml/projects/lemmy/joinlemmy/).
- Added a section on the support page thanking contributors.
- Changed some page urls / titles
## Upgrade notes
**Important**: there are multiple breaking changes:
- Configuration via environment variables is not supported anymore, you must have all your config in the [lemmy.hjson](https://github.com/LemmyNet/lemmy/blob/main/ansible/templates/config.hjson) file ( except for `LEMMY_CONFIG_LOCATION` ).
- The config format for `allowed_instances` and `blocked_instances` has changed, and you need to adjust your config file manually:
- before: `allowed_instances: ds9.lemmy.ml,enterprise.lemmy.ml`
- now: `allowed_instances: ["ds9.lemmy.ml", "enterprise.lemmy.ml"]` , and only one of the `allowed_instances` or `blocked_instances` blocks can be set.
- The API has been upgraded from `v2` to `v3`, so all clients need to be updated: [lemmy-js-client: 0.9.9 -> 0.10.0](https://github.com/LemmyNet/lemmy-js-client/compare/0.9.9...0.10.0-rc.13) .
If you'd like to make a DB backup before upgrading, follow [this guide](https://join.lemmy.ml/docs/en/administration/backup_and_restore.html).
To upgrade your instance to `v0.10.0`, simply follow the instructions in the documentation:
- [Upgrade with manual Docker installation](https://join.lemmy.ml/docs/en/administration/install_docker.html#updating)
- [Upgrade with Ansible installation](https://join.lemmy.ml/docs/en/administration/install_ansible.html)
## Compilation time
|| v0.9.0 (Rust 1.47) | v0.10.0 (Rust 1.47) | v0.10.0 (Rust 1.51) |
|-| -------- | -------- | -------- |
|Clean | 140s | 146s | 119s |
| Incremental | 28s | 22s | 19s |
Despite ongoing efforts to speed up compilation, it has actually gotten slower when comparing with the same Rust version. Only thanks to improvements in newer Rust versions has our build process gotten faster. This could be simply because we added more code, while Lemmy v0.9.0 had 22.4k lines of Rust, v0.10.0 has 23.8k (an increase of 6%).
v0.9.0 build graph:
![](https://lemmy.ml/pictrs/image/GVBqFnrLqG.jpg)
v0.10.0 build graph:
![](https://lemmy.ml/pictrs/image/NllzjVEyNK.jpg)
We extracted the crates `lemmy_api_crud` and `lemmy_apub_receive` from `lemmy_api` and `lemmy_apub`, respectively, and renamed `lemmy_structs` to `lemmy_api_common`. In the second graph you can see how parts of the api and apub crates are now built nicely in parallel, speeding up builds on multi-core systems.
On the other hand, some crates have gotten much slower to compile, in particular `lemmy_db_queries` (6.5s slower), `lemmy_apub` (6.5s slower if we include `lemmy_apub_receive`). And `lemmy_db_views` is quite slow, just as before.
# Lemmy v0.9.9 Release (2021-02-19) # Lemmy v0.9.9 Release (2021-02-19)
## Changes ## Changes

View file

@ -1 +1 @@
0.9.9 0.10.2

View file

@ -4,15 +4,22 @@
# settings related to the postgresql database # settings related to the postgresql database
database: { database: {
database: lemmy
user: lemmy
host: postgres
port: 5432
pool_size: 5
# password to connect to postgres # password to connect to postgres
password: "{{ postgres_password }}" password: "{{ postgres_password }}"
# host where postgres is running
host: "postgres"
} }
# the domain name of your instance (eg "lemmy.ml") # the domain name of your instance (eg "lemmy.ml")
hostname: "{{ domain }}" hostname: "{{ domain }}"
# the port where lemmy should listen for incoming requests
port: 8536
# json web token for authorization between server and client # json web token for authorization between server and client
jwt_secret: "{{ jwt_password }}" jwt_secret: "{{ jwt_password }}"
# whether tls is required for activitypub. only disable this for debugging, never for producion.
tls_enabled: true
# email sending configuration # email sending configuration
email: { email: {
# hostname of the smtp server # hostname of the smtp server

View file

@ -16,7 +16,7 @@
"eslint": "^7.18.0", "eslint": "^7.18.0",
"eslint-plugin-jane": "^9.0.3", "eslint-plugin-jane": "^9.0.3",
"jest": "^26.6.3", "jest": "^26.6.3",
"lemmy-js-client": "0.10.0-rc.13", "lemmy-js-client": "0.11.0-rc.1",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"prettier": "^2.1.2", "prettier": "^2.1.2",
"ts-jest": "^26.4.4", "ts-jest": "^26.4.4",

View file

@ -19,7 +19,7 @@ let apShortname: string;
function assertUserFederation(userOne: PersonViewSafe, userTwo: PersonViewSafe) { function assertUserFederation(userOne: PersonViewSafe, userTwo: PersonViewSafe) {
expect(userOne.person.name).toBe(userTwo.person.name); expect(userOne.person.name).toBe(userTwo.person.name);
expect(userOne.person.preferred_username).toBe(userTwo.person.preferred_username); expect(userOne.person.display_name).toBe(userTwo.person.display_name);
expect(userOne.person.bio).toBe(userTwo.person.bio); expect(userOne.person.bio).toBe(userTwo.person.bio);
expect(userOne.person.actor_id).toBe(userTwo.person.actor_id); expect(userOne.person.actor_id).toBe(userTwo.person.actor_id);
expect(userOne.person.avatar).toBe(userTwo.person.avatar); expect(userOne.person.avatar).toBe(userTwo.person.avatar);
@ -49,7 +49,7 @@ test('Set some user settings, check that they are federated', async () => {
lang: '', lang: '',
avatar, avatar,
banner, banner,
preferred_username: 'user321', display_name: 'user321',
show_avatars: false, show_avatars: false,
send_notifications_to_email: false, send_notifications_to_email: false,
bio, bio,

View file

@ -3233,10 +3233,10 @@ language-tags@^1.0.5:
dependencies: dependencies:
language-subtag-registry "~0.3.2" language-subtag-registry "~0.3.2"
lemmy-js-client@0.10.0-rc.13: lemmy-js-client@0.11.0-rc.1:
version "0.10.0-rc.13" version "0.11.0-rc.1"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.10.0-rc.13.tgz#ea2e88857243374d7fbd49ee6b4bb94c34359d85" resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.11.0-rc.1.tgz#0031676be9fc787157a21dd3f5095dd1ee9e6a57"
integrity sha512-zodvYkwBYR7iP27ah6L/QPUphUUdq38kCH7QF2CUYBrsSAEkGmq2kdz+iusnQ1Ht7Ad80GtYycFprsZBveV5eQ== integrity sha512-dtpxe/hHTbYEv2WnfGkAieOB9jyKUVED+y4DosUp/FcaatjPcMTiKOvCdMNjlvvG/9GyclWEoyNitPEsvJwjmg==
leven@^3.1.0: leven@^3.1.0:
version "3.1.0" version "3.1.0"

View file

@ -1,3 +1,91 @@
{ {
hostname: "localhost:8536" # # optional: parameters for automatic configuration of new instance (only used at first start)
# setup: {
# # username for the admin user
# admin_username: ""
# # password for the admin user
# admin_password: ""
# # optional: email for the admin user (can be omitted and set later through the website)
# admin_email: ""
# # name of the site (can be changed later)
# site_name: ""
# }
# settings related to the postgresql database
database: {
# username to connect to postgres
user: "lemmy"
# password to connect to postgres
password: "password"
# host where postgres is running
host: "localhost"
# port where postgres can be accessed
port: 5432
# name of the postgres database for lemmy
database: "lemmy"
# maximum number of active sql connections
pool_size: 5
}
# the domain name of your instance (eg "lemmy.ml")
hostname: lemmy-alpha
# address where lemmy should listen for incoming requests
bind: "0.0.0.0"
# port where lemmy should listen for incoming requests
port: 8536
# whether tls is required for activitypub. only disable this for debugging, never for producion.
tls_enabled: true
# json web token for authorization between server and client
jwt_secret: "changeme"
# address where pictrs is available
pictrs_url: "http://pictrs:8080"
# address where iframely is available
iframely_url: "http://iframely"
# rate limits for various user actions, by user ip
rate_limit: {
# maximum number of messages created in interval
message: 180
# interval length for message limit
message_per_second: 60
# maximum number of posts created in interval
post: 6
# interval length for post limit
post_per_second: 600
# maximum number of registrations in interval
register: 3
# interval length for registration limit
register_per_second: 3600
# maximum number of image uploads in interval
image: 6
# interval length for image uploads
image_per_second: 3600
}
# settings related to activitypub federation
federation: {
# whether to enable activitypub federation.
enabled: false
# Allows and blocks are described here:
# https://join.lemmy.ml/docs/en/federation/administration.html#instance-allowlist-and-blocklist
#
# comma separated list of instances with which federation is allowed
# Only one of these blocks should be uncommented
# allowed_instances: ["instance1.tld","instance2.tld"]
# comma separated list of instances which are blocked from federating
# blocked_instances: []
}
captcha: {
enabled: true
difficulty: medium # Can be easy, medium, or hard
}
# # email sending configuration
# email: {
# # hostname and port of the smtp server
# smtp_server: ""
# # login name for smtp server
# smtp_login: ""
# # password to login to the smtp server
# smtp_password: ""
# # address to send emails from, eg "noreply@your-instance.com"
# smtp_from_address: ""
# # whether or not smtp connections should use tls
# use_tls: true
# }
} }

View file

@ -1,91 +0,0 @@
{
# # optional: parameters for automatic configuration of new instance (only used at first start)
# setup: {
# # username for the admin user
# admin_username: ""
# # password for the admin user
# admin_password: ""
# # optional: email for the admin user (can be omitted and set later through the website)
# admin_email: ""
# # name of the site (can be changed later)
# site_name: ""
# }
# settings related to the postgresql database
database: {
# username to connect to postgres
user: "lemmy"
# password to connect to postgres
password: "password"
# host where postgres is running
host: "localhost"
# port where postgres can be accessed
port: 5432
# name of the postgres database for lemmy
database: "lemmy"
# maximum number of active sql connections
pool_size: 5
}
# the domain name of your instance (eg "lemmy.ml")
hostname: null
# address where lemmy should listen for incoming requests
bind: "0.0.0.0"
# port where lemmy should listen for incoming requests
port: 8536
# whether tls is required for activitypub. only disable this for debugging, never for producion.
tls_enabled: true
# json web token for authorization between server and client
jwt_secret: "changeme"
# address where pictrs is available
pictrs_url: "http://pictrs:8080"
# address where iframely is available
iframely_url: "http://iframely"
# rate limits for various user actions, by user ip
rate_limit: {
# maximum number of messages created in interval
message: 180
# interval length for message limit
message_per_second: 60
# maximum number of posts created in interval
post: 6
# interval length for post limit
post_per_second: 600
# maximum number of registrations in interval
register: 3
# interval length for registration limit
register_per_second: 3600
# maximum number of image uploads in interval
image: 6
# interval length for image uploads
image_per_second: 3600
}
# settings related to activitypub federation
federation: {
# whether to enable activitypub federation.
enabled: false
# Allows and blocks are described here:
# https://join.lemmy.ml/docs/en/federation/administration.html#instance-allowlist-and-blocklist
#
# comma separated list of instances with which federation is allowed
# Only one of these blocks should be uncommented
# allowed_instances: ["instance1.tld","instance2.tld"]
# comma separated list of instances which are blocked from federating
# blocked_instances: []
}
captcha: {
enabled: true
difficulty: medium # Can be easy, medium, or hard
}
# # email sending configuration
# email: {
# # hostname and port of the smtp server
# smtp_server: ""
# # login name for smtp server
# smtp_login: ""
# # password to login to the smtp server
# smtp_password: ""
# # address to send emails from, eg "noreply@your-instance.com"
# smtp_from_address: ""
# # whether or not smtp connections should use tls
# use_tls: true
# }
}

View file

@ -1,9 +1,9 @@
use actix_web::{web, web::Data}; use actix_web::{web, web::Data};
use captcha::Captcha;
use lemmy_api_common::{comment::*, community::*, person::*, post::*, site::*, websocket::*}; use lemmy_api_common::{comment::*, community::*, person::*, post::*, site::*, websocket::*};
use lemmy_utils::{ConnectionId, LemmyError}; use lemmy_utils::{ConnectionId, LemmyError};
use lemmy_websocket::{serialize_websocket_message, LemmyContext, UserOperation}; use lemmy_websocket::{serialize_websocket_message, LemmyContext, UserOperation};
use serde::Deserialize; use serde::Deserialize;
use std::{env, process::Command};
mod comment; mod comment;
mod comment_report; mod comment_report;
@ -161,60 +161,23 @@ where
serialize_websocket_message(&op, &res) serialize_websocket_message(&op, &res)
} }
pub(crate) fn captcha_espeak_wav_base64(captcha: &str) -> Result<String, LemmyError> { /// Converts the captcha to a base64 encoded wav audio file
let mut built_text = String::new(); pub(crate) fn captcha_as_wav_base64(captcha: &Captcha) -> String {
let letters = captcha.as_wav();
// Building proper speech text for espeak let mut concat_letters: Vec<u8> = Vec::new();
for mut c in captcha.chars() {
let new_str = if c.is_alphabetic() {
if c.is_lowercase() {
c.make_ascii_uppercase();
format!("lower case {} ... ", c)
} else {
c.make_ascii_uppercase();
format!("capital {} ... ", c)
}
} else {
format!("{} ...", c)
};
built_text.push_str(&new_str); for letter in letters {
let bytes = letter.unwrap_or_default();
concat_letters.extend(bytes);
} }
espeak_wav_base64(&built_text)
}
pub(crate) fn espeak_wav_base64(text: &str) -> Result<String, LemmyError> {
// Make a temp file path
let uuid = uuid::Uuid::new_v4().to_string();
let file_path = format!(
"{}/lemmy_espeak_{}.wav",
env::temp_dir().to_string_lossy(),
&uuid
);
// Write the wav file
Command::new("espeak")
.arg("-w")
.arg(&file_path)
.arg(text)
.status()?;
// Read the wav file bytes
let bytes = std::fs::read(&file_path)?;
// Delete the file
std::fs::remove_file(file_path)?;
// Convert to base64 // Convert to base64
let base64 = base64::encode(bytes); base64::encode(concat_letters)
Ok(base64)
} }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use crate::captcha_espeak_wav_base64;
use lemmy_api_common::check_validator_time; use lemmy_api_common::check_validator_time;
use lemmy_db_queries::{establish_unpooled_connection, source::local_user::LocalUser_, Crud}; use lemmy_db_queries::{establish_unpooled_connection, source::local_user::LocalUser_, Crud};
use lemmy_db_schema::source::{ use lemmy_db_schema::source::{
@ -256,9 +219,4 @@ mod tests {
let num_deleted = Person::delete(&conn, inserted_person.id).unwrap(); let num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
assert_eq!(1, num_deleted); assert_eq!(1, num_deleted);
} }
#[test]
fn test_espeak() {
assert!(captcha_espeak_wav_base64("WxRt2l").is_ok())
}
} }

View file

@ -1,4 +1,4 @@
use crate::{captcha_espeak_wav_base64, Perform}; use crate::{captcha_as_wav_base64, Perform};
use actix_web::web::Data; use actix_web::web::Data;
use anyhow::Context; use anyhow::Context;
use bcrypt::verify; use bcrypt::verify;
@ -60,7 +60,7 @@ use lemmy_utils::{
email::send_email, email::send_email,
location_info, location_info,
settings::structs::Settings, settings::structs::Settings,
utils::{generate_random_string, is_valid_preferred_username, naive_from_unix}, utils::{generate_random_string, is_valid_display_name, naive_from_unix},
ApiError, ApiError,
ConnectionId, ConnectionId,
LemmyError, LemmyError,
@ -135,13 +135,11 @@ impl Perform for GetCaptcha {
let answer = captcha.chars_as_string(); let answer = captcha.chars_as_string();
let png_byte_array = captcha.as_png().expect("failed to generate captcha"); let png = captcha.as_base64().expect("failed to generate captcha");
let png = base64::encode(png_byte_array);
let uuid = uuid::Uuid::new_v4().to_string(); let uuid = uuid::Uuid::new_v4().to_string();
let wav = captcha_espeak_wav_base64(&answer).ok(); let wav = captcha_as_wav_base64(&captcha);
let captcha_item = CaptchaItem { let captcha_item = CaptchaItem {
answer, answer,
@ -174,7 +172,7 @@ impl Perform for SaveUserSettings {
let banner = diesel_option_overwrite_to_url(&data.banner)?; let banner = diesel_option_overwrite_to_url(&data.banner)?;
let email = diesel_option_overwrite(&data.email); let email = diesel_option_overwrite(&data.email);
let bio = diesel_option_overwrite(&data.bio); let bio = diesel_option_overwrite(&data.bio);
let preferred_username = diesel_option_overwrite(&data.preferred_username); let display_name = diesel_option_overwrite(&data.display_name);
let matrix_user_id = diesel_option_overwrite(&data.matrix_user_id); let matrix_user_id = diesel_option_overwrite(&data.matrix_user_id);
if let Some(Some(bio)) = &bio { if let Some(Some(bio)) = &bio {
@ -183,8 +181,8 @@ impl Perform for SaveUserSettings {
} }
} }
if let Some(Some(preferred_username)) = &preferred_username { if let Some(Some(display_name)) = &display_name {
if !is_valid_preferred_username(preferred_username.trim()) { if !is_valid_display_name(display_name.trim()) {
return Err(ApiError::err("invalid_username").into()); return Err(ApiError::err("invalid_username").into());
} }
} }
@ -200,7 +198,7 @@ impl Perform for SaveUserSettings {
avatar, avatar,
banner, banner,
inbox_url: None, inbox_url: None,
preferred_username, display_name,
published: None, published: None,
updated: Some(naive_now()), updated: Some(naive_now()),
banned: None, banned: None,
@ -232,6 +230,7 @@ impl Perform for SaveUserSettings {
email, email,
password_encrypted, password_encrypted,
show_nsfw: data.show_nsfw, show_nsfw: data.show_nsfw,
show_scores: data.show_scores,
theme: data.theme.to_owned(), theme: data.theme.to_owned(),
default_sort_type, default_sort_type,
default_listing_type, default_listing_type,

View file

@ -39,25 +39,29 @@ pub struct GetCaptchaResponse {
#[derive(Serialize)] #[derive(Serialize)]
pub struct CaptchaResponse { pub struct CaptchaResponse {
pub png: String, // A Base64 encoded png pub png: String, // A Base64 encoded png
pub wav: Option<String>, // A Base64 encoded wav audio pub wav: String, // A Base64 encoded wav audio
pub uuid: String, pub uuid: String,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct SaveUserSettings { pub struct SaveUserSettings {
pub show_nsfw: Option<bool>, pub show_nsfw: Option<bool>,
pub show_scores: Option<bool>,
pub theme: Option<String>, pub theme: Option<String>,
pub default_sort_type: Option<i16>, pub default_sort_type: Option<i16>,
pub default_listing_type: Option<i16>, pub default_listing_type: Option<i16>,
pub lang: Option<String>, pub lang: Option<String>,
pub avatar: Option<String>, pub avatar: Option<String>,
pub banner: Option<String>, pub banner: Option<String>,
pub preferred_username: Option<String>, pub display_name: Option<String>,
pub email: Option<String>, pub email: Option<String>,
pub bio: Option<String>, pub bio: Option<String>,
pub matrix_user_id: Option<String>, pub matrix_user_id: Option<String>,
pub show_avatars: Option<bool>, pub show_avatars: Option<bool>,
pub new_password: Option<String>,
pub new_password_verify: Option<String>,
pub old_password: Option<String>,
pub send_notifications_to_email: Option<bool>, pub send_notifications_to_email: Option<bool>,
pub auth: String, pub auth: String,
} }

View file

@ -133,6 +133,7 @@ impl PerformCrud for Register {
default_listing_type: Some(ListingType::Subscribed as i16), default_listing_type: Some(ListingType::Subscribed as i16),
lang: Some("browser".into()), lang: Some("browser".into()),
show_avatars: Some(true), show_avatars: Some(true),
show_scores: Some(true),
send_notifications_to_email: Some(false), send_notifications_to_email: Some(false),
}; };

View file

@ -64,7 +64,8 @@ impl ToApub for DbPerson {
set_content_and_source(&mut person, bio)?; set_content_and_source(&mut person, bio)?;
} }
if let Some(i) = self.preferred_username.to_owned() { // In apub, the "name" is a display name
if let Some(i) = self.display_name.to_owned() {
person.set_name(i); person.set_name(i);
} }
@ -161,7 +162,7 @@ impl FromApubToForm<PersonExt> for PersonForm {
.preferred_username() .preferred_username()
.context(location_info!())? .context(location_info!())?
.to_string(); .to_string();
let preferred_username: Option<String> = person let display_name: Option<String> = person
.name() .name()
.map(|n| n.one()) .map(|n| n.one())
.flatten() .flatten()
@ -176,12 +177,12 @@ impl FromApubToForm<PersonExt> for PersonForm {
.map(|s| s.to_owned().into()); .map(|s| s.to_owned().into());
check_slurs(&name)?; check_slurs(&name)?;
check_slurs_opt(&preferred_username)?; check_slurs_opt(&display_name)?;
check_slurs_opt(&bio)?; check_slurs_opt(&bio)?;
Ok(PersonForm { Ok(PersonForm {
name, name,
preferred_username: Some(preferred_username), display_name: Some(display_name),
banned: None, banned: None,
deleted: None, deleted: None,
avatar: avatar.map(|o| o.map(|i| i.into())), avatar: avatar.map(|o| o.map(|i| i.into())),

View file

@ -24,6 +24,7 @@ mod safe_settings_type {
show_avatars, show_avatars,
send_notifications_to_email, send_notifications_to_email,
validator_time, validator_time,
show_scores,
); );
impl ToSafeSettings for LocalUser { impl ToSafeSettings for LocalUser {
@ -43,6 +44,7 @@ mod safe_settings_type {
show_avatars, show_avatars,
send_notifications_to_email, send_notifications_to_email,
validator_time, validator_time,
show_scores,
) )
} }
} }

View file

@ -15,7 +15,7 @@ mod safe_type {
type Columns = ( type Columns = (
id, id,
name, name,
preferred_username, display_name,
avatar, avatar,
banned, banned,
published, published,
@ -37,7 +37,7 @@ mod safe_type {
( (
id, id,
name, name,
preferred_username, display_name,
avatar, avatar,
banned, banned,
published, published,
@ -63,7 +63,7 @@ mod safe_type_alias_1 {
type Columns = ( type Columns = (
id, id,
name, name,
preferred_username, display_name,
avatar, avatar,
banned, banned,
published, published,
@ -85,7 +85,7 @@ mod safe_type_alias_1 {
( (
id, id,
name, name,
preferred_username, display_name,
avatar, avatar,
banned, banned,
published, published,
@ -111,7 +111,7 @@ mod safe_type_alias_2 {
type Columns = ( type Columns = (
id, id,
name, name,
preferred_username, display_name,
avatar, avatar,
banned, banned,
published, published,
@ -133,7 +133,7 @@ mod safe_type_alias_2 {
( (
id, id,
name, name,
preferred_username, display_name,
avatar, avatar,
banned, banned,
published, published,
@ -236,7 +236,7 @@ impl Person_ for Person {
diesel::update(person.find(person_id)) diesel::update(person.find(person_id))
.set(( .set((
preferred_username.eq::<Option<String>>(None), display_name.eq::<Option<String>>(None),
bio.eq::<Option<String>>(None), bio.eq::<Option<String>>(None),
matrix_user_id.eq::<Option<String>>(None), matrix_user_id.eq::<Option<String>>(None),
deleted.eq(true), deleted.eq(true),
@ -264,7 +264,7 @@ mod tests {
let expected_person = Person { let expected_person = Person {
id: inserted_person.id, id: inserted_person.id,
name: "holly".into(), name: "holly".into(),
preferred_username: None, display_name: None,
avatar: None, avatar: None,
banner: None, banner: None,
banned: false, banned: false,

View file

@ -154,6 +154,7 @@ table! {
show_avatars -> Bool, show_avatars -> Bool,
send_notifications_to_email -> Bool, send_notifications_to_email -> Bool,
validator_time -> Timestamp, validator_time -> Timestamp,
show_scores -> Bool,
} }
} }
@ -270,7 +271,7 @@ table! {
person (id) { person (id) {
id -> Int4, id -> Int4,
name -> Varchar, name -> Varchar,
preferred_username -> Nullable<Varchar>, display_name -> Nullable<Varchar>,
avatar -> Nullable<Varchar>, avatar -> Nullable<Varchar>,
banned -> Bool, banned -> Bool,
published -> Timestamp, published -> Timestamp,
@ -470,7 +471,7 @@ table! {
person_alias_1 (id) { person_alias_1 (id) {
id -> Int4, id -> Int4,
name -> Varchar, name -> Varchar,
preferred_username -> Nullable<Varchar>, display_name -> Nullable<Varchar>,
avatar -> Nullable<Varchar>, avatar -> Nullable<Varchar>,
banned -> Bool, banned -> Bool,
published -> Timestamp, published -> Timestamp,
@ -494,7 +495,7 @@ table! {
person_alias_2 (id) { person_alias_2 (id) {
id -> Int4, id -> Int4,
name -> Varchar, name -> Varchar,
preferred_username -> Nullable<Varchar>, display_name -> Nullable<Varchar>,
avatar -> Nullable<Varchar>, avatar -> Nullable<Varchar>,
banned -> Bool, banned -> Bool,
published -> Timestamp, published -> Timestamp,

View file

@ -16,6 +16,7 @@ pub struct LocalUser {
pub show_avatars: bool, pub show_avatars: bool,
pub send_notifications_to_email: bool, pub send_notifications_to_email: bool,
pub validator_time: chrono::NaiveDateTime, pub validator_time: chrono::NaiveDateTime,
pub show_scores: bool,
} }
// TODO redo these, check table defaults // TODO redo these, check table defaults
@ -32,6 +33,7 @@ pub struct LocalUserForm {
pub lang: Option<String>, pub lang: Option<String>,
pub show_avatars: Option<bool>, pub show_avatars: Option<bool>,
pub send_notifications_to_email: Option<bool>, pub send_notifications_to_email: Option<bool>,
pub show_scores: Option<bool>,
} }
/// A local user view that removes password encrypted /// A local user view that removes password encrypted
@ -49,4 +51,5 @@ pub struct LocalUserSettings {
pub show_avatars: bool, pub show_avatars: bool,
pub send_notifications_to_email: bool, pub send_notifications_to_email: bool,
pub validator_time: chrono::NaiveDateTime, pub validator_time: chrono::NaiveDateTime,
pub show_scores: bool,
} }

View file

@ -10,7 +10,7 @@ use serde::Serialize;
pub struct Person { pub struct Person {
pub id: PersonId, pub id: PersonId,
pub name: String, pub name: String,
pub preferred_username: Option<String>, pub display_name: Option<String>,
pub avatar: Option<DbUrl>, pub avatar: Option<DbUrl>,
pub banned: bool, pub banned: bool,
pub published: chrono::NaiveDateTime, pub published: chrono::NaiveDateTime,
@ -35,7 +35,7 @@ pub struct Person {
pub struct PersonSafe { pub struct PersonSafe {
pub id: PersonId, pub id: PersonId,
pub name: String, pub name: String,
pub preferred_username: Option<String>, pub display_name: Option<String>,
pub avatar: Option<DbUrl>, pub avatar: Option<DbUrl>,
pub banned: bool, pub banned: bool,
pub published: chrono::NaiveDateTime, pub published: chrono::NaiveDateTime,
@ -56,7 +56,7 @@ pub struct PersonSafe {
pub struct PersonAlias1 { pub struct PersonAlias1 {
pub id: PersonId, pub id: PersonId,
pub name: String, pub name: String,
pub preferred_username: Option<String>, pub display_name: Option<String>,
pub avatar: Option<DbUrl>, pub avatar: Option<DbUrl>,
pub banned: bool, pub banned: bool,
pub published: chrono::NaiveDateTime, pub published: chrono::NaiveDateTime,
@ -80,7 +80,7 @@ pub struct PersonAlias1 {
pub struct PersonSafeAlias1 { pub struct PersonSafeAlias1 {
pub id: PersonId, pub id: PersonId,
pub name: String, pub name: String,
pub preferred_username: Option<String>, pub display_name: Option<String>,
pub avatar: Option<DbUrl>, pub avatar: Option<DbUrl>,
pub banned: bool, pub banned: bool,
pub published: chrono::NaiveDateTime, pub published: chrono::NaiveDateTime,
@ -101,7 +101,7 @@ pub struct PersonSafeAlias1 {
pub struct PersonAlias2 { pub struct PersonAlias2 {
pub id: PersonId, pub id: PersonId,
pub name: String, pub name: String,
pub preferred_username: Option<String>, pub display_name: Option<String>,
pub avatar: Option<DbUrl>, pub avatar: Option<DbUrl>,
pub banned: bool, pub banned: bool,
pub published: chrono::NaiveDateTime, pub published: chrono::NaiveDateTime,
@ -125,7 +125,7 @@ pub struct PersonAlias2 {
pub struct PersonSafeAlias2 { pub struct PersonSafeAlias2 {
pub id: PersonId, pub id: PersonId,
pub name: String, pub name: String,
pub preferred_username: Option<String>, pub display_name: Option<String>,
pub avatar: Option<DbUrl>, pub avatar: Option<DbUrl>,
pub banned: bool, pub banned: bool,
pub published: chrono::NaiveDateTime, pub published: chrono::NaiveDateTime,
@ -145,7 +145,7 @@ pub struct PersonSafeAlias2 {
#[table_name = "person"] #[table_name = "person"]
pub struct PersonForm { pub struct PersonForm {
pub name: String, pub name: String,
pub preferred_username: Option<Option<String>>, pub display_name: Option<Option<String>>,
pub avatar: Option<Option<DbUrl>>, pub avatar: Option<Option<DbUrl>>,
pub banned: Option<bool>, pub banned: Option<bool>,
pub published: Option<chrono::NaiveDateTime>, pub published: Option<chrono::NaiveDateTime>,

View file

@ -519,7 +519,7 @@ mod tests {
creator: PersonSafe { creator: PersonSafe {
id: inserted_person.id, id: inserted_person.id,
name: "timmy".into(), name: "timmy".into(),
preferred_username: None, display_name: None,
published: inserted_person.published, published: inserted_person.published,
avatar: None, avatar: None,
actor_id: inserted_person.actor_id.to_owned(), actor_id: inserted_person.actor_id.to_owned(),

View file

@ -541,7 +541,7 @@ mod tests {
creator: PersonSafe { creator: PersonSafe {
id: inserted_person.id, id: inserted_person.id,
name: person_name, name: person_name,
preferred_username: None, display_name: None,
published: inserted_person.published, published: inserted_person.published,
avatar: None, avatar: None,
actor_id: inserted_person.actor_id.to_owned(), actor_id: inserted_person.actor_id.to_owned(),

View file

@ -193,6 +193,7 @@ impl<'a> CommunityQueryBuilder<'a> {
match self.sort { match self.sort {
SortType::New => query = query.order_by(community::published.desc()), SortType::New => query = query.order_by(community::published.desc()),
SortType::TopAll => query = query.order_by(community_aggregates::subscribers.desc()), SortType::TopAll => query = query.order_by(community_aggregates::subscribers.desc()),
SortType::TopMonth => query = query.order_by(community_aggregates::users_active_month.desc()),
// Covers all other sorts, including hot // Covers all other sorts, including hot
_ => { _ => {
query = query query = query

View file

@ -13,7 +13,6 @@ use crate::{
}; };
use anyhow::{anyhow, Context}; use anyhow::{anyhow, Context};
use deser_hjson::from_str; use deser_hjson::from_str;
use log::warn;
use merge::Merge; use merge::Merge;
use std::{env, fs, io::Error, net::IpAddr, sync::RwLock}; use std::{env, fs, io::Error, net::IpAddr, sync::RwLock};
@ -23,16 +22,8 @@ pub mod structs;
static CONFIG_FILE: &str = "config/config.hjson"; static CONFIG_FILE: &str = "config/config.hjson";
lazy_static! { lazy_static! {
static ref SETTINGS: RwLock<Settings> = RwLock::new(match Settings::init() { static ref SETTINGS: RwLock<Settings> =
Ok(c) => c, RwLock::new(Settings::init().expect("Failed to load settings file"));
Err(e) => {
warn!(
"Couldn't load settings file, using default settings.\n{}",
e
);
Settings::default()
}
});
} }
impl Settings { impl Settings {

View file

@ -1,7 +1,7 @@
use crate::utils::{ use crate::utils::{
is_valid_community_name, is_valid_community_name,
is_valid_display_name,
is_valid_post_title, is_valid_post_title,
is_valid_preferred_username,
is_valid_username, is_valid_username,
remove_slurs, remove_slurs,
scrape_text_for_mentions, scrape_text_for_mentions,
@ -29,9 +29,15 @@ fn test_valid_register_username() {
} }
#[test] #[test]
fn test_valid_preferred_username() { fn test_valid_display_name() {
assert!(is_valid_preferred_username("hello @there")); assert!(is_valid_display_name("hello @there"));
assert!(!is_valid_preferred_username("@hello there")); assert!(!is_valid_display_name("@hello there"));
// Make sure zero-space with an @ doesn't work
assert!(!is_valid_display_name(&format!(
"{}@my name is",
'\u{200b}'
)));
} }
#[test] #[test]

View file

@ -108,10 +108,11 @@ pub fn is_valid_username(name: &str) -> bool {
} }
// Can't do a regex here, reverse lookarounds not supported // Can't do a regex here, reverse lookarounds not supported
pub fn is_valid_preferred_username(preferred_username: &str) -> bool { pub fn is_valid_display_name(name: &str) -> bool {
!preferred_username.starts_with('@') !name.starts_with('@')
&& preferred_username.chars().count() >= 3 && !name.starts_with('\u{200b}')
&& preferred_username.chars().count() <= 20 && name.chars().count() >= 3
&& name.chars().count() <= 20
} }
pub fn is_valid_community_name(name: &str) -> bool { pub fn is_valid_community_name(name: &str) -> bool {

View file

@ -1 +1 @@
pub const VERSION: &str = "0.10.0-rc.13"; pub const VERSION: &str = "0.10.2";

View file

@ -49,9 +49,6 @@ FROM alpine:3.12 as lemmy
# Install libpq for postgres # Install libpq for postgres
RUN apk add libpq RUN apk add libpq
# Install Espeak for captchas
RUN apk add espeak
RUN addgroup -g 1000 lemmy RUN addgroup -g 1000 lemmy
RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy

View file

@ -17,7 +17,7 @@ services:
- iframely - iframely
lemmy-ui: lemmy-ui:
image: dessalines/lemmy-ui:0.10.0-rc.13 image: dessalines/lemmy-ui:0.10.2
ports: ports:
- "1235:1234" - "1235:1234"
restart: always restart: always

View file

@ -19,9 +19,9 @@ RUN --mount=type=cache,target=/app/target \
FROM ubuntu:20.10 FROM ubuntu:20.10
# Install libpq for postgres and espeak # Install libpq for postgres
RUN apt-get update -y RUN apt-get update -y
RUN apt-get install -y libpq-dev espeak RUN apt-get install -y libpq-dev
# Copy resources # Copy resources
COPY config/defaults.hjson /config/defaults.hjson COPY config/defaults.hjson /config/defaults.hjson

View file

@ -29,7 +29,7 @@ services:
- ./volumes/pictrs_alpha:/mnt - ./volumes/pictrs_alpha:/mnt
lemmy-alpha-ui: lemmy-alpha-ui:
image: dessalines/lemmy-ui:0.10.0-rc.13 image: dessalines/lemmy-ui:0.10.2
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_INTERNAL_HOST=lemmy-alpha:8541
- LEMMY_EXTERNAL_HOST=localhost:8541 - LEMMY_EXTERNAL_HOST=localhost:8541
@ -58,7 +58,7 @@ services:
- ./volumes/postgres_alpha:/var/lib/postgresql/data - ./volumes/postgres_alpha:/var/lib/postgresql/data
lemmy-beta-ui: lemmy-beta-ui:
image: dessalines/lemmy-ui:0.10.0-rc.13 image: dessalines/lemmy-ui:0.10.2
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_INTERNAL_HOST=lemmy-beta:8551
- LEMMY_EXTERNAL_HOST=localhost:8551 - LEMMY_EXTERNAL_HOST=localhost:8551
@ -87,7 +87,7 @@ services:
- ./volumes/postgres_beta:/var/lib/postgresql/data - ./volumes/postgres_beta:/var/lib/postgresql/data
lemmy-gamma-ui: lemmy-gamma-ui:
image: dessalines/lemmy-ui:0.10.0-rc.13 image: dessalines/lemmy-ui:0.10.2
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_INTERNAL_HOST=lemmy-gamma:8561
- LEMMY_EXTERNAL_HOST=localhost:8561 - LEMMY_EXTERNAL_HOST=localhost:8561
@ -117,7 +117,7 @@ services:
# An instance with only an allowlist for beta # An instance with only an allowlist for beta
lemmy-delta-ui: lemmy-delta-ui:
image: dessalines/lemmy-ui:0.10.0-rc.13 image: dessalines/lemmy-ui:0.10.2
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_INTERNAL_HOST=lemmy-delta:8571
- LEMMY_EXTERNAL_HOST=localhost:8571 - LEMMY_EXTERNAL_HOST=localhost:8571
@ -147,7 +147,7 @@ services:
# An instance who has a blocklist, with lemmy-alpha blocked # An instance who has a blocklist, with lemmy-alpha blocked
lemmy-epsilon-ui: lemmy-epsilon-ui:
image: dessalines/lemmy-ui:0.10.0-rc.13 image: dessalines/lemmy-ui:0.10.2
environment: environment:
- LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_INTERNAL_HOST=lemmy-epsilon:8581
- LEMMY_EXTERNAL_HOST=localhost:8581 - LEMMY_EXTERNAL_HOST=localhost:8581

View file

@ -49,9 +49,6 @@ FROM alpine:3.12 as lemmy
# Install libpq for postgres # Install libpq for postgres
RUN apk add libpq RUN apk add libpq
# Install Espeak for captchas
RUN apk add espeak
RUN addgroup -g 1000 lemmy RUN addgroup -g 1000 lemmy
RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy

View file

@ -22,9 +22,9 @@ RUN cp ./target/release/lemmy_server /app/lemmy_server
# The Debian runner # The Debian runner
FROM debian:buster-slim as lemmy FROM debian:buster-slim as lemmy
# Install libpq for postgres and espeak for captchas # Install libpq for postgres
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install --no-install-recommends espeak postgresql-client libc6 libssl1.1 \ && apt-get -y install --no-install-recommends postgresql-client libc6 libssl1.1 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN addgroup --gid 1000 lemmy RUN addgroup --gid 1000 lemmy

View file

@ -13,7 +13,9 @@ git add "crates/utils/src/version.rs"
popd popd
# Changing various references to the Lemmy version # Changing various references to the Lemmy version
sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../dev/docker-compose.yml
sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../dev/docker-compose.yml sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../dev/docker-compose.yml
sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../federation/docker-compose.yml
sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../federation/docker-compose.yml sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../federation/docker-compose.yml
git add ../dev/docker-compose.yml git add ../dev/docker-compose.yml
git add ../federation/docker-compose.yml git add ../federation/docker-compose.yml
@ -22,6 +24,7 @@ git add ../federation/docker-compose.yml
# IE, when the third semver is a number, not '2-rc' # IE, when the third semver is a number, not '2-rc'
if [ ! -z "${third_semver##*[!0-9]*}" ]; then if [ ! -z "${third_semver##*[!0-9]*}" ]; then
sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml
sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../prod/docker-compose.yml
git add ../prod/docker-compose.yml git add ../prod/docker-compose.yml
# Setting the version for Ansible # Setting the version for Ansible

View file

@ -12,7 +12,7 @@ services:
restart: always restart: always
lemmy: lemmy:
image: dessalines/lemmy:0.9.9 image: dessalines/lemmy:0.10.2
ports: ports:
- "127.0.0.1:8536:8536" - "127.0.0.1:8536:8536"
restart: always restart: always
@ -26,7 +26,7 @@ services:
- iframely - iframely
lemmy-ui: lemmy-ui:
image: dessalines/lemmy-ui:0.9.9 image: dessalines/lemmy-ui:0.10.2
ports: ports:
- "127.0.0.1:1235:1234" - "127.0.0.1:1235:1234"
restart: always restart: always

View file

@ -0,0 +1 @@
alter table local_user drop column show_scores;

View file

@ -0,0 +1 @@
alter table local_user add column show_scores boolean default true not null;

View file

@ -0,0 +1,6 @@
alter table person rename display_name to preferred_username;
-- Regenerate the person_alias views
drop view person_alias_1, person_alias_2;
create view person_alias_1 as select * from person;
create view person_alias_2 as select * from person;

View file

@ -0,0 +1,6 @@
alter table person rename preferred_username to display_name;
-- Regenerate the person_alias views
drop view person_alias_1, person_alias_2;
create view person_alias_1 as select * from person;
create view person_alias_2 as select * from person;

View file

@ -0,0 +1 @@
drop index idx_community_aggregates_users_active_month;

View file

@ -0,0 +1,2 @@
create index idx_community_aggregates_users_active_month on community_aggregates (users_active_month desc);

View file

@ -5,5 +5,8 @@ psql -U lemmy -d postgres -c "DROP DATABASE lemmy;"
psql -U lemmy -d postgres -c "CREATE DATABASE lemmy;" psql -U lemmy -d postgres -c "CREATE DATABASE lemmy;"
export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
# tests are executed in working directory crates/api (or similar),
# so to load the config we need to traverse to the repo root
export LEMMY_CONFIG_LOCATION=../../config/config.hjson
RUST_BACKTRACE=1 \ RUST_BACKTRACE=1 \
cargo test --workspace --no-fail-fast cargo test --workspace --no-fail-fast