]> Untitled Git - lemmy.git/log
lemmy.git
3 years agoSplit api crate into api_structs and api
Felix Ableitner [Thu, 25 Mar 2021 19:19:40 +0000 (20:19 +0100)]
Split api crate into api_structs and api

3 years agoFixing image locations.
Dessalines [Wed, 24 Mar 2021 16:42:34 +0000 (12:42 -0400)]
Fixing image locations.

3 years agoMerge remote-tracking branch 'yerba/federated-moderation'
Dessalines [Wed, 24 Mar 2021 15:48:02 +0000 (11:48 -0400)]
Merge remote-tracking branch 'yerba/federated-moderation'

3 years agoFix federation tests
Felix Ableitner [Tue, 23 Mar 2021 16:03:14 +0000 (17:03 +0100)]
Fix federation tests

3 years agoMerge pull request #1517 from LemmyNet/add_saved_only_1
Dessalines [Mon, 22 Mar 2021 17:52:04 +0000 (13:52 -0400)]
Merge pull request #1517 from LemmyNet/add_saved_only_1

Adding saved_only to GetComments and GetPosts. Fixes #1513

3 years agoAdding saved_only to GetComments and GetPosts. Fixes #1513
Dessalines [Mon, 22 Mar 2021 14:39:54 +0000 (10:39 -0400)]
Adding saved_only to GetComments and GetPosts. Fixes #1513

3 years agoMake federation compatible with Lemmy v0.9.9
Felix Ableitner [Mon, 22 Mar 2021 14:08:06 +0000 (15:08 +0100)]
Make federation compatible with Lemmy v0.9.9

3 years agoAddress review comments
Felix Ableitner [Mon, 22 Mar 2021 12:52:00 +0000 (13:52 +0100)]
Address review comments

3 years agoMerge branch 'grishka_fix_ld_context'
Felix Ableitner [Mon, 22 Mar 2021 12:12:05 +0000 (13:12 +0100)]
Merge branch 'grishka_fix_ld_context'

3 years agoMake previous commit compile
Felix Ableitner [Mon, 22 Mar 2021 12:11:32 +0000 (13:11 +0100)]
Make previous commit compile

3 years agoMerge branch 'fix_ld_context' of https://yerbamate.ml/grishka/lemmy into grishka_fix_...
Felix Ableitner [Mon, 22 Mar 2021 12:08:07 +0000 (13:08 +0100)]
Merge branch 'fix_ld_context' of https://yerbamate.ml/grishka/lemmy into grishka_fix_ld_context

3 years agoMerge pull request #1509 from LemmyNet/fix_deploy_prod_script
Nutomic [Mon, 22 Mar 2021 12:02:41 +0000 (12:02 +0000)]
Merge pull request #1509 from LemmyNet/fix_deploy_prod_script

Fixing docker deploy script. Fixes #1507

3 years agouh
Grishka [Sun, 21 Mar 2021 01:03:53 +0000 (04:03 +0300)]
uh

3 years agoFix JSON-LD contexts
Grishka [Sun, 21 Mar 2021 01:00:32 +0000 (04:00 +0300)]
Fix JSON-LD contexts

3 years agoFixing docker deploy script. Fixes #1507
Dessalines [Sat, 20 Mar 2021 18:49:07 +0000 (14:49 -0400)]
Fixing docker deploy script. Fixes #1507

3 years agoReverting docker versions until deploy.sh fix.
Dessalines [Sat, 20 Mar 2021 15:55:11 +0000 (11:55 -0400)]
Reverting docker versions until deploy.sh fix.

3 years agoFix conflicts in docker-compose.yml
Felix Ableitner [Fri, 19 Mar 2021 17:09:05 +0000 (18:09 +0100)]
Fix conflicts in docker-compose.yml

3 years agoMerge branch 'main' into federated-moderation
Felix Ableitner [Fri, 19 Mar 2021 16:11:34 +0000 (17:11 +0100)]
Merge branch 'main' into federated-moderation

3 years agoVersion 0.10.0-rc.7
Dessalines [Fri, 19 Mar 2021 15:46:46 +0000 (11:46 -0400)]
Version 0.10.0-rc.7

