Skip to content
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.

Sign up for GitHub

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

Implement Monetization #932

Merged
merged 78 commits into from
Sep 15, 2024
Merged

Implement Monetization #932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
63c4841
feat: entitlements
viztea Apr 8, 2024
c2a4cb7
feat: skus
viztea Apr 8, 2024
50f0f23
feat: core api & fixes
viztea Apr 8, 2024
8de1fa8
merge: main -> feat/entitlements
viztea Apr 8, 2024
9ed8562
chore: remove RequiresMonetization annotation
viztea Apr 8, 2024
f4eab01
chore: api dump
viztea Apr 8, 2024
2d3e2b1
feat: respond premium required, getEntitlements, fix model bugs
viztea Apr 8, 2024
2f0153d
feat(rest): monetization error codes
viztea Apr 9, 2024
ef283ac
chore: implement requested changes
viztea Apr 9, 2024
eb1fa32
fix(common): premium required kdoc
viztea Apr 9, 2024
d4d9bef
chore: ksp
viztea Apr 9, 2024
14267aa
fix(core): only match against entitlement id
viztea Apr 9, 2024
29e0a01
chore: apply simple suggestions via github
viztea Apr 10, 2024
51063c7
chore: reorder service properties
viztea Apr 10, 2024
8ddf3f2
chore(rest): SkuService#getSkus -> listSkus
viztea Apr 10, 2024
c706e2a
chore: import Generate subtypes
viztea Apr 10, 2024
0e27632
chore: implement requested changes to rest
viztea Apr 10, 2024
a123744
feat(gateway/test): entitlement event deser tests
viztea Apr 10, 2024
cb34d9f
chore: requested changes
viztea Apr 11, 2024
da273bc
fix(core/cache): link user data -> entitlement data
viztea Apr 11, 2024
bb4e709
fix: api dump + missing optional stuff
viztea Apr 11, 2024
d9046af
feat: update error code name
viztea Apr 11, 2024
0a96289
chore: requested changes
viztea Apr 12, 2024
3f9b1ff
merge: main -> feat/entitlements
viztea Apr 12, 2024
d771c6b
chore: remove unnecessary json field
viztea Apr 12, 2024
ade3737
feat(core): add entitlements cache builder
viztea Apr 12, 2024
af49b06
feat(core): update kdoc
viztea Apr 12, 2024
10bfef2
chore: requested changes
viztea Apr 19, 2024
39b4978
chore: requested changes
viztea Apr 20, 2024
2e04524
feat: update according to docs
viztea Jul 11, 2024
9cea72f
feat: rework list entitlements
viztea Jul 11, 2024
c68f2cd
Merge branch 'main' into feat/entitlements
viztea Jul 11, 2024
be62d24
chore: api dump
viztea Jul 11, 2024
c01b8bc
chore: requested changes
viztea Aug 15, 2024
f9a8289
Merge branch 'main' into feat/entitlements
lukellmann Sep 7, 2024
d1cc987
feat(rest): error codes 40018 and 40019
lukellmann Sep 7, 2024
4b85cef
chore(core): remove suspend from EntitySupplier.getEntitlements
lukellmann Sep 7, 2024
d46c328
chore(core): remove unused RestEntitySupplier.sku
lukellmann Sep 7, 2024
7962fcf
chore(rest): defensive copy in EntitlementsListRequestBuilder
lukellmann Sep 7, 2024
2eae328
chore(core): remove suspend from Kord.getEntitlements
lukellmann Sep 8, 2024
8dd41c3
chore(core): rename Events.kt to EntitlementEvents.kt
lukellmann Sep 8, 2024
54827ee
chore: update links
lukellmann Sep 8, 2024
930fead
chore: remove getting single entitlement
lukellmann Sep 8, 2024
3e4498d
chore: document Kord.createTestEntitlement
lukellmann Sep 8, 2024
1b68967
chore: don't implement Strategizable for Entitlement
lukellmann Sep 8, 2024
27135cd
fix(core): correct pagination for getEntitlements
lukellmann Sep 8, 2024
c2a983f
feat(core): add ActionRowComponent.premiumButtons
lukellmann Sep 8, 2024
2988a4a
fix(core): Entitlement.endsAt is nullable
lukellmann Sep 9, 2024
4d46fb2
chore(core): remove Entitlement.isTest
lukellmann Sep 9, 2024
a06abeb
chore(core): use QueryBuilder in CacheEntitySupplier
lukellmann Sep 9, 2024
8ce5b64
chore: update KDoc
lukellmann Sep 9, 2024
382b887
chore: restore formatting of unrelated code
lukellmann Sep 9, 2024
4fefe6b
chore: formatting
lukellmann Sep 9, 2024
2c44cb7
chore: change equals implementations
lukellmann Sep 9, 2024
104ada0
chore: reorder
lukellmann Sep 9, 2024
0b29428
chore(core): update KDoc for methods of Kord
lukellmann Sep 9, 2024
81fb5a5
chore(common): use singular file names
lukellmann Sep 9, 2024
1ecefc2
feat(common): subscriptions
lukellmann Sep 9, 2024
ae46b1a
feat(rest): subscriptions
lukellmann Sep 9, 2024
7c47744
feat(gateway): subscriptions
lukellmann Sep 9, 2024
4753b78
Merge branch 'main' into feat/entitlements
lukellmann Sep 10, 2024
3516eb6
chore: shared monetization packages
lukellmann Sep 11, 2024
2558e28
chore: tweak KDoc
lukellmann Sep 11, 2024
ef01707
chore(core): rename parameter of EntitlementData.from
lukellmann Sep 11, 2024
b108060
chore(core): formatting
lukellmann Sep 11, 2024
6d74f96
chore(core): create Entitlements after caching
lukellmann Sep 11, 2024
c87d748
feat(core): subscriptions
lukellmann Sep 12, 2024
03ffa81
chore(core): gotta give the toString some space
lukellmann Sep 12, 2024
d4e9018
chore(common): polish SkuType KDoc
lukellmann Sep 14, 2024
37afa95
fix(core): remove unused parameter
lukellmann Sep 14, 2024
3ab3e4e
chore(core): add name to argument
lukellmann Sep 14, 2024
809f7af
chore(core): add more names to arguments
lukellmann Sep 14, 2024
cc36c98
chore(core): consistent use of "an SKU"
lukellmann Sep 14, 2024
3f5b8a1
chore(core): move consume above delete
lukellmann Sep 14, 2024
92d5131
chore(core): tweak KDoc
lukellmann Sep 14, 2024
eddd6c6
chore(core): link to Entitlement in Subscription KDoc
lukellmann Sep 14, 2024
cdf41be
chore(core): Subscription KDoc: mention IDs
lukellmann Sep 14, 2024
28923af
feat(core): Subscription.skus
lukellmann Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: update error code name
  • Loading branch information
