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

9522 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
lain 87b8ac3ce6 Merge branch 'receiverworker-error-handling' into 'develop' 
ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …}

See merge request pleroma/pleroma!4100
 2024-04-19 06:04:44 +00:00
Haelwenn 71a0373232 Merge branch 'ffmpeg-limiter' into 'develop' 
Prevent Media Helper from respawning ffmpeg for bad media

See merge request pleroma/pleroma!4086
 2024-04-17 05:47:54 +00:00
Haelwenn (lanodan) Monnier a299ddb10e
ReceiverWorker: Make sure non-{:ok, _} is returned as {:error, …} 
Otherwise an error like `{:signature, {:error, {:error, :not_found}}}` ends up considered a success.
 2024-04-17 07:43:47 +02: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
Mark Felder 741f22bfe0 MediaHelper: cache failed URLs for 15 minutes to prevent excessive retries 2024-03-19 12:14:03 -04: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
Mark Felder 1413d2e517 Remove vestiges of old Postgres support 2024-03-18 15:42:15 -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
Matthieu Rakotojaona a48f5f860e Notifications: filter on users rather than activities 2024-03-17 20:58:59 +01: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
feld 0b5bba23ce Merge branch 'backups' into 'develop' 
Include following/followers in backups

See merge request pleroma/pleroma!4085
 2024-03-15 19:32:35 +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 bb0b17f4d9 Include following/followers in backups 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2024-03-10 23:53:12 +01:00
tusooa df7a8d4efe Merge branch 'instance-contact-account' into 'develop' 
Add contact account to InstanceView

See merge request pleroma/pleroma!3960
 2024-03-10 13:14:19 +00:00
feld 72daf522c9 Merge branch 'fix-framegrabs' into 'develop' 
Fix ffmpeg framegrabs with Exile

See merge request pleroma/pleroma!4087
 2024-03-08 14:48:26 +00: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
Mark Felder 54ff7234b9 Fix ffmpeg framegrabs with Exile 2024-03-07 17:38:21 -05:00
marcin mikołajczak b7c625db0f Merge remote-tracking branch 'origin/develop' into link-verification 2024-03-07 13:13:49 +01:00
tusooa 47ce33a90d Apply tusooa's suggestion 2024-03-07 11:55:31 +00: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
Haelwenn 03e54aaba9 Merge branch 'remote-fetcher-error' into 'develop' 
RemoteFetcherWorker: Make sure {:error, _} is returned on failure

See merge request pleroma/pleroma!4077
 2024-02-24 11:37:34 +00:00
Mark Felder f4e48bc53e Rename variable to make the worker retry logic easier to read 
The boolean value matches the intent of the "last_attempt" variable name now
 2024-02-23 11:12:10 -05:00
Haelwenn (lanodan) Monnier 6af6a9704d
RemoteFetcherWorker: Make sure {:error, _} is returned on failure 
Otherwise jobs are considered a success.
 2024-02-23 01:59:30 +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
Mark Felder ac55764599 Gun Connection Pool was not attempting to free a connection and retry once if the pool was full. 2024-02-22 14:07:46 -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 f28dcc9cb7 Merge branch 'config-stat-symlink' into 'develop' 
Config: Check the permissions of the linked file instead of the symlink

See merge request pleroma/pleroma!4061
 2024-02-15 01:48:03 +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
feld 802c618885 Merge branch 'atom-leaks' into 'develop' 
Fix minor atom leaks

See merge request pleroma/pleroma!4065
 2024-02-14 23:28:00 +00:00