From: Ian Kelling <iank@fsf.org>
Date: Thu, 21 Oct 2021 21:43:50 +0000 (-0400)
Subject: remove diaspora, we arent using it anymore
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4b6dbb81c9598b8768e5638cdf27d5cc92c7d214;p=pdt.git

remove diaspora, we arent using it anymore
---

diff --git a/pdt.sh b/pdt.sh
index 25cc461..6599fd3 100644
--- a/pdt.sh
+++ b/pdt.sh
@@ -57,12 +57,6 @@ EOF
   deactivate
 }
 
-diaspora() {
-  source ~/src/diaspy/venv/bin/activate
-  python3 ~/src/jan-pona-mute/jan-pona-mute.py "$@" || { deactivate; return 1; }
-  deactivate
-}
-
 # usage: toot [-PROFILE_NAME] [TOOT_ARGS]
 toot() {
   local account
@@ -77,9 +71,7 @@ toot() {
 }
 
 
-# post to mastodon + twitter + gnu social post + diaspora
-#
-# Diaspora is skipped if posting to dbd accounts.
+# post to mastodon + twitter + gnu social post
 #
 # If posting video, it only goes to twitter. Other accounts can be
 # posted to manually with free software.
@@ -161,11 +153,6 @@ pdt() {
   if ! toot -$mastodon_account post "$*" $toot_arg; then
     fails+=(toot)
   fi
-  if ! $dbd; then
-    if ! printf "post %s\n" "${dia_arg}$*" | diaspora; then
-      fails+=(diaspora)
-    fi
-  fi
   # https://gnusocial.net/doc/twitterapi
   if ! curl -o /dev/null -sS -u "$gs_account:$(cat ~/.gnusocial_login-$gs_account)" \
        $gs_arg -F "status=$*" https://status.fsf.org/api/statuses/update.xml; then
@@ -187,7 +174,7 @@ pdt-setup() {
 
   mkdir -p ~/src
   cd ~/src
-  for repo in errhandle rainbowstream diaspy jan-pona-mute video-tweet; do
+  for repo in errhandle rainbowstream video-tweet; do
     if [[ -e $repo ]]; then
       cd $repo
       git fetch
@@ -221,16 +208,6 @@ pdt-setup() {
   deactivate
 
 
-  # This repo's upstream is https://alexschroeder.ch/cgit/diaspy which is
-  # recommended in the install instructions here:
-  # https://alexschroeder.ch/cgit/jan-pona-mute/about/
-  cd ~/src/diaspy
-  python3 -m virtualenv -p python3 venv
-  source venv/bin/activate
-  python3 -m pip install -r requirements.txt
-  python3 -m pip install -e .
-  deactivate
-
   rm -rf ~/src/toot
   mkdir -p ~/src/toot
   cd ~/src/toot
@@ -252,19 +229,6 @@ EOF
   python3 -m pip install -r requirements.txt
   deactivate
 
-
-  if [[ ! -s ~/.config/jan-pona-mute/login ]]; then
-    mkdir ~/.config/jan-pona-mute
-    account=fsf@framasphere.org
-    read -r -p "enter the password for $account > " pass
-    # background: format for this found using the save command
-    cat >~/.config/jan-pona-mute/login <<EOF
-account $account
-password $pass
-login
-EOF
-  fi
-
   for account in dbd fsf; do
     if [[ ! -s ~/.rainbow_oauth-$account ]]; then
       printf "$(tput setaf 5)█$(tput sgr0)%.0s" $(eval echo "{1..${COLUMNS:-60}}");