Update installation.md

Co-authored-by: dni ⚡ <office@dnilabs.com>

docs/guide/installation.md

@@ -15,8 +15,8 @@ Note that by default LNbits uses SQLite as its database, which is simple and eff
 Go to [releases](https://github.com/lnbits/lnbits/releases) and pull latest AppImage, or:
 
 ```sh
-sudo apt-get install libfuse2
-wget $(curl -s https://api.github.com/repos/lnbits/lnbits/releases/latest | jq -r '.assets[] | select(.name | endswith(".AppImage")) | .browser_download_url') -O LNbits-latest.AppImage
+sudo apt-get install jq libfuse2
+wget $(curl -s https://api.github.com/repos/arcbtc/lnbits/releases/latest | jq -r '.assets[] | select(.name | endswith(".AppImage")) | .browser_download_url') -O LNbits-latest.AppImage
 chmod +x LNbits-latest.AppImage
 LNBITS_ADMIN_UI=true HOST=0.0.0.0 PORT=5000 ./LNbits-latest.AppImage # most system settings are now in the admin UI, but pass additional .env variables here
 ```

lnbits/core/models/extensions.py

@@ -39,6 +39,7 @@ class ExplicitRelease(BaseModel):
     info_notification: str | None
     critical_notification: str | None
     details_link: str | None
+    paid_features: str | None
     pay_link: str | None
 
     def is_version_compatible(self):
@@ -187,6 +188,7 @@ class ExtensionRelease(BaseModel):
     icon: str | None = None
     details_link: str | None = None
 
+    paid_features: str | None = None
     pay_link: str | None = None
     cost_sats: int | None = None
     paid_sats: int | None = 0
@@ -256,6 +258,7 @@ class ExtensionRelease(BaseModel):
             html_url=e.html_url,
             details_link=e.details_link,
             pay_link=e.pay_link,
+            paid_features=e.paid_features,
             repo=e.repo,
             icon=e.icon,
         )
@@ -308,6 +311,9 @@ class ExtensionMeta(BaseModel):
     dependencies: list[str] = []
     archive: str | None = None
     featured: bool = False
+    paid_features: str | None = None
+    has_paid_release: bool = False
+    has_free_release: bool = False
 
 
 class InstallableExtension(BaseModel):
@@ -451,9 +457,23 @@ class InstallableExtension(BaseModel):
 
         shutil.rmtree(self.ext_upgrade_dir, True)
 
-    def check_latest_version(self, release: ExtensionRelease | None):
+    def check_release_updates(self, release: ExtensionRelease | None):
+        self._check_latest_version(release)
+        self._check_payment_link(release)
+
+    def find_existing_payment(self, pay_link: str | None) -> ReleasePaymentInfo | None:
+        if not pay_link or not self.meta or not self.meta.payments:
+            return None
+        return next(
+            (p for p in self.meta.payments if p.pay_link == pay_link),
+            None,
+        )
+
+    def _check_latest_version(self, release: ExtensionRelease | None):
         if not release:
             return
+        if not release.is_version_compatible:
+            return
         if not self.meta or not self.meta.latest_release:
             meta = self.meta or ExtensionMeta()
             meta.latest_release = release
@@ -464,13 +484,19 @@ class InstallableExtension(BaseModel):
         ):
             self.meta.latest_release = release
 
-    def find_existing_payment(self, pay_link: str | None) -> ReleasePaymentInfo | None:
-        if not pay_link or not self.meta or not self.meta.payments:
-            return None
-        return next(
-            (p for p in self.meta.payments if p.pay_link == pay_link),
-            None,
-        )
+    def _check_payment_link(self, release: ExtensionRelease | None):
+        if not release:
+            return
+        if not release.is_version_compatible:
+            return
+        if not self.meta:
+            self.meta = ExtensionMeta()
+        if release.pay_link:
+            self.meta.has_paid_release = True
+        else:
+            self.meta.has_free_release = True
+        if release.paid_features:
+            self.meta.paid_features = release.paid_features
 
     def _restore_payment_info(self):
         if (
@@ -596,7 +622,7 @@ class InstallableExtension(BaseModel):
                         (ee for ee in extension_list if ee.id == r.id), None
                     )
                     if existing_ext and ext.meta:
-                        existing_ext.check_latest_version(ext.meta.latest_release)
+                        existing_ext.check_release_updates(ext.meta.latest_release)
                         continue
 
                     meta = ext.meta or ExtensionMeta()
@@ -610,10 +636,10 @@ class InstallableExtension(BaseModel):
                         (ee for ee in extension_list if ee.id == e.id), None
                     )
                     if existing_ext:
-                        existing_ext.check_latest_version(release)
+                        existing_ext.check_release_updates(release)
                         continue
                     ext = InstallableExtension.from_explicit_release(e)
-                    ext.check_latest_version(release)
+                    ext.check_release_updates(release)
                     meta = ext.meta or ExtensionMeta()
                     meta.featured = ext.id in manifest.featured
                     ext.meta = meta

lnbits/core/templates/core/extensions.html

@@ -137,8 +137,40 @@
               @click="showExtensionDetails(extension.id, extension.details_link)"
               v-text="extension.name"
             ></div>
-            <div>
+            <div style="justify-content: space-between; display: flex">
               <lnbits-extension-rating :rating="0" />
+              <q-btn-group size="xs" style="margin: 5px 0">
+                <q-btn
+                  v-if="extension.hasFreeRelease"
+                  color="green"
+                  size="xs"
+                  :label="$t('free')"
+                >
+                  <q-tooltip>
+                    <span v-text="$t('extension_has_free_release')"></span>
+                  </q-tooltip>
+                </q-btn>
+                <q-btn
+                  v-if="extension.hasPaidRelease || extension.paidFeatures"
+                  color="primary"
+                  size="xs"
+                  :label="$t('paid')"
+                >
+                  <q-tooltip>
+                    <span
+                      v-if="extension.hasPaidRelease"
+                      v-text="$t('extension_has_paid_release')"
+                    ></span>
+                    <br
+                      v-if="extension.hasPaidRelease && extension.paidFeatures"
+                    />
+                    <span
+                      v-if="extension.paidFeatures"
+                      v-text="extension.paidFeatures"
+                    ></span>
+                  </q-tooltip>
+                </q-btn>
+              </q-btn-group>
             </div>
             <div style="justify-content: space-between; display: flex">
               <q-toggle
@@ -916,7 +948,6 @@
                 :href="selectedExtensionDetails.repo"
                 target="_blank"
                 rel="noopener noreferrer"
-                class="q-pr-xs"
                 ><q-tooltip>repository</q-tooltip></q-btn
               >
             </div>

lnbits/core/views/extension_api.py

@@ -61,9 +61,10 @@ async def api_install_extension(data: CreateExtension):
         data.ext_id, data.source_repo, data.archive, data.version
     )
     if not release:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail="Release not found"
-        )
+        raise HTTPException(HTTPStatus.NOT_FOUND, "Release not found")
+
+    if not release.is_version_compatible:
+        raise HTTPException(HTTPStatus.BAD_REQUEST, "Incompatible extension version.")
 
     release.payment_hash = data.payment_hash
     ext_meta = ExtensionMeta(installed_release=release)

lnbits/core/views/generic.py

@@ -126,6 +126,9 @@ async def extensions(request: Request, user: User = Depends(check_user_exists)):
                 if ext.meta and ext.meta.latest_release
                 else None
             ),
