Release 1.0.1: PRs #150, #151, #152 (#153)

Author: frozenbanana

README.md

@@ -21,7 +21,7 @@ This plugin integrates [Swarm](https://www.ethswarm.org/) (a decentralized, bloc
 
 Before using the plugin, ensure you have the following:
 
--   An active Nextcloud instance (version 30 or 31)
+-   An active Nextcloud instance (version 30, 31 or 32)
 -   A valid Access Key and URL to activate the service
     -   [Get Your Free Trial for the Nextcloud Swarm Plugin](https://app.hejbit.com)
 
@@ -49,14 +49,12 @@ Once installed, HejBit Swarm integrates directly with Nextcloud’s "Files" sect
 
 Additionally, we have introduced a HejBit Feedback button that appears in the bottom left corner when you are inside a HejBit folder. This feature allows users to easily send feedback regarding general inquiries, ideas, or issues directly from the plugin.
 
-
 ### Settings
 
 Users with administrative credentials can configure the plugin through the standard External Storage settings. Here, you can input your Access Key and URL for HejBit Swarm.
 
 ![Basic HejBit Swarm setup in External Storage in Nextcloud administration](https://github.com/user-attachments/assets/3e80f664-86b9-4cfa-bbc5-6f9f1fbeb94a)
 
-
 ### Usage
 
 Once setup and configured, the Decentralized Storage is ready to use.

appinfo/info.xml

@@ -26,7 +26,7 @@ This plugin integrates [Swarm](https://www.ethswarm.org/) (a decentralized, bloc
 
 Before using the plugin, ensure you have the following:
 
-- An active Nextcloud instance (version 30 or 31)
+- An active Nextcloud instance (version 30, 31 or 32)
 - A valid Access Key and URL to activate the service
   - [Get Your Free Trial for the Nextcloud Swarm Plugin](https://app.hejbit.com)
 
@@ -89,7 +89,7 @@ Experience the future of data storage with 5GB of free, decentralized storage on
 This program is licensed under the AGPLv3 or later.
 
     ]]></description>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <licence>agpl</licence>
     <author>MetaProvide</author>
     <namespace>Files_External_Ethswarm</namespace>
@@ -104,7 +104,7 @@ This program is licensed under the AGPLv3 or later.
     <repository type="git">https://github.com/MetaProvide/nextcloud-swarm-plugin.git</repository>
 	<screenshot>https://raw.githubusercontent.com/MetaProvide/nextcloud-swarm-plugin/main/assets/images/swarm_Files.png</screenshot>
     <dependencies>
-        <nextcloud min-version="30" max-version="31"/>
+        <nextcloud min-version="30" max-version="32"/>
     </dependencies>
 	<settings>
 		<admin>OCA\Files_External_Ethswarm\Settings\Admin</admin>

cli/staging/deploy.sh

@@ -119,7 +119,7 @@ log_gap
 
 DEPLOYMENT=()
 TIMESTAMP=$(date +%s)
-for version in {29..31}; do
+for version in {30..32}; do
 	deploy "$version" &
 	DEPLOYMENT+=($!)
 done

css/app.css

@@ -7,11 +7,26 @@
 	pointer-events: none;
 }
 
+.hejbit-overlay-32 {
+	position: absolute;
+	top: 23px;
+	left: 60px;
+	width: 16px;
+	height: 16px;
+	pointer-events: none;
+}
+
 .hejbit-overlay svg {
 	width: 16px;
 	height: 16px;
 }
 
+.hejbit-overlay-32 svg {
+	width: 16px;
+	height: 16px;
+}
+
+
 .hejbit-archive svg {
 	filter: grayscale(100%);
 	border: 1px dashed #f6c915;

docker-compose.stage.yml

@@ -8,8 +8,6 @@ services:
     depends_on:
       nextcloud:
         condition: service_started
-      proxy:
-        condition: service_healthy
     labels:
       caddy: ${APP_URL}
       caddy.reverse_proxy: '{{upstreams 80}}'
@@ -22,7 +20,7 @@ services:
       context: ./docker/nextcloud
       dockerfile: Dockerfile
       args:
-        NC_VERSION: ${NC_VERSION:-31}
+        NC_VERSION: ${NC_VERSION:-32}
       target: ${ENV:-development}
     restart: unless-stopped
     depends_on:
@@ -45,7 +43,7 @@ services:
       - ./:/var/www/html/custom_apps/files_external_ethswarm
 
   cron:
-    image: nextcloud:${NC_VERSION:-31}-fpm-alpine
+    image: nextcloud:${NC_VERSION:-32}-fpm-alpine
     restart: always
     volumes:
       - nc-app:/var/www/html
@@ -75,7 +73,7 @@ services:
       - backend
 
   postgres:
-    image: postgres:alpine
+    image: postgres:18-alpine
     restart: unless-stopped
     env_file:
       - .env
@@ -97,13 +95,13 @@ networks:
   frontend:
     ipam:
         config:
-          - subnet: 172.${NC_VERSION:-31}.10.0/24
-            gateway: 172.${NC_VERSION:-31}.10.1
+          - subnet: 172.${NC_VERSION:-32}.10.0/24
+            gateway: 172.${NC_VERSION:-32}.10.1
   backend:
     ipam:
         config:
-          - subnet: 172.${NC_VERSION:-31}.20.0/24
-            gateway: 172.${NC_VERSION:-31}.20.1
+          - subnet: 172.${NC_VERSION:-32}.20.0/24
+            gateway: 172.${NC_VERSION:-32}.20.1
   proxy:
     name: hejbit-network
     external: true

docker-compose.yml

@@ -30,7 +30,7 @@ services:
       context: ./docker/nextcloud
       dockerfile: Dockerfile
       args:
-        NC_VERSION: ${NC_VERSION:-31}
+        NC_VERSION: ${NC_VERSION:-32}
       target: ${ENV:-development}
     restart: unless-stopped
     depends_on:
@@ -57,7 +57,7 @@ services:
       - ./:/var/www/html/custom_apps/files_external_ethswarm
 
   cron:
-    image: nextcloud:${NC_VERSION:-31}-fpm-alpine
+    image: nextcloud:${NC_VERSION:-32}-fpm-alpine
     restart: always
     volumes:
       - nc-app:/var/www/html
@@ -89,7 +89,7 @@ services:
       - backend
 
   postgres:
-    image: postgres:alpine
+    image: postgres:18-alpine
     restart: unless-stopped
     #    ports:
     #      - '5432:5432'

img/hejbit-logo-padded.svg

@@ -45,7 +45,7 @@ protected function configureTelemetry(): void {
 		if ($config->getSystemValue('telemetry.enabled') && $isSupported) {
 			/** @var IAppManager $appManager */
 			$appManager = $this->container->get(IAppManager::class);
-			$appInfo = $appManager->getAppInfo(parent::NAME);
+			$appInfo = $appManager->getAppInfo(Application::NAME);
 			$pluginVersion = $appInfo['version'] ?? 'unknown';
 
 			/** @var IURLGenerator $urlGenerator */

lib/AppInfo/Telemetry.php

@@ -1,9 +1,13 @@
 import { FileAction, registerFileAction } from "@nextcloud/files";
 import { showInfo } from "@nextcloud/dialogs";
 import HejBitSvg from "@/../img/hejbit-logo.svg";
+import HejBitPaddedSvg from "@/../img/hejbit-logo-padded.svg";
 import InfoSvg from "@material-design-icons/svg/filled/info.svg";
 import FilesHelper from "@/util/FilesHelper";
 import SvgHelper from "@/util/SvgHelper";
+import { loadState } from '@nextcloud/initial-state';
+
+
 
 registerFileAction(
 	new FileAction({
@@ -29,24 +33,39 @@ registerFileAction(
 		},
 
 		iconSvgInline(files, view) {
-			return SvgHelper.convert(
-				FilesHelper.isArchiveFolder(files) ? InfoSvg : HejBitSvg
-			);
+			const config = loadState('core', 'config');
+            const majorVersion = config?.version ? parseInt(config.version.split('.')[0]) : null;
+			if (majorVersion === 32){
+				return SvgHelper.convert(FilesHelper.isArchiveFolder(files) ? InfoSvg : HejBitPaddedSvg);
+			}else{
+				return SvgHelper.convert(FilesHelper.isArchiveFolder(files) ? InfoSvg : HejBitSvg);
+			}
+
 		},
 
 		inline(file, view) {
 			return true;
 		},
 
 		async renderInline(node, view) {
+
+			const config = loadState('core', 'config');
+            const majorVersion = config?.version ? parseInt(config.version.split('.')[0]) : null;
+
 			// Create the overlay element
 			const overlay = document.createElement("div");
-			overlay.classList.add("hejbit-overlay");
+
+            if (majorVersion === 32) {
+				overlay.classList.add("hejbit-overlay-32");
+            } else {
+                overlay.classList.add("hejbit-overlay");
+            }
 
 			if (FilesHelper.isArchive(node)) {
 				overlay.classList.add("hejbit-archive");
 			}
 
+
 			overlay.innerHTML = SvgHelper.convert(HejBitSvg);
 
 			return overlay;