{"action":"created","comment":{"url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/comments/85776115","pull_request_review_id":6471347,"id":85776115,"diff_hunk":"@@ -157,12 +158,47 @@ FOUNDATION_EXPORT uint64_t const kMXUndefinedTimestamp;\n @property (nonatomic) NSString *sender;\n \n /**\n- The event content.\n+ The string event (decrypted, if necessary) type as provided by the home server.\n+ Unlike 'eventType', this field is always filled even for custom events.\n+ */\n+@property (nonatomic, readonly) MXEventTypeString type;\n+\n+/**\n+ The enum version of the 'type' property.\n+ */\n+@property (nonatomic, readonly) MXEventType eventType;\n+\n+/**\n+ The event (decrypted, if necessary) content.\n  The keys in this dictionary depend on the event type. \n- Check http://matrix.org/docs/spec/#room-events to get a list of content keys per \n+ Check http://matrix.org/docs/spec/client_server/r0.2.0.html#room-events to get a list of content keys per\n  event type.\n  */","path":"MatrixSDK/JSONModels/MXEvent.h","position":70,"original_position":70,"commit_id":"598fe6ef818a46da103201f066d5e585f202f3c9","original_commit_id":"598fe6ef818a46da103201f066d5e585f202f3c9","user":{"login":"giomfo","id":8969772,"avatar_url":"https://avatars.githubusercontent.com/u/8969772?v=3","gravatar_id":"","url":"https://api.github.com/users/giomfo","html_url":"https://github.com/giomfo","followers_url":"https://api.github.com/users/giomfo/followers","following_url":"https://api.github.com/users/giomfo/following{/other_user}","gists_url":"https://api.github.com/users/giomfo/gists{/gist_id}","starred_url":"https://api.github.com/users/giomfo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/giomfo/subscriptions","organizations_url":"https://api.github.com/users/giomfo/orgs","repos_url":"https://api.github.com/users/giomfo/repos","events_url":"https://api.github.com/users/giomfo/events{/privacy}","received_events_url":"https://api.github.com/users/giomfo/received_events","type":"User","site_admin":false},"body":"same comment than for \"type\"","created_at":"2016-10-31T16:25:40Z","updated_at":"2016-10-31T16:25:40Z","html_url":"https://github.com/matrix-org/matrix-ios-sdk/pull/155#discussion_r85776115","pull_request_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/155","_links":{"self":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/comments/85776115"},"html":{"href":"https://github.com/matrix-org/matrix-ios-sdk/pull/155#discussion_r85776115"},"pull_request":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/155"}}},"pull_request":{"url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/155","id":91403694,"html_url":"https://github.com/matrix-org/matrix-ios-sdk/pull/155","diff_url":"https://github.com/matrix-org/matrix-ios-sdk/pull/155.diff","patch_url":"https://github.com/matrix-org/matrix-ios-sdk/pull/155.patch","issue_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues/155","number":155,"state":"open","locked":false,"title":"E2e","user":{"login":"manuroe","id":8418515,"avatar_url":"https://avatars.githubusercontent.com/u/8418515?v=3","gravatar_id":"","url":"https://api.github.com/users/manuroe","html_url":"https://github.com/manuroe","followers_url":"https://api.github.com/users/manuroe/followers","following_url":"https://api.github.com/users/manuroe/following{/other_user}","gists_url":"https://api.github.com/users/manuroe/gists{/gist_id}","starred_url":"https://api.github.com/users/manuroe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/manuroe/subscriptions","organizations_url":"https://api.github.com/users/manuroe/orgs","repos_url":"https://api.github.com/users/manuroe/repos","events_url":"https://api.github.com/users/manuroe/events{/privacy}","received_events_url":"https://api.github.com/users/manuroe/received_events","type":"User","site_admin":false},"body":"First working version. It works against riot.im/app but not riot.im/develop.\nThere is still work but it could be used as a base. I will do smaller PRs after\n","created_at":"2016-10-28T15:38:08Z","updated_at":"2016-10-31T16:25:40Z","closed_at":null,"merged_at":null,"merge_commit_sha":"abfdab05efeeea0e905b22b77ff37a05e3c73498","assignee":{"login":"giomfo","id":8969772,"avatar_url":"https://avatars.githubusercontent.com/u/8969772?v=3","gravatar_id":"","url":"https://api.github.com/users/giomfo","html_url":"https://github.com/giomfo","followers_url":"https://api.github.com/users/giomfo/followers","following_url":"https://api.github.com/users/giomfo/following{/other_user}","gists_url":"https://api.github.com/users/giomfo/gists{/gist_id}","starred_url":"https://api.github.com/users/giomfo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/giomfo/subscriptions","organizations_url":"https://api.github.com/users/giomfo/orgs","repos_url":"https://api.github.com/users/giomfo/repos","events_url":"https://api.github.com/users/giomfo/events{/privacy}","received_events_url":"https://api.github.com/users/giomfo/received_events","type":"User","site_admin":false},"assignees":[{"login":"giomfo","id":8969772,"avatar_url":"https://avatars.githubusercontent.com/u/8969772?v=3","gravatar_id":"","url":"https://api.github.com/users/giomfo","html_url":"https://github.com/giomfo","followers_url":"https://api.github.com/users/giomfo/followers","following_url":"https://api.github.com/users/giomfo/following{/other_user}","gists_url":"https://api.github.com/users/giomfo/gists{/gist_id}","starred_url":"https://api.github.com/users/giomfo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/giomfo/subscriptions","organizations_url":"https://api.github.com/users/giomfo/orgs","repos_url":"https://api.github.com/users/giomfo/repos","events_url":"https://api.github.com/users/giomfo/events{/privacy}","received_events_url":"https://api.github.com/users/giomfo/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/155/commits","review_comments_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/155/comments","review_comment_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/comments{/number}","comments_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues/155/comments","statuses_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/statuses/598fe6ef818a46da103201f066d5e585f202f3c9","head":{"label":"matrix-org:e2e","ref":"e2e","sha":"598fe6ef818a46da103201f066d5e585f202f3c9","user":{"login":"matrix-org","id":8418310,"avatar_url":"https://avatars.githubusercontent.com/u/8418310?v=3","gravatar_id":"","url":"https://api.github.com/users/matrix-org","html_url":"https://github.com/matrix-org","followers_url":"https://api.github.com/users/matrix-org/followers","following_url":"https://api.github.com/users/matrix-org/following{/other_user}","gists_url":"https://api.github.com/users/matrix-org/gists{/gist_id}","starred_url":"https://api.github.com/users/matrix-org/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/matrix-org/subscriptions","organizations_url":"https://api.github.com/users/matrix-org/orgs","repos_url":"https://api.github.com/users/matrix-org/repos","events_url":"https://api.github.com/users/matrix-org/events{/privacy}","received_events_url":"https://api.github.com/users/matrix-org/received_events","type":"Organization","site_admin":false},"repo":{"id":24633503,"name":"matrix-ios-sdk","full_name":"matrix-org/matrix-ios-sdk","owner":{"login":"matrix-org","id":8418310,"avatar_url":"https://avatars.githubusercontent.com/u/8418310?v=3","gravatar_id":"","url":"https://api.github.com/users/matrix-org","html_url":"https://github.com/matrix-org","followers_url":"https://api.github.com/users/matrix-org/followers","following_url":"https://api.github.com/users/matrix-org/following{/other_user}","gists_url":"https://api.github.com/users/matrix-org/gists{/gist_id}","starred_url":"https://api.github.com/users/matrix-org/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/matrix-org/subscriptions","organizations_url":"https://api.github.com/users/matrix-org/orgs","repos_url":"https://api.github.com/users/matrix-org/repos","events_url":"https://api.github.com/users/matrix-org/events{/privacy}","received_events_url":"https://api.github.com/users/matrix-org/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/matrix-org/matrix-ios-sdk","description":"The Matrix SDK for iOS","fork":false,"url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk","forks_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/forks","keys_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/keys{/key_id}","collaborators_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/teams","hooks_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/hooks","issue_events_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues/events{/number}","events_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/events","assignees_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/assignees{/user}","branches_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/branches{/branch}","tags_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/tags","blobs_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/refs{/sha}","trees_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/trees{/sha}","statuses_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/statuses/{sha}","languages_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/languages","stargazers_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/stargazers","contributors_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/contributors","subscribers_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/subscribers","subscription_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/subscription","commits_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/commits{/sha}","git_commits_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/commits{/sha}","comments_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/comments{/number}","issue_comment_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues/comments{/number}","contents_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/contents/{+path}","compare_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/compare/{base}...{head}","merges_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/merges","archive_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/downloads","issues_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues{/number}","pulls_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls{/number}","milestones_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/milestones{/number}","notifications_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/labels{/name}","releases_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/releases{/id}","deployments_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/deployments","created_at":"2014-09-30T10:06:39Z","updated_at":"2016-09-20T00:53:03Z","pushed_at":"2016-10-28T15:38:08Z","git_url":"git://github.com/matrix-org/matrix-ios-sdk.git","ssh_url":"git@github.com:matrix-org/matrix-ios-sdk.git","clone_url":"https://github.com/matrix-org/matrix-ios-sdk.git","svn_url":"https://github.com/matrix-org/matrix-ios-sdk","homepage":null,"size":5877,"stargazers_count":33,"watchers_count":33,"language":"Objective-C","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":6,"mirror_url":null,"open_issues_count":1,"forks":6,"open_issues":1,"watchers":33,"default_branch":"master"}},"base":{"label":"matrix-org:develop","ref":"develop","sha":"74c9c55a04487664aa622138942427209518c7a5","user":{"login":"matrix-org","id":8418310,"avatar_url":"https://avatars.githubusercontent.com/u/8418310?v=3","gravatar_id":"","url":"https://api.github.com/users/matrix-org","html_url":"https://github.com/matrix-org","followers_url":"https://api.github.com/users/matrix-org/followers","following_url":"https://api.github.com/users/matrix-org/following{/other_user}","gists_url":"https://api.github.com/users/matrix-org/gists{/gist_id}","starred_url":"https://api.github.com/users/matrix-org/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/matrix-org/subscriptions","organizations_url":"https://api.github.com/users/matrix-org/orgs","repos_url":"https://api.github.com/users/matrix-org/repos","events_url":"https://api.github.com/users/matrix-org/events{/privacy}","received_events_url":"https://api.github.com/users/matrix-org/received_events","type":"Organization","site_admin":false},"repo":{"id":24633503,"name":"matrix-ios-sdk","full_name":"matrix-org/matrix-ios-sdk","owner":{"login":"matrix-org","id":8418310,"avatar_url":"https://avatars.githubusercontent.com/u/8418310?v=3","gravatar_id":"","url":"https://api.github.com/users/matrix-org","html_url":"https://github.com/matrix-org","followers_url":"https://api.github.com/users/matrix-org/followers","following_url":"https://api.github.com/users/matrix-org/following{/other_user}","gists_url":"https://api.github.com/users/matrix-org/gists{/gist_id}","starred_url":"https://api.github.com/users/matrix-org/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/matrix-org/subscriptions","organizations_url":"https://api.github.com/users/matrix-org/orgs","repos_url":"https://api.github.com/users/matrix-org/repos","events_url":"https://api.github.com/users/matrix-org/events{/privacy}","received_events_url":"https://api.github.com/users/matrix-org/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/matrix-org/matrix-ios-sdk","description":"The Matrix SDK for iOS","fork":false,"url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk","forks_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/forks","keys_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/keys{/key_id}","collaborators_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/teams","hooks_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/hooks","issue_events_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues/events{/number}","events_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/events","assignees_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/assignees{/user}","branches_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/branches{/branch}","tags_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/tags","blobs_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/refs{/sha}","trees_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/trees{/sha}","statuses_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/statuses/{sha}","languages_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/languages","stargazers_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/stargazers","contributors_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/contributors","subscribers_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/subscribers","subscription_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/subscription","commits_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/commits{/sha}","git_commits_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/git/commits{/sha}","comments_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/comments{/number}","issue_comment_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues/comments{/number}","contents_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/contents/{+path}","compare_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/compare/{base}...{head}","merges_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/merges","archive_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/downloads","issues_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues{/number}","pulls_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls{/number}","milestones_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/milestones{/number}","notifications_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/labels{/name}","releases_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/releases{/id}","deployments_url":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/deployments","created_at":"2014-09-30T10:06:39Z","updated_at":"2016-09-20T00:53:03Z","pushed_at":"2016-10-28T15:38:08Z","git_url":"git://github.com/matrix-org/matrix-ios-sdk.git","ssh_url":"git@github.com:matrix-org/matrix-ios-sdk.git","clone_url":"https://github.com/matrix-org/matrix-ios-sdk.git","svn_url":"https://github.com/matrix-org/matrix-ios-sdk","homepage":null,"size":5877,"stargazers_count":33,"watchers_count":33,"language":"Objective-C","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":6,"mirror_url":null,"open_issues_count":1,"forks":6,"open_issues":1,"watchers":33,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/155"},"html":{"href":"https://github.com/matrix-org/matrix-ios-sdk/pull/155"},"issue":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues/155"},"comments":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/issues/155/comments"},"review_comments":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/155/comments"},"review_comment":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/pulls/155/commits"},"statuses":{"href":"https://api.github.com/repos/matrix-org/matrix-ios-sdk/statuses/598fe6ef818a46da103201f066d5e585f202f3c9"}}}}
{"actor":{"display_login":"giomfo"}}