akkoma
3 years agoMerge branch 'chores/bump-copyright' into 'develop'
Haelwenn [Wed, 13 Jan 2021 06:55:12 +0000 (06:55 +0000)]
Merge branch 'chores/bump-copyright' into 'develop'

Bump Copyright to 2021

See merge request pleroma/pleroma!3252

3 years agoCOPYING: Bump copyright to 2021
Haelwenn (lanodan) Monnier [Wed, 13 Jan 2021 06:53:44 +0000 (07:53 +0100)]
COPYING: Bump copyright to 2021

3 years agoBump Copyright to 2021
Haelwenn (lanodan) Monnier [Wed, 13 Jan 2021 06:49:20 +0000 (07:49 +0100)]
Bump Copyright to 2021

grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'

3 years agoMerge branch 'fix/backup-url-on-s3' into 'develop'
feld [Tue, 12 Jan 2021 20:54:30 +0000 (20:54 +0000)]
Merge branch 'fix/backup-url-on-s3' into 'develop'

Standardize base url for uploads

See merge request pleroma/pleroma!3246

3 years agoMerge branch 'chat-message-pagination' into 'develop'
rinpatch [Tue, 12 Jan 2021 19:30:44 +0000 (19:30 +0000)]
Merge branch 'chat-message-pagination' into 'develop'

ChatMessages: Fix pagination headers.

See merge request pleroma/pleroma!3250

3 years agoPagination: Don't be dos'd by random parameters.
lain [Tue, 12 Jan 2021 11:59:50 +0000 (12:59 +0100)]
Pagination: Don't be dos'd by random parameters.

3 years agoSimplify. We will always have a result from Upload.base_url/0, so just add it to...
Mark Felder [Mon, 11 Jan 2021 20:19:14 +0000 (14:19 -0600)]
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list

3 years agoFix regression in MediaProxy.local?/0 and appending the Upload.base_url to whiteliste...
Mark Felder [Mon, 11 Jan 2021 20:01:31 +0000 (14:01 -0600)]
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains

3 years agoChatMessages: Fix pagination headers.
lain [Mon, 11 Jan 2021 14:30:40 +0000 (15:30 +0100)]
ChatMessages: Fix pagination headers.

They used to contain the path parameter `id` as query param,
which would break the link.

3 years agoFormatting
Mark Felder [Sun, 10 Jan 2021 15:03:42 +0000 (09:03 -0600)]
Formatting

3 years agoMerge branch 'feat/format-optional-migrations' into 'develop'
rinpatch [Sun, 10 Jan 2021 08:40:13 +0000 (08:40 +0000)]
Merge branch 'feat/format-optional-migrations' into 'develop'

.formatter.exs: Format optional migrations

See merge request pleroma/pleroma!3249

3 years ago.formatter.exs: Format optional migrations
rinpatch [Sun, 10 Jan 2021 08:28:41 +0000 (11:28 +0300)]
.formatter.exs: Format optional migrations

(There are no changes to optional migrations since they were manually
formatted in https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3207)

3 years agoMerge branch 'add_some_information_about_setting_up_a_development_environment' into...
rinpatch [Sun, 10 Jan 2021 08:25:36 +0000 (08:25 +0000)]
Merge branch 'add_some_information_about_setting_up_a_development_environment' into 'develop'

Add some information about setting up a development environment

Closes #1904

See merge request pleroma/pleroma!3207

3 years agoAdd development section
Ilja [Sun, 10 Jan 2021 08:25:36 +0000 (08:25 +0000)]
Add development section

* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
  * index.md
  * authentication_authorization.md
  * mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md

3 years agoApply 4 suggestion(s) to 2 file(s)
feld [Sun, 10 Jan 2021 01:34:54 +0000 (01:34 +0000)]
Apply 4 suggestion(s) to 2 file(s)

3 years agoMove construction of S3 base URL with optional namespace and bucket to Upload.base_url/0
Mark Felder [Fri, 8 Jan 2021 23:24:19 +0000 (17:24 -0600)]
Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0

