From ad42890a0b32f612a2161366ad63ef0759de84da Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Wed, 20 Jan 2021 22:15:01 +0100
Subject: Swap key and cat for running pid tracking

---
 Zotlabs/Daemon/Expire.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php
index 8ca92b6c5..c4ff8aec6 100644
--- a/Zotlabs/Daemon/Expire.php
+++ b/Zotlabs/Daemon/Expire.php
@@ -9,14 +9,14 @@ class Expire {
 
 		cli_startup();
 
-		$pid = get_config('expire', 'procid', false);
+		$pid = get_config('procid', 'expire', false);
 		if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) {
-			logger('Expire: procedure already run with pid ' . $pid, LOGGER_DEBUG);
+			logger('procedure already run with pid ' . $pid, LOGGER_DEBUG);
 			return;
 		}
 
 		$pid = getmypid();
-		set_config('expire', 'procid', $pid);
+		set_config('procid', 'expire', $pid);
 
 		// perform final cleanup on previously delete items
 
@@ -101,6 +101,6 @@ class Expire {
 			logger('Expire: sys: done', LOGGER_DEBUG);
 		}
 
-		del_config('expire', 'procid');
+		del_config('procid', 'expire');
 	}
 }
-- 
cgit v1.2.3


From 491dffd9b734c1f7aa879cca6e48eae5dc7b3f03 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Wed, 20 Jan 2021 22:18:27 +0100
Subject: Implement SQL query background caching

---
 Zotlabs/Daemon/Cache_query.php | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 Zotlabs/Daemon/Cache_query.php

(limited to 'Zotlabs')

diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php
new file mode 100644
index 000000000..c709c96b5
--- /dev/null
+++ b/Zotlabs/Daemon/Cache_query.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+use Zotlabs\Lib\Cache;
+
+class Cache_query {
+
+	static public function run($argc, $argv) {
+
+		if(! $argc == 3)
+			return;
+
+		$key = $argv[1];
+
+		$pid = get_config('procid', $key, false);
+		if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) {
+			logger($key . ': procedure already run with pid ' . $pid);
+			return;
+		}
+
+		$pid = getmypid();
+		set_config('procid', $key, $pid);
+
+		array_shift($argv);
+		array_shift($argv);
+
+		$r = call_user_func_array('q', $argv);
+		if($r)
+			Cache::set($key, serialize($r));
+
+		del_config('procid', $key);
+	}
+}
-- 
cgit v1.2.3


From 28ae78c579d9423f81f89443c50aa240609fb8f3 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Thu, 21 Jan 2021 08:16:15 +0100
Subject: Higher log level

---
 Zotlabs/Daemon/Cache_query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Daemon/Cache_query.php b/Zotlabs/Daemon/Cache_query.php
index c709c96b5..18d19cdf2 100644
--- a/Zotlabs/Daemon/Cache_query.php
+++ b/Zotlabs/Daemon/Cache_query.php
@@ -15,7 +15,7 @@ class Cache_query {
 
 		$pid = get_config('procid', $key, false);
 		if ($pid && (function_exists('posix_kill') ? posix_kill($pid, 0) : true)) {
-			logger($key . ': procedure already run with pid ' . $pid);
+			logger($key . ': procedure already run with pid ' . $pid, LOGGER_DEBUG);
 			return;
 		}
 
-- 
cgit v1.2.3


From 893847c649a9f3eb99cbaa8fc3bb795bc3184b7a Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Sat, 23 Jan 2021 13:58:05 +0100
Subject: Fix duplicate profile photos creation for clones

---
 Zotlabs/Lib/Libzot.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index 8847f0975..150a6af03 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -667,9 +667,8 @@ class Libzot {
 			$arr['connect_url'] = '';
 
 		if ($r) {
-			if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $r[0]['xchan_photo_date'] != $arr['photo']['updated']) {
+			if ($arr['photo'] && array_key_exists('updated', $arr['photo']) && $arr['photo']['updated'] > $r[0]['xchan_photo_date'])
 				$import_photos = true;
-			}
 
 			// if we import an entry from a site that's not ours and either or both of us is off the grid - hide the entry.
 			/** @TODO: check if we're the same directory realm, which would mean we are allowed to see it */
-- 
cgit v1.2.3


From 33951dc1e4695bece701b85275d4c282c1936150 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Sat, 23 Jan 2021 14:00:38 +0100
Subject: Remove duplicated profile photos

---
 Zotlabs/Update/_1241.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 Zotlabs/Update/_1241.php

(limited to 'Zotlabs')

diff --git a/Zotlabs/Update/_1241.php b/Zotlabs/Update/_1241.php
new file mode 100644
index 000000000..1b2024aad
--- /dev/null
+++ b/Zotlabs/Update/_1241.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1241 {
+
+	function run() {
+	
+		q("START TRANSACTION");
+
+		// remove duplicated profile photos
+		$r = dbq("DELETE FROM photo WHERE imgscale IN (4, 5, 6) AND photo_usage = 0");
+
+		if($r) {
+			q("COMMIT");
+			return UPDATE_SUCCESS;
+		}
+
+		q("ROLLBACK");
+		return UPDATE_FAILED;
+
+	}
+
+}
-- 
cgit v1.2.3