deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
2021-07-13 22:47:47 -05:00
5e88796784
AdminAPI: sort user results by ID descending
2021-07-13 22:47:02 -05:00
2b3d7794b2
AdminAPI: let moderators actually do things
2021-07-12 22:26:04 -05:00
4fe9a758f9
Let moderators manage custom emojis
2021-07-12 22:11:38 -05:00
1f093cb216
Moderators: reorganize :admin_api pipeline in Router
2021-07-12 22:11:32 -05:00
9bc1e79c56
Moderators: add UserIsStaffPlug
2021-07-12 21:57:52 -05:00
e40b58fd56
Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeout
2021-07-12 16:23:06 -05:00
9a0cb34c8c
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
2021-07-12 16:20:15 -05:00
173e977e28
Merge branch 'features/ingestion-page' into 'develop'
...
Pipeline Ingestion: Page
See merge request pleroma/pleroma!3097
2021-07-12 05:05:49 +00:00
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
2021-07-12 06:49:41 +02:00
5d279a22b1
Merge develop branch upstream
2021-07-10 11:04:16 -06:00
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
2021-07-02 13:03:41 +00:00
310ef6b70d
Deletions: change User.purge/1 to defp, add CHANGELOG entry
2021-06-30 12:25:20 -05:00
99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
2021-06-30 02:02:30 -05:00
beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
2021-06-30 02:02:24 -05:00
43800d83f4
Deletions: allow deactivated users to be deleted
2021-06-30 01:32:28 -05:00
a7929c4d89
Deletions: preserve account status fields during purge, fix checks
2021-06-29 23:56:19 -05:00
01c2d2a296
Also purge the user in User.perform/2
2021-06-29 22:53:33 -05:00
c6d4133727
Deletions: purge the user immediately
2021-06-29 22:30:48 -05:00
be2da95c36
Correctly purge a remote user
2021-06-29 21:45:38 -05:00
281806de75
Activity deletion: fix FunctionClauseError #2686
2021-06-24 21:03:31 -05:00
feld
f97f305d00
Merge branch 'ecto-upgrade' into 'develop'
...
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
See merge request pleroma/pleroma!3473
2021-06-23 20:17:01 +00:00
54af527759
Upgrade Ecto to v3.6.2, remove deprecated ecto_explain
2021-06-23 13:22:32 -05:00
fc6ab78a84
Add test on changing [:instance, :upload_limit]
2021-06-22 12:25:25 +02:00
a851a24036
Downgrade Plug to 1.10.x, revert upload_limit tuple to function change
...
This should fix setting the upload limit in the database as found in:
https://queer.hacktivis.me/notice/A8XUZp74Cg7eYNEMxU
This reverts commit 7d350b73f5
2021-06-22 11:19:13 +02:00
feld
406dadb56b
Merge branch 'fix/twittercard-video-dimensions' into 'develop'
...
Generate Twittercard/OGP metadata with correct dimensions
See merge request pleroma/pleroma!3456
2021-06-10 15:03:58 +00:00
Mark Felder
202ee5fd77
Add note about video thumbnails for code spelunkers unfamiliar with Media Preview Proxy
2021-06-10 09:56:43 -05:00
15e2aaa9f6
Fix compile cycle in Pleroma.Tests.AuthTestController
2021-06-09 13:30:19 -05:00
Mark Felder
6aa7fc15df
Formatting of the comment
2021-06-09 11:58:51 -05:00
Mark Felder
5f7901cc48
Credo
2021-06-09 11:09:14 -05:00
Mark Felder
2a47156b87
Lint
2021-06-09 11:06:53 -05:00
Mark Felder
86bcb87e6c
Fix incorrectly ordered arguments to the function and not properly merging lists.
2021-06-09 11:05:24 -05:00
Mark Felder
2cf648d419
Add a video thumbnail to the OpenGraph metadata if Media Preview Proxy is enabled.
2021-06-09 10:02:41 -05:00
Mark Felder
19a49dd757
Remove Metadata.Utils.attachment_url/1
...
This was a wasteful shortcut to MediaProxy.preview_url/1 and we don't
always want the preview_url in the metadata anyway.
2021-06-09 09:58:29 -05:00
c839078a75
ObjectValidators.{Announce,EmojiReact,Like}: Fix context, actor & addressing
2021-06-09 04:23:02 +02:00
53cf801c30
Merge branch 'cycles-plug-deps' into 'develop'
...
Refactor skipped plugs into Pleroma.Web functions
See merge request pleroma/pleroma!3463
2021-06-09 02:20:00 +00:00
eba3c7b42f
Merge branch 'cycles-side-effects' into 'develop'
...
Recompilation speedup: Switch to runtime deps in ActivityPub.SideEffects
See merge request pleroma/pleroma!3460
2021-06-09 01:54:38 +00:00
45b7325b9e
Refactor skipped plugs into Pleroma.Web functions
...
Speeds up recompilation by reducing compile cycles
2021-06-08 19:15:04 -05:00
67ec0e6c18
Switch to runtime deps in ActivityPub.SideEffects
...
Speeds up recompilation by reducing compile cycles
2021-06-08 18:18:25 -05:00
45ab24f2d9
Switch to runtime deps in Pleroma.Instances
...
Speeds up recompilation by limiting compile cycles
2021-06-08 18:03:34 -05:00
Mark Felder
9cb8960284
Switch OGP default type from "website" to "article"
...
This is what Mastodon uses and might fix some link preview bugs I've encountered
2021-06-08 17:14:30 -05:00
feld
d896e45faf
Merge branch 'cycles-config-loader-redux' into 'develop'
...
Recompilation speedup: Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1
See merge request pleroma/pleroma!3458
2021-06-08 22:08:37 +00:00
feld
4de2bd3b79
Merge branch 'cycles-user-view' into 'develop'
...
Recompilation speedup: Create AdminAPI.UserView to avoid compile-time dep
See merge request pleroma/pleroma!3457
2021-06-08 22:07:25 +00:00
Mark Felder
d70db63084
Set the correct height/width if the data is available when generating opengraph metadata
2021-06-08 16:58:33 -05:00
4faeec2c44
Create AdminAPI.UserView to avoid compile-time dep
...
Speeds up recompilation
2021-06-08 16:34:06 -05:00
Mark Felder
aa8cc4e86e
Only use fallback for videos and only add this metadata for images if we really have it.
2021-06-08 16:31:12 -05:00
Mark Felder
d4ac9445cd
Twittercard metadata for images should also include dimensions if available
2021-06-08 16:19:12 -05:00
1be14cc45f
Ignore runtime deps in Pleroma.Config.Loader with Module.concat/1
...
Speeds up recompilation
2021-06-08 16:07:51 -05:00
Mark Felder
5de65ce3e8
Set the correct height/width if the data is available when generating twittercard metadata
2021-06-08 15:59:55 -05:00
feld
1175023687
Merge branch 'metadata-for-all' into 'develop'
...
Support metadata for video files too
See merge request pleroma/pleroma!3441
2021-06-08 20:30:55 +00:00
feld
939b3bfe43
Merge branch 'improve-og-embed' into 'develop'
...
Improve opengraph embeds
See merge request pleroma/pleroma!3442
2021-06-08 19:26:17 +00:00
Mark Felder
5c27578bce
Support metadata for video files too
2021-06-08 12:54:09 -05:00
b99f60615c
Fix order of Pleroma.Web.Utils.Params aliases
2021-06-08 12:50:47 -05:00
ec65b7ae29
Pleroma.Web.Params --> Pleroma.Web.Utils.Params
2021-06-08 12:50:47 -05:00
0877b120c3
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
...
Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex
2021-06-08 12:50:47 -05:00
feld
99f8605582
Merge branch 'cycles-uploads' into 'develop'
...
Recompilation speedup: use generic types in @spec in Upload.Filter
See merge request pleroma/pleroma!3453
2021-06-08 17:49:24 +00:00
1399b82f7b
Create WrapperAuthenticator and simplify Authenticator behaviour
...
Speeds up recompilation by reducing compile-time cycles
2021-06-07 18:18:39 -05:00
bdaa1d4512
Upload.Filter: use generic types in @spec
...
Speeds up recompilation by reducing compile-time deps
2021-06-07 17:11:17 -05:00
d87dfcb5f0
Put custom guards in Web.Utils.Guards
...
Speeds up recompilation by removing a compile-time cycle on AdminAPI.Search
2021-06-07 15:51:52 -05:00
Mark Felder
264458531a
Formatting
2021-06-07 15:47:50 -05:00
feld
676c3c96dc
Merge branch 'cycles-mrf-policy' into 'develop'
...
Recompilation speedup: create MRF.Policy behaviour separate from MRF module
See merge request pleroma/pleroma!3450
2021-06-07 20:10:20 +00:00
feld
64bc0c69ed
Merge branch 'fix/plug_parser_multipart' into 'develop'
...
web endpoint: Use Config.get directly instead of a tuple
See merge request pleroma/pleroma!3445
2021-06-07 19:58:37 +00:00
6fcfa33e4e
Fix MRF.config_descriptions/0
2021-06-07 14:52:57 -05:00
fe4c4a7178
MRF: create MRF.Policy behaviour separate from MRF module
...
Speeds up recompilation by reducing compile-time deps
2021-06-07 14:22:08 -05:00
3be08e7c2e
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
2021-06-04 21:12:37 -05:00
1c3fe43d23
ReverseProxy: create Client.Wrapper to call client from config
...
Speeds up recompilation by reducing compile-time cycles
2021-06-04 21:12:24 -05:00
26d2c677b7
Removing trailing space on empty line in OAuth controller
2021-06-04 15:50:57 -06:00
2e310b3ec8
Fix more build errors
2021-06-04 15:06:55 -06:00
839c2c6a12
Fix code mistake in OAuth controller
2021-06-04 14:50:16 -06:00
dc4814f0cd
Fix merge conflicts with upstream
2021-06-04 14:42:44 -06:00
0c56f9de0d
Merge branch 'tests/openapi-everywhere' into 'develop'
...
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
2021-06-04 18:53:09 +00:00
eb7313b0d3
Pipeline Ingestion: Page
2021-06-04 20:06:33 +02:00
7d350b73f5
web endpoint: Use Config.get directly instead of a tuple
...
Fixes a lot of warnings like the following while running the testsuite:
warning: passing a {module, function, args} tuple to Plug.Parsers.MULTIPART is deprecated. Please see Plug.Parsers.MULTIPART module docs for better approaches to configuration
This might mean no more dynamic configuration but there seems to be the same limitation two lines underneath anyway.
2021-06-04 20:04:30 +02:00
feld
a07310888f
Merge branch 'fix/missing-deprecation' into 'develop'
...
Add missing deprecation warning left out of !2842
See merge request pleroma/pleroma!3444
2021-06-04 17:37:30 +00:00
Mark Felder
f58928cf1c
Add missing deprecation warning left out of !2842
2021-06-04 12:30:10 -05:00
2c401dafa1
Improve opengraph embeds
...
This brings them more in line with Mastodon.
- Deduplicates display name from the title and content
- Removes arbitrary limits on the size of the embedded image
- Removes angled double quotes from embed descriptions. These would normally just indicate that the content is a quote, but that is already implied by the content being in an embed.
2021-06-04 05:33:35 +00:00
11844084d0
MIME.valid?(type) → is_bitstring(type) && MIME.extensions(type) != []
...
Since mime 1.6.0:
warning: MIME.valid?/1 is deprecated. Use MIME.extensions(type) != [] instead
As for the bitstring(type) part it's because MIME.extensions only expects a string.
https://github.com/elixir-plug/mime/issues/43
2021-06-03 19:11:17 +02:00
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption
2021-06-03 19:11:16 +02:00
168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac
2021-06-03 19:11:15 +02:00
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
2021-06-03 15:52:16 +00:00
028017711c
Merge remote-tracking branch 'pleroma/develop' into cycles-email
2021-06-01 16:17:43 -05:00
9879c18548
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
...
Speeds up recompilation by fixing cycles in UserEmail
2021-06-01 16:17:03 -05:00
feld
3fe6ada6fc
Merge branch 'cycles-streaming' into 'develop'
...
Recompilation speedup: Remove deps from Streaming/Persisting behaviors
See merge request pleroma/pleroma!3434
2021-06-01 19:41:37 +00:00
Mark Felder
0be7eada92
Keep original Shoutbox channel name as chat:public
...
There is no sane / high level workaround for merging users who join shout:public and chat:public.
2021-06-01 14:34:13 -05:00
f6d2bd738d
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader
2021-06-01 14:20:31 -05:00
8a5ceb7e53
Remove deps from Uploader behaviour
...
Speeds up recompilation by limiting compile-time deps
2021-06-01 14:19:45 -05:00
708210b994
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming
2021-06-01 13:56:40 -05:00
a744c47e9a
Remove deps from Streaming/Persisting behaviors
...
Speeds up recompilation by limiting compile-time deps
2021-06-01 13:55:07 -05:00
Mark Felder
2743c66693
Add "chat" back as a feature for backwards compat.
...
Legacy PleromaFE uses this to identify if ShoutBox is available.
2021-06-01 13:17:50 -05:00
Mark Felder
48a0ea2fc3
Wire up join requests to the old "chat:public" channel into the new "shout:public" channel
2021-06-01 11:56:51 -05:00
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
4a181982c3
More confusingly named legacy chat code renamed to shout
2021-06-01 11:49:16 -05:00
a3cff59659
Ensure we actually start ShoutChannel
2021-06-01 11:49:16 -05:00
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
2021-06-01 11:33:11 -05:00
feld
75b94a2f35
Merge branch 'cycles-frontend-static' into 'develop'
...
Recompilation speedup: make Router a runtime dep of FrontendStatic
See merge request pleroma/pleroma!3429
2021-06-01 16:19:41 +00:00
feld
0ddf492c5d
Merge branch 'cycles-base-url' into 'develop'
...
Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432
2021-06-01 16:15:27 +00:00
c4b4258374
Merge branch 'features/validators-note' into 'develop'
...
Pipeline Ingestion: Note
Closes #290
See merge request pleroma/pleroma!2984
2021-06-01 01:51:38 +00:00
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
2021-05-31 16:48:03 -05:00
10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
...
Move as_local_public/0 to stop making modules depend on Web at compile-time
2021-05-31 13:39:15 -05:00
2e682788a3
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
2021-05-30 12:58:24 -05:00
595bca24ad
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static
2021-05-30 12:12:58 -05:00
721c966842
FrontendStatic: make Router a runtime dep
...
Speeds up recompilation by removing compile-time cycles
2021-05-30 12:12:16 -05:00
feld
5d40ffe429
Merge branch 'cycles-views' into 'develop'
...
Recompilation speedup: Create real Views for all Controllers
See merge request pleroma/pleroma!3425
2021-05-29 21:50:07 +00:00
feld
b5f3a5c979
Merge branch 'cycles-html' into 'develop'
...
Recompilation speedup: Break out activity-specific HTML functions into Pleroma.Activity.HTML
See merge request pleroma/pleroma!3426
2021-05-29 21:19:25 +00:00
feld
317fe240a8
Merge branch 'cycles-gun' into 'develop'
...
Recompilation speedup: use runtime deps in Pleroma.Gun
See merge request pleroma/pleroma!3422
2021-05-29 21:16:57 +00:00
feld
b2f5f48750
Merge branch 'cycles-config' into 'develop'
...
Recompilation speedup: use runtime deps in Pleroma.Config
See merge request pleroma/pleroma!3424
2021-05-29 19:20:47 +00:00
0de6716f06
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline
2021-05-29 13:32:57 -05:00
fa543a9361
ActivityPub.Pipeline: switch to runtime deps
...
Speed up recompilation by breaking compile-time cycles
2021-05-29 13:25:11 -05:00
1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
2021-05-29 12:29:58 -05:00
3ff9c5e2a6
Break out activity-specific HTML functions into Pleroma.Activity.HTML
...
Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex
2021-05-29 12:29:11 -05:00
7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
2021-05-29 12:17:24 -05:00
c9e4200ed2
Create real Views for all Controllers
...
This makes views depend on each other at runtime instead of compile-time
2021-05-29 12:15:57 -05:00
cc9e456c0a
Merge remote-tracking branch 'pleroma/develop' into cycles-plugs
2021-05-29 12:01:37 -05:00
32d263cb90
Config: use runtime deps instead of module attributes
...
Speeds up recompilation time by breaking compile-time cycles
2021-05-29 12:00:59 -05:00
e2ba852bfe
Merge remote-tracking branch 'pleroma/develop' into cycles-gun
2021-05-29 11:35:57 -05:00
0ada3fe823
Gun: use runtime deps in ConnectionPool
...
Speed up recompilation time by breaking compile-time cycles
2021-05-29 11:35:53 -05:00
3ebede4b51
Gun: make Gun.API a runtime dep
...
Speed up recompilation by breaking a compile-time cycle
2021-05-29 10:53:30 -05:00
feld
8871ca5aa3
Merge branch 'cycles-router-api-routes' into 'develop'
...
Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
See merge request pleroma/pleroma!3419
2021-05-28 19:06:49 +00:00
feld
359ded086c
Merge branch 'simplepolicy-announce-leak' into 'develop'
...
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
2021-05-28 19:05:13 +00:00
feld
edcdd15e01
Merge branch 'alias-router-helpers' into 'develop'
...
Switch to aliasing `Router.Helpers` instead of importing
See merge request pleroma/pleroma!3409
2021-05-28 19:01:47 +00:00
39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
2021-05-28 13:51:21 -05:00
c23b81e399
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
...
Reduce recompilation time by breaking compile-time cycles
2021-05-28 13:51:01 -05:00
feld
7ad87571bd
Merge branch 'cycles-router' into 'develop'
...
Recompilation speedup: move StaticFEPlug to a pipeline
See merge request pleroma/pleroma!3417
2021-05-28 18:24:33 +00:00
feld
9f386df83c
Merge branch 'cycles-router-mediaproxy' into 'develop'
...
Recompilation speedup: don't make MediaProxy be a compile-dep of Router
See merge request pleroma/pleroma!3418
2021-05-28 18:22:27 +00:00
bf2ee12fdb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy
2021-05-28 13:08:23 -05:00
fda34591ce
Don't make MediaProxy be a compile-dep of Router
...
Speeds up recompilation by removing MediaProxy as a compile-time dep of Router
2021-05-28 13:07:34 -05:00
e885b49e35
Merge remote-tracking branch 'pleroma/develop' into cycles-router
2021-05-28 12:44:16 -05:00
21787546c0
Router: move StaticFEPlug to a pipeline
...
Speed up recompilation by breaking a cycle. Removes StaticFEPlug as a compile-time dep of Router.
2021-05-28 12:43:02 -05:00
Mark Felder
4694853766
Provide totalItems field for featured collections
2021-05-27 12:17:31 -05:00
Mark Felder
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
2021-05-19 12:49:00 -05:00
07fed0fda2
Switch to aliasing `Router.Helpers` instead of importing
2021-05-18 17:45:30 -05:00
Mark Felder
c64cbee26c
Fixed checking for Upload Filter required commands
2021-05-18 16:28:21 -05:00
Mark Felder
4ab3ef07d0
Check AnalyzeMetadata filter's required commands
...
eblurhash:magick uses "convert"
Fetching image metadata uses "mogrify"
2021-05-18 16:08:31 -05:00
Mark Felder
9b6b5ac196
Rename upload filter to AnalyzeMetadata
2021-05-18 15:33:33 -05:00
bcf6efce15
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash
2021-05-14 09:09:32 -05:00
543e9402d6
Support blurhash
2021-05-14 09:07:16 -05:00
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
2021-05-12 20:10:52 -05:00
6f0b42656d
Federate attachments as Links instead of Documents
2021-05-12 19:25:37 -05:00
02b9436494
Don't render media `meta` if nil
2021-05-12 16:16:10 -05:00
4c060ae733
Ingest remote attachment width/height
2021-05-12 15:38:49 -05:00
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
2021-05-12 15:07:31 -05:00
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-05-07 12:40:45 -05:00
1a45aa1278
Merge remote-tracking branch 'pleroma/develop' into notice-routes
2021-05-05 14:50:54 -05:00
50e3750758
Add notice compatibility routes for other frontends
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785
2021-05-05 14:50:10 -05:00
feld
745375bdcf
Merge branch 'dont-crash-email-settings' into 'develop'
...
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
2021-05-04 13:30:00 +00:00
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
2021-05-03 14:43:28 -05:00
c80b1aaf51
Don't crash when email settings are invalid
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
2021-05-03 14:43:14 -05:00
926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-04-30 14:21:17 -05:00
c16c7fdb87
SimplePolicy: filter string Objects
2021-04-30 14:20:54 -05:00
3d742c3c1a
SimplePolicy: filter nested objects
2021-04-30 14:20:37 -05:00
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
6727a3659f
Remove Pleroma.Formatter.minify/2
2021-04-30 12:27:06 -05:00
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
2021-04-29 12:19:10 -05:00
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
Mark Felder
959dc6e6fc
Cleanup and ensure we obey custom Repo timeout
2021-04-22 10:15:50 -05:00
Mark Felder
99fd9c5e38
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval
2021-04-22 10:15:50 -05:00
Mark Felder
9f711ddcf8
Try to set query timeout intelligently
2021-04-22 10:15:50 -05:00
Mark Felder
9bc69196d5
Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task
2021-04-22 10:15:50 -05:00
Mark Felder
0effcd2cfe
Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.
2021-04-22 10:15:50 -05:00
f9bedf5597
Apply lanodan's suggestion(s) to 1 file(s)
2021-04-20 21:08:31 +00:00
42185d8750
Apply lanodan's suggestion(s) to 1 file(s)
2021-04-20 21:06:45 +00:00
e104829c2f
Apply lanodan's suggestion(s) to 1 file(s)
2021-04-20 21:06:39 +00:00
30b1d50938
Apply lanodan's suggestion(s) to 1 file(s)
2021-04-20 21:06:32 +00:00
d1eb1913e8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc
2021-04-19 15:42:38 -06:00
Mark Felder
efed94a23e
Fix error response which was breaking tests related to pinned posts
2021-04-19 16:23:57 -05:00
2b4f958b2a
Add opting out of Google FLoC to HTTPSecurityPlug headers
2021-04-18 14:00:18 -06:00
c6dcd863e2
Apply rinpatch's suggestion(s) to 1 file(s)
2021-04-16 09:59:50 +00:00
15f87cf658
Merge branch 'features/ingestion-ecto-tag' into 'develop'
...
TagValidator: New
See merge request pleroma/pleroma!3244
2021-04-16 09:55:55 +00:00
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
2021-04-16 09:53:47 +00:00
0ababdc068
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
...
Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381
2021-04-16 09:50:26 +00:00
ca79aab0bf
Remove MastoFE settings from users table
2021-04-15 23:33:24 -06:00
8afa3f2d1b
Remove no longer necessary unit tests for MastoFE
2021-04-15 23:12:42 -06:00
4f55d5123b
Remove MastoFE-related backend code and frontend pieces
2021-04-15 22:56:21 -06:00
Mark Felder
f95b52255b
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test
2021-04-14 09:39:57 -05:00
Mark Felder
c3b8c77967
Improve string_to_elixir_types/1 with guards
2021-04-13 14:39:57 -05:00
Mark Felder
ee53ad4d77
Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1
2021-04-13 14:39:31 -05:00
Mark Felder
0feafcc20c
Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE
2021-04-09 10:30:27 -05:00
681a42c359
release runtime provider fix for paths
2021-04-08 15:45:31 +03:00
53193b84b1
utils: Fix maybe_splice_recipient when "object" isn’t a map
2021-04-05 19:19:12 +02:00
6c9f6e62c8
transmogrifier: Fixing votes from Note to Answer
2021-04-05 19:19:12 +02:00
461123110b
Object.Fetcher: Fix getting transmogrifier reject reason
2021-04-05 19:19:12 +02:00
d1205406d9
ActivityPubControllerTest: Apply same addr changes to object
2021-04-05 19:19:12 +02:00
96212b2e32
Fix addressing
2021-04-05 19:19:12 +02:00
641184fc7a
recipients fixes/hardening for CreateGenericValidator
2021-04-05 19:19:11 +02:00
c944932674
Pipeline Ingestion: Note
2021-04-05 19:19:11 +02:00
e2a3365b5c
ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults
2021-04-05 19:19:11 +02:00
e56779dd8d
Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing
2021-04-05 19:19:11 +02:00
ef36f7fa5c
Move tag fixup to object_validator
2021-04-05 19:07:45 +02:00
7ebfe89900
object_validators: Mark validate_data as private
2021-04-01 14:18:41 +02:00
37a7f521fd
Insert string-hashtags in Pipeline
...
Cannot be done in Ecto schemas because only one type is allowed in arrays, and
needs to be done before the MRFs.
2021-04-01 14:18:41 +02:00
5ae27c8451
pipeline_test: Fix usage of %Activity{}
2021-04-01 14:18:40 +02:00
9015df2229
TagValidator: New
2021-04-01 14:18:40 +02:00
1e3db07586
Revert "Merge branch 'patch-fix-open-api-spec' into 'develop'"
...
This reverts merge request !3382
2021-04-01 12:00:58 +00:00
ce9ed6c730
Merge branch 'refactor/object_validator_validate' into 'develop'
...
object_validator: Refactor most of validate/2 to a generic block
See merge request pleroma/pleroma!3383
2021-04-01 11:10:12 +00:00
af1cd28f9b
object_validator: Refactor most of validate/2 to a generic block
2021-04-01 12:18:52 +02:00
863010ea63
date-times are always strings
2021-03-31 06:51:22 +00:00
Mark Felder
03f38ac4eb
Prefer FollowBot naming convention vs Followbot
2021-03-30 11:10:44 -05:00
Mark Felder
4796df0bc3
Remove Task.async as it is broken here and probably a premature optimization anyway
2021-03-30 11:10:44 -05:00
Mark Felder
c252ac71d4
Revert
2021-03-30 11:10:44 -05:00
Mark Felder
778010ef8e
Do not try to follow local users. Their posts are already available locally on the instance.
2021-03-30 11:10:44 -05:00
Mark Felder
86182ef8e4
Change module name to FollowbotPolicy
2021-03-30 11:10:44 -05:00
Mark Felder
1926d0804b
Add follow_requests_outstanding_since?/3 to Pleroma.Activity
2021-03-30 11:10:44 -05:00
Mark Felder
f0dcc1ca69
Lint
2021-03-30 11:10:44 -05:00
Mark Felder
a176914c73
Better checking of previous follow request attempts
2021-03-30 11:10:44 -05:00
Mark Felder
3989ec508c
Prevent duplicates from being processed
2021-03-30 11:10:44 -05:00
Mark Felder
3949cfdc24
Make the followbot only dispatch follow requests once per 30 day period
2021-03-30 11:10:43 -05:00
e78738173a
Enforce that the followbot must be marked as a bot.
2021-03-30 11:10:43 -05:00
fba770b3ea
Try to handle misconfiguration scenarios gracefully
2021-03-30 11:10:03 -05:00
8b81d62227
Upstream original followbot implementation
2021-03-30 11:10:03 -05:00
4d046afd27
tests for release config provider
2021-03-27 09:05:33 +03:00
6e108b8603
reading the file, instead of config keyword
2021-03-26 19:19:19 +03:00
1885268c9c
expanding validator
2021-03-25 13:26:54 +03:00
2a520ba008
expanding AddRemoveValidator
2021-03-25 13:03:42 +03:00
8857242c95
removeing corresponding add activity
2021-03-25 13:03:41 +03:00
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
2021-03-25 13:03:41 +03:00
d1d2744ee3
featured_address valition in AddRemoveValidator
2021-03-25 13:03:40 +03:00
ff612750b1
validator renaming & add validation for target
2021-03-25 13:03:40 +03:00
17f28c0507
mastodon pins
2021-03-25 13:03:40 +03:00
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
2021-03-25 13:03:40 +03:00
b6a69b5efd
Return token's primary key with POST /oauth/token
2021-03-24 12:50:05 -05:00
d3660b24d3
Copy emoji in the subject from parent post
...
Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post.
2021-03-22 21:20:47 +03:00
572363793f
Merge branch 'fix/2579-finger-content-type' into 'develop'
...
respect content-type header in finger request
Closes #2579
See merge request pleroma/pleroma!3375
2021-03-21 08:25:02 +00:00
72143dd732
Merge branch 'richmedia-workaround' into 'develop'
...
Workaround for RichMedia preview image breakage edge case
See merge request pleroma/pleroma!3363
2021-03-21 08:19:42 +00:00
d7e51206a2
respect content-type header in finger request
2021-03-19 18:53:55 +03:00
a9bc652ab9
Merge branch 'mediaproxy-decode' into 'develop'
...
Simple way to decode mediaproxy URLs
See merge request pleroma/pleroma!3364
2021-03-19 08:52:12 +00:00
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
67bde35e71
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
...
Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372
2021-03-19 08:36:26 +00:00
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
2021-03-16 01:54:43 +00:00
55bdfb075c
OpenAPI: TwitterAPI Util Controller
2021-03-15 06:47:07 +01:00
65cd9cb638
TwitterAPI: Remove unused read notification function
2021-03-15 06:47:07 +01:00
a22c53810b
Remove deprecated /api/qvitter/statuses/notifications/read
2021-03-15 06:47:07 +01:00
e4743847a1
OpenAPI: PleromaAPI UserImport Controller
2021-03-15 06:47:07 +01:00
3123ecdd6e
OpenAPI: MastodonAPI Media Controller
2021-03-15 06:47:06 +01:00
7eecc3b61d
OpenAPI: MastodonAPI Timeline Controller
2021-03-15 06:47:06 +01:00
b1d4b2b81e
Add support for actor icon being a list (Bridgy)
2021-03-15 06:44:05 +01:00
Mark Felder
b80f868c6b
Prefer naming this function build_image_url/2
2021-03-13 12:27:15 -06:00
cb73456609
[ #3213 ] Code formatting fix.
2021-03-12 12:25:18 +03:00
3edf45021e
[ #3213 ] Background migration infrastructure refactoring.
...
Extracted BaseMigrator and BaseMigratorState.
2021-03-12 12:18:11 +03:00
Mark Felder
029ff65389
Leverage function pattern matching instead
2021-03-11 09:20:29 -06:00
Mark Felder
8246db2a96
Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771
...
If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter.
The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL.
2021-03-10 17:15:31 -06:00
946e0aab49
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-10 07:48:50 +03:00
7f413139fb
Merge branch 'openapi/admin/user' into 'develop'
...
Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355
2021-03-10 03:24:40 +00:00
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
7f8785fd9b
[ #3213 ] Performance optimization of filtering by hashtags ("any" condition).
2021-03-07 11:33:21 +03:00
Mark Felder
e97b34f65d
Add simple way to decode fully qualified mediaproxy URLs
2021-03-05 13:18:37 -06:00
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04:00
9876fa8e90
Add UserOperation to Redoc
2021-03-04 21:13:53 +04:00
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
2021-03-03 23:09:30 +03:00
13aa98d689
Merge branch 'mergeback/2.3.0' into 'develop'
...
Mergeback/2.3.0
See merge request pleroma/pleroma!3360
2021-03-03 15:07:50 +00:00
2e296c079f
Revert "StatusController: Deactivate application support for now."
...
This reverts commit 024c11c18d
2021-03-03 15:33:06 +01:00
Mark Felder
8d601d3b23
Make the object reference in both render("show.json", _) functions consistently named
2021-03-02 14:14:38 -06:00
Mark Felder
85b2387f66
Fix build_application/1 match
2021-03-02 11:37:37 -06:00
3aae5231b2
Add OpenAPI spec for AdminAPI.UserController
2021-03-02 20:49:17 +04:00
7dac83eb6e
Linting.
2021-03-02 15:03:16 +01:00
024c11c18d
StatusController: Deactivate application support for now.
...
Some more things to discuss about, so we'll remove it from 2.3.0
2021-03-02 14:40:47 +01:00
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
1dc5794e29
Never forward the client's user-agent through the media proxy
2021-03-01 21:05:46 +01:00
Mark Felder
b1e1db82bc
Store application details in the object under the generator key, not application key
2021-03-01 11:29:10 -06:00
4a9d3a1f28
Merge branch 'features/reports-enhancements' into 'develop'
...
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
2021-02-28 16:45:15 +00:00
6a71aa535b
Merge branch 'admin-api-versioning' into 'develop'
...
Pleroma APIs versioning
Closes #2509
See merge request pleroma/pleroma!3335
2021-02-28 16:22:22 +00:00
050c4b1f14
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
...
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336
2021-02-28 16:18:23 +00:00
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
2021-02-28 16:17:34 +00:00
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
2021-02-27 21:26:17 +01:00
d0823d7f1e
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
...
Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346
2021-02-27 19:40:38 +00:00
da5d21a1cf
don't use continue in Stats init for test env
2021-02-27 09:39:15 +03:00
Mark Felder
d35b6254b4
Store the client application data in ActivityStreams format
2021-02-26 18:14:57 -06:00
feld
840686ecd5
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
...
expires_in in scheduled status params
Closes #2498
See merge request pleroma/pleroma!3315
2021-02-26 16:49:11 +00:00
Mark Felder
76b166f040
Note our upgrade path for this functionality
2021-02-25 13:08:36 -06:00
Mark Felder
2da71a526f
No need to filter out Mix.env() from the API routes.
2021-02-25 13:04:08 -06:00
Mark Felder
1552179792
Improved recursion through the api route list
2021-02-25 10:07:29 -06:00
Mark Felder
6b87dfad5d
Filter out MIX_ENV from route list and add a test
2021-02-25 09:23:10 -06:00
Mark Felder
8ad1613717
Enum instead of Stream
2021-02-25 09:06:56 -06:00
Mark Felder
cea31df6a6
Attempt to filter out API calls from FrontendStatic plug
2021-02-24 15:27:53 -06:00
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
2021-02-23 13:52:28 +03:00
6531eddf36
[ #3213 ] `hashtags`: altered `name` type to `text`. `hashtags_objects`: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.
2021-02-22 23:26:07 +03:00
0ef783baa1
[ #2534 ] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).
2021-02-22 23:09:41 +03:00
7fc9cd0974
Video: Handle peertube videos only stashing attachments in x-mpegURL
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
2021-02-21 23:41:28 +01:00
c1d63bbd9a
Reroute /api/pleroma to /api/v1/pleroma
2021-02-21 13:26:23 +03:00
Mark Felder
73aef0503c
Exiftool also cannot strip from heic files.
2021-02-20 14:29:35 -06:00
Mark Felder
369581db6d
Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup
2021-02-20 14:27:42 -06:00
Mark Felder
26b620d676
Permit :disclose_client in changesets
2021-02-18 17:50:46 -06:00
Mark Felder
63739c5a58
Tests to validate client disclosure obeys user setting
2021-02-18 17:23:17 -06:00
Mark Felder
83301fe61a
Add field to user schema for controlling disclosure of client details
2021-02-18 16:43:41 -06:00
Mark Felder
d5ef02c7a7
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
2021-02-18 16:35:03 -06:00
998437d4a4
[ #3213 ] Experimental / debug feature: `database: [improved_hashtag_timeline: :preselect_hashtag_ids]`.
2021-02-18 21:03:06 +03:00
b981edad8a
[ #3213 ] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
2021-02-18 20:40:10 +03:00
1e6c27181e
expires_in in scheduled status params
2021-02-18 14:59:22 +03:00
8829a408ec
Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'
...
ChatMessage schema: Add `unread` property
See merge request pleroma/pleroma!3323
2021-02-18 09:54:59 +00:00
2ab9499258
OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
...
Transforming scopes is no longer necessary since we are dropping
support for accessing admin api without `admin:` prefix in scopes.
2021-02-17 21:37:23 +03:00
95a22c1cc2
OpenAPI: Add `admin:` scope prefix to admin operations
...
Also splits "Emoji packs" to two categories: "Emoji pack administration"
and "Emoji packs"
2021-02-17 21:10:28 +03:00
6d66fadea7
Remove `:auth, :enforce_oauth_admin_scope_usage`
...
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
2021-02-17 20:47:38 +03:00
ff72ce31ca
Enhance reports in Pleroma API: index, show
2021-02-17 18:46:53 +01:00
e7b1f0f5f4
Merge branch 'feat/chat-list-pagination' into 'develop'
...
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes #2140
See merge request pleroma/pleroma!3325
2021-02-17 15:36:59 +00:00
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
2021-02-17 15:14:27 +00:00
264cb2c77f
Merge branch '2510-oauth-app-tokens-further-support' into 'develop'
...
[#2510 ] Improved support for app-bound OAuth tokens
Closes #2510
See merge request pleroma/pleroma!3316
2021-02-17 13:08:51 +00:00
d7ad288c84
Chats: Introduce /api/v2/pleroma/chats which implements pagination
...
Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140
2021-02-17 16:03:24 +03:00
854ea1aefb
[ #3213 ] Fixed `HashtagsTableMigrator.count/1`.
2021-02-17 09:23:35 +03:00
111bfdd3a0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-02-16 23:23:49 +03:00
938823c730
[ #3213 ] HashtagsTableMigrator state management refactoring & improvements (proper stats serialization etc.).
2021-02-16 23:14:15 +03:00
98ab2b82a6
ChatMessage schema: Add `unread` property
...
It is present in the code, but was not documented.
2021-02-16 22:41:06 +03:00
1dac7d1462
[ #3213 ] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
2021-02-15 21:13:14 +03:00
cf6d3db58f
Add API endpoint to remove a conversation
2021-02-15 21:48:13 +04:00
284504f689
[ #2053 ] Changed `Notification/for_user_query/2` to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from `users`.
2021-02-15 09:08:04 +03:00
349b8b0f4f
[ #3213 ] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).
2021-02-13 22:01:11 +03:00
Mark Felder
3554a65f45
Inject fake application metadata and validate it is stripped by transmogrifier
2021-02-12 13:05:12 -06:00
Mark Felder
9b61df1fb6
App is already preloaded into the token, so avoid an extra query
2021-02-12 12:44:45 -06:00
Mark Felder
c1d78328ee
Consistency
2021-02-11 14:27:52 -06:00
Mark Felder
6dc0b13cf8
Revert to original formatting for these function defs
2021-02-11 14:24:51 -06:00
Mark Felder
7c508319a5
Prefer naming this put_application because we're putting it into the params map
2021-02-11 14:19:53 -06:00
Mark Felder
09b8378646
%Token{} may not be in the conn, so avoid breaking the ability to post statuses in that scenario.
2021-02-11 14:15:25 -06:00
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
2021-02-11 19:31:57 +03:00
a996ab46a5
[ #3213 ] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
2021-02-11 19:30:21 +03:00
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
2021-02-11 15:02:50 +03:00
2cf753c502
Merge branch 'fix/no-version-api-pleroma-social' into 'develop'
...
Fix no version number on api.pleroma.social
See merge request pleroma/pleroma!3310
2021-02-10 00:52:59 +00:00
Mark Felder
4540e08a6a
Rendering fallback for when we don't have valid data available
2021-02-09 18:52:22 -06:00
Mark Felder
981349f21d
Enable rendering of the client application data details
2021-02-09 18:22:41 -06:00
Mark Felder
3dc7e89c54
Ensure we capture the application details into the object
2021-02-09 18:07:15 -06:00
Mark Felder
de8b8e9cf1
Add a function to lookup client app details by the app_id
2021-02-09 16:59:58 -06:00
a853218701
Merge branch 'features/ap_id-c2s-authentication' into 'develop'
...
activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295
2021-02-09 19:29:43 +00:00
0d9230aed9
OpenAPI spec: Do not show build enviroment in the spec version
2021-02-09 22:23:11 +03:00
Mark Felder
4cacce4b42
Revert "Add plaintext support for all emails except the digest"
...
This reverts commit 5df9f68392
2021-02-08 16:39:55 -06:00
feld
593c0851d9
Merge branch 'develop' into 'new-user-emails'
2021-02-08 16:01:50 -06:00
a5bee1bf35
Merge branch 'feat/mrf-noemptypolicy' into 'develop'
...
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
See merge request pleroma/pleroma!3309
2021-02-08 21:49:20 +00:00
Mark Felder
55a13fc360
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
...
Helps prevent accidental button mashes from submitting incomplete posts
2021-02-08 15:32:47 -06:00
17f41a589f
Merge branch 'fix/rss-link' into 'develop'
...
RSS: Make sure post URL is the first `<link>` element
See merge request pleroma/pleroma!3308
2021-02-08 20:14:53 +00:00
ed8ef80b5e
RSS: Make sure post URL is the first `<link>` element
...
Otherwise some RSS readers (tested in Miniflux) might pick the context
URL as the external link.
Related to #2425 .
2021-02-08 22:44:15 +03:00
8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints
2021-02-08 20:00:47 +01:00
8babd796da
Merge branch 'fix/reports-from-admins' into 'develop'
...
Suppress report notification for admin actors
See merge request pleroma/pleroma!3301
2021-02-08 10:31:20 +00:00
d1c6dd97aa
[ #3213 ] Partially addressed code review points.
...
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
2021-02-07 22:24:12 +03:00
6e68058b63
Merge branch 'feat/allow_alt_text_search_config' into 'develop'
...
allow user defined text search config in database
See merge request pleroma/pleroma!3275
2021-02-06 09:42:20 +00:00
8d4e0342e1
Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs, priv/repo/optional_migrations/rum_indexing/20190510135645_add_fts_index_to_objects_two.exs files
2021-02-06 09:42:17 +00:00
Mark Felder
0368419fce
Slightly better formatting
2021-02-05 09:13:53 -06:00
Mark Felder
5df9f68392
Add plaintext support for all emails except the digest
2021-02-05 09:13:17 -06:00
Mark Felder
95930a7aa5
Actually send the mail
2021-02-04 17:42:09 -06:00
Mark Felder
e945ccc91b
Add a registration email that only sends if no other emails (welcome, approval, confirmation) are enabled
2021-02-04 15:16:50 -06:00
Mark Felder
2956c21a55
Improve confirmation email language
2021-02-04 15:10:43 -06:00
Mark Felder
af37a5c51a
Also make this maybe_ for consistency
2021-02-04 14:33:49 -06:00
Mark Felder
b22b12f738
These welcome emails are not guaranteed and can be private functions
2021-02-04 14:01:15 -06:00
Mark Felder
d047372291
Merge branch 'develop' into fix/reports-from-admins
2021-02-04 12:37:20 -06:00
Mark Felder
bf9cd4a0e2
Standardize the way we capture and use Mix.env()
2021-02-04 10:13:03 -06:00
feld
7b67bf4e97
Merge branch 'fix/configdb-error' into 'develop'
...
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
2021-02-04 14:33:59 +00:00
ea5469961a
Merge branch 'bugfix/notice-external-redirect' into 'develop'
...
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
2021-02-04 14:26:03 +00:00
ecff027418
Redirect non-local activities when /notice/:id is used
...
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
2021-02-04 15:17:40 +01:00
Mark Felder
887db076b5
Load an emoji.txt specific to the test env
2021-02-03 16:40:59 -06:00
Mark Felder
76f732766b
Exclude reporter from receiving notifications from their own reports.
...
Currently only works if the reporting actor is an admin, but if we include
moderators with those who receive notification reports it will work for them.
2021-02-03 12:32:44 -06:00
74ef1a044d
Account schema: specify that pleroma.relationship is nullable
2021-02-03 18:10:43 +03:00
Alex Gleason
feld