Commit Graph

1690 Commits

Author SHA1 Message Date
Alex Gleason 7784025fa3 Merge branch 'reblogs-replies-fix' into 'main'
Fix reblogs showing up in replies

See merge request soapbox-pub/ditto!334
2024-05-30 16:35:20 +00:00
Alex Gleason c9302cae6a
Fix reblogs showing up in replies 2024-05-30 11:31:33 -05:00
Alex Gleason f874d3e137 Merge branch 'fix-streaming' into 'main'
Fix streaming token

See merge request soapbox-pub/ditto!332
2024-05-30 03:04:04 +00:00
Alex Gleason 74e141ba08
Fix streaming token 2024-05-29 21:57:53 -05:00
Alex Gleason 29a2a4ecdb Merge branch 'created_at-max-value' into 'main'
Enforce a created_at max value

See merge request soapbox-pub/ditto!331
2024-05-29 23:30:02 +00:00
Alex Gleason 60b762a165
Enforce a created_at max value 2024-05-29 18:26:10 -05:00
Alex Gleason 1ad1808ee2 Merge branch 'connections' into 'main'
Add OAuth tokens

See merge request soapbox-pub/ditto!325
2024-05-29 21:44:52 +00:00
Alex Gleason 03c6f23605
Use a specific version of nostr-tools 2024-05-29 16:29:46 -05:00
Alex Gleason 625b9a3ae5
ReadOnlySigner: improve error message 2024-05-29 16:16:17 -05:00
Alex Gleason 7221b5f203
grant_type nostr -> nostr_bunker, connections -> nip46_tokens 2024-05-29 16:14:21 -05:00
Alex Gleason b805c4c67e Merge branch 'fix-get-ln-invoice-header' into 'main'
CORS - Expose 'Ln-Invoice' header

See merge request soapbox-pub/ditto!330
2024-05-29 12:13:53 +00:00
P. Reis 83020e9111 fix: expose 'Ln-Invoice' header 2024-05-29 09:02:17 -03:00
Alex Gleason 153c115f24 Merge branch 'fix-get-invoice' into 'main'
ZapController - Purify event before calling getInvoice()

See merge request soapbox-pub/ditto!329
2024-05-29 02:16:49 +00:00
P. Reis 27ed364f4a fix(zapController): purify event before getting invoice 2024-05-28 22:42:00 -03:00
Alex Gleason a617e32d65
Merge remote-tracking branch 'origin/main' into connections 2024-05-28 18:28:50 -05:00
Alex Gleason e29519e877 Merge branch 'rm-nwc' into 'main'
Remove NWC, return a Ln-Invoice header on the zap endpoint

See merge request soapbox-pub/ditto!328
2024-05-28 22:10:56 +00:00
Alex Gleason 78044cc8b6
Remove NWC, return a Ln-Invoice header on the zap endpoint 2024-05-28 16:54:57 -05:00
Alex Gleason 5d05d1d570
Merge remote-tracking branch 'origin/main' into connections 2024-05-28 16:01:49 -05:00
Alex Gleason a690fa3096 Merge branch 'fix-zap-remove-user-field-check' into 'main'
Allow zap request event to proceed even if it does not have a 'user' field

See merge request soapbox-pub/ditto!327
2024-05-28 20:45:44 +00:00
P. Reis a519637bee fix(pipeline-zap): allow 'event' to proceed even without 'user' field 2024-05-28 17:40:10 -03:00
Alex Gleason 5f73232418
relay: remove enforceFilters function 2024-05-28 14:51:07 -05:00
Alex Gleason 981f8c5d22
relay: remove enforceFilters function 2024-05-28 13:59:57 -05:00
Alex Gleason a6a74a16a8
Have OAuth form accept a bunker URI 2024-05-28 13:48:27 -05:00
Alex Gleason 1aa2bafc44
OAuth: add a "nostr" grant_type 2024-05-26 21:26:59 -05:00
Alex Gleason c55cd2a977
blob -> bytea 2024-05-26 20:41:14 -05:00
Alex Gleason b1a497b127
signerMiddleware: accept token1 bech32's 2024-05-26 20:27:46 -05:00
Alex Gleason 0141a732c3
Add connections table 2024-05-26 19:21:15 -05:00
Alex Gleason 11474c5cbd Merge branch 'postgres' into 'main'
Test Postgres in the CI

