Commit Graph
69 Commits
Author SHA1 Message Date
Max BrunsfeldandMarshall 25708088b7 Add requires_zed_cla column to channels table
Don't allow granting guests write access in a call where the channel
or one of its ancestors requires the zed CLA, until that guest has
signed the Zed CLA.

Co-authored-by: Marshall <marshall@zed.dev>
2024-01-22 16:41:24 -08:00
Max Brunsfeld 03e008959f Fix get_or_create_user test 2024-01-22 14:12:31 -08:00
Max BrunsfeldandMikayla 1981de4cae Add REST APIs for getting and adding contributors
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-22 10:48:33 -08:00
Max Brunsfeld 9f04fd9019 For impersonating access tokens, store impersonatee in the new column
This way, we don't need an index on both columns
2024-01-17 18:06:16 -08:00
Max BrunsfeldandMarshall ab1bea515c Store the impersonator id on access tokens created via ZED_IMPERSONATE
* Use the impersonator id to prevent these tokens from counting
  against the impersonated user when limiting the users' total
  of access tokens.
* When connecting using an access token with an impersonator
  add the impersonator as a field to the tracing span that wraps
  the task for that connection.
* Disallow impersonating users via the admin API token in production,
  because when using the admin API token, we aren't able to identify
  the impersonator.

Co-authored-by: Marshall <marshall@zed.dev>
2024-01-17 18:06:16 -08:00
Conrad Irwin aed97f6c29 Use "test" consistently 2024-01-08 14:07:18 -07:00
Max BrunsfeldandMikayla 0cf65223ce Remove 2 suffix for collab, rope, settings, menu
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:29:16 -08:00
Max Brunsfeld 4479628342 Prevent moving a channel into its descendant 2023-12-01 11:41:38 -08:00
Max Brunsfeld b5cbfb8f1d Allow moving channels to the root 2023-10-25 15:50:37 +02:00
Max Brunsfeld 32367eba14 Set up UI to allow dragging a channel to the root 2023-10-25 15:39:02 +02:00
5c03b6a610 Remove logic for multiple channel parents
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
Co-authored-by: Joseph <joseph@zed.dev>
2023-10-24 17:29:23 +02:00
Conrad Irwin ea4e67fb76 Merge branch 'main' into guest-exp 2023-10-23 17:47:21 +02:00
Conrad Irwin aa4b8d7246 Fix notifications for membership changes too 2023-10-19 23:05:06 -06:00
Max BrunsfeldandPiotr d62f114c02 Create notifications for mentioned users
Co-authored-by: Piotr <piotr@zed.dev>
2023-10-19 10:52:40 -07:00
Conrad Irwin 3853009d92 Refactor to avoid some (mostly hypothetical) races
Tidy up added code to reduce duplicity of X and X_internals.
2023-10-18 21:42:10 -06:00
Max Brunsfeld ac54d2b927 Fix possibility of extra mention insertion on nonce collision 2023-10-18 18:04:56 -07:00
Max Brunsfeld b07f9fe3b5 Merge branch 'main' into notifications 2023-10-18 17:20:04 -07:00
Max Brunsfeld d05404a4df Persist chat mentions 2023-10-18 16:56:03 -07:00
Conrad Irwin 70aed4a605 Sync Role as part of channels
Begin to fix guest notifications
2023-10-17 22:48:44 -06:00
Conrad Irwin 2456c077f6 Fix channel test ordering 2023-10-17 10:01:31 -06:00
Conrad Irwin 851701cb6f Fix get_most_public_ancestor 2023-10-17 09:41:34 -06:00
Conrad Irwin 2feb091961 Ensure that invitees do not have permissions
They have to accept the invite, (which joining the channel will do),
first.
2023-10-16 16:24:10 -06:00
Conrad Irwin 4e7b35c917 Make joining a channel as a guest always succeed 2023-10-16 15:14:13 -06:00
Conrad Irwin e20bc87152 Add some sanity checks for new user channel graph 2023-10-13 14:30:20 -06:00
Conrad Irwin 65a0ebf975 Update get_channel_participant_details to include guests 2023-10-12 21:36:21 -06:00
Conrad Irwin da2b8082b3 Rename members to participants in db crate 2023-10-12 20:42:42 -06:00
Conrad Irwin a7db2aa39d Add check_is_channel_participant
Refactor permission checks to load ancestor permissions into memory
for all checks to make the different logics more explicit.
2023-10-12 19:59:50 -06:00
Max Brunsfeld 034e9935d4 Remove old contact request notification mechanism, use notification instead 2023-10-12 17:42:32 -07:00
Conrad Irwin 540436a1f9 Push role refactoring through RPC/client 2023-10-12 13:05:54 -06:00
Conrad Irwin 690d9fb971 Add a role column to the database and start using it
We cannot yet stop using `admin` because stable will continue writing
it.
2023-10-11 20:05:57 -06:00
40430cf01b Update channel rooms to be ephemeral
Remove redundant live kit initialization code
Fix bug in recent channel links changes where channel rooms would have the incorrect release set

