Added Optional channel description name to channel creation, adjusted tests

- SearchMessageFTSMulti
 - ListMessagesFilteredChannels
 - ListMessagesFilteredChannelIDs
 - ListMessagesFilteredSenders
 - ListMessagesFilteredTime
 - ListMessagesFilteredPriority
 - ListMessagesFilteredKeyTokens

.gitea/workflows/build_and_deploy.yml

@@ -0,0 +1,43 @@
+
+# https://docs.gitea.com/next/usage/actions/quickstart
+# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions
+# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context
+
+name: Build Docker and Deploy
+run-name: Build & Deploy ${{ gitea.ref }} on ${{ gitea.actor }}
+
+on: 
+  push:
+    branches: ['master']    
+
+
+
+jobs:
+  build_job:
+    name: Build Docker Container
+    runs-on: bfb-cicd-latest
+    steps:
+      - run: echo -n "${{ secrets.DOCKER_REG_PASS }}" | docker login registry.blackforestbytes.com -u docker --password-stdin
+      - name: Check out code
+        uses: actions/checkout@v3
+      - run: cd "${{ gitea.workspace }}/scnserver" && make clean
+      - run: cd "${{ gitea.workspace }}/scnserver" && make docker
+      - run: cd "${{ gitea.workspace }}/scnserver" && make push-docker
+    
+  deploy_job:
+    name: Deploy to Server
+    needs: [build_job]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Execute deploy on remote (via ssh)
+        uses: appleboy/ssh-action@v1.0.0
+        with:
+          host:     simplecloudnotifier.de
+          username: bfb-deploy-bot
+          port:     4477
+          key:      "${{ secrets.SSH_KEY_BFBDEPLOYBOT }}"
+          script:   cd /var/docker/deploy-scripts/simplecloudnotifier && ./deploy.sh master "${{ gitea.sha }}" || exit 1
+
+
+
+

android/.idea/assetWizardSettings.xml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="imageWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="imageAssetPanel">
-                    <value>
-                      <PersistentState>
-                        <option name="children">
-                          <map>
-                            <entry key="launcherLegacy">
-                              <value>
-                                <PersistentState>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="assetType" value="IMAGE" />
-                                      <entry key="cropped" value="true" />
-                                      <entry key="iconShape" value="NONE" />
-                                      <entry key="imageAsset" value="F:\Eigene Dateien\Dropbox\Programming\Java\AndroidStudioProjects\SimpleCloudNotifier\data\icon_512_nobox.png" />
-                                      <entry key="outputName" value="ic_notification_full" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                            <entry key="notification">
-                              <value>
-                                <PersistentState>
-                                  <option name="values">
-                                    <map>
-                                      <entry key="assetType" value="IMAGE" />
-                                      <entry key="imageAsset" value="F:\Eigene Dateien\Dropbox\Programming\Java\AndroidStudioProjects\SimpleCloudNotifier\data\icon_512_transparent.png" />
-                                      <entry key="outputName" value="ic_notification_white" />
-                                    </map>
-                                  </option>
-                                </PersistentState>
-                              </value>
-                            </entry>
-                          </map>
-                        </option>
-                        <option name="values">
-                          <map>
-                            <entry key="outputIconType" value="LAUNCHER_LEGACY" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="values">
-                          <map>
-                            <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_garbage" />
-                            <entry key="sourceFile" value="C:\Users\Mike\Downloads\garbage.svg" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

android/.idea/codeStyles/Project.xml

@@ -1,29 +1,113 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
+    <codeStyleSettings language="XML">
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
   </code_scheme>
 </component>

android/.idea/jarRepositories.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://dl.bintray.com/gericop/maven" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven3" />
+      <option name="name" value="maven3" />
+      <option name="url" value="https://maven.google.com" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>

android/app/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     def versionPropsFile = file('version.properties')
     def vNumber
@@ -16,7 +16,7 @@ android {
     defaultConfig {
         applicationId "com.blackforestbytes.simplecloudnotifier"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode vNumber
         versionName vName
     }
@@ -35,76 +35,82 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'com.google.firebase:firebase-core:16.0.4'
-    implementation 'com.google.firebase:firebase-messaging:17.3.4'
-    implementation 'com.google.android.gms:play-services-ads:17.1.0'
-    implementation 'com.android.billingclient:billing:1.2'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.firebase:firebase-core:18.0.0'
+    implementation 'com.google.firebase:firebase-messaging:21.0.0'
+    implementation 'com.google.android.gms:play-services-ads:19.5.0'
+    implementation 'com.android.billingclient:billing:3.0.1'
 
-    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.github.kenglxn.QRGen:android:2.5.0'
     implementation "com.github.DeweyReed:UltimateMusicPicker:2.0.0"
     implementation 'com.github.duanhong169:colorpicker:1.1.5'
+
+    implementation 'net.danlew:android.joda:2.10.7.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
 
-task updateVersion << {
-    def lastTag = ['git', 'describe', "--abbrev=0", "--tags"].execute().text.trim()
+tasks.register("updateVersion") {
+    group = 'Custom'
 
-    def versionPropsFile = file('version.properties')
-    if (!versionPropsFile.canRead()) throw new FileNotFoundException("Could not read version.properties!")
-    Properties versionProps = new Properties()
-    new FileInputStream(versionPropsFile).withCloseable { fis -> versionProps.load(fis) }
+    doLast {
+        def lastTag = ['git', 'describe', "--abbrev=0", "--tags"].execute().text.trim()
 
-    def matcher = lastTag =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)$/
+        def versionPropsFile = file('version.properties')
+        if (!versionPropsFile.canRead()) throw new FileNotFoundException("Could not read version.properties!")
+        Properties versionProps = new Properties()
+        new FileInputStream(versionPropsFile).withCloseable { fis -> versionProps.load(fis) }
 
-    if (!matcher.matches()) throw new Exception("Last Tag ('" + lastTag + "') has invalid format :(")
+        def matcher = lastTag =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)$/
 
-    def vName = (matcher[0][1] as Integer) + "." + (matcher[0][2] as Integer) + "." + (matcher[0][3] as Integer)
-    def vCode = versionProps['VERSION_CODE'] as Integer
+        if (!matcher.matches()) throw new Exception("Last Tag ('" + lastTag + "') has invalid format :(")
 
-    if (new File(".do_publish_beta_release").exists()) new File(".do_publish_beta_release").delete()
-    if (new File(".do_publish_prod_release").exists()) new File(".do_publish_prod_release").delete()
+        def vName = (matcher[0][1] as Integer) + "." + (matcher[0][2] as Integer) + "." + (matcher[0][3] as Integer)
+        def vCode = versionProps['VERSION_CODE'] as Integer
 
-    if (vName == versionProps['VERSION_NAME'].toString()) {
-        println "This version was already built - skip deployment"
-    } else if (vName.endsWith(".0")) {
-        println ""
-        println "====================================================================="
-        println "====================================================================="
-        println "(!) This is a new PRODUCTION release - create deployment trigger file"
-        println "====================================================================="
-        println "====================================================================="
-        println ""
+        if (new File(".do_publish_beta_release").exists()) new File(".do_publish_beta_release").delete()
+        if (new File(".do_publish_prod_release").exists()) new File(".do_publish_prod_release").delete()
 
-        vCode++
-        new File(".do_publish_prod_release").createNewFile()
+        if (vName == versionProps['VERSION_NAME'].toString()) {
+            println "This version was already built - skip deployment"
+        } else if (vName.endsWith(".0")) {
+            println ""
+            println "====================================================================="
+            println "====================================================================="
+            println "(!) This is a new PRODUCTION release - create deployment trigger file"
+            println "====================================================================="
+            println "====================================================================="
+            println ""
 
-        versionProps['VERSION_NAME'] = vName.toString()
-        versionProps['VERSION_CODE'] = vCode.toString()
+            vCode++
+            new File(".do_publish_prod_release").createNewFile()
 
-        versionPropsFile.newWriter().withCloseable { w -> versionProps.store(w, null) }
-    } else {
-        println ""
-        println "==============================================================="
-        println "(!) This is a new beta release - create deployment trigger file"
-        println "==============================================================="
-        println ""
+            versionProps['VERSION_NAME'] = vName.toString()
+            versionProps['VERSION_CODE'] = vCode.toString()
 
-        vCode++
-        new File(".do_publish_beta_release").createNewFile()
+            versionPropsFile.newWriter().withCloseable { w -> versionProps.store(w, null) }
+        } else {
+            println ""
+            println "==============================================================="
+            println "(!) This is a new beta release - create deployment trigger file"
+            println "==============================================================="
+            println ""
 
-        versionProps['VERSION_NAME'] = vName.toString()
-        versionProps['VERSION_CODE'] = vCode.toString()
+            vCode++
+            new File(".do_publish_beta_release").createNewFile()
 
-        versionPropsFile.newWriter().withCloseable { w -> versionProps.store(w, null) }
+            versionProps['VERSION_NAME'] = vName.toString()
+            versionProps['VERSION_CODE'] = vCode.toString()
+
+            versionPropsFile.newWriter().withCloseable { w -> versionProps.store(w, null) }
+        }
     }
 }

android/app/src/main/AndroidManifest.xml

@@ -1,43 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.blackforestbytes.simplecloudnotifier">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.android.vending.BILLING" />
 
     <application
+        android:name=".SCNApp"
         android:allowBackup="false"
-        android:name="SCNApp"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
-
         <activity android:name=".view.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <meta-data android:name="com.google.firebase.messaging.default_notification_icon"  android:resource="@drawable/icon" />
-        <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/colorAccent" />
-        <meta-data android:name="com.google.android.gms.ads.AD_MANAGER_APP"                android:value="true"/>
-        <meta-data android:name="com.google.android.gms.ads.APPLICATION_ID"                android:value="ca-app-pub-3320562328966175~7579972005"/>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.blackforestbytes.simplecloudnotifier.fileprovider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/filepaths" />
+        </provider>
 
-        <service android:name=".service.FBMService" android:exported="false">
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/icon" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/colorAccent" />
+        <meta-data
+            android:name="com.google.android.gms.ads.AD_MANAGER_APP"
+            android:value="true" />
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="ca-app-pub-3320562328966175~7579972005" />
+
+        <service
+            android:name=".service.FBMService"
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
 
-        <receiver android:name=".service.BroadcastReceiverService" android:exported="false" />
+        <receiver
+            android:name=".service.BroadcastReceiverService"
+            android:exported="false" />
 
+        <activity
+            android:name=".view.debug.QueryLogActivity"
+            android:label="@string/title_activity_query_log"
+            android:theme="@style/AppTheme" />
+        <activity android:name=".view.debug.SingleQueryLogActivity" />
     </application>
 
 </manifest>

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.widget.Toast;
 
 import com.android.billingclient.api.BillingClient;
+import com.blackforestbytes.simplecloudnotifier.model.QueryLog;
 import com.blackforestbytes.simplecloudnotifier.view.AccountFragment;
 import com.blackforestbytes.simplecloudnotifier.view.MainActivity;
 import com.blackforestbytes.simplecloudnotifier.view.TabAdapter;
@@ -99,4 +100,5 @@ public class SCNApp extends Application implements LifecycleObserver
     }
 }
 
-//TODO TabLayout indicator does not corretly animate when directly clicking on tabs
+//TODO: Config for collapsed line count
+//TODO: Sometimes ads but promode

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/CMessage.java

@@ -9,6 +9,8 @@ import java.util.TimeZone;
 
 public class CMessage
 {
+    public boolean IsExpandedInAdapter = false;
+
     public final long SCN_ID;
     public final long Timestamp;
     public final String Title;

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/CMessageList.java

@@ -35,6 +35,11 @@ public class CMessageList
     }
 
     private CMessageList()
