https://reisub.nsupdate.info/git
/
friendica.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d40cbdc
)
Add server block provision to Diaspora::postAllow
author
Hypolite Petovan
<hypolite@mrpetovan.com>
Sat, 9 Mar 2019 03:40:08 +0000
(22:40 -0500)
committer
Hypolite Petovan
<hypolite@mrpetovan.com>
Sat, 9 Mar 2019 03:40:08 +0000
(22:40 -0500)
src/Protocol/Diaspora.php
patch
|
blob
|
history
diff --git
a/src/Protocol/Diaspora.php
b/src/Protocol/Diaspora.php
index
ca66aa0
..
12f4115
100644
(file)
--- a/
src/Protocol/Diaspora.php
+++ b/
src/Protocol/Diaspora.php
@@
-1135,8
+1135,11
@@
class Diaspora
// Logger::log("defining user ".$contact["nick"]." as friend");
//}
- // We don't seem to like that person
- if ($contact["blocked"]) {
+ // Contact server is blocked
+ if (Network::isUrlBlocked($contact['url'])) {
+ return false;
+ // We don't seem to like that person
+ } elseif ($contact["blocked"]) {
// Maybe blocked, don't accept.
return false;
// We are following this person?