-
Notifications
You must be signed in to change notification settings - Fork 13
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
feat: emotes #41
Merged
Merged
feat: emotes #41
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
4803399
feat: add Emotes
cazala 302114f
fix: compiler errors
cazala a2dd6d9
fix: use EmoteCategory
cazala 1174c3f
fix: check metadata is not null
cazala 076944c
chore: added hashes to readme
cazala 7459bef
fix: use right schema for emote
cazala 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 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 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 |
---|---|---|
|
@@ -68,6 +68,11 @@ type Item @entity { | |
searchWearableCategory: WearableCategory | ||
searchWearableRarity: String # We're using String instead of WearableRarity here so we can later query this field via ()_in | ||
searchWearableBodyShapes: [WearableBodyShape!] | ||
|
||
## Emote search fields | ||
searchEmoteCategory: EmoteCategory | ||
searchEmoteRarity: String # We're using String instead of WearableRarity here so we can later query this field via ()_in | ||
searchEmoteBodyShapes: [WearableBodyShape!] | ||
} | ||
|
||
type NFT @entity { | ||
|
@@ -109,6 +114,11 @@ type NFT @entity { | |
searchWearableRarity: String # We're using String instead of WearableRarity here so we can later query this field via ()_in | ||
searchWearableBodyShapes: [WearableBodyShape!] | ||
|
||
## Emote search fields | ||
searchEmoteCategory: EmoteCategory | ||
searchEmoteRarity: String # We're using String instead of WearableRarity here so we can later query this field via ()_in | ||
searchEmoteBodyShapes: [WearableBodyShape!] | ||
|
||
## Order search fields | ||
searchOrderStatus: OrderStatus | ||
searchOrderPrice: BigInt | ||
|
@@ -120,13 +130,15 @@ type Metadata @entity { | |
id: ID! | ||
itemType: ItemType! | ||
wearable: Wearable | ||
emote: Emote | ||
} | ||
|
||
enum ItemType @entity { | ||
undefined | ||
wearable_v1 | ||
wearable_v2 | ||
smart_wearable_v1 | ||
emote_v1 | ||
} | ||
|
||
type Wearable @entity { | ||
|
@@ -139,6 +151,16 @@ type Wearable @entity { | |
bodyShapes: [WearableBodyShape!] | ||
} | ||
|
||
type Emote @entity { | ||
id: ID! | ||
name: String! | ||
description: String! | ||
collection: String! | ||
category: EmoteCategory! | ||
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. The difference between the |
||
rarity: WearableRarity! | ||
bodyShapes: [WearableBodyShape!] | ||
} | ||
|
||
enum WearableCategory @entity { | ||
eyebrows | ||
eyes | ||
|
@@ -158,6 +180,11 @@ enum WearableCategory @entity { | |
skin | ||
} | ||
|
||
enum EmoteCategory @entity { | ||
simple | ||
loop | ||
} | ||
|
||
enum WearableRarity @entity { | ||
common | ||
uncommon | ||
|
This file contains 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 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,3 @@ | ||
// Emote categories | ||
export const SIMPLE = 'simple' | ||
export const LOOP = 'loop' |
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.
searchEmoteRarity
andsearchEmoteBodyShapes
may be combined into a singlesearchRarity
andsearchBodyShapes
and then get rid of the currentsearchWearableRarity
andsearchWearableBodyShapes
. The thing is if we wanted to change those it would be a breaking change, so we would need to still support the old ones until migration thenft-server
and potentially breaking other integrations. Also, even tho those things are repeated between wearables and emotes, they might not exist on other future type of assets (like 3D assets for the Builder) so it might be OK to let them exist only on the item types that actually use them./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.
Do you want to create an issue with this?
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.
👍 #42