add details
This commit is contained in:
parent
f614cbdceb
commit
7bb0a5ec5a
1 changed files with 20 additions and 17 deletions
|
@ -129,7 +129,7 @@ class DiscoverMastodonServers:
|
||||||
match = re.search(banned, server)
|
match = re.search(banned, server)
|
||||||
if match:
|
if match:
|
||||||
self._log.debug(
|
self._log.debug(
|
||||||
"Regexp '%s' match server '%s'",
|
"Regexp '%s' match server '%s', banned.",
|
||||||
banned,
|
banned,
|
||||||
server
|
server
|
||||||
)
|
)
|
||||||
|
@ -148,21 +148,24 @@ class DiscoverMastodonServers:
|
||||||
data = self.get_path(server[0], 'api/v1/instance/peers')
|
data = self.get_path(server[0], 'api/v1/instance/peers')
|
||||||
if data:
|
if data:
|
||||||
for new_server in data:
|
for new_server in data:
|
||||||
new_servers_count += 1
|
if ((not self.test_banned_server(new_server)) and
|
||||||
self._log.debug(
|
(new_server not in self.servers) and
|
||||||
"Adding new server '%s'",
|
(new_server not in all_servers)):
|
||||||
new_server
|
new_servers_count += 1
|
||||||
)
|
self._log.debug(
|
||||||
all_servers.append(new_server)
|
"Adding new server '%s' from peers",
|
||||||
self.write_record(
|
new_server
|
||||||
(new_server,
|
)
|
||||||
{
|
all_servers.append(new_server)
|
||||||
"name": new_server,
|
self.write_record(
|
||||||
"last_update": time.time(),
|
(new_server,
|
||||||
"private": False
|
{
|
||||||
}
|
"name": new_server,
|
||||||
|
"last_update": time.time(),
|
||||||
|
"private": False
|
||||||
|
}
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
self._log.debug("Fetching public timeline in server '%s'", server[0])
|
self._log.debug("Fetching public timeline in server '%s'", server[0])
|
||||||
data = self.get_timeline(server[0])
|
data = self.get_timeline(server[0])
|
||||||
if data:
|
if data:
|
||||||
|
@ -171,12 +174,12 @@ class DiscoverMastodonServers:
|
||||||
match_server = re.match(r'https?://([^/]*)/', item['uri'])
|
match_server = re.match(r'https?://([^/]*)/', item['uri'])
|
||||||
if match_server:
|
if match_server:
|
||||||
new_server = match_server.group(1)
|
new_server = match_server.group(1)
|
||||||
if new_server not in all_servers:
|
if not self.test_banned_server(new_server) and new_server not in all_servers:
|
||||||
data = self.get_timeline(new_server)
|
data = self.get_timeline(new_server)
|
||||||
if data:
|
if data:
|
||||||
new_servers_count += 1
|
new_servers_count += 1
|
||||||
self._log.debug(
|
self._log.debug(
|
||||||
"Adding new server '%s'",
|
"Adding new server '%s' from timeline",
|
||||||
new_server
|
new_server
|
||||||
)
|
)
|
||||||
all_servers.append(new_server)
|
all_servers.append(new_server)
|
||||||
|
|
Loading…
Reference in a new issue