Update README.md

Move node_id field from status to status.commit in StatusEvent

README.md

@@ -1,6 +1,6 @@
 Library webhooks
 ================
-<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v5/logo.png">![Project status](https://img.shields.io/badge/version-5.11.0-green.svg)
+<img align="right" src="https://raw.githubusercontent.com/go-playground/webhooks/v5/logo.png">![Project status](https://img.shields.io/badge/version-5.12.0-green.svg)
 [![Build Status](https://travis-ci.org/go-playground/webhooks.svg?branch=v5)](https://travis-ci.org/go-playground/webhooks)
 [![Coverage Status](https://coveralls.io/repos/go-playground/webhooks/badge.svg?branch=v5&service=github)](https://coveralls.io/github/go-playground/webhooks?branch=v5)
 [![Go Report Card](https://goreportcard.com/badge/go-playground/webhooks)](https://goreportcard.com/report/go-playground/webhooks)

bitbucket/payload.go

@@ -348,8 +348,9 @@ type PullRequestCommentDeletedPayload struct {
 // Owner is the common Bitbucket Owner Sub Entity
 type Owner struct {
 	Type        string `json:"type"`
-	Username    string `json:"username"`
+	NickName    string `json:"nickname"`
 	DisplayName string `json:"display_name"`
+	AccountId   string `json:"account_id"`
 	UUID        string `json:"uuid"`
 	Links       struct {
 		Self struct {

github/payload.go

@@ -4342,6 +4342,9 @@ type PullRequestReviewPayload struct {
 		Type              string `json:"type"`
 		SiteAdmin         bool   `json:"site_admin"`
 	} `json:"sender"`
+	Installation struct {
+		ID int64 `json:"id"`
+	} `json:"installation"`
 }
 
 // PullRequestReviewCommentPayload contains the information for GitHub's pull_request_review_comments hook event
@@ -4806,6 +4809,9 @@ type PullRequestReviewCommentPayload struct {
 		Type              string `json:"type"`
 		SiteAdmin         bool   `json:"site_admin"`
 	} `json:"sender"`
+	Installation struct {
+		ID int64 `json:"id"`
+	} `json:"installation"`
 }
 
 // PushPayload contains the information for GitHub's push hook event
@@ -5329,7 +5335,6 @@ type SecurityAdvisoryPayload struct {
 // StatusPayload contains the information for GitHub's status hook event
 type StatusPayload struct {
 	ID          int64   `json:"id"`
-	NodeID      string  `json:"node_id"`
 	Sha         string  `json:"sha"`
 	Name        string  `json:"name"`
 	TargetURL   *string `json:"target_url"`
@@ -5338,6 +5343,7 @@ type StatusPayload struct {
 	State       string  `json:"state"`
 	Commit      struct {
 		Sha    string `json:"sha"`
+		NodeID string `json:"node_id"`
 		Commit struct {
 			Author struct {
 				Name  string    `json:"name"`

gitlab/payload.go

@@ -307,51 +307,74 @@ type Repository struct {
 
 // ObjectAttributes contains all of the GitLab object attributes information
 type ObjectAttributes struct {
-	ID              int64      `json:"id"`
+	ID               int64      `json:"id"`
-	Title           string     `json:"title"`
+	Title            string     `json:"title"`
-	AssigneeID      int64      `json:"assignee_id"`
+	AssigneeID       int64      `json:"assignee_id"`
-	AuthorID        int64      `json:"author_id"`
+	AuthorID         int64      `json:"author_id"`
-	ProjectID       int64      `json:"project_id"`
+	ProjectID        int64      `json:"project_id"`
-	CreatedAt       customTime `json:"created_at"`
+	CreatedAt        customTime `json:"created_at"`
-	UpdatedAt       customTime `json:"updated_at"`
+	UpdatedAt        customTime `json:"updated_at"`
-	Position        int64      `json:"position"`
+	ChangePosition   Position   `json:"change_position"`
-	BranchName      string     `json:"branch_name"`
+	OriginalPosition Position   `json:"original_position"`
-	Description     string     `json:"description"`
+	Position         Position   `json:"position"`
-	MilestoneID     int64      `json:"milestone_id"`
+	BranchName       string     `json:"branch_name"`
-	State           string     `json:"state"`
+	Description      string     `json:"description"`
-	IID             int64      `json:"iid"`
+	MilestoneID      int64      `json:"milestone_id"`
-	URL             string     `json:"url"`
+	State            string     `json:"state"`
-	Action          string     `json:"action"`
+	IID              int64      `json:"iid"`
-	TargetBranch    string     `json:"target_branch"`
+	URL              string     `json:"url"`
-	SourceBranch    string     `json:"source_branch"`
+	Action           string     `json:"action"`
-	SourceProjectID int64      `json:"source_project_id"`
+	TargetBranch     string     `json:"target_branch"`
-	TargetProjectID int64      `json:"target_project_id"`
+	SourceBranch     string     `json:"source_branch"`
-	StCommits       string     `json:"st_commits"`
+	SourceProjectID  int64      `json:"source_project_id"`
-	MergeStatus     string     `json:"merge_status"`
+	TargetProjectID  int64      `json:"target_project_id"`
-	Content         string     `json:"content"`
+	StCommits        string     `json:"st_commits"`
-	Format          string     `json:"format"`
+	MergeStatus      string     `json:"merge_status"`
-	Message         string     `json:"message"`
+	Content          string     `json:"content"`
-	Slug            string     `json:"slug"`
+	Format           string     `json:"format"`
-	Ref             string     `json:"ref"`
+	Message          string     `json:"message"`
-	Tag             bool       `json:"tag"`
+	Slug             string     `json:"slug"`
-	SHA             string     `json:"sha"`
+	Ref              string     `json:"ref"`
-	BeforeSHA       string     `json:"before_sha"`
+	Tag              bool       `json:"tag"`
-	Status          string     `json:"status"`
+	SHA              string     `json:"sha"`
-	Stages          []string   `json:"stages"`
+	BeforeSHA        string     `json:"before_sha"`
-	Duration        int64      `json:"duration"`
+	Status           string     `json:"status"`
-	Note            string     `json:"note"`
+	Stages           []string   `json:"stages"`
-	NotebookType    string     `json:"noteable_type"`
+	Duration         int64      `json:"duration"`
-	At              customTime `json:"attachment"`
+	Note             string     `json:"note"`
-	LineCode        string     `json:"line_code"`
+	NotebookType     string     `json:"noteable_type"`
-	CommitID        string     `json:"commit_id"`
+	At               customTime `json:"attachment"`
-	NoteableID      int64      `json:"noteable_id"`
+	LineCode         string     `json:"line_code"`
-	System          bool       `json:"system"`
+	CommitID         string     `json:"commit_id"`
-	WorkInProgress  bool       `json:"work_in_progress"`
+	NoteableID       int64      `json:"noteable_id"`
-	StDiffs         []StDiff   `json:"st_diffs"`
+	System           bool       `json:"system"`
-	Source          Source     `json:"source"`
+	WorkInProgress   bool       `json:"work_in_progress"`
-	Target          Target     `json:"target"`
+	StDiffs          []StDiff   `json:"st_diffs"`
-	LastCommit      LastCommit `json:"last_commit"`
+	Source           Source     `json:"source"`
-	Assignee        Assignee   `json:"assignee"`
+	Target           Target     `json:"target"`
+	LastCommit       LastCommit `json:"last_commit"`
+	Assignee         Assignee   `json:"assignee"`
+}
+
+// Position defines a specific location, identified by paths line numbers and
+// image coordinates, within a specific diff, identified by start, head and
+// base commit ids.
+//
+// Text position will have: new_line and old_line
+// Image position will have: width, height, x, y
+type Position struct {
+	BaseSHA      string `json:"base_sha"`
+	StartSHA     string `json:"start_sha"`
+	HeadSHA      string `json:"head_sha"`
+	OldPath      string `json:"old_path"`
+	NewPath      string `json:"new_path"`
+	PositionType string `json:"position_type"`
+	OldLine      int64  `json:"old_line"`
+	NewLine      int64  `json:"new_line"`
+	Width        int64  `json:"width"`
+	Height       int64  `json:"height"`
+	X            int64  `json:"x"`
+	Y            int64  `json:"y"`
 }
 
 // MergeRequest contains all of the GitLab merge request information

testdata/bitbucket/commit-comment-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/issue-comment-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/issue-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/issue-updated.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-approval-removed.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -177,15 +182,16 @@
   "approval":{
     "date":"2015-04-06T16:34:59.195330+00:00",
     "user":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-approved.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -177,15 +182,16 @@
   "approval":{
     "date":"2015-04-06T16:34:59.195330+00:00",
     "user":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-comment-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-comment-deleted.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-comment-updated.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -39,15 +40,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -147,15 +151,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-declined.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-merged.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -98,10 +100,10 @@
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +113,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +132,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/pull-request-updated.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -21,15 +22,16 @@
     "description":"Description of pull request",
     "state":"OPEN|MERGED|DECLINED",
     "author":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -93,15 +95,16 @@
     },
     "participants":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -111,15 +114,16 @@
     ],
     "reviewers":[
       {
-        "username":"emmap1",
+        "nickname":"emmap1",
+        "account_id":"udfy9suggmzpswxc7n200y3c",
         "display_name":"Emma",
         "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
         "links":{
           "self":{
-            "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+            "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "html":{
-            "href":"https://api.bitbucket.org/emmap1"
+            "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
           },
           "avatar":{
             "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -129,15 +133,16 @@
     ],
     "close_source_branch":true,
     "closed_by":{
-      "username":"emmap1",
+      "nickname":"emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name":"Emma",
       "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links":{
         "self":{
-          "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html":{
-          "href":"https://api.bitbucket.org/emmap1"
+          "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar":{
           "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-commit-status-created.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-commit-status-updated.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-fork.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-push.json

@@ -1,14 +1,15 @@
 {
   "actor":{
-    "username":"emmap1",
+    "nickname":"emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name":"Emma",
     "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links":{
       "self":{
-        "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html":{
-        "href":"https://api.bitbucket.org/emmap1"
+        "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar":{
         "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -43,15 +44,16 @@
             "type":"commit",
             "hash":"709d658dc5b6d6afcd46049c2f332ee3f515a67d",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -102,15 +104,16 @@
             "type":"commit",
             "hash":"1e65c05c1d5171631d92438a13901ca7dae9618c",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -174,15 +177,16 @@
             "type":"commit",
             "message":"commit message\n",
             "author":{
-              "username":"emmap1",
+              "nickname":"emmap1",
+              "account_id":"udfy9suggmzpswxc7n200y3c",
               "display_name":"Emma",
               "uuid":"{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
               "links":{
                 "self":{
-                  "href":"https://api.bitbucket.org/api/2.0/users/emmap1"
+                  "href":"https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "html":{
-                  "href":"https://api.bitbucket.org/emmap1"
+                  "href":"https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
                 },
                 "avatar":{
                   "href":"https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/bitbucket/repo-updated.json

@@ -1,15 +1,16 @@
 {
   "actor": {
     "type": "user",
-    "username": "emmap1",
+    "nickname": "emmap1",
+    "account_id":"udfy9suggmzpswxc7n200y3c",
     "display_name": "Emma",
     "uuid": "{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
     "links": {
       "self": {
-        "href": "https://api.bitbucket.org/api/2.0/users/emmap1"
+        "href": "https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "html": {
-        "href": "https://api.bitbucket.org/emmap1"
+        "href": "https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
       },
       "avatar": {
         "href": "https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"
@@ -49,15 +50,16 @@
     "website": "https://mywebsite.com/",
     "owner": {
       "type": "user",
-      "username": "emmap1",
+      "nickname": "emmap1",
+      "account_id":"udfy9suggmzpswxc7n200y3c",
       "display_name": "Emma",
       "uuid": "{a54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3}",
       "links": {
         "self": {
-          "href": "https://api.bitbucket.org/api/2.0/users/emmap1"
+          "href": "https://api.bitbucket.org/api/2.0/users/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "html": {
-          "href": "https://api.bitbucket.org/emmap1"
+          "href": "https://api.bitbucket.org/%7Ba54f16da-24e9-4d7f-a3a7-b1ba2cd98aa3%7D"
         },
         "avatar": {
           "href": "https://bitbucket-api-assetroot.s3.amazonaws.com/c/photos/2015/Feb/26/3613917261-0-emmap1-avatar_avatar.png"

testdata/gitlab/confidential-issue-event.json

@@ -35,7 +35,36 @@
     "project_id": 14,
     "created_at": "2013-12-03T17:15:43Z",
     "updated_at": "2013-12-03T17:15:43Z",
-    "position": 0,
+    "change_position": {
+      "base_sha": null,
+      "start_sha": null,
+      "head_sha": null,
+      "old_path": null,
+      "new_path": null,
+      "position_type": "text",
+      "old_line": null,
+      "new_line": null
+    },
+    "original_position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
+    "position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
     "branch_name": null,
     "description": "Create new API for manipulations with repository",
     "milestone_id": null,
@@ -49,4 +78,4 @@
     "username": "user1",
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   }
-}
+}

testdata/gitlab/issue-event.json

@@ -35,7 +35,36 @@
     "project_id": 14,
     "created_at": "2013-12-03T17:15:43Z",
     "updated_at": "2013-12-03T17:15:43Z",
-    "position": 0,
+    "change_position": {
+      "base_sha": null,
+      "start_sha": null,
+      "head_sha": null,
+      "old_path": null,
+      "new_path": null,
+      "position_type": "text",
+      "old_line": null,
+      "new_line": null
+    },
+    "original_position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
+    "position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
     "branch_name": null,
     "description": "Create new API for manipulations with repository",
     "milestone_id": null,
@@ -49,4 +78,4 @@
     "username": "user1",
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   }
-}
+}