Commit Graph

16109 Commits

Author SHA1 Message Date
Moon Man 428d6e34b5 Merge branch 'streams-fixes' into spc2 2024-05-21 23:52:11 +00:00
Moon Man aee44ac25e properly get actor from key id for Streams. 2024-05-21 23:50:35 +00:00
Moon Man 3edba7943b Merge remote-tracking branch 'upstream/develop' into spc2 2024-05-21 23:47:03 +00: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
marcin mikołajczak 36fa0debfe Fix `get_notified_from`
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2024-05-20 23:25:50 +02:00
Moon Man a5b041c03b Merge remote-tracking branch 'upstream/qdrant-search-2' into spc2 2024-05-19 14:15:06 +00:00
Moon Man 9bbf4c9238 Merge remote-tracking branch 'upstream/develop' into spc2 2024-05-19 14:14:51 +00: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 dbaab6f54e Docs: Mention running the Qdrant server 2024-05-19 13:38:31 +04:00
Lain Soykaf 6ec306d068 Docs: Add more information about index memory consumption. 2024-05-19 13:24:24 +04:00
Lain Soykaf 6a3a0cc0f5 Docs: Write docs for the QdrantSearch 2024-05-19 13:20:37 +04:00
Lain Soykaf 23881842ae B FastembedAPI: Add readme 2024-05-19 13:04:27 +04:00
Lain Soykaf 8329ad5214 B FastembedAPI: Add requirements.txt 2024-05-19 12:59:03 +04:00
Lain Soykaf dd48810186 B FastembedAPI: Move to more appropriate folder 2024-05-19 12:47:08 +04:00
Lain Soykaf e142ea400a Docs: Switch docs from Ollama to OpenAI. 2024-05-19 12:42:08 +04:00
Lain Soykaf c139a9f38c B Config: Set default Qdrant embedder to our fastembed-api server 2024-05-19 12:39:54 +04:00
Lain Soykaf b9af017a4c B FastembedServer: Switch to OpenAI api, support changing models 2024-05-19 12:33:49 +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 39525bcec7 Add qdrant changelog 2024-05-18 14:07:47 +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
marcin mikołajczak 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
Lain Soykaf 61e9027131 Add docker compose file for fastembed server 2024-05-18 12:19:42 +04:00
Lain Soykaf 769773a500 Add dockerfile 2024-05-18 12:08:42 +04:00
Lain Soykaf 069ce4448c Add basic fastembed server 2024-05-18 11:55:17 +04:00
Moon Man 4c3ef52a12 Merge remote-tracking branch 'upstream/develop' into spc2 2024-05-16 23:38:53 +00:00
feld 99eab1fa2a Merge branch 'revert-e944b152' into 'develop'
Revert "Merge branch 'strip-object-actor' into 'develop'"

See merge request pleroma/pleroma!4112
2024-05-16 23:34:00 +00:00
feld 9988dc2227 Revert "Merge branch 'strip-object-actor' into 'develop'"
This reverts merge request !4105
2024-05-16 23:33:48 +00:00
feld 7de657ac45 Merge branch 'bad-mrf' into 'develop'
Startup detection for configured MRF modules that are missing or incorrectly defined

See merge request pleroma/pleroma!4110
2024-05-16 20:37:37 +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
Mark Felder 43f194c434 Include one scrobble with account 2024-05-16 17:53:19 +00:00
Moon Man 1750164b2b Merge remote-tracking branch 'upstream/develop' into spc2 2024-05-16 17:52:11 +00: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
Mark Felder 2965ed47bd Changelog for stripping actor from objects 2024-05-15 16:40:31 -04: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
Moon Man d83a15e879 Merge remote-tracking branch 'upstream/qdrant-search-2' into spc2 2024-05-14 13:50:45 +00:00
Moon Man 80e0e0c466 Merge remote-tracking branch 'upstream/develop' into spc2 2024-05-14 13:50:29 +00:00
Lain Soykaf 1261c43a7a SearchBackend: Add create_index 2024-05-14 17:19:36 +04:00
Lain Soykaf c50f0f31f4 Docs/Search: Add basic documentation of the qdrant search 2024-05-14 16:56:58 +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