Lain Soykaf
4d6316b488
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject-replies-to-deleted
2024-05-27 15:19:53 +04:00
Lain Soykaf
ddf103eca0
QdrantSearch: Fetch a post in search if possible.
2024-05-27 14:35:08 +04:00
Lain Soykaf
f4c04e6b2d
QdrantSearch: Add health checks.
2024-05-27 14:21:55 +04:00
Lain Soykaf
8b76f56050
QdrantSearch: Add healthcheck for qdrant
2024-05-27 14:01:17 +04:00
Lain Soykaf
08e9d995f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into qdrant-search-2
2024-05-27 13:50:22 +04:00
lain
5e43060128
Merge branch 'search-healthcheck' into 'develop'
...
Search backend healthcheck process
See merge request pleroma/pleroma!4120
2024-05-27 09:46:57 +00:00
Lain Soykaf
d35b69d268
Pleroma.Search: Remove wrong (but irrelevant) results
2024-05-27 13:18:02 +04:00
Mark Felder
d9b82255b9
Add an HTTP timeout for the healthcheck
2024-05-26 15:23:12 -04:00
Mark Felder
d4769b076a
Return a 422 when trying to reply to a deleted status
2024-05-26 15:14:48 -04:00
Mark Felder
f2b0d5f1d0
Make it easier to read the state for debugging purposes and expose functions for testing
2024-05-26 14:11:41 -04:00
Mark Felder
807782b7f9
Fix rich media parsing some Amazon URLs
2024-05-26 14:02:20 -04:00
Mark Felder
3474b42ce3
Drop TTL to 5 seconds
2024-05-25 16:55:29 -04:00
Mark Felder
61a3b79316
Search backend healthcheck process
2024-05-25 16:07:47 -04:00
4cab6a9db0
Fix tests and regressions
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-23 17:05:52 +02:00
Lain Soykaf
a566ad56e1
QdrantSearch: Fix actor / author restriction
2024-05-23 18:55:16 +04:00
38bff08bad
Fix warning
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-23 13:13:24 +02:00
Lain Soykaf
94e4f21589
QdrantSearch: Deal with actor restrictions
2024-05-23 14:38:30 +04:00
2478532869
Fix warnings
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-23 12:12:56 +02:00
Lain Soykaf
f726e5fbbd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into qdrant-search-2
2024-05-22 20:07:43 +04:00
9876411269
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22 17:17:04 +02:00
d0b18e338b
Fix validate_webfinger when running a different domain for Webfinger
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-22 15:52:35 +02:00
1f2f7e044d
Revert "Webfinger: Allow managing account for subdomain"
...
This reverts commit 84bb854056
2024-05-22 15:52:10 +02:00
Lain Soykaf
84bb854056
Webfinger: Allow managing account for subdomain
2024-05-22 15:12:29 +04:00
Alex Gleason
b15f8b0642
Prevent webfinger spoofing
2024-05-22 12:57:45 +04:00
lain
7fca598268
Merge branch 'status-notification-type' into 'develop'
...
Add "status" notification type
See merge request pleroma/pleroma!3659
2024-05-21 05:01:45 +00:00
7a2b731f25
Fix get_notified_from
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-20 23:34:13 +02:00
d7f90782e2
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-20 23:32:49 +02:00
36fa0debfe
Fix get_notified_from
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-20 23:25:50 +02:00
Lain Soykaf
c67506ba68
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into auth-fetch-exception
2024-05-20 18:21:46 +04:00
lain
e8cd6662eb
Merge branch 'familiar-followers' into 'develop'
...
Implement `/api/v1/accounts/familiar_followers`
See merge request pleroma/pleroma!4098
2024-05-19 12:05:55 +00:00
Lain Soykaf
1b4f1db9b2
QdrantSearch: Support pagination.
2024-05-19 14:41:05 +04:00
Lain Soykaf
72ec261a69
B QdrantSearch: Switch to OpenAI api
2024-05-19 12:17:46 +04:00
Lain Soykaf
cc1321ea2e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into qdrant-search-2
2024-05-19 11:51:33 +04:00
lain
401aca2548
Merge branch 'mark-read' into 'develop'
...
PleromaAPI: Simplify marking notifications as read
See merge request pleroma/pleroma!4111
2024-05-19 07:48:32 +00:00
Mark Felder
d07d49227f
PleromaAPI: marking notifications as read no longer returns notifications
2024-05-18 18:17:35 +00:00
Lain Soykaf
3345ddd2d4
Linting
2024-05-18 15:02:22 +04:00
Lain Soykaf
7923ede8ba
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into qdrant-search-2
2024-05-18 14:45:26 +04:00
Lain Soykaf
e3933a067f
QdrantSearch: Implement post deletion
2024-05-18 14:04:32 +04:00
Lain Soykaf
933117785f
QdrantSearch: Add basic test
2024-05-18 13:43:47 +04:00
2e76ceb5b4
Merge remote-tracking branch 'origin/develop' into status-notification-type
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-18 11:30:25 +02:00
cc4fccdd80
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-17 18:44:47 +02:00
feld
9988dc2227
Revert "Merge branch 'strip-object-actor' into 'develop'"
...
This reverts merge request !4105
2024-05-16 23:33:48 +00:00
Mark Felder
7f8a9329e5
Startup detection for configured MRF modules that are missing or incorrectly defined
2024-05-16 16:13:29 -04:00
Lain Soykaf
a9be4907c0
SearchBackend: Add drop_index
2024-05-16 10:47:24 +04:00
feld
e944b15298
Merge branch 'strip-object-actor' into 'develop'
...
Strip actor from objects before federating
Closes #3269
See merge request pleroma/pleroma!4105
2024-05-15 20:51:47 +00:00
feld
53ef576739
Merge branch 'instance_rules' into 'develop'
...
Instance rules
See merge request pleroma/pleroma!3669
2024-05-15 20:29:04 +00:00
feld
8da103da57
Merge branch 'fix-muted-web-push' into 'develop'
...
Fix processing of Web Push and streaming notifications
See merge request pleroma/pleroma!4032
2024-05-15 20:12:41 +00:00
adbd40049d
Merge remote-tracking branch 'mkljczk-github/fork' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 18:11:23 +02:00
7a03e49c4d
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 18:10:03 +02:00
8c3f306c62
Revert to pleroma' card parser
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 17:54:13 +02:00
aceff8c128
Remove duplicated code
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-14 16:44:33 +02:00
Lain Soykaf
1261c43a7a
SearchBackend: Add create_index
2024-05-14 17:19:36 +04:00
Lain Soykaf
1490ff30af
QdrantSearch: Add query prefix.
2024-05-14 15:09:38 +04:00
Lain Soykaf
bb08a766f4
QdrantSearch: Remove debugging stuff
2024-05-14 14:26:41 +04:00
Lain Soykaf
cd7e2138d1
Search: Basic Qdrant/Ollama search
2024-05-14 14:13:37 +04:00
feld
c954437cc0
Merge branch 'mastodon-instance-v2' into 'develop'
...
Add new values to /api/v2/instance
Closes #3250 and #3251
See merge request pleroma/pleroma!4106
2024-05-11 12:11:00 +00:00
Mark Felder
16c72d0701
Merge branch 'develop' into fix-muted-web-push
2024-05-11 08:06:04 -04:00
faried nawaz
1bf3ae07b6
add options to mix pleroma.database prune_objects to delete more activities
2024-05-09 10:43:34 +05:00
818d9f7b63
Include image description in status media cards
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-08 13:40:26 -04:00
Mark Felder
54c2bab25f
Fix module struct matching
2024-05-07 22:27:18 -04:00
Mark Felder
9a83301ff8
Credo
2024-05-07 22:11:19 -04:00
Mark Felder
37c35daba6
Credo
2024-05-07 22:10:49 -04:00
Mark Felder
9b9a32bf74
Fix compile warning
...
warning: "else" clauses will never match because all patterns in "with" will always match
lib/pleroma/web/rich_media/parser/ttl/opengraph.ex:10
2024-05-07 21:56:27 -04:00
Mark Felder
19002fd6c1
Mastodon API: Remove deprecated GET /api/v1/statuses/:id/card endpoint
...
Removed back in 2019
https://github.com/mastodon/mastodon/pull/11213
2024-05-08 01:44:58 +00:00
Mark Felder
5a5a193877
Fix broken Rich Media parsing when the image URL is a relative path
2024-05-07 19:54:56 -04:00
Mark Felder
d21aa1a77c
Respect the TTL returned in OpenGraph tags
2024-05-07 19:54:56 -04:00
Mark Felder
df0734fcbf
Increase the :max_body for Rich Media to 5MB
...
Websites are increasingly getting more bloated with tricks like inlining content (e.g., CNN.com) which puts pages at or above 5MB. This value may still be too low.
2024-05-07 19:54:56 -04:00
Mark Felder
ede414094f
RichMedia refactor
...
Rich Media parsing was previously handled on-demand with a 2 second HTTP request timeout and retained only in Cachex. Every time a Pleroma instance is restarted it will have to request and parse the data for each status with a URL detected. When fetching a batch of statuses they were processed in parallel to attempt to keep the maximum latency at 2 seconds, but often resulted in a timeline appearing to hang during loading due to a URL that could not be successfully reached. URLs which had images links that expire (Amazon AWS) were parsed and inserted with a TTL to ensure the image link would not break.
Rich Media data is now cached in the database and fetched asynchronously. Cachex is used as a read-through cache. When the data becomes available we stream an update to the clients. If the result is returned quickly the experience is almost seamless. Activities were already processed for their Rich Media data during ingestion to warm the cache, so users should not normally encounter the asynchronous loading of the Rich Media data.
Implementation notes:
- The async worker is a Task with a globally unique process name to prevent duplicate processing of the same URL
- The Task will attempt to fetch the data 3 times with increasing sleep time between attempts
- The HTTP request obeys the default HTTP request timeout value instead of 2 seconds
- URLs that cannot be successfully parsed due to an unexpected error receives a negative cache entry for 15 minutes
- URLs that fail with an expected error will receive a negative cache with no TTL
- Activities that have no detected URLs insert a nil value in the Cachex :scrubber_cache so we do not repeat parsing the object content with Floki every time the activity is rendered
- Expiring image URLs are handled with an Oban job
- There is no automatic cleanup of the Rich Media data in the database, but it is safe to delete at any time
- The post draft/preview feature makes the URL processing synchronous so the rendered post preview will have an accurate rendering
Overall performance of timelines and creating new posts which contain URLs is greatly improved.
2024-05-07 19:54:56 -04:00
feld
750fb25f48
Revert "Merge branch 'pleroma-card-image-description' into 'develop'"
...
This reverts merge request !4101
2024-05-07 23:20:38 +00:00
Mark Felder
06c26bf9c9
Add the absent max_featured_tags to the api spec for /api/v1/instance
2024-05-07 17:46:05 -04:00
Mark Felder
b979389958
Add configuration[accounts][max_pinned_statuses] to /api/v2/instance
...
Also add the absent max_featured_tags to the api spec for /api/v2/instance
2024-05-07 17:45:02 -04:00
Mark Felder
3cad57bf48
Add configuration[statuses][characters_reserved_per_url] to /api/v2/instance
...
Fixes #3250
2024-05-07 17:25:30 -04:00
Mark Felder
dd03184811
Strip actor from objects before federating
2024-05-07 11:54:45 -04:00
0e608c98b2
Rename project to pl
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-28 23:02:11 +02:00
0bf8a2e38c
Merge remote-tracking branch 'origin/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-27 20:26:16 +02:00
Haelwenn
88412daf11
Apply @lanodan's suggestion
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-25 12:34:12 +02: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
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
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
cd86965cde
Add hint to rules
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 12:01:04 +02:00
7b1134b18c
Use Repo.exists?
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:58:30 +02:00
1745b128f9
AdminAPI: Allow filtering reports by rule_id
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:58:25 +02:00
3d09ea0fca
Apply, suggestions, use strings for actual Mastodon API compatibility
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:57:28 +02:00
ccc3ac241f
Add hint to rules
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:45:19 +02:00
9e6cf45906
/api/v1/accounts/familiar_followers
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-04-06 11:43:56 +02:00
01a5f839c5
Merge remote-tracking branch 'origin/develop' into instance_rules
2024-04-06 10:42:23 +02:00
3720c4ac22
Remove duplicate routes
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-24 13:14:58 +01:00
512db8f6dc
Remove service_domain leftovers
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-24 13:10:18 +01:00
5a6be1dd6e
Merge remote-tracking branch 'origin/develop' into fork
2024-03-21 00:00:28 +01:00
7d85bec6a1
Fix alias
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-20 14:28:43 +01: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
9f4829695b
Merge branch 'bookmark-folders' into HEAD
2024-03-20 13:25:30 +01:00
37ec645ff2
Fix BookmarkFolderView, add test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-20 13:24:43 +01:00
Mark Felder
40823462e7
Logger metadata for request path and authenticated user
2024-03-19 12:15:10 -04:00
Mark Felder
7dfd148ff8
Logger metadata for inbound federation requests
2024-03-19 12:15:10 -04:00
Mark Felder
741f22bfe0
MediaHelper: cache failed URLs for 15 minutes to prevent excessive retries
2024-03-19 12:14:03 -04:00
Mark Felder
c25fda34e7
Skip generating notifications for internal users
2024-03-19 12:11:30 -04:00
Mark Felder
291d531e4c
Unify notification push and streaming events for both local and federated activities
...
This also removes generation of notifications for blocked/filtered/muted users and threads.
2024-03-19 12:11:30 -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
8b92459345
Merge remote-tracking branch 'origin/develop' into HEAD
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-18 22:00:35 +01:00
Mark Felder
1413d2e517
Remove vestiges of old Postgres support
2024-03-18 15:42:15 -04:00
60c4cb21ea
InstanceView: Update features
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-18 14:02:29 +01:00
918c406a91
Merge remote-tracking branch 'origin/develop' into instance_rules
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-18 13:50:25 +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
0fb0d081cc
Merge branch 'backups-chats' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:48:54 +01:00
909b4380d9
Fix attachments
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:41:45 +01:00
3a23924ee8
Reject requests from specified instances if authorized_fetch_mode is enabled
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:38:40 +01:00
51edd70319
Merge branch 'bookmark-folders' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:32:16 +01:00
0e6c94f857
Merge branch 'backups' into fork
2024-03-14 23:30:57 +01:00
53a73aada2
Merge branch 'multitenancy' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:29:24 +01:00
fb572f5aa6
Fix adding language to json ld header, add transmogrifier test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:24:38 +01:00
281c82a49b
Add language from activity context in ObjectValidator
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:24:24 +01:00
c5a05a8e14
Rename test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:23:52 +01:00
86f2545068
Rename MapOfString to ContentLanguageMap
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:23:05 +01:00
92335a3fba
Move is_good_locale_code? to object validator
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:23:00 +01:00
cf9ecddbee
Remove test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:22:22 +01:00
bdff856ab8
Move maybe_add_content_map out of Transmogrifier, use code from tusooa's branch for MapOfString
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:22:15 +01:00
68d2cb9f5b
Move maybe_add_language to CommonFixes
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:21:05 +01:00
edec300ddb
Make status.language == nil for 'und' value
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:18:55 +01:00
adb84b1df9
Add ObjectValidators.LanguageCode type
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:18:36 +01:00
Haelwenn
e32116131a
Apply lanodan's suggestion
2024-03-14 23:18:24 +01:00
bf2a10331e
Allow to specify post language
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:18:17 +01:00
70a697201e
Gancio support
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:13:26 +01:00
6e6d07d9d4
Update Pleroma API docs
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:13:20 +01:00
fa725d50a7
Test "content" for Mobilizon statuses
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:12:27 +01:00
1b6301fee7
Use 'schema' alias for schema.org
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:12:23 +01:00
e74996b732
Update operation tags
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:07:00 +01:00
e9e2b18650
Merge branch 'webhooks_' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:06:25 +01:00
a97334520b
Fixes
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 23:00:48 +01:00
612e6284b4
Remove unneeded code
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-14 22:50:10 +01:00
0f33698747
Merge remote-tracking branch 'origin/develop' into fork
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 23:08:40 +01:00
bd33a7ac8f
Remove stuff I don't need to stay closer to upstream
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 16:07:29 +01:00
3c21a33656
Backup chats and chat messages
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-03-12 10:57:59 +01:00
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
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
b7c625db0f
Merge remote-tracking branch 'origin/develop' into link-verification
2024-03-07 13:13:49 +01:00