+    {
+        reloadPrefs();
+    }
+
+    public void reloadPrefs()
     {
         synchronized (msg_lock)
         {

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/LogLevel.java

@@ -0,0 +1,58 @@
+package com.blackforestbytes.simplecloudnotifier.model;
+
+
+import android.graphics.Color;
+
+public enum LogLevel
+{
+    DEBUG,
+    INFO,
+    WARN,
+    ERROR;
+
+    public String toUIString()
+    {
+        switch (this)
+        {
+            case DEBUG: return "Debug";
+            case INFO:  return "Info";
+            case WARN:  return "Warning";
+            case ERROR: return "Error";
+            default:    return "???";
+        }
+    }
+
+    public int getColor()
+    {
+        switch (this)
+        {
+            case DEBUG: return Color.GRAY;
+            case WARN:  return Color.rgb(171, 145, 68);
+            case INFO:  return Color.BLACK;
+            case ERROR: return Color.RED;
+            default:    return Color.MAGENTA;
+        }
+    }
+
+    public int asInt()
+    {
+        switch (this)
+        {
+            case DEBUG: return 0;
+            case WARN:  return 1;
+            case INFO:  return 2;
+            case ERROR: return 3;
+            default:    return 999;
+        }
+    }
+
+    public static LogLevel fromInt(int i)
+    {
+        if (i == 0) return LogLevel.DEBUG;
+        if (i == 1) return LogLevel.WARN;
+        if (i == 2) return LogLevel.INFO;
+        if (i == 3) return LogLevel.ERROR;
+
+        return LogLevel.ERROR; // ????
+    }
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/QueryLog.java

@@ -0,0 +1,69 @@
+package com.blackforestbytes.simplecloudnotifier.model;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import com.blackforestbytes.simplecloudnotifier.SCNApp;
+import com.blackforestbytes.simplecloudnotifier.lib.collections.CollectionHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class QueryLog
+{
+    private final static int MAX_HISTORY_SIZE = 192;
+
+    private static QueryLog _instance;
+    public static QueryLog inst() { if (_instance == null) synchronized (QueryLog.class) { if (_instance == null) _instance = new QueryLog(); } return _instance; }
+
+    private QueryLog(){ reloadPrefs(); }
+
+    private final List<SingleQuery> history = new ArrayList<>();
+
+    public synchronized void add(SingleQuery r)
+    {
+        history.add(r);
+        while (history.size() > MAX_HISTORY_SIZE) history.remove(0);
+
+        save();
+    }
+
+    public synchronized List<SingleQuery> get()
+    {
+        List<SingleQuery> r = new ArrayList<>(history);
+        CollectionHelper.sort_inplace(r, (o1, o2) -> (-1) * o1.Timestamp.compareTo(o2.Timestamp));
+        return r;
+    }
+
+    public synchronized void save()
+    {
+        SharedPreferences sharedPref = SCNApp.getContext().getSharedPreferences("QueryLog", Context.MODE_PRIVATE);
+        SharedPreferences.Editor e = sharedPref.edit();
+
+        e.clear();
+
+        e.putInt("history_count", history.size());
+
+        for (int i = 0; i < history.size(); i++) history.get(i).save(e, "message["+(i+1000)+"]");
+
+        e.apply();
+    }
+
+    public synchronized void reloadPrefs()
+    {
+        try
+        {
+            Context c = SCNApp.getContext();
+            SharedPreferences sharedPref = c.getSharedPreferences("QueryLog", Context.MODE_PRIVATE);
+            int count = sharedPref.getInt("history_count", 0);
+            for (int i=0; i < count; i++) history.add(SingleQuery.load(sharedPref, "message["+(i+1000)+"]"));
+
+            CollectionHelper.sort_inplace(history, (o1, o2) -> (-1) * o1.Timestamp.compareTo(o2.Timestamp));
+        }
+        catch (Exception e)
+        {
+            Log.e("SC:QL:Load", e.toString());
+        }
+    }
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SCNSettings.java

@@ -6,11 +6,11 @@ import android.content.SharedPreferences;
 import android.util.Log;
 import android.view.View;
 
-import com.android.billingclient.api.Purchase;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
+import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple3;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.service.IABService;
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.installations.FirebaseInstallations;
 
 public class SCNSettings
 {
@@ -52,7 +52,8 @@ public class SCNSettings
 
     public boolean Enabled = true;
     public int LocalCacheSize = 500;
-    public boolean EnableDeleteSwipe = true;
+    public boolean EnableDeleteSwipe = false;
+    public int PreviewLineCount = 6;
 
     public final NotificationSettings PriorityLow  = new NotificationSettings(PriorityEnum.LOW);
     public final NotificationSettings PriorityNorm = new NotificationSettings(PriorityEnum.NORMAL);
@@ -61,6 +62,11 @@ public class SCNSettings
     // ------------------------------------------------------------
 
     public SCNSettings()
+    {
+        reloadPrefs();
+    }
+
+    public void reloadPrefs()
     {
         SharedPreferences sharedPref = SCNApp.getContext().getSharedPreferences("Config", Context.MODE_PRIVATE);
 
@@ -77,6 +83,7 @@ public class SCNSettings
         Enabled                     = sharedPref.getBoolean("app_enabled",  Enabled);
         LocalCacheSize              = sharedPref.getInt("local_cache_size", LocalCacheSize);
         EnableDeleteSwipe           = sharedPref.getBoolean("do_del_swipe",  EnableDeleteSwipe);
+        PreviewLineCount            = sharedPref.getInt("preview_line_count", PreviewLineCount);
 
         PriorityLow.EnableLED         = sharedPref.getBoolean("priority_low:enabled_led",         PriorityLow.EnableLED);
         PriorityLow.EnableSound       = sharedPref.getBoolean("priority_low:enabled_sound",       PriorityLow.EnableSound);
@@ -120,10 +127,14 @@ public class SCNSettings
         e.putString( "user_key",                         user_key);
         e.putString( "fcm_token_local",                  fcm_token_local);
         e.putString( "fcm_token_server",                 fcm_token_server);
+        e.putBoolean("promode_local",                    promode_local);
+        e.putBoolean("promode_server",                   promode_server);
+        e.putString( "promode_token",                    promode_token);
 
         e.putBoolean("app_enabled",                      Enabled);
         e.putInt(    "local_cache_size",                 LocalCacheSize);
         e.putBoolean("do_del_swipe",                     EnableDeleteSwipe);
+        e.putInt(    "preview_line_count",               PreviewLineCount);
 
         e.putBoolean("priority_low:enabled_led",         PriorityLow.EnableLED);
         e.putBoolean("priority_low:enabled_sound",       PriorityLow.EnableSound);
@@ -171,13 +182,13 @@ public class SCNSettings
         return base + "index.php?preset_user_id="+user_id+"&preset_user_key="+user_key;
     }
 
-    public void setServerToken(String token, View loader)
+    public void setServerToken(String token, View loader, boolean force)
     {
         if (isConnected())
         {
             fcm_token_local = token;
             save();
-            if (!fcm_token_local.equals(fcm_token_server)) ServerCommunication.updateFCMToken(user_id, user_key, fcm_token_local, loader);
+            if (!fcm_token_local.equals(fcm_token_server) || force) ServerCommunication.updateFCMToken(user_id, user_key, fcm_token_local, loader);
         }
         else
         {
@@ -189,13 +200,12 @@ public class SCNSettings
     }
 
     // called at app start
-    public void work(Activity a)
+    public void work(Activity a, boolean force)
     {
-        FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(a, instanceIdResult ->
+        FirebaseInstallations.getInstance().getId().addOnSuccessListener(a, newToken ->
         {
-            String newToken = instanceIdResult.getToken();
             Log.d("FB::GetInstanceId", newToken);
-            SCNSettings.inst().setServerToken(newToken, null);
+            SCNSettings.inst().setServerToken(newToken, null, force);
         }).addOnCompleteListener(r ->
         {
             if (isConnected()) ServerCommunication.info(user_id, user_key, null);
@@ -221,16 +231,15 @@ public class SCNSettings
 
             if (promode_server != promode_local) updateProState(loader);
 
-            if (!Str.equals(fcm_token_local, fcm_token_server)) work(a);
+            if (!Str.equals(fcm_token_local, fcm_token_server)) work(a, false);
         }
         else
         {
             // get token then register
-            FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(a, instanceIdResult ->
+            FirebaseInstallations.getInstance().getId().addOnSuccessListener(a, newToken ->
             {
-                String newToken = instanceIdResult.getToken();
                 Log.d("FB::GetInstanceId", newToken);
-                SCNSettings.inst().setServerToken(newToken, loader); // does register in here
+                SCNSettings.inst().setServerToken(newToken, loader, false); // does register in here
             }).addOnCompleteListener(r ->
             {
                 if (isConnected()) ServerCommunication.info(user_id, user_key, null); // info again for safety
@@ -240,14 +249,17 @@ public class SCNSettings
 
     public void updateProState(View loader)
     {
-        Purchase purch = IABService.inst().getPurchaseCached(IABService.IAB_PRO_MODE);
-        boolean promode_real = (purch != null);
+        Tuple3<Boolean, Boolean, String> state = IABService.inst().getPurchaseCachedExtended(IABService.IAB_PRO_MODE);
+        if (!state.Item2) return; // not initialized
+
+        boolean promode_real = state.Item1;
 
         if (promode_real != promode_local || promode_real != promode_server)
         {
             promode_local = promode_real;
+            promode_token = promode_real ? state.Item3 : "";
+            save();
 
-            promode_token = promode_real ? purch.getPurchaseToken() : "";
             updateProStateOnServer(loader);
         }
     }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/ServerCommunication.java

@@ -4,12 +4,11 @@ import android.util.Log;
 import android.view.View;
 
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
-import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple5;
-import com.blackforestbytes.simplecloudnotifier.lib.lambda.Func1to0;
 import com.blackforestbytes.simplecloudnotifier.lib.lambda.Func5to0;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.service.FBMService;
 
+import org.joda.time.Instant;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -48,20 +47,20 @@ public class ServerCommunication
                 @Override
                 public void onFailure(Call call, IOException e)
                 {
-                    Log.e("SC:register", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                    handleError("register", call, null, Str.Empty, true, e);
                     SCNApp.runOnUiThread(() -> { if (loader!=null)loader.setVisibility(View.GONE); });
                 }
 
                 @Override
                 public void onResponse(Call call, Response response)
                 {
+                    String r = Str.Empty;
                     try (ResponseBody responseBody = response.body())
                     {
                         if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
                         if (responseBody ==  null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -69,6 +68,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("register", call, response, r);
                             return;
                         }
 
@@ -81,11 +81,12 @@ public class ServerCommunication
                         SCNSettings.inst().save();
 
                         SCNApp.refreshAccountTab();
+
+                        handleSuccess("register", call, response, r);
                     }
                     catch (Exception e)
                     {
-                        Log.e("SC:register", e.toString());
-                        SCNApp.showToast("Communication with server failed", 4000);
+                        handleError("register", call, response, r, false, e);
                     }
                     finally
                     {
@@ -96,8 +97,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            Log.e("SC:register", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("register", null, null, Str.Empty, false, e);
         }
     }
 
@@ -106,7 +106,7 @@ public class ServerCommunication
         try
         {
             Request request = new Request.Builder()
-                    .url(BASE_URL + "updateFCMToken.php?user_id="+id+"&user_key="+key+"&fcm_token="+token)
+                    .url(BASE_URL + "update.php?user_id="+id+"&user_key="+key+"&fcm_token="+token)
                     .build();
 
             client.newCall(request).enqueue(new Callback()
@@ -114,20 +114,20 @@ public class ServerCommunication
                 @Override
                 public void onFailure(Call call, IOException e)
                 {
-                    Log.e("SC:update_1", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                    handleError("update<1>", call, null, Str.Empty, true, e);
                     SCNApp.runOnUiThread(() -> { if (loader!=null)loader.setVisibility(View.GONE); });
                 }
 
                 @Override
                 public void onResponse(Call call, Response response)
                 {
+                    String r = Str.Empty;
                     try (ResponseBody responseBody = response.body())
                     {
                         if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
                         if (responseBody ==  null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -135,6 +135,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("update<1>", call, response, r);
                             return;
                         }
 
@@ -147,10 +148,12 @@ public class ServerCommunication
                         SCNSettings.inst().save();
 
                         SCNApp.refreshAccountTab();
+
+                        handleSuccess("update<1>", call, response, r);
                     }
                     catch (Exception e)
                     {
-                        Log.e("SC:update_1", e.toString());
+                        handleError("update<1>", call, response, r, false, e);
                         SCNApp.showToast("Communication with server failed", 4000);
                     }
                     finally
@@ -162,8 +165,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            Log.e("SC:update_1", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("update<1>", null, null, Str.Empty, false, e);
         }
     }
 
@@ -172,30 +174,35 @@ public class ServerCommunication
         try
         {
             Request request = new Request.Builder()
-                    .url(BASE_URL + "updateFCMToken.php?user_id=" + id + "&user_key=" + key)
+                    .url(BASE_URL + "update.php?user_id=" + id + "&user_key=" + key)
                     .build();
 
             client.newCall(request).enqueue(new Callback() {
                 @Override
-                public void onFailure(Call call, IOException e) {
-                    Log.e("SC:update_2", e.toString());
+                public void onFailure(Call call, IOException e)
+                {
+                    handleError("update<1>", call, null, Str.Empty, true, e);
                     SCNApp.showToast("Communication with server failed", 4000);
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
 
                         if (!json_bool(json, "success")) {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("update<2>", call, response, r);
                             return;
                         }
 
@@ -207,10 +214,16 @@ public class ServerCommunication
                         SCNSettings.inst().save();
 
                         SCNApp.refreshAccountTab();
-                    } catch (Exception e) {
-                        Log.e("SC:update_2", e.toString());
+
+                        handleSuccess("update<2>", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("update<2>", call, response, r, false, e);
                         SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
+                    }
+                    finally
+                    {
                         SCNApp.runOnUiThread(() -> {
                             if (loader != null) loader.setVisibility(View.GONE);
                         });
@@ -220,8 +233,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            Log.e("SC:update_2", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("update<2>", null, null, Str.Empty, false, e);
         }
     }
 
@@ -236,21 +248,23 @@ public class ServerCommunication
             client.newCall(request).enqueue(new Callback() {
                 @Override
                 public void onFailure(Call call, IOException e) {
-                    Log.e("SC:info", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                    handleError("info", call, null, Str.Empty, true, e);
                     SCNApp.runOnUiThread(() -> {
                         if (loader != null) loader.setVisibility(View.GONE);
                     });
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -258,6 +272,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("info", call, response, r);
 
                             int errid = json.optInt("errid", 0);
 
@@ -290,21 +305,23 @@ public class ServerCommunication
 
                         if (json_int(json, "unack_count")>0) ServerCommunication.requery(id, key, loader);
 
-                    } catch (Exception e) {
-                        Log.e("SC:info", e.toString());
+                        handleSuccess("info", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("info", call, response, r, false, e);
                         SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
-                        SCNApp.runOnUiThread(() -> {
-                            if (loader != null) loader.setVisibility(View.GONE);
-                        });
+                    }
+                    finally
+                    {
+                        SCNApp.runOnUiThread(() -> { if (loader != null) loader.setVisibility(View.GONE); });
                     }
                 }
             });
         }
         catch (Exception e)
         {
-            Log.e("SC:info", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("info", null, null, Str.Empty, false, e);
         }
     }
 
@@ -319,21 +336,23 @@ public class ServerCommunication
             client.newCall(request).enqueue(new Callback() {
                 @Override
                 public void onFailure(Call call, IOException e) {
-                    Log.e("SC:requery", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                    handleError("requery", call, null, Str.Empty, true, e);
                     SCNApp.runOnUiThread(() -> {
                         if (loader != null) loader.setVisibility(View.GONE);
                     });
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -341,6 +360,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("requery", call, response, r);
                             return;
                         }
 
@@ -359,10 +379,15 @@ public class ServerCommunication
                             FBMService.recieveData(time, title, content, prio, scn_id, true);
                         }
 
-                    } catch (Exception e) {
-                        Log.e("SC:info", e.toString());
+                        handleSuccess("requery", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("requery", call, response, r, false, e);
                         SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
+                    }
+                    finally
+                    {
                         SCNApp.runOnUiThread(() -> {
                             if (loader != null) loader.setVisibility(View.GONE);
                         });
@@ -372,8 +397,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            Log.e("SC:requery", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("requery", null, null, Str.Empty, false, e);
         }
     }
 
@@ -387,27 +411,31 @@ public class ServerCommunication
                     .url(BASE_URL + "upgrade.php?user_id=" + id + "&user_key=" + key + "&pro=" + pro + "&pro_token=" + URLEncoder.encode(pro_token, "utf-8"))
                     .build();
 
-            client.newCall(request).enqueue(new Callback() {
+            client.newCall(request).enqueue(new Callback()
+            {
                 @Override
-                public void onFailure(Call call, IOException e) {
-                    Log.e("SC:upgrade", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
+                public void onFailure(Call call, IOException e)
+                {
+                    handleError("upgrade", call, null, Str.Empty, true, e);
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
-                        if (!response.isSuccessful())
-                            throw new IOException("Unexpected code " + response);
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
+                        if (!response.isSuccessful()) throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
 
                         if (!json_bool(json, "success")) {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("upgrade", call, response, r);
                             return;
                         }
 
@@ -418,10 +446,15 @@ public class ServerCommunication
                         SCNSettings.inst().save();
 
                         SCNApp.refreshAccountTab();
-                    } catch (Exception e) {
-                        Log.e("SC:upgrade", e.toString());
-                        SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
+
+                        handleSuccess("upgrade", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("upgrade", call, response, r, false, e);
+                    }
+                    finally
+                    {
                         SCNApp.runOnUiThread(() -> { if (loader != null) loader.setVisibility(View.GONE); });
                     }
                 }
@@ -429,8 +462,7 @@ public class ServerCommunication
         }
         catch (Exception e)
         {
-            e.printStackTrace();
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("upgrade", null, null, Str.Empty, false, e);
         }
     }
 
@@ -442,37 +474,47 @@ public class ServerCommunication
                     .url(BASE_URL + "ack.php?user_id=" + id + "&user_key=" + key + "&scn_msg_id=" + msg_scn_id)
                     .build();
 
-            client.newCall(request).enqueue(new Callback() {
+            client.newCall(request).enqueue(new Callback()
+            {
                 @Override
-                public void onFailure(Call call, IOException e) {
-                    Log.e("SC:ack", e.toString());
+                public void onFailure(Call call, IOException e)
+                {
+                    handleError("ack", call, null, Str.Empty, true, e);
                 }
 
                 @Override
                 public void onResponse(Call call, Response response)
                 {
-                    try (ResponseBody responseBody = response.body()) {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
 
-                        if (!json_bool(json, "success")) SCNApp.showToast(json_str(json, "message"), 4000);
+                        if (!json_bool(json, "success"))
+                        {
+                            SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("ack", call, response, r);
+                        }
 
-                    } catch (Exception e) {
-                        Log.e("SC:ack", e.toString());
-                        SCNApp.showToast("Communication with server failed", 4000);
+                        handleSuccess("ack", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("ack", call, response, r, false, e);
                     }
                 }
             });
         }
         catch (Exception e)
         {
-            Log.e("SC:ack", e.toString());
+            handleError("ack", null, null, Str.Empty, false, e);
         }
     }
 
@@ -487,21 +529,21 @@ public class ServerCommunication
             client.newCall(request).enqueue(new Callback() {
                 @Override
                 public void onFailure(Call call, IOException e) {
-                    Log.e("SC:expand", e.toString());
-                    SCNApp.showToast("Communication with server failed", 4000);
-                    SCNApp.runOnUiThread(() -> {
-                        if (loader != null) loader.setVisibility(View.GONE);
-                    });
+                    handleError("expand", call, null, Str.Empty, true, e);
+                    SCNApp.runOnUiThread(() -> { if (loader != null) loader.setVisibility(View.GONE); });
                 }
 
                 @Override
-                public void onResponse(Call call, Response response) {
-                    try (ResponseBody responseBody = response.body()) {
+                public void onResponse(Call call, Response response)
+                {
+                    String r = Str.Empty;
+                    try (ResponseBody responseBody = response.body())
+                    {
                         if (!response.isSuccessful())
                             throw new IOException("Unexpected code " + response);
                         if (responseBody == null) throw new IOException("No response");
 
-                        String r = responseBody.string();
+                        r = responseBody.string();
                         Log.d("Server::Response", request.url().toString()+"\n"+r);
 
                         JSONObject json = (JSONObject) new JSONTokener(r).nextValue();
@@ -509,6 +551,7 @@ public class ServerCommunication
                         if (!json_bool(json, "success"))
                         {
                             SCNApp.showToast(json_str(json, "message"), 4000);
+                            handleNonSuccess("expand", call, response, r);
                             return;
                         }
 
@@ -522,21 +565,22 @@ public class ServerCommunication
 
                         okResult.invoke(title, content, prio, time, scn_id);
 
-                    } catch (Exception e) {
-                        Log.e("SC:expand", e.toString());
-                        SCNApp.showToast("Communication with server failed", 4000);
-                    } finally {
-                        SCNApp.runOnUiThread(() -> {
-                            if (loader != null) loader.setVisibility(View.GONE);
-                        });
+                        handleSuccess("expand", call, response, r);
+                    }
+                    catch (Exception e)
+                    {
+                        handleError("expand", call, response, r, false, e);
+                    }
+                    finally
+                    {
+                        SCNApp.runOnUiThread(() -> { if (loader != null) loader.setVisibility(View.GONE); });
                     }
                 }
             });
         }
         catch (Exception e)
         {
-            Log.e("SC:expand", e.toString());
-            SCNApp.showToast("Communication with server failed", 4000);
+            handleError("expand", null, null, Str.Empty, false, e);
         }
     }
 
@@ -564,4 +608,79 @@ public class ServerCommunication
     {
         return o.getString(key);
     }
+
+    private static void handleSuccess(String source, Call call, Response resp, String respBody)
+    {
+        Log.d("SC:"+source, respBody);
+
+        try
+        {
+            Instant i  = Instant.now();
+            String s   = source;
+            String u   = call.request().url().toString();
+            int rc     = resp.code();
+            String r   = respBody;
+            LogLevel l = LogLevel.INFO;
+
+            SingleQuery q = new SingleQuery(l, i, s, u, r, rc, "SUCCESS");
+            QueryLog.inst().add(q);
+        }
+        catch (Exception e2)
+        {
+            Log.e("SC:HandleSuccess", e2.toString());
+        }
+    }
+
+    private static void handleNonSuccess(String source, Call call, Response resp, String respBody)
+    {
+        Log.d("SC:"+source, respBody);
+
+        try
+        {
+            Instant i  = Instant.now();
+            String s   = source;
+            String u   = call.request().url().toString();
+            int rc     = resp.code();
+            String r   = respBody;
+            LogLevel l = LogLevel.WARN;
+
+            SingleQuery q = new SingleQuery(l, i, s, u, r, rc, "NON-SUCCESS");
+            QueryLog.inst().add(q);
+        }
+        catch (Exception e2)
+        {
+            Log.e("SC:HandleSuccess", e2.toString());
+        }
+    }
+
+    private static void handleError(String source, Call call, Response resp, String respBody, boolean isio, Exception e)
+    {
+        Log.e("SC:"+source, e.toString());
+
+        if (isio)
+        {
+            SCNApp.showToast("Can't connect to server", 3000);
+        }
+        else
+        {
+            SCNApp.showToast("Communication with server failed", 4000);
+        }
+
+        try
+        {
+            Instant i  = Instant.now();
+            String s   = source;
+            String u   = (call==null)?Str.Empty:call.request().url().toString();
+            int rc     = (resp==null)?-1:resp.code();
+            String r   = respBody;
+            LogLevel l = isio?LogLevel.WARN:LogLevel.ERROR;
+
+            SingleQuery q = new SingleQuery(l, i, s, u, r, rc, e.toString());
+            QueryLog.inst().add(q);
+        }
+        catch (Exception e2)
+        {
+            Log.e("SC:HandleError", e2.toString());
+        }
+    }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SingleQuery.java

@@ -0,0 +1,82 @@
+package com.blackforestbytes.simplecloudnotifier.model;
+
+import android.content.SharedPreferences;
+import android.os.BaseBundle;
+import android.os.Bundle;
+
+import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
+
+import org.joda.time.Instant;
+
+public class SingleQuery
+{
+    public final Instant Timestamp;
+
+    public final LogLevel Level;
+    public final String Name;
+    public final String URL;
+    public final String Response;
+    public final int ResponseCode;
+    public final String ExceptionString;
+
+    public SingleQuery(LogLevel l, Instant i, String n, String u, String r, int rc, String e)
+    {
+        Level=l;
+        Timestamp=i;
+        Name=n;
+        URL=u;
+        Response=r;
+        ResponseCode=rc;
+        ExceptionString=e;
+    }
+
+    public void save(SharedPreferences.Editor e, String base)
+    {
+        e.putInt(base+".Level", Level.asInt());
+        e.putLong(base+".Timestamp", Timestamp.getMillis());
+        e.putString(base+".Name", Name);
+        e.putString(base+".URL", URL);
+        e.putString(base+".Response", Response);
+        e.putInt(base+".ResponseCode", ResponseCode);
+        e.putString(base+".ExceptionString", ExceptionString);
+    }
+
+    public void save(BaseBundle e, String base)
+    {
+        e.putInt(base+".Level", Level.asInt());
+        e.putLong(base+".Timestamp", Timestamp.getMillis());
+        e.putString(base+".Name", Name);
+        e.putString(base+".URL", URL);
+        e.putString(base+".Response", Response);
+        e.putInt(base+".ResponseCode", ResponseCode);
+        e.putString(base+".ExceptionString", ExceptionString);
+    }
+
+    public static SingleQuery load(SharedPreferences e, String base)
+    {
+        return new SingleQuery
+                (
+                        LogLevel.fromInt(e.getInt(base+".Level", 0)),
+                        new Instant(e.getLong(base+".Timestamp", 0)),
+                        e.getString(base+".Name", Str.Empty),
+                        e.getString(base+".URL", Str.Empty),
+                        e.getString(base+".Response", Str.Empty),
+                        e.getInt(base+".ResponseCode", -1),
+                        e.getString(base+".ExceptionString", Str.Empty)
+                );
+    }
+
+    public static SingleQuery load(BaseBundle e, String base)
+    {
+        return new SingleQuery
+                (
+                        LogLevel.fromInt(e.getInt(base+".Level", 0)),
+                        new Instant(e.getLong(base+".Timestamp", 0)),
+                        e.getString(base+".Name", Str.Empty),
+                        e.getString(base+".URL", Str.Empty),
+                        e.getString(base+".Response", Str.Empty),
+                        e.getInt(base+".ResponseCode", -1),
+                        e.getString(base+".ExceptionString", Str.Empty)
+                );
+    }
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/FBMService.java

@@ -4,16 +4,21 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
-import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple4;
-import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple5;
+import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.model.CMessage;
 import com.blackforestbytes.simplecloudnotifier.model.CMessageList;
+import com.blackforestbytes.simplecloudnotifier.model.LogLevel;
 import com.blackforestbytes.simplecloudnotifier.model.PriorityEnum;
+import com.blackforestbytes.simplecloudnotifier.model.QueryLog;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.model.ServerCommunication;
+import com.blackforestbytes.simplecloudnotifier.model.SingleQuery;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
+import org.joda.time.Instant;
+import org.json.JSONObject;
+
 public class FBMService extends FirebaseMessagingService
 {
     @Override
@@ -42,6 +47,10 @@ public class FBMService extends FirebaseMessagingService
             long scn_id       = Long.parseLong(remoteMessage.getData().get("scn_msg_id"));
             boolean trimmed   = Boolean.parseBoolean(remoteMessage.getData().get("trimmed"));
 
+
+            SingleQuery q = new SingleQuery(LogLevel.INFO, Instant.now(), "FBM<recieve>", Str.Empty, new JSONObject(remoteMessage.getData()).toString(), 0, "SUCCESS");
+            QueryLog.inst().add(q);
+
             if (trimmed)
             {
                 ServerCommunication.expand(SCNSettings.inst().user_id, SCNSettings.inst().user_key, scn_id, null, (i1, i2, i3, i4, i5) -> recieveData(i4, i1, i2, i3, i5, false));

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/IABService.java

@@ -2,23 +2,37 @@ package com.blackforestbytes.simplecloudnotifier.service;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
 import com.android.billingclient.api.BillingFlowParams;
+import com.android.billingclient.api.BillingResult;
 import com.android.billingclient.api.Purchase;
 import com.android.billingclient.api.PurchasesUpdatedListener;
+import com.android.billingclient.api.SkuDetails;
+import com.android.billingclient.api.SkuDetailsParams;
+import com.android.billingclient.api.SkuDetailsResponseListener;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
+import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple2;
+import com.blackforestbytes.simplecloudnotifier.lib.datatypes.Tuple3;
 import com.blackforestbytes.simplecloudnotifier.lib.lambda.Func0to0;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.view.MainActivity;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import static androidx.constraintlayout.widget.Constraints.TAG;
@@ -45,18 +59,72 @@ public class IABService implements PurchasesUpdatedListener
         }
     }
 
+    public enum SimplePurchaseState { YES, NO, UNINITIALIZED }
+
     private BillingClient client;
     private boolean isServiceConnected;
     private final List<Purchase> purchases = new ArrayList<>();
+    private boolean _isInitialized = false;
+
+    private final Map<String, Boolean> _localCache= new HashMap<>();
 
     public IABService(Context c)
     {
+        _isInitialized = false;
+
+        loadCache();
+
         client = BillingClient
                 .newBuilder(c)
                 .setListener(this)
                 .build();
 
         startServiceConnection(this::queryPurchases, false);
+        startServiceConnection(this::querySkuDetails, false);
+    }
+
+    public void reloadPrefs()
+    {
+        loadCache();
+    }
+
+    private void loadCache()
+    {
+        _localCache.clear();
+        SharedPreferences sharedPref = SCNApp.getContext().getSharedPreferences("IAB", Context.MODE_PRIVATE);
+        int count = sharedPref.getInt("c", 0);
+        for (int i=0; i < count; i++)
+        {
+            String  k = sharedPref.getString("["+i+"]->key", null);
+            boolean v = sharedPref.getBoolean("["+i+"]->value", false);
+            if (k==null)continue;
+            _localCache.put(k, v);
+        }
+    }
+
+    private void saveCache()
+    {
+        SharedPreferences sharedPref = SCNApp.getContext().getSharedPreferences("IAB", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor= sharedPref.edit();
+
+        editor.putInt("c", _localCache.size());
+        int i = 0;
+        for (Map.Entry<String, Boolean> e : _localCache.entrySet())
+        {
+            editor.putString("["+i+"]->key", e.getKey());
+            editor.putBoolean("["+i+"]->value", e.getValue());
+            i++;
+        }
+        editor.apply();
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private synchronized void updateCache(String k, boolean v)
+    {
+        if (_localCache.containsKey(k) && _localCache.get(k)==v) return;
+
+        _localCache.put(k, v);
+        saveCache();
     }
 
     public void queryPurchases()
@@ -67,14 +135,16 @@ public class IABService implements PurchasesUpdatedListener
             Purchase.PurchasesResult purchasesResult = client.queryPurchases(BillingClient.SkuType.INAPP);
             Log.i(TAG, "Querying purchases elapsed time: " + (System.currentTimeMillis() - time) + "ms");
 
-            if (purchasesResult.getResponseCode() == BillingClient.BillingResponse.OK)
+            if (purchasesResult.getResponseCode() == BillingClient.BillingResponseCode.OK)
             {
-                for (Purchase p : purchasesResult.getPurchasesList())
+                for (Purchase p : Objects.requireNonNull(purchasesResult.getPurchasesList()))
                 {
-                    handlePurchase(p);
+                    handlePurchase(p, false);
                 }
 
-                boolean newProMode = getPurchaseCached(IAB_PRO_MODE) != null;
+                _isInitialized = true;
+
+                boolean newProMode = getPurchaseCachedSimple(IAB_PRO_MODE);
                 if (newProMode != SCNSettings.inst().promode_local)
                 {
                     refreshProModeListener();
@@ -89,20 +159,39 @@ public class IABService implements PurchasesUpdatedListener
         executeServiceRequest(queryToExecute, false);
     }
 
-    public void purchase(Activity a, String id)
-    {
-        executeServiceRequest(() ->
-        {
-            BillingFlowParams flowParams = BillingFlowParams
-                    .newBuilder()
-                    .setSku(id)
-                    .setType(BillingClient.SkuType.INAPP) // SkuType.SUB for subscription
-                    .build();
-            client.launchBillingFlow(a, flowParams);
-        }, true);
+    public void querySkuDetails() {
     }
 
-    private void executeServiceRequest(Func0to0 runnable, final boolean userRequest) {
+    public void purchase(Activity a, String id)
+    {
+        Func0to0 queryRequest = () -> {
+            // Query the purchase async
+            SkuDetailsParams.Builder params = SkuDetailsParams.newBuilder();
+            params.setSkusList(Collections.singletonList(id)).setType(BillingClient.SkuType.INAPP);
+            client.querySkuDetailsAsync(params.build(), (billingResult, skuDetailsList) ->
+            {
+                if (billingResult.getResponseCode() != BillingClient.BillingResponseCode.OK || skuDetailsList == null || skuDetailsList.size() != 1)
+                {
+                    SCNApp.showToast("Could not find product", Toast.LENGTH_SHORT);
+                    return;
+                }
+
+                executeServiceRequest(() ->
+                {
+                    BillingFlowParams flowParams = BillingFlowParams
+                            .newBuilder()
+                            .setSkuDetails(skuDetailsList.get(0))
+                            .build();
+                    client.launchBillingFlow(a, flowParams);
+                }, true);
+            });
+        };
+        executeServiceRequest(queryRequest, false);
+
+    }
+
+    private void executeServiceRequest(Func0to0 runnable, final boolean userRequest)
+    {
         if (isServiceConnected)
         {
             runnable.invoke();
@@ -124,34 +213,37 @@ public class IABService implements PurchasesUpdatedListener
     }
 
     @Override
-    public void onPurchasesUpdated(int responseCode, @Nullable List<Purchase> purchases)
+    public void onPurchasesUpdated(@NonNull BillingResult billingResult, @Nullable List<Purchase> purchases)
     {
-        if (responseCode == BillingClient.BillingResponse.OK && purchases != null)
+        if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK && purchases != null)
         {
             for (Purchase purchase : purchases)
             {
-                handlePurchase(purchase);
+                handlePurchase(purchase, true);
             }
         }
-        else if (responseCode == BillingClient.BillingResponse.ITEM_ALREADY_OWNED && purchases != null)
+        else if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED && purchases != null)
         {
             for (Purchase purchase : purchases)
             {
-                handlePurchase(purchase);
+                handlePurchase(purchase, true);
             }
         }
     }
 
-    private void handlePurchase(Purchase purchase)
+    private void handlePurchase(Purchase purchase, boolean triggerUpdate)
     {
         Log.d(TAG, "Got a verified purchase: " + purchase);
 
         purchases.add(purchase);
 
-        refreshProModeListener();
+        if (triggerUpdate) refreshProModeListener();
+
+        updateCache(purchase.getSku(), true);
     }
 
-    private void refreshProModeListener() {
+    private void refreshProModeListener()
+    {
         MainActivity ma = SCNApp.getMainActivity();
         if (ma != null) ma.adpTabs.tab3.updateProState();
         if (ma != null) ma.adpTabs.tab1.updateProState();
@@ -163,9 +255,9 @@ public class IABService implements PurchasesUpdatedListener
         client.startConnection(new BillingClientStateListener()
         {
             @Override
-            public void onBillingSetupFinished(@BillingClient.BillingResponse int billingResponseCode)
+            public void onBillingSetupFinished(@NonNull BillingResult billingResult)
             {
-                if (billingResponseCode == BillingClient.BillingResponse.OK)
+                if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK)
                 {
                     isServiceConnected = true;
                     if (executeOnSuccess != null) executeOnSuccess.invoke();
@@ -183,13 +275,31 @@ public class IABService implements PurchasesUpdatedListener
         });
     }
 
-    public Purchase getPurchaseCached(String id)
+    public boolean getPurchaseCachedSimple(String id)
     {
-        for (Purchase p : purchases)
+        return getPurchaseCachedExtended(id).Item1;
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    public Tuple3<Boolean, Boolean, String> getPurchaseCachedExtended(String id)
+    {
+        // <state, initialized, token>
+
+        if (!_isInitialized)
         {
-            if (Str.equals(p.getSku(), id)) return p;
+            if (_localCache.containsKey(id) && _localCache.get(id)) return new Tuple3<>(true, false, Str.Empty);
         }
 
-        return null;
+        for (Purchase p : purchases)
+        {
+            if (Str.equals(p.getSku(), id))
+            {
+                updateCache(id, true);
+                return new Tuple3<>(true, true, p.getPurchaseToken());
+            }
+        }
+
+        updateCache(id, false);
+        return new Tuple3<>(false, true, Str.Empty);
     }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/NotificationService.java

@@ -65,7 +65,8 @@ public class NotificationService
                 channel0.setDescription("Push notifications from the server with low priority.\nGo to the in-app settings to configure ringtone, volume and vibrations");
                 channel0.setSound(null, null);
                 channel0.setVibrationPattern(null);
-                channel0.setLightColor(Color.BLUE);
+                channel0.setLightColor(Color.CYAN);
+                channel0.enableLights(true);
                 notifman.createNotificationChannel(channel0);
             }
         }
@@ -77,7 +78,8 @@ public class NotificationService
                 channel1.setDescription("Push notifications from the server with low priority.\nGo to the in-app settings to configure ringtone, volume and vibrations");
                 channel1.setSound(null, null);
                 channel1.setVibrationPattern(null);
-                channel1.setLightColor(Color.BLUE);
+                channel1.setLightColor(Color.CYAN);
+                channel1.enableLights(true);
                 notifman.createNotificationChannel(channel1);
             }
         }
@@ -89,7 +91,9 @@ public class NotificationService
                 channel2.setDescription("Push notifications from the server with low priority.\nGo to the in-app settings to configure ringtone, volume and vibrations");
                 channel2.setSound(null, null);
                 channel2.setVibrationPattern(null);
-                channel2.setLightColor(Color.BLUE);
+                channel2.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
+                channel2.setLightColor(Color.CYAN);
+                channel2.enableLights(true);
                 notifman.createNotificationChannel(channel2);
             }
         }
@@ -115,9 +119,9 @@ public class NotificationService
             {
                 Vibrator v = (Vibrator) SCNApp.getContext().getSystemService(Context.VIBRATOR_SERVICE);
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    v.vibrate(VibrationEffect.createOneShot(1500, VibrationEffect.DEFAULT_AMPLITUDE));
+                    v.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
                 } else {
-                    v.vibrate(1500);
+                    v.vibrate(500);
                 }
             }
         }
@@ -225,10 +229,10 @@ public class NotificationService
         if (msg.Priority == PriorityEnum.NORMAL) mBuilder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
         if (msg.Priority == PriorityEnum.HIGH)   mBuilder.setPriority(NotificationCompat.PRIORITY_HIGH);
 
-        Intent intnt_click = new Intent(SCNApp.getContext(), BroadcastReceiverService.class);
-        intnt_click.putExtra(BroadcastReceiverService.ID_KEY, BroadcastReceiverService.NOTIF_SHOW_MAIN);
-        PendingIntent pi = PendingIntent.getBroadcast(ctxt, 0, intnt_click, 0);
+        Intent intent = new Intent(ctxt, MainActivity.class);
+        PendingIntent pi = PendingIntent.getActivity(ctxt, 0, intent, 0);
         mBuilder.setContentIntent(pi);
+
         NotificationManager mNotificationManager = (NotificationManager) ctxt.getSystemService(Context.NOTIFICATION_SERVICE);
         if (mNotificationManager == null) return;
 
@@ -254,7 +258,7 @@ public class NotificationService
         if (ns.EnableVibration)
         {
             Vibrator v = (Vibrator) SCNApp.getContext().getSystemService(Context.VIBRATOR_SERVICE);
-            v.vibrate(VibrationEffect.createOneShot(1500, VibrationEffect.DEFAULT_AMPLITUDE));
+            v.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
         }
 
         //if (ns.EnableLED) {  } // no LED in Android-O -- configure via Channel

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/util/MaxHeightScrollView.java

@@ -0,0 +1,56 @@
+package com.blackforestbytes.simplecloudnotifier.util;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.widget.ScrollView;
+
+import com.blackforestbytes.simplecloudnotifier.R;
+
+public class MaxHeightScrollView extends ScrollView
+{
+	public int maxHeight = Integer.MAX_VALUE;//dp
+
+	public MaxHeightScrollView(Context context)
+	{
+		super(context);
+	}
+
+	public MaxHeightScrollView(Context context, AttributeSet attrs)
+	{
+		super(context, attrs);
+
+		TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.MaxHeightScrollView, 0, 0);
+		try {
+			maxHeight = a.getInteger(R.styleable.MaxHeightScrollView_maxHeightOverride, Integer.MAX_VALUE);
+		} finally {
+			a.recycle();
+		}
+	}
+
+	public MaxHeightScrollView(Context context, AttributeSet attrs, int defStyleAttr)
+	{
+		super(context, attrs, defStyleAttr);
+
+		TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.MaxHeightScrollView, 0, 0);
+		try {
+			maxHeight = a.getInteger(R.styleable.MaxHeightScrollView_maxHeightOverride, Integer.MAX_VALUE);
+		} finally {
+			a.recycle();
+		}
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
+	{
+		heightMeasureSpec = MeasureSpec.makeMeasureSpec(dpToPx(getResources(), maxHeight), MeasureSpec.AT_MOST);
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+	}
+
+	private int dpToPx(Resources res, int dp)
+	{
+		return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, res.getDisplayMetrics());
+	}
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/util/TextChangedListener.java

@@ -0,0 +1,25 @@
+package com.blackforestbytes.simplecloudnotifier.util;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+public abstract class TextChangedListener<T> implements TextWatcher {
+    private T target;
+
+    public TextChangedListener(T target) {
+        this.target = target;
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        this.onTextChanged(target, s);
+    }
+
+    public abstract void onTextChanged(T target, Editable s);
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/MainActivity.java

@@ -1,14 +1,23 @@
 package com.blackforestbytes.simplecloudnotifier.view;
 
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
 import android.widget.RelativeLayout;
+import android.widget.Toast;
 
 import com.blackforestbytes.simplecloudnotifier.R;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
 import com.blackforestbytes.simplecloudnotifier.model.CMessageList;
+import com.blackforestbytes.simplecloudnotifier.model.QueryLog;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.service.IABService;
 import com.blackforestbytes.simplecloudnotifier.service.NotificationService;
+import com.blackforestbytes.simplecloudnotifier.view.debug.QueryLogActivity;
 import com.google.android.material.tabs.TabLayout;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -16,6 +25,12 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.ObjectInputStream;
+import java.util.Map;
+import java.util.Set;
+
 public class MainActivity extends AppCompatActivity
 {
     public TabAdapter adpTabs;
@@ -24,6 +39,8 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
+        QueryLog.inst();
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
@@ -33,6 +50,7 @@ public class MainActivity extends AppCompatActivity
         layoutRoot = findViewById(R.id.layoutRoot);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setOnClickListener(this::onToolbackClicked);
         setSupportActionBar(toolbar);
 
         ViewPager viewPager = findViewById(R.id.pager);
@@ -61,7 +79,7 @@ public class MainActivity extends AppCompatActivity
 
         SCNApp.register(this);
         IABService.startup(this);
-        SCNSettings.inst().work(this);
+        SCNSettings.inst().work(this, true);
     }
 
     @Override
@@ -81,4 +99,126 @@ public class MainActivity extends AppCompatActivity
         CMessageList.inst().fullSave();
         IABService.inst().destroy();
     }
+
+    private int clickCount = 0;
+    private long lastClick = 0;
+    private void onToolbackClicked(View v)
+    {
+        long now = System.currentTimeMillis();
+        if (now - lastClick > 200) clickCount=0;
+        clickCount++;
+        lastClick = now;
+
+        if (clickCount == 4) startActivity(new Intent(this, QueryLogActivity.class));
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(requestCode == 1991 && resultCode == RESULT_OK)
+        {
+            Uri uri = data.getData(); //The uri with the location of the file
+
+            Context ctxt = this;
+
+            try
+            {
+                ObjectInputStream stream = new ObjectInputStream(getContentResolver().openInputStream(uri));
+
+                Map<String, ?> d1 = (Map<String, ?>)stream.readObject();
+                Map<String, ?> d2 = (Map<String, ?>)stream.readObject();
+                Map<String, ?> d3 = (Map<String, ?>)stream.readObject();
+                Map<String, ?> d4 = (Map<String, ?>)stream.readObject();
+
+                stream.close();
+
+                runOnUiThread(() ->
+                {
+
+                    SharedPreferences.Editor e1 = ctxt.getSharedPreferences("Config", Context.MODE_PRIVATE).edit();
+                    SharedPreferences.Editor e2 = ctxt.getSharedPreferences("IAB", Context.MODE_PRIVATE).edit();
+                    SharedPreferences.Editor e3 = ctxt.getSharedPreferences("CMessageList", Context.MODE_PRIVATE).edit();
+                    SharedPreferences.Editor e4 = ctxt.getSharedPreferences("QueryLog", Context.MODE_PRIVATE).edit();
+
+                    e1.clear();
+                    for (Map.Entry<String, ?> entry : d1.entrySet())
+                    {
+                        if (entry.getValue() instanceof String)  e1.putString(entry.getKey(),    (String)entry.getValue());
+                        if (entry.getValue() instanceof Boolean) e1.putBoolean(entry.getKey(),   (Boolean)entry.getValue());
+                        if (entry.getValue() instanceof Float)   e1.putFloat(entry.getKey(),     (Float)entry.getValue());
+                        if (entry.getValue() instanceof Integer) e1.putInt(entry.getKey(),       (Integer)entry.getValue());
+                        if (entry.getValue() instanceof Long)    e1.putLong(entry.getKey(),      (Long)entry.getValue());
+                        if (entry.getValue() instanceof Set<?>)  e1.putStringSet(entry.getKey(), (Set<String>)entry.getValue());
+                    }
+
+                    e2.clear();
+                    for (Map.Entry<String, ?> entry : d2.entrySet())
+                    {
+                        if (entry.getValue() instanceof String)  e2.putString(entry.getKey(),    (String)entry.getValue());
+                        if (entry.getValue() instanceof Boolean) e2.putBoolean(entry.getKey(),   (Boolean)entry.getValue());
+                        if (entry.getValue() instanceof Float)   e2.putFloat(entry.getKey(),     (Float)entry.getValue());
+                        if (entry.getValue() instanceof Integer) e2.putInt(entry.getKey(),       (Integer)entry.getValue());
+                        if (entry.getValue() instanceof Long)    e2.putLong(entry.getKey(),      (Long)entry.getValue());
+                        if (entry.getValue() instanceof Set<?>)  e2.putStringSet(entry.getKey(), (Set<String>)entry.getValue());
+                    }
+
+                    e2.clear();
+                    for (Map.Entry<String, ?> entry : d3.entrySet())
+                    {
+                        if (entry.getValue() instanceof String)  e3.putString(entry.getKey(),    (String)entry.getValue());
+                        if (entry.getValue() instanceof Boolean) e3.putBoolean(entry.getKey(),   (Boolean)entry.getValue());
+                        if (entry.getValue() instanceof Float)   e3.putFloat(entry.getKey(),     (Float)entry.getValue());
+                        if (entry.getValue() instanceof Integer) e3.putInt(entry.getKey(),       (Integer)entry.getValue());
+                        if (entry.getValue() instanceof Long)    e3.putLong(entry.getKey(),      (Long)entry.getValue());
+                        if (entry.getValue() instanceof Set<?>)  e3.putStringSet(entry.getKey(), (Set<String>)entry.getValue());
+                    }
+
+                    e4.clear();
+                    for (Map.Entry<String, ?> entry : d4.entrySet())
+                    {
+                        if (entry.getValue() instanceof String)  e4.putString(entry.getKey(),    (String)entry.getValue());
+                        if (entry.getValue() instanceof Boolean) e4.putBoolean(entry.getKey(),   (Boolean)entry.getValue());
+                        if (entry.getValue() instanceof Float)   e4.putFloat(entry.getKey(),     (Float)entry.getValue());
+                        if (entry.getValue() instanceof Integer) e4.putInt(entry.getKey(),       (Integer)entry.getValue());
+                        if (entry.getValue() instanceof Long)    e4.putLong(entry.getKey(),      (Long)entry.getValue());
+                        if (entry.getValue() instanceof Set<?>)  e4.putStringSet(entry.getKey(), (Set<String>)entry.getValue());
+                    }
+
+                    e1.apply();
+                    e2.apply();
+                    e3.apply();
+                    e4.apply();
+
+
+                    SCNSettings.inst().reloadPrefs();
+                    IABService.inst().reloadPrefs();
+                    CMessageList.inst().reloadPrefs();
+                    QueryLog.inst().reloadPrefs();
+
+
+                    Toolbar toolbar = findViewById(R.id.toolbar);
+                    setSupportActionBar(toolbar);
+
+                    ViewPager viewPager = findViewById(R.id.pager);
+                    PagerAdapter adapter = adpTabs = new TabAdapter(getSupportFragmentManager());
+                    viewPager.setAdapter(adapter);
+
+                    TabLayout tabLayout = findViewById(R.id.tab_layout);
+                    tabLayout.setupWithViewPager(viewPager);
+
+
+                    SCNSettings.inst().work(this, true);
+
+                    SCNApp.showToast("Backup imported", Toast.LENGTH_LONG);
+
+                    finish();
+                });
+            }
+            catch (Exception e)
+            {
+                Log.e("Import:Err", e.toString());
+                SCNApp.showToast("Import failed", Toast.LENGTH_LONG);
+            }
+        }
+    }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/MessageAdapter.java

@@ -1,5 +1,6 @@
 package com.blackforestbytes.simplecloudnotifier.view;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,8 +10,11 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.blackforestbytes.simplecloudnotifier.R;
+import com.blackforestbytes.simplecloudnotifier.SCNApp;
 import com.blackforestbytes.simplecloudnotifier.model.CMessage;
 import com.blackforestbytes.simplecloudnotifier.model.CMessageList;
+import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
+import com.google.android.material.button.MaterialButton;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
@@ -53,7 +57,7 @@ public class MessageAdapter extends RecyclerView.Adapter
     {
         CMessage msg = CMessageList.inst().tryGetFromBack(position);
         MessagePresenter view = (MessagePresenter) holder;
-        view.setMessage(msg);
+        view.setMessage(msg, position);
 
         viewHolders.put(view, true);
     }
@@ -110,7 +114,11 @@ public class MessageAdapter extends RecyclerView.Adapter
         public RelativeLayout viewForeground;
         public RelativeLayout viewBackground;
 
+        public MaterialButton btnShare;
+        public MaterialButton btnDelete;
+
         private CMessage data;
+        private int datapos;
 
         MessagePresenter(View itemView)
         {
@@ -121,6 +129,8 @@ public class MessageAdapter extends RecyclerView.Adapter
             ivPriority     = itemView.findViewById(R.id.ivPriority);
             viewForeground = itemView.findViewById(R.id.layoutFront);
             viewBackground = itemView.findViewById(R.id.layoutBack);
+            btnShare       = itemView.findViewById(R.id.btnShare);
+            btnDelete      = itemView.findViewById(R.id.btnDelete);
 
             itemView.setOnClickListener(this);
             tvTimestamp.setOnClickListener(this);
@@ -128,9 +138,22 @@ public class MessageAdapter extends RecyclerView.Adapter
             tvMessage.setOnClickListener(this);
             ivPriority.setOnClickListener(this);
             viewForeground.setOnClickListener(this);
+
+            btnShare.setOnClickListener(v ->
+            {
+                if (data == null) return;
+                Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+                sharingIntent.setType("text/plain");
+                sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, data.Title);
+                sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, data.Content);
+                SCNApp.getMainActivity().startActivity(Intent.createChooser(sharingIntent, "Share message"));
+
+            });
+            btnDelete.setOnClickListener(v -> { if (data != null) SCNApp.getMainActivity().adpTabs.tab1.deleteMessage(datapos); });
+
         }
 
-        void setMessage(CMessage msg)
+        void setMessage(CMessage msg, int pos)
         {
             tvTimestamp.setText(msg.formatTimestamp());
             tvTitle.setText(msg.Title);
@@ -155,21 +178,49 @@ public class MessageAdapter extends RecyclerView.Adapter
             }
 
             data = msg;
+            datapos = pos;
+
+            if (msg.IsExpandedInAdapter) expand(true); else collapse(true);
+        }
+
+        private void expand(boolean force)
+        {
+            if (data != null && data.IsExpandedInAdapter && !force) return;
+            if (data != null) data.IsExpandedInAdapter = true;
+            if (tvMessage != null) tvMessage.setMaxLines(9999);
+            if (btnDelete != null) btnDelete.setVisibility(View.VISIBLE);
+            if (btnShare != null) btnShare.setVisibility(View.VISIBLE);
+
+        }
+
+        private int norm(int i) { return (i<=0)?0:((i>9999)?9999:i); }
+
+        private void collapse(boolean force)
+        {
+            if (data != null && !data.IsExpandedInAdapter && !force) return;
+            if (data != null) data.IsExpandedInAdapter = false;
+            if (tvMessage != null) tvMessage.setMaxLines(norm(SCNSettings.inst().PreviewLineCount));
+            if (btnDelete != null) btnDelete.setVisibility(View.GONE);
+            if (btnShare != null) btnShare.setVisibility(View.GONE);
         }
 
         @Override
         public void onClick(View v)
         {
+            if (data.IsExpandedInAdapter)
+            {
+                collapse(false);
+                return;
+            }
+
             for (MessagePresenter holder : MessageAdapter.this.viewHolders.keySet())
             {
                 if (holder == null) continue;
                 if (holder == this) continue;
-                if (holder.tvMessage == null) continue;
-                if (holder.tvMessage.getMaxLines() == 6) continue;
-                holder.tvMessage.setMaxLines(6);
+                holder.collapse(false);
             }
 
-            tvMessage.setMaxLines(9999);
+            expand(false);
         }
     }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/NotificationsFragment.java

@@ -58,7 +58,7 @@ public class NotificationsFragment extends Fragment implements MessageAdapterTou
 
     public void updateProState()
     {
-        if (adView != null) adView.setVisibility(IABService.inst().getPurchaseCached(IABService.IAB_PRO_MODE) != null ? View.GONE : View.VISIBLE);
+        if (adView != null) adView.setVisibility(IABService.inst().getPurchaseCachedSimple(IABService.IAB_PRO_MODE) ? View.GONE : View.VISIBLE);
     }
 
     @Override
@@ -66,15 +66,25 @@ public class NotificationsFragment extends Fragment implements MessageAdapterTou
     {
         if (viewHolder instanceof MessageAdapter.MessagePresenter)
         {
-            final int deletedIndex = viewHolder.getAdapterPosition();
-
-            final CMessage deletedItem = adpMessages.removeItem(viewHolder.getAdapterPosition());
-            String name = deletedItem.Title;
-
-            Snackbar snackbar = Snackbar.make(SCNApp.getMainActivity().layoutRoot, name + " removed", Snackbar.LENGTH_LONG);
-            snackbar.setAction("UNDO", view -> adpMessages.restoreItem(deletedItem, deletedIndex));
-            snackbar.setActionTextColor(Color.YELLOW);
-            snackbar.show();
+            deleteMessage(viewHolder.getAdapterPosition());
         }
     }
+
+    public void deleteMessage(int pos)
+    {
+        final int deletedIndex = pos;
+
+        final CMessage deletedItem = adpMessages.removeItem(pos);
+        String name = deletedItem.Title;
+
+        Snackbar snackbar = Snackbar.make(SCNApp.getMainActivity().layoutRoot, name + " removed", Snackbar.LENGTH_LONG);
+        snackbar.setAction("UNDO", view -> adpMessages.restoreItem(deletedItem, deletedIndex));
+        snackbar.setActionTextColor(Color.YELLOW);
+        snackbar.show();
+    }
+
+    public void updateDeleteSwipeEnabled()
+    {
+        if (touchHelper != null) touchHelper.updateEnabled();
+    }
 }

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java

@@ -1,15 +1,15 @@
 package com.blackforestbytes.simplecloudnotifier.view;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Color;
 import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
+import android.text.Editable;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,6 +17,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.Spinner;
@@ -24,21 +25,26 @@ import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.billingclient.api.Purchase;
+import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
+import androidx.fragment.app.Fragment;
+
 import com.blackforestbytes.simplecloudnotifier.R;
 import com.blackforestbytes.simplecloudnotifier.SCNApp;
-import com.blackforestbytes.simplecloudnotifier.lib.android.ThreadUtils;
 import com.blackforestbytes.simplecloudnotifier.lib.lambda.FI;
 import com.blackforestbytes.simplecloudnotifier.lib.string.Str;
 import com.blackforestbytes.simplecloudnotifier.model.SCNSettings;
 import com.blackforestbytes.simplecloudnotifier.service.IABService;
+import com.blackforestbytes.simplecloudnotifier.util.TextChangedListener;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.util.Map;
 
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
 import top.defaults.colorpicker.ColorPickerPopup;
 import xyz.aprildown.ultimatemusicpicker.MusicPickerListener;
 import xyz.aprildown.ultimatemusicpicker.UltimateMusicPicker;
@@ -51,6 +57,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
     private TextView  prefUpgradeAccount_msg;
     private TextView  prefUpgradeAccount_info;
     private Switch    prefEnableDeleteSwipe;
+    private EditText  prefPreviewLineCount;
 
     private Switch    prefMsgLowEnableSound;
     private TextView  prefMsgLowRingtone_value;
@@ -88,6 +95,9 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
     private SeekBar   prefMsgHighVolume;
     private ImageView prefMsgHighVolumeTest;
 
+    private Button    prefBtnImport;
+    private Button    prefBtnExport;
+
     private int musicPickerSwitch = -1;
 
     private MediaPlayer[] mPlayers = new MediaPlayer[3];
@@ -117,6 +127,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
         prefUpgradeAccount_msg        = v.findViewById(R.id.prefUpgradeAccount2);
         prefUpgradeAccount_info       = v.findViewById(R.id.prefUpgradeAccount_info);
         prefEnableDeleteSwipe         = v.findViewById(R.id.prefEnableDeleteSwipe);
+        prefPreviewLineCount          = v.findViewById(R.id.prefPreviewLineCount);
 
         prefMsgLowEnableSound         = v.findViewById(R.id.prefMsgLowEnableSound);
         prefMsgLowRingtone_value      = v.findViewById(R.id.prefMsgLowRingtone_value);
@@ -150,11 +161,19 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
         prefMsgHighLedColor_value     = v.findViewById(R.id.prefMsgHighLedColor_value);
         prefMsgHighLedColor_container = v.findViewById(R.id.prefMsgHighLedColor_container);
         prefMsgHighEnableVibrations   = v.findViewById(R.id.prefMsgHighEnableVibrations);
-        prefMsgHighForceVolume         = v.findViewById(R.id.prefMsgHighForceVolume);
-        prefMsgHighVolume              = v.findViewById(R.id.prefMsgHighVolume);
-        prefMsgHighVolumeTest          = v.findViewById(R.id.btnHighVolumeTest);
+        prefMsgHighForceVolume        = v.findViewById(R.id.prefMsgHighForceVolume);
+        prefMsgHighVolume             = v.findViewById(R.id.prefMsgHighVolume);
+        prefMsgHighVolumeTest         = v.findViewById(R.id.btnHighVolumeTest);
+
+        prefBtnExport                 = v.findViewById(R.id.prefExport);
+        prefBtnImport                 = v.findViewById(R.id.prefImport);
+
+        ArrayAdapter<Integer> plcsa = new ArrayAdapter<>(v.getContext(), android.R.layout.simple_spinner_item, SCNSettings.CHOOSABLE_CACHE_SIZES);
+        plcsa.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        prefLocalCacheSize.setAdapter(plcsa);
     }
 
+    @SuppressLint("SetTextI18n")
     private void updateUI()
     {
         SCNSettings s = SCNSettings.inst();
@@ -163,15 +182,13 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
         if (prefAppEnabled.isChecked() != s.Enabled) prefAppEnabled.setChecked(s.Enabled);
         if (prefEnableDeleteSwipe.isChecked() != s.EnableDeleteSwipe) prefEnableDeleteSwipe.setChecked(s.EnableDeleteSwipe);
+        if (!prefPreviewLineCount.getText().toString().equals(Integer.toString(s.PreviewLineCount))) prefPreviewLineCount.setText(Integer.toString(s.PreviewLineCount));
 
         prefUpgradeAccount.setVisibility(     SCNSettings.inst().promode_local ? View.GONE    : View.VISIBLE);
         prefUpgradeAccount_info.setVisibility(SCNSettings.inst().promode_local ? View.GONE    : View.VISIBLE);
         prefUpgradeAccount_msg.setVisibility( SCNSettings.inst().promode_local ? View.VISIBLE : View.GONE   );
 
-        ArrayAdapter<Integer> plcsa = new ArrayAdapter<>(c, android.R.layout.simple_spinner_item, SCNSettings.CHOOSABLE_CACHE_SIZES);
-        plcsa.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        prefLocalCacheSize.setAdapter(plcsa);
-        prefLocalCacheSize.setSelection(getCacheSizeIndex(s.LocalCacheSize));
+        if (prefLocalCacheSize.getSelectedItemPosition() != getCacheSizeIndex(s.LocalCacheSize)) prefLocalCacheSize.setSelection(getCacheSizeIndex(s.LocalCacheSize));
 
         if (prefMsgLowEnableSound.isChecked() != s.PriorityLow.EnableSound) prefMsgLowEnableSound.setChecked(s.PriorityLow.EnableSound);
         if (!prefMsgLowRingtone_value.getText().equals(s.PriorityLow.SoundName)) prefMsgLowRingtone_value.setText(s.PriorityLow.SoundName);
@@ -219,6 +236,12 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
         prefAppEnabled.setOnCheckedChangeListener((a,b) -> { boolean prev=s.Enabled; s.Enabled=b; saveAndUpdate(); updateEnabled(prev, b); });
         prefEnableDeleteSwipe.setOnCheckedChangeListener((a,b) -> { s.EnableDeleteSwipe=b; saveAndUpdate(); });
+        prefPreviewLineCount.addTextChangedListener(new TextChangedListener<EditText>(prefPreviewLineCount) {
+            @Override
+            public void onTextChanged(EditText target, Editable ed) {
+                if (!ed.toString().isEmpty()) try { s.PreviewLineCount=Integer.parseInt(ed.toString()); saveAndUpdate(); } catch (Exception e) { /* */ }
+            }
+        });
 
         prefLocalCacheSize.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
         {
@@ -231,6 +254,9 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
         prefUpgradeAccount.setOnClickListener(a -> onUpgradeAccount());
 
+        prefBtnExport.setOnClickListener(a -> onExport());
+        prefBtnImport.setOnClickListener(a -> onImport());
+
         prefMsgLowEnableSound.setOnCheckedChangeListener((a,b) -> { s.PriorityLow.EnableSound=b; saveAndUpdate(); });
         prefMsgLowRingtone_container.setOnClickListener(a -> chooseRingtoneLow());
         prefMsgLowRepeatSound.setOnCheckedChangeListener((a,b) -> { s.PriorityLow.RepeatSound=b; saveAndUpdate(); });
@@ -262,6 +288,55 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
         prefMsgHighVolumeTest.setOnClickListener((v) -> { if (s.PriorityHigh.ForceVolume) playTestSound(2, prefMsgHighVolumeTest, s.PriorityHigh.SoundSource, s.PriorityHigh.ForceVolumeValue); });
     }
 
+    private void onExport()
+    {
+        Context ctxt = getContext();
+        if (ctxt == null) return;
+
+        try
+        {
+            File outputDir = ctxt.getCacheDir(); // context being the Activity pointer
+            File outputFile = File.createTempFile("scn_export_", ".dat", outputDir);
+
+            ObjectOutputStream output = new ObjectOutputStream(new FileOutputStream(outputFile));
+
+            Map<String, ?> d1 = ctxt.getSharedPreferences("Config", Context.MODE_PRIVATE).getAll();
+            Map<String, ?> d2 = ctxt.getSharedPreferences("IAB", Context.MODE_PRIVATE).getAll();
+            Map<String, ?> d3 = ctxt.getSharedPreferences("CMessageList", Context.MODE_PRIVATE).getAll();
+            Map<String, ?> d4 = ctxt.getSharedPreferences("QueryLog", Context.MODE_PRIVATE).getAll();
+
+            output.writeObject(d1);
+            output.writeObject(d2);
+            output.writeObject(d3);
+            output.writeObject(d4);
+
+            Intent intent = new Intent(Intent.ACTION_SEND);
+
+            Uri uri = FileProvider.getUriForFile(ctxt, "com.blackforestbytes.simplecloudnotifier.fileprovider", outputFile);
+            intent.putExtra(Intent.EXTRA_STREAM, uri);
+            intent.setType("*/*");
+            intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+            startActivity(Intent.createChooser(intent, "Export"));
+        }
+        catch (IOException e)
+        {
+            Log.e("Export:Err", e.toString());
+            SCNApp.showToast("Export failed", Toast.LENGTH_LONG);
+        }
+    }
+
+    private void onImport()
+    {
+        SCNApp.getMainActivity().setContentView(R.layout.activity_main);
+
+        Intent intent = new Intent()
+                .setType("*/*")
+                .setAction(Intent.ACTION_GET_CONTENT);
+
+        ((MainActivity)getActivity()).startActivityForResult(Intent.createChooser(intent, "Select a file"), 1991);
+    }
+
     private void updateEnabled(boolean prev, boolean now)
     {
         if (!prev && now)
@@ -341,7 +416,7 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
     {
         SCNSettings.inst().save();
         updateUI();
-        SCNApp.getMainActivity().adpTabs.tab1.touchHelper.updateEnabled();
+        SCNApp.getMainActivity().adpTabs.tab1.updateDeleteSwipeEnabled();
     }
 
     private void onUpgradeAccount()
@@ -351,11 +426,11 @@ public class SettingsFragment extends Fragment implements MusicPickerListener
 
     public void updateProState()
     {
-        Purchase p = IABService.inst().getPurchaseCached(IABService.IAB_PRO_MODE);
+        boolean pmode = IABService.inst().getPurchaseCachedSimple(IABService.IAB_PRO_MODE);
 
-        if (prefUpgradeAccount != null)      prefUpgradeAccount.setVisibility(     p != null ? View.GONE    : View.VISIBLE);
-        if (prefUpgradeAccount_info != null) prefUpgradeAccount_info.setVisibility(p != null ? View.GONE    : View.VISIBLE);
-        if (prefUpgradeAccount_msg != null)  prefUpgradeAccount_msg.setVisibility( p != null ? View.VISIBLE : View.GONE   );
+        if (prefUpgradeAccount != null)      prefUpgradeAccount.setVisibility(     pmode ? View.GONE    : View.VISIBLE);
+        if (prefUpgradeAccount_info != null) prefUpgradeAccount_info.setVisibility(pmode ? View.GONE    : View.VISIBLE);
+        if (prefUpgradeAccount_msg != null)  prefUpgradeAccount_msg.setVisibility( pmode ? View.VISIBLE : View.GONE   );
     }
 
     private int getCacheSizeIndex(int value)

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/debug/QueryLogActivity.java

@@ -0,0 +1,44 @@
+package com.blackforestbytes.simplecloudnotifier.view.debug;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.blackforestbytes.simplecloudnotifier.model.QueryLog;
+import com.blackforestbytes.simplecloudnotifier.model.SingleQuery;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.widget.ListView;
+
+import com.blackforestbytes.simplecloudnotifier.R;
+
+public class QueryLogActivity extends AppCompatActivity
+{
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_querylog);
+
+        ListView lvMain = findViewById(R.id.lvQueryList);
+        SingleQuery[] arr = QueryLog.inst().get().toArray(new SingleQuery[0]);
+        QueryLogAdapter a = new QueryLogAdapter(this, arr);
+        lvMain.setAdapter(a);
+
+        lvMain.setOnItemClickListener((parent, view, position, id) ->
+        {
+            if (position >= 0 && position < arr.length)
+            {
+                Intent i = new Intent(QueryLogActivity.this, SingleQueryLogActivity.class);
+                Bundle b = new Bundle();
+                arr[position].save(b, "data");
+                i.putExtra("query", b);
+                startActivity(i);
+            }
+        });
+
+
+    }
+
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/debug/QueryLogAdapter.java

@@ -0,0 +1,66 @@
+package com.blackforestbytes.simplecloudnotifier.view.debug;
+
+import android.content.Context;
+import android.graphics.Color;
+import androidx.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import com.blackforestbytes.simplecloudnotifier.R;
+import com.blackforestbytes.simplecloudnotifier.model.SingleQuery;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+public class QueryLogAdapter extends ArrayAdapter<SingleQuery>
+{
+    public static DateTimeFormatter UI_FULLTIME_FORMATTER = DateTimeFormat.forPattern("HH:mm:ss");
+
+    public QueryLogAdapter(@NonNull Context context, @NonNull SingleQuery[] objects)
+    {
+        super(context, R.layout.adapter_querylog, objects);
+    }
+
+    @NonNull
+    @Override
+    public View getView(int position, View convertView, @NonNull ViewGroup parent)
+    {
+        View v = convertView;
+
+        if (v == null) {
+            LayoutInflater vi;
+            vi = LayoutInflater.from(getContext());
+            v = vi.inflate(R.layout.adapter_querylog, parent, false);
+        }
+
+        SingleQuery p = getItem(position);
+
+        if (p != null)
+        {
+            TextView tt1 = v.findViewById(R.id.list_item_debuglogrow_time);
+            if (tt1 != null) tt1.setText(p.Timestamp.toString(UI_FULLTIME_FORMATTER));
+            if (tt1 != null) tt1.setTextColor(Color.BLACK);
+
+            TextView tt2 = v.findViewById(R.id.list_item_debuglogrow_level);
+            if (tt2 != null) tt2.setText(p.Level.toUIString());
+            if (tt2 != null) tt2.setTextColor(Color.BLACK);
+
+            TextView tt3 = v.findViewById(R.id.list_item_debuglogrow_info);
+            if (tt3 != null) tt3.setText("");
+            if (tt3 != null) tt3.setTextColor(Color.BLUE);
+
+            TextView tt4 = v.findViewById(R.id.list_item_debuglogrow_id);
+            if (tt4 != null) tt4.setText(p.Name);
+            if (tt4 != null) tt4.setTextColor(p.Level.getColor());
+
+            TextView tt5 = v.findViewById(R.id.list_item_debuglogrow_message);
+            if (tt5 != null) tt5.setText(p.ExceptionString.length()> 40 ? p.ExceptionString.substring(0, 40-3)+"..." : p.ExceptionString);
+            if (tt5 != null) tt5.setTextColor(p.Level.getColor());
+        }
+
+        return v;
+    }
+}

android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/debug/SingleQueryLogActivity.java

@@ -0,0 +1,38 @@
+package com.blackforestbytes.simplecloudnotifier.view.debug;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.blackforestbytes.simplecloudnotifier.R;
+import com.blackforestbytes.simplecloudnotifier.lib.string.CompactJsonFormatter;
+import com.blackforestbytes.simplecloudnotifier.model.SingleQuery;
+
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.util.Objects;
+
+public class SingleQueryLogActivity extends AppCompatActivity
+{
+    @Override
+    @SuppressLint("SetTextI18n")
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_singlequerylog);
+
+        SingleQuery q = SingleQuery.load(getIntent().getBundleExtra("query"), "data");
+
+        this.<TextView>findViewById(R.id.tvQL_Timestamp).setText(q.Timestamp.toString(DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss")));
+        this.<TextView>findViewById(R.id.tvQL_Level).setText(q.Level.toUIString());
+        this.<TextView>findViewById(R.id.tvQL_Level).setTextColor(q.Level.getColor());
+        this.<TextView>findViewById(R.id.tvQL_Name).setText(q.Name);
+        this.<TextView>findViewById(R.id.tvQL_URL).setText(q.URL.replace("?", "\r\n?").replace("&", "\r\n&"));
+        this.<TextView>findViewById(R.id.tvQL_Response).setText(CompactJsonFormatter.formatJSON(q.Response, 999));
+        this.<TextView>findViewById(R.id.tvQL_ResponseCode).setText(Integer.toString(q.ResponseCode));
+        this.<TextView>findViewById(R.id.tvQL_ExceptionString).setText(q.ExceptionString);
+    }
+}

android/app/src/main/res/drawable-mdpi/simple_black_border.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@android:color/white" />
+    <stroke android:width="1dip" android:color="#888888"/>
+</shape>

android/app/src/main/res/drawable/ic_share_small.xml

@@ -0,0 +1,10 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12sp"
+    android:height="12sp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>

android/app/src/main/res/drawable/ic_trash_small.xml

@@ -0,0 +1,16 @@
+<vector
+    android:height="12sp"
+    android:width="12sp"
+    android:viewportHeight="53"
+    android:viewportWidth="53"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M42.943,6H33.5V3c0,-1.654 -1.346,-3 -3,-3h-8c-1.654,0 -3,1.346 -3,3v3h-9.443C8.096,6 6.5,7.596 6.5,9.557V14h2h36h2V9.557C46.5,7.596 44.904,6 42.943,6zM31.5,6h-10V3c0,-0.552 0.449,-1 1,-1h8c0.551,0 1,0.448 1,1V6z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M8.5,49.271C8.5,51.327 10.173,53 12.229,53h28.541c2.057,0 3.729,-1.673 3.729,-3.729V16h-36V49.271z"/>
+
+</vector>

android/app/src/main/res/layout/activity_main.xml

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    android:id="@+id/layoutRoot"
+<RelativeLayout android:id="@+id/layoutRoot"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:showIn="@layout/activity_main">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
+        app:titleTextColor="@color/colorOnPrimary"
         android:background="?attr/colorPrimary"
         android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        android:minHeight="?attr/actionBarSize" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/toolbar"
+        app:titleTextColor="@color/colorOnPrimary"
+        app:tabTextColor="@color/colorOnPrimary"
+        app:tabSelectedTextColor="@color/colorSecondary"
         android:background="?attr/colorPrimary"
         android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+        android:minHeight="?attr/actionBarSize" />
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"

android/app/src/main/res/layout/activity_querylog.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/layoutRoot"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/lvQueryList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</RelativeLayout>

android/app/src/main/res/layout/activity_singlequerylog.xml

@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:padding="4sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:textAlignment="center"
+                android:textStyle="bold"
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:text="Server Query" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Timestamp" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:background="@drawable/simple_black_border"
+                android:layout_margin="2dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_Timestamp"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Level" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:background="@drawable/simple_black_border"
+                android:layout_margin="2dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_Level"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Name" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_Name"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="URL" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_URL"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text=""/>
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="ResponeCode" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="64"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_ResponseCode"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Response" />
+
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_Response"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_margin="2dip"
+                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:text="Exception" />
+
+            <com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView
+                app:maxHeightOverride="100"
+                android:layout_margin="2dip"
+                android:background="@drawable/simple_black_border"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fillViewport="true">
+
+                <TextView
+                    android:id="@+id/tvQL_ExceptionString"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:padding="1dip"
+                    android:textIsSelectable="true"
+                    android:text="" />
+
+            </com.blackforestbytes.simplecloudnotifier.util.MaxHeightScrollView>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</FrameLayout>

android/app/src/main/res/layout/adapter_querylog.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_item_imagerow"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal" >
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="96dp"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_level"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_id"
+            android:textStyle="bold"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/list_item_debuglogrow_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+
+</LinearLayout>

android/app/src/main/res/layout/fragment_account.xml

@@ -198,19 +198,27 @@
             app:layout_constraintBottom_toTopOf="@+id/btnAccountReset"
             app:layout_constraintTop_toBottomOf="@+id/ic_img_quota" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnAccountReset"
+            app:cornerRadius="0dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            android:backgroundTint="#fa315b"
             android:text="@string/str_reset_account"
             app:layout_constraintBottom_toTopOf="@+id/btnClearLocalStorage" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnClearLocalStorage"
+            app:cornerRadius="0dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Clear Messages"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            android:backgroundTint="#607D8B"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

android/app/src/main/res/layout/fragment_settings.xml

@@ -95,6 +95,46 @@
                     android:layout_height="wrap_content"
                     android:minHeight="48dp" />
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="2dp"
+                    android:layout_marginTop="2dp"
+                    android:background="#c0c0c0"/>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp">
+
+                    <TextView
+                        android:id="@+id/tvPreviewLineCount"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/str_previewlinecount"
+                        android:textColor="#000"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/prefPreviewLineCount"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <EditText
+                        android:minWidth="64dp"
+                        android:id="@+id/prefPreviewLineCount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:inputType="number"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:importantForAutofill="no"
+                        tools:ignore="LabelFor,UnusedAttribute" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
@@ -111,8 +151,10 @@
                     android:gravity="center|center"
                     android:minHeight="48dp">
 
-                    <Button
+                    <com.google.android.material.button.MaterialButton
                         android:id="@+id/prefUpgradeAccount"
+                        app:cornerRadius="0dp"
+                        android:backgroundTint="#4CAF50"
                         android:text="@string/str_upgrade_account"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
@@ -763,6 +805,24 @@
 
         </androidx.cardview.widget.CardView>
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/prefExport"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            app:cornerRadius="0dp"
+            android:backgroundTint="#444444"
+            android:text="@string/export_settings" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/prefImport"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            app:cornerRadius="0dp"
+            android:backgroundTint="#666666"
+            android:text="@string/import_settings" />
+
     </LinearLayout>
 
 </ScrollView>

android/app/src/main/res/layout/message_card.xml

@@ -108,6 +108,43 @@
                     android:paddingTop="3dp"
                     android:contentDescription="@string/desc_priority_icon" />
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnShare"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    app:cornerRadius="0dp"
+                    app:icon="@drawable/ic_share_small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="25dp"
+                    android:layout_marginEnd="8sp"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
+                    android:insetLeft="0dp"
+                    android:insetRight="0dp"
+                    android:textSize="12sp"
+                    card_view:layout_constraintTop_toBottomOf="@id/tvMessage"
+                    app:layout_constraintRight_toLeftOf="@id/btnDelete"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:backgroundTint="#03A9F4"
+                    android:text="Share" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/btnDelete"
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    app:cornerRadius="0dp"
+                    app:icon="@drawable/ic_trash_small"
+                    android:layout_width="wrap_content"
+                    android:layout_height="25dp"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
+                    android:insetLeft="0dp"
+                    android:insetRight="0dp"
+                    android:textSize="12sp"
+                    card_view:layout_constraintTop_toBottomOf="@id/tvMessage"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:backgroundTint="#F44336"
+                    android:text="Delete"/>
+
             </androidx.constraintlayout.widget.ConstraintLayout>
 
         </androidx.cardview.widget.CardView>

android/app/src/main/res/values/attrs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="MaxHeightScrollView">
+        <attr name="maxHeightOverride" format="integer" />
+    </declare-styleable>
+
+</resources>

android/app/src/main/res/values/colors.xml

@@ -6,6 +6,9 @@
     <color name="colorHeader">#3F51B5</color>
     <color name="colorHeaderForeground">#FFFFFF</color>
 
+    <color name="colorOnPrimary">#ecf0f1</color>
+    <color name="colorSecondary">#FF5722</color>
+
     <color name="colorBlack">#000</color>
 
     <color name="bg_row_background">#fa315b</color>

android/app/src/main/res/values/dimens.xml

@@ -6,4 +6,5 @@
     <dimen name="padd_10">10dp</dimen>
     <dimen name="ic_delete">30dp</dimen>
     <dimen name="thumbnail">90dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -30,9 +30,13 @@
     <string name="str_enable_vibration">Enable notification vibration</string>
     <string name="str_upgrade_account">Upgrade account</string>
     <string name="str_deleteswipe">Delete messages by swiping left</string>
+    <string name="str_previewlinecount">Number of visibile lines in collapsed messages</string>
     <string name="str_promode">Thank you for supporting the app and using the pro mode</string>
     <string name="str_promode_info">Increase your daily quota, remove the ad banner and support the developer (that\'s me)</string>
     <string name="volume_icon">Volume icon</string>
     <string name="play_test_sound">Play test sound</string>
     <string name="delete">DELETE</string>
+    <string name="title_activity_query_log">QueryLogActivity</string>
+    <string name="import_settings">Import settings</string>
+    <string name="export_settings">Export settings</string>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -1,13 +1,20 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!--   your app branding color for the app bar -->
         <item name="colorPrimary">#3F51B5</item>
+
         <!--   darker variant for the status bar and contextual app bars -->
         <item name="colorPrimaryDark">#303F9F</item>
+
         <!--   theme UI controls like checkboxes and text fields -->
-        <item name="colorAccent">#FF4081</item>
+        <item name="colorAccent">#FF5722</item>
+        <item name="colorSecondary">#FF5722</item>
     </style>
 
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
+
 </resources>

android/app/src/main/res/xml/filepaths.xml

@@ -0,0 +1,7 @@
+<paths>
+    <files-path          path="/" name="files" />
+    <cache-path          path="/" name="cache" />
+    <external-path       path="/" name="external" />
+    <external-files-path path="/" name="external-files" />
+    <external-cache-path path="/" name="external-cache" />
+</paths>

android/app/version.properties

@@ -1,3 +1,3 @@
-#Mon Nov 19 12:30:54 CET 2018
-VERSION_NAME=1.0.0
-VERSION_CODE=14
+#Thu Mar 05 15:29:10 UTC 2020
+VERSION_NAME=1.8.0
+VERSION_CODE=23

android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.google.gms:google-services:4.2.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.google.gms:google-services:4.3.4'
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Sep 26 22:10:14 CEST 2018
+#Tue Nov 03 14:10:19 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

androidExportReader/.gitignore

@@ -0,0 +1,58 @@
+# Created by https://www.toptal.com/developers/gitignore/api/java,gradle
+# Edit at https://www.toptal.com/developers/gitignore?templates=java,gradle
+
+### Java ###
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
+
+### Gradle ###
+.gradle
+**/build/
+!src/**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
+# Cache of project
+.gradletasknamecache
+
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Gradle Patch ###
+# Java heap dump
+*.hprof
+
+# End of https://www.toptal.com/developers/gitignore/api/java,gradle
+

androidExportReader/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

androidExportReader/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="18" />
+  </component>
+</project>

androidExportReader/.idea/gradle.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

androidExportReader/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,11 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavadocReference" enabled="true" level="WARNING" enabled_by_default="true" editorAttributes="WARNING_ATTRIBUTES" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

androidExportReader/.idea/jarRepositories.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+  </component>
+</project>

androidExportReader/.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="openjdk-18" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

androidExportReader/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

androidExportReader/build.gradle

@@ -0,0 +1,47 @@
+
+buildscript {
+    repositories {
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
+    }
+}
+
+plugins {
+    id 'java'
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id 'application'
+}
+
+group 'com.blackforestbytes'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+    maven { url "https://jitpack.io" }
+}
+
+application {
+    mainClass = 'com.blackforestbytes.Main'
+}
+
+jar {
+    manifest {
+        attributes 'Main-Class': application.mainClass
+    }
+}
+
+tasks.jar {
+    manifest.attributes["Main-Class"] = application.mainClass
+}
+
+dependencies {
+    implementation 'com.github.RalleYTN:SimpleJSON:2.1.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+}
+
+test {
+    useJUnitPlatform()
+}

androidExportReader/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

androidExportReader/gradlew

@@ -0,0 +1,240 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

androidExportReader/gradlew.bat

@@ -0,0 +1,91 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

androidExportReader/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = 'androidExportReader'
+

androidExportReader/src/main/java/com/blackforestbytes/Main.java

@@ -0,0 +1,104 @@
+package com.blackforestbytes;
+
+import de.ralleytn.simple.json.JSONArray;
+import de.ralleytn.simple.json.JSONFormatter;
+import de.ralleytn.simple.json.JSONObject;
+
+import java.io.ObjectInputStream;
+import java.net.URI;
+import java.nio.file.FileSystems;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class Main {
+    @SuppressWarnings("unchecked")
+    public static void main(String[] args) {
+        if (args.length != 1) {
+            System.err.println("call with ./androidExportConvert scn_export.dat");
+            return;
+        }
+
+        try {
+
+            var path = FileSystems.getDefault().getPath(args[0]).normalize().toAbsolutePath().toUri().toURL();
+
+            ObjectInputStream stream = new ObjectInputStream(path.openStream());
+
+            Map<String, ?> d1 = new HashMap<>((Map<String, ?>)stream.readObject());
+            Map<String, ?> d2 = new HashMap<>((Map<String, ?>)stream.readObject());
+            Map<String, ?> d3 = new HashMap<>((Map<String, ?>)stream.readObject());
+            Map<String, ?> d4 = new HashMap<>((Map<String, ?>)stream.readObject());
+
+            stream.close();
+
+            JSONObject root = new JSONObject();
+
+            var subConfig = new JSONObject();
+            var subIAB = new JSONArray();
+            var subCMessageList = new JSONArray();
+            var subAcks = new JSONArray();
+            var subQueryLog = new JSONArray();
+
+            for (Map.Entry<String, ?> entry : d1.entrySet())
+            {
+                if (entry.getValue() instanceof String)  subConfig.put(entry.getKey(),    (String)entry.getValue());
+                if (entry.getValue() instanceof Boolean) subConfig.put(entry.getKey(),   (Boolean)entry.getValue());
+                if (entry.getValue() instanceof Float)   subConfig.put(entry.getKey(),     (Float)entry.getValue());
+                if (entry.getValue() instanceof Integer) subConfig.put(entry.getKey(),       (Integer)entry.getValue());
+                if (entry.getValue() instanceof Long)    subConfig.put(entry.getKey(),      (Long)entry.getValue());
+                if (entry.getValue() instanceof Set<?>)  subConfig.put(entry.getKey(), ((Set<String>)entry.getValue()).toArray());
+            }
+
+            for (int i = 0; i < (Integer)d2.get("c"); i++) {
+                var obj = new JSONObject();
+                obj.put("key", d2.get("["+i+"]->key"));
+                obj.put("value", d2.get("["+i+"]->value"));
+                subIAB.add(obj);
+            }
+
+            for (int i = 0; i < (Integer)d3.get("message_count"); i++) {
+                if (d3.get("message["+i+"].scnid") == null)
+                    throw new Exception("ONF");
+
+                var obj = new JSONObject();
+                obj.put("timestamp", d3.get("message["+i+"].timestamp"));
+                obj.put("title", d3.get("message["+i+"].title"));
+                obj.put("content", d3.get("message["+i+"].content"));
+                obj.put("priority", d3.get("message["+i+"].priority"));
+                obj.put("scnid", d3.get("message["+i+"].scnid"));
+                subCMessageList.add(obj);
+            }
+
+            subAcks.addAll(((Set<String>)d3.get("acks")).stream().map(p -> Long.decode("0x"+p)).toList());
+
+            for (int i = 0; i < (Integer)d4.get("history_count"); i++) {
+                if (d4.get("message["+(i+1000)+"].Name") == null)
+                    throw new Exception("ONF");
+
+                var obj = new JSONObject();
+                obj.put("Level", d4.get("message["+(i+1000)+"].Level"));
+                obj.put("Timestamp", d4.get("message["+(i+1000)+"].Timestamp"));
+                obj.put("Name", d4.get("message["+(i+1000)+"].Name"));
+                obj.put("URL", d4.get("message["+(i+1000)+"].URL"));
+                obj.put("Response", d4.get("message["+(i+1000)+"].Response"));
+                obj.put("ResponseCode", d4.get("message["+(i+1000)+"].ResponseCode"));
+                obj.put("ExceptionString", d4.get("message["+(i+1000)+"].ExceptionString"));
+                subQueryLog.add(obj);
+            }
+
+            root.put("config", subConfig);
+            root.put("iab", subIAB);
+            root.put("cmessagelist", subCMessageList);
+            root.put("acks", subAcks);
+            root.put("querylog", subQueryLog);
+
+            System.out.println(new JSONFormatter().format(root.toString()));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+}

examples/scn_send.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @param string $title
+ * @param string $content
+ * @param int $priority
+ * @return bool
+ */
+function sendSCN($title, $content, $priority) {
+	global $config;
+
+	$data =
+	[
+		'user_id'  => '', //TODO set your userid
+		'user_key' => '', //TODO set your userkey
+		'title'    => $title,
+		'content'  => $content,
+		'priority' => $priority,
+	];
+
+	$ch = curl_init();
+
+	curl_setopt($ch, CURLOPT_URL, "https://simplecloudnotifier.blackforestbytes.com/send.php");
+	curl_setopt($ch, CURLOPT_POST, 1);
+	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+	$result = curl_exec($ch);
+
+	curl_close($ch);
+	if ($result === false) return false;
+
+	$json = json_decode($result, true);
+	return $json['success'];
+}

examples/scn_send.sh

@@ -21,6 +21,7 @@ user_key="????????????????????????????????????????????????????????????????"
 
 title=$1
 content=""
+sendtime=$(date +%s)
 
 if [ "$#" -gt 1 ]; then
     content=$2
@@ -37,7 +38,7 @@ usr_msg_id=$(uuidgen)
 while true ; do
 
     curlresp=$(curl -s -o /dev/null -w "%{http_code}" \
-                    -d "user_id=$user_id" -d "user_key=$user_key" -d "title=$title" \
+                    -d "user_id=$user_id" -d "user_key=$user_key" -d "title=$title" -d "timestamp=$sendtime" \
                     -d "content=$content" -d "priority=$priority" -d "msg_id=$usr_msg_id" \
                     https://scn.blackforestbytes.com/send.php)
     

scn_send.sh

@@ -0,0 +1,184 @@
+#!/usr/bin/env bash
+
+#
+# Wrapper around SCN ( https://simplecloudnotifier.de/ )
+# ======================================================
+#
+# ./scn_send [@channel] title [content] [priority]
+#
+#
+# Call with   scn_send              "${title}"
+#        or   scn_send              "${title}" ${content}"
+#        or   scn_send              "${title}" ${content}" "${priority:0|1|2}"
+#        or   scn_send "@${channel} "${title}"
+#        or   scn_send "@${channel} "${title}" ${content}"
+#        or   scn_send "@${channel} "${title}" ${content}" "${priority:0|1|2}"
+#
+# content can be of format "--scnsend-read-body-from-file={path}" to read body from file
+# (this circumvents max commandline length)
+#
+
+################################################################################
+
+usage() {
+    echo "Usage: "
+    echo "  scn_send [@channel] title [content] [priority]"
+    echo ""
+}
+
+function cfgcol { [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; }
+
+function rederr() { if cfgcol; then >&2 echo -e "\x1B[31m$1\x1B[0m"; else >&2 echo "$1"; fi; }
+function green()  { if cfgcol; then     echo -e "\x1B[32m$1\x1B[0m"; else     echo "$1"; fi; }
+
+################################################################################
+
+#
+# Get env 'SCN_UID' and 'SCN_KEY' from conf file
+# 
+# shellcheck source=/dev/null
+. "/etc/scn.conf"
+SCN_UID=${SCN_UID:-}
+SCN_KEY=${SCN_KEY:-}
+
+[ -z "${SCN_UID}" ] && { rederr "Missing config value 'SCN_UID' in /etc/scn.conf"; exit 1; }
+[ -z "${SCN_KEY}" ] && { rederr "Missing config value 'SCN_KEY' in /etc/scn.conf"; exit 1; }
+
+################################################################################
+
+args=( "$@" )
+
+title=""
+content=""
+channel=""
+priority=""
+usr_msg_id="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32)"
+sendtime="$(date +%s)"
+sender="$(hostname)"
+
+if command -v srvname &> /dev/null; then
+  sender="$( srvname )"
+fi
+
+if [[ "${args[0]}" = "--" ]]; then
+    # only positional args form here on (currently not handled)
+    args=("${args[@]:1}")
+fi
+
+if [ ${#args[@]} -lt 1 ]; then
+    rederr "[ERROR]: no title supplied via parameter"
+    usage
+    exit 1
+fi
+
+if [[ "${args[0]}" =~ ^@.* ]]; then
+    channel="${args[0]}"
+    args=("${args[@]:1}")
+    channel="${channel:1}"
+fi
+
+if [ ${#args[@]} -lt 1 ]; then
+    rederr "[ERROR]: no title supplied via parameter"
+    usage
+    exit 1
+fi
+
+title="${args[0]}"
+args=("${args[@]:1}")
+
+content=""
+
+if [ ${#args[@]} -gt 0 ]; then
+    content="${args[0]}"
+    args=("${args[@]:1}")
+fi
+
+if [ ${#args[@]} -gt 0 ]; then
+    priority="${args[0]}"
+    args=("${args[@]:1}")
+fi
+
+if [ ${#args[@]} -gt 0 ]; then
+    rederr "Too many arguments to scn_send"
+    usage
+    exit 1
+fi
+
+if [[ "$content" == --scnsend-read-body-from-file=* ]]; then
+  path="$( awk '{ print substr($0, 31) }' <<< "$content" )"
+  content="$( cat "$path" )"
+fi
+
+curlparams=()
+
+curlparams+=( "--data-urlencode" "user_id=${SCN_UID}"  )
+curlparams+=( "--data-urlencode" "key=${SCN_KEY}"      )
+curlparams+=( "--data-urlencode" "title=$title"        )
+curlparams+=( "--data-urlencode" "timestamp=$sendtime" )
+curlparams+=( "--data-urlencode" "msg_id=$usr_msg_id"  )
+
+if [[ -n "$content" ]]; then
+    curlparams+=("--data-urlencode" "content=$content")
+fi
+
+if [[ -n "$priority" ]]; then
+    curlparams+=("--data-urlencode" "priority=$priority")
+fi
+
+if [[ -n "$channel" ]]; then
+    curlparams+=("--data-urlencode" "channel=$channel")
+fi
+
+if [[ -n "$sender" ]]; then
+    curlparams+=("--data-urlencode" "sender_name=$sender")
+fi
+
+while true ; do
+
+    outf="$(mktemp)"
+
+    curlresp=$(curl --silent                             \
+                    --output "${outf}"                   \
+                    --write-out "%{http_code}"           \
+                    "${curlparams[@]}"                   \
+                    "https://simplecloudnotifier.de/"    )
+
+    curlout="$(cat "$outf")"
+    rm "$outf"
+
+    if [ "$curlresp" == 200 ] ; then
+        green "Successfully send"
+        exit 0
+    fi
+
+    if [ "$curlresp" == 400 ] ; then
+        rederr "Bad request - something went wrong"
+        echo "$curlout"
+        echo ""
+        exit 1
+    fi
+
+    if [ "$curlresp" == 401 ] ; then
+        rederr "Unauthorized - wrong userid/userkey"
+        exit 1
+    fi
+
+    if [ "$curlresp" == 403 ] ; then
+        rederr "Quota exceeded - wait 5 min before re-try"
+        sleep 300
+    fi
+
+    if [ "$curlresp" == 412 ] ; then
+        rederr "Precondition Failed - No device linked"
+        exit 1
+    fi
+
+    if [ "$curlresp" == 500 ] ; then
+        rederr "Internal server error - waiting for better times"
+        sleep 60
+    fi
+
+    # if none of the above matched we probably have no network ...
+    rederr "Send failed (response code $curlresp) ... try again in 5s"
+    sleep 5
+done

scnserver/.gitignore

@@ -0,0 +1,106 @@
+
+
+_build
+.run-data
+
+DOCKER_GIT_INFO
+
+scn_export.dat
+scn_export.json
+
+scn_export_*.dat
+scn_export_*.json
+
+simple_cloud_notifier-202306172202.sql
+simple_cloud_notifier-*.sql
+
+identifier.sqlite
+
+.idea/dataSources.xml
+
+.swaggobin
+
+scn_send.sh
+
+##############
+
+
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+.idea/**/aws.xml
+.idea/**/contentModel.xml
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+.idea/**/gradle.xml
+.idea/**/libraries
+.idea/**/mongoSettings.xml
+.idea/**/sonarlint/
+.idea/**/sonarIssues.xml
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator-enh.xml
+.idea/**/markdown-navigator/
+.idea/**/azureSettings.xml
+
+.idea/replstate.xml
+.idea/sonarlint/
+.idea/httpRequests
+.idea/caches/build_file_checksums.ser
+.idea/$CACHE_FILE$
+.idea/codestream.xml
+
+.idea_modules/
+
+
+
+
+cmake-build-*/
+*.iws
+out/
+atlassian-ide-plugin.xml
+
+
+
+
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+
+
+
+*~
+.fuse_hidden*
+.directory
+.Trash-*
+.nfs*
+
+
+
+
+.DS_Store
+.AppleDouble
+.LSOverride
+Icon
+._*
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+*.icloud

scnserver/.golangci.yml

@@ -0,0 +1,40 @@
+# https://golangci-lint.run/usage/configuration/
+
+run:
+  go: '1.20'
+
+linters:
+  enable-all: true
+  disable:
+    - golint           # deprecated
+    - exhaustivestruct # deprecated
+    - deadcode         # deprecated
+    - scopelint        # deprecated
+    - structcheck      # deprecated
+    - varcheck         # deprecated
+    - nosnakecase      # deprecated
+    - maligned         # deprecated
+    - interfacer       # deprecated
+    - ifshort          # deprecated
+    - dupl             # (i disagree)
+    - ireturn          # (i disagree)
+    - wrapcheck        # (waiting for bferr)
+    - goerr113         # (waiting for bferr)
+    - varnamelen       # (too many false-positives)
+    - gomnd            # (i disagree)
+    - depguard         # (not configured)
+    - gofumpt          # (we do not use gofumpt)
+    - gci              # (we do no use gci)
+    - lll              # (i disagree)
+    - gochecknoglobals # (i disagree)
+
+issues:
+  exclude-rules:
+    - path: api/handler/.*.go
+      linters:
+        - funlen
+
+linters-settings:
+  tagalign:
+    align: true
+    sort: false

scnserver/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

scnserver/.idea/golinter.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GoLinterSettings">
+    <option name="checkGoLinterExe" value="false" />
+  </component>
+</project>

scnserver/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,12 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="LanguageDetectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+    <inspection_tool class="SqlRedundantOrderingDirectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

scnserver/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/server.iml" filepath="$PROJECT_DIR$/.idea/server.iml" />
+    </modules>
+  </component>
+</project>

scnserver/.idea/server.iml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true">
+    <buildTags>
+      <option name="customFlags">
+        <array>
+          <option value="timetzdata" />
+          <option value="sqlite_fts5" />
+          <option value="sqlite_foreign_keys" />
+        </array>
+      </option>
+    </buildTags>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/_pygments" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

scnserver/.idea/sqldialects.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/db/schema/primary_3.ddl" dialect="SQLite" />
+    <file url="PROJECT" dialect="SQLite" />
+  </component>
+  <component name="SqlResolveMappings">
+    <file url="file://$PROJECT_DIR$" scope="{&quot;node&quot;:{  &quot;@negative&quot;:&quot;1&quot;,  &quot;group&quot;:{   &quot;@kind&quot;:&quot;root&quot;,   &quot;node&quot;:{    &quot;name&quot;:{     &quot;@qname&quot;:&quot;b3228d61-4c36-41ce-803f-63bd80e198b3&quot;    },    &quot;group&quot;:{     &quot;@kind&quot;:&quot;schema&quot;,     &quot;node&quot;:{      &quot;name&quot;:{       &quot;@qname&quot;:&quot;schema_3.0.ddl&quot;      }     }    }   }  } }}" />
+    <file url="PROJECT" scope="" />
+  </component>
+</project>

scnserver/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

scnserver/Dockerfile

@@ -0,0 +1,36 @@
+
+
+FROM golang:1-bullseye AS builder
+
+RUN apt-get update && \
+    apt-get install -y ca-certificates openssl make git tar coreutils && \
+    apt-get install -y python3 python3-pip && \
+    pip install virtualenv && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY . /buildsrc
+
+RUN cd /buildsrc && cp "scn_send.sh" "../scn_send.sh" && make build
+
+
+
+
+
+
+FROM debian:bookworm
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends ca-certificates && \
+    apt-get install -y --no-install-recommends tzdata          && \
+    rm -rf /var/cache/apt/archives && \
+    rm -rf /var/lib/apt/lists
+
+COPY --from=builder   /buildsrc/_build/scn_backend   /app/server
+
+RUN mkdir /data
+
+WORKDIR /app
+
+EXPOSE 80
+
+CMD ["/app/server"]

scnserver/Makefile

@@ -0,0 +1,107 @@
+DOCKER_REPO=registry.blackforestbytes.com
+DOCKER_NAME=mikescher/simplecloudnotifier
+PORT=9090
+
+NAMESPACE=$(shell git rev-parse --abbrev-ref HEAD)
+HASH=$(shell git rev-parse HEAD)
+
+.PHONY: test swagger pygmentize docker migrate dgi pygmentize lint docker
+
+SWAGGO_VERSION=v1.8.12
+SWAGGO=github.com/swaggo/swag/cmd/swag@$(SWAGGO_VERSION)
+
+build: swagger pygmentize fmt
+	mkdir -p _build
+	rm -f ./_build/scn_backend
+	go generate ./...
+	CGO_ENABLED=1 go build -v -o _build/scn_backend -tags "timetzdata sqlite_fts5 sqlite_foreign_keys" ./cmd/scnserver
+
+run: build
+	mkdir -p .run-data
+	_build/scn_backend
+
+gow:
+	which gow || go install github.com/mitranim/gow@latest
+	gow -e "go,mod,html,css,json,yaml,js" run -tags "timetzdata sqlite_fts5 sqlite_foreign_keys" blackforestbytes.com/simplecloudnotifier/cmd/scnserver
+
+dgi:
+	[ ! -f "DOCKER_GIT_INFO" ] || rm DOCKER_GIT_INFO
+	echo -n "VCSTYPE="     >> DOCKER_GIT_INFO ; echo "git"                         >> DOCKER_GIT_INFO
+	echo -n "BRANCH="      >> DOCKER_GIT_INFO ; git rev-parse --abbrev-ref HEAD    >> DOCKER_GIT_INFO
+	echo -n "HASH="        >> DOCKER_GIT_INFO ; git rev-parse              HEAD    >> DOCKER_GIT_INFO
+	echo -n "COMMITTIME="  >> DOCKER_GIT_INFO ; git log -1 --format=%cd --date=iso >> DOCKER_GIT_INFO
+	echo -n "REMOTE="      >> DOCKER_GIT_INFO ; git config --get remote.origin.url >> DOCKER_GIT_INFO
+
+docker: dgi
+	cp ../scn_send.sh .
+	docker build \
+            -t "$(DOCKER_NAME):$(HASH)" \
+            -t "$(DOCKER_NAME):$(NAMESPACE)-latest" \
+            -t "$(DOCKER_NAME):latest" \
+            -t "$(DOCKER_REPO)/$(DOCKER_NAME):$(HASH)" \
+            -t "$(DOCKER_REPO)/$(DOCKER_NAME):$(NAMESPACE)-latest" \
+            -t "$(DOCKER_REPO)/$(DOCKER_NAME):latest" \
+            .
+	[ -f "scn_send.sh" ] && rm scn_send.sh
+
+swagger-setup:
+	mkdir -p ".swaggobin"
+	[ -f ".swaggobin/swag_$(SWAGGO_VERSION)" ] || { GOBIN=/tmp/_swaggo go install $(SWAGGO); cp "/tmp/_swaggo/swag" ".swaggobin/swag_$(SWAGGO_VERSION)"; rm -rf "/tmp/_swaggo"; }
+
+swagger: swagger-setup
+	".swaggobin/swag_$(SWAGGO_VERSION)" init -generalInfo ./api/router.go --propertyStrategy camelcase --output ./swagger/ --outputTypes "json,yaml"
+
+pygmentize: website/scn_send.html
+
+website/scn_send.html: ../scn_send.sh
+	_pygments/pygmentizew -l bash    -f html "$(shell pwd)/../scn_send.sh" > "$(shell pwd)/website/scn_send.html"
+	_pygments/pygmentizew -S monokai -f html                               > "$(shell pwd)/website/css/pygmnetize-dark.css"
+	_pygments/pygmentizew -S borland -f html                               > "$(shell pwd)/website/css/pygmnetize-light.css"
+
+run-docker-local: docker
+	mkdir -p .run-data
+	docker run --rm \
+	           --init \
+	           --env "CONF_NS=local-docker" \
+			   --volume "$(shell pwd)/.run-data/docker-local:/data" \
+			   --publish "8080:80" \
+			   $(DOCKER_NAME):latest
+
+inspect-docker: docker
+	mkdir -p .run-data
+	docker run -ti \
+	           --rm \
+	           --volume "$(shell pwd)/.run-data/docker-inspect:/data" \
+	           $(DOCKER_NAME):latest \
+	           bash
+
+push-docker:
+	docker image push "$(DOCKER_REPO)/$(DOCKER_NAME):$(HASH)"
+	docker image push "$(DOCKER_REPO)/$(DOCKER_NAME):$(NAMESPACE)-latest"
+	docker image push "$(DOCKER_REPO)/$(DOCKER_NAME):latest"
+
+clean:
+	rm -rf _build/*
+	rm -rf .run-data/*
+	rm -rf _pygments/env
+	git clean -fdx
+	! which go 2>&1 >> /dev/null || go clean
+	! which go 2>&1 >> /dev/null || go clean -testcache
+
+fmt: swagger-setup
+	go fmt ./...
+	".swaggobin/swag_$(SWAGGO_VERSION)" fmt
+
+test:
+	which gotestsum || go install gotest.tools/gotestsum@latest
+	gotestsum --format "testname" -- -tags="timetzdata sqlite_fts5 sqlite_foreign_keys" "./test"
+
+migrate:
+	CGO_ENABLED=1 go build -v -o _build/scn_migrate -tags "timetzdata sqlite_fts5 sqlite_foreign_keys" ./cmd/migrate
+	./_build/scn_migrate
+
+lint:
+	# curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.2
+	golangci-lint run ./...
+
+

scnserver/TODO.md

@@ -0,0 +1,73 @@
+
+
+  TODO
+========
+
+
+#### DO DO DO
+
+ - app-store link in HTML
+
+ - ios purchase verification
+
+ - (!) use goext.ginWrapper
+  
+ - (!) use goext.exerr
+
+ - use bfcodegen (enums+id)
+
+#### UNSURE
+
+ - (?) default-priority for channels
+
+ - (?) "login" on website and list/search/filter messages
+
+ - (?) make channels deleteable (soft-delete) (what do with messages in channel?)
+
+ - (?) desktop client for notifications
+
+ - (?) add querylog (similar to requestlog/errorlog) - only for main-db
+
+ - (?) specify 'type' of message (debug, info, warn, error, fatal)  ->  distinct from priority 
+
+#### LATER
+
+ - do i need bool2db()? it seems to work for keytokens without them?
+
+ - We no longer have a route to reshuffle all keys (previously in updateUser), add a /user/:uid/keys/reset ?
+   Would delete all existing keys and create 3 new ones?
+
+ - error logging as goroutine, gets all errors via channel,
+   (channel buffered - nonblocking send, second channel that gets a message when sender failed )
+   (then all errors end up in _second_ sqlite table)
+   due to message channel etc everything is non blocking and cant fail in main
+ 
+ - => implement proper error logging in goext, kinda combines zerolog and wrapped-errors
+   copy basic code from bringman, but remove all bm specific stuff and make it abstract
+   Register(ErrType) methods, errtypes then as structs
+   log.xxx package with same interface as zerolog
+
+ - jobs to clear error-db to only keep X entries... (requests-db already exists)
+
+ - route to re-check all pro-token (for me)
+
+ - endpoint to list all servernames of user (distinct select)
+
+ - weblogin, webapp, ...
+
+ - Pagination for ListChannels / ListSubscriptions / ListClients / ListChannelSubscriptions / ListUserSubscriptions
+
+ - Use only single struct for DB|Model|JSON
+     * needs sq.Converter implementation
+     * needs to handle joined data
+     * rfctime.Time...
+
+ - use job superclass (copy from isi/bnet/?), reduce duplicate code
+
+ - admin panel (especially errors and requests)
+
+ - cli app (?)
+
+#### FUTURE
+
+ - Remove compat, especially do not create compat id for every new message...

scnserver/_gen/enum-generate.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"gogs.mikescher.com/BlackForestBytes/goext/bfcodegen"
+	"os"
+)
+
+func main() {
+	dest := os.Args[2]
+
+	wd, err := os.Getwd()
+	if err != nil {
+		panic(err)
+	}
+
+	err = bfcodegen.GenerateEnumSpecs(wd, dest)
+	if err != nil {
+		panic(err)
+	}
+}
+

scnserver/_pygments/.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+*.swp
+env

scnserver/_pygments/pygmentizew

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -o nounset   # disallow usage of unset vars  ( set -u )
+set -o errexit   # Exit immediately if a pipeline returns non-zero.  ( set -e )
+set -o errtrace  # Allow the above trap be inherited by all functions in the script.  ( set -E )
+set -o pipefail  # Return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
+IFS=$'\n\t'      # Set $IFS to only newline and tab.
+
+cd "$(dirname "$0")" || exit 1
+
+1>&2 virtualenv env
+1>&2 source env/bin/activate
+
+1>&2 pip install Pygments
+
+pygmentize "$@"

scnserver/api/apierr/enums.go

@@ -0,0 +1,63 @@
+package apierr
+
+type APIError int //@enum:type
+
+//goland:noinspection GoSnakeCaseUsage
+const (
+	UNDEFINED APIError = -1
+
+	NO_ERROR APIError = 0000
+
+	MISSING_UID          APIError = 1101
+	MISSING_TOK          APIError = 1102
+	MISSING_TITLE        APIError = 1103
+	INVALID_PRIO         APIError = 1104
+	REQ_METHOD           APIError = 1105
+	INVALID_CLIENTTYPE   APIError = 1106
+	PAGETOKEN_ERROR      APIError = 1121
+	BINDFAIL_QUERY_PARAM APIError = 1151
+	BINDFAIL_BODY_PARAM  APIError = 1152
+	BINDFAIL_URI_PARAM   APIError = 1153
+	INVALID_BODY_PARAM   APIError = 1161
+	INVALID_ENUM_VALUE   APIError = 1171
+
+	NO_TITLE                     APIError = 1201
+	TITLE_TOO_LONG               APIError = 1202
+	CONTENT_TOO_LONG             APIError = 1203
+	USR_MSG_ID_TOO_LONG          APIError = 1204
+	TIMESTAMP_OUT_OF_RANGE       APIError = 1205
+	SENDERNAME_TOO_LONG          APIError = 1206
+	CHANNEL_TOO_LONG             APIError = 1207
+	CHANNEL_DESCRIPTION_TOO_LONG APIError = 1208
+	CHANNEL_NAME_EMPTY           APIError = 1209
+
+	USER_NOT_FOUND             APIError = 1301
+	CLIENT_NOT_FOUND           APIError = 1302
+	CHANNEL_NOT_FOUND          APIError = 1303
+	SUBSCRIPTION_NOT_FOUND     APIError = 1304
+	MESSAGE_NOT_FOUND          APIError = 1305
+	SUBSCRIPTION_USER_MISMATCH APIError = 1306
+	KEY_NOT_FOUND              APIError = 1307
+	USER_AUTH_FAILED           APIError = 1311
+
+	NO_DEVICE_LINKED APIError = 1401
+
+	CHANNEL_ALREADY_EXISTS APIError = 1501
+	CANNOT_SELFDELETE_KEY  APIError = 1511
+	CANNOT_SELFUPDATE_KEY  APIError = 1512
+
+	QUOTA_REACHED APIError = 2101
+
+	FAILED_VERIFY_PRO_TOKEN APIError = 3001
+	INVALID_PRO_TOKEN       APIError = 3002
+
+	COMMIT_FAILED   = 9001
+	DATABASE_ERROR  = 9002
+	PERM_QUERY_FAIL = 9003
+
+	FIREBASE_COM_FAILED  APIError = 9901
+	FIREBASE_COM_ERRORED APIError = 9902
+	INTERNAL_EXCEPTION   APIError = 9903
+	PANIC                APIError = 9904
+	NOT_IMPLEMENTED      APIError = 9905
+)

scnserver/api/apihighlight/highlights.go

@@ -0,0 +1,16 @@
+package apihighlight
+
+type ErrHighlight int //@enum:type
+
+//goland:noinspection GoSnakeCaseUsage
+const (
+	NONE            ErrHighlight = -1
+	USER_ID         ErrHighlight = 101
+	USER_KEY        ErrHighlight = 102
+	TITLE           ErrHighlight = 103
+	CONTENT         ErrHighlight = 104
+	PRIORITY        ErrHighlight = 105
+	CHANNEL         ErrHighlight = 106
+	SENDER_NAME     ErrHighlight = 107
+	USER_MESSAGE_ID ErrHighlight = 108
+)

scnserver/api/ginext/cors.go

@@ -0,0 +1,21 @@
+package ginext
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func CorsMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
+		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
+		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
+		c.Writer.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST, PUT, PATCH, DELETE")
+
+		if c.Request.Method == "OPTIONS" {
+			c.AbortWithStatus(http.StatusOK)
+		} else {
+			c.Next()
+		}
+	}
+}

scnserver/api/ginext/gin.go

@@ -0,0 +1,31 @@
+package ginext
+
+import (
+	scn "blackforestbytes.com/simplecloudnotifier"
+	"github.com/gin-gonic/gin"
+)
+
+var SuppressGinLogs = false
+
+func NewEngine(cfg scn.Config) *gin.Engine {
+	engine := gin.New()
+
+	engine.RedirectFixedPath = false
+	engine.RedirectTrailingSlash = false
+
+	if cfg.Cors {
+		engine.Use(CorsMiddleware())
+	}
+
+	if cfg.GinDebug {
+		ginlogger := gin.Logger()
+		engine.Use(func(context *gin.Context) {
+			if SuppressGinLogs {
+				return
+			}
+			ginlogger(context)
+		})
+	}
+
+	return engine
+}

scnserver/api/ginext/handler.go

@@ -0,0 +1,24 @@
+package ginext
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func RedirectFound(newuri string) gin.HandlerFunc {
+	return func(g *gin.Context) {
+		g.Redirect(http.StatusFound, newuri)
+	}
+}
+
+func RedirectTemporary(newuri string) gin.HandlerFunc {
+	return func(g *gin.Context) {
+		g.Redirect(http.StatusTemporaryRedirect, newuri)
+	}
+}
+
+func RedirectPermanent(newuri string) gin.HandlerFunc {
+	return func(g *gin.Context) {
+		g.Redirect(http.StatusPermanentRedirect, newuri)
+	}
+}

scnserver/api/ginresp/apiError.go

@@ -0,0 +1,23 @@
+package ginresp
+
+type apiError struct {
+	Success        bool   `json:"success"`
+	Error          int    `json:"error"`
+	ErrorHighlight int    `json:"errhighlight"`
+	Message        string `json:"message"`
+}
+
+type extendedAPIError struct {
+	Success        bool     `json:"success"`
+	Error          int      `json:"error"`
+	ErrorHighlight int      `json:"errhighlight"`
+	Message        string   `json:"message"`
+	RawError       *string  `json:"__error"`
+	Trace          []string `json:"__trace"`
+}
+
+type compatAPIError struct {
+	Success bool   `json:"success"`
+	ErrorID int    `json:"errid,omitempty"`
+	Message string `json:"message"`
+}

scnserver/api/ginresp/resp.go

@@ -0,0 +1,212 @@
+package ginresp
+
+import (
+	scn "blackforestbytes.com/simplecloudnotifier"
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/apihighlight"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog/log"
+	json "gogs.mikescher.com/BlackForestBytes/goext/gojson"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"runtime/debug"
+	"strings"
+)
+
+type HTTPResponse interface {
+	Write(g *gin.Context)
+	Statuscode() int
+	BodyString() *string
+	ContentType() string
+}
+
+type jsonHTTPResponse struct {
+	statusCode int
+	data       any
+}
+
+func (j jsonHTTPResponse) Write(g *gin.Context) {
+	g.Render(j.statusCode, json.GoJsonRender{Data: j.data, NilSafeSlices: true, NilSafeMaps: true})
+}
+
+func (j jsonHTTPResponse) Statuscode() int {
+	return j.statusCode
+}
+
+func (j jsonHTTPResponse) BodyString() *string {
+	v, err := json.Marshal(j.data)
+	if err != nil {
+		return nil
+	}
+	return langext.Ptr(string(v))
+}
+
+func (j jsonHTTPResponse) ContentType() string {
+	return "application/json"
+}
+
+type emptyHTTPResponse struct {
+	statusCode int
+}
+
+func (j emptyHTTPResponse) Write(g *gin.Context) {
+	g.Status(j.statusCode)
+}
+
+func (j emptyHTTPResponse) Statuscode() int {
+	return j.statusCode
+}
+
+func (j emptyHTTPResponse) BodyString() *string {
+	return nil
+}
+
+func (j emptyHTTPResponse) ContentType() string {
+	return ""
+}
+
+type textHTTPResponse struct {
+	statusCode int
+	data       string
+}
+
+func (j textHTTPResponse) Write(g *gin.Context) {
+	g.String(j.statusCode, "%s", j.data)
+}
+
+func (j textHTTPResponse) Statuscode() int {
+	return j.statusCode
+}
+
+func (j textHTTPResponse) BodyString() *string {
+	return langext.Ptr(j.data)
+}
+
+func (j textHTTPResponse) ContentType() string {
+	return "text/plain"
+}
+
+type dataHTTPResponse struct {
+	statusCode  int
+	data        []byte
+	contentType string
+}
+
+func (j dataHTTPResponse) Write(g *gin.Context) {
+	g.Data(j.statusCode, j.contentType, j.data)
+}
+
+func (j dataHTTPResponse) Statuscode() int {
+	return j.statusCode
+}
+
+func (j dataHTTPResponse) BodyString() *string {
+	return langext.Ptr(string(j.data))
+}
+
+func (j dataHTTPResponse) ContentType() string {
+	return j.contentType
+}
+
+type errorHTTPResponse struct {
+	statusCode int
+	data       any
+	error      error
+}
+
+func (j errorHTTPResponse) Write(g *gin.Context) {
+	g.JSON(j.statusCode, j.data)
+}
+
+func (j errorHTTPResponse) Statuscode() int {
+	return j.statusCode
+}
+
+func (j errorHTTPResponse) BodyString() *string {
+	v, err := json.Marshal(j.data)
+	if err != nil {
+		return nil
+	}
+	return langext.Ptr(string(v))
+}
+
+func (j errorHTTPResponse) ContentType() string {
+	return "application/json"
+}
+
+func Status(sc int) HTTPResponse {
+	return &emptyHTTPResponse{statusCode: sc}
+}
+
+func JSON(sc int, data any) HTTPResponse {
+	return &jsonHTTPResponse{statusCode: sc, data: data}
+}
+
+func Data(sc int, contentType string, data []byte) HTTPResponse {
+	return &dataHTTPResponse{statusCode: sc, contentType: contentType, data: data}
+}
+
+func Text(sc int, data string) HTTPResponse {
+	return &textHTTPResponse{statusCode: sc, data: data}
+}
+
+func InternalError(e error) HTTPResponse {
+	return createApiError(nil, "InternalError", 500, apierr.INTERNAL_EXCEPTION, 0, e.Error(), e)
+}
+
+func APIError(g *gin.Context, status int, errorid apierr.APIError, msg string, e error) HTTPResponse {
+	return createApiError(g, "APIError", status, errorid, 0, msg, e)
+}
+
+func SendAPIError(g *gin.Context, status int, errorid apierr.APIError, highlight apihighlight.ErrHighlight, msg string, e error) HTTPResponse {
+	return createApiError(g, "SendAPIError", status, errorid, highlight, msg, e)
+}
+
+func NotImplemented(g *gin.Context) HTTPResponse {
+	return createApiError(g, "NotImplemented", 500, apierr.NOT_IMPLEMENTED, 0, "Not Implemented", nil)
+}
+
+func createApiError(g *gin.Context, ident string, status int, errorid apierr.APIError, highlight apihighlight.ErrHighlight, msg string, e error) HTTPResponse {
+	reqUri := ""
+	if g != nil && g.Request != nil {
+		reqUri = g.Request.Method + " :: " + g.Request.RequestURI
+	}
+
+	log.Error().
+		Int("errorid", int(errorid)).
+		Int("highlight", int(highlight)).
+		Str("uri", reqUri).
+		AnErr("err", e).
+		Stack().
+		Msg(fmt.Sprintf("[%s] %s", ident, msg))
+
+	if scn.Conf.ReturnRawErrors {
+		return &errorHTTPResponse{
+			statusCode: status,
+			data: extendedAPIError{
+				Success:        false,
+				Error:          int(errorid),
+				ErrorHighlight: int(highlight),
+				Message:        msg,
+				RawError:       langext.Ptr(langext.Conditional(e == nil, "", fmt.Sprintf("%+v", e))),
+				Trace:          strings.Split(string(debug.Stack()), "\n"),
+			},
+			error: e,
+		}
+	} else {
+		return &errorHTTPResponse{
+			statusCode: status,
+			data: apiError{
+				Success:        false,
+				Error:          int(errorid),
+				ErrorHighlight: int(highlight),
+				Message:        msg,
+			},
+			error: e,
+		}
+	}
+}
+
+func CompatAPIError(errid int, msg string) HTTPResponse {
+	return &jsonHTTPResponse{statusCode: 200, data: compatAPIError{Success: false, ErrorID: errid, Message: msg}}
+}

scnserver/api/ginresp/wrapper.go

@@ -0,0 +1,184 @@
+package ginresp
+
+import (
+	scn "blackforestbytes.com/simplecloudnotifier"
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"errors"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/mattn/go-sqlite3"
+	"github.com/rs/zerolog/log"
+	"gogs.mikescher.com/BlackForestBytes/goext/dataext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"runtime/debug"
+	"time"
+)
+
+type WHandlerFunc func(*gin.Context) HTTPResponse
+
+type RequestLogAcceptor interface {
+	InsertRequestLog(data models.RequestLog)
+}
+
+func Wrap(rlacc RequestLogAcceptor, fn WHandlerFunc) gin.HandlerFunc {
+
+	maxRetry := scn.Conf.RequestMaxRetry
+	retrySleep := scn.Conf.RequestRetrySleep
+
+	return func(g *gin.Context) {
+
+		reqctx := g.Request.Context()
+
+		if g.Request.Body != nil {
+			g.Request.Body = dataext.NewBufferedReadCloser(g.Request.Body)
+		}
+
+		t0 := time.Now()
+
+		for ctr := 1; ; ctr++ {
+
+			wrap, stackTrace, panicObj := callPanicSafe(fn, g)
+			if panicObj != nil {
+				log.Error().Interface("panicObj", panicObj).Msg("Panic occured (in gin handler)")
+				log.Error().Msg(stackTrace)
+				wrap = APIError(g, 500, apierr.PANIC, "A panic occured in the HTTP handler", errors.New(fmt.Sprintf("%+v\n\n@:\n%s", panicObj, stackTrace)))
+			}
+
+			if g.Writer.Written() {
+				if scn.Conf.ReqLogEnabled {
+					rlacc.InsertRequestLog(createRequestLog(g, t0, ctr, nil, langext.Ptr("Writing in WrapperFunc is not supported")))
+				}
+				panic("Writing in WrapperFunc is not supported")
+			}
+
+			if ctr < maxRetry && isSqlite3Busy(wrap) {
+				log.Warn().Int("counter", ctr).Str("url", g.Request.URL.String()).Msg("Retry request (ErrBusy)")
+
+				err := resetBody(g)
+				if err != nil {
+					panic(err)
+				}
+
+				time.Sleep(retrySleep)
+				continue
+			}
+
+			if reqctx.Err() == nil {
+				if scn.Conf.ReqLogEnabled {
+					rlacc.InsertRequestLog(createRequestLog(g, t0, ctr, wrap, nil))
+				}
+
+				statuscode := wrap.Statuscode()
+				if statuscode/100 != 2 {
+					log.Warn().Str("url", g.Request.Method+"::"+g.Request.URL.String()).Msg(fmt.Sprintf("Request failed with statuscode %d", statuscode))
+				}
+
+				wrap.Write(g)
+			}
+
+			return
+		}
+
+	}
+
+}
+
+func createRequestLog(g *gin.Context, t0 time.Time, ctr int, resp HTTPResponse, panicstr *string) models.RequestLog {
+
+	t1 := time.Now()
+
+	ua := g.Request.UserAgent()
+	auth := g.Request.Header.Get("Authorization")
+	ct := g.Request.Header.Get("Content-Type")
+
+	var reqbody []byte = nil
+	if g.Request.Body != nil {
+		brcbody, err := g.Request.Body.(dataext.BufferedReadCloser).BufferedAll()
+		if err == nil {
+			reqbody = brcbody
+		}
+	}
+	var strreqbody *string = nil
+	if len(reqbody) < scn.Conf.ReqLogMaxBodySize {
+		strreqbody = langext.Ptr(string(reqbody))
+	}
+
+	var respbody *string = nil
+
+	var strrespbody *string = nil
+	if resp != nil {
+		respbody = resp.BodyString()
+		if respbody != nil && len(*respbody) < scn.Conf.ReqLogMaxBodySize {
+			strrespbody = respbody
+		}
+	}
+
+	permObj, hasPerm := g.Get("perm")
+
+	hasTok := false
+	if hasPerm {
+		hasTok = permObj.(models.PermissionSet).Token != nil
+	}
+
+	return models.RequestLog{
+		Method:              g.Request.Method,
+		URI:                 g.Request.URL.String(),
+		UserAgent:           langext.Conditional(ua == "", nil, &ua),
+		Authentication:      langext.Conditional(auth == "", nil, &auth),
+		RequestBody:         strreqbody,
+		RequestBodySize:     int64(len(reqbody)),
+		RequestContentType:  ct,
+		RemoteIP:            g.RemoteIP(),
+		KeyID:               langext.ConditionalFn10(hasTok, func() *models.KeyTokenID { return langext.Ptr(permObj.(models.PermissionSet).Token.KeyTokenID) }, nil),
+		UserID:              langext.ConditionalFn10(hasTok, func() *models.UserID { return langext.Ptr(permObj.(models.PermissionSet).Token.OwnerUserID) }, nil),
+		Permissions:         langext.ConditionalFn10(hasTok, func() *string { return langext.Ptr(permObj.(models.PermissionSet).Token.Permissions.String()) }, nil),
+		ResponseStatuscode:  langext.ConditionalFn10(resp != nil, func() *int64 { return langext.Ptr(int64(resp.Statuscode())) }, nil),
+		ResponseBodySize:    langext.ConditionalFn10(strrespbody != nil, func() *int64 { return langext.Ptr(int64(len(*respbody))) }, nil),
+		ResponseBody:        strrespbody,
+		ResponseContentType: langext.ConditionalFn10(resp != nil, func() string { return resp.ContentType() }, ""),
+		RetryCount:          int64(ctr),
+		Panicked:            panicstr != nil,
+		PanicStr:            panicstr,
+		ProcessingTime:      t1.Sub(t0),
+		TimestampStart:      t0,
+		TimestampFinish:     t1,
+	}
+}
+
+func callPanicSafe(fn WHandlerFunc, g *gin.Context) (res HTTPResponse, stackTrace string, panicObj any) {
+	defer func() {
+		if rec := recover(); rec != nil {
+			res = nil
+			stackTrace = string(debug.Stack())
+			panicObj = rec
+		}
+	}()
+
+	res = fn(g)
+	return res, "", nil
+}
+
+func resetBody(g *gin.Context) error {
+	if g.Request.Body == nil {
+		return nil
+	}
+
+	err := g.Request.Body.(dataext.BufferedReadCloser).Reset()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func isSqlite3Busy(r HTTPResponse) bool {
+	if errwrap, ok := r.(*errorHTTPResponse); ok && errwrap != nil {
+		if s3err, ok := (errwrap.error).(sqlite3.Error); ok {
+			if s3err.Code == sqlite3.ErrBusy {
+				return true
+			}
+		}
+	}
+	return false
+}

scnserver/api/handler/api.go

@@ -0,0 +1,18 @@
+package handler
+
+import (
+	primarydb "blackforestbytes.com/simplecloudnotifier/db/impl/primary"
+	"blackforestbytes.com/simplecloudnotifier/logic"
+)
+
+type APIHandler struct {
+	app      *logic.Application
+	database *primarydb.Database
+}
+
+func NewAPIHandler(app *logic.Application) APIHandler {
+	return APIHandler{
+		app:      app,
+		database: app.Database.Primary,
+	}
+}

scnserver/api/handler/apiChannel.go

@@ -0,0 +1,468 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	ct "blackforestbytes.com/simplecloudnotifier/db/cursortoken"
+	"blackforestbytes.com/simplecloudnotifier/db/impl/primary"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"database/sql"
+	"errors"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/mathext"
+	"net/http"
+	"strings"
+)
+
+// ListChannels swaggerdoc
+//
+//	@Summary		List channels of a user (subscribed/owned/all)
+//	@Description	The possible values for 'selector' are:
+//	@Description	- "owned"          Return all channels of the user
+//	@Description	- "subscribed"     Return all channels that the user is subscribing to
+//	@Description	- "all"            Return channels that the user owns or is subscribing
+//	@Description	- "subscribed_any" Return all channels that the user is subscribing to (even unconfirmed)
+//	@Description	- "all_any"        Return channels that the user owns or is subscribing (even unconfirmed)
+//
+//	@ID				api-channels-list
+//	@Tags			API-v2
+//
+//	@Param			uid			path		string	true	"UserID"
+//	@Param			selector	query		string	false	"Filter channels (default: owned)"	Enums(owned, subscribed, all, subscribed_any, all_any)
+//
+//	@Success		200			{object}	handler.ListChannels.response
+//	@Failure		400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid}/channels [GET]
+func (h APIHandler) ListChannels(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type query struct {
+		Selector *string `json:"selector" form:"selector"  enums:"owned,subscribed_any,all_any,subscribed,all"`
+	}
+	type response struct {
+		Channels []models.ChannelWithSubscriptionJSON `json:"channels"`
+	}
+
+	var u uri
+	var q query
+	ctx, errResp := h.app.StartRequest(g, &u, &q, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserRead(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	sel := strings.ToLower(langext.Coalesce(q.Selector, "owned"))
+
+	var res []models.ChannelWithSubscriptionJSON
+
+	if sel == "owned" {
+
+		channels, err := h.database.ListChannelsByOwner(ctx, u.UserID, u.UserID)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channels", err)
+		}
+		res = langext.ArrMap(channels, func(v models.ChannelWithSubscription) models.ChannelWithSubscriptionJSON { return v.JSON(true) })
+
+	} else if sel == "subscribed_any" {
+
+		channels, err := h.database.ListChannelsBySubscriber(ctx, u.UserID, nil)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channels", err)
+		}
+		res = langext.ArrMap(channels, func(v models.ChannelWithSubscription) models.ChannelWithSubscriptionJSON { return v.JSON(false) })
+
+	} else if sel == "all_any" {
+
+		channels, err := h.database.ListChannelsByAccess(ctx, u.UserID, nil)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channels", err)
+		}
+		res = langext.ArrMap(channels, func(v models.ChannelWithSubscription) models.ChannelWithSubscriptionJSON { return v.JSON(false) })
+
+	} else if sel == "subscribed" {
+
+		channels, err := h.database.ListChannelsBySubscriber(ctx, u.UserID, langext.Ptr(true))
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channels", err)
+		}
+		res = langext.ArrMap(channels, func(v models.ChannelWithSubscription) models.ChannelWithSubscriptionJSON { return v.JSON(false) })
+
+	} else if sel == "all" {
+
+		channels, err := h.database.ListChannelsByAccess(ctx, u.UserID, langext.Ptr(true))
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channels", err)
+		}
+		res = langext.ArrMap(channels, func(v models.ChannelWithSubscription) models.ChannelWithSubscriptionJSON { return v.JSON(false) })
+
+	} else {
+
+		return ginresp.APIError(g, 400, apierr.INVALID_ENUM_VALUE, "Invalid value for the [selector] parameter", nil)
+
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{Channels: res}))
+}
+
+// GetChannel swaggerdoc
+//
+//	@Summary	Get a single channel
+//	@ID			api-channels-get
+//	@Tags		API-v2
+//
+//	@Param		uid	path		string	true	"UserID"
+//	@Param		cid	path		string	true	"ChannelID"
+//
+//	@Success	200	{object}	models.ChannelWithSubscriptionJSON
+//	@Failure	400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404	{object}	ginresp.apiError	"channel not found"
+//	@Failure	500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/channels/{cid} [GET]
+func (h APIHandler) GetChannel(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID    models.UserID    `uri:"uid" binding:"entityid"`
+		ChannelID models.ChannelID `uri:"cid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserRead(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	channel, err := h.database.GetChannel(ctx, u.UserID, u.ChannelID, true)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.CHANNEL_NOT_FOUND, "Channel not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channel", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, channel.JSON(true)))
+}
+
+// CreateChannel swaggerdoc
+//
+//	@Summary	Create a new (empty) channel
+//	@ID			api-channels-create
+//	@Tags		API-v2
+//
+//	@Param		uid			path		string						true	"UserID"
+//	@Param		post_body	body		handler.CreateChannel.body	false	" "
+//
+//	@Success	200			{object}	models.ChannelWithSubscriptionJSON
+//	@Failure	400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	409			{object}	ginresp.apiError	"channel already exists"
+//	@Failure	500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/channels [POST]
+func (h APIHandler) CreateChannel(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type body struct {
+		Name      string `json:"name"`
+		Subscribe *bool  `json:"subscribe"`
+
+		Description *string `json:"description"`
+	}
+
+	var u uri
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	if b.Name == "" {
+		return ginresp.APIError(g, 400, apierr.INVALID_BODY_PARAM, "Missing parameter: name", nil)
+	}
+
+	channelDisplayName := h.app.NormalizeChannelDisplayName(b.Name)
+	channelInternalName := h.app.NormalizeChannelInternalName(b.Name)
+
+	channelExisting, err := h.database.GetChannelByName(ctx, u.UserID, channelInternalName)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channel", err)
+	}
+
+	user, err := h.database.GetUser(ctx, u.UserID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 400, apierr.USER_NOT_FOUND, "User not found", nil)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query user", err)
+	}
+
+	if len(channelDisplayName) > user.MaxChannelNameLength() {
+		return ginresp.APIError(g, 400, apierr.CHANNEL_TOO_LONG, fmt.Sprintf("Channel too long (max %d characters)", user.MaxChannelNameLength()), nil)
+	}
+	if len(strings.TrimSpace(channelDisplayName)) == 0 {
+		return ginresp.APIError(g, 400, apierr.CHANNEL_NAME_EMPTY, fmt.Sprintf("Channel displayname cannot be empty"), nil)
+	}
+	if len(channelInternalName) > user.MaxChannelNameLength() {
+		return ginresp.APIError(g, 400, apierr.CHANNEL_TOO_LONG, fmt.Sprintf("Channel too long (max %d characters)", user.MaxChannelNameLength()), nil)
+	}
+	if len(strings.TrimSpace(channelInternalName)) == 0 {
+		return ginresp.APIError(g, 400, apierr.CHANNEL_NAME_EMPTY, fmt.Sprintf("Channel internalname cannot be empty"), nil)
+	}
+
+	if channelExisting != nil {
+		return ginresp.APIError(g, 409, apierr.CHANNEL_ALREADY_EXISTS, "Channel with this name already exists", nil)
+	}
+
+	subscribeKey := h.app.GenerateRandomAuthKey()
+
+	cChannel := primary.CreateChanel{
+		UserId:       u.UserID,
+		IntName:      channelInternalName,
+		SubscribeKey: subscribeKey,
+		DisplayName:  channelDisplayName,
+		Description:  b.Description,
+	}
+
+	channel, err := h.database.CreateChannel(ctx, cChannel)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create channel", err)
+	}
+
+	if langext.Coalesce(b.Subscribe, true) {
+
+		sub, err := h.database.CreateSubscription(ctx, u.UserID, channel, true)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create subscription", err)
+		}
+
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, channel.WithSubscription(langext.Ptr(sub)).JSON(true)))
+
+	} else {
+
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, channel.WithSubscription(nil).JSON(true)))
+
+	}
+
+}
+
+// UpdateChannel swaggerdoc
+//
+//	@Summary	(Partially) update a channel
+//	@ID			api-channels-update
+//	@Tags		API-v2
+//
+//	@Param		uid				path		string	true	"UserID"
+//	@Param		cid				path		string	true	"ChannelID"
+//
+//	@Param		subscribe_key	body		string	false	"Send `true` to create a new subscribe_key"
+//	@Param		send_key		body		string	false	"Send `true` to create a new send_key"
+//	@Param		display_name	body		string	false	"Change the cahnnel display-name (only chnages to lowercase/uppercase are allowed - internal_name must stay the same)"
+//
+//	@Success	200				{object}	models.ChannelWithSubscriptionJSON
+//	@Failure	400				{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401				{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404				{object}	ginresp.apiError	"channel not found"
+//	@Failure	500				{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/channels/{cid} [PATCH]
+func (h APIHandler) UpdateChannel(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID    models.UserID    `uri:"uid" binding:"entityid"`
+		ChannelID models.ChannelID `uri:"cid" binding:"entityid"`
+	}
+	type body struct {
+		RefreshSubscribeKey *bool   `json:"subscribe_key"`
+		DisplayName         *string `json:"display_name"`
+		DescriptionName     *string `json:"description_name"`
+	}
+
+	var u uri
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	_, err := h.database.GetChannel(ctx, u.UserID, u.ChannelID, true)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.CHANNEL_NOT_FOUND, "Channel not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channel", err)
+	}
+
+	user, err := h.database.GetUser(ctx, u.UserID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 400, apierr.USER_NOT_FOUND, "User not found", nil)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query user", err)
+	}
+
+	if langext.Coalesce(b.RefreshSubscribeKey, false) {
+		newkey := h.app.GenerateRandomAuthKey()
+
+		err := h.database.UpdateChannelSubscribeKey(ctx, u.ChannelID, newkey)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update channel", err)
+		}
+	}
+
+	if b.DisplayName != nil {
+
+		newDisplayName := h.app.NormalizeChannelDisplayName(*b.DisplayName)
+
+		if len(newDisplayName) > user.MaxChannelNameLength() {
+			return ginresp.APIError(g, 400, apierr.CHANNEL_TOO_LONG, fmt.Sprintf("Channel too long (max %d characters)", user.MaxChannelNameLength()), nil)
+		}
+
+		if len(strings.TrimSpace(newDisplayName)) == 0 {
+			return ginresp.APIError(g, 400, apierr.CHANNEL_NAME_EMPTY, fmt.Sprintf("Channel displayname cannot be empty"), nil)
+		}
+
+		err := h.database.UpdateChannelDisplayName(ctx, u.ChannelID, newDisplayName)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update channel", err)
+		}
+
+	}
+
+	if b.DescriptionName != nil {
+
+		var descName *string = nil
+		if strings.TrimSpace(*b.DescriptionName) != "" {
+			descName = langext.Ptr(strings.TrimSpace(*b.DescriptionName))
+		}
+
+		if descName != nil && len(*descName) > user.MaxChannelDescriptionLength() {
+			return ginresp.APIError(g, 400, apierr.CHANNEL_DESCRIPTION_TOO_LONG, fmt.Sprintf("Channel-Description too long (max %d characters)", user.MaxChannelDescriptionLength()), nil)
+		}
+
+		err := h.database.UpdateChannelDescriptionName(ctx, u.ChannelID, descName)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update channel", err)
+		}
+
+	}
+
+	channel, err := h.database.GetChannel(ctx, u.UserID, u.ChannelID, true)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query (updated) channel", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, channel.JSON(true)))
+}
+
+// ListChannelMessages swaggerdoc
+//
+//	@Summary		List messages of a channel
+//	@Description	The next_page_token is an opaque token, the special value "@start" (or empty-string) is the beginning and "@end" is the end
+//	@Description	Simply start the pagination without a next_page_token and get the next page by calling this endpoint with the returned next_page_token of the last query
+//	@Description	If there are no more entries the token "@end" will be returned
+//	@Description	By default we return long messages with a trimmed body, if trimmed=false is supplied we return full messages (this reduces the max page_size)
+//	@ID				api-channel-messages
+//	@Tags			API-v2
+//
+//	@Param			query_data	query		handler.ListChannelMessages.query	false	" "
+//	@Param			uid			path		string								true	"UserID"
+//	@Param			cid			path		string								true	"ChannelID"
+//
+//	@Success		200			{object}	handler.ListChannelMessages.response
+//	@Failure		400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		404			{object}	ginresp.apiError	"channel not found"
+//	@Failure		500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid}/channels/{cid}/messages [GET]
+func (h APIHandler) ListChannelMessages(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		ChannelUserID models.UserID    `uri:"uid" binding:"entityid"`
+		ChannelID     models.ChannelID `uri:"cid" binding:"entityid"`
+	}
+	type query struct {
+		PageSize      *int    `json:"page_size"       form:"page_size"`
+		NextPageToken *string `json:"next_page_token" form:"next_page_token"`
+		Filter        *string `json:"filter"          form:"filter"`
+		Trimmed       *bool   `json:"trimmed"         form:"trimmed"`
+	}
+	type response struct {
+		Messages      []models.MessageJSON `json:"messages"`
+		NextPageToken string               `json:"next_page_token"`
+		PageSize      int                  `json:"page_size"`
+	}
+
+	var u uri
+	var q query
+	ctx, errResp := h.app.StartRequest(g, &u, &q, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	trimmed := langext.Coalesce(q.Trimmed, true)
+
+	maxPageSize := langext.Conditional(trimmed, 16, 256)
+
+	pageSize := mathext.Clamp(langext.Coalesce(q.PageSize, 64), 1, maxPageSize)
+
+	channel, err := h.database.GetChannel(ctx, u.ChannelUserID, u.ChannelID, false)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.CHANNEL_NOT_FOUND, "Channel not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channel", err)
+	}
+
+	if permResp := ctx.CheckPermissionChanMessagesRead(channel.Channel); permResp != nil {
+		return *permResp
+	}
+
+	tok, err := ct.Decode(langext.Coalesce(q.NextPageToken, ""))
+	if err != nil {
+		return ginresp.APIError(g, 400, apierr.PAGETOKEN_ERROR, "Failed to decode next_page_token", err)
+	}
+
+	filter := models.MessageFilter{
+		ChannelID: langext.Ptr([]models.ChannelID{channel.ChannelID}),
+	}
+
+	messages, npt, err := h.database.ListMessages(ctx, filter, &pageSize, tok)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query messages", err)
+	}
+
+	var res []models.MessageJSON
+	if trimmed {
+		res = langext.ArrMap(messages, func(v models.Message) models.MessageJSON { return v.TrimmedJSON() })
+	} else {
+		res = langext.ArrMap(messages, func(v models.Message) models.MessageJSON { return v.FullJSON() })
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{Messages: res, NextPageToken: npt.Token(), PageSize: pageSize}))
+}

scnserver/api/handler/apiClient.go

@@ -0,0 +1,295 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"database/sql"
+	"errors"
+	"github.com/gin-gonic/gin"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"net/http"
+)
+
+// ListClients swaggerdoc
+//
+//	@Summary	List all clients
+//	@ID			api-clients-list
+//	@Tags		API-v2
+//
+//	@Param		uid	path		string	true	"UserID"
+//
+//	@Success	200	{object}	handler.ListClients.response
+//	@Failure	400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/clients [GET]
+func (h APIHandler) ListClients(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type response struct {
+		Clients []models.ClientJSON `json:"clients"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserRead(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	clients, err := h.database.ListClients(ctx, u.UserID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query clients", err)
+	}
+
+	res := langext.ArrMap(clients, func(v models.Client) models.ClientJSON { return v.JSON() })
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{Clients: res}))
+}
+
+// GetClient swaggerdoc
+//
+//	@Summary	Get a single client
+//	@ID			api-clients-get
+//	@Tags		API-v2
+//
+//	@Param		uid	path		string	true	"UserID"
+//	@Param		cid	path		string	true	"ClientID"
+//
+//	@Success	200	{object}	models.ClientJSON
+//	@Failure	400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404	{object}	ginresp.apiError	"client not found"
+//	@Failure	500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/clients/{cid} [GET]
+func (h APIHandler) GetClient(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID   models.UserID   `uri:"uid" binding:"entityid"`
+		ClientID models.ClientID `uri:"cid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserRead(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	client, err := h.database.GetClient(ctx, u.UserID, u.ClientID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.CLIENT_NOT_FOUND, "Client not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query client", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, client.JSON()))
+}
+
+// AddClient swaggerdoc
+//
+//	@Summary	Add a new clients
+//	@ID			api-clients-create
+//	@Tags		API-v2
+//
+//	@Param		uid			path		string					true	"UserID"
+//
+//	@Param		post_body	body		handler.AddClient.body	false	" "
+//
+//	@Success	200			{object}	models.ClientJSON
+//	@Failure	400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/clients [POST]
+func (h APIHandler) AddClient(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type body struct {
+		FCMToken     string `json:"fcm_token" binding:"required"`
+		AgentModel   string `json:"agent_model" binding:"required"`
+		AgentVersion string `json:"agent_version" binding:"required"`
+		ClientType   string `json:"client_type" binding:"required"`
+	}
+
+	var u uri
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	var clientType models.ClientType
+	if b.ClientType == string(models.ClientTypeAndroid) {
+		clientType = models.ClientTypeAndroid
+	} else if b.ClientType == string(models.ClientTypeIOS) {
+		clientType = models.ClientTypeIOS
+	} else {
+		return ginresp.APIError(g, 400, apierr.INVALID_CLIENTTYPE, "Invalid ClientType", nil)
+	}
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	err := h.database.DeleteClientsByFCM(ctx, b.FCMToken)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to delete existing clients in db", err)
+	}
+
+	client, err := h.database.CreateClient(ctx, u.UserID, clientType, b.FCMToken, b.AgentModel, b.AgentVersion)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create client in db", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, client.JSON()))
+}
+
+// DeleteClient swaggerdoc
+//
+//	@Summary	Delete a client
+//	@ID			api-clients-delete
+//	@Tags		API-v2
+//
+//	@Param		uid	path		string	true	"UserID"
+//	@Param		cid	path		string	true	"ClientID"
+//
+//	@Success	200	{object}	models.ClientJSON
+//	@Failure	400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404	{object}	ginresp.apiError	"client not found"
+//	@Failure	500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/clients/{cid} [DELETE]
+func (h APIHandler) DeleteClient(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID   models.UserID   `uri:"uid" binding:"entityid"`
+		ClientID models.ClientID `uri:"cid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	client, err := h.database.GetClient(ctx, u.UserID, u.ClientID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.CLIENT_NOT_FOUND, "Client not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query client", err)
+	}
+
+	err = h.database.DeleteClient(ctx, u.ClientID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to delete client", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, client.JSON()))
+}
+
+// UpdateClient swaggerdoc
+//
+//	@Summary		(Partially) update a client
+//	@Description	The body-values are optional, only send the ones you want to update
+//	@ID				api-client-update
+//	@Tags			API-v2
+//
+//	@Param			uid			path		string	true	"UserID"
+//	@Param			cid			path		string	true	"ClientID"
+//
+//	@Param			clientname	body		string	false	"Change the clientname (send an empty string to clear it)"
+//	@Param			pro_token	body		string	false	"Send a verification of premium purchase"
+//
+//	@Success		200			{object}	models.ClientJSON
+//	@Failure		400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401			{object}	ginresp.apiError	"client is not authorized / has missing permissions"
+//	@Failure		404			{object}	ginresp.apiError	"client not found"
+//	@Failure		500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid}/clients/{cid} [PATCH]
+func (h APIHandler) UpdateClient(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID   models.UserID   `uri:"uid" binding:"entityid"`
+		ClientID models.ClientID `uri:"cid" binding:"entityid"`
+	}
+	type body struct {
+		FCMToken     *string `json:"fcm_token"`
+		AgentModel   *string `json:"agent_model"`
+		AgentVersion *string `json:"agent_version"`
+	}
+
+	var u uri
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	client, err := h.database.GetClient(ctx, u.UserID, u.ClientID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.CLIENT_NOT_FOUND, "Client not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query client", err)
+	}
+
+	if b.FCMToken != nil && *b.FCMToken != client.FCMToken {
+
+		err = h.database.DeleteClientsByFCM(ctx, *b.FCMToken)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to delete existing clients in db", err)
+		}
+
+		err = h.database.UpdateClientFCMToken(ctx, u.ClientID, *b.FCMToken)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update client", err)
+		}
+	}
+
+	if b.AgentModel != nil {
+		err = h.database.UpdateClientAgentModel(ctx, u.ClientID, *b.AgentModel)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update client", err)
+		}
+	}
+
+	if b.AgentVersion != nil {
+		err = h.database.UpdateClientAgentVersion(ctx, u.ClientID, *b.AgentVersion)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update client", err)
+		}
+	}
+
+	client, err = h.database.GetClient(ctx, u.UserID, u.ClientID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query (updated) client", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, client.JSON()))
+}

scnserver/api/handler/apiKeyToken.go

@@ -0,0 +1,323 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"database/sql"
+	"errors"
+	"github.com/gin-gonic/gin"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"net/http"
+)
+
+// ListUserKeys swaggerdoc
+//
+//	@Summary		List keys of the user
+//	@Description	The request must be done with an ADMIN key, the returned keys are without their token.
+//	@ID				api-tokenkeys-list
+//	@Tags			API-v2
+//
+//	@Param			uid	path		string	true	"UserID"
+//
+//	@Success		200	{object}	handler.ListUserKeys.response
+//	@Failure		400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		404	{object}	ginresp.apiError	"message not found"
+//	@Failure		500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid}/keys [GET]
+func (h APIHandler) ListUserKeys(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type response struct {
+		Keys []models.KeyTokenJSON `json:"keys"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	toks, err := h.database.ListKeyTokens(ctx, u.UserID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query keys", err)
+	}
+
+	res := langext.ArrMap(toks, func(v models.KeyToken) models.KeyTokenJSON { return v.JSON() })
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{Keys: res}))
+}
+
+// GetUserKey swaggerdoc
+//
+//	@Summary		Get a single key
+//	@Description	The request must be done with an ADMIN key, the returned key does not include its token.
+//	@ID				api-tokenkeys-get
+//	@Tags			API-v2
+//
+//	@Param			uid	path		string	true	"UserID"
+//	@Param			kid	path		string	true	"TokenKeyID"
+//
+//	@Success		200	{object}	models.KeyTokenJSON
+//	@Failure		400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		404	{object}	ginresp.apiError	"message not found"
+//	@Failure		500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid}/keys/{kid} [GET]
+func (h APIHandler) GetUserKey(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID     `uri:"uid" binding:"entityid"`
+		KeyID  models.KeyTokenID `uri:"kid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	keytoken, err := h.database.GetKeyToken(ctx, u.UserID, u.KeyID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.KEY_NOT_FOUND, "Key not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query client", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, keytoken.JSON()))
+}
+
+// UpdateUserKey swaggerdoc
+//
+//	@Summary	Update a key
+//	@ID			api-tokenkeys-update
+//	@Tags		API-v2
+//
+//	@Param		uid			path		string						true	"UserID"
+//	@Param		kid			path		string						true	"TokenKeyID"
+//
+//	@Param		post_body	body		handler.UpdateUserKey.body	false	" "
+//
+//	@Success	200			{object}	models.KeyTokenJSON
+//	@Failure	400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404			{object}	ginresp.apiError	"message not found"
+//	@Failure	500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/keys/{kid} [PATCH]
+func (h APIHandler) UpdateUserKey(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID     `uri:"uid" binding:"entityid"`
+		KeyID  models.KeyTokenID `uri:"kid" binding:"entityid"`
+	}
+	type body struct {
+		Name        *string             `json:"name"`
+		AllChannels *bool               `json:"all_channels"`
+		Channels    *[]models.ChannelID `json:"channels"`
+		Permissions *string             `json:"permissions"`
+	}
+
+	var u uri
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	keytoken, err := h.database.GetKeyToken(ctx, u.UserID, u.KeyID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.KEY_NOT_FOUND, "Key not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query client", err)
+	}
+
+	if b.Name != nil {
+		err := h.database.UpdateKeyTokenName(ctx, u.KeyID, *b.Name)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update name", err)
+		}
+		keytoken.Name = *b.Name
+	}
+
+	if b.Permissions != nil {
+		if keytoken.KeyTokenID == *ctx.GetPermissionKeyTokenID() {
+			return ginresp.APIError(g, 400, apierr.CANNOT_SELFUPDATE_KEY, "Cannot update the currently used key", err)
+		}
+
+		permlist := models.ParseTokenPermissionList(*b.Permissions)
+		err := h.database.UpdateKeyTokenPermissions(ctx, u.KeyID, permlist)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update permissions", err)
+		}
+		keytoken.Permissions = permlist
+	}
+
+	if b.AllChannels != nil {
+		if keytoken.KeyTokenID == *ctx.GetPermissionKeyTokenID() {
+			return ginresp.APIError(g, 400, apierr.CANNOT_SELFUPDATE_KEY, "Cannot update the currently used key", err)
+		}
+
+		err := h.database.UpdateKeyTokenAllChannels(ctx, u.KeyID, *b.AllChannels)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update all_channels", err)
+		}
+		keytoken.AllChannels = *b.AllChannels
+	}
+
+	if b.Channels != nil {
+		if keytoken.KeyTokenID == *ctx.GetPermissionKeyTokenID() {
+			return ginresp.APIError(g, 400, apierr.CANNOT_SELFUPDATE_KEY, "Cannot update the currently used key", err)
+		}
+
+		err := h.database.UpdateKeyTokenChannels(ctx, u.KeyID, *b.Channels)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update channels", err)
+		}
+		keytoken.Channels = *b.Channels
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, keytoken.JSON()))
+}
+
+// CreateUserKey swaggerdoc
+//
+//	@Summary	Create a new key
+//	@ID			api-tokenkeys-create
+//	@Tags		API-v2
+//
+//	@Param		uid			path		string						true	"UserID"
+//
+//	@Param		post_body	body		handler.CreateUserKey.body	false	" "
+//
+//	@Success	200			{object}	models.KeyTokenJSON
+//	@Failure	400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404			{object}	ginresp.apiError	"message not found"
+//	@Failure	500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/keys [POST]
+func (h APIHandler) CreateUserKey(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type body struct {
+		Name        string              `json:"name"         binding:"required"`
+		Permissions string              `json:"permissions"  binding:"required"`
+		AllChannels *bool               `json:"all_channels"`
+		Channels    *[]models.ChannelID `json:"channels"`
+	}
+
+	var u uri
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	channels := langext.Coalesce(b.Channels, make([]models.ChannelID, 0))
+
+	var allChan bool
+	if b.AllChannels == nil && b.Channels != nil {
+		allChan = false
+	} else if b.AllChannels == nil && b.Channels == nil {
+		allChan = true
+	} else {
+		allChan = *b.AllChannels
+	}
+
+	for _, c := range channels {
+		if err := c.Valid(); err != nil {
+			return ginresp.APIError(g, 400, apierr.INVALID_BODY_PARAM, "Invalid ChannelID", err)
+		}
+	}
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	token := h.app.GenerateRandomAuthKey()
+
+	perms := models.ParseTokenPermissionList(b.Permissions)
+
+	keytok, err := h.database.CreateKeyToken(ctx, b.Name, *ctx.GetPermissionUserID(), allChan, channels, perms, token)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create keytoken in db", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, keytok.JSON().WithToken(token)))
+}
+
+// DeleteUserKey swaggerdoc
+//
+//	@Summary		Delete a key
+//	@Description	Cannot be used to delete the key used in the request itself
+//	@ID				api-tokenkeys-delete
+//	@Tags			API-v2
+//
+//	@Param			uid	path		string	true	"UserID"
+//	@Param			kid	path		string	true	"TokenKeyID"
+//
+//	@Success		200	{object}	models.KeyTokenJSON
+//	@Failure		400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		404	{object}	ginresp.apiError	"message not found"
+//	@Failure		500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid}/keys/{kid} [DELETE]
+func (h APIHandler) DeleteUserKey(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID     `uri:"uid" binding:"entityid"`
+		KeyID  models.KeyTokenID `uri:"kid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	client, err := h.database.GetKeyToken(ctx, u.UserID, u.KeyID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.KEY_NOT_FOUND, "Key not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query client", err)
+	}
+
+	if u.KeyID == *ctx.GetPermissionKeyTokenID() {
+		return ginresp.APIError(g, 400, apierr.CANNOT_SELFDELETE_KEY, "Cannot delete the currently used key", err)
+	}
+
+	err = h.database.DeleteKeyToken(ctx, u.KeyID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to delete client", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, client.JSON()))
+}

scnserver/api/handler/apiMessage.go

@@ -0,0 +1,286 @@
+package handler
+
+import (
+	"database/sql"
+	"errors"
+	"net/http"
+	"strings"
+	"time"
+
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	ct "blackforestbytes.com/simplecloudnotifier/db/cursortoken"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"github.com/gin-gonic/gin"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/mathext"
+)
+
+// ListMessages swaggerdoc
+//
+//	@Summary		List all (subscribed) messages
+//	@Description	The next_page_token is an opaque token, the special value "@start" (or empty-string) is the beginning and "@end" is the end
+//	@Description	Simply start the pagination without a next_page_token and get the next page by calling this endpoint with the returned next_page_token of the last query
+//	@Description	If there are no more entries the token "@end" will be returned
+//	@Description	By default we return long messages with a trimmed body, if trimmed=false is supplied we return full messages (this reduces the max page_size)
+//	@ID				api-messages-list
+//	@Tags			API-v2
+//
+//	@Param			query_data	query		handler.ListMessages.query	false	" "
+//
+//	@Success		200			{object}	handler.ListMessages.response
+//	@Failure		400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/messages [GET]
+func (h APIHandler) ListMessages(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		PageSize      *int     `json:"page_size"       form:"page_size"`
+		NextPageToken *string  `json:"next_page_token" form:"next_page_token"`
+		Filter        *string  `json:"filter"          form:"filter"`
+		Trimmed       *bool    `json:"trimmed"         form:"trimmed"`
+		Channels      []string `json:"channel"         form:"channel"`
+		ChannelIDs    []string `json:"channel_id"      form:"channel_id"`
+		Senders       []string `json:"sender"          form:"sender"`
+		TimeBefore    *string  `json:"before"          form:"before"` // RFC3339
+		TimeAfter     *string  `json:"after"           form:"after"`  // RFC3339
+		Priority      []int    `json:"priority"        form:"priority"`
+		KeyTokens     []string `json:"used_key"        form:"used_key"`
+	}
+	type response struct {
+		Messages      []models.MessageJSON `json:"messages"`
+		NextPageToken string               `json:"next_page_token"`
+		PageSize      int                  `json:"page_size"`
+	}
+
+	var q query
+	ctx, errResp := h.app.StartRequest(g, nil, &q, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	trimmed := langext.Coalesce(q.Trimmed, true)
+
+	maxPageSize := langext.Conditional(trimmed, 16, 256)
+
+	pageSize := mathext.Clamp(langext.Coalesce(q.PageSize, 64), 1, maxPageSize)
+
+	if permResp := ctx.CheckPermissionSelfAllMessagesRead(); permResp != nil {
+		return *permResp
+	}
+
+	userid := *ctx.GetPermissionUserID()
+
+	tok, err := ct.Decode(langext.Coalesce(q.NextPageToken, ""))
+	if err != nil {
+		return ginresp.APIError(g, 400, apierr.PAGETOKEN_ERROR, "Failed to decode next_page_token", err)
+	}
+
+	err = h.database.UpdateUserLastRead(ctx, userid)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update last-read", err)
+	}
+
+	filter := models.MessageFilter{
+		ConfirmedSubscriptionBy: langext.Ptr(userid),
+	}
+
+	if q.Filter != nil && strings.TrimSpace(*q.Filter) != "" {
+		filter.SearchString = langext.Ptr([]string{strings.TrimSpace(*q.Filter)})
+	}
+
+	if len(q.Channels) != 0 {
+		filter.ChannelNameCS = langext.Ptr(q.Channels)
+	}
+
+	if len(q.ChannelIDs) != 0 {
+		cids := make([]models.ChannelID, 0, len(q.ChannelIDs))
+		for _, v := range q.ChannelIDs {
+			cid := models.ChannelID(v)
+			if err = cid.Valid(); err != nil {
+				return ginresp.APIError(g, 400, apierr.BINDFAIL_QUERY_PARAM, "Invalid channel-id", err)
+			}
+			cids = append(cids, cid)
+		}
+		filter.ChannelID = &cids
+	}
+
+	if len(q.Senders) != 0 {
+		filter.SenderNameCS = langext.Ptr(q.Senders)
+	}
+
+	if q.TimeBefore != nil {
+		t0, err := time.Parse(time.RFC3339, *q.TimeBefore)
+		if err != nil {
+			return ginresp.APIError(g, 400, apierr.BINDFAIL_QUERY_PARAM, "Invalid before-time", err)
+		}
+		filter.TimestampCoalesceBefore = &t0
+	}
+
+	if q.TimeAfter != nil {
+		t0, err := time.Parse(time.RFC3339, *q.TimeAfter)
+		if err != nil {
+			return ginresp.APIError(g, 400, apierr.BINDFAIL_QUERY_PARAM, "Invalid after-time", err)
+		}
+		filter.TimestampCoalesceAfter = &t0
+	}
+
+	if len(q.Priority) != 0 {
+		filter.Priority = langext.Ptr(q.Priority)
+	}
+
+	if len(q.KeyTokens) != 0 {
+		tids := make([]models.KeyTokenID, 0, len(q.KeyTokens))
+		for _, v := range q.KeyTokens {
+			tid := models.KeyTokenID(v)
+			if err = tid.Valid(); err != nil {
+				return ginresp.APIError(g, 400, apierr.BINDFAIL_QUERY_PARAM, "Invalid keytoken-id", err)
+			}
+			tids = append(tids, tid)
+		}
+		filter.UsedKeyID = &tids
+	}
+
+	messages, npt, err := h.database.ListMessages(ctx, filter, &pageSize, tok)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query messages", err)
+	}
+
+	var res []models.MessageJSON
+	if trimmed {
+		res = langext.ArrMap(messages, func(v models.Message) models.MessageJSON { return v.TrimmedJSON() })
+	} else {
+		res = langext.ArrMap(messages, func(v models.Message) models.MessageJSON { return v.FullJSON() })
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{Messages: res, NextPageToken: npt.Token(), PageSize: pageSize}))
+}
+
+// GetMessage swaggerdoc
+//
+//	@Summary		Get a single message (untrimmed)
+//	@Description	The user must either own the message and request the resource with the READ or ADMIN Key
+//	@Description	Or the user must subscribe to the corresponding channel (and be confirmed) and request the resource with the READ or ADMIN Key
+//	@Description	The returned message is never trimmed
+//	@ID				api-messages-get
+//	@Tags			API-v2
+//
+//	@Param			mid	path		string	true	"MessageID"
+//
+//	@Success		200	{object}	models.MessageJSON
+//	@Failure		400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		404	{object}	ginresp.apiError	"message not found"
+//	@Failure		500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/messages/{mid} [GET]
+func (h APIHandler) GetMessage(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		MessageID models.MessageID `uri:"mid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionAny(); permResp != nil {
+		return *permResp
+	}
+
+	msg, err := h.database.GetMessage(ctx, u.MessageID, false)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.MESSAGE_NOT_FOUND, "message not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query message", err)
+	}
+
+	// either we have direct read permissions (it is our message + read/admin key)
+	// or we subscribe (+confirmed) to the channel and have read/admin key
+
+	if ctx.CheckPermissionMessageRead(msg) {
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, msg.FullJSON()))
+	}
+
+	if uid := ctx.GetPermissionUserID(); uid != nil && ctx.CheckPermissionUserRead(*uid) == nil {
+		sub, err := h.database.GetSubscriptionBySubscriber(ctx, *uid, msg.ChannelID)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query subscription", err)
+		}
+		if sub == nil {
+			// not subbed
+			return ginresp.APIError(g, 401, apierr.USER_AUTH_FAILED, "You are not authorized for this action", nil)
+		}
+		if !sub.Confirmed {
+			// sub not confirmed
+			return ginresp.APIError(g, 401, apierr.USER_AUTH_FAILED, "You are not authorized for this action", nil)
+		}
+
+		// => perm okay
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, msg.FullJSON()))
+	}
+
+	return ginresp.APIError(g, 401, apierr.USER_AUTH_FAILED, "You are not authorized for this action", nil)
+}
+
+// DeleteMessage swaggerdoc
+//
+//	@Summary		Delete a single message
+//	@Description	The user must own the message and request the resource with the ADMIN Key
+//	@ID				api-messages-delete
+//	@Tags			API-v2
+//
+//	@Param			mid	path		string	true	"MessageID"
+//
+//	@Success		200	{object}	models.MessageJSON
+//	@Failure		400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		404	{object}	ginresp.apiError	"message not found"
+//	@Failure		500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/messages/{mid} [DELETE]
+func (h APIHandler) DeleteMessage(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		MessageID models.MessageID `uri:"mid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionAny(); permResp != nil {
+		return *permResp
+	}
+
+	msg, err := h.database.GetMessage(ctx, u.MessageID, false)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.MESSAGE_NOT_FOUND, "message not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query message", err)
+	}
+
+	if !ctx.CheckPermissionMessageDelete(msg) {
+		return ginresp.APIError(g, 401, apierr.USER_AUTH_FAILED, "You are not authorized for this action", nil)
+	}
+
+	err = h.database.DeleteMessage(ctx, msg.MessageID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to delete message", err)
+	}
+
+	err = h.database.CancelPendingDeliveries(ctx, msg.MessageID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to cancel deliveries", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, msg.FullJSON()))
+}

scnserver/api/handler/apiSubscription.go

@@ -0,0 +1,459 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"database/sql"
+	"errors"
+	"github.com/gin-gonic/gin"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"net/http"
+	"strings"
+)
+
+// ListUserSubscriptions swaggerdoc
+//
+//	@Summary		List all subscriptions of a user (incoming/owned)
+//
+//	@Description	The possible values for 'direction' are:
+//	@Description	- "outgoing"       Subscriptions with the user as subscriber (= subscriptions he can use to read channels)
+//	@Description	- "incoming"       Subscriptions to channels of this user (= incoming subscriptions and subscription requests)
+//	@Description	- "both"           Combines "outgoing" and "incoming" (default)
+//	@Description
+//	@Description	The possible values for 'confirmation' are:
+//	@Description	- "confirmed"      Confirmed (active) subscriptions
+//	@Description	- "unconfirmed"    Unconfirmed (pending) subscriptions
+//	@Description	- "all"            Combines "confirmed" and "unconfirmed" (default)
+//	@Description
+//	@Description	The possible values for 'external' are:
+//	@Description	- "true"           Subscriptions with subscriber_user_id != channel_owner_user_id  (subscriptions from other users)
+//	@Description	- "false"          Subscriptions with subscriber_user_id == channel_owner_user_id  (subscriptions from this user to his own channels)
+//	@Description	- "all"            Combines "external" and "internal" (default)
+//	@Description
+//	@Description	The `subscriber_user_id` parameter can be used to additionally filter the subscriber_user_id (return subscribtions from a specific user)
+//	@Description
+//	@Description	The `channel_owner_user_id` parameter can be used to additionally filter the channel_owner_user_id (return subscribtions to a specific user)
+//
+//	@ID				api-user-subscriptions-list
+//	@Tags			API-v2
+//
+//	@Param			uid			path		string	true	"UserID"
+//	@Param			selector	query		string	true	"Filter subscriptions (default: outgoing_all)"	Enums(outgoing_all, outgoing_confirmed, outgoing_unconfirmed, incoming_all, incoming_confirmed, incoming_unconfirmed)
+//
+//	@Success		200			{object}	handler.ListUserSubscriptions.response
+//	@Failure		400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid}/subscriptions [GET]
+func (h APIHandler) ListUserSubscriptions(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type query struct {
+		Direction          *string        `json:"direction"             form:"direction"                enums:"incoming,outgoing,both"`
+		Confirmation       *string        `json:"confirmation"          form:"confirmation"             enums:"confirmed,unconfirmed,all"`
+		External           *string        `json:"external"              form:"external"                 enums:"true,false,all"`
+		SubscriberUserID   *models.UserID `json:"subscriber_user_id"    form:"subscriber_user_id"`
+		ChannelOwnerUserID *models.UserID `json:"channel_owner_user_id" form:"channel_owner_user_id"`
+	}
+	type response struct {
+		Subscriptions []models.SubscriptionJSON `json:"subscriptions"`
+	}
+
+	var u uri
+	var q query
+	ctx, errResp := h.app.StartRequest(g, &u, &q, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserRead(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	filter := models.SubscriptionFilter{}
+	filter.AnyUserID = langext.Ptr(u.UserID)
+
+	if q.Direction != nil {
+		if strings.EqualFold(*q.Direction, "incoming") {
+			filter.ChannelOwnerUserID = langext.Ptr([]models.UserID{u.UserID})
+		} else if strings.EqualFold(*q.Direction, "outgoing") {
+			filter.SubscriberUserID = langext.Ptr([]models.UserID{u.UserID})
+		} else if strings.EqualFold(*q.Direction, "both") {
+			// both
+		} else {
+			return ginresp.APIError(g, 400, apierr.BINDFAIL_QUERY_PARAM, "Invalid value for param 'direction'", nil)
+		}
+	}
+
+	if q.Confirmation != nil {
+		if strings.EqualFold(*q.Confirmation, "confirmed") {
+			filter.Confirmed = langext.PTrue
+		} else if strings.EqualFold(*q.Confirmation, "unconfirmed") {
+			filter.Confirmed = langext.PFalse
+		} else if strings.EqualFold(*q.Confirmation, "all") {
+			// both
+		} else {
+			return ginresp.APIError(g, 400, apierr.BINDFAIL_QUERY_PARAM, "Invalid value for param 'confirmation'", nil)
+		}
+	}
+
+	if q.External != nil {
+		if strings.EqualFold(*q.External, "true") {
+			filter.SubscriberIsChannelOwner = langext.PFalse
+		} else if strings.EqualFold(*q.External, "false") {
+			filter.SubscriberIsChannelOwner = langext.PTrue
+		} else if strings.EqualFold(*q.External, "all") {
+			// both
+		} else {
+			return ginresp.APIError(g, 400, apierr.BINDFAIL_QUERY_PARAM, "Invalid value for param 'external'", nil)
+		}
+	}
+
+	if q.SubscriberUserID != nil {
+		filter.SubscriberUserID2 = langext.Ptr([]models.UserID{*q.SubscriberUserID})
+	}
+
+	if q.ChannelOwnerUserID != nil {
+		filter.ChannelOwnerUserID2 = langext.Ptr([]models.UserID{*q.ChannelOwnerUserID})
+	}
+
+	res, err := h.database.ListSubscriptions(ctx, filter)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query subscriptions", err)
+	}
+
+	jsonres := langext.ArrMap(res, func(v models.Subscription) models.SubscriptionJSON { return v.JSON() })
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{Subscriptions: jsonres}))
+}
+
+// ListChannelSubscriptions swaggerdoc
+//
+//	@Summary	List all subscriptions of a channel
+//	@ID			api-chan-subscriptions-list
+//	@Tags		API-v2
+//
+//	@Param		uid	path		string	true	"UserID"
+//	@Param		cid	path		string	true	"ChannelID"
+//
+//	@Success	200	{object}	handler.ListChannelSubscriptions.response
+//	@Failure	400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404	{object}	ginresp.apiError	"channel not found"
+//	@Failure	500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/channels/{cid}/subscriptions [GET]
+func (h APIHandler) ListChannelSubscriptions(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID    models.UserID    `uri:"uid" binding:"entityid"`
+		ChannelID models.ChannelID `uri:"cid" binding:"entityid"`
+	}
+	type response struct {
+		Subscriptions []models.SubscriptionJSON `json:"subscriptions"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserRead(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	_, err := h.database.GetChannel(ctx, u.UserID, u.ChannelID, true)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.CHANNEL_NOT_FOUND, "Channel not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channel", err)
+	}
+
+	clients, err := h.database.ListSubscriptions(ctx, models.SubscriptionFilter{AnyUserID: langext.Ptr(u.UserID), ChannelID: langext.Ptr([]models.ChannelID{u.ChannelID})})
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query subscriptions", err)
+	}
+
+	res := langext.ArrMap(clients, func(v models.Subscription) models.SubscriptionJSON { return v.JSON() })
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{Subscriptions: res}))
+}
+
+// GetSubscription swaggerdoc
+//
+//	@Summary	Get a single subscription
+//	@ID			api-subscriptions-get
+//	@Tags		API-v2
+//
+//	@Param		uid	path		string	true	"UserID"
+//	@Param		sid	path		string	true	"SubscriptionID"
+//
+//	@Success	200	{object}	models.SubscriptionJSON
+//	@Failure	400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404	{object}	ginresp.apiError	"subscription not found"
+//	@Failure	500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/subscriptions/{sid} [GET]
+func (h APIHandler) GetSubscription(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID         models.UserID         `uri:"uid" binding:"entityid"`
+		SubscriptionID models.SubscriptionID `uri:"sid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserRead(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	subscription, err := h.database.GetSubscription(ctx, u.SubscriptionID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.SUBSCRIPTION_NOT_FOUND, "Subscription not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query subscription", err)
+	}
+	if subscription.SubscriberUserID != u.UserID && subscription.ChannelOwnerUserID != u.UserID {
+		return ginresp.APIError(g, 404, apierr.SUBSCRIPTION_USER_MISMATCH, "Subscription not found", nil)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, subscription.JSON()))
+}
+
+// CancelSubscription swaggerdoc
+//
+//	@Summary	Cancel (delete) subscription
+//	@ID			api-subscriptions-delete
+//	@Tags		API-v2
+//
+//	@Param		uid	path		string	true	"UserID"
+//	@Param		sid	path		string	true	"SubscriptionID"
+//
+//	@Success	200	{object}	models.SubscriptionJSON
+//	@Failure	400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404	{object}	ginresp.apiError	"subscription not found"
+//	@Failure	500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/subscriptions/{sid} [DELETE]
+func (h APIHandler) CancelSubscription(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID         models.UserID         `uri:"uid" binding:"entityid"`
+		SubscriptionID models.SubscriptionID `uri:"sid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	subscription, err := h.database.GetSubscription(ctx, u.SubscriptionID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.SUBSCRIPTION_NOT_FOUND, "Subscription not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query subscription", err)
+	}
+	if subscription.SubscriberUserID != u.UserID && subscription.ChannelOwnerUserID != u.UserID {
+		return ginresp.APIError(g, 404, apierr.SUBSCRIPTION_USER_MISMATCH, "Subscription not found", nil)
+	}
+
+	err = h.database.DeleteSubscription(ctx, u.SubscriptionID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to delete subscription", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, subscription.JSON()))
+}
+
+// CreateSubscription swaggerdoc
+//
+//	@Summary		Create/Request a subscription
+//	@Description	Either [channel_owner_user_id, channel_internal_name] or [channel_id] must be supplied in the request body
+//	@ID				api-subscriptions-create
+//	@Tags			API-v2
+//
+//	@Param			uid			path		string								true	"UserID"
+//	@Param			query_data	query		handler.CreateSubscription.query	false	" "
+//	@Param			post_data	body		handler.CreateSubscription.body		false	" "
+//
+//	@Success		200			{object}	models.SubscriptionJSON
+//	@Failure		400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid}/subscriptions [POST]
+func (h APIHandler) CreateSubscription(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type body struct {
+		ChannelOwnerUserID  *models.UserID    `json:"channel_owner_user_id" binding:"entityid"`
+		ChannelInternalName *string           `json:"channel_internal_name"`
+		ChannelID           *models.ChannelID `json:"channel_id" binding:"entityid"`
+	}
+	type query struct {
+		ChanSubscribeKey *string `json:"chan_subscribe_key" form:"chan_subscribe_key"`
+	}
+
+	var u uri
+	var q query
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, &q, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	var channel models.Channel
+
+	if b.ChannelOwnerUserID != nil && b.ChannelInternalName != nil && b.ChannelID == nil {
+
+		channelInternalName := h.app.NormalizeChannelInternalName(*b.ChannelInternalName)
+
+		outchannel, err := h.database.GetChannelByName(ctx, *b.ChannelOwnerUserID, channelInternalName)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channel", err)
+		}
+		if outchannel == nil {
+			return ginresp.APIError(g, 400, apierr.CHANNEL_NOT_FOUND, "Channel not found", err)
+		}
+
+		channel = *outchannel
+
+	} else if b.ChannelOwnerUserID == nil && b.ChannelInternalName == nil && b.ChannelID != nil {
+
+		outchannel, err := h.database.GetChannelByID(ctx, *b.ChannelID)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query channel", err)
+		}
+		if outchannel == nil {
+			return ginresp.APIError(g, 400, apierr.CHANNEL_NOT_FOUND, "Channel not found", err)
+		}
+
+		channel = *outchannel
+
+	} else {
+
+		return ginresp.APIError(g, 400, apierr.INVALID_BODY_PARAM, "Must either supply [channel_owner_user_id, channel_internal_name] or [channel_id]", nil)
+
+	}
+
+	if channel.OwnerUserID != u.UserID && (q.ChanSubscribeKey == nil || *q.ChanSubscribeKey != channel.SubscribeKey) {
+		return ginresp.APIError(g, 401, apierr.USER_AUTH_FAILED, "You are not authorized for this action", nil)
+	}
+
+	existingSub, err := h.database.GetSubscriptionBySubscriber(ctx, u.UserID, channel.ChannelID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query existing subscription", err)
+	}
+	if existingSub != nil {
+		if !existingSub.Confirmed && channel.OwnerUserID == u.UserID {
+			err = h.database.UpdateSubscriptionConfirmed(ctx, existingSub.SubscriptionID, true)
+			if err != nil {
+				return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update subscription", err)
+			}
+			existingSub.Confirmed = true
+		}
+
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, existingSub.JSON()))
+	}
+
+	sub, err := h.database.CreateSubscription(ctx, u.UserID, channel, channel.OwnerUserID == u.UserID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create subscription", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, sub.JSON()))
+}
+
+// UpdateSubscription swaggerdoc
+//
+//	@Summary	Update a subscription (e.g. confirm)
+//	@ID			api-subscriptions-update
+//	@Tags		API-v2
+//
+//	@Param		uid			path		string							true	"UserID"
+//	@Param		sid			path		string							true	"SubscriptionID"
+//	@Param		post_data	body		handler.UpdateSubscription.body	false	" "
+//
+//	@Success	200			{object}	models.SubscriptionJSON
+//	@Failure	400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404			{object}	ginresp.apiError	"subscription not found"
+//	@Failure	500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid}/subscriptions/{sid} [PATCH]
+func (h APIHandler) UpdateSubscription(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID         models.UserID         `uri:"uid" binding:"entityid"`
+		SubscriptionID models.SubscriptionID `uri:"sid" binding:"entityid"`
+	}
+	type body struct {
+		Confirmed *bool `form:"confirmed"`
+	}
+
+	var u uri
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	userid := *ctx.GetPermissionUserID()
+
+	subscription, err := h.database.GetSubscription(ctx, u.SubscriptionID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.SUBSCRIPTION_NOT_FOUND, "Subscription not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query subscription", err)
+	}
+	if subscription.SubscriberUserID != u.UserID && subscription.ChannelOwnerUserID != u.UserID {
+		return ginresp.APIError(g, 404, apierr.SUBSCRIPTION_USER_MISMATCH, "Subscription not found", nil)
+	}
+
+	if b.Confirmed != nil {
+		if subscription.ChannelOwnerUserID != userid {
+			return ginresp.APIError(g, 401, apierr.USER_AUTH_FAILED, "You are not authorized for this action", nil)
+		}
+		err = h.database.UpdateSubscriptionConfirmed(ctx, u.SubscriptionID, *b.Confirmed)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update subscription", err)
+		}
+	}
+
+	subscription, err = h.database.GetSubscription(ctx, u.SubscriptionID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query subscription", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, subscription.JSON()))
+}

scnserver/api/handler/apiUser.go

@@ -0,0 +1,267 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"database/sql"
+	"errors"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog/log"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"net/http"
+)
+
+// CreateUser swaggerdoc
+//
+//	@Summary	Create a new user
+//	@ID			api-user-create
+//	@Tags		API-v2
+//
+//	@Param		post_body	body		handler.CreateUser.body	false	" "
+//
+//	@Success	200			{object}	models.UserJSONWithClientsAndKeys
+//	@Failure	400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users [POST]
+func (h APIHandler) CreateUser(g *gin.Context) ginresp.HTTPResponse {
+	type body struct {
+		FCMToken     string  `json:"fcm_token"`
+		ProToken     *string `json:"pro_token"`
+		Username     *string `json:"username"`
+		AgentModel   string  `json:"agent_model"`
+		AgentVersion string  `json:"agent_version"`
+		ClientType   string  `json:"client_type"`
+		NoClient     bool    `json:"no_client"`
+	}
+
+	var b body
+	ctx, errResp := h.app.StartRequest(g, nil, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	var clientType models.ClientType
+	if !b.NoClient {
+		if b.FCMToken == "" {
+			return ginresp.APIError(g, 400, apierr.INVALID_CLIENTTYPE, "Missing FCMToken", nil)
+		}
+		if b.AgentVersion == "" {
+			return ginresp.APIError(g, 400, apierr.INVALID_CLIENTTYPE, "Missing AgentVersion", nil)
+		}
+		if b.ClientType == "" {
+			return ginresp.APIError(g, 400, apierr.INVALID_CLIENTTYPE, "Missing ClientType", nil)
+		}
+		if b.ClientType == string(models.ClientTypeAndroid) {
+			clientType = models.ClientTypeAndroid
+		} else if b.ClientType == string(models.ClientTypeIOS) {
+			clientType = models.ClientTypeIOS
+		} else {
+			return ginresp.APIError(g, 400, apierr.BINDFAIL_BODY_PARAM, "Invalid ClientType", nil)
+		}
+	}
+
+	if b.ProToken != nil {
+		ptok, err := h.app.VerifyProToken(ctx, *b.ProToken)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.FAILED_VERIFY_PRO_TOKEN, "Failed to query purchase status", err)
+		}
+
+		if !ptok {
+			return ginresp.APIError(g, 400, apierr.INVALID_PRO_TOKEN, "Purchase token could not be verified", nil)
+		}
+	}
+
+	readKey := h.app.GenerateRandomAuthKey()
+	sendKey := h.app.GenerateRandomAuthKey()
+	adminKey := h.app.GenerateRandomAuthKey()
+
+	err := h.database.ClearFCMTokens(ctx, b.FCMToken)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to clear existing fcm tokens", err)
+	}
+
+	if b.ProToken != nil {
+		err := h.database.ClearProTokens(ctx, *b.ProToken)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to clear existing pro tokens", err)
+		}
+	}
+
+	username := b.Username
+	if username != nil {
+		username = langext.Ptr(h.app.NormalizeUsername(*username))
+	}
+
+	userobj, err := h.database.CreateUser(ctx, b.ProToken, username)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create user in db", err)
+	}
+
+	_, err = h.database.CreateKeyToken(ctx, "AdminKey (default)", userobj.UserID, true, make([]models.ChannelID, 0), models.TokenPermissionList{models.PermAdmin}, adminKey)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create admin-key in db", err)
+	}
+
+	_, err = h.database.CreateKeyToken(ctx, "SendKey (default)", userobj.UserID, true, make([]models.ChannelID, 0), models.TokenPermissionList{models.PermChannelSend}, sendKey)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create send-key in db", err)
+	}
+
+	_, err = h.database.CreateKeyToken(ctx, "ReadKey (default)", userobj.UserID, true, make([]models.ChannelID, 0), models.TokenPermissionList{models.PermUserRead, models.PermChannelRead}, readKey)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create read-key in db", err)
+	}
+
+	log.Info().Msg(fmt.Sprintf("Sucessfully created new user %s (client: %v)", userobj.UserID, b.NoClient))
+
+	if b.NoClient {
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, userobj.JSONWithClients(make([]models.Client, 0), adminKey, sendKey, readKey)))
+	} else {
+		err := h.database.DeleteClientsByFCM(ctx, b.FCMToken)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to delete existing clients in db", err)
+		}
+
+		client, err := h.database.CreateClient(ctx, userobj.UserID, clientType, b.FCMToken, b.AgentModel, b.AgentVersion)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create client in db", err)
+		}
+
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, userobj.JSONWithClients([]models.Client{client}, adminKey, sendKey, readKey)))
+	}
+
+}
+
+// GetUser swaggerdoc
+//
+//	@Summary	Get a user
+//	@ID			api-user-get
+//	@Tags		API-v2
+//
+//	@Param		uid	path		string	true	"UserID"
+//
+//	@Success	200	{object}	models.UserJSON
+//	@Failure	400	{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure	401	{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure	404	{object}	ginresp.apiError	"user not found"
+//	@Failure	500	{object}	ginresp.apiError	"internal server error"
+//
+//	@Router		/api/v2/users/{uid} [GET]
+func (h APIHandler) GetUser(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+
+	var u uri
+	ctx, errResp := h.app.StartRequest(g, &u, nil, nil, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserRead(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	user, err := h.database.GetUser(ctx, u.UserID)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.APIError(g, 404, apierr.USER_NOT_FOUND, "User not found", err)
+	}
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query user", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, user.JSON()))
+}
+
+// UpdateUser swaggerdoc
+//
+//	@Summary		(Partially) update a user
+//	@Description	The body-values are optional, only send the ones you want to update
+//	@ID				api-user-update
+//	@Tags			API-v2
+//
+//	@Param			uid			path		string	true	"UserID"
+//
+//	@Param			username	body		string	false	"Change the username (send an empty string to clear it)"
+//	@Param			pro_token	body		string	false	"Send a verification of premium purchase"
+//
+//	@Success		200			{object}	models.UserJSON
+//	@Failure		400			{object}	ginresp.apiError	"supplied values/parameters cannot be parsed / are invalid"
+//	@Failure		401			{object}	ginresp.apiError	"user is not authorized / has missing permissions"
+//	@Failure		404			{object}	ginresp.apiError	"user not found"
+//	@Failure		500			{object}	ginresp.apiError	"internal server error"
+//
+//	@Router			/api/v2/users/{uid} [PATCH]
+func (h APIHandler) UpdateUser(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		UserID models.UserID `uri:"uid" binding:"entityid"`
+	}
+	type body struct {
+		Username *string `json:"username"`
+		ProToken *string `json:"pro_token"`
+	}
+
+	var u uri
+	var b body
+	ctx, errResp := h.app.StartRequest(g, &u, nil, &b, nil)
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	if permResp := ctx.CheckPermissionUserAdmin(u.UserID); permResp != nil {
+		return *permResp
+	}
+
+	if b.Username != nil {
+		username := langext.Ptr(h.app.NormalizeUsername(*b.Username))
+		if *username == "" {
+			username = nil
+		}
+
+		err := h.database.UpdateUserUsername(ctx, u.UserID, username)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update user", err)
+		}
+	}
+
+	if b.ProToken != nil {
+		if *b.ProToken == "" {
+			err := h.database.UpdateUserProToken(ctx, u.UserID, nil)
+			if err != nil {
+				return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update user", err)
+			}
+		} else {
+			ptok, err := h.app.VerifyProToken(ctx, *b.ProToken)
+			if err != nil {
+				return ginresp.APIError(g, 500, apierr.FAILED_VERIFY_PRO_TOKEN, "Failed to query purchase status", err)
+			}
+
+			if !ptok {
+				return ginresp.APIError(g, 400, apierr.INVALID_PRO_TOKEN, "Purchase token could not be verified", nil)
+			}
+
+			err = h.database.ClearProTokens(ctx, *b.ProToken)
+			if err != nil {
+				return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to clear existing fcm tokens", err)
+			}
+
+			err = h.database.UpdateUserProToken(ctx, u.UserID, b.ProToken)
+			if err != nil {
+				return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to update user", err)
+			}
+		}
+	}
+
+	user, err := h.database.GetUser(ctx, u.UserID)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query (updated) user", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, user.JSON()))
+}

scnserver/api/handler/common.go

@@ -0,0 +1,219 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/db/simplectx"
+	"blackforestbytes.com/simplecloudnotifier/logic"
+	"bytes"
+	"context"
+	"errors"
+	"github.com/gin-gonic/gin"
+	sqlite3 "github.com/mattn/go-sqlite3"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/timeext"
+	"net/http"
+	"time"
+)
+
+type CommonHandler struct {
+	app *logic.Application
+}
+
+func NewCommonHandler(app *logic.Application) CommonHandler {
+	return CommonHandler{
+		app: app,
+	}
+}
+
+type pingResponse struct {
+	Message string           `json:"message"`
+	Info    pingResponseInfo `json:"info"`
+}
+type pingResponseInfo struct {
+	Method  string              `json:"method"`
+	Request string              `json:"request"`
+	Headers map[string][]string `json:"headers"`
+	URI     string              `json:"uri"`
+	Address string              `json:"addr"`
+}
+
+// Ping swaggerdoc
+//
+//	@Summary	Simple endpoint to test connection (any http method)
+//	@Tags		Common
+//
+//	@Success	200	{object}	pingResponse
+//	@Failure	500	{object}	ginresp.apiError
+//
+//	@Router		/api/ping [get]
+//	@Router		/api/ping [post]
+//	@Router		/api/ping [put]
+//	@Router		/api/ping [delete]
+//	@Router		/api/ping [patch]
+func (h CommonHandler) Ping(g *gin.Context) ginresp.HTTPResponse {
+	buf := new(bytes.Buffer)
+	_, _ = buf.ReadFrom(g.Request.Body)
+	resuestBody := buf.String()
+
+	return ginresp.JSON(http.StatusOK, pingResponse{
+		Message: "Pong",
+		Info: pingResponseInfo{
+			Method:  g.Request.Method,
+			Request: resuestBody,
+			Headers: g.Request.Header,
+			URI:     g.Request.RequestURI,
+			Address: g.Request.RemoteAddr,
+		},
+	})
+}
+
+// DatabaseTest swaggerdoc
+//
+//	@Summary	Check for a working database connection
+//	@ID			api-common-dbtest
+//	@Tags		Common
+//
+//	@Success	200	{object}	handler.DatabaseTest.response
+//	@Failure	500	{object}	ginresp.apiError
+//
+//	@Router		/api/db-test [post]
+func (h CommonHandler) DatabaseTest(g *gin.Context) ginresp.HTTPResponse {
+	type response struct {
+		Success          bool   `json:"success"`
+		LibVersion       string `json:"libVersion"`
+		LibVersionNumber int    `json:"libVersionNumber"`
+		SourceID         string `json:"sourceID"`
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+
+	libVersion, libVersionNumber, sourceID := sqlite3.Version()
+
+	err := h.app.Database.Ping(ctx)
+	if err != nil {
+		return ginresp.InternalError(err)
+	}
+
+	return ginresp.JSON(http.StatusOK, response{
+		Success:          true,
+		LibVersion:       libVersion,
+		LibVersionNumber: libVersionNumber,
+		SourceID:         sourceID,
+	})
+}
+
+// Health swaggerdoc
+//
+//	@Summary	Server Health-checks
+//	@ID			api-common-health
+//	@Tags		Common
+//
+//	@Success	200	{object}	handler.Health.response
+//	@Failure	500	{object}	ginresp.apiError
+//
+//	@Router		/api/health [get]
+func (h CommonHandler) Health(g *gin.Context) ginresp.HTTPResponse {
+	type response struct {
+		Status string `json:"status"`
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+
+	_, libVersionNumber, _ := sqlite3.Version()
+
+	if libVersionNumber < 3039000 {
+		return ginresp.InternalError(errors.New("sqlite version too low"))
+	}
+
+	tctx := simplectx.CreateSimpleContext(ctx, nil)
+
+	err := h.app.Database.Ping(tctx)
+	if err != nil {
+		return ginresp.InternalError(err)
+	}
+
+	for _, subdb := range h.app.Database.List() {
+
+		uuidKey, _ := langext.NewHexUUID()
+		uuidWrite, _ := langext.NewHexUUID()
+
+		err = subdb.WriteMetaString(tctx, uuidKey, uuidWrite)
+		if err != nil {
+			return ginresp.InternalError(err)
+		}
+
+		uuidRead, err := subdb.ReadMetaString(tctx, uuidKey)
+		if err != nil {
+			return ginresp.InternalError(err)
+		}
+
+		if uuidRead == nil || uuidWrite != *uuidRead {
+			return ginresp.InternalError(errors.New("writing into DB was not consistent"))
+		}
+
+		err = subdb.DeleteMeta(tctx, uuidKey)
+		if err != nil {
+			return ginresp.InternalError(err)
+		}
+
+	}
+
+	return ginresp.JSON(http.StatusOK, response{Status: "ok"})
+}
+
+// Sleep swaggerdoc
+//
+//	@Summary	Return 200 after x seconds
+//	@ID			api-common-sleep
+//	@Tags		Common
+//
+//	@Param		secs	path		number	true	"sleep delay (in seconds)"
+//
+//	@Success	200		{object}	handler.Sleep.response
+//	@Failure	400		{object}	ginresp.apiError
+//	@Failure	500		{object}	ginresp.apiError
+//
+//	@Router		/api/sleep/{secs} [post]
+func (h CommonHandler) Sleep(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		Seconds float64 `uri:"secs"`
+	}
+	type response struct {
+		Start    string  `json:"start"`
+		End      string  `json:"end"`
+		Duration float64 `json:"duration"`
+	}
+
+	t0 := time.Now().Format(time.RFC3339Nano)
+
+	var u uri
+	if err := g.ShouldBindUri(&u); err != nil {
+		return ginresp.APIError(g, 400, apierr.BINDFAIL_URI_PARAM, "Failed to read uri", err)
+	}
+
+	time.Sleep(timeext.FromSeconds(u.Seconds))
+
+	t1 := time.Now().Format(time.RFC3339Nano)
+
+	return ginresp.JSON(http.StatusOK, response{
+		Start:    t0,
+		End:      t1,
+		Duration: u.Seconds,
+	})
+}
+
+func (h CommonHandler) NoRoute(g *gin.Context) ginresp.HTTPResponse {
+	return ginresp.JSON(http.StatusNotFound, gin.H{
+		"":           "================ ROUTE NOT FOUND ================",
+		"FullPath":   g.FullPath(),
+		"Method":     g.Request.Method,
+		"URL":        g.Request.URL.String(),
+		"RequestURI": g.Request.RequestURI,
+		"Proto":      g.Request.Proto,
+		"Header":     g.Request.Header,
+		"~":          "================ ROUTE NOT FOUND ================",
+	})
+}

scnserver/api/handler/compat.go

@@ -0,0 +1,932 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	hl "blackforestbytes.com/simplecloudnotifier/api/apihighlight"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	ct "blackforestbytes.com/simplecloudnotifier/db/cursortoken"
+	primarydb "blackforestbytes.com/simplecloudnotifier/db/impl/primary"
+	"blackforestbytes.com/simplecloudnotifier/logic"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"database/sql"
+	"errors"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"gogs.mikescher.com/BlackForestBytes/goext/dataext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"net/http"
+)
+
+type CompatHandler struct {
+	app      *logic.Application
+	database *primarydb.Database
+}
+
+func NewCompatHandler(app *logic.Application) CompatHandler {
+	return CompatHandler{
+		app:      app,
+		database: app.Database.Primary,
+	}
+}
+
+// SendMessage swaggerdoc
+//
+//	@Deprecated
+//
+//	@Summary		Send a new message (compatibility)
+//	@Description	All parameter can be set via query-parameter or form-data body. Only UserID, UserKey and Title are required
+//	@Tags			External
+//
+//	@Param			query_data	query		handler.SendMessage.combined	false	" "
+//	@Param			form_data	formData	handler.SendMessage.combined	false	" "
+//
+//	@Success		200			{object}	handler.SendMessage.response
+//	@Failure		400			{object}	ginresp.apiError
+//	@Failure		401			{object}	ginresp.apiError
+//	@Failure		403			{object}	ginresp.apiError
+//	@Failure		500			{object}	ginresp.apiError
+//
+//	@Router			/send.php [POST]
+func (h CompatHandler) SendMessage(g *gin.Context) ginresp.HTTPResponse {
+	type combined struct {
+		UserID        *int64   `json:"user_id"   form:"user_id"`
+		UserKey       *string  `json:"user_key"  form:"user_key"`
+		Title         *string  `json:"title"     form:"title"`
+		Content       *string  `json:"content"   form:"content"`
+		Priority      *int     `json:"priority"  form:"priority"`
+		UserMessageID *string  `json:"msg_id"    form:"msg_id"`
+		SendTimestamp *float64 `json:"timestamp" form:"timestamp"`
+	}
+	type response struct {
+		Success        bool            `json:"success"`
+		ErrorID        apierr.APIError `json:"error"`
+		ErrorHighlight int             `json:"errhighlight"`
+		Message        string          `json:"message"`
+		SuppressSend   bool            `json:"suppress_send"`
+		MessageCount   int             `json:"messagecount"`
+		Quota          int             `json:"quota"`
+		IsPro          bool            `json:"is_pro"`
+		QuotaMax       int             `json:"quota_max"`
+		SCNMessageID   int64           `json:"scn_msg_id"`
+	}
+
+	var f combined
+	var q combined
+	ctx, errResp := h.app.StartRequest(g, nil, &q, nil, &f, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	data := dataext.ObjectMerge(f, q)
+
+	newid, err := h.database.ConvertCompatID(ctx, langext.Coalesce(data.UserID, -1), "userid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query userid<old>", err)
+	}
+	if newid == nil {
+		return ginresp.SendAPIError(g, 400, apierr.USER_NOT_FOUND, hl.USER_ID, "User not found (compat)", nil)
+	}
+
+	okResp, errResp := h.app.SendMessage(g, ctx, langext.Ptr(models.UserID(*newid)), data.UserKey, nil, data.Title, data.Content, data.Priority, data.UserMessageID, data.SendTimestamp, nil)
+	if errResp != nil {
+		return *errResp
+	} else {
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+			Success:        true,
+			ErrorID:        apierr.NO_ERROR,
+			ErrorHighlight: -1,
+			Message:        langext.Conditional(okResp.MessageIsOld, "Message already sent", "Message sent"),
+			SuppressSend:   okResp.MessageIsOld,
+			MessageCount:   okResp.User.MessagesSent,
+			Quota:          okResp.User.QuotaUsedToday(),
+			IsPro:          okResp.User.IsPro,
+			QuotaMax:       okResp.User.QuotaPerDay(),
+			SCNMessageID:   okResp.CompatMessageID,
+		}))
+	}
+}
+
+// Register swaggerdoc
+//
+//	@Summary	Register a new account
+//	@ID			compat-register
+//	@Tags		API-v1
+//
+//	@Deprecated
+//
+//	@Param		fcm_token	query		string	true	"the (android) fcm token"
+//	@Param		pro			query		string	true	"if the user is a paid account"	Enums(true, false)
+//	@Param		pro_token	query		string	true	"the (android) IAP token"
+//
+//	@Param		fcm_token	formData	string	true	"the (android) fcm token"
+//	@Param		pro			formData	string	true	"if the user is a paid account"	Enums(true, false)
+//	@Param		pro_token	formData	string	true	"the (android) IAP token"
+//
+//	@Success	200			{object}	handler.Register.response
+//	@Failure	default		{object}	ginresp.compatAPIError
+//
+//	@Router		/api/register.php [get]
+func (h CompatHandler) Register(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		FCMToken *string `json:"fcm_token" form:"fcm_token"`
+		Pro      *string `json:"pro"       form:"pro"`
+		ProToken *string `json:"pro_token" form:"pro_token"`
+	}
+	type response struct {
+		Success   bool   `json:"success"`
+		Message   string `json:"message"`
+		UserID    int64  `json:"user_id"`
+		UserKey   string `json:"user_key"`
+		QuotaUsed int    `json:"quota"`
+		QuotaMax  int    `json:"quota_max"`
+		IsPro     bool   `json:"is_pro"`
+	}
+
+	var datq query
+	var datb query
+	ctx, errResp := h.app.StartRequest(g, nil, &datq, nil, &datb, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	data := dataext.ObjectMerge(datb, datq)
+
+	if data.FCMToken == nil {
+		return ginresp.CompatAPIError(0, "Missing parameter [[fcm_token]]")
+	}
+	if data.Pro == nil {
+		return ginresp.CompatAPIError(0, "Missing parameter [[pro]]")
+	}
+	if data.ProToken == nil {
+		return ginresp.CompatAPIError(0, "Missing parameter [[pro_token]]")
+	}
+
+	if data.ProToken != nil {
+		data.ProToken = langext.Ptr("ANDROID|v1|" + *data.ProToken)
+	}
+
+	if *data.Pro != "true" {
+		data.ProToken = nil
+	}
+
+	if data.ProToken != nil {
+		ptok, err := h.app.VerifyProToken(ctx, *data.ProToken)
+		if err != nil {
+			return ginresp.CompatAPIError(0, "Failed to query purchase status")
+		}
+
+		if !ptok {
+			return ginresp.CompatAPIError(0, "Purchase token could not be verified")
+		}
+	}
+
+	adminKey := h.app.GenerateRandomAuthKey()
+
+	err := h.database.ClearFCMTokens(ctx, *data.FCMToken)
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to clear existing fcm tokens")
+	}
+
+	if data.ProToken != nil {
+		err := h.database.ClearProTokens(ctx, *data.ProToken)
+		if err != nil {
+			return ginresp.CompatAPIError(0, "Failed to clear existing pro tokens")
+		}
+	}
+
+	user, err := h.database.CreateUser(ctx, data.ProToken, nil)
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to create user in db")
+	}
+
+	_, err = h.database.CreateKeyToken(ctx, "CompatKey", user.UserID, true, make([]models.ChannelID, 0), models.TokenPermissionList{models.PermAdmin}, adminKey)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create admin-key in db", err)
+	}
+
+	_, err = h.database.CreateClient(ctx, user.UserID, models.ClientTypeAndroid, *data.FCMToken, "compat", "compat")
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to create client in db")
+	}
+
+	oldid, err := h.database.CreateCompatID(ctx, "userid", user.UserID.String())
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to create userid<old>", err)
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+		Success:   true,
+		Message:   "New user registered",
+		UserID:    oldid,
+		UserKey:   adminKey,
+		QuotaUsed: user.QuotaUsedToday(),
+		QuotaMax:  user.QuotaPerDay(),
+		IsPro:     user.IsPro,
+	}))
+}
+
+// Info swaggerdoc
+//
+//	@Summary	Get information about the current user
+//	@ID			compat-info
+//	@Tags		API-v1
+//
+//	@Deprecated
+//
+//	@Param		user_id		query		string	true	"the user_id"
+//	@Param		user_key	query		string	true	"the user_key"
+//
+//	@Param		user_id		formData	string	true	"the user_id"
+//	@Param		user_key	formData	string	true	"the user_key"
+//
+//	@Success	200			{object}	handler.Info.response
+//	@Failure	default		{object}	ginresp.compatAPIError
+//
+//	@Router		/api/info.php [get]
+func (h CompatHandler) Info(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		UserID  *int64  `json:"user_id"  form:"user_id"`
+		UserKey *string `json:"user_key" form:"user_key"`
+	}
+	type response struct {
+		Success    bool   `json:"success"`
+		Message    string `json:"message"`
+		UserID     int64  `json:"user_id"`
+		UserKey    string `json:"user_key"`
+		QuotaUsed  int    `json:"quota"`
+		QuotaMax   int    `json:"quota_max"`
+		IsPro      int    `json:"is_pro"`
+		FCMSet     bool   `json:"fcm_token_set"`
+		UnackCount int64  `json:"unack_count"`
+	}
+
+	var datq query
+	var datb query
+	ctx, errResp := h.app.StartRequest(g, nil, &datq, nil, &datb, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	data := dataext.ObjectMerge(datb, datq)
+
+	if data.UserID == nil {
+		return ginresp.CompatAPIError(101, "Missing parameter [[user_id]]")
+	}
+	if data.UserKey == nil {
+		return ginresp.CompatAPIError(102, "Missing parameter [[user_key]]")
+	}
+
+	useridCompNew, err := h.database.ConvertCompatID(ctx, *data.UserID, "userid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query userid<old>", err)
+	}
+	if useridCompNew == nil {
+		return ginresp.SendAPIError(g, 400, apierr.USER_NOT_FOUND, hl.USER_ID, "User not found (compat)", nil)
+	}
+
+	user, err := h.database.GetUser(ctx, models.UserID(*useridCompNew))
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(201, "User not found")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	keytok, err := h.database.GetKeyTokenByToken(ctx, *data.UserKey)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query token")
+	}
+	if !keytok.IsAdmin(user.UserID) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+
+	clients, err := h.database.ListClients(ctx, user.UserID)
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query clients")
+	}
+
+	filter := models.MessageFilter{
+		Sender:             langext.Ptr([]models.UserID{user.UserID}),
+		CompatAcknowledged: langext.Ptr(false),
+	}
+
+	unackCount, err := h.database.CountMessages(ctx, filter)
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+		Success:    true,
+		Message:    "ok",
+		UserID:     *data.UserID,
+		UserKey:    keytok.Token,
+		QuotaUsed:  user.QuotaUsedToday(),
+		QuotaMax:   user.QuotaPerDay(),
+		IsPro:      langext.Conditional(user.IsPro, 1, 0),
+		FCMSet:     len(clients) > 0,
+		UnackCount: unackCount,
+	}))
+}
+
+// Ack swaggerdoc
+//
+//	@Summary	Acknowledge that a message was received
+//	@ID			compat-ack
+//	@Tags		API-v1
+//
+//	@Deprecated
+//
+//	@Param		user_id		query		string	true	"the user_id"
+//	@Param		user_key	query		string	true	"the user_key"
+//	@Param		scn_msg_id	query		string	true	"the message id"
+//
+//	@Param		user_id		formData	string	true	"the user_id"
+//	@Param		user_key	formData	string	true	"the user_key"
+//	@Param		scn_msg_id	formData	string	true	"the message id"
+//
+//	@Success	200			{object}	handler.Ack.response
+//	@Failure	default		{object}	ginresp.compatAPIError
+//
+//	@Router		/api/ack.php [get]
+func (h CompatHandler) Ack(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		UserID    *int64  `json:"user_id"    form:"user_id"`
+		UserKey   *string `json:"user_key"   form:"user_key"`
+		MessageID *int64  `json:"scn_msg_id" form:"scn_msg_id"`
+	}
+	type response struct {
+		Success      bool   `json:"success"`
+		Message      string `json:"message"`
+		PrevAckValue int    `json:"prev_ack"`
+		NewAckValue  int    `json:"new_ack"`
+	}
+
+	var datq query
+	var datb query
+	ctx, errResp := h.app.StartRequest(g, nil, &datq, nil, &datb, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	data := dataext.ObjectMerge(datb, datq)
+
+	if data.UserID == nil {
+		return ginresp.CompatAPIError(101, "Missing parameter [[user_id]]")
+	}
+	if data.UserKey == nil {
+		return ginresp.CompatAPIError(102, "Missing parameter [[user_key]]")
+	}
+	if data.MessageID == nil {
+		return ginresp.CompatAPIError(103, "Missing parameter [[scn_msg_id]]")
+	}
+
+	useridCompNew, err := h.database.ConvertCompatID(ctx, *data.UserID, "userid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query userid<old>", err)
+	}
+	if useridCompNew == nil {
+		return ginresp.SendAPIError(g, 400, apierr.USER_NOT_FOUND, hl.USER_ID, fmt.Sprintf("User %d not found (compat)", *data.UserID), nil)
+	}
+
+	user, err := h.database.GetUser(ctx, models.UserID(*useridCompNew))
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(201, "User not found")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	keytok, err := h.database.GetKeyTokenByToken(ctx, *data.UserKey)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query token")
+	}
+	if !keytok.IsAdmin(user.UserID) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+
+	messageIdComp, err := h.database.ConvertCompatID(ctx, *data.MessageID, "messageid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query messageid<old>", err)
+	}
+	if messageIdComp == nil {
+		return ginresp.SendAPIError(g, 400, apierr.MESSAGE_NOT_FOUND, hl.NONE, fmt.Sprintf("Message %d not found (compat)", *data.MessageID), nil)
+	}
+
+	ackBefore, err := h.database.GetAck(ctx, models.MessageID(*messageIdComp))
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query ack", err)
+	}
+
+	if !ackBefore {
+		err = h.database.SetAck(ctx, user.UserID, models.MessageID(*messageIdComp))
+		if err != nil {
+			return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to set ack", err)
+		}
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+		Success:      true,
+		Message:      "ok",
+		PrevAckValue: langext.Conditional(ackBefore, 1, 0),
+		NewAckValue:  1,
+	}))
+}
+
+// Requery swaggerdoc
+//
+//	@Summary	Return all not-acknowledged messages
+//	@ID			compat-requery
+//	@Tags		API-v1
+//
+//	@Deprecated
+//
+//	@Param		user_id		query		string	true	"the user_id"
+//	@Param		user_key	query		string	true	"the user_key"
+//
+//	@Param		user_id		formData	string	true	"the user_id"
+//	@Param		user_key	formData	string	true	"the user_key"
+//
+//	@Success	200			{object}	handler.Requery.response
+//	@Failure	default		{object}	ginresp.compatAPIError
+//
+//	@Router		/api/requery.php [get]
+func (h CompatHandler) Requery(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		UserID  *int64  `json:"user_id"  form:"user_id"`
+		UserKey *string `json:"user_key" form:"user_key"`
+	}
+	type response struct {
+		Success bool                   `json:"success"`
+		Message string                 `json:"message"`
+		Count   int                    `json:"count"`
+		Data    []models.CompatMessage `json:"data"`
+	}
+
+	var datq query
+	var datb query
+	ctx, errResp := h.app.StartRequest(g, nil, &datq, nil, &datb, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	data := dataext.ObjectMerge(datb, datq)
+
+	if data.UserID == nil {
+		return ginresp.CompatAPIError(101, "Missing parameter [[user_id]]")
+	}
+	if data.UserKey == nil {
+		return ginresp.CompatAPIError(102, "Missing parameter [[user_key]]")
+	}
+
+	useridCompNew, err := h.database.ConvertCompatID(ctx, *data.UserID, "userid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query userid<old>", err)
+	}
+	if useridCompNew == nil {
+		return ginresp.SendAPIError(g, 400, apierr.USER_NOT_FOUND, hl.USER_ID, "User not found (compat)", nil)
+	}
+
+	user, err := h.database.GetUser(ctx, models.UserID(*useridCompNew))
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(201, "User not found")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	keytok, err := h.database.GetKeyTokenByToken(ctx, *data.UserKey)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query token")
+	}
+	if !keytok.IsAdmin(user.UserID) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+
+	filter := models.MessageFilter{
+		Sender:             langext.Ptr([]models.UserID{user.UserID}),
+		CompatAcknowledged: langext.Ptr(false),
+	}
+
+	msgs, _, err := h.database.ListMessages(ctx, filter, langext.Ptr(16), ct.Start())
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	compMsgs := make([]models.CompatMessage, 0, len(msgs))
+	for _, v := range msgs {
+
+		messageIdComp, err := h.database.ConvertToCompatIDOrCreate(ctx, "messageid", v.MessageID.String())
+		if err != nil {
+			return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query/create messageid<old>", err)
+		}
+
+		compMsgs = append(compMsgs, models.CompatMessage{
+			Title:         h.app.CompatizeMessageTitle(ctx, v),
+			Body:          v.Content,
+			Priority:      v.Priority,
+			Timestamp:     v.Timestamp().Unix(),
+			UserMessageID: v.UserMessageID,
+			SCNMessageID:  messageIdComp,
+			Trimmed:       nil,
+		})
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+		Success: true,
+		Message: "ok",
+		Count:   len(compMsgs),
+		Data:    compMsgs,
+	}))
+}
+
+// Update swaggerdoc
+//
+//	@Summary	Set the fcm-token (android)
+//	@ID			compat-update
+//	@Tags		API-v1
+//
+//	@Deprecated
+//
+//	@Param		user_id		query		string	true	"the user_id"
+//	@Param		user_key	query		string	true	"the user_key"
+//	@Param		fcm_token	query		string	true	"the (android) fcm token"
+//
+//	@Param		user_id		formData	string	true	"the user_id"
+//	@Param		user_key	formData	string	true	"the user_key"
+//	@Param		fcm_token	formData	string	true	"the (android) fcm token"
+//
+//	@Success	200			{object}	handler.Update.response
+//	@Failure	default		{object}	ginresp.compatAPIError
+//
+//	@Router		/api/update.php [get]
+func (h CompatHandler) Update(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		UserID   *int64  `json:"user_id"   form:"user_id"`
+		UserKey  *string `json:"user_key"  form:"user_key"`
+		FCMToken *string `json:"fcm_token" form:"fcm_token"`
+	}
+	type response struct {
+		Success   bool   `json:"success"`
+		Message   string `json:"message"`
+		UserID    int64  `json:"user_id"`
+		UserKey   string `json:"user_key"`
+		QuotaUsed int    `json:"quota"`
+		QuotaMax  int    `json:"quota_max"`
+		IsPro     int    `json:"is_pro"`
+	}
+
+	var datq query
+	var datb query
+	ctx, errResp := h.app.StartRequest(g, nil, &datq, nil, &datb, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	data := dataext.ObjectMerge(datb, datq)
+
+	if data.UserID == nil {
+		return ginresp.CompatAPIError(101, "Missing parameter [[user_id]]")
+	}
+	if data.UserKey == nil {
+		return ginresp.CompatAPIError(102, "Missing parameter [[user_key]]")
+	}
+
+	useridCompNew, err := h.database.ConvertCompatID(ctx, *data.UserID, "userid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query userid<old>", err)
+	}
+	if useridCompNew == nil {
+		return ginresp.SendAPIError(g, 400, apierr.USER_NOT_FOUND, hl.USER_ID, "User not found (compat)", nil)
+	}
+
+	user, err := h.database.GetUser(ctx, models.UserID(*useridCompNew))
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(201, "User not found")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	keytok, err := h.database.GetKeyTokenByToken(ctx, *data.UserKey)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query token")
+	}
+	if !keytok.IsAdmin(user.UserID) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+
+	clients, err := h.database.ListClients(ctx, user.UserID)
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to list clients")
+	}
+
+	newAdminKey := h.app.GenerateRandomAuthKey()
+
+	_, err = h.database.CreateKeyToken(ctx, "CompatKey", user.UserID, true, make([]models.ChannelID, 0), models.TokenPermissionList{models.PermAdmin}, newAdminKey)
+	if err != nil {
+		return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to create admin-key in db", err)
+	}
+
+	err = h.database.DeleteKeyToken(ctx, keytok.KeyTokenID)
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to update keys")
+	}
+
+	if data.FCMToken != nil {
+
+		for _, client := range clients {
+
+			err = h.database.DeleteClient(ctx, client.ClientID)
+			if err != nil {
+				return ginresp.CompatAPIError(0, "Failed to delete client")
+			}
+
+		}
+
+		_, err = h.database.CreateClient(ctx, user.UserID, models.ClientTypeAndroid, *data.FCMToken, "compat", "compat")
+		if err != nil {
+			return ginresp.CompatAPIError(0, "Failed to delete client")
+		}
+
+	}
+
+	user, err = h.database.GetUser(ctx, user.UserID)
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+		Success:   true,
+		Message:   "user updated",
+		UserID:    *data.UserID,
+		UserKey:   newAdminKey,
+		QuotaUsed: user.QuotaUsedToday(),
+		QuotaMax:  user.QuotaPerDay(),
+		IsPro:     langext.Conditional(user.IsPro, 1, 0),
+	}))
+}
+
+// Expand swaggerdoc
+//
+//	@Summary	Get a whole (potentially truncated) message
+//	@ID			compat-expand
+//	@Tags		API-v1
+//
+//	@Deprecated
+//
+//	@Param		user_id		query		string	true	"The user_id"
+//	@Param		user_key	query		string	true	"The user_key"
+//	@Param		scn_msg_id	query		string	true	"The message-id"
+//
+//	@Param		user_id		formData	string	true	"The user_id"
+//	@Param		user_key	formData	string	true	"The user_key"
+//	@Param		scn_msg_id	formData	string	true	"The message-id"
+//
+//	@Success	200			{object}	handler.Expand.response
+//	@Failure	default		{object}	ginresp.compatAPIError
+//
+//	@Router		/api/expand.php [get]
+func (h CompatHandler) Expand(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		UserID    *int64  `json:"user_id"    form:"user_id"`
+		UserKey   *string `json:"user_key"   form:"user_key"`
+		MessageID *int64  `json:"scn_msg_id" form:"scn_msg_id"`
+	}
+	type response struct {
+		Success bool                 `json:"success"`
+		Message string               `json:"message"`
+		Data    models.CompatMessage `json:"data"`
+	}
+
+	var datq query
+	var datb query
+	ctx, errResp := h.app.StartRequest(g, nil, &datq, nil, &datb, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	data := dataext.ObjectMerge(datb, datq)
+
+	if data.UserID == nil {
+		return ginresp.CompatAPIError(101, "Missing parameter [[user_id]]")
+	}
+	if data.UserKey == nil {
+		return ginresp.CompatAPIError(102, "Missing parameter [[user_key]]")
+	}
+	if data.MessageID == nil {
+		return ginresp.CompatAPIError(103, "Missing parameter [[scn_msg_id]]")
+	}
+
+	useridCompNew, err := h.database.ConvertCompatID(ctx, *data.UserID, "userid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query userid<old>", err)
+	}
+	if useridCompNew == nil {
+		return ginresp.SendAPIError(g, 400, apierr.USER_NOT_FOUND, hl.USER_ID, "User not found (compat)", nil)
+	}
+
+	user, err := h.database.GetUser(ctx, models.UserID(*useridCompNew))
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(201, "User not found")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	keytok, err := h.database.GetKeyTokenByToken(ctx, *data.UserKey)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query token")
+	}
+	if !keytok.IsAdmin(user.UserID) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+
+	messageCompNew, err := h.database.ConvertCompatID(ctx, *data.MessageID, "messageid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query messagid<old>", err)
+	}
+	if messageCompNew == nil {
+		return ginresp.CompatAPIError(301, "Message not found")
+	}
+
+	msg, err := h.database.GetMessage(ctx, models.MessageID(*messageCompNew), false)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(301, "Message not found")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query message")
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+		Success: true,
+		Message: "ok",
+		Data: models.CompatMessage{
+			Title:         h.app.CompatizeMessageTitle(ctx, msg),
+			Body:          msg.Content,
+			Trimmed:       langext.Ptr(false),
+			Priority:      msg.Priority,
+			Timestamp:     msg.Timestamp().Unix(),
+			UserMessageID: msg.UserMessageID,
+			SCNMessageID:  *data.MessageID,
+		},
+	}))
+}
+
+// Upgrade swaggerdoc
+//
+//	@Summary	Upgrade a free account to a paid account
+//	@ID			compat-upgrade
+//	@Tags		API-v1
+//
+//	@Deprecated
+//
+//	@Param		user_id		query		string	true	"the user_id"
+//	@Param		user_key	query		string	true	"the user_key"
+//	@Param		pro			query		string	true	"if the user is a paid account"	Enums(true, false)
+//	@Param		pro_token	query		string	true	"the (android) IAP token"
+//
+//	@Param		user_id		formData	string	true	"the user_id"
+//	@Param		user_key	formData	string	true	"the user_key"
+//	@Param		pro			formData	string	true	"if the user is a paid account"	Enums(true, false)
+//	@Param		pro_token	formData	string	true	"the (android) IAP token"
+//
+//	@Success	200			{object}	handler.Upgrade.response
+//	@Failure	default		{object}	ginresp.compatAPIError
+//
+//	@Router		/api/upgrade.php [get]
+func (h CompatHandler) Upgrade(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		UserID   *int64  `json:"user_id"   form:"user_id"`
+		UserKey  *string `json:"user_key"  form:"user_key"`
+		Pro      *string `json:"pro"       form:"pro"`
+		ProToken *string `json:"pro_token" form:"pro_token"`
+	}
+	type response struct {
+		Success   bool   `json:"success"`
+		Message   string `json:"message"`
+		UserID    int64  `json:"user_id"`
+		QuotaUsed int    `json:"quota"`
+		QuotaMax  int    `json:"quota_max"`
+		IsPro     bool   `json:"is_pro"`
+	}
+
+	var datq query
+	var datb query
+	ctx, errResp := h.app.StartRequest(g, nil, &datq, nil, &datb, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	data := dataext.ObjectMerge(datb, datq)
+
+	if data.UserID == nil {
+		return ginresp.CompatAPIError(101, "Missing parameter [[user_id]]")
+	}
+	if data.UserKey == nil {
+		return ginresp.CompatAPIError(102, "Missing parameter [[user_key]]")
+	}
+	if data.Pro == nil {
+		return ginresp.CompatAPIError(103, "Missing parameter [[pro]]")
+	}
+	if data.ProToken == nil {
+		return ginresp.CompatAPIError(104, "Missing parameter [[pro_token]]")
+	}
+
+	useridCompNew, err := h.database.ConvertCompatID(ctx, *data.UserID, "userid")
+	if err != nil {
+		return ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query userid<old>", err)
+	}
+	if useridCompNew == nil {
+		return ginresp.SendAPIError(g, 400, apierr.USER_NOT_FOUND, hl.USER_ID, "User not found (compat)", nil)
+	}
+
+	user, err := h.database.GetUser(ctx, models.UserID(*useridCompNew))
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(201, "User not found")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	keytok, err := h.database.GetKeyTokenByToken(ctx, *data.UserKey)
+	if errors.Is(err, sql.ErrNoRows) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query token")
+	}
+	if !keytok.IsAdmin(user.UserID) {
+		return ginresp.CompatAPIError(204, "Authentification failed")
+	}
+
+	if data.ProToken != nil {
+		data.ProToken = langext.Ptr("ANDROID|v1|" + *data.ProToken)
+	}
+
+	if *data.Pro != "true" {
+		data.ProToken = nil
+	}
+
+	if data.ProToken != nil {
+		ptok, err := h.app.VerifyProToken(ctx, *data.ProToken)
+		if err != nil {
+			return ginresp.CompatAPIError(0, "Failed to query purchase status")
+		}
+
+		if !ptok {
+			return ginresp.CompatAPIError(0, "Purchase token could not be verified")
+		}
+
+		err = h.database.ClearProTokens(ctx, *data.ProToken)
+		if err != nil {
+			return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to clear existing fcm tokens", err)
+		}
+
+		err = h.database.UpdateUserProToken(ctx, user.UserID, langext.Ptr(*data.ProToken))
+		if err != nil {
+			return ginresp.CompatAPIError(0, "Failed to update user")
+		}
+	} else {
+		err = h.database.UpdateUserProToken(ctx, user.UserID, nil)
+		if err != nil {
+			return ginresp.CompatAPIError(0, "Failed to update user")
+		}
+	}
+
+	user, err = h.database.GetUser(ctx, user.UserID)
+	if err != nil {
+		return ginresp.CompatAPIError(0, "Failed to query user")
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+		Success:   true,
+		Message:   "user updated",
+		UserID:    *data.UserID,
+		QuotaUsed: user.QuotaUsedToday(),
+		QuotaMax:  user.QuotaPerDay(),
+		IsPro:     user.IsPro,
+	}))
+}

scnserver/api/handler/external.go

@@ -0,0 +1,134 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	primarydb "blackforestbytes.com/simplecloudnotifier/db/impl/primary"
+	"blackforestbytes.com/simplecloudnotifier/logic"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"net/http"
+	"time"
+)
+
+type ExternalHandler struct {
+	app      *logic.Application
+	database *primarydb.Database
+}
+
+func NewExternalHandler(app *logic.Application) ExternalHandler {
+	return ExternalHandler{
+		app:      app,
+		database: app.Database.Primary,
+	}
+}
+
+// UptimeKuma swaggerdoc
+//
+//	@Summary		Send a new message
+//	@Description	All parameter can be set via query-parameter or the json body. Only UserID, UserKey and Title are required
+//	@Tags			External
+//
+//	@Param			query_data	query		handler.UptimeKuma.query	false	" "
+//	@Param			post_body	body		handler.UptimeKuma.body		false	" "
+//
+//	@Success		200			{object}	handler.UptimeKuma.response
+//	@Failure		400			{object}	ginresp.apiError
+//	@Failure		401			{object}	ginresp.apiError	"The user_id was not found or the user_key is wrong"
+//	@Failure		403			{object}	ginresp.apiError	"The user has exceeded its daily quota - wait 24 hours or upgrade your account"
+//	@Failure		500			{object}	ginresp.apiError	"An internal server error occurred - try again later"
+//
+//	@Router			/external/v1/uptime-kuma [POST]
+func (h ExternalHandler) UptimeKuma(g *gin.Context) ginresp.HTTPResponse {
+	type query struct {
+		UserID       *models.UserID `form:"user_id"     example:"7725"`
+		KeyToken     *string        `form:"key"         example:"P3TNH8mvv14fm"`
+		Channel      *string        `form:"channel"`
+		ChannelUp    *string        `form:"channel_up"`
+		ChannelDown  *string        `form:"channel_down"`
+		Priority     *int           `form:"priority"`
+		PriorityUp   *int           `form:"priority_up"`
+		PriorityDown *int           `form:"priority_down"`
+		SenderName   *string        `form:"senderName"`
+	}
+	type body struct {
+		Heartbeat *struct {
+			Time           string `json:"time"`
+			Status         int    `json:"status"`
+			Msg            string `json:"msg"`
+			Timezone       string `json:"timezone"`
+			TimezoneOffset string `json:"timezoneOffset"`
+			LocalDateTime  string `json:"localDateTime"`
+		} `json:"heartbeat"`
+		Monitor *struct {
+			Name string  `json:"name"`
+			Url  *string `json:"url"`
+		} `json:"monitor"`
+		Msg *string `json:"msg"`
+	}
+	type response struct {
+		MessageID models.MessageID `json:"message_id"`
+	}
+
+	var b body
+	var q query
+	ctx, httpErr := h.app.StartRequest(g, nil, &q, &b, nil)
+	if httpErr != nil {
+		return *httpErr
+	}
+	defer ctx.Cancel()
+
+	if b.Heartbeat == nil {
+		return ginresp.APIError(g, 400, apierr.BINDFAIL_BODY_PARAM, "missing field 'heartbeat' in request body", nil)
+	}
+	if b.Monitor == nil {
+		return ginresp.APIError(g, 400, apierr.BINDFAIL_BODY_PARAM, "missing field 'monitor' in request body", nil)
+	}
+	if b.Msg == nil {
+		return ginresp.APIError(g, 400, apierr.BINDFAIL_BODY_PARAM, "missing field 'msg' in request body", nil)
+	}
+
+	title := langext.Conditional(b.Heartbeat.Status == 1, fmt.Sprintf("Monitor %v is back online", b.Monitor.Name), fmt.Sprintf("Monitor %v went down!", b.Monitor.Name))
+
+	content := b.Heartbeat.Msg
+
+	var timestamp *float64 = nil
+	if tz, err := time.LoadLocation(b.Heartbeat.Timezone); err == nil {
+		if ts, err := time.ParseInLocation("2006-01-02 15:04:05", b.Heartbeat.LocalDateTime, tz); err == nil {
+			timestamp = langext.Ptr(float64(ts.Unix()))
+		}
+	}
+
+	var channel *string = nil
+	if q.Channel != nil {
+		channel = q.Channel
+	}
+	if q.ChannelUp != nil && b.Heartbeat.Status == 1 {
+		channel = q.ChannelUp
+	}
+	if q.ChannelDown != nil && b.Heartbeat.Status != 1 {
+		channel = q.ChannelDown
+	}
+
+	var priority *int = nil
+	if q.Priority != nil {
+		priority = q.Priority
+	}
+	if q.PriorityUp != nil && b.Heartbeat.Status == 1 {
+		priority = q.PriorityUp
+	}
+	if q.PriorityDown != nil && b.Heartbeat.Status != 1 {
+		priority = q.PriorityDown
+	}
+
+	okResp, errResp := h.app.SendMessage(g, ctx, q.UserID, q.KeyToken, channel, &title, &content, priority, nil, timestamp, q.SenderName)
+	if errResp != nil {
+		return *errResp
+	}
+
+	return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+		MessageID: okResp.Message.MessageID,
+	}))
+}

scnserver/api/handler/message.go

@@ -0,0 +1,107 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	primarydb "blackforestbytes.com/simplecloudnotifier/db/impl/primary"
+	"blackforestbytes.com/simplecloudnotifier/logic"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"github.com/gin-gonic/gin"
+	"gogs.mikescher.com/BlackForestBytes/goext/dataext"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"net/http"
+)
+
+type SendMessageResponse struct {
+	User            models.User
+	Message         models.Message
+	MessageIsOld    bool
+	CompatMessageID int64
+}
+
+type MessageHandler struct {
+	app      *logic.Application
+	database *primarydb.Database
+}
+
+func NewMessageHandler(app *logic.Application) MessageHandler {
+	return MessageHandler{
+		app:      app,
+		database: app.Database.Primary,
+	}
+}
+
+// SendMessage swaggerdoc
+//
+//	@Summary		Send a new message
+//	@Description	All parameter can be set via query-parameter or the json body. Only UserID, UserKey and Title are required
+//	@Tags			External
+//
+//	@Param			query_data	query		handler.SendMessage.combined	false	" "
+//	@Param			post_body	body		handler.SendMessage.combined	false	" "
+//	@Param			form_body	formData	handler.SendMessage.combined	false	" "
+//
+//	@Success		200			{object}	handler.SendMessage.response
+//	@Failure		400			{object}	ginresp.apiError
+//	@Failure		401			{object}	ginresp.apiError	"The user_id was not found or the user_key is wrong"
+//	@Failure		403			{object}	ginresp.apiError	"The user has exceeded its daily quota - wait 24 hours or upgrade your account"
+//	@Failure		500			{object}	ginresp.apiError	"An internal server error occurred - try again later"
+//
+//	@Router			/     [POST]
+//	@Router			/send [POST]
+func (h MessageHandler) SendMessage(g *gin.Context) ginresp.HTTPResponse {
+	type combined struct {
+		UserID        *models.UserID `json:"user_id"     form:"user_id"     example:"7725"                               `
+		KeyToken      *string        `json:"key"         form:"key"         example:"P3TNH8mvv14fm"                      `
+		Channel       *string        `json:"channel"     form:"channel"     example:"test"                               `
+		Title         *string        `json:"title"       form:"title"       example:"Hello World"                        `
+		Content       *string        `json:"content"     form:"content"     example:"This is a message"                  `
+		Priority      *int           `json:"priority"    form:"priority"    example:"1"                   enums:"0,1,2"  `
+		UserMessageID *string        `json:"msg_id"      form:"msg_id"      example:"db8b0e6a-a08c-4646"                 `
+		SendTimestamp *float64       `json:"timestamp"   form:"timestamp"   example:"1669824037"                         `
+		SenderName    *string        `json:"sender_name" form:"sender_name" example:"example-server"                     `
+	}
+
+	type response struct {
+		Success        bool             `json:"success"`
+		ErrorID        apierr.APIError  `json:"error"`
+		ErrorHighlight int              `json:"errhighlight"`
+		Message        string           `json:"message"`
+		SuppressSend   bool             `json:"suppress_send"`
+		MessageCount   int              `json:"messagecount"`
+		Quota          int              `json:"quota"`
+		IsPro          bool             `json:"is_pro"`
+		QuotaMax       int              `json:"quota_max"`
+		SCNMessageID   models.MessageID `json:"scn_msg_id"`
+	}
+
+	var b combined
+	var q combined
+	var f combined
+	ctx, errResp := h.app.StartRequest(g, nil, &q, &b, &f, logic.RequestOptions{IgnoreWrongContentType: true})
+	if errResp != nil {
+		return *errResp
+	}
+	defer ctx.Cancel()
+
+	// query has highest prio, then form, then json
+	data := dataext.ObjectMerge(dataext.ObjectMerge(b, f), q)
+
+	okResp, errResp := h.app.SendMessage(g, ctx, data.UserID, data.KeyToken, data.Channel, data.Title, data.Content, data.Priority, data.UserMessageID, data.SendTimestamp, data.SenderName)
+	if errResp != nil {
+		return *errResp
+	} else {
+		return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
+			Success:        true,
+			ErrorID:        apierr.NO_ERROR,
+			ErrorHighlight: -1,
+			Message:        langext.Conditional(okResp.MessageIsOld, "Message already sent", "Message sent"),
+			SuppressSend:   okResp.MessageIsOld,
+			MessageCount:   okResp.User.MessagesSent,
+			Quota:          okResp.User.QuotaUsedToday(),
+			IsPro:          okResp.User.IsPro,
+			QuotaMax:       okResp.User.QuotaPerDay(),
+			SCNMessageID:   okResp.Message.MessageID,
+		}))
+	}
+}

scnserver/api/handler/website.go

@@ -0,0 +1,177 @@
+package handler
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/logic"
+	"blackforestbytes.com/simplecloudnotifier/website"
+	"errors"
+	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog/log"
+	"gogs.mikescher.com/BlackForestBytes/goext/rext"
+	"net/http"
+	"regexp"
+	"strings"
+)
+
+type WebsiteHandler struct {
+	app         *logic.Application
+	rexTemplate rext.Regex
+	rexConfig   rext.Regex
+}
+
+func NewWebsiteHandler(app *logic.Application) WebsiteHandler {
+	return WebsiteHandler{
+		app:         app,
+		rexTemplate: rext.W(regexp.MustCompile("{{template\\|[A-Za-z0-9_\\-\\[\\].]+}}")),
+		rexConfig:   rext.W(regexp.MustCompile("{{config\\|[A-Za-z0-9_\\-.]+}}")),
+	}
+}
+
+func (h WebsiteHandler) Index(g *gin.Context) ginresp.HTTPResponse {
+	return h.serveAsset(g, "index.html", true)
+}
+
+func (h WebsiteHandler) APIDocs(g *gin.Context) ginresp.HTTPResponse {
+	return h.serveAsset(g, "api.html", true)
+}
+
+func (h WebsiteHandler) APIDocsMore(g *gin.Context) ginresp.HTTPResponse {
+	return h.serveAsset(g, "api_more.html", true)
+}
+
+func (h WebsiteHandler) MessageSent(g *gin.Context) ginresp.HTTPResponse {
+	return h.serveAsset(g, "message_sent.html", true)
+}
+
+func (h WebsiteHandler) FaviconIco(g *gin.Context) ginresp.HTTPResponse {
+	return h.serveAsset(g, "favicon.ico", false)
+}
+
+func (h WebsiteHandler) FaviconPNG(g *gin.Context) ginresp.HTTPResponse {
+	return h.serveAsset(g, "favicon.png", false)
+}
+
+func (h WebsiteHandler) Javascript(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		Filename string `uri:"fn"`
+	}
+
+	var u uri
+	if err := g.ShouldBindUri(&u); err != nil {
+		return ginresp.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+	}
+
+	return h.serveAsset(g, "js/"+u.Filename, false)
+}
+
+func (h WebsiteHandler) CSS(g *gin.Context) ginresp.HTTPResponse {
+	type uri struct {
+		Filename string `uri:"fn"`
+	}
+
+	var u uri
+	if err := g.ShouldBindUri(&u); err != nil {
+		return ginresp.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+	}
+
+	return h.serveAsset(g, "css/"+u.Filename, false)
+}
+
+func (h WebsiteHandler) serveAsset(g *gin.Context, fn string, repl bool) ginresp.HTTPResponse {
+	_data, err := website.Assets.ReadFile(fn)
+	if err != nil {
+		return ginresp.Status(http.StatusNotFound)
+	}
+
+	data := string(_data)
+
+	if repl {
+		failed := false
+		data = h.rexTemplate.ReplaceAllFunc(data, func(match string) string {
+			prefix := len("{{template|")
+			suffix := len("}}")
+			fnSub := match[prefix : len(match)-suffix]
+
+			fnSub = strings.ReplaceAll(fnSub, "[theme]", h.getTheme(g))
+
+			subdata, err := website.Assets.ReadFile(fnSub)
+			if err != nil {
+				log.Error().Str("templ", string(match)).Str("fnSub", fnSub).Str("source", fn).Msg("Failed to replace template")
+				failed = true
+			}
+			return string(subdata)
+		})
+		if failed {
+			return ginresp.InternalError(errors.New("template replacement failed"))
+		}
+
+		data = h.rexConfig.ReplaceAllFunc(data, func(match string) string {
+			prefix := len("{{config|")
+			suffix := len("}}")
+			cfgKey := match[prefix : len(match)-suffix]
+
+			cval, ok := h.getReplConfig(cfgKey)
+			if !ok {
+				log.Error().Str("templ", match).Str("source", fn).Msg("Failed to replace config")
+				failed = true
+			}
+			return cval
+		})
+		if failed {
+			return ginresp.InternalError(errors.New("config replacement failed"))
+		}
+	}
+
+	mime := "text/plain"
+
+	lowerFN := strings.ToLower(fn)
+	if strings.HasSuffix(lowerFN, ".html") || strings.HasSuffix(lowerFN, ".htm") {
+		mime = "text/html"
+	} else if strings.HasSuffix(lowerFN, ".css") {
+		mime = "text/css"
+	} else if strings.HasSuffix(lowerFN, ".js") {
+		mime = "text/javascript"
+	} else if strings.HasSuffix(lowerFN, ".json") {
+		mime = "application/json"
+	} else if strings.HasSuffix(lowerFN, ".jpeg") || strings.HasSuffix(lowerFN, ".jpg") {
+		mime = "image/jpeg"
+	} else if strings.HasSuffix(lowerFN, ".png") {
+		mime = "image/png"
+	} else if strings.HasSuffix(lowerFN, ".svg") {
+		mime = "image/svg+xml"
+	}
+
+	return ginresp.Data(http.StatusOK, mime, []byte(data))
+}
+
+func (h WebsiteHandler) getReplConfig(key string) (string, bool) {
+	key = strings.TrimSpace(strings.ToLower(key))
+
+	if key == "baseurl" {
+		return h.app.Config.BaseURL, true
+	}
+	if key == "ip" {
+		return h.app.Config.ServerIP, true
+	}
+	if key == "port" {
+		return h.app.Config.ServerPort, true
+	}
+	if key == "namespace" {
+		return h.app.Config.Namespace, true
+	}
+
+	return "", false
+
+}
+
+func (h WebsiteHandler) getTheme(g *gin.Context) string {
+	if c, err := g.Cookie("theme"); err != nil {
+		return "light"
+	} else if c == "light" {
+		return "light"
+	} else if c == "dark" {
+		return "dark"
+	} else {
+		return "light"
+	}
+}

scnserver/api/router.go

@@ -0,0 +1,186 @@
+package api
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/api/ginext"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/api/handler"
+	"blackforestbytes.com/simplecloudnotifier/logic"
+	"blackforestbytes.com/simplecloudnotifier/models"
+	"blackforestbytes.com/simplecloudnotifier/swagger"
+	"errors"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/go-playground/validator/v10"
+)
+
+type Router struct {
+	app *logic.Application
+
+	commonHandler   handler.CommonHandler
+	compatHandler   handler.CompatHandler
+	websiteHandler  handler.WebsiteHandler
+	apiHandler      handler.APIHandler
+	messageHandler  handler.MessageHandler
+	externalHandler handler.ExternalHandler
+}
+
+func NewRouter(app *logic.Application) *Router {
+	return &Router{
+		app: app,
+
+		commonHandler:   handler.NewCommonHandler(app),
+		compatHandler:   handler.NewCompatHandler(app),
+		websiteHandler:  handler.NewWebsiteHandler(app),
+		apiHandler:      handler.NewAPIHandler(app),
+		messageHandler:  handler.NewMessageHandler(app),
+		externalHandler: handler.NewExternalHandler(app),
+	}
+}
+
+// Init swaggerdocs
+//
+//	@title			SimpleCloudNotifier API
+//	@version		2.0
+//	@description	API for SCN
+//	@host			simplecloudnotifier.de
+//
+//	@tag.name		External
+//	@tag.name		API-v1
+//	@tag.name		API-v2
+//	@tag.name		Common
+//
+//	@BasePath		/
+func (r *Router) Init(e *gin.Engine) error {
+
+	if v, ok := binding.Validator.Engine().(*validator.Validate); ok {
+		err := v.RegisterValidation("entityid", models.ValidateEntityID, true)
+		if err != nil {
+			return err
+		}
+	} else {
+		return errors.New("failed to add validators - wrong engine")
+	}
+
+	// ================ General (unversioned) ================
+
+	commonAPI := e.Group("/api")
+	{
+		commonAPI.Any("/ping", r.Wrap(r.commonHandler.Ping))
+		commonAPI.POST("/db-test", r.Wrap(r.commonHandler.DatabaseTest))
+		commonAPI.GET("/health", r.Wrap(r.commonHandler.Health))
+		commonAPI.POST("/sleep/:secs", r.Wrap(r.commonHandler.Sleep))
+	}
+
+	// ================ Swagger ================
+
+	docs := e.Group("/documentation")
+	{
+		docs.GET("/swagger", ginext.RedirectTemporary("/documentation/swagger/"))
+		docs.GET("/swagger/*sub", r.Wrap(swagger.Handle))
+	}
+
+	// ================ Website ================
+
+	frontend := e.Group("")
+	{
+		frontend.GET("/", r.Wrap(r.websiteHandler.Index))
+		frontend.GET("/index.php", r.Wrap(r.websiteHandler.Index))
+		frontend.GET("/index.html", r.Wrap(r.websiteHandler.Index))
+		frontend.GET("/index", r.Wrap(r.websiteHandler.Index))
+
+		frontend.GET("/api", r.Wrap(r.websiteHandler.APIDocs))
+		frontend.GET("/api.php", r.Wrap(r.websiteHandler.APIDocs))
+		frontend.GET("/api.html", r.Wrap(r.websiteHandler.APIDocs))
+
+		frontend.GET("/api_more", r.Wrap(r.websiteHandler.APIDocsMore))
+		frontend.GET("/api_more.php", r.Wrap(r.websiteHandler.APIDocsMore))
+		frontend.GET("/api_more.html", r.Wrap(r.websiteHandler.APIDocsMore))
+
+		frontend.GET("/message_sent", r.Wrap(r.websiteHandler.MessageSent))
+		frontend.GET("/message_sent.php", r.Wrap(r.websiteHandler.MessageSent))
+		frontend.GET("/message_sent.html", r.Wrap(r.websiteHandler.MessageSent))
+
+		frontend.GET("/favicon.ico", r.Wrap(r.websiteHandler.FaviconIco))
+		frontend.GET("/favicon.png", r.Wrap(r.websiteHandler.FaviconPNG))
+
+		frontend.GET("/js/:fn", r.Wrap(r.websiteHandler.Javascript))
+		frontend.GET("/css/:fn", r.Wrap(r.websiteHandler.CSS))
+	}
+
+	// ================ Compat (v1) ================
+
+	compat := e.Group("/api")
+	{
+		compat.GET("/register.php", r.Wrap(r.compatHandler.Register))
+		compat.GET("/info.php", r.Wrap(r.compatHandler.Info))
+		compat.GET("/ack.php", r.Wrap(r.compatHandler.Ack))
+		compat.GET("/requery.php", r.Wrap(r.compatHandler.Requery))
+		compat.GET("/update.php", r.Wrap(r.compatHandler.Update))
+		compat.GET("/expand.php", r.Wrap(r.compatHandler.Expand))
+		compat.GET("/upgrade.php", r.Wrap(r.compatHandler.Upgrade))
+	}
+
+	// ================ Manage API (v2) ================
+
+	apiv2 := e.Group("/api/v2/")
+	{
+		apiv2.POST("/users", r.Wrap(r.apiHandler.CreateUser))
+		apiv2.GET("/users/:uid", r.Wrap(r.apiHandler.GetUser))
+		apiv2.PATCH("/users/:uid", r.Wrap(r.apiHandler.UpdateUser))
+
+		apiv2.GET("/users/:uid/keys", r.Wrap(r.apiHandler.ListUserKeys))
+		apiv2.POST("/users/:uid/keys", r.Wrap(r.apiHandler.CreateUserKey))
+		apiv2.GET("/users/:uid/keys/:kid", r.Wrap(r.apiHandler.GetUserKey))
+		apiv2.PATCH("/users/:uid/keys/:kid", r.Wrap(r.apiHandler.UpdateUserKey))
+		apiv2.DELETE("/users/:uid/keys/:kid", r.Wrap(r.apiHandler.DeleteUserKey))
+
+		apiv2.GET("/users/:uid/clients", r.Wrap(r.apiHandler.ListClients))
+		apiv2.GET("/users/:uid/clients/:cid", r.Wrap(r.apiHandler.GetClient))
+		apiv2.PATCH("/users/:uid/clients/:cid", r.Wrap(r.apiHandler.UpdateClient))
+		apiv2.POST("/users/:uid/clients", r.Wrap(r.apiHandler.AddClient))
+		apiv2.DELETE("/users/:uid/clients/:cid", r.Wrap(r.apiHandler.DeleteClient))
+
+		apiv2.GET("/users/:uid/channels", r.Wrap(r.apiHandler.ListChannels))
+		apiv2.POST("/users/:uid/channels", r.Wrap(r.apiHandler.CreateChannel))
+		apiv2.GET("/users/:uid/channels/:cid", r.Wrap(r.apiHandler.GetChannel))
+		apiv2.PATCH("/users/:uid/channels/:cid", r.Wrap(r.apiHandler.UpdateChannel))
+		apiv2.GET("/users/:uid/channels/:cid/messages", r.Wrap(r.apiHandler.ListChannelMessages))
+		apiv2.GET("/users/:uid/channels/:cid/subscriptions", r.Wrap(r.apiHandler.ListChannelSubscriptions))
+
+		apiv2.GET("/users/:uid/subscriptions", r.Wrap(r.apiHandler.ListUserSubscriptions))
+		apiv2.POST("/users/:uid/subscriptions", r.Wrap(r.apiHandler.CreateSubscription))
+		apiv2.GET("/users/:uid/subscriptions/:sid", r.Wrap(r.apiHandler.GetSubscription))
+		apiv2.DELETE("/users/:uid/subscriptions/:sid", r.Wrap(r.apiHandler.CancelSubscription))
+		apiv2.PATCH("/users/:uid/subscriptions/:sid", r.Wrap(r.apiHandler.UpdateSubscription))
+
+		apiv2.GET("/messages", r.Wrap(r.apiHandler.ListMessages))
+		apiv2.GET("/messages/:mid", r.Wrap(r.apiHandler.GetMessage))
+		apiv2.DELETE("/messages/:mid", r.Wrap(r.apiHandler.DeleteMessage))
+	}
+
+	// ================ Send API (unversioned) ================
+
+	sendAPI := e.Group("")
+	{
+		sendAPI.POST("/", r.Wrap(r.messageHandler.SendMessage))
+		sendAPI.POST("/send", r.Wrap(r.messageHandler.SendMessage))
+		sendAPI.POST("/send.php", r.Wrap(r.compatHandler.SendMessage))
+
+		sendAPI.POST("/external/v1/uptime-kuma", r.Wrap(r.externalHandler.UptimeKuma))
+
+	}
+
+	// ================
+
+	if r.app.Config.ReturnRawErrors {
+		e.NoRoute(r.Wrap(r.commonHandler.NoRoute))
+	}
+
+	// ================
+
+	return nil
+}
+
+func (r *Router) Wrap(fn ginresp.WHandlerFunc) gin.HandlerFunc {
+	return ginresp.Wrap(r.app, fn)
+}

scnserver/cmd/dbhash/main.go

@@ -0,0 +1,60 @@
+package main
+
+import (
+	"blackforestbytes.com/simplecloudnotifier/db/schema"
+	"context"
+	"fmt"
+	"github.com/mattn/go-sqlite3"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
+	"time"
+)
+
+func main() {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	sqlite3.Version() // ensure slite3 loaded
+
+	{
+		h0, err := sq.HashSqliteSchema(ctx, schema.PrimarySchema1)
+		if err != nil {
+			h0 = "ERR"
+		}
+		fmt.Printf("PrimarySchema1  := %s\n", h0)
+	}
+	{
+		h0, err := sq.HashSqliteSchema(ctx, schema.PrimarySchema2)
+		if err != nil {
+			h0 = "ERR"
+		}
+		fmt.Printf("PrimarySchema2  := %s\n", h0)
+	}
+	{
+		h0, err := sq.HashSqliteSchema(ctx, schema.PrimarySchema3)
+		if err != nil {
+			h0 = "ERR"
+		}
+		fmt.Printf("PrimarySchema3  := %s\n", h0)
+	}
+	{
+		h0, err := sq.HashSqliteSchema(ctx, schema.PrimarySchema4)
+		if err != nil {
+			h0 = "ERR"
+		}
+		fmt.Printf("PrimarySchema4  := %s\n", h0)
+	}
+	{
+		h0, err := sq.HashSqliteSchema(ctx, schema.RequestsSchema1)
+		if err != nil {
+			h0 = "ERR"
+		}
+		fmt.Printf("RequestsSchema1 := %s\n", h0)
+	}
+	{
+		h0, err := sq.HashSqliteSchema(ctx, schema.LogsSchema1)
+		if err != nil {
+			h0 = "ERR"
+		}
+		fmt.Printf("LogsSchema1     := %s\n", h0)
+	}
+}