moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,990 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

6903 Commits

Author SHA1 Message Date
feld 750fb25f48 Revert "Merge branch 'pleroma-card-image-description' into 'develop'" 
This reverts merge request !4101
 2024-05-07 23:20:38 +00:00
lain 50af909c01 Merge branch 'pleroma-card-image-description' into 'develop' 
Include image description in status media cards

See merge request pleroma/pleroma!4101
 2024-04-19 07:39:05 +00:00
marcin mikołajczak 6f6bede900 Include image description in status media cards 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-19 10:20:31 +04:00
marcin mikołajczak 4f5c4d79c4 FEP-2c59, add "webfinger" to user actor 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-04-11 17:50:11 +02:00
lain 987f44d811 Merge branch 'bookmark-folders' into 'develop' 
Fix BookmarkFolderView, add test

See merge request pleroma/pleroma!4096
 2024-03-20 13:26:47 +00:00
marcin mikołajczak 37ec645ff2 Fix BookmarkFolderView, add test 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-20 13:24:43 +01:00
Lain Soykaf 4e8a1b40cb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into transient-validators-defaults 2024-03-19 16:26:02 +04:00
marcin mikołajczak 60c4cb21ea InstanceView: Update features 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-18 14:02:29 +01:00
lain 2b71f4897f Merge branch 'develop' into 'bookmark-folders' 
# Conflicts:
#   docs/development/API/differences_in_mastoapi_responses.md
 2024-03-18 10:35:02 +00:00
lain cf0aa1238c Merge branch 'public-polls' into 'develop' 
Expose nonAnonymous field from Smithereen polls

See merge request pleroma/pleroma!3962
 2024-03-18 06:26:22 +00:00
Lain Soykaf caf855cf9c ActivityPub.Publisher: Don't try federating if a user doesn't have an inbox. 2024-03-17 16:57:45 +04:00
Lain Soykaf 0450da88b6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-fix-3241 2024-03-17 16:42:17 +04:00
lain 95bcd5d28f Merge branch 'force-mention' into 'develop' 
Add ForceMention mrf

See merge request pleroma/pleroma!4082
 2024-03-17 12:32:14 +00:00
Haelwenn (lanodan) Monnier 48c22a67de
QuestionOptionsValidator: set default AS types 2024-03-15 16:22:18 +01:00
Haelwenn (lanodan) Monnier 8b651fab1d
AttachmentValidator: Set "Link" as default type 2024-03-15 16:22:18 +01:00
marcin mikołajczak c0c4a9ed0d Merge remote-tracking branch 'origin/develop' into instance-contact-account 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-08 12:12:55 +01:00
tusooa 1422082bf2 Apply ledyba's suggestion(s) to 1 file(s) 2024-03-07 04:43:56 +00:00
tusooa 8298b326a7 Merge branch 'instance-v2' into 'develop' 
Add some missing fields to instanceV2

See merge request pleroma/pleroma!4081
 2024-03-07 01:31:27 +00:00
Kaede Fujisaki 0242c1f691 fmt 2024-03-02 18:34:12 +09:00
Kaede Fujisaki 6ad4acea50 Consider a case when inbox is nil 2024-03-02 18:09:08 +09:00
marcin mikołajczak 9cfa4e67b1 Add ForceMention mrf 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-01 18:16:09 +01:00
marcin mikołajczak d415686bb9 Allow to group bookmarks in folders 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-01 11:04:01 +01:00
marcin mikołajczak acb9e46074 Add some missing fields to instanceV2 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-02-27 13:25:26 +01:00
marcin mikołajczak c592a0e58d Merge remote-tracking branch 'origin/develop' into HEAD 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-02-22 21:05:20 +01:00
Mark Felder 72fc41d891 Prevent publisher jobs from erroring if the connection pool is full 
A full pool is a soft-error. Snooze the job for 30 seconds and try again.
 2024-02-22 14:14:40 -05:00
Haelwenn (lanodan) Monnier 7d624c4750
StealEmojiPolicy: Sanitize shortcodes 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3245
 2024-02-20 09:09:54 +01:00
Mark Felder 7e99d0619d Force more frequent full_sweep GC runs on the Websocket processes 
Websocket processes seem to be the primary culprit for Binary memory allocation bloat.
 2024-02-17 09:53:52 -05:00
feld 4dd8a1a1ca Merge branch 'websocket-refactor' into 'develop' 
Websocket refactor to use Phoenix.Socket.Transport

See merge request pleroma/pleroma!4064
 2024-02-15 14:36:54 +00:00
lain d3208d2250 Merge branch 'oauth-nickname' into 'develop' 
Use User.full_nickname/1 in oauth html template

See merge request pleroma/pleroma!4054
 2024-02-15 09:35:39 +00:00
lain f2f455f283 Merge branch 'frontend-caching' into 'develop' 
FrontendStatic should have reasonable caching

See merge request pleroma/pleroma!3685
 2024-02-15 09:23:47 +00:00