+            "hasPaidRelease": ext.meta.has_paid_release if ext.meta else False,
+            "hasFreeRelease": ext.meta.has_free_release if ext.meta else False,
+            "paidFeatures": ext.meta.paid_features if ext.meta else False,
             "installedRelease": (
                 dict(ext.meta.installed_release)
                 if ext.meta and ext.meta.installed_release

lnbits/core/views/payment_api.py

@@ -296,7 +296,9 @@ async def api_payment(payment_hash, x_api_key: str | None = Header(None)):
         return {"paid": True, "preimage": payment.preimage}
 
     if payment.failed:
-        return {"paid": False, "status": "failed", "details": payment}
+        if wallet and wallet.id == payment.wallet_id:
+            return {"paid": False, "status": "failed", "details": payment}
+        return {"paid": False, "status": "failed"}
 
     try:
         status = await payment.check_status()

lnbits/static/i18n/en.js

@@ -168,6 +168,8 @@ window.localisation.en = {
     'Only admin accounts can create extensions',
   admin_only: 'Admin Only',
   new_version: 'New Version',
+  extension_has_free_release: 'Has free releases',
+  extension_has_paid_release: 'Has paid releases',
   extension_depends_on: 'Depends on:',
   extension_rating_soon: 'Ratings coming soon',
   extension_installed_version: 'Installed version',
@@ -663,5 +665,7 @@ window.localisation.en = {
   callback_success_url_hint:
     'The user will be redirected to this URL after the payment is successful',
   connected: 'Connected',
-  not_connected: 'Not Connected'
+  not_connected: 'Not Connected',
+  free: 'Free',
+  paid: 'Paid'
 }

lnbits/static/js/admin.js

@@ -468,7 +468,10 @@ window.AdminPageLogic = {
         .catch(LNbits.utils.notifyApiError)
     },
     formatDate(date) {
-      return moment.utc(date * 1000).fromNow()
+      return moment
+        .utc(date * 1000)
+        .local()
+        .fromNow()
     },
     sendTestEmail() {
       LNbits.api

lnbits/static/js/base.js

@@ -267,10 +267,10 @@ window.LNbits = {
       }
 
       obj.date = moment.utc(data.created_at).local().format(window.dateFormat)
-      obj.dateFrom = moment.utc(data.created_at).fromNow()
+      obj.dateFrom = moment.utc(data.created_at).local().fromNow()
 
       obj.expirydate = moment.utc(obj.expiry).local().format(window.dateFormat)
-      obj.expirydateFrom = moment.utc(obj.expiry).fromNow()
+      obj.expirydateFrom = moment.utc(obj.expiry).local().fromNow()
       obj.msat = obj.amount
       obj.sat = obj.msat / 1000
       obj.tag = obj.extra?.tag

lnbits/static/js/node.js

@@ -600,7 +600,7 @@ window.app.component('lnbits-date', {
       return LNbits.utils.formatDate(this.ts)
     },
     dateFrom() {
-      return moment.utc(this.date).fromNow()
+      return moment.utc(this.date).local().fromNow()
     }
   },
   template: `

lnbits/static/js/payments.js

@@ -164,7 +164,7 @@ window.PaymentsPageLogic = {
           if (p.extra && p.extra.tag) {
             p.tag = p.extra.tag
           }
-          p.timeFrom = moment.utc(p.created_at).fromNow()
+          p.timeFrom = moment.utc(p.created_at).local().fromNow()
           p.outgoing = p.amount < 0
           p.amount =
             new Intl.NumberFormat(window.LOCALE).format(p.amount / 1000) +

lnbits/static/js/wallet.js

@@ -179,7 +179,7 @@ window.WalletPageLogic = {
   methods: {
     dateFromNow(unix) {
       const date = new Date(unix * 1000)
-      return moment.utc(date).fromNow()
+      return moment.utc(date).local().fromNow()
     },
     formatFiatAmount(amount, currency) {
       this.update.currency = currency
@@ -476,8 +476,14 @@ window.WalletPageLogic = {
               createdDate,
               'YYYY-MM-DDTHH:mm:ss.SSSZ'
             )
-            cleanInvoice.expireDateFrom = moment.utc(expireDate).fromNow()
-            cleanInvoice.createdDateFrom = moment.utc(createdDate).fromNow()
+            cleanInvoice.expireDateFrom = moment
+              .utc(expireDate)
+              .local()
+              .fromNow()
+            cleanInvoice.createdDateFrom = moment
+              .utc(createdDate)
+              .local()
+              .fromNow()
 
             cleanInvoice.expired = false // TODO
           }

lnbits/templates/components.vue

@@ -649,8 +649,7 @@
     </div>
     <div
       v-if="showButtons"
-      class="qrcode__buttons row q-gutter-x-sm"
-      style="justify-content: flex-end"
+      class="qrcode__buttons row q-gutter-x-sm items-center justify-end no-wrap full-width"
     >
       <q-btn
         v-if="nfc && nfcSupported"