highperfocused/nostrdvm
1
0
Fork 0
mirror of https://github.com/believethehype/nostrdvm.git synced 2025-04-01 00:18:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

ui fixes

Browse Source
This commit is contained in:
Believethehype 2024-03-18 20:17:17 +01:00
parent 41785313a4
commit 3788bf8ec1
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nostr_dvm/subscription.py
View File

@ -230,6 +230,8 @@ class Subscription:
try:
while True:
time.sleep(60.0)
print("Checking Subscription")
except KeyboardInterrupt:
print('Stay weird!')

2
ui/noogle/src/components/Login.vue
View File

@ -817,11 +817,13 @@ export default {
}
console.log("hello")
let subscription_status = await hasActiveSubscription(store.state.pubkey.toHex(), nip88.d, evt.author.toHex(), nip88.amounts)
nip88.hasActiveSubscription = subscription_status.isActive
nip88.subscribedUntil = subscription_status.validUntil
nip88.subscriptionId = subscription_status.subscriptionId
nip88.expires = subscription_status.expires
console.log(subscription_status)
jsonentry.nip88 = nip88

25
ui/noogle/src/components/RecommendationGeneration.vue
View File

@ -550,7 +550,10 @@ async function cancelSubscription(kind7001, recipent){
async function subscribe_to_dvm() {
if (!localStorage.getItem("nostr-key-method") || localStorage.getItem("nostr-key-method") === "anon"){
miniToastr.showMessage("Login to subscribe to a DVM.", "Not logged in", "error")
return
}
// We only arrive here if no subscription exists, we might create a 7001 if it doesnt exist and we zap it
let client = store.state.client
@ -641,6 +644,21 @@ async function subscribe_to_dvm() {
}
// TODO this is only for viewing, check event (happens on page reload now)
let subscribeduntil = Timestamp.now().asSecs()
if (this.current_subscription_cadence === "daily"){
subscribeduntil = Timestamp.now().asSecs() + 60*60*24
}
else if (this.current_subscription_cadence === "weekly"){
subscribeduntil = Timestamp.now().asSecs() + 60*60*24 * 7
}
else if (this.current_subscription_cadence === "monthly"){
subscribeduntil = Timestamp.now().asSecs() + 60*60*24 * 31
}
else if (this.current_subscription_cadence === "yearly"){
subscribeduntil = Timestamp.now().asSecs() + 60*60*24 * 365
}
console.log(content)
let msg = JSON.stringify(content)
console.log(msg)
@ -649,6 +667,9 @@ async function subscribe_to_dvm() {
dvms.find(x => x.nip88.eventid === this.current_subscription_dvm.nip88.eventid).nip88.hasActiveSubscription = true
dvms.find(x => x.nip88.eventid === this.current_subscription_dvm.nip88.eventid).nip88.expires = false
dvms.find(x => x.nip88.eventid === this.current_subscription_dvm.nip88.eventid).nip88.subscribedUntil = subscribeduntil
}
catch(error){
console.log(error)
@ -1077,7 +1098,7 @@ const closeNWCModal = () => {
</div>
<button class="btn" v-if="!dvm.nip88.expires" @click="set_subscription_props(0, '', dvm); cancelSubscription(dvm.nip88.subscriptionId, dvm.id)"> Cancel Subscription
<button class="btn" v-if="!dvm.nip88.expires && dvm.nip88.hasActiveSubscription" @click="set_subscription_props(0, '', dvm); cancelSubscription(dvm.nip88.subscriptionId, dvm.id)"> Cancel Subscription
</button>

4
ui/noogle/src/components/helper/Helper.vue
View File

@ -382,7 +382,7 @@ export async function hasActiveSubscription(pubkeystring, tiereventdtag, tieraut
let subscriptionfilter = new Filter().kind(7003).pubkey(PublicKey.parse(tierauthorid)).customTag(SingleLetterTag.uppercase(Alphabet.P), [pubkeystring]).limit(1)
let evts = await client.getEventsOf([subscriptionfilter], Duration.fromSecs(5))
console.log(evts)
if (evts.length > 0){
console.log(evts[0].asJson())
let matchesdtag = false
@ -419,7 +419,7 @@ export async function hasActiveSubscription(pubkeystring, tiereventdtag, tieraut
return subscriptionstatus
}
return subscriptionstatus
}