-
Notifications
You must be signed in to change notification settings - Fork 124
Callback results refactor #260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d1fe129
Implement PNMembershipMetadataResult inside PNObjectEventResult
jakub-grzesiowski 7e6b594
refactor UserMetadata deserialization
jakub-grzesiowski 11f8caa
small test refactor
jakub-grzesiowski 82d6246
PubNub SDK v7.4.1.0 release.
pubnub-release-bot 7ac26f9
test tweak
jakub-grzesiowski cc84899
another test tweak
jakub-grzesiowski 5a8aab7
changelog: quote
085dc30
changelog: update message
34d9638
update .pubnub.yml
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 1 addition & 4 deletions
5
src/Api/PubnubApi/Model/Consumer/Objects/PNChannelMetadataResult.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/Api/PubnubApi/Model/Consumer/Objects/PNMembershipMetadataResult.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| using System.Collections.Generic; | ||
|
|
||
| namespace PubnubApi; | ||
|
|
||
| public class PNMembershipMetadataResult | ||
| { | ||
| public string Channel { get; internal set; } | ||
| public string Uuid { get; internal set; } | ||
| public Dictionary<string, object> Custom { get; internal set; } | ||
| public string Status { get; internal set; } | ||
| public string Type { get; internal set; } | ||
| public string Updated { get; internal set; } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 5 additions & 15 deletions
20
src/Api/PubnubApi/Model/Consumer/Pubsub/PNObjectEventResult.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,14 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
|
|
||
| namespace PubnubApi | ||
| namespace PubnubApi | ||
| { | ||
| public class PNObjectEventResult | ||
| { | ||
| public PNObjectEventResult() | ||
| { | ||
| this.Event = ""; //values = set/delete for uuid/channel/UuidAssociation/ChannelAssociation | ||
| this.Type = ""; //values = uuid/channel/membership | ||
| this.Channel = ""; | ||
| } | ||
| public string Event { get; internal set; } | ||
| public string Type { get; internal set; } | ||
| public string Event { get; internal set; } = ""; //values = set/delete for uuid/channel/UuidAssociation/ChannelAssociation | ||
| public string Type { get; internal set; } = ""; //values = uuid/channel/membership | ||
| public PNUuidMetadataResult UuidMetadata { get; internal set; } //Populate when Type = uuid | ||
| public PNChannelMetadataResult ChannelMetadata { get; internal set; } //Populate when Type = channel | ||
| public PNMembershipMetadataResult MembershipMetadata { get; internal set; } //Populate when Type = membership | ||
| public long Timestamp { get; internal set; } | ||
| public string Channel { get; internal set; } //Subscribed channel | ||
| public string Channel { get; internal set; } = ""; //Subscribed channel | ||
| public string Subscription { get; internal set; } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ public PNPresenceEventResult() | |
| public string Subscription { get; internal set; } | ||
|
|
||
| public long Timetoken { get; internal set; } | ||
| public object UserMetadata { get; internal set; } | ||
| public Dictionary<string, object> UserMetadata { get; internal set; } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍🏻 |
||
| public string[] Join { get; internal set; } | ||
| public string[] Timeout { get; internal set; } | ||
| public string[] Leave { get; internal set; } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍🏻