From 4199ef9d223d8efd9a63a09c89d5bd3af659300e Mon Sep 17 00:00:00 2001
From: ave <ave@ave.zone>
Date: Sun, 22 Aug 2021 18:37:50 +0300
Subject: [PATCH 1/2] Fix permissions on files

---
 .gitignore                                   | 3 +++
 resources/patches/slashcommands/code/gradlew | 0
 resources/scripts/ctcci/ctcci.py             | 0
 3 files changed, 3 insertions(+)
 mode change 100644 => 100755 resources/patches/slashcommands/code/gradlew
 mode change 100644 => 100755 resources/scripts/ctcci/ctcci.py

diff --git a/.gitignore b/.gitignore
index e2b49e0..b758151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 patches/*/*-custom.patch
 patches/*/*.patch-failed
+resources/distok/versionlogs/*
+!resources/distok/versionlogs/.gitkeep
+*.apk
diff --git a/resources/patches/slashcommands/code/gradlew b/resources/patches/slashcommands/code/gradlew
old mode 100644
new mode 100755
diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py
old mode 100644
new mode 100755

From d3c51e2beff06127832081eb66953cc2acc6a912 Mon Sep 17 00:00:00 2001
From: ave <ave@ave.zone>
Date: Sun, 22 Aug 2021 18:38:17 +0300
Subject: [PATCH 2/2] Fix images defaulting to spoilered state + not getting
 out

---
 .gitignore                                 |  1 +
 resources/patches/supplemental/87202.patch | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b758151..e1cb701 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ patches/*/*-custom.patch
 patches/*/*.patch-failed
 resources/distok/versionlogs/*
 !resources/distok/versionlogs/.gitkeep
+resources/fdroid/repo/icons/*.xml
 *.apk
diff --git a/resources/patches/supplemental/87202.patch b/resources/patches/supplemental/87202.patch
index 9a4e77e..b8d912e 100644
--- a/resources/patches/supplemental/87202.patch
+++ b/resources/patches/supplemental/87202.patch
@@ -83,7 +83,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis
 +
 +     const-string v1, "CACHE_KEY_CTC_LEAK_CHANNELS"
 +
-+     const/4 v2, 0x1
++     const/4 v2, 0x0
 +
 +     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 +
@@ -124,7 +124,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis
 +
 +     const-string v1, "CACHE_KEY_CTC_IMAGE_SPOILER"
 +
-+     const/4 v2, 0x1
++     const/4 v2, 0x0
 +
 +     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 +
@@ -165,7 +165,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis
 +
 +     const-string v1, "CACHE_KEY_CTC_NO_DELETE"
 +
-+     const/4 v2, 0x1
++     const/4 v2, 0x0
 +
 +     invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getBoolean(Ljava/lang/String;Z)Z
 +
@@ -385,10 +385,10 @@ diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/s
 +
 +     move-result-object p0
 +
-+     # I commented this out and do this in StoreMessages now as this'd only work for a single image
-+     # const/4 v1, 0x0
++     # this only works for a single image
++     const/4 v1, 0x0
 +
-+     # invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V
++     invoke-virtual {v0, v1}, Lcom/discord/stores/StoreUserSettings;->setImageSpoiler(Z)V
 +
 +     :cond_1
 +     return-object p0