Group by timelines; auto update home, local, direct timelines; Create status

pleroma-cli.sh

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-instance=$(jj -i config.json instance)
+if [ -z "$instance" ]; then
+	instance=$(jj -i config.json instance)
+fi
 alias default_auth_browser=links
 
 export main_basedir=$(dirname $0)
@@ -983,10 +985,14 @@ statuses_auto_update()
 {
 	while true; do 
 		echo "Updating statuses..." 
-		timeline='home'
-		export instance
-        	timeline_api | ./utils/statuses2files.sh
-		echo "Waiting..."
+		for i in home local direct; do
+			echo "checking timeline $i"
+			timeline="$i"
+			export instance timeline
+        		timeline_api | ./utils/statuses2files.sh
+			sleep 3
+		done
+		echo "Sleeping..."
 		sleep 30
 	done
 }
@@ -1028,6 +1034,23 @@ if [ "$daemon_mode" = 'yes' ]; then
 						;;
 				esac
 			fi
+			write_status_action=$(/bin/ls $main_basedir/all_statuses/$instance/create 2>/dev/null)
+			if [ -n "$write_status_action" ]; then
+				dir_write_status=$(dirname "$write_status_action")
+				if [ -d "$dir_status/attachments" ]; then
+                                     attach_id=''
+                                     echo "Uploading attachments..."
+				     for attach in "$dir_write_status"/attachments/*; do
+                	                     attach_id=$(upload_api_media "@$attach" | jj id)
+                        	             attach_id="${attach_id},"
+                                	     echo $attach_id
+	                             done
+         	                     mediaattach=$(echo $attach_id | sed 's/,$//g')
+                                     echo $mediaattach
+                                fi
+				write_api_status $dir_write_status/message
+				rm $write_status_action
+			fi
 		done
 	done
 fi

utils/extract_fields_statuses.sh

@@ -31,4 +31,4 @@ for i in $ids; do
 done
 
 export ids
-echo "$json" | "$main_basedir"/utils/statuses2files_acct.sh
+echo "$json" | "$main_basedir"/utils/statuses2files_group.sh

utils/statuses2files.sh

@@ -6,6 +6,7 @@ ids=$(echo "$json" | jj -l '#.id' | sed 's/"//g')
 
 mkdir -p "$main_basedir/all_statuses/$instance"
 mkdir -p "$main_basedir/statuses/$instance"
+mkdir -p "$main_basedir/timelines/$instance/$timeline"
 
 for i in $ids; do
 	if [ -f "$main_basedir"/all_statuses/$instance/$i/$i.json ]; then

utils/statuses2files_acct.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Move statuses to acct dirs
-
-json=$(cat)
-
-for i in $ids; do
-	status_id=$i
-	acct=$(echo "$json" | jj "#[id=$i].account.acct")
-	mkdir -m 711 -p "$main_basedir"/statuses/$instance/$acct
-	if [ -n "$status_id" ]; then
-		ln -s -r "$main_basedir"/all_statuses/$instance/$status_id "$main_basedir"/statuses/$instance/$acct/$status_id
-		touch --reference "$main_basedir"/all_statuses/$instance/$status_id "$main_basedir"/statuses/$instance/$acct/$status_id
-	fi
-done
-

utils/statuses2files_group.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Group statuses by acct and timelines dirs
+
+json=$(cat)
+
+for i in $ids; do
+	status_id=$i
+	acct=$(echo "$json" | jj "#[id=$i].account.acct")
+	mkdir -m 711 -p "$main_basedir"/statuses/$instance/$acct
+	if [ -n "$status_id" ]; then
+	  ln -s -r "$main_basedir"/all_statuses/$instance/$status_id "$main_basedir"/statuses/$instance/$acct/$status_id
+	  touch --reference "$main_basedir"/all_statuses/$instance/$status_id "$main_basedir"/statuses/$instance/$acct/$status_id
+		
+	  ln -s -r "$main_basedir"/all_statuses/$instance/$status_id "$main_basedir"/timelines/$instance/$timeline/$status_id
+	  touch --reference "$main_basedir"/all_statuses/$instance/$status_id "$main_basedir"/timelines/$instance/$timeline/$status_id
+	fi
+done
+