Skip to content

Commit

Permalink
feat(collaborator): add deviceID
Browse files Browse the repository at this point in the history
  • Loading branch information
jpeisenbarth committed Dec 6, 2018
1 parent 5264b65 commit bf06100
Show file tree
Hide file tree
Showing 6 changed files with 651 additions and 1,022 deletions.
1,658 changes: 636 additions & 1,022 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/collaborators/CollaboratorsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class CollaboratorsService extends Service<proto.ICollaborator, proto.Col
collab.login = updated.login || collab.login
collab.email = updated.email || collab.email
collab.avatar = updated.avatar || collab.avatar
collab.deviceID = updated.deviceID || collab.deviceID
this.updateSubject.next(collab)
} else {
this.collaborators.set(updated.id, updated)
Expand Down
1 change: 1 addition & 0 deletions src/collaborators/ICollaborator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ export interface ICollaborator {
login?: string
email?: string
avatar?: string
deviceID?: string
}
1 change: 1 addition & 0 deletions src/proto/collaborator.proto
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ message Collaborator {
string login = 3;
string email = 4;
string avatar = 5;
string deviceID = 6;
}
6 changes: 6 additions & 0 deletions src/proto/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,9 @@ export namespace collaborator {

/** Collaborator avatar */
avatar?: (string|null);

/** Collaborator deviceID */
deviceID?: (string|null);
}

/** Represents a Collaborator. */
Expand All @@ -643,6 +646,9 @@ export namespace collaborator {
/** Collaborator avatar. */
public avatar: string;

/** Collaborator deviceID. */
public deviceID: string;

/**
* Creates a new Collaborator instance using the specified properties.
* @param [properties] Properties to set
Expand Down
6 changes: 6 additions & 0 deletions src/proto/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1852,6 +1852,7 @@ var collaborator = $root.collaborator = (function () {
Collaborator.prototype.login = "";
Collaborator.prototype.email = "";
Collaborator.prototype.avatar = "";
Collaborator.prototype.deviceID = "";
Collaborator.create = function create(properties) {
return new Collaborator(properties);
};
Expand All @@ -1868,6 +1869,8 @@ var collaborator = $root.collaborator = (function () {
writer.uint32(34).string(message.email);
if (message.avatar != null && message.hasOwnProperty("avatar"))
writer.uint32(42).string(message.avatar);
if (message.deviceID != null && message.hasOwnProperty("deviceID"))
writer.uint32(50).string(message.deviceID);
return writer;
};
Collaborator.decode = function decode(reader, length) {
Expand All @@ -1892,6 +1895,9 @@ var collaborator = $root.collaborator = (function () {
case 5:
message.avatar = reader.string();
break;
case 6:
message.deviceID = reader.string();
break;
default:
reader.skipType(tag & 7);
break;
Expand Down

0 comments on commit bf06100

Please sign in to comment.