3 years agoMerge pull request #1500 from LemmyNet/jwt_revocation_dess
Nutomic [Fri, 19 Mar 2021 15:43:47 +0000 (15:43 +0000)]
Merge pull request #1500 from LemmyNet/jwt_revocation_dess

Jwt revocation dess

3 years agoA few suggestion fixes.
Dessalines [Fri, 19 Mar 2021 14:02:58 +0000 (10:02 -0400)]
A few suggestion fixes.

3 years agoMerge pull request #1499 from LemmyNet/strictly_type_db_ids
Nutomic [Fri, 19 Mar 2021 13:41:22 +0000 (13:41 +0000)]
Merge pull request #1499 from LemmyNet/strictly_type_db_ids

Strictly type db ids

3 years agoMerge pull request #1428 from LemmyNet/split_user_table
Nutomic [Fri, 19 Mar 2021 13:20:23 +0000 (13:20 +0000)]
Merge pull request #1428 from LemmyNet/split_user_table

Split user table

3 years agoMerge branch 'Mart-Bogdan-1462-jwt-revocation-on-pwd-change' into jwt_revocation_dess
Dessalines [Fri, 19 Mar 2021 04:31:49 +0000 (00:31 -0400)]
Merge branch 'Mart-Bogdan-1462-jwt-revocation-on-pwd-change' into jwt_revocation_dess

3 years agoMerge branch '1462-jwt-revocation-on-pwd-change' of https://github.com/Mart-Bogdan...
Dessalines [Fri, 19 Mar 2021 01:41:00 +0000 (21:41 -0400)]
Merge branch '1462-jwt-revocation-on-pwd-change' of https://github.com/Mart-Bogdan/lemmy into Mart-Bogdan-1462-jwt-revocation-on-pwd-change

3 years agoMerge branch 'split_user_table' into strictly_type_db_ids
Dessalines [Thu, 18 Mar 2021 23:37:54 +0000 (19:37 -0400)]
Merge branch 'split_user_table' into strictly_type_db_ids

3 years agoMerge branch 'main' into split_user_table
Dessalines [Thu, 18 Mar 2021 23:36:48 +0000 (19:36 -0400)]
Merge branch 'main' into split_user_table