See merge request soapbox-pub/ditto!324
2024-05-26 23:51:52 +00:00
Alex Gleason 8f3b9df1e1
Test Postgres in the CI 2024-05-26 18:42:14 -05:00
Alex Gleason a6cae8f878
renderAccount: display_name cannot be undefined 2024-05-26 12:59:04 -05:00
Alex Gleason 1fff0834eb Merge branch 'fix-reblog' into 'main'
Fix renderReblog on other Mastodon apps

See merge request soapbox-pub/ditto!323
2024-05-26 17:57:40 +00:00
Alex Gleason 875b678948
Fix renderReblog on other Mastodon apps 2024-05-26 12:55:01 -05:00
Alex Gleason 30881275ad Merge branch 'encrypted-tag' into 'main'
Add `encrypted` tag to Pleroma configs event

See merge request soapbox-pub/ditto!322
2024-05-26 17:45:44 +00:00
Alex Gleason c03be1726e
Add `encrypted` tag to Pleroma configs event 2024-05-26 12:43:08 -05:00
Alex Gleason 3f9908449b Merge branch 'dont-encrypt-settings' into 'main'
Don't encrypt settings_store

See merge request soapbox-pub/ditto!321
2024-05-26 17:37:09 +00:00
Alex Gleason a66df583fb
Don't encrypt settings_store 2024-05-26 12:34:18 -05:00
Alex Gleason d6727d2d09 Merge branch 'ping' into 'main'
Set idleTimeout to 30s for WebSocket connections

See merge request soapbox-pub/ditto!320
2024-05-25 19:12:14 +00:00
Alex Gleason 16558e24c9
Set idleTimeout to 30s for WebSocket connections 2024-05-25 13:39:19 -05:00
Alex Gleason 6bfe611847 Merge branch 'rm-optimizer' into 'main'
Remove Optimizer and Reqmeister

See merge request soapbox-pub/ditto!319
2024-05-25 17:24:58 +00:00
Alex Gleason a15013e22a
Remove Optimizer and Reqmeister 2024-05-25 12:22:01 -05:00
Alex Gleason b77e14dac3 Merge branch 'pipeline-encounter-race' into 'main'
pipeline: fix race condition in encounterEvent

See merge request soapbox-pub/ditto!318
2024-05-25 17:16:55 +00:00
Alex Gleason 6684edaeaf
pipeline: fix race condition in encounterEvent 2024-05-25 12:13:55 -05:00
Alex Gleason 4111d8b3cb Merge branch 'file-routes' into 'main'
Optimize filesystem routes

See merge request soapbox-pub/ditto!317
2024-05-25 16:55:24 +00:00
Alex Gleason 1ee0ca8d5c
Optimize filesystem routes 2024-05-25 11:18:17 -05:00
Alex Gleason 40f72f750e Merge branch 'assemble-events-bench' into 'main'
Add benchmark for assembleEvents

See merge request soapbox-pub/ditto!316
2024-05-25 15:52:10 +00:00
Alex Gleason 1ffc1fc8f4
hydrate.bench: move the `events` variable above the bench 2024-05-25 10:49:09 -05:00
Alex Gleason 3c950fb4ba
Update assembleEvents bench with stats 2024-05-25 10:40:23 -05:00
Alex Gleason 14e5948394
Add assembleEvents bench 2024-05-25 10:33:23 -05:00
Alex Gleason 40369be6c6 Merge branch 'fix-schema-update-credentials' into 'main'
Only allow valid data or empty string in update credentials

See merge request soapbox-pub/ditto!315
2024-05-25 14:34:43 +00:00
Alex Gleason c89867f486
Remove unused NostrMetadata import 2024-05-25 09:25:09 -05:00