@viztea
viztea committed Apr 11, 2024
commit d9046af58c1c96565645ba80942f478f0ddece5f
2 changes: 1 addition & 1 deletion rest/api/rest.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2568,6 +2568,7 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field Companion Ldev/kord/rest/json/JsonErrorCode$Companion;
public static final field ConnectionRevoked Ldev/kord/rest/json/JsonErrorCode;
public static final field DisallowedName Ldev/kord/rest/json/JsonErrorCode;
public static final field EntitlementAlreadyGranted Ldev/kord/rest/json/JsonErrorCode;
public static final field EntityOfEventDifferentFromEventEntity Ldev/kord/rest/json/JsonErrorCode;
public static final field FailedToCreateStage Ldev/kord/rest/json/JsonErrorCode;
public static final field FailedToResizeAssetBelowMaximumSize Ldev/kord/rest/json/JsonErrorCode;
Expand Down Expand Up @@ -2658,7 +2659,6 @@ public final class dev/kord/rest/json/JsonErrorCode : java/lang/Enum {
public static final field ReactionBlocked Ldev/kord/rest/json/JsonErrorCode;
public static final field RequestEntityTooLarge Ldev/kord/rest/json/JsonErrorCode;
public static final field Require2FA Ldev/kord/rest/json/JsonErrorCode;
public static final field ResourceHasEntitlement Ldev/kord/rest/json/JsonErrorCode;
public static final field ResourceIsRateLimited Ldev/kord/rest/json/JsonErrorCode;
public static final field SendMessagesTemporarilyDisabled Ldev/kord/rest/json/JsonErrorCode;
public static final field ServerNeedsMonetizationEnabled Ldev/kord/rest/json/JsonErrorCode;
Expand Down
2 changes: 1 addition & 1 deletion rest/src/commonMain/kotlin/json/JsonErrorCode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ public enum class JsonErrorCode(public val code: Int) {
TagRequired(40067),

/** An entitlement has already been granted for this resource. */
ResourceHasEntitlement(40074),
EntitlementAlreadyGranted(40074),

/** Missing access. */
MissingAccess(50001),
Expand Down
Loading