From 5433329b5c951b383cdf564c5fb065830cd5ce23 Mon Sep 17 00:00:00 2001
From: Krille Fear <christian-pauly@posteo.de>
Date: Tue, 16 Nov 2021 08:27:53 +0100
Subject: [PATCH] chore: Publish snap from CI

---
 .gitlab-ci.yml                 |  6 +++
 scripts/publish-snap-stable.sh |  3 +-
 snap/snapcraft.yaml            | 98 ++++++++++++++++++++++++++++------
 3 files changed, 88 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92c00b28..3c0ee9f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,6 +223,12 @@ upload-android:
     - |
       curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build/android/app-release.apk ${PACKAGE_REGISTRY_URL}/fluffychat.apk
 
+snap_stable:
+  extends: .release
+  image: cibuilds/snapcraft:core18
+  script: [./scripts/publish-snap-stable.sh]
+  needs: [build_linux_x86]
+
 upload-web:
   extends: .release
   script:
diff --git a/scripts/publish-snap-stable.sh b/scripts/publish-snap-stable.sh
index 208a4dbf..4bf6ab3f 100755
--- a/scripts/publish-snap-stable.sh
+++ b/scripts/publish-snap-stable.sh
@@ -1,6 +1,5 @@
 #!/bin/sh -ve
-echo $SNAPCRAFT_LOGIN_FILE | base64 --decode --ignore-garbage > snapcraft.login
-snapcraft login --with snapcraft.login
+echo $SNAPCRAFT_LOGIN_FILE | snapcraft login --with -
 snapcraft
 snapcraft upload --release=stable *.snap
 snapcraft logout
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 77603cb8..3020e623 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,20 +1,39 @@
 name: fluffychat
 base: core18
-version: git
+adopt-info: version
 summary: The cutest messenger in the Matrix network
 description: |
-  FluffyChat - Chat with your friends
+  FluffyChat is an open source, nonprofit and cute matrix messenger app. The app is easy to use but secure and decentralized.
 
-  The greatest FluffyChat features:
-  1. Opensource and open development where everyone can join.
-  2. Nonprofit - FluffyChat is donation funded.
-  3. Cute design and many theme settings including a dark mode.
-  4. Unlimited groups and direct chats.
-  5. FluffyChat is made as simple to use as possible.
-  6. Free to use for everyone without ads.
-  7. There is no "FluffyChat server" you are forced to use. Use the server
-  you find trustworthy or host your own.
-  8. Compatible with Element, Fractal, Nheko and all matrix messengers.
+
+  ## Features
+
+  - Send all kinds of messages, images and files
+  - Voice messages
+  - Location sharing
+  - Push notifications
+  - Unlimited private and public group chats
+  - Public channels with thousands of participants
+  - Feature rich group moderation including all matrix features
+  - Discover and join public groups
+  - Dark mode
+  - Hides complexity of Matrix IDs behind simple QR codes
+  - Custom emotes and stickers
+  - Video calls via sharing links to Jitsi
+  - Spaces
+  - Compatible with Element, Nheko, NeoChat and all other Matrix apps
+  - End to end encryption
+  - Emoji verification & cross signing
+  - And much more...
+
+
+  ## FluffyChat comes with a dream
+
+  Imagine a world where everyone can choose the messenger they like and is still able to chat with all of their friends.
+
+  A world where there are no companies spying on you when you send selfies to friends and lovers.
+
+  And a world where apps are made for fluffyness and not for profit. ♥
 
   Join the community: https://matrix.to/#/#fluffychat:matrix.org
   Website: http://fluffychat.im
@@ -34,15 +53,29 @@ parts:
     source-tag: 3.2.3
     build-packages:
       - g++
+  version:
+    plugin: dump
+    source: .
+    override-build: |
+      snapcraftctl set-version $(git describe --always --tag)
   fluffychat:
     plugin: dump
     source: ./build/linux/x64/release/bundle/
     build-packages:
-     - libsecret-1-dev
-     - libjsoncpp-dev
+      - libsecret-1-dev
+      - libjsoncpp-dev
     stage-packages:
-     - libsecret-1-dev
-     - libjsoncpp-dev
+      - libsecret-1-dev
+      - libjsoncpp-dev
+  gnome-3-28-extension:
+    build-packages:
+      - gcc
+      - libgtk-3-dev
+    make-parameters:
+      - PLATFORM_PLUG=gnome-3-28-1804
+    plugin: make
+    source: $SNAPCRAFT_EXTENSIONS_DIR/desktop
+    source-subdir: gnome
 
 slots:
   dbus-svc:
@@ -52,10 +85,41 @@ slots:
 
 apps:
   fluffychat:
-    extensions: [flutter-stable]
     command: fluffychat
     plugs:
+      - desktop
+      - desktop-legacy
+      - gsettings
+      - opengl
+      - wayland
+      - x11
       - network
       - home
     slots:
       - dbus-svc
+    command-chain:
+      - snap/command-chain/desktop-launch
+assumes:
+  - snapd2.43
+plugs:
+  gnome-3-28-1804:
+    default-provider: gnome-3-28-1804
+    interface: content
+    target: $SNAP/gnome-platform
+  gtk-3-themes:
+    default-provider: gtk-common-themes
+    interface: content
+    target: $SNAP/data-dir/themes
+  icon-themes:
+    default-provider: gtk-common-themes
+    interface: content
+    target: $SNAP/data-dir/icons
+  sound-themes:
+    default-provider: gtk-common-themes
+    interface: content
+    target: $SNAP/data-dir/sounds
+environment:
+  SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform
+layout:
+  /usr/share/xml/iso-codes:
+    bind: $SNAP/gnome-platform/usr/share/xml/iso-codes