co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
co-authored-by: Max <max@zed.dev>
2023-10-10 12:39:16 -07:00
Conrad Irwin d4ef764305 Merge branch 'main' into links 2023-10-09 20:08:48 -06:00
Conrad Irwin 162cb19cff Only allow one release channel in a call 2023-10-09 12:59:18 -06:00
Max Brunsfeld 663649a100 Fix error in query for last N channel messages 2023-10-06 10:58:34 -07:00
Mikayla db8096ccdc Fix most tests for new chat changes 2023-10-03 20:50:17 -07:00
Max BrunsfeldandMikayla 61e0289014 Acknowledge channel notes and chat changes when views are active
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-10-03 17:40:10 -07:00
MikaylaandMax 32c4138758 Added db message and edit operation observation
Co-authored-by: Max <max@zed.dev>
2023-10-03 11:39:59 -07:00
Max BrunsfeldandMikayla 0db4b29452 Avoid N+1 query for channels with new messages
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-10-02 16:22:28 -07:00
Max BrunsfeldandMikayla d9d997b218 Avoid N+1 query for channels with notes changes
Also, start work on new timing for recording observed notes edits.

Co-authored-by: Mikayla <mikayla@zed.dev>
2023-10-02 15:58:34 -07:00
Mikayla 1d5b665f13 Implement channel changes for messages 2023-10-01 22:32:11 -07:00
Mikayla 51cf6a5ff3 Add database implementation of channel message change tracking 2023-10-01 22:32:11 -07:00
Mikayla 9ba975d6ad Channel notifications from the server works 2023-10-01 22:30:21 -07:00
Mikayla 1469c02998 Add observed_channel_notes table and implement note diffing 2023-10-01 22:26:27 -07:00
545b5e0161 Assign unique color indices to room participants, use those instead of replica_ids
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Antonio <antonio@zed.dev>
2023-09-28 11:06:09 -07:00
MikaylaandMax 4ff44dfa3b Fix bugs in moving channels that could cause channels to be stranded or moved unexpectedly
Made channel linking not query in a loop

co-authored-by: Max <max@zed.dev>
2023-09-20 15:32:06 -07:00
Mikayla dadad397ef Finish optimizing channel representations and operations 2023-09-18 20:24:37 -07:00
Mikayla 5f9c56c8b0 WIP: Send the channel name and the channel edges seperately, so we're not repeating them constantly
This commit is currently broken and includes debug data for a failed attempt at rewriting the insert_edge logic
2023-09-15 17:57:23 -07:00
Mikayla 363867c65b Make DAG tests order independent 2023-09-15 13:44:01 -07:00
Mikayla 5400605483 Fix merge conflicts 2023-09-15 12:30:26 -07:00
Mikayla f9fff3a7b2 fmt 2023-09-15 11:39:56 -07:00