fix: Use correct join for gserver

friendica-delete-old-users.sh

@@ -103,20 +103,20 @@ if [[ -n $(type curl) && -n "${dbengine}" && -n $(type "${dbengine}") && -n $(ty
 	if [[ "${intense_optimizations}" -gt 0 ]]; then
 		"${dbengine}" "${db}" -N -B -q -e "alter table \`contact\` add index if not exists \`contact_baseurl\` (baseurl)"
 	fi
-	"${dbengine}" "${db}" -N -B -q -e \
+	while read -r id nick baseurl lastitem; do
+		loop "${id}" "${nick}" "${baseurl}" &
+		if [[ $(jobs -r -p | wc -l) -ge $(($(getconf _NPROCESSORS_ONLN) / 2)) ]]; then
+			wait -n
+		fi
+	done < <("${dbengine}" "${db}" -N -B -q -e \
 		"select \`id\`, \`nick\`, \`baseurl\`, \`last-item\` from contact c where \
 		c.\`id\` not in (select \`cid\` from \`user-contact\`) and \
 		c.\`id\` not in (select \`uid\` from \`user\`) and \
 		c.\`id\` not in ( select \`contact-id\` from \`group_member\`) and \
-		c.\`contact-type\` != 4 and not pending and \`last-discovery\` < CURDATE() - INTERVAL ${period} and \`last-item\` < CURDATE() - INTERVAL ${period}" |
-		while read -r id nick baseurl lastitem; do
-			loop "${id}" "${nick}" "${baseurl}" &
-			if [[ $(jobs -r -p | wc -l) -ge $(($(getconf _NPROCESSORS_ONLN) * 2)) ]]; then
-				wait -n
-			fi
-		done
+		c.\`contact-type\` != 4 and not pending and \`last-discovery\` < CURDATE() - INTERVAL ${period} and \`last-item\` < CURDATE() - INTERVAL ${period}")
 	wait
 	printf "\n\r"
+	if [[ "${intense_optimizations}" -gt 0 ]]; then
 		"${dbengine}" "${db}" -N -B -q -e "alter table \`post-thread\` auto_increment = 1; \
 			alter table \`post-thread-user\` auto_increment = 1; \
 			alter table \`post-user\` auto_increment = 1; \
@@ -124,7 +124,6 @@ if [[ -n $(type curl) && -n "${dbengine}" && -n $(type "${dbengine}") && -n $(ty
 			alter table \`post\` auto_increment = 1; \
 			alter table \`photo\` auto_increment = 1; \
 			alter table \`contact\` auto_increment = 1"
-	if [[ "${intense_optimizations}" -gt 0 ]]; then
 		"${dbengine}" "${db}" -N -B -q -e "alter table \`contact\` drop index \`contact_baseurl\`"
 	fi
 	rm -rf "${tmpfile}"

friendica-delete-specific-contact.sh

@@ -9,13 +9,17 @@ else
 	exit
 fi
 db="friendica"
-tmpfile=/tmp/friendica-delete-old-users.csv
 url=friendica.example.net
 avatarfolder=/var/www/friendica/avatar
 avatarfolderescaped=${avatarfolder////\\/}
-input_id=${1:-"0"}
+input_id=${1:-""}
 
-loop() {
+#Check if our dependencies are installed
+if [[ -n $(type curl) && -n "${dbengine}" && -n $(type "${dbengine}") && -n $(type date) ]]; then
+	#Check if there was an input id; if not, skip
+	if [[ "${input_id}" != "" ]]; then
+		date
+		while read -r id nick baseurl lastitem; do
 			baseurltrimmed=$(echo "${baseurl}" | sed -e "s/http[s]*:\/\///g")
 			#Find the pictures in the avatar folders and delete them
 			picturecount=0
@@ -42,19 +46,6 @@ loop() {
 			contactcount=$("${dbengine}" "${db}" -N -B -q -e "delete from \`contact\` where \`id\` = ${id}; select row_count();" || echo 0)
 			apcontactcount=$("${dbengine}" "${db}" -N -B -q -e "delete from \`apcontact\` where \`uri-id\` = ${id}; select row_count();" || echo 0)
 			diasporacontactcount=$("${dbengine}" "${db}" -N -B -q -e "delete from \`diaspora-contact\` where \`uri-id\` = ${id}; select row_count();" || echo 0)
-	while read -r tmp_picturecount tmp_postthreadcount tmp_postthreadusercount tmp_postusercount tmp_posttagcount tmp_postcontentcount tmp_postcount tmp_photocount tmp_contactcount tmp_apcontactcount tmp_diasporacontactcount; do
-		picturecount=$((picturecount + tmp_picturecount))
-		postthreadcount=$((postthreadcount + tmp_postthreadcount))
-		postthreadusercount=$((postthreadusercount + tmp_postthreadusercount))
-		postusercount=$((postusercount + tmp_postusercount))
-		posttagcount=$((posttagcount + tmp_posttagcount))
-		postcontentcount=$((postcontentcount + tmp_postcontentcount))
-		postcount=$((postcount + tmp_postcount))
-		photocount=$((photocount + tmp_photocount))
-		contactcount=$((contactcount + tmp_contactcount))
-		apcontactcount=$((apcontactcount + tmp_apcontactcount))
-		diasporacontactcount=$((diasporacontactcount + tmp_diasporacontactcount))
-	done <"${tmpfile}"
 			response_left=$(printf "%s %s %s@%s " "${id}" "${lastitem::-9}" "${nick}" "${baseurltrimmed}")
 			response=$(printf "%spicture:%s " "${response}" "${picturecount}")
 			response=$(printf "%spost-thread:%s " "${response}" "${postthreadcount}")
@@ -67,7 +58,6 @@ loop() {
 			response=$(printf "%scontact:%s " "${response}" "${contactcount}")
 			response=$(printf "%sapcontact:%s " "${response}" "${apcontactcount}")
 			response=$(printf "%sdiaspora-contact:%s " "${response}" "${diasporacontactcount}")
-	echo "${picturecount}" "${postthreadcount} ${postthreadusercount} ${postusercount} ${posttagcount} ${postcontentcount} ${postcount} ${photocount} ${contactcount} ${apcontactcount} ${diasporacontactcount}" >"${tmpfile}"
 			#Previous line clearance
 			#Measure length of string, blank only the excess
 			#Since this string is panned to both sides, we will need to account for two lengths
@@ -92,27 +82,8 @@ loop() {
 			done
 			response=$(printf "%s%s%s" "${response_left}" "${blank_string}" "${response}")
 			printf "%s\r" "${response}"
-}
-
-#Check if our dependencies are installed
-if [[ -n $(type curl) && -n "${dbengine}" && -n $(type "${dbengine}") && -n $(type date) ]]; then
-	#Check if there was an input id; if not, skip
-	if [[ "${input_id}" -gt 0 ]]; then
-		date
-		touch "${tmpfile}"
-		echo "0 0 0 0 0 0 0 0 0 0 0" >"${tmpfile}"
-		"${dbengine}" "${db}" -N -B -q -e \
-			"select \`id\`, \`nick\`, \`baseurl\`, \`last-item\` from contact c where \
-			c.\`id\` = ${input_id}" |
-			while read -r id nick baseurl lastitem; do
-				loop "${id}" "${nick}" "${baseurl}" &
-				if [[ $(jobs -r -p | wc -l) -ge $(getconf _NPROCESSORS_ONLN) ]]; then
-					wait -n
-				fi
-			done
-		wait
+		done < <("${dbengine}" "${db}" -N -B -q -e "select \`id\`, \`nick\`, \`baseurl\`, \`last-item\` from contact where \`id\` = ${input_id}")
 		printf "\n\r"
-		rm -rf "${tmpfile}"
 		date
 	else
 		echo "${input_id}"

friendica-find-largest-accounts.sh

@@ -47,7 +47,7 @@ db="friendica"
 	    on c.id = o.\`owner-id\` \
 	right join tmp_causers as t \
 	    on c.id = t.\`causer-id\` \
-	left join gserver as g \
+	inner join gserver as g \
 	    on g.id = c.gsid \
     order by final_amount asc \
 	limit 1000;"