gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,643 Commits
1,009 Branches
538 Tags
45 MiB
Commit Graph

692 Commits (248dec6564c4fb86b3aad6cdca524a2f27567000)

Author SHA1 Message Date
Dessalines bccb4f068d Version 0.15.0 2022-01-12 08:46:35 -05:00
Marty a860e22b85
uses compatable images - fixes GLIBC_2.29 not found issue on (at least) arm machines (#2028) 2022-01-10 10:48:55 -05:00
Riley 41b90bb162
Add console-subscriber (#2003) 
* Add console-subscriber

* Add larg event buffer capacity

* Add console port to lemmy prod container

* Expose pict-rs console port

* Update pictrs
 2022-01-07 09:53:45 -05:00
Riley 3032a2745b
Opentelemetry (#1992) 
* Add otlp export

* Add jaeger to dev docker

* More instrument

* Update deps

* Merge from main.

* Add comment about viewing traces

* Fixing reqwest-tracing dep.

* Update pre-commit regex

* Move imports to top

Co-authored-by: Dessalines <tyhou13@gmx.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
 2022-01-06 19:10:20 +00:00
Dessalines 1880d64235
Upgrading pictrs. (#1996) 2021-12-14 13:24:33 +00:00
Marty 8ce0c6d618
added deps - git and ca-certificates (for federation to work) and changed adduser to useradd so that user can be added non-interactively (#1976) 2021-12-06 01:35:50 +01:00
Dessalines 97b8b9c255 Version 0.14.3 2021-11-23 14:39:55 -05:00
Dessalines 7f01d8cde6 Version 0.14.2 2021-11-23 11:48:49 -05:00
Dessalines a56853be05
Merge pull request #1907 from not-layla/main 
Implement rate limits on comments
 2021-11-18 11:22:38 -05:00
layla 7fe7062c47 Implement rate limits on comments 2021-11-18 13:40:16 +00:00
Dessalines 66ba91de8c Fixing arm dockerfile. 2021-11-17 16:46:05 -05:00
Dessalines f4616789a7 Version 0.14.1 2021-11-17 16:25:50 -05:00
Dessalines 8b45ca0da2 Fixing prod deploy not adding other docker-compose.yml files. 2021-11-17 12:05:02 -05:00
Dessalines c29366328e Version 0.14.0 2021-11-17 11:28:16 -05:00
Felix Ableitner 135fd6864b Add docker setup for testing Pleroma federation 2021-11-11 14:26:46 +01:00
Dessalines 5b3be5c102 Updating rust musl images 2021-11-09 17:16:59 -05:00
Dessalines 44b5fe0631
Stop using lemmy-ui:dev images (#1880) 
* Stop using lemmy-ui:dev images

* Dont publish dev docker images with drone.
 2021-11-05 21:49:15 +00:00
Felix Ableitner 0bde2d595e Add tests for parsing activities and collections 2021-11-02 12:44:51 +01:00
Dessalines b18ea3e0cc
Renaming to slur_filter. Fixes #1773 (#1801) 
* Renaming to slur_filter. Fixes #1773

* Fixing config

* Updating doku for slur filter.

* Updating doku for slur filter again.

* Remove comment.
 2021-10-28 20:47:25 +00:00
Dessalines 90a5febd38
Remove ansible from this repo. (#1829) 
* Remove ansible from this repo.

* Adding a git push.
 2021-10-27 12:09:00 -04:00
Felix Ableitner f24999027e Merge crates db_schema and db_queries 2021-10-20 12:28:08 +02:00
Nutomic b96ce81f89
Move code to apub library (#1795) 
* Remove dependency of apub_lib on LemmyContext

* Move ApubObject trait to library

* Reorganize files in apub lib

* Move ActorType, signatures, activity_queue to apub library
 2021-10-06 16:20:05 -04:00
Dessalines a99ba2de24 Version 0.13.0 2021-09-29 16:16:46 -04:00
Felix Ableitner cf214ff583 Move jwt secret from config to database (fixes #1728) 2021-09-27 11:25:09 +02:00
Dessalines 0fbc342fe3 Fix tests 2021-09-19 17:20:47 -04:00
Nutomic e84e1193fc
Dont pass accept-encoding header to pictrs (ref #1734) (#1738) 
* Allow image upload in docker/dev/ (replaces #1765)

* Dont pass accept-encoding header to pictrs (ref #1734)

* Fix clippy errors
 2021-09-17 11:44:20 -04:00
Dessalines a9a65a0f4f Try fixing arm build 2021-09-05 13:56:41 -04:00
Dessalines df997dff49 Version 0.12.0 2021-09-03 09:23:50 -04:00
Dessalines c654aa3416
Use more generic docker deps. Fixes #1759 (#1762) 
* Use more generic docker deps. Fixes #1759

* Don't use slim
 2021-09-02 11:50:20 +00:00
Dessalines 46b223e3c5
Fixing docker-compose prod (#1741) 2021-08-31 14:01:36 +00:00
Dessalines af225a42d0
Fix prod deploy script and clippy (#1724) 
* Updating lemmy-js-client.

* Fix prod deploy script and clippy

* Try using buster.

* Using more generic and updated images.

* again.

* again.

* Try alternate env

* again.

* again.

* Version 0.11.4-rc.24

* again.

* Better old_tag

* Version 0.11.4-rc.27

* Updating cargo.lock

* Trying to run a cargo check to update the lock

* Version 0.11.4-rc.28
 2021-08-25 17:26:10 -04:00
Dessalines 1ee0c0c291
Adding more site setup vars. Fixes #678 (#1718) 2021-08-23 09:44:10 +00:00
Dessalines 6af75492a9
Swap out iframely (#1706) 
* Replace Iframely. Fixes #1681

* Add post_link_tags to nginx

* Adding post_link_tags route

* Cleaning up post_link_tags

* Changing PostLink to SiteMetadata, adding it to the API.

* Fixing issue when local has no openssl certs.

* Fixing an issue with pictrs errors

* Revert "Fixing issue when local has no openssl certs."

This reverts commit dbf7d1b1ee03846e5ef7b7156e618424f1150e1d.

* Add ca-certs to dockerfile for volume mount.

* Cleaning up fetch_pictrs request

* Changing to fetch_site_data
 2021-08-19 14:12:49 +00:00
Dessalines 1f64db6a33 Upgrading deps 2021-08-17 16:31:16 -04:00
Felix Ableitner a44b5c9c36 publish to crates.io with normal release script 2021-08-09 18:44:18 +02:00
Dessalines 15a11c13a2 Updating ansible version. 2021-07-30 16:55:04 -04:00
Felix Ableitner c1db86925f Merge apub, apub_receive crates (fixes #1621) 2021-07-17 18:20:44 +02:00
Nutomic c7de1fcf24
Apub inbox rewrite (#1652) 
* start to implement apub inbox routing lib

* got something that almost works

* it compiles!

* implemented some more

* move library code to separate crate (most of it)

* convert private message handlers

* convert all comment receivers (except undo comment)

* convert post receiver

* add verify trait

* convert community receivers

* add cc field for all activities which i forgot before

* convert inbox functions, add missing checks

* convert undo like/dislike receivers

* convert undo_delete and undo_remove receivers

* move block/unblock activities

* convert remaining activity receivers

* reimplement http signature verification and other checks

* also use actor type for routing, VerifyActivity and SendActivity traits

* cleanup and restructure apub_receive code

* wip: try to fix activity routing

* implement a (very bad) derive macro for activityhandler

* working activity routing!

* rework pm verify(), fix tests and confirm manually

also remove inbox username check which was broken

* rework following verify(), fix tests and test manually

* fix post/comment create/update, rework voting

* Rewrite remove/delete post/comment, fix tests, test manually

* Rework and fix (un)block user, announce, update post

* some code cleanup

* rework delete/remove activity receivers (still quite messy)

* rewrite, test and fix add/remove mod, update community handlers

* add docs for ActivityHandler derive macro

* dont try to compile macro comments
 2021-07-17 12:08:46 -04:00
Dessalines 3022c00a0b Version 0.11.2 2021-06-14 18:14:29 -04:00
Dessalines 12d50e42b4
Change join.lemmy.ml to join-lemmy.org (#1628) 2021-06-07 21:10:47 +00:00
Dessalines 7fb4508fa1
Upgrade pictrs. Fixes #1599 (#1600) 2021-05-28 15:51:09 +00:00
Dessalines 100a56e8ef Version 0.11.1 2021-05-17 19:15:51 -04:00
Dessalines f67b0e9ff8
Updating to rust 1.51.0 (#1598) 2021-05-03 14:46:12 +00:00
Dessalines 6eed6cf362 Fixing release doc. 2021-05-02 21:19:16 -04:00
Dessalines c1cbcdc253 Version 0.11.0 2021-04-27 10:35:54 -04:00
Felix Ableitner 78eee7dc9e Improved logging 2021-04-21 14:45:10 +02:00
Felix Ableitner b7d1d91309 For untagged commits, include hash in version name (fixes #1563) 2021-04-12 13:47:58 +02:00
Nutomic b8a6592369
Drone release main (ref #1556) (#1557) 
* publish docker images from main

* try with separate step

* redo, lots of boilerplate

* try to fix syntax

* unique step names

* fix docker tags, remove cargo-chef

* only build dev image on main branch

* use `ref` for condition, as `branch` uses the target branch for PRs

* consistent indents

* fix tag

* use lemmy-ui:dev image for `docker/dev` and `docker/federation`
 2021-04-08 10:33:58 -04:00
Dessalines 831ab76152 Version 0.10.3 2021-04-07 14:23:09 -04:00
Dessalines 727fa610d4
Merge pull request #1552 from LemmyNet/feature/1550-optional-config-values 
Make some of the database config values optional (fixes #1550)
 2021-04-07 13:16:28 -04:00
Felix Ableitner ccdf117c8f Make some of the database config values optional (fixes #1550) 2021-04-06 14:57:37 +02:00
Nutomic 98216d8a3b
Merge pull request #1535 from LemmyNet/rust_captcha_features 
Rust captcha features
 2021-04-06 11:58:48 +00:00
Dessalines 89b96511bf Version 0.10.2 2021-04-05 13:21:08 -04:00
Nutomic 74a63804dc
Fix test failure due to config loading error (#1547) 
* Crash if config fails to load

* fix previous commit

* Fix test failure due to config loading error

* Adding test fix to drone.

* Logging line.

* Trying to fix drone 2

* Fixing deploy script.

Co-authored-by: Dessalines <tyhou13@gmx.com>
 2021-04-05 13:21:56 -04:00
Dessalines 458767e3a8 Version 0.10.1 2021-04-05 10:29:14 -04:00
Dessalines ba517249e8 Version 0.10.0 2021-04-05 08:53:28 -04:00
Dessalines 1ba570092e Adding more rust captcha features. Fixes #1248 2021-04-01 13:30:24 -04:00
Dessalines 36a79e18cd Version 0.10.0-rc.13 2021-03-29 18:10:04 -04:00
Dessalines c2f8695c9a Version 0.10.0-rc.12 2021-03-25 15:22:07 -04:00
Dessalines 3ca2453fc6 Merge branch 'main' into move_matrix_and_admin_to_person 2021-03-24 11:51:34 -04:00
Dessalines 8a10a9079f Merge remote-tracking branch 'yerba/federated-moderation' 2021-03-24 11:48:02 -04:00
Dessalines 7051207495 Version 0.10.0-rc.10 2021-03-23 14:46:18 -04:00
Dessalines 8543092b9f Merge branch 'remove_cargo_cache_v2' into move_matrix_and_admin_to_person 2021-03-23 14:46:00 -04:00
Dessalines 6758922a63 Version 0.10.0-rc.9 2021-03-23 14:17:44 -04:00
Dessalines 77f8dc9675 Fixing docker deploy script. Fixes #1507 2021-03-20 14:49:07 -04:00
Dessalines 4b92e35edc Reverting docker versions until deploy.sh fix. 2021-03-20 11:55:11 -04:00
Dessalines e9eca35816 Version 0.10.0-rc.8 2021-03-19 15:58:24 -04:00
Felix Ableitner 05b07b8cbb Fix conflicts in docker-compose.yml 2021-03-19 18:09:05 +01:00
Felix Ableitner 4f54108a9c Merge branch 'main' into federated-moderation 2021-03-19 17:11:34 +01:00
Dessalines f55ef1d7ef Version 0.10.0-rc.7 2021-03-19 11:46:46 -04:00
Dessalines 8d9fab0389 Merge branch 'main' into split_user_table 2021-03-18 16:30:29 -04:00
Dessalines b9f483bc27 Version 0.10.0-rc.5 2021-03-15 14:50:50 -04:00
Dessalines 0a7271a185 Upgrading pictrs. 2021-03-12 10:13:20 -05:00
Felix Ableitner 803aad3b3e Add check so only author or mods can edit posts/comments 2021-03-11 17:50:47 +01:00
Felix Ableitner beb8b9fe69 Use collection for moderators, instead of `attributedTo` (ref #1061) 2021-03-09 18:14:15 +01:00
Dessalines ff2c71a74a Adding more mem limits 2021-03-04 22:41:08 -05:00
Avery Pierce 126c6a23bb bump memory limit of iframely 2021-03-04 08:58:03 -06:00
Dessalines 817b4ff08e Fixing wrong user_ and community icon and banner urls. 
- Fixes #1477
 2021-03-03 23:40:00 -05:00
Felix Ableitner 66946117e1 Upgrade Rust version 2021-03-01 18:46:56 +01:00
Dessalines 462c4a2954
Rewrite settings implementation. Fixes #1270 (#1433) 
* A first attempt at using deser-hjson. Fixes #1270

* Trying to fix tests, try 1

* Trying to fix tests, try 2

* A few fixes to deser_hjson

- Removing unwrap_or_defaults, using impl functions.
- Reorganized settings

* Make clippy happy

* hjson list strings must be quoted.

* Adding support for env vars.

* Moving to structs and defaults file.

* Moving settings default and struct.
 2021-03-01 17:24:11 +00:00
Dessalines 723ec65ac6 Use more recent version of cargo chef. 2021-02-24 17:10:28 -05:00
Dessalines c81435c994 Version 0.9.9 2021-02-19 13:10:04 -05:00
Dessalines bcc8dae16b Fixing deploy version. 2021-02-19 13:05:42 -05:00
Dessalines a806493bc2 Version 0.9.8 2021-02-19 11:38:24 -05:00
Dessalines a920bf768e Closing open lemmy-ui prod port. Fixes #1430 2021-02-17 11:26:03 -05:00
Dessalines 5656db3e3d Version 0.9.7 2021-02-08 15:17:56 -05:00
Dessalines f198f281cf Version 0.9.6 2021-02-05 13:01:29 -05:00
Dessalines d5d99fa3b9
Moving docs to join.lemmy.ml . Fixes #1396 (#1410) 
* Moving docs to join.lemmy.ml . Fixes #1396

* Removing submodule fetch from drone.
 2021-02-05 12:30:49 +00:00
Dessalines 8a7e50381f Version 0.9.5 2021-02-04 22:48:21 -05:00
Dessalines 9415bec557 Version 0.9.4 2021-02-02 15:29:38 -05:00
Dessalines 3a05817b41 Version 0.9.3 2021-01-29 14:25:20 -05:00
Dessalines 2322534648 Version 0.9.2 2021-01-29 13:49:43 -05:00
Dessalines e6a16f08a3 Version 0.9.1 2021-01-29 11:43:16 -05:00
Dessalines 1addbe361a Version 0.9.0 2021-01-24 22:43:52 -05:00
Dessalines 97617d699d
Docker manifest arm amd64 deploy (#1367) 
* A first try at docker manifest. 1.

* Fixing api version location

* Version 0.9.0-rc.13

* Test docker.

* Test docker 2.

* Test docker 3.

* Test docker 4.

* Test docker 5.

* Test docker 6.

* Test docker 7.

* Test docker 8.

* Test docker 9.

* Test docker 10.

* Test docker 11.

* Test docker 12.

* Version 0.9.0-rc.14

* Test docker 13.

* Test docker 14.

* Version 0.9.0-rc.15

* Test docker 15.

* Version 0.9.0-rc.16

* Test docker 16.

* Version 0.9.0-rc.17
 2021-01-24 22:44:35 -05:00
Dessalines 856802ef35 Version 0.9.0-rc.12 2021-01-19 09:37:26 -05:00
Dessalines 25dd1a21e2
Try arm fix (#1356) 
* Trying to fix arm build.

* Version 0.9.0-rc.8

* Trying to fix arm build 2.

* Version 0.9.0-rc.9

* Checking time when removing lto.

* Version 0.9.0-rc.10

* Adding back in arm tests.

* Version 0.9.0-rc.11
 2021-01-18 13:04:32 +00:00
Dessalines 6f2954dffd Version 0.9.0-rc.7 2021-01-15 13:32:10 -05:00
Dessalines 8cfee9ca7d Trying to fix arm build. 2021-01-15 13:31:10 -05:00
Dessalines b124a29e05 Version 0.9.0-rc.6 2021-01-15 12:44:34 -05:00
Dessalines fe4b516bd9 Adding back in federation docker-compose lemmy-ui writing 2021-01-15 12:38:44 -05:00
Dessalines edf0fd4381 Merge branch 'move_views_to_diesel' into remove_travis_and_federation_docker 2021-01-15 11:28:21 -06:00
Felix Ableitner f06b71d961 Add drone CI for arm 2021-01-15 15:24:48 +01:00
Dessalines 15c5e5c502 Merge branch 'move_views_to_diesel' into remove_travis_and_federation_docker 2021-01-13 14:20:21 -05:00
Dessalines 116d908002 Restoring docker-compose and nginx in federation folder. 2021-01-13 14:18:26 -05:00
Dessalines cd19a72c41 Version 0.9.0-rc.4 2021-01-13 12:05:56 -05:00
Dessalines eafdf3033f Version v0.9.0-rc.2 2021-01-12 19:29:48 -05:00
Dessalines a1e5d0fd00 Version v0.9.0-rc.1 2021-01-12 18:59:07 -05:00
Dessalines d4e800175f Merge branch 'move_views_to_diesel' into remove_travis_and_federation_docker 2021-01-12 11:56:24 -05:00
Dessalines 39001af9a0 Merge remote-tracking branch 'yerba/move_views_to_diesel' into move_views_to_diesel 2021-01-12 11:12:54 -05:00
Dessalines c6357f3c86
Deletion on fetch (#1345) 
* Delete local object on fetch when receiving HTTP 410, split fetcher (fixes #1256)

* Removing submodules

* Trying to re-init submodule

* Trying to re-init submodule 2

* Trying to re-init submodule 3

* Logging line.

* Removing submodules

* Adding again.

* Adding again 2.

* Adding again 3.

* Adding again 4.

* Adding again 5.

* Adding again 6.

* Adding again 7.

* Adding again 8.

* Adding again 9.

* Add more clippy lints, remove dbg!() statement

* Adding again 10.

* Adding again 11.

* Adding again 12.

Co-authored-by: Felix Ableitner <me@nutomic.com>
 2021-01-12 11:12:41 -05:00
Dessalines 3d4cc32525 Adding back start-local-instances. 2021-01-12 10:42:34 -05:00
Dessalines 7db754e94c Revert "Revert "Removing docker/federation and docker/travis folders."" 
This reverts commit e483b6b51f.
 2021-01-12 10:40:38 -05:00
Dessalines e483b6b51f Revert "Removing docker/federation and docker/travis folders." 
This reverts commit 689f5c1306.
 2021-01-12 10:39:15 -05:00
Dessalines 689f5c1306 Removing docker/federation and docker/travis folders. 2021-01-11 20:41:10 -05:00
Felix Ableitner fec77d583f Include fix for mdbook xss vulnerability 2021-01-09 17:54:31 +01:00
Dessalines 86dfe456fd Merge branch 'main' into move_views_to_diesel 2021-01-06 00:30:29 -05:00
Nutomic 50e7275c3b
Move docs into submodule (fixes #1342) (#1343) 2021-01-06 00:27:58 -05:00
Dessalines 1e0c32f7a3 Merge branch 'main' into move_views_to_diesel 2021-01-05 23:55:02 -05:00
Dessalines d767dd998e Merge branch 'drone-io-dess' into move_views_to_diesel_drone 2020-12-20 21:48:29 -05:00
Felix Ableitner 4bf0ec94c8 Create empty inbox collections for actors (ref #1322) 2020-12-17 14:22:51 +01:00
Dessalines 4f5e51beb5 Removing fast tables and old views. 2020-12-16 22:42:25 -05:00
Felix Ableitner db0a51de2a Handle long activitystreams header in nginx config (ref #1322) 2020-12-16 18:24:14 +01:00
Nutomic c947539301
Add docs for creating custom lemmy frontend (#1319) 2020-12-16 09:03:21 -05:00
Felix Ableitner f33577b317 send activities sync for tests 2020-12-14 17:44:27 +01:00
Dessalines eed7eac10b Version v0.8.10 2020-12-03 08:28:58 -06:00
Dessalines b587e147b0 Version v0.8.9 2020-12-01 12:54:44 -06:00
Dessalines 2e9164584b Version v0.8.8 2020-11-30 12:56:05 -06:00
Dessalines 5e10cf69b7 Merge remote-tracking branch 'yerba/main' into main 2020-11-27 15:58:22 -05:00
Dessalines 01a14e3b3c
Change references of dev.lemmy.ml to lemmy.ml (#1281) 
* Change references of dev.lemmy.ml to lemmy.ml

* Remove the dev.lemmy.ml refs in RELEASES.md
 2020-11-26 11:47:01 -05:00
Felix Ableitner a7b72ed5c4 Set valid context for our extra fields (ref #1220) 2020-11-25 18:44:49 +01:00
Dessalines d26a7ad337
Trying out cargo chef and a travis docker image cache. (#1238) 
* Trying out cargo chef and a travis docker image cache.

* trying to change internal target.

* Use latest cargo-chef with --target

* Remove caching for now.

* Adding back in chowns

* Adding back in cache.

* Remove travis caching.

* Switching dev dockerfile to match prod, using cargo-chef and alpine.

* Make travis happy

* Trying a chown rust.

* Caching cargo-chef first.

* Moving the chowns

* Removing many copy commands.

* Go back to rust 1.47.0 due to config-rs breaking.

* Adding the old volume mount version.

* Adding some script comments.

Co-authored-by: Luca Palmieri <lpalmieri@truelayer.com>
 2020-11-23 10:59:06 -05:00
Dessalines bffc82f752 Version v0.8.7 2020-11-18 16:18:53 -06:00
Dessalines e2693a4192 Version v0.8.6 2020-11-18 13:12:24 -06:00
Dessalines b8dc3c11c1 Version v0.8.5 2020-11-17 15:11:58 -06:00
Dessalines 0dcff2e647 Version v0.8.4 2020-11-12 11:54:31 -06:00
Dessalines 64ac4e382a Version v0.8.3 2020-11-11 07:57:33 -06:00
Dessalines 7e13970a4f Version v0.8.2 2020-11-06 07:06:50 -06:00
nutomic b7d2dac9bf Fix federation of community removal/deletion, added docs (#125) 
Adding a federation test for community deletes / removes.

Add missing docs for community deletion/removal (fixes #1250)

Fix federation of community deletion/removal (fixes #1253)

Co-authored-by: Dessalines <tyhou13@gmx.com>
Co-authored-by: Felix Ableitner <me@nutomic.com>
Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/125
 2020-11-05 20:19:06 +00:00
Dessalines 5e2a5c0266
Upgrading pictrs to v0.2.5 (#1249) 2020-11-02 18:12:21 +00:00
Dessalines 77b17c6737 Fixing cache dev dockerfile 2020-10-27 10:57:40 -05:00
Felix Ableitner 91d073c2e8 Use docker cache for docker/dev/ 2020-10-27 13:58:52 +01:00
Dessalines 2e922d602d Trying a target fix. 2020-10-26 17:32:50 -05:00
Dessalines 3100e8bf21 Trying a target fix. 2020-10-26 15:50:37 -05:00
Dessalines b42b461418 Trying a permissions fix. 2020-10-26 13:35:19 -05:00
Dessalines ba0680f5e6 Simplifying prod build, using musl stable. 2020-10-26 12:18:47 -05:00
Dessalines 134d66924e Version v0.8.1 2020-10-24 15:15:48 -05:00
Dessalines 295c209c67 Updating lemmy.hjson config. 2020-10-24 15:14:58 -05:00
Iron Oxidizer ac79496036 Removed docker root prefix, add pictrs dir 2020-10-23 13:14:30 -04:00
Dessalines dd99e77881
Upgrade pictrs to v0.2.4-r0 (#1212) 2020-10-20 10:44:55 +00:00