mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-02 06:31:23 +00:00
Merge branch 'main' into use_unwrap_or_false_for_reports
This commit is contained in:
Dessalines
commit
250a9fbcce
12
README.md
12
README.md
|
|
@ -7,7 +7,7 @@
|
|||
[](http://weblate.join-lemmy.org/engage/lemmy/)
|
||||
[](LICENSE)
|
||||
|
||||
[](https://github.com/humanetech-community/awesome-humane-tech)
|
||||
[](https://codeberg.org/teaserbot-labs/delightful-humane-design)
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent
|
|||
- [Support on Liberapay](https://liberapay.com/Lemmy).
|
||||
- [Support on Patreon](https://www.patreon.com/dessalines).
|
||||
- [Support on OpenCollective](https://opencollective.com/lemmy).
|
||||
- [List of Sponsors](https://join-lemmy.org/sponsors).
|
||||
- [List of Sponsors](https://join-lemmy.org/donate).
|
||||
|
||||
### Crypto
|
||||
|
||||
|
|
@ -150,13 +150,13 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent
|
|||
|
||||
## Contributing
|
||||
|
||||
- [Contributing instructions](https://join-lemmy.org/docs/en/contributing/contributing.html)
|
||||
- [Docker Development](https://join-lemmy.org/docs/en/contributing/docker_development.html)
|
||||
- [Local Development](https://join-lemmy.org/docs/en/contributing/local_development.html)
|
||||
- [Contributing instructions](https://join-lemmy.org/docs/en/contributors/01-overview.html)
|
||||
- [Docker Development](https://join-lemmy.org/docs/en/contributors/03-docker-development.html)
|
||||
- [Local Development](https://join-lemmy.org/docs/en/contributors/02-local-development.html)
|
||||
|
||||
### Translations
|
||||
|
||||
If you want to help with translating, take a look at [Weblate](https://weblate.join-lemmy.org/projects/lemmy/). You can also help by [translating the documentation](https://github.com/LemmyNet/lemmy-docs#adding-a-new-language).
|
||||
- If you want to help with translating, take a look at [Weblate](https://weblate.join-lemmy.org/projects/lemmy/). You can also help by [translating the documentation](https://github.com/LemmyNet/lemmy-docs#adding-a-new-language).
|
||||
|
||||
## Contact
|
||||
|
||||
|
|
|
|||
|
|
@ -144,9 +144,13 @@ impl Object for ApubPerson {
|
|||
) -> Result<ApubPerson, LemmyError> {
|
||||
let instance_id = fetch_instance_actor_for_object(&person.id, context).await?;
|
||||
|
||||
// Some Mastodon users have `name: ""` (empty string), need to convert that to `None`
|
||||
// https://github.com/mastodon/mastodon/issues/25233
|
||||
let display_name = person.name.filter(|n| !n.is_empty());
|
||||
|
||||
let person_form = PersonInsertForm {
|
||||
name: person.preferred_username,
|
||||
display_name: person.name,
|
||||
display_name,
|
||||
banned: None,
|
||||
ban_expires: None,
|
||||
deleted: Some(false),
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ services:
|
|||
- lemmyexternalproxy
|
||||
ports:
|
||||
# actual and only port facing any connection from outside
|
||||
- "1236:1236"
|
||||
- "8536:8536"
|
||||
# Note, change the left number if port 80 is already in use on your system (or you want to run a reverse proxy outside this config)
|
||||
- "80:80"
|
||||
volumes:
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf:ro,Z
|
||||
restart: always
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
[](http://weblate.yerbamate.ml/engage/lemmy/)
|
||||
[](LICENSE)
|
||||
|
||||
[](https://github.com/humanetech-community/awesome-humane-tech)
|
||||
[](https://codeberg.org/teaserbot-labs/delightful-humane-design)
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
[](http://weblate.yerbamate.ml/engage/lemmy/)
|
||||
[](LICENSE)
|
||||
|
||||
[](https://github.com/humanetech-community/awesome-humane-tech)
|
||||
[](https://codeberg.org/teaserbot-labs/delightful-humane-design)
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
[](http://weblate.yerbamate.ml/engage/lemmy/)
|
||||
[](LICENSE)
|
||||
|
||||
[](https://github.com/humanetech-community/awesome-humane-tech)
|
||||
[](https://codeberg.org/teaserbot-labs/delightful-humane-design)
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
[](http://weblate.yerbamate.ml/engage/lemmy/)
|
||||
[](LICENSE)
|
||||
|
||||
[](https://github.com/humanetech-community/awesome-humane-tech)
|
||||
[](https://codeberg.org/teaserbot-labs/delightful-humane-design)
|
||||
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue