Update podlist

app/src/main/AndroidManifest.xml

@@ -66,7 +66,15 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <!--@@@ PODLIST START-->
-
+                <data android:host="joindiaspora.com" android:scheme="https" />
+                <data android:host="diasporaaqmjixh5.onion" android:scheme="http" />
+                <data android:host="pod.geraspora.de" android:scheme="https" />
+                <data android:host="diasp.org" android:scheme="https" />
+                <data android:host="framasphere.org" android:scheme="https" />
+                <data android:host="nerdpol.ch" android:scheme="https" />
+                <data android:host="despora.de" android:scheme="https" />
+                <data android:host="sechat.org" android:scheme="https" />
+                <data android:host="sechatqpscuj2npx.onion" android:scheme="http" />
                 <data android:host="austriapod.at" android:scheme="https" />
                 <data android:host="berdaguermontes.eu" android:scheme="https" />
                 <data android:host="berlinspora.de" android:scheme="https" />
@@ -74,7 +82,6 @@
                 <data android:host="community.kanalinseln.de" android:scheme="https" />
                 <data android:host="cryptospora.net" android:scheme="https" />
                 <data android:host="d.consumium.org" android:scheme="https" />
-                <data android:host="despora.de" android:scheme="https" />
                 <data android:host="dia.manuelbichler.at" android:scheme="https" />
                 <data android:host="dia.myocastor.de" android:scheme="https" />
                 <data android:host="diapod.net" android:scheme="https" />
@@ -86,17 +93,16 @@
                 <data android:host="diasp.eu.com" android:scheme="https" />
                 <data android:host="diasp.nl" android:scheme="https" />
                 <data android:host="diaspod.de" android:scheme="https" />
+                <data android:host="diaspora-fr.org" android:scheme="https" />
                 <data android:host="diaspora.alfter.us" android:scheme="https" />
                 <data android:host="diaspora.bohramt.de" android:scheme="https" />
-                <data android:host="diasporabrazil.org" android:scheme="https" />
-                <data android:host="diasporabr.com.br" android:scheme="https" />
                 <data android:host="diaspora.com.ar" android:scheme="https" />
                 <data android:host="diaspora.deadhexagon.com" android:scheme="https" />
+                <data android:host="diaspora.digi-merc.org" android:scheme="https" />
                 <data android:host="diaspora.digitalismus.org" android:scheme="https" />
                 <data android:host="diaspora.dorf-post.de" android:scheme="https" />
                 <data android:host="diaspora.espiritolivre.org" android:scheme="https" />
                 <data android:host="diaspora.fr33.co" android:scheme="https" />
-                <data android:host="diaspora-fr.org" android:scheme="https" />
                 <data android:host="diaspora.horwood.biz" android:scheme="https" />
                 <data android:host="diaspora.hzsogood.net" android:scheme="https" />
                 <data android:host="diaspora.kapper.net" android:scheme="https" />
@@ -104,15 +110,14 @@
                 <data android:host="diaspora.kosebamse.com" android:scheme="https" />
                 <data android:host="diaspora.lebarjack.com" android:scheme="https" />
                 <data android:host="diaspora.mazi.tk" android:scheme="https" />
+                <data android:host="diaspora.microdata.co.uk" android:scheme="https" />
                 <data android:host="diaspora.moosje.nl" android:scheme="https" />
                 <data android:host="diaspora.net.gr" android:scheme="https" />
-                <data android:host="diasporanet.tk" android:scheme="https" />
                 <data android:host="diaspora.permutationsofchaos.com" android:scheme="https" />
                 <data android:host="diaspora.pimpmypony.eu" android:scheme="https" />
                 <data android:host="diaspora.pingupod.de" android:scheme="https" />
                 <data android:host="diaspora.podzimek.org" android:scheme="https" />
                 <data android:host="diaspora.poleni.com" android:scheme="https" />
-                <data android:host="diasporapr.tk" android:scheme="https" />
                 <data android:host="diaspora.psyco.fr" android:scheme="https" />
                 <data android:host="diaspora.punkbeer.me" android:scheme="https" />
                 <data android:host="diaspora.raven-ip.com" android:scheme="https" />
@@ -126,10 +131,14 @@
                 <data android:host="diaspora.u4u.org" android:scheme="https" />
                 <data android:host="diaspora.undernet.uy" android:scheme="https" />
                 <data android:host="diaspora.unixcorn.org" android:scheme="https" />
-                <data android:host="diasporausa.com" android:scheme="https" />
                 <data android:host="diaspora.weenmebrown.com" android:scheme="https" />
                 <data android:host="diaspora.xcelor8.com" android:scheme="https" />
-                <data android:host="diasp.org" android:scheme="https" />
+                <data android:host="diasporabr.com.br" android:scheme="https" />
+                <data android:host="diasporabrazil.org" android:scheme="https" />
+                <data android:host="diasporanet.tk" android:scheme="https" />
+                <data android:host="diasporapr.tk" android:scheme="https" />
+                <data android:host="diasporausa.com" android:scheme="https" />
+                <data android:host="diasporing.ch" android:scheme="https" />
                 <data android:host="dissociateduse.rs" android:scheme="https" />
                 <data android:host="distributed.chat" android:scheme="https" />
                 <data android:host="eat.egregious.ly" android:scheme="https" />
@@ -138,50 +147,43 @@
                 <data android:host="espora.social" android:scheme="https" />
                 <data android:host="failure.net" android:scheme="https" />
                 <data android:host="flokk.no" android:scheme="https" />
-                <data android:host="framasphere.org" android:scheme="https" />
                 <data android:host="freehuman.fr" android:scheme="https" />
                 <data android:host="friendica.tk" android:scheme="https" />
                 <data android:host="home.enslaver.net" android:scheme="https" />
                 <data android:host="idoru.pl" android:scheme="https" />
                 <data android:host="iliketoast.net" android:scheme="https" />
-                <data android:host="joindiaspora.com" android:scheme="https" />
                 <data android:host="jons.gr" android:scheme="https" />
                 <data android:host="kapok.se" android:scheme="https" />
                 <data android:host="karmasphe.re" android:scheme="https" />
                 <data android:host="kosmospora.net" android:scheme="https" />
                 <data android:host="laba.mba" android:scheme="https" />
-                <data android:host="legends.im" android:scheme="https" />
                 <data android:host="liberdade.digital" android:scheme="https" />
                 <data android:host="libertypod.org" android:scheme="https" />
-                <data android:host="LibertyPod.org" android:scheme="https" />
                 <data android:host="librenet.co.za" android:scheme="https" />
                 <data android:host="librenet.gr" android:scheme="https" />
                 <data android:host="londor.be" android:scheme="https" />
-                <data android:host="lubiora.de" android:scheme="https" />
                 <data android:host="misamigos.online" android:scheme="https" />
                 <data android:host="mondiaspora.net" android:scheme="https" />
-                <data android:host="nerdpol.ch" android:scheme="https" />
                 <data android:host="networkwizard.de" android:scheme="https" />
                 <data android:host="nx-pod.de" android:scheme="https" />
                 <data android:host="parteidervernunft.com" android:scheme="https" />
+                <data android:host="pe.spbstu.ru" android:scheme="https" />
                 <data android:host="pod.4ray.co" android:scheme="https" />
                 <data android:host="pod.8n1.org" android:scheme="https" />
                 <data android:host="pod.alterworld.info" android:scheme="https" />
                 <data android:host="pod.asap-soft.com" android:scheme="https" />
-                <data android:host="podbay.net" android:scheme="https" />
                 <data android:host="pod.cannyfoxx.me" android:scheme="https" />
                 <data android:host="pod.comin.dk" android:scheme="https" />
                 <data android:host="pod.cyberdungeon.de" android:scheme="https" />
                 <data android:host="pod.dapor.net" android:scheme="https" />
                 <data android:host="pod.datenknoten.me" android:scheme="https" />
-                <data android:host="poddery.com" android:scheme="https" />
                 <data android:host="pod.diaspora.software" android:scheme="https" />
                 <data android:host="pod.dirkomatik.de" android:scheme="https" />
                 <data android:host="pod.disroot.org" android:scheme="https" />
                 <data android:host="pod.dobs.at" android:scheme="https" />
                 <data android:host="pod.dragondreaming.de" android:scheme="https" />
+                <data android:host="pod.gaialabs.ch" android:scheme="https" />
                 <data android:host="pod.gedankenausbruch.com" android:scheme="https" />
-                <data android:host="pod.geraspora.de" android:scheme="https" />
                 <data android:host="pod.gleisnetze.de" android:scheme="https" />
                 <data android:host="pod.goodsharing.at" android:scheme="https" />
                 <data android:host="pod.hashtagueule.fr" android:scheme="https" />
@@ -200,32 +202,33 @@
                 <data android:host="pod.psynet.su" android:scheme="https" />
                 <data android:host="pod.readme.is" android:scheme="https" />
                 <data android:host="pod.richtig.koeln" android:scheme="https" />
-                <data android:host="podricing.pw" android:scheme="https" />
+                <data android:host="pod.roocita.com" android:scheme="https" />
                 <data android:host="pod.ros-it.ch" android:scheme="https" />
                 <data android:host="pod.sccn.club" android:scheme="https" />
                 <data android:host="pod.sertelon.fr" android:scheme="https" />
                 <data android:host="pod.shouldit.work" android:scheme="https" />
-                <data android:host="pod.skisso.com" android:scheme="https" />
                 <data android:host="pod.storel.li" android:scheme="https" />
                 <data android:host="pod.tchncs.de" android:scheme="https" />
                 <data android:host="pod.thomasdalichow.de" android:scheme="https" />
                 <data android:host="pod.undreaming.org" android:scheme="https" />
+                <data android:host="pod.volt.io" android:scheme="https" />
+                <data android:host="podbay.net" android:scheme="https" />
+                <data android:host="poddery.com" android:scheme="https" />
+                <data android:host="podricing.pw" android:scheme="https" />
                 <data android:host="pubpod.alqualonde.org" android:scheme="https" />
                 <data android:host="realms.the-wizard.co.za" android:scheme="https" />
                 <data android:host="revreso.de" android:scheme="https" />
                 <data android:host="ruhrspora.de" android:scheme="https" />
                 <data android:host="russiandiaspora.org" android:scheme="https" />
-                <data android:host="sechat.org" android:scheme="https" />
                 <data android:host="shrekislove.us" android:scheme="https" />
                 <data android:host="social.acclaro.digital" android:scheme="https" />
                 <data android:host="social.baldr.io" android:scheme="https" />
                 <data android:host="social.daxbau.net" android:scheme="https" />
                 <data android:host="social.elaon.de" android:scheme="https" />
-                <data android:host="socializer.cc" android:scheme="https" />
                 <data android:host="social.lanham.id.au" android:scheme="https" />
                 <data android:host="social.mbuto.me" android:scheme="https" />
                 <data android:host="social.sum7.de" android:scheme="https" />
-                <data android:host="spora.com.ua" android:scheme="https" />
+                <data android:host="socializer.cc" android:scheme="https" />
                 <data android:host="spora.zone" android:scheme="https" />
                 <data android:host="subvillage.de" android:scheme="https" />
                 <data android:host="sysad.org" android:scheme="https" />
@@ -238,7 +241,6 @@
                 <data android:host="wk3.org" android:scheme="https" />
                 <data android:host="www.datataffel.dk" android:scheme="https" />
                 <data android:host="www.diasporaix.de" android:scheme="https" />
-
                 <!--@@@ PODLIST END-->
             </intent-filter>
 

app/src/main/java/com/github/dfa/diaspora_android/data/DiasporaPodList.java

@@ -1,6 +1,8 @@
 package com.github.dfa.diaspora_android.data;
 
-import android.support.annotation.NonNull;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -8,10 +10,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 
 /**
  * Created by gsantner (https://gsantner.github.io/ on 30.09.16.
@@ -25,6 +23,8 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
     private boolean trackMergeChanges = false;
     private Integer trackAddedIndexStart = -1;
     private List<Integer> trackUpdatedIndexes = new ArrayList<>();
+    private boolean keepOldNameDuringMerge = false;
+    private long timestamp;
 
     public DiasporaPodList() {
     }
@@ -45,6 +45,9 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
                 pods.add(pod);
             }
         }
+        if (json.has("timestamp")) {
+            timestamp = json.getLong("timestamp");
+        }
         return this;
     }
 
@@ -58,6 +61,7 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
             jpods.put(pod.toJson());
         }
         json.put("pods", jpods);
+        json.put("timestamp", System.currentTimeMillis());
         return json;
     }
 
@@ -89,6 +93,9 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
                 if (updatePodBak.getScore() != 0 && updatePod.getScore() == 0) {
                     updatePod.setScore(updatePodBak.getScore());
                 }
+                if (!updatePodBak.getName().equals("") && keepOldNameDuringMerge) {
+                    updatePod.setName(updatePodBak.getName());
+                }
                 if (isTrackMergeChanges()) {
                     trackUpdatedIndexes.add(index);
                 }
@@ -154,6 +161,14 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
         return trackUpdatedIndexes;
     }
 
+    public boolean isKeepOldNameDuringMerge() {
+        return keepOldNameDuringMerge;
+    }
+
+    public void setKeepOldNameDuringMerge(boolean keepOldNameDuringMerge) {
+        this.keepOldNameDuringMerge = keepOldNameDuringMerge;
+    }
+
     /*      ██████╗  ██████╗ ██████╗
          *      ██╔══██╗██╔═══██╗██╔══██╗
          *      ██████╔╝██║   ██║██║  ██║
@@ -289,7 +304,6 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
         /*
         * Getter & Setter
         */
-        @NonNull
         public List<DiasporaPodUrl> getPodUrls() {
             return podUrls;
         }
@@ -299,7 +313,6 @@ public class DiasporaPodList implements Iterable<DiasporaPodList.DiasporaPod>, S
             return this;
         }
 
-        @NonNull
         public List<String> getMainLangs() {
             return mainLangs;
         }

app/src/main/java/com/github/dfa/diaspora_android/fragment/PodSelectionFragment.java

@@ -20,6 +20,7 @@ import android.webkit.CookieManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.R;
@@ -83,7 +84,14 @@ public class PodSelectionFragment extends CustomFragment implements SearchView.O
         listViewPod.setTextFilterEnabled(true);
         listViewPod.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                showPodSelectionDialog(podList.getPodAt(i));
+                String text = ((TextView) view).getText().toString();
+                for (DiasporaPod pod : podList) {
+                    if (pod.getPodUrl().getHost().equals(text)) {
+                        showPodSelectionDialog(pod);
+                        return;
+                    }
+                }
+
             }
         });
         LocalBroadcastManager.getInstance(getContext()).registerReceiver(podListReceiver, new IntentFilter(GetPodsService.MESSAGE_PODS_RECEIVED));
@@ -139,7 +147,7 @@ public class PodSelectionFragment extends CustomFragment implements SearchView.O
     private void updateListedPods() {
         final ArrayList<String> listedPodsList = new ArrayList<>();
         for (DiasporaPod pod : this.podList) {
-            listedPodsList.add(pod.getPodUrls().get(0).getHost());
+            listedPodsList.add(pod.getPodUrl().getHost());
         }
 
         listViewPodAdapter = new ArrayAdapter<>(

app/src/main/res/raw/podlist.json

@@ -1,4 +1,75 @@
-{"pods": [
+{
+  "pods": [
+    {
+      "active6": 10775,
+      "score": 20,
+      "podUrls": [
+        {"host": "joindiaspora.com"},
+        {
+          "protocol": "http",
+          "port": 80,
+          "host": "diasporaaqmjixh5.onion"
+        }
+      ],
+      "name": "JoinDiaspora*",
+      "mainLangs": ["en"],
+      "id": 38077
+    },
+    {
+      "active6": 7260,
+      "score": 20,
+      "podUrls": [{"host": "pod.geraspora.de"}],
+      "name": "Geraspora",
+      "mainLangs": ["de"],
+      "id": 24783
+    },
+    {
+      "active6": 0,
+      "score": 0,
+      "podUrls": [{"host": "diasp.org"}],
+      "name": "diasporg*",
+      "mainLangs": [],
+      "id": 12688
+    },
+    {
+      "active6": 9039,
+      "score": 20,
+      "podUrls": [{"host": "framasphere.org"}],
+      "name": "Framasphere",
+      "mainLangs": [],
+      "id": 38776
+    },
+    {
+      "active6": 540,
+      "score": 20,
+      "podUrls": [{"host": "nerdpol.ch"}],
+      "name": "nerdpol.ch*",
+      "mainLangs": ["de"],
+      "id": 17343
+    },
+    {
+      "active6": 859,
+      "score": 20,
+      "podUrls": [{"host": "despora.de"}],
+      "name": "Despora*",
+      "mainLangs": ["de"],
+      "id": 6695
+    },
+    {
+      "active6": 626,
+      "score": 20,
+      "podUrls": [
+        {"host": "sechat.org"},
+        {
+          "protocol": "http",
+          "port": 80,
+          "host": "sechatqpscuj2npx.onion"
+        }
+      ],
+      "name": "Sechat*",
+      "mainLangs": [],
+      "id": 6524
+    },
     {
       "active6": 0,
       "score": 0,
@@ -16,7 +87,7 @@
       "id": 25432
     },
     {
-    "active6": 184,
+      "active6": 179,
       "score": 20,
       "podUrls": [{"host": "berlinspora.de"}],
       "name": "berlinspora.de",
@@ -32,7 +103,7 @@
       "id": 49516
     },
     {
-    "active6": 7,
+      "active6": 6,
       "score": 20,
       "podUrls": [{"host": "community.kanalinseln.de"}],
       "name": "community.kanalinseln.de",
@@ -48,7 +119,7 @@
       "id": 46568
     },
     {
-    "active6": 73,
+      "active6": 69,
       "score": 20,
       "podUrls": [{"host": "d.consumium.org"}],
       "name": "d.consumium.org",
@@ -56,16 +127,8 @@
       "id": 2107
     },
     {
-    "active6": 872,
+      "active6": 21,
       "score": 20,
-    "podUrls": [{"host": "despora.de"}],
-    "name": "despora.de",
-    "mainLangs": ["de"],
-    "id": 6695
-  },
-  {
-    "active6": 0,
-    "score": 0,
       "podUrls": [{"host": "dia.manuelbichler.at"}],
       "name": "dia.manuelbichler.at",
       "mainLangs": ["de"],
@@ -96,7 +159,7 @@
       "id": 13926
     },
     {
-    "active6": 145,
+      "active6": 146,
       "score": 20,
       "podUrls": [{"host": "diasp.ca"}],
       "name": "diasp.ca",
@@ -136,21 +199,13 @@
       "id": 4343
     },
     {
-    "active6": 195,
+      "active6": 199,
       "score": 20,
       "podUrls": [{"host": "diasp.nl"}],
       "name": "diasp.nl",
       "mainLangs": ["nl"],
       "id": 33262
     },
-  {
-    "active6": 0,
-    "score": 0,
-    "podUrls": [{"host": "diasp.org"}],
-    "name": "diasp.org",
-    "mainLangs": [],
-    "id": 12688
-  },
     {
       "active6": 234,
       "score": 20,
@@ -199,6 +254,14 @@
       "mainLangs": [],
       "id": 16721
     },
+    {
+      "active6": 0,
+      "score": 12,
+      "podUrls": [{"host": "diaspora.digi-merc.org"}],
+      "name": "digi-merc.org",
+      "mainLangs": [],
+      "id": 13165
+    },
     {
       "active6": 49,
       "score": 20,
@@ -240,7 +303,7 @@
       "id": 12684
     },
     {
-    "active6": 106,
+      "active6": 102,
       "score": 20,
       "podUrls": [{"host": "diaspora.hzsogood.net"}],
       "name": "hzsogood.net",
@@ -248,7 +311,7 @@
       "id": 3651
     },
     {
-    "active6": 82,
+      "active6": 78,
       "score": 20,
       "podUrls": [{"host": "diaspora.kapper.net"}],
       "name": "kapper.net",
@@ -256,7 +319,7 @@
       "id": 40765
     },
     {
-    "active6": 160,
+      "active6": 155,
       "score": 20,
       "podUrls": [{"host": "diaspora.koehn.com"}],
       "name": "koehn.com",
@@ -296,7 +359,7 @@
       "id": 8704
     },
     {
-    "active6": 3,
+      "active6": 2,
       "score": 20,
       "podUrls": [{"host": "diaspora.moosje.nl"}],
       "name": "moosje.nl",
@@ -312,7 +375,7 @@
       "id": 9863
     },
     {
-    "active6": 282,
+      "active6": 278,
       "score": 20,
       "podUrls": [{"host": "diaspora.permutationsofchaos.com"}],
       "name": "permutationsofchaos.com",
@@ -320,7 +383,7 @@
       "id": 1513
     },
     {
-    "active6": 65,
+      "active6": 61,
       "score": 20,
       "podUrls": [{"host": "diaspora.pimpmypony.eu"}],
       "name": "pimpmypony.eu",
@@ -344,7 +407,7 @@
       "id": 12139
     },
     {
-    "active6": 65,
+      "active6": 59,
       "score": 20,
       "podUrls": [{"host": "diaspora.poleni.com"}],
       "name": "poleni.com",
@@ -352,7 +415,7 @@
       "id": 1154
     },
     {
-    "active6": 177,
+      "active6": 179,
       "score": 20,
       "podUrls": [{"host": "diaspora.psyco.fr"}],
       "name": "psyco.fr",
@@ -368,8 +431,8 @@
       "id": 44751
     },
     {
-    "active6": 0,
+      "active6": 28,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "diaspora.raven-ip.com"}],
       "name": "raven-ip.com",
       "mainLangs": [],
@@ -416,7 +479,7 @@
       "id": 39183
     },
     {
-    "active6": 40,
+      "active6": 38,
       "score": 20,
       "podUrls": [{"host": "diaspora.subsignal.org"}],
       "name": "subsignal.org",
@@ -432,7 +495,7 @@
       "id": 46672
     },
     {
-    "active6": 19,
+      "active6": 23,
       "score": 20,
       "podUrls": [{"host": "diaspora.u4u.org"}],
       "name": "u4u.org",
@@ -472,7 +535,7 @@
       "id": 27412
     },
     {
-    "active6": 1264,
+      "active6": 1258,
       "score": 20,
       "podUrls": [{"host": "diasporabr.com.br"}],
       "name": "diasporabr.com.br",
@@ -512,7 +575,7 @@
       "id": 46740
     },
     {
-    "active6": 1,
+      "active6": 9,
       "score": 20,
       "podUrls": [{"host": "diasporing.ch"}],
       "name": "Diasporing.ch",
@@ -529,7 +592,7 @@
     },
     {
       "active6": 0,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "distributed.chat"}],
       "name": "distributed.chat",
       "mainLangs": [],
@@ -560,7 +623,7 @@
       "id": 11247
     },
     {
-    "active6": 204,
+      "active6": 220,
       "score": 20,
       "podUrls": [{"host": "espora.social"}],
       "name": "espora.social",
@@ -576,7 +639,7 @@
       "id": 41690
     },
     {
-    "active6": 177,
+      "active6": 174,
       "score": 20,
       "podUrls": [{"host": "flokk.no"}],
       "name": "flokk.no",
@@ -584,16 +647,8 @@
       "id": 45658
     },
     {
-    "active6": 8973,
+      "active6": 193,
       "score": 20,
-    "podUrls": [{"host": "framasphere.org"}],
-    "name": "framasphere.org",
-    "mainLangs": [],
-    "id": 38776
-  },
-  {
-    "active6": 0,
-    "score": 0,
       "podUrls": [{"host": "freehuman.fr"}],
       "name": "freehuman.fr",
       "mainLangs": ["fr"],
@@ -608,8 +663,8 @@
       "id": 27402
     },
     {
-    "active6": 19,
+      "active6": 312,
-    "score": 6,
+      "score": 20,
       "podUrls": [{"host": "home.enslaver.net"}],
       "name": "home.enslaver.net",
       "mainLangs": [],
@@ -624,7 +679,7 @@
       "id": 40630
     },
     {
-    "active6": 68,
+      "active6": 65,
       "score": 20,
       "podUrls": [{"host": "iliketoast.net"}],
       "name": "iliketoast.net",
@@ -632,23 +687,8 @@
       "id": 23287
     },
     {
-    "active6": 10775,
+      "active6": 13,
       "score": 20,
-    "podUrls": [
-      {"host": "joindiaspora.com"},
-      {
-        "protocol": "http",
-        "port": 80,
-        "host": "diasporaaqmjixh5.onion"
-      }
-    ],
-    "name": "joindiaspora.com",
-    "mainLangs": [],
-    "id": 38077
-  },
-  {
-    "active6": 0,
-    "score": 0,
       "podUrls": [{"host": "jons.gr"}],
       "name": "jons.gr",
       "mainLangs": [],
@@ -663,7 +703,7 @@
       "id": 32786
     },
     {
-    "active6": 81,
+      "active6": 70,
       "score": 20,
       "podUrls": [{"host": "karmasphe.re"}],
       "name": "karmasphe.re",
@@ -672,7 +712,7 @@
     },
     {
       "active6": 0,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "kosmospora.net"}],
       "name": "kosmospora.net",
       "mainLangs": [],
@@ -687,15 +727,7 @@
       "id": 32393
     },
     {
-    "active6": 0,
+      "active6": 147,
-    "score": 0,
-    "podUrls": [{"host": "legends.im"}],
-    "name": "legends.im",
-    "mainLangs": [],
-    "id": 46156
-  },
-  {
-    "active6": 151,
       "score": 20,
       "podUrls": [{"host": "liberdade.digital"}],
       "name": "liberdade.digital",
@@ -719,7 +751,7 @@
       "id": 14862
     },
     {
-    "active6": 180,
+      "active6": 177,
       "score": 20,
       "podUrls": [{"host": "librenet.gr"}],
       "name": "librenet.gr",
@@ -734,14 +766,6 @@
       "mainLangs": [],
       "id": 32281
     },
-  {
-    "active6": 0,
-    "score": 0,
-    "podUrls": [{"host": "lubiora.de"}],
-    "name": "lubiora.de",
-    "mainLangs": ["de"],
-    "id": 1569
-  },
     {
       "active6": 0,
       "score": 20,
@@ -751,21 +775,13 @@
       "id": 16366
     },
     {
-    "active6": 673,
+      "active6": 663,
       "score": 20,
       "podUrls": [{"host": "mondiaspora.net"}],
       "name": "mondiaspora.net",
       "mainLangs": [],
       "id": 3365
     },
-  {
-    "active6": 547,
-    "score": 20,
-    "podUrls": [{"host": "nerdpol.ch"}],
-    "name": "nerdpol.ch",
-    "mainLangs": ["de"],
-    "id": 17343
-  },
     {
       "active6": 0,
       "score": 20,
@@ -791,7 +807,7 @@
       "id": 31558
     },
     {
-    "active6": 36,
+      "active6": 37,
       "score": 20,
       "podUrls": [{"host": "pe.spbstu.ru"}],
       "name": "pe.spbstu.ru",
@@ -855,8 +871,8 @@
       "id": 887
     },
     {
-    "active6": 0,
+      "active6": 13,
-    "score": 0,
+      "score": 14,
       "podUrls": [{"host": "pod.dapor.net"}],
       "name": "dapor.net",
       "mainLangs": [],
@@ -871,8 +887,8 @@
       "id": 34173
     },
     {
-    "active6": 0,
+      "active6": 1,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "pod.diaspora.software"}],
       "name": "software",
       "mainLangs": [],
@@ -910,6 +926,14 @@
       "mainLangs": ["de"],
       "id": 16107
     },
+    {
+      "active6": 0,
+      "score": 0,
+      "podUrls": [{"host": "pod.gaialabs.ch"}],
+      "name": "gaialabs.ch",
+      "mainLangs": ["de"],
+      "id": 45384
+    },
     {
       "active6": 0,
       "score": 0,
@@ -918,14 +942,6 @@
       "mainLangs": [],
       "id": 6893
     },
-  {
-    "active6": 7329,
-    "score": 20,
-    "podUrls": [{"host": "pod.geraspora.de"}],
-    "name": "geraspora.de",
-    "mainLangs": ["de"],
-    "id": 24783
-  },
     {
       "active6": 0,
       "score": 20,
@@ -943,7 +959,7 @@
       "id": 36615
     },
     {
-    "active6": 59,
+      "active6": 58,
       "score": 20,
       "podUrls": [{"host": "pod.hashtagueule.fr"}],
       "name": "hashtagueule.fr",
@@ -951,7 +967,7 @@
       "id": 10296
     },
     {
-    "active6": 87,
+      "active6": 81,
       "score": 20,
       "podUrls": [{"host": "pod.hfrc.de"}],
       "name": "hfrc.de",
@@ -983,7 +999,7 @@
       "id": 15016
     },
     {
-    "active6": 15,
+      "active6": 16,
       "score": 20,
       "podUrls": [{"host": "pod.jpope.org"}],
       "name": "jpope.org",
@@ -999,7 +1015,7 @@
       "id": 32151
     },
     {
-    "active6": 61,
+      "active6": 60,
       "score": 20,
       "podUrls": [{"host": "pod.liebeleu.de"}],
       "name": "liebeleu.de",
@@ -1015,7 +1031,7 @@
       "id": 9248
     },
     {
-    "active6": 108,
+      "active6": 109,
       "score": 20,
       "podUrls": [{"host": "pod.nomorestars.com"}],
       "name": "nomorestars.com",
@@ -1023,15 +1039,15 @@
       "id": 31958
     },
     {
-    "active6": 0,
+      "active6": 398,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "pod.orkz.net"}],
       "name": "orkz.net",
       "mainLangs": [],
       "id": 41604
     },
     {
-    "active6": 34,
+      "active6": 32,
       "score": 20,
       "podUrls": [{"host": "pod.ponk.pink"}],
       "name": "ponk.pink",
@@ -1047,7 +1063,7 @@
       "id": 21338
     },
     {
-    "active6": 97,
+      "active6": 94,
       "score": 20,
       "podUrls": [{"host": "pod.psynet.su"}],
       "name": "psynet.su",
@@ -1110,14 +1126,6 @@
       "mainLangs": [],
       "id": 47610
     },
-  {
-    "active6": 0,
-    "score": 0,
-    "podUrls": [{"host": "pod.skisso.com"}],
-    "name": "skisso.com",
-    "mainLangs": [],
-    "id": 32924
-  },
     {
       "active6": 5,
       "score": 20,
@@ -1127,7 +1135,7 @@
       "id": 33181
     },
     {
-    "active6": 76,
+      "active6": 72,
       "score": 20,
       "podUrls": [{"host": "pod.tchncs.de"}],
       "name": "tchncs.de",
@@ -1135,7 +1143,7 @@
       "id": 20115
     },
     {
-    "active6": 50,
+      "active6": 51,
       "score": 20,
       "podUrls": [{"host": "pod.thomasdalichow.de"}],
       "name": "thomasdalichow.de",
@@ -1151,7 +1159,15 @@
       "id": 40460
     },
     {
-    "active6": 52,
+      "active6": 1,
+      "score": 11,
+      "podUrls": [{"host": "pod.volt.io"}],
+      "name": "volt.io",
+      "mainLangs": [],
+      "id": 19139
+    },
+    {
+      "active6": 48,
       "score": 20,
       "podUrls": [{"host": "podbay.net"}],
       "name": "podbay.net",
@@ -1159,7 +1175,7 @@
       "id": 16270
     },
     {
-    "active6": 344,
+      "active6": 354,
       "score": 20,
       "podUrls": [{"host": "poddery.com"}],
       "name": "poddery.com",
@@ -1175,7 +1191,7 @@
       "id": 6398
     },
     {
-    "active6": 90,
+      "active6": 88,
       "score": 20,
       "podUrls": [{"host": "pubpod.alqualonde.org"}],
       "name": "pubpod.alqualonde.org",
@@ -1199,7 +1215,7 @@
       "id": 41788
     },
     {
-    "active6": 106,
+      "active6": 108,
       "score": 20,
       "podUrls": [{"host": "ruhrspora.de"}],
       "name": "ruhrspora.de",
@@ -1207,21 +1223,13 @@
       "id": 46198
     },
     {
-    "active6": 0,
+      "active6": 431,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "russiandiaspora.org"}],
       "name": "russiandiaspora.org",
       "mainLangs": [],
       "id": 22166
     },
-  {
-    "active6": 634,
-    "score": 20,
-    "podUrls": [{"host": "sechat.org"}],
-    "name": "sechat.org",
-    "mainLangs": [],
-    "id": 6524
-  },
     {
       "active6": 0,
       "score": 0,
@@ -1231,31 +1239,31 @@
       "id": 39003
     },
     {
-    "active6": 0,
+      "active6": 1,
-    "score": 0,
+      "score": -18,
       "podUrls": [{"host": "social.acclaro.digital"}],
       "name": "acclaro.digital",
       "mainLangs": [],
       "id": 33853
     },
     {
-    "active6": 0,
+      "active6": 23,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "social.baldr.io"}],
       "name": "baldr.io",
       "mainLangs": [],
       "id": 7781
     },
     {
-    "active6": 0,
+      "active6": 5,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "social.daxbau.net"}],
       "name": "daxbau.net",
       "mainLangs": [],
       "id": 37517
     },
     {
-    "active6": 84,
+      "active6": 85,
       "score": 20,
       "podUrls": [{"host": "social.elaon.de"}],
       "name": "elaon.de",
@@ -1294,14 +1302,6 @@
       "mainLangs": [],
       "id": 30584
     },
-  {
-    "active6": 0,
-    "score": 0,
-    "podUrls": [{"host": "spora.com.ua"}],
-    "name": "spora.com.ua",
-    "mainLangs": [],
-    "id": 29583
-  },
     {
       "active6": 0,
       "score": 0,
@@ -1319,7 +1319,7 @@
       "id": 29359
     },
     {
-    "active6": 50,
+      "active6": 49,
       "score": 20,
       "podUrls": [{"host": "sysad.org"}],
       "name": "sysad.org",
@@ -1335,7 +1335,7 @@
       "id": 5276
     },
     {
-    "active6": 4299,
+      "active6": 4222,
       "score": 20,
       "podUrls": [{"host": "therealtalk.org"}],
       "name": "therealtalk.org",
@@ -1343,8 +1343,8 @@
       "id": 26786
     },
     {
-    "active6": 0,
+      "active6": 47,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "thinkopen.net"}],
       "name": "thinkopen.net",
       "mainLangs": [],
@@ -1375,27 +1375,29 @@
       "id": 5842
     },
     {
-    "active6": 0,
+      "active6": 312,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "wk3.org"}],
       "name": "wk3.org",
       "mainLangs": [],
       "id": 39292
     },
     {
-    "active6": 0,
+      "active6": 45,
-    "score": 0,
+      "score": 20,
       "podUrls": [{"host": "www.datataffel.dk"}],
       "name": "datataffel.dk",
       "mainLangs": [],
       "id": 35984
     },
     {
-    "active6": 38,
+      "active6": 37,
       "score": 20,
       "podUrls": [{"host": "www.diasporaix.de"}],
       "name": "diasporaix.de",
       "mainLangs": ["de"],
       "id": 26219
     }
-]}
+  ],
+  "timestamp": 1475804650123
+}