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

9609 Commits

Author SHA1 Message Date
Moon Man 2b18b2c5bd Merge remote-tracking branch 'upstream/qdrant-search-2' into spc2 2024-05-23 14:56:02 +00:00
Lain Soykaf a566ad56e1 QdrantSearch: Fix actor / author restriction 2024-05-23 18:55:16 +04:00
Moon Man 696b916c7c Merge remote-tracking branch 'upstream/qdrant-search-2' into spc2 2024-05-23 14:03:58 +00:00
Lain Soykaf 94e4f21589 QdrantSearch: Deal with actor restrictions 2024-05-23 14:38:30 +04:00
Moon Man 9d23feeb87 Merge remote-tracking branch 'upstream/develop' into spc2 2024-05-22 18:30:08 +00: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
marcin mikołajczak 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
marcin mikołajczak 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
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 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
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
Moon Man 4c3ef52a12 Merge remote-tracking branch 'upstream/develop' into spc2 2024-05-16 23:38:53 +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
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
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 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
marcin mikołajczak 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