3 years agoSet CARGO_HOME for CI so deps arent redownloaded (#1497)
Nutomic [Thu, 18 Mar 2021 20:35:04 +0000 (20:35 +0000)]
Set CARGO_HOME for CI so deps arent redownloaded (#1497)

* Set CARGO_HOME for CI so deps arent redownloaded

* run find on x86

* fix path

* cleanup

* try again

* use mv

3 years agoMerge branch 'split_user_table' into strictly_type_db_ids
Dessalines [Thu, 18 Mar 2021 20:30:42 +0000 (16:30 -0400)]
Merge branch 'split_user_table' into strictly_type_db_ids

3 years agoMerge branch 'main' into split_user_table
Dessalines [Thu, 18 Mar 2021 20:30:29 +0000 (16:30 -0400)]
Merge branch 'main' into split_user_table

3 years agoStrictly typing DB id fields. Fixes #1498
Dessalines [Thu, 18 Mar 2021 20:25:21 +0000 (16:25 -0400)]
Strictly typing DB id fields. Fixes #1498

3 years agoFix three federation test cases
Felix Ableitner [Thu, 18 Mar 2021 13:24:29 +0000 (14:24 +0100)]
Fix three federation test cases

3 years agoAdding some comments to notifs.
Dessalines [Thu, 18 Mar 2021 14:59:17 +0000 (10:59 -0400)]
Adding some comments to notifs.

3 years agoMoving send email check inside function.
Dessalines [Thu, 18 Mar 2021 14:52:25 +0000 (10:52 -0400)]
Moving send email check inside function.

3 years agoRefactor activitypub code
Felix Ableitner [Wed, 17 Mar 2021 17:12:37 +0000 (18:12 +0100)]
Refactor activitypub code

3 years agoFor FromApub trait, use `is_mod_action: bool` instead
Felix Ableitner [Tue, 16 Mar 2021 17:26:19 +0000 (18:26 +0100)]
For FromApub trait, use `is_mod_action: bool` instead

3 years agoAllow remot moderators to do Remove/Post and Remove/Comment
Felix Ableitner [Tue, 16 Mar 2021 17:06:59 +0000 (18:06 +0100)]
Allow remot moderators to do Remove/Post and Remove/Comment

3 years agoMerge pull request 'Insert announced activities into DB for fetching (fixes #1494...
dessalines [Tue, 16 Mar 2021 13:47:32 +0000 (13:47 +0000)]
Merge pull request 'Insert announced activities into DB for fetching (fixes #1494)' (#187) from insert-local-announce into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/187

3 years agoRemoving some TODOS.
Dessalines [Mon, 15 Mar 2021 22:18:50 +0000 (18:18 -0400)]
Removing some TODOS.

3 years agoVersion 0.10.0-rc.5
Dessalines [Mon, 15 Mar 2021 18:50:50 +0000 (14:50 -0400)]
Version 0.10.0-rc.5

3 years agoSome changes
Dessalines [Mon, 15 Mar 2021 18:02:27 +0000 (14:02 -0400)]
Some changes

- Changing claim name to local_user_id to facilitate logout.
- Changing AddAdmin back to using person_id

3 years agoInsert announced activities into DB for fetching (fixes #1494)
Felix Ableitner [Mon, 15 Mar 2021 12:58:54 +0000 (13:58 +0100)]
Insert announced activities into DB for fetching (fixes #1494)

3 years agoMerge pull request #1491 from LemmyNet/upgrade_pictrs_3
Nutomic [Mon, 15 Mar 2021 12:14:31 +0000 (12:14 +0000)]
Merge pull request #1491 from LemmyNet/upgrade_pictrs_3

Upgrading pictrs.

3 years agomore correct tests
Bogdan Mart [Sat, 13 Mar 2021 20:36:40 +0000 (22:36 +0200)]
more correct tests

3 years agofix timestamp condition #1462
Bogdan Mart [Sat, 13 Mar 2021 20:18:26 +0000 (22:18 +0200)]
fix timestamp condition #1462

3 years agoMerge remote-tracking branch 'origin/main' into 1462-jwt-revocation-on-pwd-change
Bogdan Mart [Sat, 13 Mar 2021 18:19:55 +0000 (20:19 +0200)]
Merge remote-tracking branch 'origin/main' into 1462-jwt-revocation-on-pwd-change

* origin/main:
  revert Compose file version from 3.3 to 2.2
  Adding more mem limits
  bump memory limit of iframely
  Remove extra category_id s . Fixes #1429
  Fixing wrong user_ and community icon and banner urls.
  Remove category from activitypub context
  Adding a password length check to other API actions. (#1474)
  Update test script
  Use URL type in most outstanding struct fields (#1468)
  Forbid usage of unwrap
  Upgrade Rust version
  Rewrite settings implementation. Fixes #1270 (#1433)
  Rename `lemmy_structs` to `lemmy_api_structs`

# Conflicts:
# crates/db_schema/src/source/user.rs

3 years agoUser token revocation upon password change
Bogdan Mart [Sat, 13 Mar 2021 18:16:35 +0000 (20:16 +0200)]
User token revocation upon password change

Added DB column validator_time and chedking that is is less then token's "Issuead at time"
Wip on #1462

3 years agoOnly sending private message if its a local user.
Dessalines [Fri, 12 Mar 2021 20:18:03 +0000 (15:18 -0500)]
Only sending private message if its a local user.

3 years agoTrying to fix API tests.
Dessalines [Fri, 12 Mar 2021 19:09:03 +0000 (14:09 -0500)]
Trying to fix API tests.

3 years agoChange joinuser, sendusermessage to use local_user_id
Dessalines [Fri, 12 Mar 2021 15:54:47 +0000 (10:54 -0500)]
Change joinuser, sendusermessage to use local_user_id

3 years agoFix code to allow sticky/lock from remote moderators
Felix Ableitner [Fri, 12 Mar 2021 15:43:01 +0000 (16:43 +0100)]
Fix code to allow sticky/lock from remote moderators

3 years agoMerge pull request 'Add memory limit for pictrs' (#186) from nutomic-patch-1 into...
dessalines [Fri, 12 Mar 2021 15:16:49 +0000 (15:16 +0000)]
Merge pull request 'Add memory limit for pictrs' (#186) from nutomic-patch-1 into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/186

3 years agoUpgrading pictrs.
Dessalines [Fri, 12 Mar 2021 15:13:20 +0000 (10:13 -0500)]
Upgrading pictrs.

3 years agoWIP: check that modifications are made by same user, add docs
Felix Ableitner [Fri, 12 Mar 2021 13:47:55 +0000 (14:47 +0100)]
WIP: check that modifications are made by same user, add docs

3 years ago2nd pass. JWT now uses local_user_id
Dessalines [Thu, 11 Mar 2021 22:47:44 +0000 (17:47 -0500)]
2nd pass. JWT now uses local_user_id

3 years agoFix clippy warning
Felix Ableitner [Thu, 11 Mar 2021 17:18:01 +0000 (18:18 +0100)]
Fix clippy warning

3 years agoAdd check so only mods can change stickied/locked state of posts
Felix Ableitner [Thu, 11 Mar 2021 17:11:59 +0000 (18:11 +0100)]
Add check so only mods can change stickied/locked state of posts

3 years agofixing tests 3
Dessalines [Thu, 11 Mar 2021 17:08:30 +0000 (12:08 -0500)]
fixing tests 3

3 years agoFixing some tests 2
Dessalines [Thu, 11 Mar 2021 16:54:03 +0000 (11:54 -0500)]
Fixing some tests 2

3 years agoAdd check so only author or mods can edit posts/comments
Felix Ableitner [Thu, 11 Mar 2021 16:50:47 +0000 (17:50 +0100)]
Add check so only author or mods can edit posts/comments

3 years agoFixing some tests
Dessalines [Thu, 11 Mar 2021 16:41:04 +0000 (11:41 -0500)]
Fixing some tests

3 years agoAllow for remote mods to remove posts/comments
Felix Ableitner [Thu, 11 Mar 2021 16:21:45 +0000 (17:21 +0100)]
Allow for remote mods to remove posts/comments

3 years agoA first pass.
Dessalines [Thu, 11 Mar 2021 04:43:11 +0000 (23:43 -0500)]
A first pass.

3 years ago~80% done
Dessalines [Wed, 10 Mar 2021 22:33:55 +0000 (17:33 -0500)]
~80% done

3 years agoAdd memory limit for pictrs
nutomic [Wed, 10 Mar 2021 18:38:00 +0000 (18:38 +0000)]
Add memory limit for pictrs

3 years agoAllow adding remote users as community mods (ref #1061)
Felix Ableitner [Tue, 9 Mar 2021 17:13:08 +0000 (18:13 +0100)]
Allow adding remote users as community mods (ref #1061)

3 years agoUpdate activitystreams to 0.7.0-alpha.11
Felix Ableitner [Tue, 9 Mar 2021 13:18:24 +0000 (14:18 +0100)]
Update activitystreams to 0.7.0-alpha.11

3 years agoImplemented receiving activities to add/remove remote mods
Felix Ableitner [Mon, 8 Mar 2021 16:34:54 +0000 (17:34 +0100)]
Implemented receiving activities to add/remove remote mods

3 years agoMove moderators collection to separate HTTP endpoint
Felix Ableitner [Mon, 8 Mar 2021 13:40:28 +0000 (14:40 +0100)]
Move moderators collection to separate HTTP endpoint

3 years agoUse collection for moderators, instead of `attributedTo` (ref #1061)
Felix Ableitner [Fri, 5 Mar 2021 13:45:30 +0000 (14:45 +0100)]
Use collection for moderators, instead of `attributedTo` (ref #1061)

3 years agoMerge pull request #1485 from PatMulligan/fix-docker-compose-yaml
Nutomic [Mon, 8 Mar 2021 15:41:17 +0000 (15:41 +0000)]
Merge pull request #1485 from PatMulligan/fix-docker-compose-yaml

revert Compose file version from 3.3 to 2.2

3 years agorevert Compose file version from 3.3 to 2.2
Patrick Mulligan [Mon, 8 Mar 2021 15:23:50 +0000 (09:23 -0600)]
revert Compose file version from 3.3 to 2.2

3 years agoAdding more mem limits
Dessalines [Fri, 5 Mar 2021 03:41:08 +0000 (22:41 -0500)]
Adding more mem limits

3 years agobump memory limit of iframely
Avery Pierce [Thu, 4 Mar 2021 14:58:03 +0000 (08:58 -0600)]
bump memory limit of iframely

3 years agoMerge pull request #1478 from LemmyNet/fix_wrong_urls
Nutomic [Thu, 4 Mar 2021 12:18:30 +0000 (12:18 +0000)]
Merge pull request #1478 from LemmyNet/fix_wrong_urls

Fixing wrong user_ and community icon and banner urls.

3 years agoMerge pull request #1479 from LemmyNet/fix_extra_categories
Nutomic [Thu, 4 Mar 2021 12:14:25 +0000 (12:14 +0000)]
Merge pull request #1479 from LemmyNet/fix_extra_categories

Remove extra category_id s . Fixes #1429

3 years agoRemove extra category_id s . Fixes #1429
Dessalines [Thu, 4 Mar 2021 04:44:07 +0000 (23:44 -0500)]
Remove extra category_id s . Fixes #1429

3 years agoFixing wrong user_ and community icon and banner urls.
Dessalines [Thu, 4 Mar 2021 04:40:00 +0000 (23:40 -0500)]
Fixing wrong user_ and community icon and banner urls.

- Fixes #1477

3 years agoMerge branch 'main' of https://github.com/lemmynet/lemmy
Dessalines [Tue, 2 Mar 2021 16:52:46 +0000 (11:52 -0500)]
Merge branch 'main' of https://github.com/lemmynet/lemmy

3 years agoMerge pull request 'Forbid usage of unwrap' (#179) from clippy-unwrap into main
dessalines [Tue, 2 Mar 2021 16:49:19 +0000 (16:49 +0000)]
Merge pull request 'Forbid usage of unwrap' (#179) from clippy-unwrap into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/179

3 years agoMerge pull request 'Remove category from activitypub context' (#183) from context...
dessalines [Tue, 2 Mar 2021 16:48:24 +0000 (16:48 +0000)]
Merge pull request 'Remove category from activitypub context' (#183) from context-remove-category into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/183

3 years agoMerge pull request 'Update test script' (#182) from update-test-script into main
dessalines [Tue, 2 Mar 2021 16:47:58 +0000 (16:47 +0000)]
Merge pull request 'Update test script' (#182) from update-test-script into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/182

3 years agoRemove category from activitypub context
Felix Ableitner [Tue, 2 Mar 2021 16:12:45 +0000 (17:12 +0100)]
Remove category from activitypub context

3 years agoAdding a password length check to other API actions. (#1474)
Dessalines [Tue, 2 Mar 2021 15:36:10 +0000 (10:36 -0500)]
Adding a password length check to other API actions. (#1474)

* Adding a password length check to other API actions.

- Fixes #1473

* Fixing comment.

3 years agoUpdate test script
Felix Ableitner [Tue, 2 Mar 2021 12:57:06 +0000 (13:57 +0100)]
Update test script

3 years agoUse URL type in most outstanding struct fields (#1468)
Andrew Yoon [Tue, 2 Mar 2021 12:41:48 +0000 (07:41 -0500)]
Use URL type in most outstanding struct fields (#1468)

* Use URL type in most outstanding struct fields

This fixes all known remaining cases where url fields are stored as
plain strings, with the exception of form fields where empty strings
are used as sentinels (see `diesel_option_overwrite_to_url`).

Tested for regressions in the federated docker setup attempting to
exercise all changed fields, including through apub federation.

Fixes #1385

* Add migration to fix blank-string post.url values to be null

This also then fixes #602

* Address review feedback

- Fixed some unwraps and err message formatting
- Bumped the `url` library to 2.2.1 to fix a bug with serde error
  messages
- Add unit tests for the two diesel option override functions
- Fix migration teardown by adding a no-op

* Rename lemmy_db_queries::Url to lemmy_db_queries::DbUrl

* fix compile error

* box PostOrComment variants

3 years agoForbid usage of unwrap
Felix Ableitner [Mon, 1 Mar 2021 12:56:07 +0000 (13:56 +0100)]
Forbid usage of unwrap

3 years agoMerge pull request 'Upgrade Rust version' (#181) from upgrade-rust into main
dessalines [Mon, 1 Mar 2021 18:02:39 +0000 (18:02 +0000)]
Merge pull request 'Upgrade Rust version' (#181) from upgrade-rust into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/181

3 years agoUpgrade Rust version
Felix Ableitner [Mon, 1 Mar 2021 17:46:56 +0000 (18:46 +0100)]
Upgrade Rust version

3 years agoRewrite settings implementation. Fixes #1270 (#1433)
Dessalines [Mon, 1 Mar 2021 17:24:11 +0000 (12:24 -0500)]
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.

3 years agoMerge pull request 'Rename `lemmy_structs` to `lemmy_api_structs`' (#180) from rename...
dessalines [Mon, 1 Mar 2021 15:50:45 +0000 (15:50 +0000)]
Merge pull request 'Rename `lemmy_structs` to `lemmy_api_structs`' (#180) from rename-structs into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/180

3 years agoRename `lemmy_structs` to `lemmy_api_structs`
Felix Ableitner [Mon, 1 Mar 2021 13:08:41 +0000 (14:08 +0100)]
Rename `lemmy_structs` to `lemmy_api_structs`

3 years agoMerge pull request #1465 from arjenpdevries/patch-2
Dessalines [Sat, 27 Feb 2021 23:08:58 +0000 (18:08 -0500)]
Merge pull request #1465 from arjenpdevries/patch-2

Update README.md

3 years agoUpdate README.md
Arjen P. de Vries [Sat, 27 Feb 2021 19:26:30 +0000 (20:26 +0100)]
Update README.md

Federation is probably more complete than suggested here.

In response to:
https://github.com/LemmyNet/lemmy/issues/647#issuecomment-787068478

3 years agoStill continuing on....
Dessalines [Fri, 26 Feb 2021 13:49:58 +0000 (08:49 -0500)]
Still continuing on....

3 years agoMerge pull request 'Remove federation backward compatibility code (ref #1220)' (...
dessalines [Fri, 26 Feb 2021 13:23:46 +0000 (13:23 +0000)]
Merge pull request 'Remove federation backward compatibility code (ref #1220)' (#164) from remove-backwards-compatibility into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/164

3 years agoMerge pull request 'Remove code for apub compatibility with Lemmy v0.8.9 and older...
dessalines [Fri, 26 Feb 2021 13:23:07 +0000 (13:23 +0000)]
Merge pull request 'Remove code for apub compatibility with Lemmy v0.8.9 and older' (#178) from remove-apub-compat-code into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/178

3 years agoRemove federation backward compatibility code (ref #1220)
Felix Ableitner [Fri, 5 Feb 2021 13:43:18 +0000 (14:43 +0100)]
Remove federation backward compatibility code (ref #1220)

3 years agoRemove code for apub compatibility with Lemmy v0.8.9 and older
Felix Ableitner [Fri, 26 Feb 2021 13:03:49 +0000 (14:03 +0100)]
Remove code for apub compatibility with Lemmy v0.8.9 and older

3 years agoMerge pull request #1455 from ajyoon/fix-flaky-db-tests
Nutomic [Thu, 25 Feb 2021 22:54:40 +0000 (22:54 +0000)]
Merge pull request #1455 from ajyoon/fix-flaky-db-tests

Support plain `cargo test` and disable unused doctests for speed