Now we should have a correct base URL for S3 hosted objects throughout the codebase.

3 years agoMore places we should be using Upload.base_url
Mark Felder [Fri, 8 Jan 2021 23:05:55 +0000 (17:05 -0600)]
More places we should be using Upload.base_url

3 years agoAvoid duplicate Config calls
Mark Felder [Fri, 8 Jan 2021 22:43:19 +0000 (16:43 -0600)]
Avoid duplicate Config calls

3 years agoApply Upload.base_url for S3
Mark Felder [Fri, 8 Jan 2021 16:49:12 +0000 (10:49 -0600)]
Apply Upload.base_url for S3

3 years agoFix URL generated for backup files, try to create a source of truth we can reuse...
Mark Felder [Fri, 8 Jan 2021 00:34:30 +0000 (18:34 -0600)]
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase

3 years agoMerge branch 'guppe-example' into 'develop'
lain [Fri, 8 Jan 2021 15:55:48 +0000 (15:55 +0000)]
Merge branch 'guppe-example' into 'develop'

ActivtityPub Test: Add example for guppe actor

See merge request pleroma/pleroma!3243

3 years agoMerge branch 'confirm-users' into 'develop'
lain [Fri, 8 Jan 2021 15:36:42 +0000 (15:36 +0000)]
Merge branch 'confirm-users' into 'develop'

Automatically confirm logged-in users

See merge request pleroma/pleroma!3234

3 years agoMerge remote-tracking branch 'upstream/develop' into confirm-users
Alex Gleason [Fri, 8 Jan 2021 13:48:19 +0000 (07:48 -0600)]
Merge remote-tracking branch 'upstream/develop' into confirm-users

3 years agoRemove ConfirmUserPlug
Alex Gleason [Fri, 8 Jan 2021 13:47:55 +0000 (07:47 -0600)]
Remove ConfirmUserPlug

3 years agoMerge branch 'fix/missing_emoji_steal_dir' into 'develop'
lain [Fri, 8 Jan 2021 13:10:49 +0000 (13:10 +0000)]
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'

Create dir for EmojiStealPolicy automatically

See merge request pleroma/pleroma!3218

3 years agoMerge branch 'backup-ids' into 'develop'
lain [Thu, 7 Jan 2021 19:16:58 +0000 (19:16 +0000)]
Merge branch 'backup-ids' into 'develop'

Backups: render ID in API

See merge request pleroma/pleroma!3245

3 years agoBackups: render ID in API
Alex Gleason [Thu, 7 Jan 2021 19:06:22 +0000 (13:06 -0600)]
Backups: render ID in API

3 years agoMerge branch 'cleanup/unused-proxy-opts' into 'develop'
lain [Thu, 7 Jan 2021 16:25:39 +0000 (16:25 +0000)]
Merge branch 'cleanup/unused-proxy-opts' into 'develop'

Cleanup Pleroma.Upload proxy opts

See merge request pleroma/pleroma!3236

3 years agoActivtityPub Test: Add example for guppe actor
lain [Thu, 7 Jan 2021 15:20:30 +0000 (16:20 +0100)]
ActivtityPub Test: Add example for guppe actor

3 years agoMerge branch 'object-normalize-refactor' into 'develop'
lain [Thu, 7 Jan 2021 11:09:18 +0000 (11:09 +0000)]
Merge branch 'object-normalize-refactor' into 'develop'

Object: Rework how Object.normalize works

See merge request pleroma/pleroma!3229

3 years agoMerge branch 'adminapi-user-email' into 'develop'
lain [Thu, 7 Jan 2021 10:08:02 +0000 (10:08 +0000)]
Merge branch 'adminapi-user-email' into 'develop'

AdminAPI: return user email

See merge request pleroma/pleroma!3240

