Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add getEventNearestToTimestamp #38

Merged
merged 5 commits into from
Nov 24, 2023

Conversation

Half-Shot
Copy link
Member

Needs #37 to fix the diffs

Checklist

  • Tests written for all new code
  • Linter has been satisfied
  • Sign-off given on the changes (see CONTRIBUTING.md)

@Half-Shot Half-Shot requested a review from a team as a code owner November 22, 2023 14:09
AndrewFerr
AndrewFerr previously approved these changes Nov 22, 2023
@AndrewFerr AndrewFerr dismissed their stale review November 22, 2023 20:33

Tests fail

@AndrewFerr
Copy link
Member

Half-Shot#1

@Half-Shot Half-Shot changed the base branch from main to af/catch-crypto-room-event-member-lookup November 22, 2023 22:08
@Half-Shot Half-Shot changed the base branch from af/catch-crypto-room-event-member-lookup to main November 22, 2023 22:08
@AndrewFerr
Copy link
Member

557b39c

IMO it's better to not merge with vector-im:main & to instead keep this branch relative to upstream's main, as it can be more easily merged into both repos that way, which is worth doing since this PR is useful for upstream too. In fact, doing that makes it possible to open an upstream PR with the same branch as this one.

@Half-Shot
Copy link
Member Author

Apparently it was a requirement on the repo to keep this branch up to date with main.

@AndrewFerr
Copy link
Member

Apparently it was a requirement on the repo to keep this branch up to date with main.

It technically isn't, but it makes reading through commit history & keeping up-to-date with upstream so much easier.

I've updated Half-Shot#1 with a version of this PR with commits shifted onto upstream main, which I would very much appreciate being done here (I'd have done it myself but this PR is on a repo I don't have write access on).

@AndrewFerr AndrewFerr merged commit 669408d into element-hq:main Nov 24, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants