From 7d4b11b4508ede6a8154513a15408cf8327fd5c5 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 21 May 2023 17:19:39 +0000
Subject: [PATCH 1/2] Preparation to add Bluesky

---
 images/bluesky.jpg              | Bin 0 -> 5070 bytes
 src/Content/ContactSelector.php |   2 ++
 src/Content/Text/Plaintext.php  |   1 -
 src/Core/Protocol.php           |   1 +
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 images/bluesky.jpg

diff --git a/images/bluesky.jpg b/images/bluesky.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..35020ac7702c32bbdc96c7881e455848d3ef9dc5
GIT binary patch
literal 5070
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
HoYng;Qjy>K

literal 0
HcmV?d00001

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index d9f475e2e7..9a8af1cd24 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -141,6 +141,7 @@ class ContactSelector
 			Protocol::ACTIVITYPUB => DI::l10n()->t('ActivityPub'),
 			Protocol::PNUT      =>   DI::l10n()->t('pnut'),
 			Protocol::TUMBLR    =>   DI::l10n()->t('Tumblr'),
+			Protocol::BLUESKY   =>   DI::l10n()->t('Bluesky'),
 		];
 
 		Hook::callAll('network_to_name', $nets);
@@ -212,6 +213,7 @@ class ContactSelector
 			Protocol::ACTIVITYPUB => 'activitypub',
 			Protocol::PNUT      =>   'file-text-o', /// @todo
 			Protocol::TUMBLR    =>   'tumblr',