Haelwenn d19642d7eb Merge branch 'bugfix-ccworks' into 'develop' 
Bugfix for ccworks AP bridge

Closes #3234

See merge request pleroma/pleroma!4043
 2024-02-15 01:30:22 +00:00
Mark Felder 64ad451a7b Websocket refactor to use Phoenix.Socket.Transport 
This will make us compatible with Cowboy and Bandit
 2024-02-14 15:27:07 -05:00
marcin mikołajczak 0fcdcc2300 Use User.full_nickname/1 in oauth html template 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-02-09 16:46:45 +01:00
Mark Felder 9f2319e50d RichMedia.Helpers: move the validate_page_url/1 function to the Parser module 
This will ensure that the page validation happens in Parser.parse/1 so it can be called from anywhere and still filter invalid URLs.
 2024-02-06 18:34:02 -05:00
Mark Felder 6b7b443ff9 Pleroma.Web.RichMedia.Parser: Remove test-specific codepaths 
Also consolidate Tesla mocks into the HttpRequestMock module.

Tests were not exercising the real codepaths. The Rich Media Preview only works with https, but most of these tests were only mocking http.
 2024-02-06 18:33:54 -05:00
Mark Felder 0cc038b67c Ensure URLs with IP addresses for the host do not generate previews 2024-02-05 00:09:37 -05:00
Mark Felder 579561e97b URI.authority is deprecated 2024-02-04 23:49:07 -05:00
Mark Felder 04fc4eddaa Fix Rich Media Previews for updated activities 
The Rich Media Previews were not regenerated when a post was updated due to a cache invalidation issue. They are now cached by the activity id so they can be evicted with the other activity cache objects in the :scrubber_cache.
 2024-02-04 23:47:04 -05:00
Mark Felder 518a38577b Fix dialyzer errors due to deprecated usage of put_layout/2 2024-01-31 14:55:11 -05:00
Mark Felder 97c4d3bcc9 Pleroma.Web.Plugs.RateLimiter.Supervisor: dialyzer error 
lib/pleroma/web/plugs/rate_limiter/supervisor.ex:12:no_return
Function init/1 has no local return.
 2024-01-31 13:12:56 -05:00
Mark Felder 92992c022d Pleroma.Web.OAuth.OAuthController: dialyzer error 
validate_scopes/2 can never receive a map as it is only called in one place with a guard requiring a list

lib/pleroma/web/o_auth/o_auth_controller.ex:615:guard_fail
The guard test:

is_map(_params :: maybe_improper_list())

can never succeed.
 2024-01-31 11:29:06 -05:00
Mark Felder 5e8bedcca0 Pleroma.Web.PleromaAPI.MascotController: fix dialyzer error due to bad error match 
lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:37:pattern_match
The pattern can never match the type.

Pattern:
{:content_type, _}

Type:
{:error, _}

________________________________________________________________________________
lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:40:pattern_match
The pattern can never match the type.

Pattern:
{:upload, {:error, _}}

Type:
{:error, _}
 2024-01-31 11:15:48 -05:00
Mark Felder ed2f8e45e9 Pleroma.Web.MastodonAPI.SearchController: fix dialyzer errors 
Add a separate Pagination.paginate_list/2 function instead of overloading paginate/4 and complicating its matching and @spec
 2024-01-31 11:12:41 -05:00
Mark Felder c6f783c551 Pleroma.Web.ControllerHelper: fix @spec to resolve dialyzer errors 
lib/pleroma/web/admin_api/controllers/user_controller.ex:333:no_return
Function index/2 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:357:unused_fun
Function maybe_parse_filters/1 will never be called.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:366:no_return
Function page_params/1 has no local return.
________________________________________________________________________________
lib/pleroma/web/admin_api/controllers/user_controller.ex:368:call
The function call will not succeed.

Pleroma.Web.ControllerHelper.fetch_integer_param(_params :: any(), :page, 1)

breaks the contract
(map(), String.t(), integer() | nil) :: integer() | nil
 2024-01-31 11:01:37 -05:00
Mark Felder 225afe05b3 Pleroma.Web.TwitterAPI.UtilController: fix dialyzer errors with replace_params: false 2024-01-31 10:13:02 -05:00
Mark Felder b8db67dafa Pleroma.Web.MastodonAPI.StatusController: fix dialzyer errors with replace_params: false 2024-01-31 10:13:02 -05:00
Mark Felder 9760149886 Pleroma.Web.PleromaAPI.UserImportController: fix dialyzer errors with replace_params: false 2024-01-31 10:13:02 -05:00
Mark Felder c39e4dd214 Pleroma.Web.PleromaAPI.NotificationController: fix dialyzer errors with replace_params: false 2024-01-31 10:13:02 -05:00
Mark Felder e157fd60ee Pleroma.Web.PleromaAPI.MascotController: fix dialyzer errors with replace_params: false 2024-01-31 10:13:02 -05:00
Mark Felder 9d16393d8b Pleroma.Web.PleromaAPI.EmojiPackController: fix dialyzer errors with replace_params: false 2024-01-31 10:13:02 -05:00