akkoma
4 years agoCredo fixes.
lain [Mon, 27 Apr 2020 15:55:29 +0000 (17:55 +0200)]
Credo fixes.

4 years agoDocs: Align chat api changes with docs.
lain [Mon, 27 Apr 2020 15:52:16 +0000 (17:52 +0200)]
Docs: Align chat api changes with docs.

4 years agoChat API: Align more to Pleroma/Mastodon API.
lain [Mon, 27 Apr 2020 15:48:34 +0000 (17:48 +0200)]
Chat API: Align more to Pleroma/Mastodon API.

4 years agoChatView: Add actor_account_id
lain [Mon, 27 Apr 2020 14:08:03 +0000 (16:08 +0200)]
ChatView: Add actor_account_id

4 years agoCredo fixes.
lain [Mon, 27 Apr 2020 12:02:11 +0000 (14:02 +0200)]
Credo fixes.

4 years agoDocs: Add chat motivation and api description.
lain [Mon, 27 Apr 2020 11:48:09 +0000 (13:48 +0200)]
Docs: Add chat motivation and api description.

4 years agoChat Schemas: Inline unimportant Schemas.
lain [Mon, 27 Apr 2020 10:45:59 +0000 (12:45 +0200)]
Chat Schemas: Inline unimportant Schemas.

