mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-28 20:31:24 +00:00
Merge branch 'main' into mark_accounts_as_bot
This commit is contained in:
Dessalines
commit
4e98cea679
43 changed files with 482 additions and 229 deletions
|
|
@ -29,6 +29,7 @@ steps:
|
|||
image: ekidd/rust-musl-builder:1.50.0
|
||||
environment:
|
||||
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
|
||||
LEMMY_CONFIG_LOCATION: ../../config/config.hjson
|
||||
RUST_BACKTRACE: 1
|
||||
RUST_TEST_THREADS: 1
|
||||
commands:
|
||||
|
|
@ -107,6 +108,7 @@ steps:
|
|||
image: rust:1.50-slim-buster
|
||||
environment:
|
||||
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
|
||||
LEMMY_CONFIG_LOCATION: ../../config/config.hjson
|
||||
RUST_BACKTRACE: 1
|
||||
RUST_TEST_THREADS: 1
|
||||
commands:
|
||||
|
|
|
|||
|
|
@ -10,6 +10,11 @@
|
|||
[](https://github.com/humanetech-community/awesome-humane-tech)
|
||||
</div>
|
||||
|
||||
<p align="center">
|
||||
<span>English</span> |
|
||||
<a href="readmes/README.es.md">Español</a>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://join.lemmy.ml/" rel="noopener">
|
||||
<img width=200px height=200px src="https://raw.githubusercontent.com/LemmyNet/lemmy-ui/main/src/assets/icons/favicon.svg"></a>
|
||||
|
|
|
|||
92
RELEASES.md
92
RELEASES.md
|
|
@ -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:
|
||||
|
||||
|
||||
v0.10.0 build graph:
|
||||
|
||||
|
||||
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)
|
||||
|
||||
## Changes
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
0.9.9
|
||||
0.10.2
|
||||
|
|
|
|||
|
|
@ -4,15 +4,22 @@
|
|||
|
||||
# settings related to the postgresql database
|
||||
database: {
|
||||
database: lemmy
|
||||
user: lemmy
|
||||
host: postgres
|
||||
port: 5432
|
||||
pool_size: 5
|
||||
# password to connect to postgres
|
||||
password: "{{ postgres_password }}"
|
||||
# host where postgres is running
|
||||
host: "postgres"
|
||||
}
|
||||
# the domain name of your instance (eg "lemmy.ml")
|
||||
hostname: "{{ domain }}"
|
||||
# the port where lemmy should listen for incoming requests
|
||||
port: 8536
|
||||
# json web token for authorization between server and client
|
||||
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: {
|
||||
# hostname of the smtp server
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
"eslint": "^7.18.0",
|
||||
"eslint-plugin-jane": "^9.0.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",
|
||||
"prettier": "^2.1.2",
|
||||
"ts-jest": "^26.4.4",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ let apShortname: string;
|
|||
|
||||
function assertUserFederation(userOne: PersonViewSafe, userTwo: PersonViewSafe) {
|
||||
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.actor_id).toBe(userTwo.person.actor_id);
|
||||
expect(userOne.person.avatar).toBe(userTwo.person.avatar);
|
||||
|
|
@ -49,7 +49,7 @@ test('Set some user settings, check that they are federated', async () => {
|
|||
lang: '',
|
||||
avatar,
|
||||
banner,
|
||||
preferred_username: 'user321',
|
||||
display_name: 'user321',
|
||||
show_avatars: false,
|
||||
send_notifications_to_email: false,
|
||||
bio,
|
||||
|
|
|
|||
|
|
@ -3233,10 +3233,10 @@ language-tags@^1.0.5:
|
|||
dependencies:
|
||||
language-subtag-registry "~0.3.2"
|
||||
|
||||
lemmy-js-client@0.10.0-rc.13:
|
||||
version "0.10.0-rc.13"
|
||||
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.10.0-rc.13.tgz#ea2e88857243374d7fbd49ee6b4bb94c34359d85"
|
||||
integrity sha512-zodvYkwBYR7iP27ah6L/QPUphUUdq38kCH7QF2CUYBrsSAEkGmq2kdz+iusnQ1Ht7Ad80GtYycFprsZBveV5eQ==
|
||||
lemmy-js-client@0.11.0-rc.1:
|
||||
version "0.11.0-rc.1"
|
||||
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.11.0-rc.1.tgz#0031676be9fc787157a21dd3f5095dd1ee9e6a57"
|
||||
integrity sha512-dtpxe/hHTbYEv2WnfGkAieOB9jyKUVED+y4DosUp/FcaatjPcMTiKOvCdMNjlvvG/9GyclWEoyNitPEsvJwjmg==
|
||||
|
||||
leven@^3.1.0:
|
||||
version "3.1.0"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
# }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
# }
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
use actix_web::{web, web::Data};
|
||||
use captcha::Captcha;
|
||||
use lemmy_api_common::{comment::*, community::*, person::*, post::*, site::*, websocket::*};
|
||||
use lemmy_utils::{ConnectionId, LemmyError};
|
||||
use lemmy_websocket::{serialize_websocket_message, LemmyContext, UserOperation};
|
||||
use serde::Deserialize;
|
||||
use std::{env, process::Command};
|
||||
|
||||
mod comment;
|
||||
mod comment_report;
|
||||
|
|
@ -158,60 +158,23 @@ where
|
|||
serialize_websocket_message(&op, &res)
|
||||
}
|
||||
|
||||
pub(crate) fn captcha_espeak_wav_base64(captcha: &str) -> Result<String, LemmyError> {
|
||||
let mut built_text = String::new();
|
||||
/// Converts the captcha to a base64 encoded wav audio file
|
||||
pub(crate) fn captcha_as_wav_base64(captcha: &Captcha) -> String {
|
||||
let letters = captcha.as_wav();
|
||||
|
||||
// Building proper speech text for espeak
|
||||
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)
|
||||
};
|
||||
let mut concat_letters: Vec<u8> = Vec::new();
|
||||
|
||||
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
|
||||
let base64 = base64::encode(bytes);
|
||||
|
||||
Ok(base64)
|
||||
base64::encode(concat_letters)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::captcha_espeak_wav_base64;
|
||||
use lemmy_api_common::check_validator_time;
|
||||
use lemmy_db_queries::{establish_unpooled_connection, source::local_user::LocalUser_, Crud};
|
||||
use lemmy_db_schema::source::{
|
||||
|
|
@ -253,9 +216,4 @@ mod tests {
|
|||
let num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
|
||||
assert_eq!(1, num_deleted);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_espeak() {
|
||||
assert!(captcha_espeak_wav_base64("WxRt2l").is_ok())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use crate::{captcha_espeak_wav_base64, Perform};
|
||||
use crate::{captcha_as_wav_base64, Perform};
|
||||
use actix_web::web::Data;
|
||||
use anyhow::Context;
|
||||
use bcrypt::verify;
|
||||
|
|
@ -60,7 +60,7 @@ use lemmy_utils::{
|
|||
email::send_email,
|
||||
location_info,
|
||||
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,
|
||||
ConnectionId,
|
||||
LemmyError,
|
||||
|
|
@ -135,13 +135,11 @@ impl Perform for GetCaptcha {
|
|||
|
||||
let answer = captcha.chars_as_string();
|
||||
|
||||
let png_byte_array = captcha.as_png().expect("failed to generate captcha");
|
||||
|
||||
let png = base64::encode(png_byte_array);
|
||||
let png = captcha.as_base64().expect("failed to generate captcha");
|
||||
|
||||
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 {
|
||||
answer,
|
||||
|
|
@ -174,7 +172,7 @@ impl Perform for SaveUserSettings {
|
|||
let banner = diesel_option_overwrite_to_url(&data.banner)?;
|
||||
let email = diesel_option_overwrite(&data.email);
|
||||
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 bot_account = data.bot_account;
|
||||
|
||||
|
|
@ -184,8 +182,8 @@ impl Perform for SaveUserSettings {
|
|||
}
|
||||
}
|
||||
|
||||
if let Some(Some(preferred_username)) = &preferred_username {
|
||||
if !is_valid_preferred_username(preferred_username.trim()) {
|
||||
if let Some(Some(display_name)) = &display_name {
|
||||
if !is_valid_display_name(display_name.trim()) {
|
||||
return Err(ApiError::err("invalid_username").into());
|
||||
}
|
||||
}
|
||||
|
|
@ -236,7 +234,7 @@ impl Perform for SaveUserSettings {
|
|||
avatar,
|
||||
banner,
|
||||
inbox_url: None,
|
||||
preferred_username,
|
||||
display_name,
|
||||
published: None,
|
||||
updated: Some(naive_now()),
|
||||
banned: None,
|
||||
|
|
@ -270,6 +268,7 @@ impl Perform for SaveUserSettings {
|
|||
password_encrypted,
|
||||
show_nsfw: data.show_nsfw,
|
||||
show_bot_accounts: data.show_bot_accounts,
|
||||
show_scores: data.show_scores,
|
||||
theme: data.theme.to_owned(),
|
||||
default_sort_type,
|
||||
default_listing_type,
|
||||
|
|
|
|||
|
|
@ -39,28 +39,29 @@ pub struct GetCaptchaResponse {
|
|||
|
||||
#[derive(Serialize)]
|
||||
pub struct CaptchaResponse {
|
||||
pub png: String, // A Base64 encoded png
|
||||
pub wav: Option<String>, // A Base64 encoded wav audio
|
||||
pub png: String, // A Base64 encoded png
|
||||
pub wav: String, // A Base64 encoded wav audio
|
||||
pub uuid: String,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct SaveUserSettings {
|
||||
pub show_nsfw: Option<bool>,
|
||||
pub show_scores: Option<bool>,
|
||||
pub show_avatars: Option<bool>,
|
||||
pub theme: Option<String>,
|
||||
pub default_sort_type: Option<i16>,
|
||||
pub default_listing_type: Option<i16>,
|
||||
pub lang: Option<String>,
|
||||
pub avatar: Option<String>,
|
||||
pub banner: Option<String>,
|
||||
pub preferred_username: Option<String>,
|
||||
pub display_name: Option<String>,
|
||||
pub email: Option<String>,
|
||||
pub bio: Option<String>,
|
||||
pub matrix_user_id: Option<String>,
|
||||
pub new_password: Option<String>,
|
||||
pub new_password_verify: Option<String>,
|
||||
pub old_password: Option<String>,
|
||||
pub show_avatars: Option<bool>,
|
||||
pub send_notifications_to_email: Option<bool>,
|
||||
pub bot_account: Option<bool>,
|
||||
pub show_bot_accounts: Option<bool>,
|
||||
|
|
|
|||
|
|
@ -134,6 +134,7 @@ impl PerformCrud for Register {
|
|||
default_listing_type: Some(ListingType::Subscribed as i16),
|
||||
lang: Some("browser".into()),
|
||||
show_avatars: Some(true),
|
||||
show_scores: Some(true),
|
||||
send_notifications_to_email: Some(false),
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,8 @@ impl ToApub for DbPerson {
|
|||
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);
|
||||
}
|
||||
|
||||
|
|
@ -162,7 +163,7 @@ impl FromApubToForm<PersonExt> for PersonForm {
|
|||
.preferred_username()
|
||||
.context(location_info!())?
|
||||
.to_string();
|
||||
let preferred_username: Option<String> = person
|
||||
let display_name: Option<String> = person
|
||||
.name()
|
||||
.map(|n| n.one())
|
||||
.flatten()
|
||||
|
|
@ -177,12 +178,12 @@ impl FromApubToForm<PersonExt> for PersonForm {
|
|||
.map(|s| s.to_owned().into());
|
||||
|
||||
check_slurs(&name)?;
|
||||
check_slurs_opt(&preferred_username)?;
|
||||
check_slurs_opt(&display_name)?;
|
||||
check_slurs_opt(&bio)?;
|
||||
|
||||
Ok(PersonForm {
|
||||
name,
|
||||
preferred_username: Some(preferred_username),
|
||||
display_name: Some(display_name),
|
||||
banned: None,
|
||||
deleted: None,
|
||||
avatar: avatar.map(|o| o.map(|i| i.into())),
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ mod safe_settings_type {
|
|||
send_notifications_to_email,
|
||||
validator_time,
|
||||
show_bot_accounts,
|
||||
show_scores,
|
||||
);
|
||||
|
||||
impl ToSafeSettings for LocalUser {
|
||||
|
|
@ -45,6 +46,7 @@ mod safe_settings_type {
|
|||
send_notifications_to_email,
|
||||
validator_time,
|
||||
show_bot_accounts,
|
||||
show_scores,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ mod safe_type {
|
|||
type Columns = (
|
||||
id,
|
||||
name,
|
||||
preferred_username,
|
||||
display_name,
|
||||
avatar,
|
||||
banned,
|
||||
published,
|
||||
|
|
@ -38,7 +38,7 @@ mod safe_type {
|
|||
(
|
||||
id,
|
||||
name,
|
||||
preferred_username,
|
||||
display_name,
|
||||
avatar,
|
||||
banned,
|
||||
published,
|
||||
|
|
@ -65,7 +65,7 @@ mod safe_type_alias_1 {
|
|||
type Columns = (
|
||||
id,
|
||||
name,
|
||||
preferred_username,
|
||||
display_name,
|
||||
avatar,
|
||||
banned,
|
||||
published,
|
||||
|
|
@ -88,7 +88,7 @@ mod safe_type_alias_1 {
|
|||
(
|
||||
id,
|
||||
name,
|
||||
preferred_username,
|
||||
display_name,
|
||||
avatar,
|
||||
banned,
|
||||
published,
|
||||
|
|
@ -115,7 +115,7 @@ mod safe_type_alias_2 {
|
|||
type Columns = (
|
||||
id,
|
||||
name,
|
||||
preferred_username,
|
||||
display_name,
|
||||
avatar,
|
||||
banned,
|
||||
published,
|
||||
|
|
@ -138,7 +138,7 @@ mod safe_type_alias_2 {
|
|||
(
|
||||
id,
|
||||
name,
|
||||
preferred_username,
|
||||
display_name,
|
||||
avatar,
|
||||
banned,
|
||||
published,
|
||||
|
|
@ -242,7 +242,7 @@ impl Person_ for Person {
|
|||
|
||||
diesel::update(person.find(person_id))
|
||||
.set((
|
||||
preferred_username.eq::<Option<String>>(None),
|
||||
display_name.eq::<Option<String>>(None),
|
||||
bio.eq::<Option<String>>(None),
|
||||
matrix_user_id.eq::<Option<String>>(None),
|
||||
deleted.eq(true),
|
||||
|
|
@ -270,7 +270,7 @@ mod tests {
|
|||
let expected_person = Person {
|
||||
id: inserted_person.id,
|
||||
name: "holly".into(),
|
||||
preferred_username: None,
|
||||
display_name: None,
|
||||
avatar: None,
|
||||
banner: None,
|
||||
banned: false,
|
||||
|
|
|
|||
|
|
@ -155,6 +155,7 @@ table! {
|
|||
send_notifications_to_email -> Bool,
|
||||
validator_time -> Timestamp,
|
||||
show_bot_accounts -> Bool,
|
||||
show_scores -> Bool,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -271,7 +272,7 @@ table! {
|
|||
person (id) {
|
||||
id -> Int4,
|
||||
name -> Varchar,
|
||||
preferred_username -> Nullable<Varchar>,
|
||||
display_name -> Nullable<Varchar>,
|
||||
avatar -> Nullable<Varchar>,
|
||||
banned -> Bool,
|
||||
published -> Timestamp,
|
||||
|
|
@ -472,7 +473,7 @@ table! {
|
|||
person_alias_1 (id) {
|
||||
id -> Int4,
|
||||
name -> Varchar,
|
||||
preferred_username -> Nullable<Varchar>,
|
||||
display_name -> Nullable<Varchar>,
|
||||
avatar -> Nullable<Varchar>,
|
||||
banned -> Bool,
|
||||
published -> Timestamp,
|
||||
|
|
@ -497,7 +498,7 @@ table! {
|
|||
person_alias_2 (id) {
|
||||
id -> Int4,
|
||||
name -> Varchar,
|
||||
preferred_username -> Nullable<Varchar>,
|
||||
display_name -> Nullable<Varchar>,
|
||||
avatar -> Nullable<Varchar>,
|
||||
banned -> Bool,
|
||||
published -> Timestamp,
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ pub struct LocalUser {
|
|||
pub send_notifications_to_email: bool,
|
||||
pub validator_time: chrono::NaiveDateTime,
|
||||
pub show_bot_accounts: bool,
|
||||
pub show_scores: bool,
|
||||
}
|
||||
|
||||
// TODO redo these, check table defaults
|
||||
|
|
@ -34,6 +35,7 @@ pub struct LocalUserForm {
|
|||
pub show_avatars: Option<bool>,
|
||||
pub send_notifications_to_email: Option<bool>,
|
||||
pub show_bot_accounts: Option<bool>,
|
||||
pub show_scores: Option<bool>,
|
||||
}
|
||||
|
||||
/// A local user view that removes password encrypted
|
||||
|
|
@ -52,4 +54,5 @@ pub struct LocalUserSettings {
|
|||
pub send_notifications_to_email: bool,
|
||||
pub validator_time: chrono::NaiveDateTime,
|
||||
pub show_bot_accounts: bool,
|
||||
pub show_scores: bool,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ use serde::Serialize;
|
|||
pub struct Person {
|
||||
pub id: PersonId,
|
||||
pub name: String,
|
||||
pub preferred_username: Option<String>,
|
||||
pub display_name: Option<String>,
|
||||
pub avatar: Option<DbUrl>,
|
||||
pub banned: bool,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
|
|
@ -36,7 +36,7 @@ pub struct Person {
|
|||
pub struct PersonSafe {
|
||||
pub id: PersonId,
|
||||
pub name: String,
|
||||
pub preferred_username: Option<String>,
|
||||
pub display_name: Option<String>,
|
||||
pub avatar: Option<DbUrl>,
|
||||
pub banned: bool,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
|
|
@ -58,7 +58,7 @@ pub struct PersonSafe {
|
|||
pub struct PersonAlias1 {
|
||||
pub id: PersonId,
|
||||
pub name: String,
|
||||
pub preferred_username: Option<String>,
|
||||
pub display_name: Option<String>,
|
||||
pub avatar: Option<DbUrl>,
|
||||
pub banned: bool,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
|
|
@ -83,7 +83,7 @@ pub struct PersonAlias1 {
|
|||
pub struct PersonSafeAlias1 {
|
||||
pub id: PersonId,
|
||||
pub name: String,
|
||||
pub preferred_username: Option<String>,
|
||||
pub display_name: Option<String>,
|
||||
pub avatar: Option<DbUrl>,
|
||||
pub banned: bool,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
|
|
@ -105,7 +105,7 @@ pub struct PersonSafeAlias1 {
|
|||
pub struct PersonAlias2 {
|
||||
pub id: PersonId,
|
||||
pub name: String,
|
||||
pub preferred_username: Option<String>,
|
||||
pub display_name: Option<String>,
|
||||
pub avatar: Option<DbUrl>,
|
||||
pub banned: bool,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
|
|
@ -130,7 +130,7 @@ pub struct PersonAlias2 {
|
|||
pub struct PersonSafeAlias2 {
|
||||
pub id: PersonId,
|
||||
pub name: String,
|
||||
pub preferred_username: Option<String>,
|
||||
pub display_name: Option<String>,
|
||||
pub avatar: Option<DbUrl>,
|
||||
pub banned: bool,
|
||||
pub published: chrono::NaiveDateTime,
|
||||
|
|
@ -151,7 +151,7 @@ pub struct PersonSafeAlias2 {
|
|||
#[table_name = "person"]
|
||||
pub struct PersonForm {
|
||||
pub name: String,
|
||||
pub preferred_username: Option<Option<String>>,
|
||||
pub display_name: Option<Option<String>>,
|
||||
pub avatar: Option<Option<DbUrl>>,
|
||||
pub banned: Option<bool>,
|
||||
pub published: Option<chrono::NaiveDateTime>,
|
||||
|
|
|
|||
|
|
@ -530,7 +530,7 @@ mod tests {
|
|||
creator: PersonSafe {
|
||||
id: inserted_person.id,
|
||||
name: "timmy".into(),
|
||||
preferred_username: None,
|
||||
display_name: None,
|
||||
published: inserted_person.published,
|
||||
avatar: None,
|
||||
actor_id: inserted_person.actor_id.to_owned(),
|
||||
|
|
|
|||
|
|
@ -571,7 +571,7 @@ mod tests {
|
|||
creator: PersonSafe {
|
||||
id: inserted_person.id,
|
||||
name: person_name,
|
||||
preferred_username: None,
|
||||
display_name: None,
|
||||
published: inserted_person.published,
|
||||
avatar: None,
|
||||
actor_id: inserted_person.actor_id.to_owned(),
|
||||
|
|
|
|||
|
|
@ -193,6 +193,7 @@ impl<'a> CommunityQueryBuilder<'a> {
|
|||
match self.sort {
|
||||
SortType::New => query = query.order_by(community::published.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
|
||||
_ => {
|
||||
query = query
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ use crate::{
|
|||
};
|
||||
use anyhow::{anyhow, Context};
|
||||
use deser_hjson::from_str;
|
||||
use log::warn;
|
||||
use merge::Merge;
|
||||
use std::{env, fs, io::Error, net::IpAddr, sync::RwLock};
|
||||
|
||||
|
|
@ -23,16 +22,8 @@ pub mod structs;
|
|||
static CONFIG_FILE: &str = "config/config.hjson";
|
||||
|
||||
lazy_static! {
|
||||
static ref SETTINGS: RwLock<Settings> = RwLock::new(match Settings::init() {
|
||||
Ok(c) => c,
|
||||
Err(e) => {
|
||||
warn!(
|
||||
"Couldn't load settings file, using default settings.\n{}",
|
||||
e
|
||||
);
|
||||
Settings::default()
|
||||
}
|
||||
});
|
||||
static ref SETTINGS: RwLock<Settings> =
|
||||
RwLock::new(Settings::init().expect("Failed to load settings file"));
|
||||
}
|
||||
|
||||
impl Settings {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use crate::utils::{
|
||||
is_valid_community_name,
|
||||
is_valid_display_name,
|
||||
is_valid_post_title,
|
||||
is_valid_preferred_username,
|
||||
is_valid_username,
|
||||
remove_slurs,
|
||||
scrape_text_for_mentions,
|
||||
|
|
@ -29,9 +29,15 @@ fn test_valid_register_username() {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn test_valid_preferred_username() {
|
||||
assert!(is_valid_preferred_username("hello @there"));
|
||||
assert!(!is_valid_preferred_username("@hello there"));
|
||||
fn test_valid_display_name() {
|
||||
assert!(is_valid_display_name("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]
|
||||
|
|
|
|||
|
|
@ -108,10 +108,11 @@ pub fn is_valid_username(name: &str) -> bool {
|
|||
}
|
||||
|
||||
// Can't do a regex here, reverse lookarounds not supported
|
||||
pub fn is_valid_preferred_username(preferred_username: &str) -> bool {
|
||||
!preferred_username.starts_with('@')
|
||||
&& preferred_username.chars().count() >= 3
|
||||
&& preferred_username.chars().count() <= 20
|
||||
pub fn is_valid_display_name(name: &str) -> bool {
|
||||
!name.starts_with('@')
|
||||
&& !name.starts_with('\u{200b}')
|
||||
&& name.chars().count() >= 3
|
||||
&& name.chars().count() <= 20
|
||||
}
|
||||
|
||||
pub fn is_valid_community_name(name: &str) -> bool {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
pub const VERSION: &str = "0.10.0-rc.13";
|
||||
pub const VERSION: &str = "0.10.2";
|
||||
|
|
|
|||
|
|
@ -49,9 +49,6 @@ FROM alpine:3.12 as lemmy
|
|||
# Install libpq for postgres
|
||||
RUN apk add libpq
|
||||
|
||||
# Install Espeak for captchas
|
||||
RUN apk add espeak
|
||||
|
||||
RUN addgroup -g 1000 lemmy
|
||||
RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ services:
|
|||
- iframely
|
||||
|
||||
lemmy-ui:
|
||||
image: dessalines/lemmy-ui:0.10.0-rc.13
|
||||
image: dessalines/lemmy-ui:0.10.2
|
||||
ports:
|
||||
- "1235:1234"
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ RUN --mount=type=cache,target=/app/target \
|
|||
|
||||
FROM ubuntu:20.10
|
||||
|
||||
# Install libpq for postgres and espeak
|
||||
# Install libpq for postgres
|
||||
RUN apt-get update -y
|
||||
RUN apt-get install -y libpq-dev espeak
|
||||
RUN apt-get install -y libpq-dev
|
||||
|
||||
# Copy resources
|
||||
COPY config/defaults.hjson /config/defaults.hjson
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ services:
|
|||
- ./volumes/pictrs_alpha:/mnt
|
||||
|
||||
lemmy-alpha-ui:
|
||||
image: dessalines/lemmy-ui:0.10.0-rc.13
|
||||
image: dessalines/lemmy-ui:0.10.2
|
||||
environment:
|
||||
- LEMMY_INTERNAL_HOST=lemmy-alpha:8541
|
||||
- LEMMY_EXTERNAL_HOST=localhost:8541
|
||||
|
|
@ -58,7 +58,7 @@ services:
|
|||
- ./volumes/postgres_alpha:/var/lib/postgresql/data
|
||||
|
||||
lemmy-beta-ui:
|
||||
image: dessalines/lemmy-ui:0.10.0-rc.13
|
||||
image: dessalines/lemmy-ui:0.10.2
|
||||
environment:
|
||||
- LEMMY_INTERNAL_HOST=lemmy-beta:8551
|
||||
- LEMMY_EXTERNAL_HOST=localhost:8551
|
||||
|
|
@ -87,7 +87,7 @@ services:
|
|||
- ./volumes/postgres_beta:/var/lib/postgresql/data
|
||||
|
||||
lemmy-gamma-ui:
|
||||
image: dessalines/lemmy-ui:0.10.0-rc.13
|
||||
image: dessalines/lemmy-ui:0.10.2
|
||||
environment:
|
||||
- LEMMY_INTERNAL_HOST=lemmy-gamma:8561
|
||||
- LEMMY_EXTERNAL_HOST=localhost:8561
|
||||
|
|
@ -117,7 +117,7 @@ services:
|
|||
|
||||
# An instance with only an allowlist for beta
|
||||
lemmy-delta-ui:
|
||||
image: dessalines/lemmy-ui:0.10.0-rc.13
|
||||
image: dessalines/lemmy-ui:0.10.2
|
||||
environment:
|
||||
- LEMMY_INTERNAL_HOST=lemmy-delta:8571
|
||||
- LEMMY_EXTERNAL_HOST=localhost:8571
|
||||
|
|
@ -147,7 +147,7 @@ services:
|
|||
|
||||
# An instance who has a blocklist, with lemmy-alpha blocked
|
||||
lemmy-epsilon-ui:
|
||||
image: dessalines/lemmy-ui:0.10.0-rc.13
|
||||
image: dessalines/lemmy-ui:0.10.2
|
||||
environment:
|
||||
- LEMMY_INTERNAL_HOST=lemmy-epsilon:8581
|
||||
- LEMMY_EXTERNAL_HOST=localhost:8581
|
||||
|
|
|
|||
|
|
@ -49,9 +49,6 @@ FROM alpine:3.12 as lemmy
|
|||
# Install libpq for postgres
|
||||
RUN apk add libpq
|
||||
|
||||
# Install Espeak for captchas
|
||||
RUN apk add espeak
|
||||
|
||||
RUN addgroup -g 1000 lemmy
|
||||
RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ RUN cp ./target/release/lemmy_server /app/lemmy_server
|
|||
# The Debian runner
|
||||
FROM debian:buster-slim as lemmy
|
||||
|
||||
# Install libpq for postgres and espeak for captchas
|
||||
# Install libpq for postgres
|
||||
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/*
|
||||
|
||||
RUN addgroup --gid 1000 lemmy
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@ git add "crates/utils/src/version.rs"
|
|||
popd
|
||||
|
||||
# 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:.*/dessalines\/lemmy:$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 ../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'
|
||||
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-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../prod/docker-compose.yml
|
||||
git add ../prod/docker-compose.yml
|
||||
|
||||
# Setting the version for Ansible
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ services:
|
|||
restart: always
|
||||
|
||||
lemmy:
|
||||
image: dessalines/lemmy:0.9.9
|
||||
image: dessalines/lemmy:0.10.2
|
||||
ports:
|
||||
- "127.0.0.1:8536:8536"
|
||||
restart: always
|
||||
|
|
@ -26,7 +26,7 @@ services:
|
|||
- iframely
|
||||
|
||||
lemmy-ui:
|
||||
image: dessalines/lemmy-ui:0.9.9
|
||||
image: dessalines/lemmy-ui:0.10.2
|
||||
ports:
|
||||
- "127.0.0.1:1235:1234"
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
alter table local_user drop column show_scores;
|
||||
|
|
@ -0,0 +1 @@
|
|||
alter table local_user add column show_scores boolean default true not null;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -0,0 +1 @@
|
|||
drop index idx_community_aggregates_users_active_month;
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
create index idx_community_aggregates_users_active_month on community_aggregates (users_active_month desc);
|
||||
|
||||
168
readmes/README.es.md
Normal file
168
readmes/README.es.md
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
<div align="center">
|
||||
|
||||
|
||||
[](https://cloud.drone.io/LemmyNet/lemmy/)
|
||||
[](https://github.com/LemmyNet/lemmy/issues)
|
||||
[](https://cloud.docker.com/repository/docker/dessalines/lemmy/)
|
||||
[](http://weblate.yerbamate.ml/engage/lemmy/)
|
||||
[](LICENSE)
|
||||
|
||||
[](https://github.com/humanetech-community/awesome-humane-tech)
|
||||
</div>
|
||||
|
||||
<p align="center">
|
||||
<a href="../README.md">English</a> |
|
||||
<span>Español</span>
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://join.lemmy.ml/" rel="noopener">
|
||||
<img width=200px height=200px src="https://raw.githubusercontent.com/LemmyNet/lemmy-ui/main/src/assets/icons/favicon.svg"></a>
|
||||
|
||||
<h3 align="center"><a href="https://join.lemmy.ml">Lemmy</a></h3>
|
||||
<p align="center">
|
||||
Un agregador de enlaces / alternativa a Menéame - Reddit para el fediverso.
|
||||
<br />
|
||||
<br />
|
||||
<a href="https://join.lemmy.ml">Unirse a Lemmy</a>
|
||||
·
|
||||
<a href="https://join.lemmy.ml/docs/es/index.html">Documentación</a>
|
||||
·
|
||||
<a href="https://github.com/LemmyNet/lemmy/issues">Reportar Errores (bugs)</a>
|
||||
·
|
||||
<a href="https://github.com/LemmyNet/lemmy/issues">Solicitar Características</a>
|
||||
·
|
||||
<a href="https://github.com/LemmyNet/lemmy/blob/main/RELEASES.md">Lanzamientos</a>
|
||||
·
|
||||
<a href="https://join.lemmy.ml/docs/es/code_of_conduct.html">Código de Conducta</a>
|
||||
</p>
|
||||
</p>
|
||||
|
||||
## Sobre El Proyecto
|
||||
|
||||
Escritorio|Móvil
|
||||
---|---
|
||||
|
|
||||
|
||||
[Lemmy](https://github.com/LemmyNet/lemmy) es similar a sitios como [Menéame](https://www.meneame.net/), [Reddit](https://reddit.com), [Lobste.rs](https://lobste.rs), [Raddle](https://raddle.me), o [Hacker News](https://news.ycombinator.com/): te subscribes a los foros que te interesan, publicas enlaces y debates, luego votas y comentas en ellos. Entre bastidores, es muy diferente; cualquiera puede gestionar fácilmente un servidor, y todos estos servidores son federados (piensa en el correo electrónico), y conectados al mismo universo, llamado [Fediverso](https://es.wikipedia.org/wiki/Fediverso).
|
||||
|
||||
Para un agregador de enlaces, esto significa que un usuario registrado en un servidor puede suscribirse a los foros de otro servidor, y puede mantener discusiones con usuarios registrados en otros lugares.
|
||||
|
||||
El objetivo general es crear una alternativa a reddit y otros agregadores de enlaces, fácilmente auto-hospedada, descentralizada, fuera de su control e intromisión corporativa.
|
||||
|
||||
Cada servidor lemmy puede establecer su propia política de moderación; nombrando a los administradores del sitio y a los moderadores de la comunidad para mantener alejados a los trolls, y fomentar un entorno saludable y no tóxico en el que puedan sentirse cómodos contribuyendo.
|
||||
|
||||
*Nota: Las APIs WebSocket y HTTP actualmente son inestables*
|
||||
|
||||
### ¿Por qué se llama Lemmy?
|
||||
|
||||
- Cantante principal de [Motörhead](https://invidio.us/watch?v=pWB5JZRGl0U).
|
||||
- El [videojuego de la vieja escuela](<https://es.wikipedia.org/wiki/Lemmings>).
|
||||
- El [Koopa de Super Mario](https://www.mariowiki.com/Lemmy_Koopa).
|
||||
- Los [roedores peludos](http://sunchild.fpwc.org/lemming-the-little-giant-of-the-north/).
|
||||
|
||||
### Creado Con
|
||||
|
||||
- [Rust](https://www.rust-lang.org)
|
||||
- [Actix](https://actix.rs/)
|
||||
- [Diesel](http://diesel.rs/)
|
||||
- [Inferno](https://infernojs.org)
|
||||
- [Typescript](https://www.typescriptlang.org/)
|
||||
|
||||
# Características
|
||||
|
||||
- Código abierto, [Licencia AGPL](/LICENSE).
|
||||
- Auto-hospedado, fácil de desplegar (deploy).
|
||||
- Viene con [Docker](#docker) y [Ansible](#ansible).
|
||||
- Interfaz limpia y fácil de usar. Apta para dispositivos móviles.
|
||||
- Sólo se requiere como mínimo un nombre de usuario y una contraseñar para inscribirse!
|
||||
- Soporte de avatar de usuario.
|
||||
- Hilos de comentarios actualizados en directo.
|
||||
- Puntuaciones completas de los votos `(+/-)` como en el antiguo reddit.
|
||||
- Temas, incluidos los claros, los oscuros, y los solarizados.
|
||||
- Emojis con soporte de autocompletado. Empieza tecleando `:`
|
||||
- *Ejemplo* `miau :cat:` => `miau 🐈`
|
||||
- Etiquetado de Usuarios con `@`, etiquetado de Comunidades con `!`.
|
||||
- *Ejemplo* `@miguel@lemmy.ml me invitó a la comunidad !gaming@lemmy.ml`
|
||||
- Carga de imágenes integrada tanto en las publicaciones como en los comentarios.
|
||||
- Una publicación puede consistir en un título y cualquier combinación de texto propio, una URL o nada más.
|
||||
- Notificaciones, sobre las respuestas a los comentarios y cuando te etiquetan.
|
||||
- Las notificaciones se pueden enviar por correo electrónico.
|
||||
- Soporte para mensajes privados.
|
||||
- Soporte de i18n / internacionalización.
|
||||
- Fuentes RSS / Atom para Todo `All`, Suscrito `Subscribed`, Bandeja de entrada `inbox`, Usuario `User`, y Comunidad `Community`.
|
||||
- Soporte para la publicación cruzada (cross-posting).
|
||||
- **búsqueda de publicaciones similares** al crear una nueva. Ideal para comunidades de preguntas y respuestas.
|
||||
- Capacidades de moderación.
|
||||
- Registros públicos de moderación.
|
||||
- Puedes pegar las publicaciones a la parte superior de las comunidades.
|
||||
- Tanto los administradores del sitio, como los moderadores de la comunidad, pueden nombrar a otros moderadores.
|
||||
- Puedes bloquear, eliminar y restaurar publicaciones y comentarios.
|
||||
- Puedes banear y desbanear usuarios de las comunidades y del sitio.
|
||||
- Puedes transferir el sitio y las comunidades a otros.
|
||||
- Puedes borrar completamente tus datos, reemplazando todas las publicaciones y comentarios.
|
||||
- Soporte para publicaciones y comunidades NSFW.
|
||||
- Alto rendimiento.
|
||||
- El servidor está escrito en rust.
|
||||
- El front end está comprimido (gzipped) en `~80kB`.
|
||||
- El front end funciona sin javascript (sólo lectura).
|
||||
- Soporta arm64 / Raspberry Pi.
|
||||
|
||||
## Instalación
|
||||
|
||||
- [Docker](https://join.lemmy.ml/docs/es/administration/install_docker.html)
|
||||
- [Ansible](https://join.lemmy.ml/docs/es/administration/install_ansible.html)
|
||||
|
||||
## Proyectos de Lemmy
|
||||
|
||||
### Aplicaciones
|
||||
|
||||
- [lemmy-ui - La aplicación web oficial para lemmy](https://github.com/LemmyNet/lemmy-ui)
|
||||
- [Lemmur - Un cliente móvil para Lemmy (Android, Linux, Windows)](https://github.com/krawieck/lemmur)
|
||||
- [Remmel - Una aplicación IOS nativa](https://github.com/uuttff8/Lemmy-iOS)
|
||||
|
||||
### Librerías
|
||||
|
||||
- [lemmy-js-client](https://github.com/LemmyNet/lemmy-js-client)
|
||||
- [Kotlin API ( en desarrollo )](https://github.com/eiknat/lemmy-client)
|
||||
- [Dart API client ( en desarrollo )](https://github.com/krawieck/lemmy_api_client)
|
||||
|
||||
## Apoyo / Donación
|
||||
|
||||
Lemmy es un software libre y de código abierto, lo que significa que no hay publicidad, monetización o capital de riesgo, nunca. Tus donaciones apoyan directamente el desarrollo a tiempo completo del proyecto.
|
||||
|
||||
- [Apoya en Liberapay](https://liberapay.com/Lemmy).
|
||||
- [Apoya en Patreon](https://www.patreon.com/dessalines).
|
||||
- [Apoya en OpenCollective](https://opencollective.com/lemmy).
|
||||
- [Lista de patrocinadores](https://join.lemmy.ml/sponsors).
|
||||
|
||||
### Crypto
|
||||
|
||||
- bitcoin: `1Hefs7miXS5ff5Ck5xvmjKjXf5242KzRtK`
|
||||
- ethereum: `0x400c96c96acbC6E7B3B43B1dc1BB446540a88A01`
|
||||
- monero: `41taVyY6e1xApqKyMVDRVxJ76sPkfZhALLTjRvVKpaAh2pBd4wv9RgYj1tSPrx8wc6iE1uWUfjtQdTmTy2FGMeChGVKPQuV`
|
||||
|
||||
## Contribuir
|
||||
|
||||
- [Instrucciones para contribuir](https://join.lemmy.ml/docs/es/contributing/contributing.html)
|
||||
- [Desarrollo por Docker](https://join.lemmy.ml/docs/es/contributing/docker_development.html)
|
||||
- [Desarrollo Local](https://join.lemmy.ml/docs/es/contributing/local_development.html)
|
||||
|
||||
### Traducciones
|
||||
|
||||
Si quieres ayudar con la traducción, echa un vistazo a [Weblate](https://weblate.yerbamate.ml/projects/lemmy/). También puedes ayudar [traduciendo la documentación](https://github.com/LemmyNet/lemmy-docs#adding-a-new-language).
|
||||
|
||||
## Contacto
|
||||
|
||||
- [Mastodon](https://mastodon.social/@LemmyDev)
|
||||
- [Matrix](https://matrix.to/#/#lemmy:matrix.org)
|
||||
|
||||
## Repositorios del código
|
||||
|
||||
- [GitHub](https://github.com/LemmyNet/lemmy)
|
||||
- [Gitea](https://yerbamate.ml/LemmyNet/lemmy)
|
||||
- [Codeberg](https://codeberg.org/LemmyNet/lemmy)
|
||||
|
||||
## Creditos
|
||||
|
||||
Logo hecho por Andy Cuccaro (@andycuccaro) bajo la licencia CC-BY-SA 4.0.
|
||||
|
|
@ -5,5 +5,8 @@ psql -U lemmy -d postgres -c "DROP DATABASE lemmy;"
|
|||
psql -U lemmy -d postgres -c "CREATE DATABASE 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 \
|
||||
cargo test --workspace --no-fail-fast
|
||||
|
|
|
|||
Loading…
Reference in a new issue