3 years agoMerge branch 'upstream/remote-emoji-support' into 'develop'
lain [Thu, 7 Jan 2021 10:06:39 +0000 (10:06 +0000)]
Merge branch 'upstream/remote-emoji-support' into 'develop'

Upstream external emoji support

See merge request pleroma/pleroma!3238

3 years agoCall ConfirmUserPlug from Router, not Endpoint
Alex Gleason [Wed, 6 Jan 2021 21:15:47 +0000 (15:15 -0600)]
Call ConfirmUserPlug from Router, not Endpoint

3 years agoAdd AdminAPI.AccountViewTest
Alex Gleason [Wed, 6 Jan 2021 17:43:07 +0000 (11:43 -0600)]
Add AdminAPI.AccountViewTest

3 years agoAdminAPI: return user email
Alex Gleason [Wed, 6 Jan 2021 17:30:32 +0000 (11:30 -0600)]
AdminAPI: return user email

3 years agoallow external emoji
Roger Braun [Wed, 6 Feb 2019 17:05:34 +0000 (18:05 +0100)]
allow external emoji

3 years agoMerge branch 'fix/mediaproxy-config-descriptions' into 'develop'
feld [Tue, 5 Jan 2021 21:16:33 +0000 (21:16 +0000)]
Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'

Fix proxy and mediaproxy description.exs

See merge request pleroma/pleroma!3219

3 years agoRemove configurability of upload proxy opts, simplify
Mark Felder [Tue, 5 Jan 2021 21:06:00 +0000 (15:06 -0600)]
Remove configurability of upload proxy opts, simplify

3 years agoMerge branch 'fix/emoji-encoding' into 'develop'
lain [Tue, 5 Jan 2021 20:09:29 +0000 (20:09 +0000)]
Merge branch 'fix/emoji-encoding' into 'develop'

URI.encode custom emojis

Closes #2381

See merge request pleroma/pleroma!3235

3 years agoAdd test to validate URLs to custom emojis are properly encoded
Mark Felder [Tue, 5 Jan 2021 19:58:49 +0000 (13:58 -0600)]
Add test to validate URLs to custom emojis are properly encoded

3 years agoAdd dinosaur gif from https://gifs.cc
Mark Felder [Tue, 5 Jan 2021 19:25:14 +0000 (13:25 -0600)]
Add dinosaur gif from https://gifs.cc

"Our animations are free to be used to enhance your website."

3 years agoURI.encode custom emojis
Mark Felder [Tue, 5 Jan 2021 18:25:30 +0000 (12:25 -0600)]
URI.encode custom emojis

3 years agoMerge branch 'fix/pagination-regression' into 'develop'
lain [Tue, 5 Jan 2021 12:40:45 +0000 (12:40 +0000)]
Merge branch 'fix/pagination-regression' into 'develop'

Do not try to guess which pagination we need by the existence of an :offset param.

Closes #2399

See merge request pleroma/pleroma!3230

