squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,665 Commits 154 Branches 42 Tags 503 MiB
173e977e28
Commit Graph

8281 Commits

Author SHA1 Message Date
feld
b553bfd745 Merge branch 'fix/prune-hashtags' into 'develop' 
get prune_objects to work again

See merge request pleroma/pleroma!3397
 2021-06-07 20:11:45 +00: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
84f42b92f0 Merge branch 'develop' into 'fix/prune-hashtags' 
# Conflicts:
#   CHANGELOG.md
 2021-06-07 20:06:36 +00:00
feld
bc51dea425 Update lib/mix/tasks/pleroma/database.ex 2021-06-07 20:02:28 +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
Alex Gleason
6fcfa33e4e
Fix MRF.config_descriptions/0 2021-06-07 14:52:57 -05:00
Alex Gleason
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
Alex Gleason
3be08e7c2e
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy 2021-06-04 21:12:37 -05:00
Alex Gleason
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
Haelwenn
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
Haelwenn (lanodan) Monnier
eb7313b0d3
Pipeline Ingestion: Page 2021-06-04 20:06:33 +02:00
Haelwenn (lanodan) Monnier
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
io
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
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
ab32ea44f0
mix.exs: Apply OTP24 fixes to web_push_encryption 2021-06-03 19:11:16 +02:00
Haelwenn (lanodan) Monnier
168687eef2
media_proxy: switch from :crypto.hmac to :crypto.mac 2021-06-03 19:11:15 +02:00
Haelwenn
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
Alex Gleason
028017711c
Merge remote-tracking branch 'pleroma/develop' into cycles-email 2021-06-01 16:17:43 -05:00
Alex Gleason
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
Alex Gleason
f6d2bd738d
Merge remote-tracking branch 'pleroma/develop' into cycles-uploader 2021-06-01 14:20:31 -05:00
Alex Gleason
8a5ceb7e53
Remove deps from Uploader behaviour 
Speeds up recompilation by limiting compile-time deps
 2021-06-01 14:19:45 -05:00
Alex Gleason
708210b994
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming 2021-06-01 13:56:40 -05:00
Alex Gleason
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
Mark Felder
d6432a65da Move shout configuration from :instance, update docs and changelog 2021-06-01 11:49:46 -05:00
Mark Felder
4a181982c3 More confusingly named legacy chat code renamed to shout 2021-06-01 11:49:16 -05:00
Mark Felder
a3cff59659 Ensure we actually start ShoutChannel 2021-06-01 11:49:16 -05:00
Mark Felder
ff00b354fa Rename the non-federating Chat feature to Shout 2021-06-01 11:49:14 -05:00
Alex Gleason
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
Haelwenn
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
Alex Gleason
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url 2021-05-31 16:49:46 -05:00
Alex Gleason
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
Alex Gleason
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
Alex Gleason
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
Alex Gleason
595bca24ad
Merge remote-tracking branch 'pleroma/develop' into cycles-frontend-static 2021-05-30 12:12:58 -05:00
Alex Gleason
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
Alex Gleason
0de6716f06
Merge remote-tracking branch 'pleroma/develop' into cycles-pipeline 2021-05-29 13:32:57 -05:00
Alex Gleason
fa543a9361
ActivityPub.Pipeline: switch to runtime deps 
Speed up recompilation by breaking compile-time cycles
 2021-05-29 13:25:11 -05:00
Alex Gleason
1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html 2021-05-29 12:29:58 -05:00
Alex Gleason
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
Alex Gleason
7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views 2021-05-29 12:17:24 -05:00
Alex Gleason
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
Alex Gleason
cc9e456c0a
Merge remote-tracking branch 'pleroma/develop' into cycles-plugs 2021-05-29 12:01:37 -05:00
Alex Gleason
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
Alex Gleason
e2ba852bfe
Merge remote-tracking branch 'pleroma/develop' into cycles-gun 2021-05-29 11:35:57 -05:00
Alex Gleason
0ada3fe823
Gun: use runtime deps in ConnectionPool 
Speed up recompilation time by breaking compile-time cycles
 2021-05-29 11:35:53 -05:00
