The twitter addon is no import connector anymore

diff --git a/mod/item.php b/mod/item.php
index e15ca639c4032a5ba4784a16e9bf165badfcbe6e..72c2ed8c5d10679fef6b2ddeca31d5752f0b10cd 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -266,6 +266,7 @@ function item_process(array $post, array $request, bool $preview, string $return
                $post['uri-id']         = -1;
                $post['author-network'] = Protocol::DFRN;
                $post['author-updated'] = '';
+               $post['author-alias']   = '';
                $post['author-gsid']    = 0;
                $post['author-uri-id']  = ItemURI::getIdByURI($post['author-link']);
                $post['owner-updated']  = '';

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index e4585cd297392962775558387054ff2d0439c13a..5d33aa59e454f8d04d5a463784727ea9a5d2ea8f 100644 (file)
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -220,7 +220,8 @@ class ContactSelector
                        'GNU Social' => 'gnu-social', 'gnusocial' => 'gnu-social', 'hubzilla' => 'hubzilla',
                        'mastodon' => 'mastodon', 'peertube' => 'peertube', 'pixelfed' => 'pixelfed',
                        'pleroma' => 'pleroma', 'red' => 'hubzilla', 'redmatrix' => 'hubzilla',
-                       'socialhome' => 'social-home', 'wordpress' => 'wordpress', 'lemmy' => 'users'];
+                       'socialhome' => 'social-home', 'wordpress' => 'wordpress', 'lemmy' => 'users',
+                       'firefish' => 'fire', 'calckey' => 'calculator', 'kbin' => 'check'];
 
                $search  = array_keys($nets);
                $replace = array_values($nets);

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index c8c0230c688dd7bafc136127ff05afdf88e92fc4..ce4548d1ad02ea73ba42e39d7292f6c4414da82a 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -102,7 +102,7 @@ class Widget
        public static function unavailableNetworks(): array
        {
                // Always hide content from these networks
-               $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::ZOT];
+               $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::TWITTER, Protocol::ZOT];
 
                if (!Addon::isEnabled("discourse")) {
                        $networks[] = Protocol::DISCOURSE;
@@ -116,10 +116,6 @@ class Widget
                        $networks[] = Protocol::PUMPIO;
                }
 
-               if (!Addon::isEnabled("twitter")) {
-                       $networks[] = Protocol::TWITTER;
-               }
-
                if (!Addon::isEnabled("tumblr")) {
                        $networks[] = Protocol::TUMBLR;
                }

diff --git a/src/Model/Nodeinfo.php b/src/Model/Nodeinfo.php
index 4dbe06c9b352e78c8662f7a2e223b97f68605482..825afb4a9a9f14fa0118cfca340471ee733f676d 100644 (file)
--- a/src/Model/Nodeinfo.php
+++ b/src/Model/Nodeinfo.php
@@ -109,8 +109,9 @@ class Nodeinfo
                        'outbound' => [],
                ];
 
-               if (Addon::isEnabled('blogger')) {
-                       $services['outbound'][] = 'blogger';
+               if (Addon::isEnabled('bluesky')) {
+                       $services['inbound'][] = 'bluesky';
+                       $services['outbound'][] = 'bluesky';
                }
                if (Addon::isEnabled('dwpost')) {
                        $services['outbound'][] = 'dreamwidth';
@@ -125,18 +126,9 @@ class Nodeinfo
                if (Addon::isEnabled('libertree')) {
                        $services['outbound'][] = 'libertree';
                }
-               if (Addon::isEnabled('buffer')) {
-                       $services['outbound'][] = 'linkedin';
-               }
                if (Addon::isEnabled('ljpost')) {
                        $services['outbound'][] = 'livejournal';
                }
-               if (Addon::isEnabled('buffer')) {
-                       $services['outbound'][] = 'pinterest';
-               }
-               if (Addon::isEnabled('posterous')) {
-                       $services['outbound'][] = 'posterous';
-               }
                if (Addon::isEnabled('pumpio')) {
                        $services['inbound'][] = 'pumpio';
                        $services['outbound'][] = 'pumpio';
@@ -147,7 +139,7 @@ class Nodeinfo
                if (Addon::isEnabled('tumblr')) {
                        $services['outbound'][] = 'tumblr';
                }
-               if (Addon::isEnabled('twitter') || Addon::isEnabled('buffer')) {
+               if (Addon::isEnabled('twitter')) {
                        $services['outbound'][] = 'twitter';
                }
                if (Addon::isEnabled('wppost')) {

diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php
index aee7ade5b331c76d35fb049a59d2d3e53700cd74..85785ccca28b58854541b45077efa7e9efa28065 100644 (file)
--- a/src/Module/NodeInfo110.php
+++ b/src/Module/NodeInfo110.php
@@ -88,10 +88,6 @@ class NodeInfo110 extends BaseModule
 
                $nodeinfo['metadata']['services'] = $nodeinfo['services'];
 
-               if (Addon::isEnabled('twitter')) {
-                       $nodeinfo['metadata']['services']['inbound'][] = 'twitter';
-               }
-
                $nodeinfo['metadata']['explicitContent'] = $this->config->get('system', 'explicit_content', false) == true;
 
                $this->response->setType(ICanCreateResponses::TYPE_JSON);

diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php
index a5547be3fb9f4f44aa547912f9c1478c297aa65c..9fc72c528c8d7d52c270ca12a88d45d751d3e8ad 100644 (file)
--- a/src/Module/NodeInfo120.php
+++ b/src/Module/NodeInfo120.php
@@ -72,10 +72,6 @@ class NodeInfo120 extends BaseModule
                        $nodeinfo['protocols'][] = 'ostatus';
                }
 
-               if (Addon::isEnabled('twitter')) {
-                       $nodeinfo['services']['inbound'][] = 'twitter';
-               }
-
                $nodeinfo['services']['inbound'][]  = 'atom1.0';
                $nodeinfo['services']['inbound'][]  = 'rss2.0';
                $nodeinfo['services']['outbound'][] = 'atom1.0';

diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php
index e7112846c6c9c86400a12f595f47fdee31ee2d13..a1a6e0b199efe2084638dfbb7a8ab8bfe38c71e4 100644 (file)
--- a/src/Module/NodeInfo210.php
+++ b/src/Module/NodeInfo210.php
@@ -71,10 +71,6 @@ class NodeInfo210 extends BaseModule
                        $nodeinfo['protocols'][] = 'ostatus';
                }
 
-               if (Addon::isEnabled('twitter')) {
-                       $nodeinfo['services']['inbound'][] = 'twitter';
-               }
-
                $nodeinfo['services']['inbound'][]  = 'atom1.0';
                $nodeinfo['services']['inbound'][]  = 'rss2.0';
                $nodeinfo['services']['outbound'][] = 'atom1.0';

diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php
index e69f75421649bc216b66741ec0de298380b485de..dc205578222eeb3abe11c8cfaff1bfb287adced1 100644 (file)
--- a/src/Module/Statistics.php
+++ b/src/Module/Statistics.php
@@ -59,7 +59,7 @@ class Statistics extends BaseModule
                /// @todo mark the "service" addons and load them dynamically here
                $services = [
                        'appnet'      => Addon::isEnabled('appnet'),
-                       'buffer'      => Addon::isEnabled('buffer'),
+                       'bluesky'     => Addon::isEnabled('bluesky'),
                        'dreamwidth'  => Addon::isEnabled('dreamwidth'),
                        'gnusocial'   => Addon::isEnabled('gnusocial'),
                        'libertree'   => Addon::isEnabled('libertree'),