3 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
lain [Tue, 5 Jan 2021 12:33:57 +0000 (13:33 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users

3 years agoMerge branch '1526-account-aliases' into 'develop'
lain [Tue, 5 Jan 2021 12:31:33 +0000 (12:31 +0000)]
Merge branch '1526-account-aliases' into 'develop'

Resolve "account move from mastodon to pleroma"

Closes #1526

See merge request pleroma/pleroma!3233

3 years agoUser: Use ObjectID type to validate also-known-as field
lain [Tue, 5 Jan 2021 12:10:14 +0000 (13:10 +0100)]
User: Use ObjectID type to validate also-known-as field

3 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
lain [Tue, 5 Jan 2021 11:42:30 +0000 (12:42 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases

3 years agoMerge branch 'pleroma-moderation-log-stuff' into 'develop'
lain [Tue, 5 Jan 2021 11:36:57 +0000 (11:36 +0000)]
Merge branch 'pleroma-moderation-log-stuff' into 'develop'

AdminAPI: return id for moderation log entries

See merge request pleroma/pleroma!3232

3 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation...
lain [Tue, 5 Jan 2021 11:19:39 +0000 (12:19 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff

3 years agoAccountControllerTest: Fix test logic
lain [Tue, 5 Jan 2021 10:48:40 +0000 (11:48 +0100)]
AccountControllerTest: Fix test logic

3 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize...
lain [Tue, 5 Jan 2021 09:48:32 +0000 (10:48 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor

3 years agoMerge branch '2391-async-bugs' into 'develop'
Haelwenn [Tue, 5 Jan 2021 00:01:44 +0000 (00:01 +0000)]
Merge branch '2391-async-bugs' into 'develop'

SideEffects.DeleteTest: asyncify.

Closes #2391

See merge request pleroma/pleroma!3231

3 years agoSideEffects.DeleteTest: asyncify.
lain [Mon, 4 Jan 2021 17:40:59 +0000 (18:40 +0100)]
SideEffects.DeleteTest: asyncify.

Replace Mock with Mox, mock out Logger.

3 years agoAdd test to validate profile pagination works with keyset
Mark Felder [Mon, 4 Jan 2021 17:04:58 +0000 (11:04 -0600)]
Add test to validate profile pagination works with keyset

3 years agoDo not try to guess which pagination we need by the existence of an :offset param.
Mark Felder [Mon, 4 Jan 2021 16:13:17 +0000 (10:13 -0600)]
Do not try to guess which pagination we need by the existence of an :offset param.
Require explicit request to get offset pagination.

3 years agoObject: Rework how Object.normalize works
lain [Mon, 4 Jan 2021 12:38:31 +0000 (13:38 +0100)]
Object: Rework how Object.normalize works

Now it defaults to not fetching, and the option is named.

3 years agoAdminAPI: return id for moderation log entries
Alex Gleason [Fri, 1 Jan 2021 17:58:42 +0000 (11:58 -0600)]
AdminAPI: return id for moderation log entries

3 years agoMigration to confirm previously-logged-in users
Alex Gleason [Thu, 31 Dec 2020 20:04:51 +0000 (14:04 -0600)]
Migration to confirm previously-logged-in users

3 years agoMerge branch 'fix/reports-ordering' into 'develop'
feld [Thu, 31 Dec 2020 19:24:49 +0000 (19:24 +0000)]
Merge branch 'fix/reports-ordering' into 'develop'

Do not reverse order of reports. We want newest ones sorted to the top.

Closes #2364

See merge request pleroma/pleroma!3225

3 years agoDocument reports ordering change
Mark Felder [Thu, 31 Dec 2020 19:15:44 +0000 (13:15 -0600)]
Document reports ordering change

3 years agoAliases: refactor validate_also_known_as/1
Alex Gleason [Thu, 31 Dec 2020 18:53:28 +0000 (12:53 -0600)]
Aliases: refactor validate_also_known_as/1

3 years agoApply 2 suggestion(s) to 1 file(s)
Alex Gleason [Thu, 31 Dec 2020 18:51:57 +0000 (18:51 +0000)]
Apply 2 suggestion(s) to 1 file(s)

3 years agoEnsure newest report is returned first in the list
Mark Felder [Thu, 31 Dec 2020 16:53:18 +0000 (10:53 -0600)]
Ensure newest report is returned first in the list

3 years agoAutomatically confirm logged-in users
Alex Gleason [Thu, 31 Dec 2020 18:13:08 +0000 (12:13 -0600)]
Automatically confirm logged-in users

3 years agoMerge branch 'fix/adminapi-user-status-pagination' into 'develop'
feld [Thu, 31 Dec 2020 16:04:42 +0000 (16:04 +0000)]
Merge branch 'fix/adminapi-user-status-pagination' into 'develop'

Support pagination in AdminAPI for user statuses

See merge request pleroma/pleroma!3226

3 years agoApply 1 suggestion(s) to 1 file(s)
feld [Thu, 31 Dec 2020 15:55:44 +0000 (15:55 +0000)]
Apply 1 suggestion(s) to 1 file(s)

3 years agoRender AKAs in Actor endpoints
Alex Gleason [Thu, 31 Dec 2020 00:53:27 +0000 (18:53 -0600)]
Render AKAs in Actor endpoints

3 years agoMerge remote-tracking branch 'upstream/develop' into aliases
Alex Gleason [Wed, 30 Dec 2020 23:10:02 +0000 (17:10 -0600)]
Merge remote-tracking branch 'upstream/develop' into aliases

3 years agoMake pagination type conditional
Mark Felder [Wed, 30 Dec 2020 22:37:04 +0000 (16:37 -0600)]
Make pagination type conditional

3 years agoContinue to use ActivityPub.fetch_user_activities/3, make it pass :offset
Mark Felder [Wed, 30 Dec 2020 22:10:10 +0000 (16:10 -0600)]
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset

3 years agoSupport pagination in AdminAPI for user statuses
Mark Felder [Wed, 30 Dec 2020 20:36:04 +0000 (14:36 -0600)]
Support pagination in AdminAPI for user statuses

3 years agoDo not reverse order of reports. We want newest ones sorted to the top.
Mark Felder [Wed, 30 Dec 2020 20:22:48 +0000 (14:22 -0600)]
Do not reverse order of reports. We want newest ones sorted to the top.

3 years agoMerge branch 'deps/crypt-local-fork' into 'develop'
lain [Wed, 30 Dec 2020 14:04:10 +0000 (14:04 +0000)]
Merge branch 'deps/crypt-local-fork' into 'develop'

Switch to local fork of crypt until upstream fixes ability to build on aarch64

See merge request pleroma/pleroma!3224

3 years agoSwitch to local fork of crypt until upstream fixes ability to build on aarch64
Mark Felder [Mon, 28 Dec 2020 23:52:18 +0000 (17:52 -0600)]
Switch to local fork of crypt until upstream fixes ability to build on aarch64

https://github.com/msantos/crypt/pull/8

3 years agoMerge branch 'revert-b122b6ff' into 'develop'
Haelwenn [Mon, 28 Dec 2020 12:12:19 +0000 (12:12 +0000)]
Merge branch 'revert-b122b6ff' into 'develop'

Revert "Merge branch 'features/hashtag-column' into 'develop'"

See merge request pleroma/pleroma!3222

3 years agoRevert "Merge branch 'features/hashtag-column' into 'develop'"
Haelwenn [Mon, 28 Dec 2020 12:02:16 +0000 (12:02 +0000)]
Revert "Merge branch 'features/hashtag-column' into 'develop'"

This reverts merge request !2824

3 years agoMerge branch 'features/hashtag-column' into 'develop'
Haelwenn [Mon, 28 Dec 2020 10:14:58 +0000 (10:14 +0000)]
Merge branch 'features/hashtag-column' into 'develop'

Insert text representation of hashtags into object["hashtags"]

See merge request pleroma/pleroma!2824

3 years agopleroma.database fill_old_hashtags: Add month_limit argument
Haelwenn (lanodan) Monnier [Tue, 22 Dec 2020 04:11:19 +0000 (05:11 +0100)]
pleroma.database fill_old_hashtags: Add month_limit argument

3 years agoPleroma.Object/1: take %Object{} as argument instead
Haelwenn (lanodan) Monnier [Mon, 28 Dec 2020 09:33:28 +0000 (10:33 +0100)]
Pleroma.Object/1: take %Object{} as argument instead

3 years agonon condition dir creation
Alexander Strizhakov [Sun, 27 Dec 2020 18:58:15 +0000 (21:58 +0300)]
non condition dir creation

3 years agochangelog entry
Alexander Strizhakov [Fri, 25 Dec 2020 08:53:01 +0000 (11:53 +0300)]
changelog entry

3 years agonot needed
Alexander Strizhakov [Fri, 25 Dec 2020 08:34:09 +0000 (11:34 +0300)]
not needed

3 years agoinsreasing test coverage for StealEmojiPolicy
Alexander Strizhakov [Fri, 25 Dec 2020 08:30:36 +0000 (11:30 +0300)]
insreasing test coverage for StealEmojiPolicy

3 years agocheck dir existence in policy
Alexander Strizhakov [Thu, 24 Dec 2020 17:27:28 +0000 (20:27 +0300)]
check dir existence in policy

3 years agoAdd MRFs to the list of things that may need a soft reboot
Mark Felder [Wed, 23 Dec 2020 21:19:08 +0000 (15:19 -0600)]
Add MRFs to the list of things that may need a soft reboot

3 years agoMark private
Mark Felder [Wed, 23 Dec 2020 21:16:58 +0000 (15:16 -0600)]
Mark private

3 years agoCreate dir for EmojiStealPolicy automatically
Mark Felder [Wed, 23 Dec 2020 21:06:20 +0000 (15:06 -0600)]
Create dir for EmojiStealPolicy automatically

3 years agoMerge branch 'cachex-test' into 'develop'
lain [Sat, 26 Dec 2020 10:26:35 +0000 (10:26 +0000)]
Merge branch 'cachex-test' into 'develop'

Test framework overhaul (speed, reliability)

See merge request pleroma/pleroma!3209

3 years agoRevert, this is useful in an edge case
Mark Felder [Wed, 23 Dec 2020 23:41:15 +0000 (17:41 -0600)]
Revert, this is useful in an edge case

3 years agoFormatting
Mark Felder [Wed, 23 Dec 2020 23:41:10 +0000 (17:41 -0600)]
Formatting

3 years agoUpdate descriptions for MediaProxy, remove settings that should not be exposed in...
Mark Felder [Wed, 23 Dec 2020 23:38:33 +0000 (17:38 -0600)]
Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE

3 years agoRemove Proxy settings that were not meant to exist under Pleroma.Upload
Mark Felder [Wed, 23 Dec 2020 23:01:11 +0000 (17:01 -0600)]
Remove Proxy settings that were not meant to exist under Pleroma.Upload

3 years agoAdd test/instance to .gitignore
Mark Felder [Wed, 23 Dec 2020 20:09:22 +0000 (14:09 -0600)]
Add test/instance to .gitignore

3 years agoMerge branch 'update/linkify' into 'develop'
lain [Wed, 23 Dec 2020 15:58:20 +0000 (15:58 +0000)]
Merge branch 'update/linkify' into 'develop'

Update Linkify to 0.4.1

See merge request pleroma/pleroma!3217

3 years agoUpdate Linkify to 0.4.1
Mark Felder [Wed, 23 Dec 2020 15:03:16 +0000 (09:03 -0600)]
Update Linkify to 0.4.1

Fixes false positive detection of IPv4 addresses

3 years agoMerge branch 'mergeback/2.2.1' into 'develop'
lain [Wed, 23 Dec 2020 14:08:08 +0000 (14:08 +0000)]
Merge branch 'mergeback/2.2.1' into 'develop'

Mergeback/2.2.1

See merge request pleroma/pleroma!3215

3 years agoAlign changelog
lain [Wed, 23 Dec 2020 13:56:57 +0000 (14:56 +0100)]
Align changelog

3 years agoMerge branch 'stable' into mergeback/2.2.1
lain [Wed, 23 Dec 2020 13:41:04 +0000 (14:41 +0100)]
Merge branch 'stable' into mergeback/2.2.1

3 years agoMerge branch 'release/2.2.1' into 'stable'
lain [Wed, 23 Dec 2020 13:35:41 +0000 (13:35 +0000)]
Merge branch 'release/2.2.1' into 'stable'

Release/2.2.1

See merge request pleroma/pleroma!3214

3 years agoFixtures: Add application actor fixture.
lain [Wed, 23 Dec 2020 10:56:08 +0000 (11:56 +0100)]
Fixtures: Add application actor fixture.