+			Protocol::BLUESKY   =>   'circle', /// @todo
 		];
 
 		$platform_icons = ['diaspora' => 'diaspora', 'friendica' => 'friendica', 'friendika' => 'friendica',
diff --git a/src/Content/Text/Plaintext.php b/src/Content/Text/Plaintext.php
index 4ea4849fe7..b297f75b36 100644
--- a/src/Content/Text/Plaintext.php
+++ b/src/Content/Text/Plaintext.php
@@ -26,7 +26,6 @@ use Friendica\DI;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Util\Network;
-use Friendica\Util\Strings;
 
 class Plaintext
 {
diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 9776848757..4effa8d74b 100644
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -57,6 +57,7 @@ class Protocol
 	const TWITTER   = 'twit';    // Twitter
 	const DISCOURSE = 'dscs';    // Discourse
 	const TUMBLR    = 'tmbl';    // Tumblr
+	const BLUESKY   = 'bsky';    // Bluesky
 
 	// Dead protocols
 	const APPNET    = 'apdn';    // app.net - Dead protocol

From a417d049cbf4bbda10582cc17de1af7fda01a63d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 21 May 2023 17:30:47 +0000
Subject: [PATCH 2/2] Updated messages.po

---
 view/lang/C/messages.po | 54 ++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index c8fd55ce72..3abf2cedd4 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2023.05-rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-20 12:23+0000\n"
+"POT-Creation-Date: 2023-05-21 17:30+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -774,17 +774,17 @@ msgstr ""
 msgid "All contacts"
 msgstr ""
 
-#: src/BaseModule.php:432 src/Content/Widget.php:239 src/Core/ACL.php:195
+#: src/BaseModule.php:432 src/Content/Widget.php:243 src/Core/ACL.php:195
 #: src/Module/Contact.php:407 src/Module/PermissionTooltip.php:127
 #: src/Module/PermissionTooltip.php:149
 msgid "Followers"
 msgstr ""
 
-#: src/BaseModule.php:437 src/Content/Widget.php:240 src/Module/Contact.php:408
+#: src/BaseModule.php:437 src/Content/Widget.php:244 src/Module/Contact.php:408
 msgid "Following"
 msgstr ""
 
-#: src/BaseModule.php:442 src/Content/Widget.php:241 src/Module/Contact.php:409
+#: src/BaseModule.php:442 src/Content/Widget.php:245 src/Module/Contact.php:409
 msgid "Mutual friends"
 msgstr ""
 
@@ -1113,7 +1113,11 @@ msgstr ""
 msgid "Tumblr"
 msgstr ""
 
-#: src/Content/ContactSelector.php:179
+#: src/Content/ContactSelector.php:144
+msgid "Bluesky"
+msgstr ""
+
+#: src/Content/ContactSelector.php:180
 #, php-format
 msgid "%s (via %s)"
 msgstr ""
@@ -1593,7 +1597,7 @@ msgid ""
 msgstr ""
 
 #: src/Content/ForumManager.php:151 src/Content/Nav.php:276
-#: src/Content/Text/HTML.php:877 src/Content/Widget.php:528
+#: src/Content/Text/HTML.php:877 src/Content/Widget.php:532
 msgid "Forums"
 msgstr ""
 
@@ -1601,12 +1605,12 @@ msgstr ""
 msgid "External link to forum"
 msgstr ""
 
-#: src/Content/ForumManager.php:156 src/Content/Widget.php:507
+#: src/Content/ForumManager.php:156 src/Content/Widget.php:511
 msgid "show less"
 msgstr ""
 
-#: src/Content/ForumManager.php:157 src/Content/Widget.php:409
-#: src/Content/Widget.php:508
+#: src/Content/ForumManager.php:157 src/Content/Widget.php:413
+#: src/Content/Widget.php:512
 msgid "show more"
 msgstr ""
 
@@ -2128,72 +2132,72 @@ msgstr ""
 msgid "Local Directory"
 msgstr ""
 
-#: src/Content/Widget.php:215 src/Model/Group.php:596
+#: src/Content/Widget.php:219 src/Model/Group.php:596
 #: src/Module/Contact.php:394 src/Module/Welcome.php:76
 msgid "Groups"
 msgstr ""
 
-#: src/Content/Widget.php:217
+#: src/Content/Widget.php:221
 msgid "Everyone"
 msgstr ""
 
-#: src/Content/Widget.php:246
+#: src/Content/Widget.php:250
 msgid "Relationships"
 msgstr ""
 
-#: src/Content/Widget.php:248 src/Module/Contact.php:338
+#: src/Content/Widget.php:252 src/Module/Contact.php:338
 #: src/Module/Group.php:291
 msgid "All Contacts"
 msgstr ""
 
-#: src/Content/Widget.php:287
+#: src/Content/Widget.php:291
 msgid "Protocols"
 msgstr ""
 
-#: src/Content/Widget.php:289
+#: src/Content/Widget.php:293
 msgid "All Protocols"
 msgstr ""
 
-#: src/Content/Widget.php:317
+#: src/Content/Widget.php:321
 msgid "Saved Folders"
 msgstr ""
 
-#: src/Content/Widget.php:319 src/Content/Widget.php:350
+#: src/Content/Widget.php:323 src/Content/Widget.php:354
 msgid "Everything"
 msgstr ""
 
-#: src/Content/Widget.php:348
+#: src/Content/Widget.php:352
 msgid "Categories"
 msgstr ""
 
-#: src/Content/Widget.php:405
+#: src/Content/Widget.php:409
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Content/Widget.php:501
+#: src/Content/Widget.php:505
 msgid "Archives"
 msgstr ""
 
-#: src/Content/Widget.php:525
+#: src/Content/Widget.php:529
 msgid "Persons"
 msgstr ""
 
-#: src/Content/Widget.php:526
+#: src/Content/Widget.php:530
 msgid "Organisations"
 msgstr ""
 
-#: src/Content/Widget.php:527 src/Model/Contact.php:1651
+#: src/Content/Widget.php:531 src/Model/Contact.php:1651
 msgid "News"
 msgstr ""
 
-#: src/Content/Widget.php:531 src/Module/Settings/Account.php:453
+#: src/Content/Widget.php:535 src/Module/Settings/Account.php:453
 msgid "Account Types"
 msgstr ""
 
-#: src/Content/Widget.php:532 src/Module/Moderation/BaseUsers.php:69
+#: src/Content/Widget.php:536 src/Module/Moderation/BaseUsers.php:69
 msgid "All"
 msgstr ""