GitHub PullRequestEvent at 2014-03-30 02:39:16
Repository: cryptocat
Actor: kaepora
Payload: {"action":"closed","number":599,"pull_request":{"url":"https://api.github.com/repos/cryptocat/cryptocat/pulls/599","id":13936714,"html_url":"https://github.com/cryptocat/cryptocat/pull/599","diff_url":"https://github.com/cryptocat/cryptocat/pull/599.diff","patch_url":"https://github.com/cryptocat/cryptocat/pull/599.patch","issue_url":"https://api.github.com/repos/cryptocat/cryptocat/issues/599","number":599,"state":"closed","title":"Authenticate the multiparty key if available","user":{"login":"arlolra","id":123708,"avatar_url":"https://avatars.githubusercontent.com/u/123708?","gravatar_id":"403a6bcf6c06f2694b635a5f108c7101","url":"https://api.github.com/users/arlolra","html_url":"https://github.com/arlolra","followers_url":"https://api.github.com/users/arlolra/followers","following_url":"https://api.github.com/users/arlolra/following{/other_user}","gists_url":"https://api.github.com/users/arlolra/gists{/gist_id}","starred_url":"https://api.github.com/users/arlolra/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arlolra/subscriptions","organizations_url":"https://api.github.com/users/arlolra/orgs","repos_url":"https://api.github.com/users/arlolra/repos","events_url":"https://api.github.com/users/arlolra/events{/privacy}","received_events_url":"https://api.github.com/users/arlolra/received_events","type":"User","site_admin":false},"body":"**Warning: This breaks backwards compatibility.**\r\n\r\nIf we have a multiparty key for the user we're authenticating, add it (and our mp key) to the secret when performing smp. (The _if_ is to remain compatible with general xmpp clients that don't support the mp protocol). Warn the user (and switch to unauthenticated) if the mp key changes (or suddenly becomes available).\r\n\r\nThis also upgrades otr.js to the latest version (v0.2.11)\r\n\r\nRequesting lots of review before this gets merged. I definitely haven't thought through all the implications. Just appeasing @kaepora's demands in #475 and #594. This means you @vmon, @koolfy, @jcb82, @daira, @Sc00bz, etc.","created_at":"2014-03-25T04:41:35Z","updated_at":"2014-03-30T02:39:16Z","closed_at":"2014-03-30T02:39:16Z","merged_at":"2014-03-30T02:39:16Z","merge_commit_sha":"8f3537d85a4b7811bcd5510f1f57d2a1f64b3d92","assignee":{"login":"kaepora","id":9953,"avatar_url":"https://avatars.githubusercontent.com/u/9953?","gravatar_id":"55f5c1a4c5aa4b7f9bbfb5974a1a6544","url":"https://api.github.com/users/kaepora","html_url":"https://github.com/kaepora","followers_url":"https://api.github.com/users/kaepora/followers","following_url":"https://api.github.com/users/kaepora/following{/other_user}","gists_url":"https://api.github.com/users/kaepora/gists{/gist_id}","starred_url":"https://api.github.com/users/kaepora/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kaepora/subscriptions","organizations_url":"https://api.github.com/users/kaepora/orgs","repos_url":"https://api.github.com/users/kaepora/repos","events_url":"https://api.github.com/users/kaepora/events{/privacy}","received_events_url":"https://api.github.com/users/kaepora/received_events","type":"User","site_admin":false},"milestone":{"url":"https://api.github.com/repos/cryptocat/cryptocat/milestones/24","labels_url":"https://api.github.com/repos/cryptocat/cryptocat/milestones/24/labels","id":505931,"number":24,"title":"2.1.22","description":"","creator":{"login":"kaepora","id":9953,"avatar_url":"https://avatars.githubusercontent.com/u/9953?","gravatar_id":"55f5c1a4c5aa4b7f9bbfb5974a1a6544","url":"https://api.github.com/users/kaepora","html_url":"https://github.com/kaepora","followers_url":"https://api.github.com/users/kaepora/followers","following_url":"https://api.github.com/users/kaepora/following{/other_user}","gists_url":"https://api.github.com/users/kaepora/gists{/gist_id}","starred_url":"https://api.github.com/users/kaepora/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kaepora/subscriptions","organizations_url":"https://api.github.com/users/kaepora/orgs","repos_url":"https://api.github.com/users/kaepora/repos","events_url":"https://api.github.com/users/kaepora/events{/privacy}","received_events_url":"https://api.github.com/users/kaepora/received_events","type":"User","site_admin":false},"open_issues":7,"closed_issues":5,"state":"open","created_at":"2013-12-05T14:51:04Z","updated_at":"2014-03-30T02:39:16Z","due_on":null},"commits_url":"https://api.github.com/repos/cryptocat/cryptocat/pulls/599/commits","review_comments_url":"https://api.github.com/repos/cryptocat/cryptocat/pulls/599/comments","review_comment_url":"https://api.github.com/repos/cryptocat/cryptocat/pulls/comments/{number}","comments_url":"https://api.github.com/repos/cryptocat/cryptocat/issues/599/comments","statuses_url":"https://api.github.com/repos/cryptocat/cryptocat/statuses/c81c3393bcfcc59539a51831bac865253b941a9e","head":{"label":"arlolra:mp","ref":"mp","sha":"c81c3393bcfcc59539a51831bac865253b941a9e","user":{"login":"arlolra","id":123708,"avatar_url":"https://avatars.githubusercontent.com/u/123708?","gravatar_id":"403a6bcf6c06f2694b635a5f108c7101","url":"https://api.github.com/users/arlolra","html_url":"https://github.com/arlolra","followers_url":"https://api.github.com/users/arlolra/followers","following_url":"https://api.github.com/users/arlolra/following{/other_user}","gists_url":"https://api.github.com/users/arlolra/gists{/gist_id}","starred_url":"https://api.github.com/users/arlolra/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arlolra/subscriptions","organizations_url":"https://api.github.com/users/arlolra/orgs","repos_url":"https://api.github.com/users/arlolra/repos","events_url":"https://api.github.com/users/arlolra/events{/privacy}","received_events_url":"https://api.github.com/users/arlolra/received_events","type":"User","site_admin":false},"repo":{"id":5532027,"name":"cryptocat","full_name":"arlolra/cryptocat","owner":{"login":"arlolra","id":123708,"avatar_url":"https://avatars.githubusercontent.com/u/123708?","gravatar_id":"403a6bcf6c06f2694b635a5f108c7101","url":"https://api.github.com/users/arlolra","html_url":"https://github.com/arlolra","followers_url":"https://api.github.com/users/arlolra/followers","following_url":"https://api.github.com/users/arlolra/following{/other_user}","gists_url":"https://api.github.com/users/arlolra/gists{/gist_id}","starred_url":"https://api.github.com/users/arlolra/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arlolra/subscriptions","organizations_url":"https://api.github.com/users/arlolra/orgs","repos_url":"https://api.github.com/users/arlolra/repos","events_url":"https://api.github.com/users/arlolra/events{/privacy}","received_events_url":"https://api.github.com/users/arlolra/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/arlolra/cryptocat","description":"Web chat client with client-side cryptography.","fork":true,"url":"https://api.github.com/repos/arlolra/cryptocat","forks_url":"https://api.github.com/repos/arlolra/cryptocat/forks","keys_url":"https://api.github.com/repos/arlolra/cryptocat/keys{/key_id}","collaborators_url":"https://api.github.com/repos/arlolra/cryptocat/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/arlolra/cryptocat/teams","hooks_url":"https://api.github.com/repos/arlolra/cryptocat/hooks","issue_events_url":"https://api.github.com/repos/arlolra/cryptocat/issues/events{/number}","events_url":"https://api.github.com/repos/arlolra/cryptocat/events","assignees_url":"https://api.github.com/repos/arlolra/cryptocat/assignees{/user}","branches_url":"https://api.github.com/repos/arlolra/cryptocat/branches{/branch}","tags_url":"https://api.github.com/repos/arlolra/cryptocat/tags","blobs_url":"https://api.github.com/repos/arlolra/cryptocat/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/arlolra/cryptocat/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/arlolra/cryptocat/git/refs{/sha}","trees_url":"https://api.github.com/repos/arlolra/cryptocat/git/trees{/sha}","statuses_url":"https://api.github.com/repos/arlolra/cryptocat/statuses/{sha}","languages_url":"https://api.github.com/repos/arlolra/cryptocat/languages","stargazers_url":"https://api.github.com/repos/arlolra/cryptocat/stargazers","contributors_url":"https://api.github.com/repos/arlolra/cryptocat/contributors","subscribers_url":"https://api.github.com/repos/arlolra/cryptocat/subscribers","subscription_url":"https://api.github.com/repos/arlolra/cryptocat/subscription","commits_url":"https://api.github.com/repos/arlolra/cryptocat/commits{/sha}","git_commits_url":"https://api.github.com/repos/arlolra/cryptocat/git/commits{/sha}","comments_url":"https://api.github.com/repos/arlolra/cryptocat/comments{/number}","issue_comment_url":"https://api.github.com/repos/arlolra/cryptocat/issues/comments/{number}","contents_url":"https://api.github.com/repos/arlolra/cryptocat/contents/{+path}","compare_url":"https://api.github.com/repos/arlolra/cryptocat/compare/{base}...{head}","merges_url":"https://api.github.com/repos/arlolra/cryptocat/merges","archive_url":"https://api.github.com/repos/arlolra/cryptocat/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/arlolra/cryptocat/downloads","issues_url":"https://api.github.com/repos/arlolra/cryptocat/issues{/number}","pulls_url":"https://api.github.com/repos/arlolra/cryptocat/pulls{/number}","milestones_url":"https://api.github.com/repos/arlolra/cryptocat/milestones{/number}","notifications_url":"https://api.github.com/repos/arlolra/cryptocat/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/arlolra/cryptocat/labels{/name}","releases_url":"https://api.github.com/repos/arlolra/cryptocat/releases{/id}","created_at":"2012-08-23T20:33:00Z","updated_at":"2014-03-30T02:39:16Z","pushed_at":"2014-03-28T18:30:37Z","git_url":"git://github.com/arlolra/cryptocat.git","ssh_url":"git@github.com:arlolra/cryptocat.git","clone_url":"https://github.com/arlolra/cryptocat.git","svn_url":"https://github.com/arlolra/cryptocat","homepage":"https://crypto.cat","size":24048,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master","master_branch":"master"}},"base":{"label":"cryptocat:master","ref":"master","sha":"fa5cfd7fdf529c58eda4704e08627ae8cb968e1a","user":{"login":"cryptocat","id":2255942,"avatar_url":"https://avatars.githubusercontent.com/u/2255942?","gravatar_id":"d48196fcafdc791eb5cefb87ac26609f","url":"https://api.github.com/users/cryptocat","html_url":"https://github.com/cryptocat","followers_url":"https://api.github.com/users/cryptocat/followers","following_url":"https://api.github.com/users/cryptocat/following{/other_user}","gists_url":"https://api.github.com/users/cryptocat/gists{/gist_id}","starred_url":"https://api.github.com/users/cryptocat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cryptocat/subscriptions","organizations_url":"https://api.github.com/users/cryptocat/orgs","repos_url":"https://api.github.com/users/cryptocat/repos","events_url":"https://api.github.com/users/cryptocat/events{/privacy}","received_events_url":"https://api.github.com/users/cryptocat/received_events","type":"Organization","site_admin":false},"repo":{"id":2023792,"name":"cryptocat","full_name":"cryptocat/cryptocat","owner":{"login":"cryptocat","id":2255942,"avatar_url":"https://avatars.githubusercontent.com/u/2255942?","gravatar_id":"d48196fcafdc791eb5cefb87ac26609f","url":"https://api.github.com/users/cryptocat","html_url":"https://github.com/cryptocat","followers_url":"https://api.github.com/users/cryptocat/followers","following_url":"https://api.github.com/users/cryptocat/following{/other_user}","gists_url":"https://api.github.com/users/cryptocat/gists{/gist_id}","starred_url":"https://api.github.com/users/cryptocat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cryptocat/subscriptions","organizations_url":"https://api.github.com/users/cryptocat/orgs","repos_url":"https://api.github.com/users/cryptocat/repos","events_url":"https://api.github.com/users/cryptocat/events{/privacy}","received_events_url":"https://api.github.com/users/cryptocat/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/cryptocat/cryptocat","description":"Easy to use encrypted instant messaging built on modern web technologies.","fork":false,"url":"https://api.github.com/repos/cryptocat/cryptocat","forks_url":"https://api.github.com/repos/cryptocat/cryptocat/forks","keys_url":"https://api.github.com/repos/cryptocat/cryptocat/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cryptocat/cryptocat/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cryptocat/cryptocat/teams","hooks_url":"https://api.github.com/repos/cryptocat/cryptocat/hooks","issue_events_url":"https://api.github.com/repos/cryptocat/cryptocat/issues/events{/number}","events_url":"https://api.github.com/repos/cryptocat/cryptocat/events","assignees_url":"https://api.github.com/repos/cryptocat/cryptocat/assignees{/user}","branches_url":"https://api.github.com/repos/cryptocat/cryptocat/branches{/branch}","tags_url":"https://api.github.com/repos/cryptocat/cryptocat/tags","blobs_url":"https://api.github.com/repos/cryptocat/cryptocat/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cryptocat/cryptocat/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cryptocat/cryptocat/git/refs{/sha}","trees_url":"https://api.github.com/repos/cryptocat/cryptocat/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cryptocat/cryptocat/statuses/{sha}","languages_url":"https://api.github.com/repos/cryptocat/cryptocat/languages","stargazers_url":"https://api.github.com/repos/cryptocat/cryptocat/stargazers","contributors_url":"https://api.github.com/repos/cryptocat/cryptocat/contributors","subscribers_url":"https://api.github.com/repos/cryptocat/cryptocat/subscribers","subscription_url":"https://api.github.com/repos/cryptocat/cryptocat/subscription","commits_url":"https://api.github.com/repos/cryptocat/cryptocat/commits{/sha}","git_commits_url":"https://api.github.com/repos/cryptocat/cryptocat/git/commits{/sha}","comments_url":"https://api.github.com/repos/cryptocat/cryptocat/comments{/number}","issue_comment_url":"https://api.github.com/repos/cryptocat/cryptocat/issues/comments/{number}","contents_url":"https://api.github.com/repos/cryptocat/cryptocat/contents/{+path}","compare_url":"https://api.github.com/repos/cryptocat/cryptocat/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cryptocat/cryptocat/merges","archive_url":"https://api.github.com/repos/cryptocat/cryptocat/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cryptocat/cryptocat/downloads","issues_url":"https://api.github.com/repos/cryptocat/cryptocat/issues{/number}","pulls_url":"https://api.github.com/repos/cryptocat/cryptocat/pulls{/number}","milestones_url":"https://api.github.com/repos/cryptocat/cryptocat/milestones{/number}","notifications_url":"https://api.github.com/repos/cryptocat/cryptocat/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cryptocat/cryptocat/labels{/name}","releases_url":"https://api.github.com/repos/cryptocat/cryptocat/releases{/id}","created_at":"2011-07-09T22:14:38Z","updated_at":"2014-03-30T02:39:16Z","pushed_at":"2014-03-30T02:39:16Z","git_url":"git://github.com/cryptocat/cryptocat.git","ssh_url":"git@github.com:cryptocat/cryptocat.git","clone_url":"https://github.com/cryptocat/cryptocat.git","svn_url":"https://github.com/cryptocat/cryptocat","homepage":"https://crypto.cat","size":32191,"stargazers_count":1631,"watchers_count":1631,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":240,"mirror_url":null,"open_issues_count":79,"forks":240,"open_issues":79,"watchers":1631,"default_branch":"master","master_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/cryptocat/cryptocat/pulls/599"},"html":{"href":"https://github.com/cryptocat/cryptocat/pull/599"},"issue":{"href":"https://api.github.com/repos/cryptocat/cryptocat/issues/599"},"comments":{"href":"https://api.github.com/repos/cryptocat/cryptocat/issues/599/comments"},"review_comments":{"href":"https://api.github.com/repos/cryptocat/cryptocat/pulls/599/comments"},"review_comment":{"href":"https://api.github.com/repos/cryptocat/cryptocat/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/cryptocat/cryptocat/pulls/599/commits"},"statuses":{"href":"https://api.github.com/repos/cryptocat/cryptocat/statuses/c81c3393bcfcc59539a51831bac865253b941a9e"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"kaepora","id":9953,"avatar_url":"https://avatars.githubusercontent.com/u/9953?","gravatar_id":"55f5c1a4c5aa4b7f9bbfb5974a1a6544","url":"https://api.github.com/users/kaepora","html_url":"https://github.com/kaepora","followers_url":"https://api.github.com/users/kaepora/followers","following_url":"https://api.github.com/users/kaepora/following{/other_user}","gists_url":"https://api.github.com/users/kaepora/gists{/gist_id}","starred_url":"https://api.github.com/users/kaepora/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kaepora/subscriptions","organizations_url":"https://api.github.com/users/kaepora/orgs","repos_url":"https://api.github.com/users/kaepora/repos","events_url":"https://api.github.com/users/kaepora/events{/privacy}","received_events_url":"https://api.github.com/users/kaepora/received_events","type":"User","site_admin":false},"comments":13,"review_comments":0,"commits":2,"additions":115,"deletions":85,"changed_files":4}}