Alex Gleason
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
Alex Gleason
39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes 2021-05-28 13:51:21 -05:00
Alex Gleason
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
Alex Gleason
bf2ee12fdb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-mediaproxy 2021-05-28 13:08:23 -05:00
Alex Gleason
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
Alex Gleason
e885b49e35
Merge remote-tracking branch 'pleroma/develop' into cycles-router 2021-05-28 12:44:16 -05:00
Alex Gleason
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
Alex Gleason
ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers 2021-05-19 12:49:00 -05:00
Alex Gleason
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
Alex Gleason
bcf6efce15
Merge remote-tracking branch 'upstream/attachment-meta' into blurhash 2021-05-14 09:09:32 -05:00
Alex Gleason
543e9402d6
Support blurhash 2021-05-14 09:07:16 -05:00
Alex Gleason
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta 2021-05-12 20:10:52 -05:00
Alex Gleason
6f0b42656d
Federate attachments as Links instead of Documents 2021-05-12 19:25:37 -05:00
Alex Gleason
02b9436494
Don't render media meta if nil 2021-05-12 16:16:10 -05:00
Alex Gleason
4c060ae733
Ingest remote attachment width/height 2021-05-12 15:38:49 -05:00
Alex Gleason
ab9eabdf20
Add SetMeta filter to store uploaded image sizes 2021-05-12 15:07:31 -05:00
faried nawaz
5be9d13981
a better query to delete from hashtags 
old query:

Delete on hashtags  (cost=5089.81..5521.63 rows=6160 width=18)
   ->  Hash Semi Join  (cost=5089.81..5521.63 rows=6160 width=18)
         Hash Cond: (hashtags.id = ht.id)
         ->  Seq Scan on hashtags  (cost=0.00..317.28 rows=17528 width=14)
         ->  Hash  (cost=5012.81..5012.81 rows=6160 width=20)
               ->  Merge Anti Join  (cost=0.70..5012.81 rows=6160 width=20)
                     Merge Cond: (ht.id = hto.hashtag_id)
                     ->  Index Scan using hashtags_pkey on hashtags ht  (cost=0.29..610.53 rows=17528 width=14)
                     ->  Index Scan using hashtags_objects_pkey on hashtags_objects hto  (cost=0.42..3506.48 rows=68158 width=14)

new query:

Delete on hashtags ht  (cost=0.70..5012.81 rows=6160 width=12)
   ->  Merge Anti Join  (cost=0.70..5012.81 rows=6160 width=12)
         Merge Cond: (ht.id = hto.hashtag_id)
         ->  Index Scan using hashtags_pkey on hashtags ht  (cost=0.29..610.53 rows=17528 width=14)
         ->  Index Scan using hashtags_objects_pkey on hashtags_objects hto  (cost=0.42..3506.48 rows=68158 width=14)
 2021-05-08 02:00:43 +05:00
faried nawaz
a0c9a2b4cc
mix prune_objects: remove unused hashtags after pruning remote objects 2021-05-08 02:00:42 +05:00
Alex Gleason
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak 2021-05-07 12:40:45 -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
Alex Gleason
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings 2021-05-03 14:43:28 -05:00
Alex Gleason
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
Alex Gleason
926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak 2021-04-30 14:21:17 -05:00
Alex Gleason
c16c7fdb87
SimplePolicy: filter string Objects 2021-04-30 14:20:54 -05:00
Alex Gleason
3d742c3c1a
SimplePolicy: filter nested objects 2021-04-30 14:20:37 -05:00
Alex Gleason
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark 2021-04-30 13:17:03 -05:00
Alex Gleason
6727a3659f
Remove Pleroma.Formatter.minify/2 2021-04-30 12:27:06 -05:00
Alex Gleason
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id 2021-04-29 12:19:10 -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