4 years agoChatControllerTest: Use new schema testing functions.
lain [Mon, 27 Apr 2020 10:19:27 +0000 (12:19 +0200)]
ChatControllerTest: Use new schema testing functions.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Mon, 27 Apr 2020 10:07:08 +0000 (12:07 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoMerge branch 'img-src-blob' into 'develop'
rinpatch [Sun, 26 Apr 2020 11:39:17 +0000 (11:39 +0000)]
Merge branch 'img-src-blob' into 'develop'

Let blob: pass CSP

See merge request pleroma/pleroma!2427

4 years agoLet blob: pass CSP
Alex Gleason [Sun, 26 Apr 2020 05:28:57 +0000 (00:28 -0500)]
Let blob: pass CSP

4 years agoMerge branch '1706-dm-timeline-failure-fix' into 'develop'
lain [Sat, 25 Apr 2020 19:24:22 +0000 (19:24 +0000)]
Merge branch '1706-dm-timeline-failure-fix' into 'develop'

[#1706] Prevented error on unresolved activity actors for timeline actions

Closes #1706

See merge request pleroma/pleroma!2425

4 years ago[#1706] Formatting fix.
Ivan Tashkinov [Sat, 25 Apr 2020 15:42:08 +0000 (18:42 +0300)]
[#1706] Formatting fix.

4 years ago[#1706] Prevented error on unresolved activity actors for timeline actions.
Ivan Tashkinov [Sat, 25 Apr 2020 15:24:10 +0000 (18:24 +0300)]
[#1706] Prevented error on unresolved activity actors for timeline actions.

4 years agoMerge branch 'bugfix/announce-race-condition' into 'develop'
rinpatch [Fri, 24 Apr 2020 16:58:24 +0000 (16:58 +0000)]
Merge branch 'bugfix/announce-race-condition' into 'develop'

Announcements: Prevent race condition.

See merge request pleroma/pleroma!2423

4 years agoMerge branch 'reply-filtering-refactor' into 'develop'
lain [Fri, 24 Apr 2020 16:32:13 +0000 (16:32 +0000)]
Merge branch 'reply-filtering-refactor' into 'develop'

Reply filtering refactor

See merge request pleroma/pleroma!2424

4 years agoReply Filtering: Refactor.
lain [Fri, 24 Apr 2020 16:25:26 +0000 (18:25 +0200)]
Reply Filtering: Refactor.

4 years agoMerge branch 'openapi-improvements' into 'develop'
lain [Fri, 24 Apr 2020 16:10:43 +0000 (16:10 +0000)]
Merge branch 'openapi-improvements' into 'develop'

Support validation for inline OpenAPI schema and automatic tests for examples

Closes #1696

See merge request pleroma/pleroma!2421

4 years agoApply suggestion to CHANGELOG.md
lain [Fri, 24 Apr 2020 10:27:51 +0000 (10:27 +0000)]
Apply suggestion to CHANGELOG.md

4 years agoUpdate differences_in_mastoapi_responses.md
lain [Fri, 24 Apr 2020 10:26:54 +0000 (10:26 +0000)]
Update differences_in_mastoapi_responses.md

4 years agobench sync
Alexander Strizhakov [Fri, 24 Apr 2020 06:57:30 +0000 (09:57 +0300)]
bench sync

4 years agoupdating benchmarks
Alexander Strizhakov [Fri, 24 Apr 2020 06:24:08 +0000 (09:24 +0300)]
updating benchmarks

4 years agoformatting
Alexander [Wed, 4 Dec 2019 07:29:26 +0000 (10:29 +0300)]
formatting

4 years agoreply filtering
Alexander [Wed, 4 Dec 2019 06:49:17 +0000 (09:49 +0300)]
reply filtering

4 years agoAnnouncements: Prevent race condition.
lain [Fri, 24 Apr 2020 12:37:53 +0000 (14:37 +0200)]
Announcements: Prevent race condition.

4 years agoMerge branch 'feature/remove-unused-like-code' into 'develop'
lain [Fri, 24 Apr 2020 12:09:15 +0000 (12:09 +0000)]
Merge branch 'feature/remove-unused-like-code' into 'develop'

ActivitPub: Remove `like` function.

See merge request pleroma/pleroma!2422

4 years agoCredo fixes.
lain [Fri, 24 Apr 2020 11:59:48 +0000 (13:59 +0200)]
Credo fixes.

4 years agoActivitPub: Remove `like` function.
lain [Fri, 24 Apr 2020 11:48:13 +0000 (13:48 +0200)]
ActivitPub: Remove `like` function.

We don't need another way to build likes.

4 years agoSupport validation for inline OpenAPI schema and automatic tests for examples
Egor Kislitsyn [Fri, 24 Apr 2020 10:46:59 +0000 (14:46 +0400)]
Support validation for inline OpenAPI schema and automatic tests for examples

4 years agoDocs: Add documentation about chatmessages
lain [Thu, 23 Apr 2020 14:55:00 +0000 (16:55 +0200)]
Docs: Add documentation about chatmessages

4 years agoChatMessage: Correctly ingest emoji tags.
lain [Thu, 23 Apr 2020 14:19:49 +0000 (16:19 +0200)]
ChatMessage: Correctly ingest emoji tags.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Thu, 23 Apr 2020 13:47:08 +0000 (15:47 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoMerge branch 'bugfix/repeating-announce' into 'develop'
rinpatch [Thu, 23 Apr 2020 12:40:38 +0000 (12:40 +0000)]
Merge branch 'bugfix/repeating-announce' into 'develop'

CommonAPI: Don't make repeating announces possible

See merge request pleroma/pleroma!2418

4 years agoCommonAPI: Don't make repeating announces possible
lain [Thu, 23 Apr 2020 11:33:30 +0000 (13:33 +0200)]
CommonAPI: Don't make repeating announces possible

4 years agoMerge branch 'bugfix/null-scheduled-at' into 'develop'
rinpatch [Thu, 23 Apr 2020 11:22:30 +0000 (11:22 +0000)]
Merge branch 'bugfix/null-scheduled-at' into 'develop'

StatusController: Ignore nil scheduled_at parameters.

Closes #1699

See merge request pleroma/pleroma!2412

4 years agoMerge branch 'bugfix/1629-fav-race-condition' into 'develop'
lain [Wed, 22 Apr 2020 19:26:32 +0000 (19:26 +0000)]
Merge branch 'bugfix/1629-fav-race-condition' into 'develop'

SideEffects: Run in transaction.

Closes #1629

See merge request pleroma/pleroma!2417

4 years agoSideEffects: Use less cryptic syntax.
lain [Wed, 22 Apr 2020 19:21:21 +0000 (21:21 +0200)]
SideEffects: Use less cryptic syntax.

4 years agoMerge branch 'bugfix/1670-user-count' into 'develop'
Haelwenn [Wed, 22 Apr 2020 17:37:09 +0000 (17:37 +0000)]
Merge branch 'bugfix/1670-user-count' into 'develop'

Stats: Ignore internal users for user count.

Closes #1670

See merge request pleroma/pleroma!2414

4 years agoStats: Use `invisible` property for filtering.
lain [Wed, 22 Apr 2020 17:02:22 +0000 (19:02 +0200)]
Stats: Use `invisible` property for filtering.

4 years agoSideEffects: Run in transaction.
lain [Wed, 22 Apr 2020 16:40:53 +0000 (18:40 +0200)]
SideEffects: Run in transaction.

This fixes race conditions.

4 years agoMerge branch 'fix/follow-and-blocks-import' into 'develop'
Haelwenn [Wed, 22 Apr 2020 15:46:04 +0000 (15:46 +0000)]
Merge branch 'fix/follow-and-blocks-import' into 'develop'

Fix follower/blocks import when nicknames starts with @

Closes #1698

See merge request pleroma/pleroma!2416

4 years agoMerge branch 'bugfix/following-fix-status-code' into 'develop'
Haelwenn [Wed, 22 Apr 2020 15:33:04 +0000 (15:33 +0000)]
Merge branch 'bugfix/following-fix-status-code' into 'develop'

AccountController: Use code 400 for self-follow.

Closes #1674

See merge request pleroma/pleroma!2413

4 years agoMerge branch 'bugfix/1543-streaming-boosts' into 'develop'
Haelwenn [Wed, 22 Apr 2020 15:31:51 +0000 (15:31 +0000)]
Merge branch 'bugfix/1543-streaming-boosts' into 'develop'

Streamer: Stream boosts to the boosting user.

Closes #1543

See merge request pleroma/pleroma!2415

4 years agoUpdate CHANGELOG
Egor Kislitsyn [Wed, 22 Apr 2020 15:31:03 +0000 (19:31 +0400)]
Update CHANGELOG

4 years agoFix Oban warning
Egor Kislitsyn [Wed, 22 Apr 2020 15:00:08 +0000 (19:00 +0400)]
Fix Oban warning

Warning example:

     [warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received:  [error: "not found @user@server.party", error: "not found "]  The job will be considered a success.

4 years agoFix blocks import
Egor Kislitsyn [Wed, 22 Apr 2020 14:13:13 +0000 (18:13 +0400)]
Fix blocks import

4 years agoFix follow import
Egor Kislitsyn [Tue, 21 Apr 2020 16:05:25 +0000 (20:05 +0400)]
Fix follow import

4 years agoStreamer: Stream boosts to the boosting user.
lain [Wed, 22 Apr 2020 15:21:13 +0000 (17:21 +0200)]
Streamer: Stream boosts to the boosting user.

4 years agoMerge branch 'feature/voters-count' into 'develop'
Haelwenn [Wed, 22 Apr 2020 15:12:19 +0000 (15:12 +0000)]
Merge branch 'feature/voters-count' into 'develop'

Polls: Persist and show voters' count

Closes #1702

See merge request pleroma/pleroma!2411

4 years agoMerge branch 'worker-messages' into 'develop'
Haelwenn [Wed, 22 Apr 2020 15:09:10 +0000 (15:09 +0000)]
Merge branch 'worker-messages' into 'develop'

Worker messages

Closes #1705

See merge request pleroma/pleroma!2410

4 years agoMerge branch 'microformats' into 'develop'
lain [Wed, 22 Apr 2020 14:10:55 +0000 (14:10 +0000)]
Merge branch 'microformats' into 'develop'

static_fe: Add microformats2 classes

See merge request pleroma/pleroma!2215

4 years agostatic_fe: Add microformats2 classes
Karol Kosek [Wed, 22 Apr 2020 14:02:40 +0000 (16:02 +0200)]
static_fe: Add microformats2 classes

4 years agoStats: Ignore internal users for user count.
lain [Wed, 22 Apr 2020 13:31:37 +0000 (15:31 +0200)]
Stats: Ignore internal users for user count.

4 years agoAccountController: Use code 400 for self-follow.
lain [Wed, 22 Apr 2020 13:04:26 +0000 (15:04 +0200)]
AccountController: Use code 400 for self-follow.

4 years agoMerge branch 'fix/1689-fix-migrate-to-db' into 'develop'
lain [Wed, 22 Apr 2020 12:41:31 +0000 (12:41 +0000)]
Merge branch 'fix/1689-fix-migrate-to-db' into 'develop'

Fix migrate to db config

Closes #1689

See merge request pleroma/pleroma!2394

4 years agoStatusController: Ignore nil scheduled_at parameters.
lain [Wed, 22 Apr 2020 12:26:19 +0000 (14:26 +0200)]
StatusController: Ignore nil scheduled_at parameters.

4 years agoMerge branch 'docs/debian-packages' into 'develop'
lain [Wed, 22 Apr 2020 12:10:27 +0000 (12:10 +0000)]
Merge branch 'docs/debian-packages' into 'develop'

debian_based_*.md: Use erlang-nox metapackage

See merge request pleroma/pleroma!2268

4 years agoApply suggestion to docs/installation/debian_based_en.md
lain [Wed, 22 Apr 2020 12:10:20 +0000 (12:10 +0000)]
Apply suggestion to docs/installation/debian_based_en.md

4 years agoPolls: Persist and show voters' count
lain [Wed, 22 Apr 2020 12:06:39 +0000 (14:06 +0200)]
Polls: Persist and show voters' count

4 years agoFederator: Return proper values for jobs
lain [Wed, 22 Apr 2020 11:28:52 +0000 (13:28 +0200)]
Federator: Return proper values for jobs

4 years agoWebPush: Return proper values for jobs.
lain [Wed, 22 Apr 2020 11:28:34 +0000 (13:28 +0200)]
WebPush: Return proper values for jobs.

4 years agoLitepub: Add ChatMessage.
lain [Wed, 22 Apr 2020 10:52:39 +0000 (12:52 +0200)]
Litepub: Add ChatMessage.

4 years agoChatMessageValidator: Validation changes
lain [Wed, 22 Apr 2020 10:48:52 +0000 (12:48 +0200)]
ChatMessageValidator: Validation changes

Don't validate if the recipient is blocking the actor.

4 years agoChatControllerTest: Credo fixes.
lain [Tue, 21 Apr 2020 16:32:30 +0000 (18:32 +0200)]
ChatControllerTest: Credo fixes.

4 years agoChatController: Validate parameters.
lain [Tue, 21 Apr 2020 16:23:00 +0000 (18:23 +0200)]
ChatController: Validate parameters.

4 years agoChats: Add API specs.
lain [Tue, 21 Apr 2020 15:51:06 +0000 (17:51 +0200)]
Chats: Add API specs.

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Tue, 21 Apr 2020 12:24:27 +0000 (14:24 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoMerge branch 'openapi/custom-emojis' into 'develop'
lain [Tue, 21 Apr 2020 10:13:50 +0000 (10:13 +0000)]
Merge branch 'openapi/custom-emojis' into 'develop'

Add OpenAPI spec for CustomEmojiController

See merge request pleroma/pleroma!2375

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Tue, 21 Apr 2020 10:00:33 +0000 (12:00 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoMerge branch 'accept-deletes' into 'develop'
rinpatch [Mon, 20 Apr 2020 18:30:01 +0000 (18:30 +0000)]
Merge branch 'accept-deletes' into 'develop'

Always accept deletions through SimplePolicy, add :reject_deletes group

See merge request pleroma/pleroma!2371

4 years agoMerge branch 'router-cleanup' into 'develop'
rinpatch [Mon, 20 Apr 2020 18:29:03 +0000 (18:29 +0000)]
Merge branch 'router-cleanup' into 'develop'

Cleanup and DRY the Router

See merge request pleroma/pleroma!2406

4 years agoMerge remote-tracking branch 'upstream/develop' into accept-deletes
Alex Gleason [Mon, 20 Apr 2020 15:13:56 +0000 (10:13 -0500)]
Merge remote-tracking branch 'upstream/develop' into accept-deletes

4 years agoAdd :reject_deletes option to SimplePolicy
Alex Gleason [Mon, 13 Apr 2020 18:48:32 +0000 (13:48 -0500)]
Add :reject_deletes option to SimplePolicy

4 years agoMerge branch 'cleanup-subscription-controller' into 'develop'
lain [Mon, 20 Apr 2020 13:01:17 +0000 (13:01 +0000)]
Merge branch 'cleanup-subscription-controller' into 'develop'

Cleanup SubscriptionController

See merge request pleroma/pleroma!2393

4 years agoMerge branch 'fix-object_age_policy' into 'develop'
lain [Mon, 20 Apr 2020 12:59:16 +0000 (12:59 +0000)]
Merge branch 'fix-object_age_policy' into 'develop'

Fix ObjectAgePolicy

See merge request pleroma/pleroma!2404

4 years agoFix ObjectAgePolicyTest
Ilja [Mon, 20 Apr 2020 12:59:16 +0000 (12:59 +0000)]
Fix ObjectAgePolicyTest

The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests

4 years agoMerge branch 'mrf-docs-update' into 'develop'
lain [Mon, 20 Apr 2020 12:57:45 +0000 (12:57 +0000)]
Merge branch 'mrf-docs-update' into 'develop'

Expand MRF SimplePolicy docs

See merge request pleroma/pleroma!2370

4 years agoCleanup and DRY the Router
Egor Kislitsyn [Mon, 20 Apr 2020 12:38:00 +0000 (16:38 +0400)]
Cleanup and DRY the Router

4 years agoChatMessageView: Support emoji.
lain [Mon, 20 Apr 2020 12:38:53 +0000 (14:38 +0200)]
ChatMessageView: Support emoji.

4 years agoChatMessage: Support emoji.
lain [Mon, 20 Apr 2020 12:08:54 +0000 (14:08 +0200)]
ChatMessage: Support emoji.

4 years agoChatMessageValidator: Require `published` field
lain [Mon, 20 Apr 2020 11:14:59 +0000 (13:14 +0200)]
ChatMessageValidator: Require `published` field

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Mon, 20 Apr 2020 10:37:17 +0000 (12:37 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoCredo fixes.
lain [Mon, 20 Apr 2020 10:29:19 +0000 (12:29 +0200)]
Credo fixes.

4 years agoCommonAPI: Obey local limit for chat messages.
lain [Mon, 20 Apr 2020 10:08:47 +0000 (12:08 +0200)]
CommonAPI: Obey local limit for chat messages.

4 years agoChatMessageValidator: Don't validate messages that are too long.
lain [Mon, 20 Apr 2020 09:45:11 +0000 (11:45 +0200)]
ChatMessageValidator: Don't validate messages that are too long.

4 years agoMerge branch '1559-follow-request-notifications' into 'develop'
rinpatch [Sun, 19 Apr 2020 21:45:20 +0000 (21:45 +0000)]
Merge branch '1559-follow-request-notifications' into 'develop'

[#1559] Support for "follow_request" notifications

Closes #1559

See merge request pleroma/pleroma!2354

4 years agoMerge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'
rinpatch [Sun, 19 Apr 2020 21:44:25 +0000 (21:44 +0000)]
Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop'

mix.exs: Do not bail out when .git doesn’t exists

See merge request pleroma/pleroma!2405

4 years agomix.exs: Do not bail out when .git doesn’t exists
Haelwenn (lanodan) Monnier [Sun, 19 Apr 2020 18:23:48 +0000 (20:23 +0200)]
mix.exs: Do not bail out when .git doesn’t exists

4 years agoMerge branch 'bugfix/1697-user_emoji_miration' into 'develop'
Haelwenn [Sat, 18 Apr 2020 06:59:23 +0000 (06:59 +0000)]
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'

migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403

4 years agoApply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
Haelwenn [Fri, 17 Apr 2020 22:48:40 +0000 (22:48 +0000)]
Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs

4 years agoApply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
Haelwenn [Fri, 17 Apr 2020 22:48:37 +0000 (22:48 +0000)]
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex

4 years agomigrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Haelwenn (lanodan) Monnier [Fri, 17 Apr 2020 21:55:56 +0000 (23:55 +0200)]
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

4 years agoMerge branch '1682-basic-auth-permissions-fix' into 'develop'
rinpatch [Fri, 17 Apr 2020 20:47:43 +0000 (20:47 +0000)]
Merge branch '1682-basic-auth-permissions-fix' into 'develop'

[#1682] Fixed Basic Auth permissions issue

Closes #1682

See merge request pleroma/pleroma!2401

4 years agoMerge branch 'update/pleroma-fe-20200417' into 'develop'
Haelwenn [Fri, 17 Apr 2020 19:21:34 +0000 (19:21 +0000)]
Merge branch 'update/pleroma-fe-20200417' into 'develop'

pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4

See merge request pleroma/pleroma!2402

4 years agopleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4
Mark Felder [Fri, 17 Apr 2020 18:22:25 +0000 (13:22 -0500)]
pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4

4 years ago[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when...
Ivan Tashkinov [Fri, 17 Apr 2020 18:21:10 +0000 (21:21 +0300)]
[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.

4 years agoNotifications: Create a chat notification.
lain [Fri, 17 Apr 2020 14:55:01 +0000 (16:55 +0200)]
Notifications: Create a chat notification.

4 years agoMerge branch 'sideeffects-test' into 'develop'
rinpatch [Fri, 17 Apr 2020 14:03:04 +0000 (14:03 +0000)]
Merge branch 'sideeffects-test' into 'develop'

SideEffects: Test for notification creation.

See merge request pleroma/pleroma!2399

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lain [Fri, 17 Apr 2020 13:51:24 +0000 (15:51 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

4 years agoSideEffects: Test for notification creation.
lain [Fri, 17 Apr 2020 13:50:15 +0000 (15:50 +0200)]
SideEffects: Test for notification creation.