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

Edits start - reaction end #669

Merged
merged 16 commits into from
May 24, 2019
Merged

Edits start - reaction end #669

merged 16 commits into from
May 24, 2019

Conversation

manuroe
Copy link
Contributor

@manuroe manuroe commented May 24, 2019

I started this branch to implement edits. I first made a refactor to let room for the edits part in MXAggregation but I got stucked in edits spec so I came back to reactions and fix some (maybe all) things.

This PR contains

Commits can be reviewed one by one.

Test

They pass but with some restrictions:

  • The local server must run synapse/develop with the config experimental_msc1849_support_enabled: true
  • We must comment the 2 TODOs in MXAggregatedReactionTests related to server or spec issues.

Screenshot 2019-05-24 at 08 01 55


@interface MXAggregatedEditsUpdater ()

@property (nonatomic, weak) NSString *myUserId;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove weak attribute, seems to be a copy/paste issue.


@interface MXAggregatedReactionsUpdater ()

@property (nonatomic, weak) NSString *myUserId;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove weak attribute, seems to be a copy/paste issue.

…on_end

# Conflicts:
#	MatrixSDK/Aggregations/MXAggregations.m
@manuroe manuroe merged commit 1bd1e1f into develop May 24, 2019
@manuroe manuroe deleted the edits_start_reaction_end branch May 24, 2019 09:36
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.

Reaction: Support in non live timeline
2 participants