From a4c5d7539c63ad018686ea9fd65bcb6c0b0a32fc Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 9 Nov 2024 14:39:32 +0000 Subject: [PATCH] =?UTF-8?q?Preparation=20f=C3=BCr=20multiple=20icon=20styl?= =?UTF-8?q?es=20/=20improved=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSES/EUPL-1.2.txt | 287 ----------- LICENSES/Zlib.txt | 15 - images/platforms/black/aardwolf.svg | 1 + images/platforms/black/aardwolf.svg.license | 2 + images/platforms/black/activitypods.svg | 1 + .../platforms/black/activitypods.svg.license | 2 + images/platforms/black/anfora.svg | 11 + images/platforms/black/anfora.svg.license | 2 + images/platforms/black/awakari.svg | 1 + images/platforms/black/awakari.svg.license | 2 + images/platforms/black/azorius.svg | 1 + images/platforms/black/azorius.svg.license | 2 + images/platforms/black/bluesky.svg | 2 +- images/platforms/black/bluesky.svg.license | 4 +- images/platforms/black/bonfire.svg | 1 + images/platforms/black/bonfire.svg.license | 2 + images/platforms/black/bookwyrm.svg | 1 + images/platforms/black/bookwyrm.svg.license | 2 + images/platforms/black/bridgy_fed.svg | 1 + images/platforms/black/bridgy_fed.svg.license | 2 + images/platforms/black/brighteon_social.svg | 12 + .../black/brighteon_social.svg.license | 2 + images/platforms/black/brutalinks.svg | 1 + images/platforms/black/brutalinks.svg.license | 2 + images/platforms/black/calckey.svg | 14 +- images/platforms/black/calckey.svg.license | 4 +- images/platforms/black/castopod.svg | 1 + images/platforms/black/castopod.svg.license | 2 + images/platforms/black/catodon.svg | 1 + images/platforms/black/catodon.svg.license | 2 + images/platforms/black/chatter_net.svg | 7 + .../platforms/black/chatter_net.svg.license | 2 + images/platforms/black/chuckya.svg | 1 + images/platforms/black/chuckya.svg.license | 2 + images/platforms/black/clubsall.svg | 1 + images/platforms/black/clubsall.svg.license | 2 + images/platforms/black/communecter.svg | 12 + .../platforms/black/communecter.svg.license | 2 + images/platforms/black/decodon.svg | 1 + images/platforms/black/decodon.svg.license | 2 + images/platforms/black/diaspora.svg | 9 +- images/platforms/black/diaspora.svg.license | 4 +- images/platforms/black/discourse.svg | 12 +- images/platforms/black/discourse.svg.license | 4 +- images/platforms/black/dolphin.svg | 14 + images/platforms/black/dolphin.svg.license | 2 + images/platforms/black/drupal.svg | 1 + images/platforms/black/drupal.svg.license | 2 + images/platforms/black/emissary.svg | 1 + images/platforms/black/emissary.svg.license | 2 + images/platforms/black/epicyon.svg | 1 + images/platforms/black/epicyon.svg.license | 2 + images/platforms/black/f2ap.svg | 32 ++ images/platforms/black/f2ap.svg.license | 2 + images/platforms/black/fedibird.svg | 12 + images/platforms/black/fedibird.svg.license | 2 + images/platforms/black/fedify.svg | 1 + images/platforms/black/fedify.svg.license | 2 + images/platforms/black/firefish.svg | 37 +- images/platforms/black/firefish.svg.license | 4 +- images/platforms/black/flipboard.svg | 3 +- images/platforms/black/flipboard.svg.license | 4 +- images/platforms/black/flohmarkt.svg | 1 + images/platforms/black/flohmarkt.svg.license | 2 + images/platforms/black/forgefriends.svg | 13 + .../platforms/black/forgefriends.svg.license | 2 + images/platforms/black/forgejo.svg | 1 + images/platforms/black/forgejo.svg.license | 2 + images/platforms/black/forte.svg | 1 + images/platforms/black/forte.svg.license | 2 + images/platforms/black/foundkey.svg | 1 + images/platforms/black/foundkey.svg.license | 2 + images/platforms/black/friendica.svg | 13 +- images/platforms/black/friendica.svg.license | 5 +- images/platforms/black/funkwhale.svg | 14 + images/platforms/black/funkwhale.svg.license | 2 + images/platforms/black/gancio.svg | 12 + images/platforms/black/gancio.svg.license | 2 + images/platforms/black/gath.io.svg | 11 + images/platforms/black/gath.io.svg.license | 2 + images/platforms/black/ghost.svg | 1 + images/platforms/black/ghost.svg.license | 2 + images/platforms/black/gitlab.svg | 1 + images/platforms/black/gitlab.svg.license | 2 + images/platforms/black/glitch-soc.svg | 7 + images/platforms/black/glitch-soc.svg.license | 2 + images/platforms/black/gnu_social.svg | 1 + images/platforms/black/gnu_social.svg.license | 2 + images/platforms/black/gnusocial.svg | 11 +- images/platforms/black/go-fed.svg | 1 + images/platforms/black/go-fed.svg.license | 2 + images/platforms/black/goblin.svg | 1 + images/platforms/black/goblin.svg.license | 2 + images/platforms/black/gotosocial.svg.license | 4 +- images/platforms/black/greatape.svg | 7 + images/platforms/black/greatape.svg.license | 2 + images/platforms/black/guppe.svg | 1 + images/platforms/black/guppe.svg.license | 2 + images/platforms/black/hollo.svg | 1 + images/platforms/black/hollo.svg.license | 2 + images/platforms/black/hometown.svg.license | 4 +- images/platforms/black/honk.svg | 9 + images/platforms/black/honk.svg.license | 2 + images/platforms/black/hubzilla.svg | 15 +- images/platforms/black/hubzilla.svg.license | 4 +- images/platforms/black/iceshrimp.svg.license | 4 +- images/platforms/black/juick.svg | 1 + images/platforms/black/juick.svg.license | 2 + images/platforms/black/kazarma.svg | 7 + images/platforms/black/kazarma.svg.license | 2 + images/platforms/black/kbin.svg | 1 + images/platforms/black/kbin.svg.license | 2 + images/platforms/black/kepi.svg | 12 + images/platforms/black/kepi.svg.license | 2 + images/platforms/black/kitsune.svg | 1 + images/platforms/black/kitsune.svg.license | 2 + images/platforms/black/kmyblue.svg | 1 + images/platforms/black/kmyblue.svg.license | 2 + images/platforms/black/kookie.svg | 1 + images/platforms/black/kookie.svg.license | 2 + images/platforms/black/ktistec.svg | 9 + images/platforms/black/ktistec.svg.license | 2 + images/platforms/black/lemmy.svg | 82 +--- images/platforms/black/lemmy.svg.license | 4 +- images/platforms/black/loops.svg | 1 + images/platforms/black/loops.svg.license | 2 + images/platforms/black/mastodon.svg | 16 +- images/platforms/black/mastodon.svg.license | 4 +- images/platforms/black/mbin.svg.license | 4 +- images/platforms/black/micro.blog.svg | 9 + images/platforms/black/micro.blog.svg.license | 2 + images/platforms/black/minds.svg | 1 + images/platforms/black/minds.svg.license | 2 + images/platforms/black/misskey.svg | 2 +- images/platforms/black/misskey.svg.license | 4 +- images/platforms/black/mistpark.svg | 9 + images/platforms/black/mistpark.svg.license | 2 + images/platforms/black/mitra.svg | 1 + images/platforms/black/mitra.svg.license | 2 + images/platforms/black/mobilizon.svg | 11 +- images/platforms/black/mobilizon.svg.license | 4 +- images/platforms/black/neodb.svg | 1 + images/platforms/black/neodb.svg.license | 2 + images/platforms/black/newsmast.svg | 1 + images/platforms/black/newsmast.svg.license | 2 + images/platforms/black/nextcloud_social.svg | 1 + .../black/nextcloud_social.svg.license | 2 + images/platforms/black/nodebb.svg | 1 + images/platforms/black/nodebb.svg.license | 2 + images/platforms/black/osada.svg | 9 + images/platforms/black/osada.svg.license | 2 + images/platforms/black/owncast.svg | 13 + images/platforms/black/owncast.svg.license | 2 + images/platforms/black/piefed.svg | 1 + images/platforms/black/piefed.svg.license | 2 + images/platforms/black/pinetta.svg | 1 + images/platforms/black/pinetta.svg.license | 2 + images/platforms/black/pixelfed.svg | 13 +- images/platforms/black/pixelfed.svg.license | 4 +- images/platforms/black/pleroma.svg | 9 +- images/platforms/black/pleroma.svg.license | 4 +- images/platforms/black/plume.svg | 16 +- images/platforms/black/plume.svg.license | 4 +- images/platforms/black/postmarks.svg | 19 + images/platforms/black/postmarks.svg.license | 2 + images/platforms/black/prismo.svg | 9 + images/platforms/black/prismo.svg.license | 2 + images/platforms/black/rebased.svg | 9 + images/platforms/black/rebased.svg.license | 2 + images/platforms/black/redmatrix.svg | 9 + images/platforms/black/redmatrix.svg.license | 2 + images/platforms/black/reel2bits.svg | 14 + images/platforms/black/reel2bits.svg.license | 2 + images/platforms/black/ruffy.svg | 1 + images/platforms/black/ruffy.svg.license | 2 + images/platforms/black/sakura.svg | 1 + images/platforms/black/sakura.svg.license | 2 + images/platforms/black/seppo.svg | 7 + images/platforms/black/seppo.svg.license | 2 + images/platforms/black/shadowfacts.svg | 1 + .../platforms/black/shadowfacts.svg.license | 2 + images/platforms/black/sharkey.svg.license | 2 - .../black/{sharkey.svg => sharky.svg} | 0 images/platforms/black/sharky.svg.license | 2 + images/platforms/black/shuttlecraft.svg | 7 + .../platforms/black/shuttlecraft.svg.license | 2 + images/platforms/black/smilodon.svg | 1 + images/platforms/black/smilodon.svg.license | 2 + images/platforms/black/smithereen.svg | 9 + images/platforms/black/smithereen.svg.license | 2 + images/platforms/black/snac.svg | 1 + images/platforms/black/snac.svg.license | 2 + images/platforms/black/soapbox.svg | 9 + images/platforms/black/soapbox.svg.license | 2 + images/platforms/black/socialhome.svg | 9 + images/platforms/black/socialhome.svg.license | 2 + images/platforms/black/streams.svg | 1 + images/platforms/black/streams.svg.license | 2 + images/platforms/black/sublinks.svg | 1 + images/platforms/black/sublinks.svg.license | 2 + images/platforms/black/sutty.svg | 1 + images/platforms/black/sutty.svg.license | 2 + images/platforms/black/swanye.svg.license | 2 + images/platforms/black/takahe.svg | 9 + images/platforms/black/takahe.svg.license | 2 + images/platforms/black/takesama.svg | 7 + images/platforms/black/takesama.svg.license | 2 + images/platforms/black/threads.svg | 2 +- images/platforms/black/threads.svg.license | 4 +- images/platforms/black/vernissage.svg | 1 + images/platforms/black/vernissage.svg.license | 2 + images/platforms/black/vervis.svg | 1 + images/platforms/black/vervis.svg.license | 2 + images/platforms/black/vidzy.svg | 1 + images/platforms/black/vidzy.svg.license | 2 + images/platforms/black/vocata.svg | 1 + images/platforms/black/vocata.svg.license | 2 + images/platforms/black/wafrn.svg | 1 + images/platforms/black/wafrn.svg.license | 2 + images/platforms/black/wildebeest.svg | 1 + images/platforms/black/wildebeest.svg.license | 2 + images/platforms/black/wordpress.svg | 17 +- images/platforms/black/wordpress.svg.license | 4 +- images/platforms/black/write.as.svg | 1 + images/platforms/black/write.as.svg.license | 2 + images/platforms/black/writefreely.svg | 1 + .../platforms/black/writefreely.svg.license | 2 + images/platforms/black/wxwclub.svg | 1 + images/platforms/black/wxwclub.svg.license | 2 + images/platforms/black/xwiki.svg | 15 + images/platforms/black/xwiki.svg.license | 2 + images/platforms/black/zap.svg | 1 + images/platforms/black/zap.svg.license | 2 + images/platforms/color/aardwolf.svg | 42 ++ images/platforms/color/aardwolf.svg.license | 2 + images/platforms/color/activitypods.svg | 15 + .../platforms/color/activitypods.svg.license | 2 + images/platforms/color/bluesky.svg | 2 +- images/platforms/color/bluesky.svg.license | 4 +- images/platforms/color/chuckya.svg | 1 + images/platforms/color/chuckya.svg.license | 2 + images/platforms/color/decodon.svg | 12 + images/platforms/color/decodon.svg.license | 2 + images/platforms/color/fedify.svg | 175 +++++++ images/platforms/color/fedify.svg.license | 2 + images/platforms/color/flipboard.svg.license | 4 +- images/platforms/color/gitlab.svg | 1 + images/platforms/color/gitlab.svg.license | 2 + images/platforms/color/kookie.svg | 1 + images/platforms/color/kookie.svg.license | 2 + images/platforms/color/loops.svg | 16 + images/platforms/color/loops.svg.license | 2 + images/platforms/color/mbin.svg | 26 + images/platforms/color/mbin.svg.license | 2 + images/platforms/color/misskey.svg | 1 + images/platforms/color/misskey.svg.license | 2 + images/platforms/color/neodb.svg | 140 ++++++ images/platforms/color/neodb.svg.license | 2 + images/platforms/color/newsmast.svg | 7 + images/platforms/color/newsmast.svg.license | 2 + images/platforms/color/nodebb.svg | 16 + images/platforms/color/nodebb.svg.license | 2 + images/platforms/color/sharky.svg | 1 + images/platforms/color/sharky.svg.license | 2 + images/platforms/color/vervis.svg | 38 ++ images/platforms/color/vervis.svg.license | 2 + images/platforms/color/vocata.svg | 40 ++ images/platforms/color/vocata.svg.license | 2 + images/platforms/white/activitypub.svg | 1 + .../platforms/white/activitypub.svg.license | 2 + images/platforms/white/akkoma.svg | 1 + images/platforms/white/akkoma.svg.license | 2 + images/platforms/white/andstatus.svg | 1 + images/platforms/white/andstatus.svg.license | 2 + images/platforms/white/bluesky.svg | 1 + images/platforms/white/bluesky.svg.license | 2 + images/platforms/white/bonfire.svg | 1 + images/platforms/white/bonfire.svg.license | 2 + images/platforms/white/bookwyrm.svg | 1 + images/platforms/white/bookwyrm.svg.license | 2 + images/platforms/white/bridgy_fed.svg | 11 + images/platforms/white/bridgy_fed.svg.license | 2 + images/platforms/white/calckey.svg | 11 + images/platforms/white/calckey.svg.license | 2 + images/platforms/white/diaspora.svg | 1 + images/platforms/white/diaspora.svg.license | 2 + images/platforms/white/discourse.svg | 1 + images/platforms/white/discourse.svg.license | 2 + images/platforms/white/drupal.svg | 1 + images/platforms/white/drupal.svg.license | 2 + images/platforms/white/email.svg | 1 + images/platforms/white/email.svg.license | 2 + images/platforms/white/firefish.svg | 1 + images/platforms/white/firefish.svg.license | 2 + images/platforms/white/flipboard.svg | 1 + images/platforms/white/flipboard.svg.license | 2 + images/platforms/white/forgejo.svg | 1 + images/platforms/white/forgejo.svg.license | 2 + images/platforms/white/friendica.svg | 1 + images/platforms/white/friendica.svg.license | 2 + images/platforms/white/funkwhale.svg | 1 + images/platforms/white/funkwhale.svg.license | 2 + images/platforms/white/ghost.svg | 1 + images/platforms/white/ghost.svg.license | 2 + images/platforms/white/gitlab.svg | 1 + images/platforms/white/gitlab.svg.license | 2 + images/platforms/white/gnusocial.svg | 1 + images/platforms/white/gnusocial.svg.license | 2 + images/platforms/white/gotosocial.svg | 1 + images/platforms/white/gotosocial.svg.license | 2 + images/platforms/white/kbin.svg | 1 + images/platforms/white/kbin.svg.license | 2 + images/platforms/white/lemmy.svg | 1 + images/platforms/white/lemmy.svg.license | 2 + images/platforms/white/mastodon.svg | 1 + images/platforms/white/mastodon.svg.license | 2 + images/platforms/white/microblog.svg | 1 + images/platforms/white/microblog.svg.license | 2 + images/platforms/white/minds.svg | 1 + images/platforms/white/minds.svg.license | 2 + images/platforms/white/misskey.svg | 1 + images/platforms/white/misskey.svg.license | 2 + images/platforms/white/mobilizon.svg | 1 + images/platforms/white/mobilizon.svg.license | 2 + images/platforms/white/nextcloud.svg | 1 + images/platforms/white/nextcloud.svg.license | 2 + images/platforms/white/peertube.svg | 1 + images/platforms/white/peertube.svg.license | 2 + images/platforms/white/pixelfed.svg | 1 + images/platforms/white/pixelfed.svg.license | 2 + images/platforms/white/pleroma.svg | 1 + images/platforms/white/pleroma.svg.license | 2 + images/platforms/white/rss.svg | 1 + images/platforms/white/rss.svg.license | 2 + images/platforms/white/shark.svg | 1 + images/platforms/white/shark.svg.license | 2 + images/platforms/white/threads.svg | 1 + images/platforms/white/threads.svg.license | 2 + images/platforms/white/wordpress.svg | 1 + images/platforms/white/wordpress.svg.license | 2 + images/platforms/white/xwiki.svg | 1 + images/platforms/white/xwiki.svg.license | 2 + src/Content/ContactSelector.php | 276 +++++------ src/Content/Conversation.php | 5 +- src/Content/Text/BBCode.php | 6 +- src/Content/Widget/VCard.php | 5 +- src/Factory/Api/Mastodon/Status.php | 2 +- src/Factory/Api/Twitter/Status.php | 4 +- src/Model/Item.php | 42 +- src/Module/Admin/Federation.php | 2 +- src/Module/Contact.php | 2 +- src/Module/Contact/Profile.php | 2 +- .../Moderation/Blocklist/Server/Add.php | 1 - src/Module/Notifications/Introductions.php | 5 +- src/Module/Settings/Display.php | 87 ++-- src/Object/Api/Twitter/Status.php | 2 +- src/Object/Api/Twitter/User.php | 2 +- src/Object/Post.php | 5 +- src/Util/Strings.php | 3 +- view/lang/C/messages.po | 452 +++++++++--------- .../moderation/blocklist/server/add.tpl | 4 +- view/templates/settings/display.tpl | 2 +- view/templates/shared_content.tpl | 8 +- view/theme/frio/scheme/black.css | 4 - view/theme/frio/scheme/dark.css | 4 - view/theme/frio/templates/search_item.tpl | 22 +- .../theme/frio/templates/settings/display.tpl | 2 +- view/theme/frio/templates/wall_thread.tpl | 6 +- 368 files changed, 1949 insertions(+), 1009 deletions(-) delete mode 100644 LICENSES/EUPL-1.2.txt delete mode 100644 LICENSES/Zlib.txt create mode 100644 images/platforms/black/aardwolf.svg create mode 100644 images/platforms/black/aardwolf.svg.license create mode 100644 images/platforms/black/activitypods.svg create mode 100644 images/platforms/black/activitypods.svg.license create mode 100644 images/platforms/black/anfora.svg create mode 100644 images/platforms/black/anfora.svg.license create mode 100644 images/platforms/black/awakari.svg create mode 100644 images/platforms/black/awakari.svg.license create mode 100644 images/platforms/black/azorius.svg create mode 100644 images/platforms/black/azorius.svg.license create mode 100644 images/platforms/black/bonfire.svg create mode 100644 images/platforms/black/bonfire.svg.license create mode 100644 images/platforms/black/bookwyrm.svg create mode 100644 images/platforms/black/bookwyrm.svg.license create mode 100644 images/platforms/black/bridgy_fed.svg create mode 100644 images/platforms/black/bridgy_fed.svg.license create mode 100644 images/platforms/black/brighteon_social.svg create mode 100644 images/platforms/black/brighteon_social.svg.license create mode 100644 images/platforms/black/brutalinks.svg create mode 100644 images/platforms/black/brutalinks.svg.license create mode 100644 images/platforms/black/castopod.svg create mode 100644 images/platforms/black/castopod.svg.license create mode 100644 images/platforms/black/catodon.svg create mode 100644 images/platforms/black/catodon.svg.license create mode 100644 images/platforms/black/chatter_net.svg create mode 100644 images/platforms/black/chatter_net.svg.license create mode 100644 images/platforms/black/chuckya.svg create mode 100644 images/platforms/black/chuckya.svg.license create mode 100644 images/platforms/black/clubsall.svg create mode 100644 images/platforms/black/clubsall.svg.license create mode 100644 images/platforms/black/communecter.svg create mode 100644 images/platforms/black/communecter.svg.license create mode 100644 images/platforms/black/decodon.svg create mode 100644 images/platforms/black/decodon.svg.license create mode 100644 images/platforms/black/dolphin.svg create mode 100644 images/platforms/black/dolphin.svg.license create mode 100644 images/platforms/black/drupal.svg create mode 100644 images/platforms/black/drupal.svg.license create mode 100644 images/platforms/black/emissary.svg create mode 100644 images/platforms/black/emissary.svg.license create mode 100644 images/platforms/black/epicyon.svg create mode 100644 images/platforms/black/epicyon.svg.license create mode 100644 images/platforms/black/f2ap.svg create mode 100644 images/platforms/black/f2ap.svg.license create mode 100644 images/platforms/black/fedibird.svg create mode 100644 images/platforms/black/fedibird.svg.license create mode 100644 images/platforms/black/fedify.svg create mode 100644 images/platforms/black/fedify.svg.license create mode 100644 images/platforms/black/flohmarkt.svg create mode 100644 images/platforms/black/flohmarkt.svg.license create mode 100644 images/platforms/black/forgefriends.svg create mode 100644 images/platforms/black/forgefriends.svg.license create mode 100644 images/platforms/black/forgejo.svg create mode 100644 images/platforms/black/forgejo.svg.license create mode 100644 images/platforms/black/forte.svg create mode 100644 images/platforms/black/forte.svg.license create mode 100644 images/platforms/black/foundkey.svg create mode 100644 images/platforms/black/foundkey.svg.license create mode 100644 images/platforms/black/funkwhale.svg create mode 100644 images/platforms/black/funkwhale.svg.license create mode 100644 images/platforms/black/gancio.svg create mode 100644 images/platforms/black/gancio.svg.license create mode 100644 images/platforms/black/gath.io.svg create mode 100644 images/platforms/black/gath.io.svg.license create mode 100644 images/platforms/black/ghost.svg create mode 100644 images/platforms/black/ghost.svg.license create mode 100644 images/platforms/black/gitlab.svg create mode 100644 images/platforms/black/gitlab.svg.license create mode 100644 images/platforms/black/glitch-soc.svg create mode 100644 images/platforms/black/glitch-soc.svg.license create mode 100644 images/platforms/black/gnu_social.svg create mode 100644 images/platforms/black/gnu_social.svg.license create mode 100644 images/platforms/black/go-fed.svg create mode 100644 images/platforms/black/go-fed.svg.license create mode 100644 images/platforms/black/goblin.svg create mode 100644 images/platforms/black/goblin.svg.license create mode 100644 images/platforms/black/greatape.svg create mode 100644 images/platforms/black/greatape.svg.license create mode 100644 images/platforms/black/guppe.svg create mode 100644 images/platforms/black/guppe.svg.license create mode 100644 images/platforms/black/hollo.svg create mode 100644 images/platforms/black/hollo.svg.license create mode 100644 images/platforms/black/honk.svg create mode 100644 images/platforms/black/honk.svg.license create mode 100644 images/platforms/black/juick.svg create mode 100644 images/platforms/black/juick.svg.license create mode 100644 images/platforms/black/kazarma.svg create mode 100644 images/platforms/black/kazarma.svg.license create mode 100644 images/platforms/black/kbin.svg create mode 100644 images/platforms/black/kbin.svg.license create mode 100644 images/platforms/black/kepi.svg create mode 100644 images/platforms/black/kepi.svg.license create mode 100644 images/platforms/black/kitsune.svg create mode 100644 images/platforms/black/kitsune.svg.license create mode 100644 images/platforms/black/kmyblue.svg create mode 100644 images/platforms/black/kmyblue.svg.license create mode 100644 images/platforms/black/kookie.svg create mode 100644 images/platforms/black/kookie.svg.license create mode 100644 images/platforms/black/ktistec.svg create mode 100644 images/platforms/black/ktistec.svg.license create mode 100644 images/platforms/black/loops.svg create mode 100644 images/platforms/black/loops.svg.license create mode 100644 images/platforms/black/micro.blog.svg create mode 100644 images/platforms/black/micro.blog.svg.license create mode 100644 images/platforms/black/minds.svg create mode 100644 images/platforms/black/minds.svg.license create mode 100644 images/platforms/black/mistpark.svg create mode 100644 images/platforms/black/mistpark.svg.license create mode 100644 images/platforms/black/mitra.svg create mode 100644 images/platforms/black/mitra.svg.license create mode 100644 images/platforms/black/neodb.svg create mode 100644 images/platforms/black/neodb.svg.license create mode 100644 images/platforms/black/newsmast.svg create mode 100644 images/platforms/black/newsmast.svg.license create mode 100644 images/platforms/black/nextcloud_social.svg create mode 100644 images/platforms/black/nextcloud_social.svg.license create mode 100644 images/platforms/black/nodebb.svg create mode 100644 images/platforms/black/nodebb.svg.license create mode 100644 images/platforms/black/osada.svg create mode 100644 images/platforms/black/osada.svg.license create mode 100644 images/platforms/black/owncast.svg create mode 100644 images/platforms/black/owncast.svg.license create mode 100644 images/platforms/black/piefed.svg create mode 100644 images/platforms/black/piefed.svg.license create mode 100644 images/platforms/black/pinetta.svg create mode 100644 images/platforms/black/pinetta.svg.license create mode 100644 images/platforms/black/postmarks.svg create mode 100644 images/platforms/black/postmarks.svg.license create mode 100644 images/platforms/black/prismo.svg create mode 100644 images/platforms/black/prismo.svg.license create mode 100644 images/platforms/black/rebased.svg create mode 100644 images/platforms/black/rebased.svg.license create mode 100644 images/platforms/black/redmatrix.svg create mode 100644 images/platforms/black/redmatrix.svg.license create mode 100644 images/platforms/black/reel2bits.svg create mode 100644 images/platforms/black/reel2bits.svg.license create mode 100644 images/platforms/black/ruffy.svg create mode 100644 images/platforms/black/ruffy.svg.license create mode 100644 images/platforms/black/sakura.svg create mode 100644 images/platforms/black/sakura.svg.license create mode 100644 images/platforms/black/seppo.svg create mode 100644 images/platforms/black/seppo.svg.license create mode 100644 images/platforms/black/shadowfacts.svg create mode 100644 images/platforms/black/shadowfacts.svg.license delete mode 100644 images/platforms/black/sharkey.svg.license rename images/platforms/black/{sharkey.svg => sharky.svg} (100%) create mode 100644 images/platforms/black/sharky.svg.license create mode 100644 images/platforms/black/shuttlecraft.svg create mode 100644 images/platforms/black/shuttlecraft.svg.license create mode 100644 images/platforms/black/smilodon.svg create mode 100644 images/platforms/black/smilodon.svg.license create mode 100644 images/platforms/black/smithereen.svg create mode 100644 images/platforms/black/smithereen.svg.license create mode 100644 images/platforms/black/snac.svg create mode 100644 images/platforms/black/snac.svg.license create mode 100644 images/platforms/black/soapbox.svg create mode 100644 images/platforms/black/soapbox.svg.license create mode 100644 images/platforms/black/socialhome.svg create mode 100644 images/platforms/black/socialhome.svg.license create mode 100644 images/platforms/black/streams.svg create mode 100644 images/platforms/black/streams.svg.license create mode 100644 images/platforms/black/sublinks.svg create mode 100644 images/platforms/black/sublinks.svg.license create mode 100644 images/platforms/black/sutty.svg create mode 100644 images/platforms/black/sutty.svg.license create mode 100644 images/platforms/black/swanye.svg.license create mode 100644 images/platforms/black/takahe.svg create mode 100644 images/platforms/black/takahe.svg.license create mode 100644 images/platforms/black/takesama.svg create mode 100644 images/platforms/black/takesama.svg.license create mode 100644 images/platforms/black/vernissage.svg create mode 100644 images/platforms/black/vernissage.svg.license create mode 100644 images/platforms/black/vervis.svg create mode 100644 images/platforms/black/vervis.svg.license create mode 100644 images/platforms/black/vidzy.svg create mode 100644 images/platforms/black/vidzy.svg.license create mode 100644 images/platforms/black/vocata.svg create mode 100644 images/platforms/black/vocata.svg.license create mode 100644 images/platforms/black/wafrn.svg create mode 100644 images/platforms/black/wafrn.svg.license create mode 100644 images/platforms/black/wildebeest.svg create mode 100644 images/platforms/black/wildebeest.svg.license create mode 100644 images/platforms/black/write.as.svg create mode 100644 images/platforms/black/write.as.svg.license create mode 100644 images/platforms/black/writefreely.svg create mode 100644 images/platforms/black/writefreely.svg.license create mode 100644 images/platforms/black/wxwclub.svg create mode 100644 images/platforms/black/wxwclub.svg.license create mode 100644 images/platforms/black/xwiki.svg create mode 100644 images/platforms/black/xwiki.svg.license create mode 100644 images/platforms/black/zap.svg create mode 100644 images/platforms/black/zap.svg.license create mode 100644 images/platforms/color/aardwolf.svg create mode 100644 images/platforms/color/aardwolf.svg.license create mode 100644 images/platforms/color/activitypods.svg create mode 100644 images/platforms/color/activitypods.svg.license create mode 100644 images/platforms/color/chuckya.svg create mode 100644 images/platforms/color/chuckya.svg.license create mode 100644 images/platforms/color/decodon.svg create mode 100644 images/platforms/color/decodon.svg.license create mode 100644 images/platforms/color/fedify.svg create mode 100644 images/platforms/color/fedify.svg.license create mode 100644 images/platforms/color/gitlab.svg create mode 100644 images/platforms/color/gitlab.svg.license create mode 100644 images/platforms/color/kookie.svg create mode 100644 images/platforms/color/kookie.svg.license create mode 100644 images/platforms/color/loops.svg create mode 100644 images/platforms/color/loops.svg.license create mode 100644 images/platforms/color/mbin.svg create mode 100644 images/platforms/color/mbin.svg.license create mode 100644 images/platforms/color/misskey.svg create mode 100644 images/platforms/color/misskey.svg.license create mode 100644 images/platforms/color/neodb.svg create mode 100644 images/platforms/color/neodb.svg.license create mode 100644 images/platforms/color/newsmast.svg create mode 100644 images/platforms/color/newsmast.svg.license create mode 100644 images/platforms/color/nodebb.svg create mode 100644 images/platforms/color/nodebb.svg.license create mode 100644 images/platforms/color/sharky.svg create mode 100644 images/platforms/color/sharky.svg.license create mode 100644 images/platforms/color/vervis.svg create mode 100644 images/platforms/color/vervis.svg.license create mode 100644 images/platforms/color/vocata.svg create mode 100644 images/platforms/color/vocata.svg.license create mode 100644 images/platforms/white/activitypub.svg create mode 100644 images/platforms/white/activitypub.svg.license create mode 100644 images/platforms/white/akkoma.svg create mode 100644 images/platforms/white/akkoma.svg.license create mode 100644 images/platforms/white/andstatus.svg create mode 100644 images/platforms/white/andstatus.svg.license create mode 100644 images/platforms/white/bluesky.svg create mode 100644 images/platforms/white/bluesky.svg.license create mode 100644 images/platforms/white/bonfire.svg create mode 100644 images/platforms/white/bonfire.svg.license create mode 100644 images/platforms/white/bookwyrm.svg create mode 100644 images/platforms/white/bookwyrm.svg.license create mode 100644 images/platforms/white/bridgy_fed.svg create mode 100644 images/platforms/white/bridgy_fed.svg.license create mode 100644 images/platforms/white/calckey.svg create mode 100644 images/platforms/white/calckey.svg.license create mode 100644 images/platforms/white/diaspora.svg create mode 100644 images/platforms/white/diaspora.svg.license create mode 100644 images/platforms/white/discourse.svg create mode 100644 images/platforms/white/discourse.svg.license create mode 100644 images/platforms/white/drupal.svg create mode 100644 images/platforms/white/drupal.svg.license create mode 100644 images/platforms/white/email.svg create mode 100644 images/platforms/white/email.svg.license create mode 100644 images/platforms/white/firefish.svg create mode 100644 images/platforms/white/firefish.svg.license create mode 100644 images/platforms/white/flipboard.svg create mode 100644 images/platforms/white/flipboard.svg.license create mode 100644 images/platforms/white/forgejo.svg create mode 100644 images/platforms/white/forgejo.svg.license create mode 100644 images/platforms/white/friendica.svg create mode 100644 images/platforms/white/friendica.svg.license create mode 100644 images/platforms/white/funkwhale.svg create mode 100644 images/platforms/white/funkwhale.svg.license create mode 100644 images/platforms/white/ghost.svg create mode 100644 images/platforms/white/ghost.svg.license create mode 100644 images/platforms/white/gitlab.svg create mode 100644 images/platforms/white/gitlab.svg.license create mode 100644 images/platforms/white/gnusocial.svg create mode 100644 images/platforms/white/gnusocial.svg.license create mode 100644 images/platforms/white/gotosocial.svg create mode 100644 images/platforms/white/gotosocial.svg.license create mode 100644 images/platforms/white/kbin.svg create mode 100644 images/platforms/white/kbin.svg.license create mode 100644 images/platforms/white/lemmy.svg create mode 100644 images/platforms/white/lemmy.svg.license create mode 100644 images/platforms/white/mastodon.svg create mode 100644 images/platforms/white/mastodon.svg.license create mode 100644 images/platforms/white/microblog.svg create mode 100644 images/platforms/white/microblog.svg.license create mode 100644 images/platforms/white/minds.svg create mode 100644 images/platforms/white/minds.svg.license create mode 100644 images/platforms/white/misskey.svg create mode 100644 images/platforms/white/misskey.svg.license create mode 100644 images/platforms/white/mobilizon.svg create mode 100644 images/platforms/white/mobilizon.svg.license create mode 100644 images/platforms/white/nextcloud.svg create mode 100644 images/platforms/white/nextcloud.svg.license create mode 100644 images/platforms/white/peertube.svg create mode 100644 images/platforms/white/peertube.svg.license create mode 100644 images/platforms/white/pixelfed.svg create mode 100644 images/platforms/white/pixelfed.svg.license create mode 100644 images/platforms/white/pleroma.svg create mode 100644 images/platforms/white/pleroma.svg.license create mode 100644 images/platforms/white/rss.svg create mode 100644 images/platforms/white/rss.svg.license create mode 100644 images/platforms/white/shark.svg create mode 100644 images/platforms/white/shark.svg.license create mode 100644 images/platforms/white/threads.svg create mode 100644 images/platforms/white/threads.svg.license create mode 100644 images/platforms/white/wordpress.svg create mode 100644 images/platforms/white/wordpress.svg.license create mode 100644 images/platforms/white/xwiki.svg create mode 100644 images/platforms/white/xwiki.svg.license diff --git a/LICENSES/EUPL-1.2.txt b/LICENSES/EUPL-1.2.txt deleted file mode 100644 index 7aed2eafc9..0000000000 --- a/LICENSES/EUPL-1.2.txt +++ /dev/null @@ -1,287 +0,0 @@ - EUROPEAN UNION PUBLIC LICENCE v. 1.2 - EUPL © the European Union 2007, 2016 - -This European Union Public Licence (the 'EUPL') applies to the Work (as defined -below) which is provided under the terms of this Licence. Any use of the Work, -other than as authorised under this Licence is prohibited (to the extent such -use is covered by a right of the copyright holder of the Work). - -The Work is provided under the terms of this Licence when the Licensor (as -defined below) has placed the following notice immediately following the -copyright notice for the Work: - - Licensed under the EUPL - -or has expressed by any other means his willingness to license under the EUPL. - -1. Definitions - -In this Licence, the following terms have the following meaning: - -- 'The Licence': this Licence. - -- 'The Original Work': the work or software distributed or communicated by the - Licensor under this Licence, available as Source Code and also as Executable - Code as the case may be. - -- 'Derivative Works': the works or software that could be created by the - Licensee, based upon the Original Work or modifications thereof. This Licence - does not define the extent of modification or dependence on the Original Work - required in order to classify a work as a Derivative Work; this extent is - determined by copyright law applicable in the country mentioned in Article 15. - -- 'The Work': the Original Work or its Derivative Works. - -- 'The Source Code': the human-readable form of the Work which is the most - convenient for people to study and modify. - -- 'The Executable Code': any code which has generally been compiled and which is - meant to be interpreted by a computer as a program. - -- 'The Licensor': the natural or legal person that distributes or communicates - the Work under the Licence. - -- 'Contributor(s)': any natural or legal person who modifies the Work under the - Licence, or otherwise contributes to the creation of a Derivative Work. - -- 'The Licensee' or 'You': any natural or legal person who makes any usage of - the Work under the terms of the Licence. - -- 'Distribution' or 'Communication': any act of selling, giving, lending, - renting, distributing, communicating, transmitting, or otherwise making - available, online or offline, copies of the Work or providing access to its - essential functionalities at the disposal of any other natural or legal - person. - -2. Scope of the rights granted by the Licence - -The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, -sublicensable licence to do the following, for the duration of copyright vested -in the Original Work: - -- use the Work in any circumstance and for all usage, -- reproduce the Work, -- modify the Work, and make Derivative Works based upon the Work, -- communicate to the public, including the right to make available or display - the Work or copies thereof to the public and perform publicly, as the case may - be, the Work, -- distribute the Work or copies thereof, -- lend and rent the Work or copies thereof, -- sublicense rights in the Work or copies thereof. - -Those rights can be exercised on any media, supports and formats, whether now -known or later invented, as far as the applicable law permits so. - -In the countries where moral rights apply, the Licensor waives his right to -exercise his moral right to the extent allowed by law in order to make effective -the licence of the economic rights here above listed. - -The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to -any patents held by the Licensor, to the extent necessary to make use of the -rights granted on the Work under this Licence. - -3. Communication of the Source Code - -The Licensor may provide the Work either in its Source Code form, or as -Executable Code. If the Work is provided as Executable Code, the Licensor -provides in addition a machine-readable copy of the Source Code of the Work -along with each copy of the Work that the Licensor distributes or indicates, in -a notice following the copyright notice attached to the Work, a repository where -the Source Code is easily and freely accessible for as long as the Licensor -continues to distribute or communicate the Work. - -4. Limitations on copyright - -Nothing in this Licence is intended to deprive the Licensee of the benefits from -any exception or limitation to the exclusive rights of the rights owners in the -Work, of the exhaustion of those rights or of other applicable limitations -thereto. - -5. Obligations of the Licensee - -The grant of the rights mentioned above is subject to some restrictions and -obligations imposed on the Licensee. Those obligations are the following: - -Attribution right: The Licensee shall keep intact all copyright, patent or -trademarks notices and all notices that refer to the Licence and to the -disclaimer of warranties. The Licensee must include a copy of such notices and a -copy of the Licence with every copy of the Work he/she distributes or -communicates. The Licensee must cause any Derivative Work to carry prominent -notices stating that the Work has been modified and the date of modification. - -Copyleft clause: If the Licensee distributes or communicates copies of the -Original Works or Derivative Works, this Distribution or Communication will be -done under the terms of this Licence or of a later version of this Licence -unless the Original Work is expressly distributed only under this version of the -Licence — for example by communicating 'EUPL v. 1.2 only'. The Licensee -(becoming Licensor) cannot offer or impose any additional terms or conditions on -the Work or Derivative Work that alter or restrict the terms of the Licence. - -Compatibility clause: If the Licensee Distributes or Communicates Derivative -Works or copies thereof based upon both the Work and another work licensed under -a Compatible Licence, this Distribution or Communication can be done under the -terms of this Compatible Licence. For the sake of this clause, 'Compatible -Licence' refers to the licences listed in the appendix attached to this Licence. -Should the Licensee's obligations under the Compatible Licence conflict with -his/her obligations under this Licence, the obligations of the Compatible -Licence shall prevail. - -Provision of Source Code: When distributing or communicating copies of the Work, -the Licensee will provide a machine-readable copy of the Source Code or indicate -a repository where this Source will be easily and freely available for as long -as the Licensee continues to distribute or communicate the Work. - -Legal Protection: This Licence does not grant permission to use the trade names, -trademarks, service marks, or names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the copyright notice. - -6. Chain of Authorship - -The original Licensor warrants that the copyright in the Original Work granted -hereunder is owned by him/her or licensed to him/her and that he/she has the -power and authority to grant the Licence. - -Each Contributor warrants that the copyright in the modifications he/she brings -to the Work are owned by him/her or licensed to him/her and that he/she has the -power and authority to grant the Licence. - -Each time You accept the Licence, the original Licensor and subsequent -Contributors grant You a licence to their contributions to the Work, under the -terms of this Licence. - -7. Disclaimer of Warranty - -The Work is a work in progress, which is continuously improved by numerous -Contributors. It is not a finished work and may therefore contain defects or -'bugs' inherent to this type of development. - -For the above reason, the Work is provided under the Licence on an 'as is' basis -and without warranties of any kind concerning the Work, including without -limitation merchantability, fitness for a particular purpose, absence of defects -or errors, accuracy, non-infringement of intellectual property rights other than -copyright as stated in Article 6 of this Licence. - -This disclaimer of warranty is an essential part of the Licence and a condition -for the grant of any rights to the Work. - -8. Disclaimer of Liability - -Except in the cases of wilful misconduct or damages directly caused to natural -persons, the Licensor will in no event be liable for any direct or indirect, -material or moral, damages of any kind, arising out of the Licence or of the use -of the Work, including without limitation, damages for loss of goodwill, work -stoppage, computer failure or malfunction, loss of data or any commercial -damage, even if the Licensor has been advised of the possibility of such damage. -However, the Licensor will be liable under statutory product liability laws as -far such laws apply to the Work. - -9. Additional agreements - -While distributing the Work, You may choose to conclude an additional agreement, -defining obligations or services consistent with this Licence. However, if -accepting obligations, You may act only on your own behalf and on your sole -responsibility, not on behalf of the original Licensor or any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor harmless -for any liability incurred by, or claims asserted against such Contributor by -the fact You have accepted any warranty or additional liability. - -10. Acceptance of the Licence - -The provisions of this Licence can be accepted by clicking on an icon 'I agree' -placed under the bottom of a window displaying the text of this Licence or by -affirming consent in any other similar way, in accordance with the rules of -applicable law. Clicking on that icon indicates your clear and irrevocable -acceptance of this Licence and all of its terms and conditions. - -Similarly, you irrevocably accept this Licence and all of its terms and -conditions by exercising any rights granted to You by Article 2 of this Licence, -such as the use of the Work, the creation by You of a Derivative Work or the -Distribution or Communication by You of the Work or copies thereof. - -11. Information to the public - -In case of any Distribution or Communication of the Work by means of electronic -communication by You (for example, by offering to download the Work from a -remote location) the distribution channel or media (for example, a website) must -at least provide to the public the information requested by the applicable law -regarding the Licensor, the Licence and the way it may be accessible, concluded, -stored and reproduced by the Licensee. - -12. Termination of the Licence - -The Licence and the rights granted hereunder will terminate automatically upon -any breach by the Licensee of the terms of the Licence. - -Such a termination will not terminate the licences of any person who has -received the Work from the Licensee under the Licence, provided such persons -remain in full compliance with the Licence. - -13. Miscellaneous - -Without prejudice of Article 9 above, the Licence represents the complete -agreement between the Parties as to the Work. - -If any provision of the Licence is invalid or unenforceable under applicable -law, this will not affect the validity or enforceability of the Licence as a -whole. Such provision will be construed or reformed so as necessary to make it -valid and enforceable. - -The European Commission may publish other linguistic versions or new versions of -this Licence or updated versions of the Appendix, so far this is required and -reasonable, without reducing the scope of the rights granted by the Licence. New -versions of the Licence will be published with a unique version number. - -All linguistic versions of this Licence, approved by the European Commission, -have identical value. Parties can take advantage of the linguistic version of -their choice. - -14. Jurisdiction - -Without prejudice to specific agreement between parties, - -- any litigation resulting from the interpretation of this License, arising - between the European Union institutions, bodies, offices or agencies, as a - Licensor, and any Licensee, will be subject to the jurisdiction of the Court - of Justice of the European Union, as laid down in article 272 of the Treaty on - the Functioning of the European Union, - -- any litigation arising between other parties and resulting from the - interpretation of this License, will be subject to the exclusive jurisdiction - of the competent court where the Licensor resides or conducts its primary - business. - -15. Applicable Law - -Without prejudice to specific agreement between parties, - -- this Licence shall be governed by the law of the European Union Member State - where the Licensor has his seat, resides or has his registered office, - -- this licence shall be governed by Belgian law if the Licensor has no seat, - residence or registered office inside a European Union Member State. - -Appendix - -'Compatible Licences' according to Article 5 EUPL are: - -- GNU General Public License (GPL) v. 2, v. 3 -- GNU Affero General Public License (AGPL) v. 3 -- Open Software License (OSL) v. 2.1, v. 3.0 -- Eclipse Public License (EPL) v. 1.0 -- CeCILL v. 2.0, v. 2.1 -- Mozilla Public Licence (MPL) v. 2 -- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 -- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for - works other than software -- European Union Public Licence (EUPL) v. 1.1, v. 1.2 -- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong - Reciprocity (LiLiQ-R+). - -The European Commission may update this Appendix to later versions of the above -licences without producing a new version of the EUPL, as long as they provide -the rights granted in Article 2 of this Licence and protect the covered Source -Code from exclusive appropriation. - -All other changes or additions to this Appendix require the production of a new -EUPL version. diff --git a/LICENSES/Zlib.txt b/LICENSES/Zlib.txt deleted file mode 100644 index 480c61edca..0000000000 --- a/LICENSES/Zlib.txt +++ /dev/null @@ -1,15 +0,0 @@ -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. diff --git a/images/platforms/black/aardwolf.svg b/images/platforms/black/aardwolf.svg new file mode 100644 index 0000000000..74558d599d --- /dev/null +++ b/images/platforms/black/aardwolf.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/aardwolf.svg.license b/images/platforms/black/aardwolf.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/aardwolf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/activitypods.svg b/images/platforms/black/activitypods.svg new file mode 100644 index 0000000000..494f938ba7 --- /dev/null +++ b/images/platforms/black/activitypods.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/activitypods.svg.license b/images/platforms/black/activitypods.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/activitypods.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/anfora.svg b/images/platforms/black/anfora.svg new file mode 100644 index 0000000000..953d931d5f --- /dev/null +++ b/images/platforms/black/anfora.svg @@ -0,0 +1,11 @@ + + + Anfora + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/anfora.svg.license b/images/platforms/black/anfora.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/anfora.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/awakari.svg b/images/platforms/black/awakari.svg new file mode 100644 index 0000000000..7d65e5a68a --- /dev/null +++ b/images/platforms/black/awakari.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/awakari.svg.license b/images/platforms/black/awakari.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/awakari.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/azorius.svg b/images/platforms/black/azorius.svg new file mode 100644 index 0000000000..3dcec30fce --- /dev/null +++ b/images/platforms/black/azorius.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/azorius.svg.license b/images/platforms/black/azorius.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/azorius.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/bluesky.svg b/images/platforms/black/bluesky.svg index ce0126edac..6e7f1bdb96 100644 --- a/images/platforms/black/bluesky.svg +++ b/images/platforms/black/bluesky.svg @@ -1 +1 @@ -Bluesky \ No newline at end of file + \ No newline at end of file diff --git a/images/platforms/black/bluesky.svg.license b/images/platforms/black/bluesky.svg.license index 00bd211190..3ffce40c5f 100644 --- a/images/platforms/black/bluesky.svg.license +++ b/images/platforms/black/bluesky.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: https://github.com/simple-icons/simple-icons/ -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/bonfire.svg b/images/platforms/black/bonfire.svg new file mode 100644 index 0000000000..459892408e --- /dev/null +++ b/images/platforms/black/bonfire.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/bonfire.svg.license b/images/platforms/black/bonfire.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/bonfire.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/bookwyrm.svg b/images/platforms/black/bookwyrm.svg new file mode 100644 index 0000000000..df54fc74c5 --- /dev/null +++ b/images/platforms/black/bookwyrm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/bookwyrm.svg.license b/images/platforms/black/bookwyrm.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/bookwyrm.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/bridgy_fed.svg b/images/platforms/black/bridgy_fed.svg new file mode 100644 index 0000000000..1e202aedce --- /dev/null +++ b/images/platforms/black/bridgy_fed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/bridgy_fed.svg.license b/images/platforms/black/bridgy_fed.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/bridgy_fed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/brighteon_social.svg b/images/platforms/black/brighteon_social.svg new file mode 100644 index 0000000000..67b9abbfd5 --- /dev/null +++ b/images/platforms/black/brighteon_social.svg @@ -0,0 +1,12 @@ + + + Brighteon Social + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/brighteon_social.svg.license b/images/platforms/black/brighteon_social.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/brighteon_social.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/brutalinks.svg b/images/platforms/black/brutalinks.svg new file mode 100644 index 0000000000..9540a38b07 --- /dev/null +++ b/images/platforms/black/brutalinks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/brutalinks.svg.license b/images/platforms/black/brutalinks.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/brutalinks.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/calckey.svg b/images/platforms/black/calckey.svg index b7d247c66f..dd22d04466 100644 --- a/images/platforms/black/calckey.svg +++ b/images/platforms/black/calckey.svg @@ -1,13 +1,11 @@ - + Calckey - - - - - - - + + + + + \ No newline at end of file diff --git a/images/platforms/black/calckey.svg.license b/images/platforms/black/calckey.svg.license index 482f1809d0..3ffce40c5f 100644 --- a/images/platforms/black/calckey.svg.license +++ b/images/platforms/black/calckey.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: ThatOneCalculator https://commons.wikimedia.org/wiki/File:Calckey_Logomark.svg -SPDX-License-Identifier: CC-BY-4.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/castopod.svg b/images/platforms/black/castopod.svg new file mode 100644 index 0000000000..2db17e7a02 --- /dev/null +++ b/images/platforms/black/castopod.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/castopod.svg.license b/images/platforms/black/castopod.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/castopod.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/catodon.svg b/images/platforms/black/catodon.svg new file mode 100644 index 0000000000..dad44fcc30 --- /dev/null +++ b/images/platforms/black/catodon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/catodon.svg.license b/images/platforms/black/catodon.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/catodon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/chatter_net.svg b/images/platforms/black/chatter_net.svg new file mode 100644 index 0000000000..39312ca2ea --- /dev/null +++ b/images/platforms/black/chatter_net.svg @@ -0,0 +1,7 @@ + + + Chatter Net + + + + \ No newline at end of file diff --git a/images/platforms/black/chatter_net.svg.license b/images/platforms/black/chatter_net.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/chatter_net.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/chuckya.svg b/images/platforms/black/chuckya.svg new file mode 100644 index 0000000000..a4b60c4efa --- /dev/null +++ b/images/platforms/black/chuckya.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/chuckya.svg.license b/images/platforms/black/chuckya.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/chuckya.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/clubsall.svg b/images/platforms/black/clubsall.svg new file mode 100644 index 0000000000..29db863218 --- /dev/null +++ b/images/platforms/black/clubsall.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/clubsall.svg.license b/images/platforms/black/clubsall.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/clubsall.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/communecter.svg b/images/platforms/black/communecter.svg new file mode 100644 index 0000000000..46505c9d84 --- /dev/null +++ b/images/platforms/black/communecter.svg @@ -0,0 +1,12 @@ + + + COmmunecter + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/communecter.svg.license b/images/platforms/black/communecter.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/communecter.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/decodon.svg b/images/platforms/black/decodon.svg new file mode 100644 index 0000000000..f2a47a722d --- /dev/null +++ b/images/platforms/black/decodon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/decodon.svg.license b/images/platforms/black/decodon.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/decodon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/diaspora.svg b/images/platforms/black/diaspora.svg index 5eedacaccc..3087c4e6aa 100644 --- a/images/platforms/black/diaspora.svg +++ b/images/platforms/black/diaspora.svg @@ -1,8 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/images/platforms/black/diaspora.svg.license b/images/platforms/black/diaspora.svg.license index 33acc29726..3ffce40c5f 100644 --- a/images/platforms/black/diaspora.svg.license +++ b/images/platforms/black/diaspora.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/discourse.svg b/images/platforms/black/discourse.svg index 250d6389ed..0359b3b004 100644 --- a/images/platforms/black/discourse.svg +++ b/images/platforms/black/discourse.svg @@ -1,2 +1,10 @@ - - \ No newline at end of file + + + Discourse + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/discourse.svg.license b/images/platforms/black/discourse.svg.license index 38caf821b0..3ffce40c5f 100644 --- a/images/platforms/black/discourse.svg.license +++ b/images/platforms/black/discourse.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Kenan Gundogan https://www.svgrepo.com/svg/394118/discourse -SPDX-License-Identifier: MIT +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/dolphin.svg b/images/platforms/black/dolphin.svg new file mode 100644 index 0000000000..2d581150e1 --- /dev/null +++ b/images/platforms/black/dolphin.svg @@ -0,0 +1,14 @@ + + + Dolphin + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/dolphin.svg.license b/images/platforms/black/dolphin.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/dolphin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/drupal.svg b/images/platforms/black/drupal.svg new file mode 100644 index 0000000000..c9ab526143 --- /dev/null +++ b/images/platforms/black/drupal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/drupal.svg.license b/images/platforms/black/drupal.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/drupal.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/emissary.svg b/images/platforms/black/emissary.svg new file mode 100644 index 0000000000..b73b64f324 --- /dev/null +++ b/images/platforms/black/emissary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/emissary.svg.license b/images/platforms/black/emissary.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/emissary.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/epicyon.svg b/images/platforms/black/epicyon.svg new file mode 100644 index 0000000000..ab399d6b86 --- /dev/null +++ b/images/platforms/black/epicyon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/epicyon.svg.license b/images/platforms/black/epicyon.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/epicyon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/f2ap.svg b/images/platforms/black/f2ap.svg new file mode 100644 index 0000000000..5c6c37db22 --- /dev/null +++ b/images/platforms/black/f2ap.svg @@ -0,0 +1,32 @@ + + + f2ap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/f2ap.svg.license b/images/platforms/black/f2ap.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/f2ap.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/fedibird.svg b/images/platforms/black/fedibird.svg new file mode 100644 index 0000000000..8849889a5e --- /dev/null +++ b/images/platforms/black/fedibird.svg @@ -0,0 +1,12 @@ + + + Fedibird + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/fedibird.svg.license b/images/platforms/black/fedibird.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/fedibird.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/fedify.svg b/images/platforms/black/fedify.svg new file mode 100644 index 0000000000..ee1b9b20a0 --- /dev/null +++ b/images/platforms/black/fedify.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/fedify.svg.license b/images/platforms/black/fedify.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/fedify.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/firefish.svg b/images/platforms/black/firefish.svg index 800668c539..b3dd710e4f 100644 --- a/images/platforms/black/firefish.svg +++ b/images/platforms/black/firefish.svg @@ -1 +1,36 @@ -Firefish \ No newline at end of file + +Firefish + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/platforms/black/firefish.svg.license b/images/platforms/black/firefish.svg.license index 00bd211190..3ffce40c5f 100644 --- a/images/platforms/black/firefish.svg.license +++ b/images/platforms/black/firefish.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: https://github.com/simple-icons/simple-icons/ -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/flipboard.svg b/images/platforms/black/flipboard.svg index 5e30e51ff1..85494db64f 100644 --- a/images/platforms/black/flipboard.svg +++ b/images/platforms/black/flipboard.svg @@ -1,2 +1 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/images/platforms/black/flipboard.svg.license b/images/platforms/black/flipboard.svg.license index fa07a94d1f..3ffce40c5f 100644 --- a/images/platforms/black/flipboard.svg.license +++ b/images/platforms/black/flipboard.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Kenan Gundogan https://www.svgrepo.com/svg/394160/flipboard -SPDX-License-Identifier: MIT +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/flohmarkt.svg b/images/platforms/black/flohmarkt.svg new file mode 100644 index 0000000000..0df94e3288 --- /dev/null +++ b/images/platforms/black/flohmarkt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/flohmarkt.svg.license b/images/platforms/black/flohmarkt.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/flohmarkt.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/forgefriends.svg b/images/platforms/black/forgefriends.svg new file mode 100644 index 0000000000..fd6ddcfca6 --- /dev/null +++ b/images/platforms/black/forgefriends.svg @@ -0,0 +1,13 @@ + + + forgefriends + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/forgefriends.svg.license b/images/platforms/black/forgefriends.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/forgefriends.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/forgejo.svg b/images/platforms/black/forgejo.svg new file mode 100644 index 0000000000..b78d3b9c86 --- /dev/null +++ b/images/platforms/black/forgejo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/forgejo.svg.license b/images/platforms/black/forgejo.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/forgejo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/forte.svg b/images/platforms/black/forte.svg new file mode 100644 index 0000000000..c5d53c8763 --- /dev/null +++ b/images/platforms/black/forte.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/forte.svg.license b/images/platforms/black/forte.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/forte.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/foundkey.svg b/images/platforms/black/foundkey.svg new file mode 100644 index 0000000000..071215d3df --- /dev/null +++ b/images/platforms/black/foundkey.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/foundkey.svg.license b/images/platforms/black/foundkey.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/foundkey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/friendica.svg b/images/platforms/black/friendica.svg index 9195f0a8d5..fbfc7e1221 100644 --- a/images/platforms/black/friendica.svg +++ b/images/platforms/black/friendica.svg @@ -1,8 +1,7 @@ - - - - - + + + Friendica + + + \ No newline at end of file diff --git a/images/platforms/black/friendica.svg.license b/images/platforms/black/friendica.svg.license index 0c5f79700d..3ffce40c5f 100644 --- a/images/platforms/black/friendica.svg.license +++ b/images/platforms/black/friendica.svg.license @@ -1,3 +1,2 @@ -SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com -SPDX-License-Identifier: CC0-1.0 - +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/funkwhale.svg b/images/platforms/black/funkwhale.svg new file mode 100644 index 0000000000..11318d562e --- /dev/null +++ b/images/platforms/black/funkwhale.svg @@ -0,0 +1,14 @@ + + + Funkwhale + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/funkwhale.svg.license b/images/platforms/black/funkwhale.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/funkwhale.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/gancio.svg b/images/platforms/black/gancio.svg new file mode 100644 index 0000000000..41c28673ff --- /dev/null +++ b/images/platforms/black/gancio.svg @@ -0,0 +1,12 @@ + + + Gancio + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/gancio.svg.license b/images/platforms/black/gancio.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/gancio.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/gath.io.svg b/images/platforms/black/gath.io.svg new file mode 100644 index 0000000000..d2e89cd6c1 --- /dev/null +++ b/images/platforms/black/gath.io.svg @@ -0,0 +1,11 @@ + + + Gath.io + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/gath.io.svg.license b/images/platforms/black/gath.io.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/gath.io.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/ghost.svg b/images/platforms/black/ghost.svg new file mode 100644 index 0000000000..b7ca833be3 --- /dev/null +++ b/images/platforms/black/ghost.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/ghost.svg.license b/images/platforms/black/ghost.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/ghost.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/gitlab.svg b/images/platforms/black/gitlab.svg new file mode 100644 index 0000000000..23a97f4814 --- /dev/null +++ b/images/platforms/black/gitlab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/gitlab.svg.license b/images/platforms/black/gitlab.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/gitlab.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/glitch-soc.svg b/images/platforms/black/glitch-soc.svg new file mode 100644 index 0000000000..b097a6608a --- /dev/null +++ b/images/platforms/black/glitch-soc.svg @@ -0,0 +1,7 @@ + + + Glitch-soc Alt 1 + + + + \ No newline at end of file diff --git a/images/platforms/black/glitch-soc.svg.license b/images/platforms/black/glitch-soc.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/glitch-soc.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/gnu_social.svg b/images/platforms/black/gnu_social.svg new file mode 100644 index 0000000000..51790be388 --- /dev/null +++ b/images/platforms/black/gnu_social.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/gnu_social.svg.license b/images/platforms/black/gnu_social.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/gnu_social.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/gnusocial.svg b/images/platforms/black/gnusocial.svg index 8314f315f0..51790be388 100644 --- a/images/platforms/black/gnusocial.svg +++ b/images/platforms/black/gnusocial.svg @@ -1,10 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/images/platforms/black/go-fed.svg b/images/platforms/black/go-fed.svg new file mode 100644 index 0000000000..71caf52743 --- /dev/null +++ b/images/platforms/black/go-fed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/go-fed.svg.license b/images/platforms/black/go-fed.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/go-fed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/goblin.svg b/images/platforms/black/goblin.svg new file mode 100644 index 0000000000..d4024eab0a --- /dev/null +++ b/images/platforms/black/goblin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/goblin.svg.license b/images/platforms/black/goblin.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/goblin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/gotosocial.svg.license b/images/platforms/black/gotosocial.svg.license index 92bf50a2b6..3ffce40c5f 100644 --- a/images/platforms/black/gotosocial.svg.license +++ b/images/platforms/black/gotosocial.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Anna Abramek https://abramek.art/ -SPDX-License-Identifier: CC-BY-SA-4.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/greatape.svg b/images/platforms/black/greatape.svg new file mode 100644 index 0000000000..ecb21e81b4 --- /dev/null +++ b/images/platforms/black/greatape.svg @@ -0,0 +1,7 @@ + + + Greatape + + + + \ No newline at end of file diff --git a/images/platforms/black/greatape.svg.license b/images/platforms/black/greatape.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/greatape.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/guppe.svg b/images/platforms/black/guppe.svg new file mode 100644 index 0000000000..f1e39eb5dd --- /dev/null +++ b/images/platforms/black/guppe.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/guppe.svg.license b/images/platforms/black/guppe.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/guppe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/hollo.svg b/images/platforms/black/hollo.svg new file mode 100644 index 0000000000..c1caf81cef --- /dev/null +++ b/images/platforms/black/hollo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/hollo.svg.license b/images/platforms/black/hollo.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/hollo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/hometown.svg.license b/images/platforms/black/hometown.svg.license index 50895de908..3ffce40c5f 100644 --- a/images/platforms/black/hometown.svg.license +++ b/images/platforms/black/hometown.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Copyright (C) 2016-2022 Eugen Rochko & other Mastodon contributors -SPDX-License-Identifier: AGPL-3.0-or-later +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/honk.svg b/images/platforms/black/honk.svg new file mode 100644 index 0000000000..6e12a2b4ab --- /dev/null +++ b/images/platforms/black/honk.svg @@ -0,0 +1,9 @@ + + + Honk + + + + + + \ No newline at end of file diff --git a/images/platforms/black/honk.svg.license b/images/platforms/black/honk.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/honk.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/hubzilla.svg b/images/platforms/black/hubzilla.svg index b175f2a759..60aaa1e532 100644 --- a/images/platforms/black/hubzilla.svg +++ b/images/platforms/black/hubzilla.svg @@ -1,8 +1,9 @@ - - - - - + + + Hubzilla + + + + + \ No newline at end of file diff --git a/images/platforms/black/hubzilla.svg.license b/images/platforms/black/hubzilla.svg.license index 33acc29726..3ffce40c5f 100644 --- a/images/platforms/black/hubzilla.svg.license +++ b/images/platforms/black/hubzilla.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/iceshrimp.svg.license b/images/platforms/black/iceshrimp.svg.license index a6ab3519b6..3ffce40c5f 100644 --- a/images/platforms/black/iceshrimp.svg.license +++ b/images/platforms/black/iceshrimp.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: https://iceshrimp.dev/iceshrimp/iceshrimp.net -SPDX-License-Identifier: EUPL-1.2 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/juick.svg b/images/platforms/black/juick.svg new file mode 100644 index 0000000000..1cddc5135c --- /dev/null +++ b/images/platforms/black/juick.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/juick.svg.license b/images/platforms/black/juick.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/juick.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/kazarma.svg b/images/platforms/black/kazarma.svg new file mode 100644 index 0000000000..d7a9f0c550 --- /dev/null +++ b/images/platforms/black/kazarma.svg @@ -0,0 +1,7 @@ + + + Kazarma + + + + \ No newline at end of file diff --git a/images/platforms/black/kazarma.svg.license b/images/platforms/black/kazarma.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/kazarma.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/kbin.svg b/images/platforms/black/kbin.svg new file mode 100644 index 0000000000..aa5e1ae3f1 --- /dev/null +++ b/images/platforms/black/kbin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/kbin.svg.license b/images/platforms/black/kbin.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/kbin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/kepi.svg b/images/platforms/black/kepi.svg new file mode 100644 index 0000000000..96b6871e34 --- /dev/null +++ b/images/platforms/black/kepi.svg @@ -0,0 +1,12 @@ + + + kepi + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/kepi.svg.license b/images/platforms/black/kepi.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/kepi.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/kitsune.svg b/images/platforms/black/kitsune.svg new file mode 100644 index 0000000000..a58f0d4203 --- /dev/null +++ b/images/platforms/black/kitsune.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/kitsune.svg.license b/images/platforms/black/kitsune.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/kitsune.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/kmyblue.svg b/images/platforms/black/kmyblue.svg new file mode 100644 index 0000000000..2c77208f3e --- /dev/null +++ b/images/platforms/black/kmyblue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/kmyblue.svg.license b/images/platforms/black/kmyblue.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/kmyblue.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/kookie.svg b/images/platforms/black/kookie.svg new file mode 100644 index 0000000000..e435201b06 --- /dev/null +++ b/images/platforms/black/kookie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/kookie.svg.license b/images/platforms/black/kookie.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/kookie.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/ktistec.svg b/images/platforms/black/ktistec.svg new file mode 100644 index 0000000000..39b71d11b6 --- /dev/null +++ b/images/platforms/black/ktistec.svg @@ -0,0 +1,9 @@ + + + Ktistec + + + + + + \ No newline at end of file diff --git a/images/platforms/black/ktistec.svg.license b/images/platforms/black/ktistec.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/ktistec.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/lemmy.svg b/images/platforms/black/lemmy.svg index eb07724289..f031bb90b5 100644 --- a/images/platforms/black/lemmy.svg +++ b/images/platforms/black/lemmy.svg @@ -1,75 +1,7 @@ - - - - - - - - - - - - + + + Lemmy + + + + \ No newline at end of file diff --git a/images/platforms/black/lemmy.svg.license b/images/platforms/black/lemmy.svg.license index 47758d23cf..3ffce40c5f 100644 --- a/images/platforms/black/lemmy.svg.license +++ b/images/platforms/black/lemmy.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Andy Cuccaro https://commons.wikimedia.org/wiki/File:Lemmy_logo.svg -SPDX-License-Identifier: AGPL-3.0-or-later +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/loops.svg b/images/platforms/black/loops.svg new file mode 100644 index 0000000000..9ec17d9983 --- /dev/null +++ b/images/platforms/black/loops.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/loops.svg.license b/images/platforms/black/loops.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/loops.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/mastodon.svg b/images/platforms/black/mastodon.svg index 9ecf4ba0e1..f3e0e962ca 100644 --- a/images/platforms/black/mastodon.svg +++ b/images/platforms/black/mastodon.svg @@ -1,9 +1,9 @@ - - - - - + + + Mastodon + + + + + \ No newline at end of file diff --git a/images/platforms/black/mastodon.svg.license b/images/platforms/black/mastodon.svg.license index 33acc29726..3ffce40c5f 100644 --- a/images/platforms/black/mastodon.svg.license +++ b/images/platforms/black/mastodon.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/mbin.svg.license b/images/platforms/black/mbin.svg.license index aa9aa09b5c..3ffce40c5f 100644 --- a/images/platforms/black/mbin.svg.license +++ b/images/platforms/black/mbin.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: grumpyDev https://github.com/mbinOrg/mbin?tab=readme-ov-file#credits -SPDX-License-Identifier: Zlib +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/micro.blog.svg b/images/platforms/black/micro.blog.svg new file mode 100644 index 0000000000..df4c8c06cf --- /dev/null +++ b/images/platforms/black/micro.blog.svg @@ -0,0 +1,9 @@ + + + Micro.blog + + + + + + \ No newline at end of file diff --git a/images/platforms/black/micro.blog.svg.license b/images/platforms/black/micro.blog.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/micro.blog.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/minds.svg b/images/platforms/black/minds.svg new file mode 100644 index 0000000000..8fd98b7b3d --- /dev/null +++ b/images/platforms/black/minds.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/minds.svg.license b/images/platforms/black/minds.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/minds.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/misskey.svg b/images/platforms/black/misskey.svg index 02cb7288b9..ab1c3204a0 100644 --- a/images/platforms/black/misskey.svg +++ b/images/platforms/black/misskey.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/images/platforms/black/misskey.svg.license b/images/platforms/black/misskey.svg.license index fc85a362b6..3ffce40c5f 100644 --- a/images/platforms/black/misskey.svg.license +++ b/images/platforms/black/misskey.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: kakkokari-gtyih https://commons.wikimedia.org/wiki/File:Misskey_Mi_icon.svg -SPDX-License-Identifier: AGPL-3.0-or-later +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/mistpark.svg b/images/platforms/black/mistpark.svg new file mode 100644 index 0000000000..994ede5fe6 --- /dev/null +++ b/images/platforms/black/mistpark.svg @@ -0,0 +1,9 @@ + + + Mistpark + + + + + + \ No newline at end of file diff --git a/images/platforms/black/mistpark.svg.license b/images/platforms/black/mistpark.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/mistpark.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/mitra.svg b/images/platforms/black/mitra.svg new file mode 100644 index 0000000000..593c62b6b1 --- /dev/null +++ b/images/platforms/black/mitra.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/mitra.svg.license b/images/platforms/black/mitra.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/mitra.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/mobilizon.svg b/images/platforms/black/mobilizon.svg index a6caf78a59..31ef831ec9 100644 --- a/images/platforms/black/mobilizon.svg +++ b/images/platforms/black/mobilizon.svg @@ -1,2 +1,9 @@ - - \ No newline at end of file + + + Mobilizon + + + + + + \ No newline at end of file diff --git a/images/platforms/black/mobilizon.svg.license b/images/platforms/black/mobilizon.svg.license index 690c5f7c1d..3ffce40c5f 100644 --- a/images/platforms/black/mobilizon.svg.license +++ b/images/platforms/black/mobilizon.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: 2017 - 2024 Developed with ♥ by Framasoft -SPDX-License-Identifier: AGPL-3.0-only +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/neodb.svg b/images/platforms/black/neodb.svg new file mode 100644 index 0000000000..adae2cf953 --- /dev/null +++ b/images/platforms/black/neodb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/neodb.svg.license b/images/platforms/black/neodb.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/neodb.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/newsmast.svg b/images/platforms/black/newsmast.svg new file mode 100644 index 0000000000..8331cb87e2 --- /dev/null +++ b/images/platforms/black/newsmast.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/newsmast.svg.license b/images/platforms/black/newsmast.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/newsmast.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/nextcloud_social.svg b/images/platforms/black/nextcloud_social.svg new file mode 100644 index 0000000000..acd6ee0f9a --- /dev/null +++ b/images/platforms/black/nextcloud_social.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/nextcloud_social.svg.license b/images/platforms/black/nextcloud_social.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/nextcloud_social.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/nodebb.svg b/images/platforms/black/nodebb.svg new file mode 100644 index 0000000000..7798d3bd8a --- /dev/null +++ b/images/platforms/black/nodebb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/nodebb.svg.license b/images/platforms/black/nodebb.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/nodebb.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/osada.svg b/images/platforms/black/osada.svg new file mode 100644 index 0000000000..56b4d774bb --- /dev/null +++ b/images/platforms/black/osada.svg @@ -0,0 +1,9 @@ + + + Osada + + + + + + \ No newline at end of file diff --git a/images/platforms/black/osada.svg.license b/images/platforms/black/osada.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/osada.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/owncast.svg b/images/platforms/black/owncast.svg new file mode 100644 index 0000000000..44b3f5b9b8 --- /dev/null +++ b/images/platforms/black/owncast.svg @@ -0,0 +1,13 @@ + + + Owncast + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/owncast.svg.license b/images/platforms/black/owncast.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/owncast.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/piefed.svg b/images/platforms/black/piefed.svg new file mode 100644 index 0000000000..87386fd939 --- /dev/null +++ b/images/platforms/black/piefed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/piefed.svg.license b/images/platforms/black/piefed.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/piefed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/pinetta.svg b/images/platforms/black/pinetta.svg new file mode 100644 index 0000000000..4d8d49d2c6 --- /dev/null +++ b/images/platforms/black/pinetta.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/pinetta.svg.license b/images/platforms/black/pinetta.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/pinetta.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/pixelfed.svg b/images/platforms/black/pixelfed.svg index 214dbab31b..4f56fe12e4 100644 --- a/images/platforms/black/pixelfed.svg +++ b/images/platforms/black/pixelfed.svg @@ -1,8 +1,7 @@ - - - - - + + + Pixelfed + + + \ No newline at end of file diff --git a/images/platforms/black/pixelfed.svg.license b/images/platforms/black/pixelfed.svg.license index 33acc29726..3ffce40c5f 100644 --- a/images/platforms/black/pixelfed.svg.license +++ b/images/platforms/black/pixelfed.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/pleroma.svg b/images/platforms/black/pleroma.svg index d03da50d2d..af93e43942 100644 --- a/images/platforms/black/pleroma.svg +++ b/images/platforms/black/pleroma.svg @@ -1,8 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/images/platforms/black/pleroma.svg.license b/images/platforms/black/pleroma.svg.license index 33acc29726..3ffce40c5f 100644 --- a/images/platforms/black/pleroma.svg.license +++ b/images/platforms/black/pleroma.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/plume.svg b/images/platforms/black/plume.svg index 741aeee32c..d78dc18e70 100644 --- a/images/platforms/black/plume.svg +++ b/images/platforms/black/plume.svg @@ -1,9 +1,7 @@ - - - - - - - + + + Plume + + + + \ No newline at end of file diff --git a/images/platforms/black/plume.svg.license b/images/platforms/black/plume.svg.license index d15e28f3ac..3ffce40c5f 100644 --- a/images/platforms/black/plume.svg.license +++ b/images/platforms/black/plume.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: https://github.com/Plume-org/Plume -SPDX-License-Identifier: AGPL-3.0-only +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/postmarks.svg b/images/platforms/black/postmarks.svg new file mode 100644 index 0000000000..19dda5af8f --- /dev/null +++ b/images/platforms/black/postmarks.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/postmarks.svg.license b/images/platforms/black/postmarks.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/postmarks.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/prismo.svg b/images/platforms/black/prismo.svg new file mode 100644 index 0000000000..67d71635c6 --- /dev/null +++ b/images/platforms/black/prismo.svg @@ -0,0 +1,9 @@ + + + Prismo + + + + + + \ No newline at end of file diff --git a/images/platforms/black/prismo.svg.license b/images/platforms/black/prismo.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/prismo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/rebased.svg b/images/platforms/black/rebased.svg new file mode 100644 index 0000000000..e74cac4873 --- /dev/null +++ b/images/platforms/black/rebased.svg @@ -0,0 +1,9 @@ + + + Rebased + + + + + + \ No newline at end of file diff --git a/images/platforms/black/rebased.svg.license b/images/platforms/black/rebased.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/rebased.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/redmatrix.svg b/images/platforms/black/redmatrix.svg new file mode 100644 index 0000000000..7aebdf7b52 --- /dev/null +++ b/images/platforms/black/redmatrix.svg @@ -0,0 +1,9 @@ + + + Redmatrix + + + + + + \ No newline at end of file diff --git a/images/platforms/black/redmatrix.svg.license b/images/platforms/black/redmatrix.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/redmatrix.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/reel2bits.svg b/images/platforms/black/reel2bits.svg new file mode 100644 index 0000000000..d5b9e48a75 --- /dev/null +++ b/images/platforms/black/reel2bits.svg @@ -0,0 +1,14 @@ + + + reel2bits + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/reel2bits.svg.license b/images/platforms/black/reel2bits.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/reel2bits.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/ruffy.svg b/images/platforms/black/ruffy.svg new file mode 100644 index 0000000000..d6af02252a --- /dev/null +++ b/images/platforms/black/ruffy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/ruffy.svg.license b/images/platforms/black/ruffy.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/ruffy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/sakura.svg b/images/platforms/black/sakura.svg new file mode 100644 index 0000000000..1caeb82705 --- /dev/null +++ b/images/platforms/black/sakura.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/sakura.svg.license b/images/platforms/black/sakura.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/sakura.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/seppo.svg b/images/platforms/black/seppo.svg new file mode 100644 index 0000000000..f5ca69ba8f --- /dev/null +++ b/images/platforms/black/seppo.svg @@ -0,0 +1,7 @@ + + + Seppo! + + + + \ No newline at end of file diff --git a/images/platforms/black/seppo.svg.license b/images/platforms/black/seppo.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/seppo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/shadowfacts.svg b/images/platforms/black/shadowfacts.svg new file mode 100644 index 0000000000..89c2cad2b5 --- /dev/null +++ b/images/platforms/black/shadowfacts.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/shadowfacts.svg.license b/images/platforms/black/shadowfacts.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/shadowfacts.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/sharkey.svg.license b/images/platforms/black/sharkey.svg.license deleted file mode 100644 index aa007dea4a..0000000000 --- a/images/platforms/black/sharkey.svg.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-FileCopyrightText: https://activitypub.software/TransFem-org/Sharkey -SPDX-License-Identifier: AGPL-3.0-only diff --git a/images/platforms/black/sharkey.svg b/images/platforms/black/sharky.svg similarity index 100% rename from images/platforms/black/sharkey.svg rename to images/platforms/black/sharky.svg diff --git a/images/platforms/black/sharky.svg.license b/images/platforms/black/sharky.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/sharky.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/shuttlecraft.svg b/images/platforms/black/shuttlecraft.svg new file mode 100644 index 0000000000..269386557c --- /dev/null +++ b/images/platforms/black/shuttlecraft.svg @@ -0,0 +1,7 @@ + + + Shuttlecraft + + + + \ No newline at end of file diff --git a/images/platforms/black/shuttlecraft.svg.license b/images/platforms/black/shuttlecraft.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/shuttlecraft.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/smilodon.svg b/images/platforms/black/smilodon.svg new file mode 100644 index 0000000000..e418615cc7 --- /dev/null +++ b/images/platforms/black/smilodon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/smilodon.svg.license b/images/platforms/black/smilodon.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/smilodon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/smithereen.svg b/images/platforms/black/smithereen.svg new file mode 100644 index 0000000000..bda9644917 --- /dev/null +++ b/images/platforms/black/smithereen.svg @@ -0,0 +1,9 @@ + + + Smithereen + + + + + + \ No newline at end of file diff --git a/images/platforms/black/smithereen.svg.license b/images/platforms/black/smithereen.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/smithereen.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/snac.svg b/images/platforms/black/snac.svg new file mode 100644 index 0000000000..5d37b80941 --- /dev/null +++ b/images/platforms/black/snac.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/snac.svg.license b/images/platforms/black/snac.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/snac.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/soapbox.svg b/images/platforms/black/soapbox.svg new file mode 100644 index 0000000000..f70bcf2700 --- /dev/null +++ b/images/platforms/black/soapbox.svg @@ -0,0 +1,9 @@ + + + Soapbox + + + + + + \ No newline at end of file diff --git a/images/platforms/black/soapbox.svg.license b/images/platforms/black/soapbox.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/soapbox.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/socialhome.svg b/images/platforms/black/socialhome.svg new file mode 100644 index 0000000000..fcd8bb08c0 --- /dev/null +++ b/images/platforms/black/socialhome.svg @@ -0,0 +1,9 @@ + + + Socialhome + + + + + + \ No newline at end of file diff --git a/images/platforms/black/socialhome.svg.license b/images/platforms/black/socialhome.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/socialhome.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/streams.svg b/images/platforms/black/streams.svg new file mode 100644 index 0000000000..3c78ce0beb --- /dev/null +++ b/images/platforms/black/streams.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/streams.svg.license b/images/platforms/black/streams.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/streams.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/sublinks.svg b/images/platforms/black/sublinks.svg new file mode 100644 index 0000000000..6e771f63bc --- /dev/null +++ b/images/platforms/black/sublinks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/sublinks.svg.license b/images/platforms/black/sublinks.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/sublinks.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/sutty.svg b/images/platforms/black/sutty.svg new file mode 100644 index 0000000000..f7b9a9030c --- /dev/null +++ b/images/platforms/black/sutty.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/sutty.svg.license b/images/platforms/black/sutty.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/sutty.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/swanye.svg.license b/images/platforms/black/swanye.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/swanye.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/takahe.svg b/images/platforms/black/takahe.svg new file mode 100644 index 0000000000..1faf05bfeb --- /dev/null +++ b/images/platforms/black/takahe.svg @@ -0,0 +1,9 @@ + + + Takahē + + + + + + \ No newline at end of file diff --git a/images/platforms/black/takahe.svg.license b/images/platforms/black/takahe.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/takahe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/takesama.svg b/images/platforms/black/takesama.svg new file mode 100644 index 0000000000..fdf0f65984 --- /dev/null +++ b/images/platforms/black/takesama.svg @@ -0,0 +1,7 @@ + + + takesama + + + + \ No newline at end of file diff --git a/images/platforms/black/takesama.svg.license b/images/platforms/black/takesama.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/takesama.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/threads.svg b/images/platforms/black/threads.svg index ae0ec86c42..0097a7aeba 100644 --- a/images/platforms/black/threads.svg +++ b/images/platforms/black/threads.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/images/platforms/black/threads.svg.license b/images/platforms/black/threads.svg.license index 4c063fb3eb..3ffce40c5f 100644 --- a/images/platforms/black/threads.svg.license +++ b/images/platforms/black/threads.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Meta Platforms, Inc. https://commons.wikimedia.org/wiki/File:Threads_(app)_logo.svg -SPDX-License-Identifier: CC-PDDC +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/vernissage.svg b/images/platforms/black/vernissage.svg new file mode 100644 index 0000000000..9c576ac7cb --- /dev/null +++ b/images/platforms/black/vernissage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/vernissage.svg.license b/images/platforms/black/vernissage.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/vernissage.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/vervis.svg b/images/platforms/black/vervis.svg new file mode 100644 index 0000000000..7c6a37f507 --- /dev/null +++ b/images/platforms/black/vervis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/vervis.svg.license b/images/platforms/black/vervis.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/vervis.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/vidzy.svg b/images/platforms/black/vidzy.svg new file mode 100644 index 0000000000..953b9a5c3e --- /dev/null +++ b/images/platforms/black/vidzy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/vidzy.svg.license b/images/platforms/black/vidzy.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/vidzy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/vocata.svg b/images/platforms/black/vocata.svg new file mode 100644 index 0000000000..4d4476a320 --- /dev/null +++ b/images/platforms/black/vocata.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/vocata.svg.license b/images/platforms/black/vocata.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/vocata.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/wafrn.svg b/images/platforms/black/wafrn.svg new file mode 100644 index 0000000000..8e9d27df10 --- /dev/null +++ b/images/platforms/black/wafrn.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/wafrn.svg.license b/images/platforms/black/wafrn.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/wafrn.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/wildebeest.svg b/images/platforms/black/wildebeest.svg new file mode 100644 index 0000000000..91b37d0a32 --- /dev/null +++ b/images/platforms/black/wildebeest.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/wildebeest.svg.license b/images/platforms/black/wildebeest.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/wildebeest.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/wordpress.svg b/images/platforms/black/wordpress.svg index 7c00c85c2d..a5c5aa6249 100644 --- a/images/platforms/black/wordpress.svg +++ b/images/platforms/black/wordpress.svg @@ -1,10 +1,9 @@ - - - - - + + + Wordpress + + + + + \ No newline at end of file diff --git a/images/platforms/black/wordpress.svg.license b/images/platforms/black/wordpress.svg.license index 33acc29726..3ffce40c5f 100644 --- a/images/platforms/black/wordpress.svg.license +++ b/images/platforms/black/wordpress.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/write.as.svg b/images/platforms/black/write.as.svg new file mode 100644 index 0000000000..4ea60554fd --- /dev/null +++ b/images/platforms/black/write.as.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/write.as.svg.license b/images/platforms/black/write.as.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/write.as.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/writefreely.svg b/images/platforms/black/writefreely.svg new file mode 100644 index 0000000000..60c8c0bb53 --- /dev/null +++ b/images/platforms/black/writefreely.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/writefreely.svg.license b/images/platforms/black/writefreely.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/writefreely.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/wxwclub.svg b/images/platforms/black/wxwclub.svg new file mode 100644 index 0000000000..1ec30e8d7a --- /dev/null +++ b/images/platforms/black/wxwclub.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/wxwclub.svg.license b/images/platforms/black/wxwclub.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/wxwclub.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/xwiki.svg b/images/platforms/black/xwiki.svg new file mode 100644 index 0000000000..3bd39a5f89 --- /dev/null +++ b/images/platforms/black/xwiki.svg @@ -0,0 +1,15 @@ + + + XWiki + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/xwiki.svg.license b/images/platforms/black/xwiki.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/xwiki.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/zap.svg b/images/platforms/black/zap.svg new file mode 100644 index 0000000000..062b00393e --- /dev/null +++ b/images/platforms/black/zap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/zap.svg.license b/images/platforms/black/zap.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/zap.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/aardwolf.svg b/images/platforms/color/aardwolf.svg new file mode 100644 index 0000000000..8e5fb499ed --- /dev/null +++ b/images/platforms/color/aardwolf.svg @@ -0,0 +1,42 @@ + + + g38804-2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/aardwolf.svg.license b/images/platforms/color/aardwolf.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/aardwolf.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/activitypods.svg b/images/platforms/color/activitypods.svg new file mode 100644 index 0000000000..1cac3f1640 --- /dev/null +++ b/images/platforms/color/activitypods.svg @@ -0,0 +1,15 @@ + + + + Layer 1 + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/activitypods.svg.license b/images/platforms/color/activitypods.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/activitypods.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/bluesky.svg b/images/platforms/color/bluesky.svg index c71e2018a6..b60d51c279 100644 --- a/images/platforms/color/bluesky.svg +++ b/images/platforms/color/bluesky.svg @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/images/platforms/color/bluesky.svg.license b/images/platforms/color/bluesky.svg.license index 0a78ba51da..3ffce40c5f 100644 --- a/images/platforms/color/bluesky.svg.license +++ b/images/platforms/color/bluesky.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Eric Bailey https://commons.wikimedia.org/wiki/File:Bluesky_Logo.svg -SPDX-License-Identifier: CC-PDDC +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/chuckya.svg b/images/platforms/color/chuckya.svg new file mode 100644 index 0000000000..3d633b8842 --- /dev/null +++ b/images/platforms/color/chuckya.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/color/chuckya.svg.license b/images/platforms/color/chuckya.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/chuckya.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/decodon.svg b/images/platforms/color/decodon.svg new file mode 100644 index 0000000000..0e648c759b --- /dev/null +++ b/images/platforms/color/decodon.svg @@ -0,0 +1,12 @@ + + + decodon_flower_logo + + \ No newline at end of file diff --git a/images/platforms/color/decodon.svg.license b/images/platforms/color/decodon.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/decodon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/fedify.svg b/images/platforms/color/fedify.svg new file mode 100644 index 0000000000..b19fbb59b6 --- /dev/null +++ b/images/platforms/color/fedify.svg @@ -0,0 +1,175 @@ + + + + + Deno Avatar + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/platforms/color/fedify.svg.license b/images/platforms/color/fedify.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/fedify.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/flipboard.svg.license b/images/platforms/color/flipboard.svg.license index 92f3811c81..3ffce40c5f 100644 --- a/images/platforms/color/flipboard.svg.license +++ b/images/platforms/color/flipboard.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Flipboard, Inc. - Moving Brands https://commons.wikimedia.org/wiki/File:Flipboard_logo.svg -SPDX-License-Identifier: CC-PDDC +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/gitlab.svg b/images/platforms/color/gitlab.svg new file mode 100644 index 0000000000..858feda2a0 --- /dev/null +++ b/images/platforms/color/gitlab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/color/gitlab.svg.license b/images/platforms/color/gitlab.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/gitlab.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/kookie.svg b/images/platforms/color/kookie.svg new file mode 100644 index 0000000000..df374d1d33 --- /dev/null +++ b/images/platforms/color/kookie.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/color/kookie.svg.license b/images/platforms/color/kookie.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/kookie.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/loops.svg b/images/platforms/color/loops.svg new file mode 100644 index 0000000000..8ba6b2231c --- /dev/null +++ b/images/platforms/color/loops.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/images/platforms/color/loops.svg.license b/images/platforms/color/loops.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/loops.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/mbin.svg b/images/platforms/color/mbin.svg new file mode 100644 index 0000000000..b48eccdd17 --- /dev/null +++ b/images/platforms/color/mbin.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/platforms/color/mbin.svg.license b/images/platforms/color/mbin.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/mbin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/misskey.svg b/images/platforms/color/misskey.svg new file mode 100644 index 0000000000..15c0bcc9bd --- /dev/null +++ b/images/platforms/color/misskey.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/color/misskey.svg.license b/images/platforms/color/misskey.svg.license new file mode 100644 index 0000000000..41182ca490 --- /dev/null +++ b/images/platforms/color/misskey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://icon-sets.iconify.design/simple-icons/misskey/ +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/color/neodb.svg b/images/platforms/color/neodb.svg new file mode 100644 index 0000000000..cc10cff898 --- /dev/null +++ b/images/platforms/color/neodb.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/platforms/color/neodb.svg.license b/images/platforms/color/neodb.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/neodb.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/newsmast.svg b/images/platforms/color/newsmast.svg new file mode 100644 index 0000000000..875fef30d9 --- /dev/null +++ b/images/platforms/color/newsmast.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/newsmast.svg.license b/images/platforms/color/newsmast.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/newsmast.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/nodebb.svg b/images/platforms/color/nodebb.svg new file mode 100644 index 0000000000..6ef96a9261 --- /dev/null +++ b/images/platforms/color/nodebb.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/nodebb.svg.license b/images/platforms/color/nodebb.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/nodebb.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/sharky.svg b/images/platforms/color/sharky.svg new file mode 100644 index 0000000000..40a2fd9bed --- /dev/null +++ b/images/platforms/color/sharky.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/color/sharky.svg.license b/images/platforms/color/sharky.svg.license new file mode 100644 index 0000000000..c0a1118a51 --- /dev/null +++ b/images/platforms/color/sharky.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://icon-sets.iconify.design/game-icons/shark-jaws/ +SPDX-License-Identifier: CC-BY-3.0 diff --git a/images/platforms/color/vervis.svg b/images/platforms/color/vervis.svg new file mode 100644 index 0000000000..571464e7a8 --- /dev/null +++ b/images/platforms/color/vervis.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/vervis.svg.license b/images/platforms/color/vervis.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/vervis.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/color/vocata.svg b/images/platforms/color/vocata.svg new file mode 100644 index 0000000000..a0ab84330f --- /dev/null +++ b/images/platforms/color/vocata.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/vocata.svg.license b/images/platforms/color/vocata.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/color/vocata.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/activitypub.svg b/images/platforms/white/activitypub.svg new file mode 100644 index 0000000000..f44e06683a --- /dev/null +++ b/images/platforms/white/activitypub.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/activitypub.svg.license b/images/platforms/white/activitypub.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/activitypub.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/akkoma.svg b/images/platforms/white/akkoma.svg new file mode 100644 index 0000000000..7bc4df5630 --- /dev/null +++ b/images/platforms/white/akkoma.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/akkoma.svg.license b/images/platforms/white/akkoma.svg.license new file mode 100644 index 0000000000..53413ed82d --- /dev/null +++ b/images/platforms/white/akkoma.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/white/andstatus.svg b/images/platforms/white/andstatus.svg new file mode 100644 index 0000000000..ab551a2275 --- /dev/null +++ b/images/platforms/white/andstatus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/andstatus.svg.license b/images/platforms/white/andstatus.svg.license new file mode 100644 index 0000000000..53413ed82d --- /dev/null +++ b/images/platforms/white/andstatus.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/white/bluesky.svg b/images/platforms/white/bluesky.svg new file mode 100644 index 0000000000..88153df455 --- /dev/null +++ b/images/platforms/white/bluesky.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/bluesky.svg.license b/images/platforms/white/bluesky.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/bluesky.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/bonfire.svg b/images/platforms/white/bonfire.svg new file mode 100644 index 0000000000..9f2c438cfa --- /dev/null +++ b/images/platforms/white/bonfire.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/bonfire.svg.license b/images/platforms/white/bonfire.svg.license new file mode 100644 index 0000000000..53413ed82d --- /dev/null +++ b/images/platforms/white/bonfire.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/white/bookwyrm.svg b/images/platforms/white/bookwyrm.svg new file mode 100644 index 0000000000..6afc7c37ca --- /dev/null +++ b/images/platforms/white/bookwyrm.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/bookwyrm.svg.license b/images/platforms/white/bookwyrm.svg.license new file mode 100644 index 0000000000..53413ed82d --- /dev/null +++ b/images/platforms/white/bookwyrm.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/white/bridgy_fed.svg b/images/platforms/white/bridgy_fed.svg new file mode 100644 index 0000000000..90fe34d8be --- /dev/null +++ b/images/platforms/white/bridgy_fed.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/images/platforms/white/bridgy_fed.svg.license b/images/platforms/white/bridgy_fed.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/bridgy_fed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/calckey.svg b/images/platforms/white/calckey.svg new file mode 100644 index 0000000000..90fe34d8be --- /dev/null +++ b/images/platforms/white/calckey.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/images/platforms/white/calckey.svg.license b/images/platforms/white/calckey.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/calckey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/diaspora.svg b/images/platforms/white/diaspora.svg new file mode 100644 index 0000000000..54ecd5f069 --- /dev/null +++ b/images/platforms/white/diaspora.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/diaspora.svg.license b/images/platforms/white/diaspora.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/diaspora.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/discourse.svg b/images/platforms/white/discourse.svg new file mode 100644 index 0000000000..801b1345ee --- /dev/null +++ b/images/platforms/white/discourse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/discourse.svg.license b/images/platforms/white/discourse.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/discourse.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/drupal.svg b/images/platforms/white/drupal.svg new file mode 100644 index 0000000000..f4179023e7 --- /dev/null +++ b/images/platforms/white/drupal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/drupal.svg.license b/images/platforms/white/drupal.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/drupal.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/email.svg b/images/platforms/white/email.svg new file mode 100644 index 0000000000..cbc88ddb10 --- /dev/null +++ b/images/platforms/white/email.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/email.svg.license b/images/platforms/white/email.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/email.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/firefish.svg b/images/platforms/white/firefish.svg new file mode 100644 index 0000000000..bf20d55ebf --- /dev/null +++ b/images/platforms/white/firefish.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/firefish.svg.license b/images/platforms/white/firefish.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/firefish.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/flipboard.svg b/images/platforms/white/flipboard.svg new file mode 100644 index 0000000000..62d8873eb1 --- /dev/null +++ b/images/platforms/white/flipboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/flipboard.svg.license b/images/platforms/white/flipboard.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/flipboard.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/forgejo.svg b/images/platforms/white/forgejo.svg new file mode 100644 index 0000000000..fb9566de7e --- /dev/null +++ b/images/platforms/white/forgejo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/forgejo.svg.license b/images/platforms/white/forgejo.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/forgejo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/friendica.svg b/images/platforms/white/friendica.svg new file mode 100644 index 0000000000..c08f087165 --- /dev/null +++ b/images/platforms/white/friendica.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/friendica.svg.license b/images/platforms/white/friendica.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/friendica.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/funkwhale.svg b/images/platforms/white/funkwhale.svg new file mode 100644 index 0000000000..8afb6a3226 --- /dev/null +++ b/images/platforms/white/funkwhale.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/funkwhale.svg.license b/images/platforms/white/funkwhale.svg.license new file mode 100644 index 0000000000..53413ed82d --- /dev/null +++ b/images/platforms/white/funkwhale.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/white/ghost.svg b/images/platforms/white/ghost.svg new file mode 100644 index 0000000000..cca71bc322 --- /dev/null +++ b/images/platforms/white/ghost.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/ghost.svg.license b/images/platforms/white/ghost.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/ghost.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/gitlab.svg b/images/platforms/white/gitlab.svg new file mode 100644 index 0000000000..ef428338de --- /dev/null +++ b/images/platforms/white/gitlab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/gitlab.svg.license b/images/platforms/white/gitlab.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/gitlab.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/gnusocial.svg b/images/platforms/white/gnusocial.svg new file mode 100644 index 0000000000..179c6fc8ba --- /dev/null +++ b/images/platforms/white/gnusocial.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/gnusocial.svg.license b/images/platforms/white/gnusocial.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/gnusocial.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/gotosocial.svg b/images/platforms/white/gotosocial.svg new file mode 100644 index 0000000000..2e097a139f --- /dev/null +++ b/images/platforms/white/gotosocial.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/gotosocial.svg.license b/images/platforms/white/gotosocial.svg.license new file mode 100644 index 0000000000..53413ed82d --- /dev/null +++ b/images/platforms/white/gotosocial.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/white/kbin.svg b/images/platforms/white/kbin.svg new file mode 100644 index 0000000000..2867d2d37c --- /dev/null +++ b/images/platforms/white/kbin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/kbin.svg.license b/images/platforms/white/kbin.svg.license new file mode 100644 index 0000000000..bf13a3d696 --- /dev/null +++ b/images/platforms/white/kbin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: MIT diff --git a/images/platforms/white/lemmy.svg b/images/platforms/white/lemmy.svg new file mode 100644 index 0000000000..3bed2cc4b1 --- /dev/null +++ b/images/platforms/white/lemmy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/lemmy.svg.license b/images/platforms/white/lemmy.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/lemmy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/mastodon.svg b/images/platforms/white/mastodon.svg new file mode 100644 index 0000000000..2ac7d0b895 --- /dev/null +++ b/images/platforms/white/mastodon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/mastodon.svg.license b/images/platforms/white/mastodon.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/mastodon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/microblog.svg b/images/platforms/white/microblog.svg new file mode 100644 index 0000000000..c77fd2ff6b --- /dev/null +++ b/images/platforms/white/microblog.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/microblog.svg.license b/images/platforms/white/microblog.svg.license new file mode 100644 index 0000000000..07ac40ec9a --- /dev/null +++ b/images/platforms/white/microblog.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-4.0 diff --git a/images/platforms/white/minds.svg b/images/platforms/white/minds.svg new file mode 100644 index 0000000000..0ddee7bc03 --- /dev/null +++ b/images/platforms/white/minds.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/minds.svg.license b/images/platforms/white/minds.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/minds.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/misskey.svg b/images/platforms/white/misskey.svg new file mode 100644 index 0000000000..9dd605eb9a --- /dev/null +++ b/images/platforms/white/misskey.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/misskey.svg.license b/images/platforms/white/misskey.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/misskey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/mobilizon.svg b/images/platforms/white/mobilizon.svg new file mode 100644 index 0000000000..2d2a6d9a17 --- /dev/null +++ b/images/platforms/white/mobilizon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/mobilizon.svg.license b/images/platforms/white/mobilizon.svg.license new file mode 100644 index 0000000000..53413ed82d --- /dev/null +++ b/images/platforms/white/mobilizon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/white/nextcloud.svg b/images/platforms/white/nextcloud.svg new file mode 100644 index 0000000000..6ef81a6795 --- /dev/null +++ b/images/platforms/white/nextcloud.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/nextcloud.svg.license b/images/platforms/white/nextcloud.svg.license new file mode 100644 index 0000000000..bf13a3d696 --- /dev/null +++ b/images/platforms/white/nextcloud.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: MIT diff --git a/images/platforms/white/peertube.svg b/images/platforms/white/peertube.svg new file mode 100644 index 0000000000..7a15c8e0d4 --- /dev/null +++ b/images/platforms/white/peertube.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/peertube.svg.license b/images/platforms/white/peertube.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/peertube.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/pixelfed.svg b/images/platforms/white/pixelfed.svg new file mode 100644 index 0000000000..c872c65e89 --- /dev/null +++ b/images/platforms/white/pixelfed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/pixelfed.svg.license b/images/platforms/white/pixelfed.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/pixelfed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/pleroma.svg b/images/platforms/white/pleroma.svg new file mode 100644 index 0000000000..e0b0585c7b --- /dev/null +++ b/images/platforms/white/pleroma.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/pleroma.svg.license b/images/platforms/white/pleroma.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/pleroma.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/white/rss.svg b/images/platforms/white/rss.svg new file mode 100644 index 0000000000..1874fa72d3 --- /dev/null +++ b/images/platforms/white/rss.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/rss.svg.license b/images/platforms/white/rss.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/rss.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/shark.svg b/images/platforms/white/shark.svg new file mode 100644 index 0000000000..6b360796ab --- /dev/null +++ b/images/platforms/white/shark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/shark.svg.license b/images/platforms/white/shark.svg.license new file mode 100644 index 0000000000..d1c6a344b0 --- /dev/null +++ b/images/platforms/white/shark.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC-BY-3.0 diff --git a/images/platforms/white/threads.svg b/images/platforms/white/threads.svg new file mode 100644 index 0000000000..d178ba1dfb --- /dev/null +++ b/images/platforms/white/threads.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/threads.svg.license b/images/platforms/white/threads.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/threads.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/wordpress.svg b/images/platforms/white/wordpress.svg new file mode 100644 index 0000000000..39c01c6658 --- /dev/null +++ b/images/platforms/white/wordpress.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/wordpress.svg.license b/images/platforms/white/wordpress.svg.license new file mode 100644 index 0000000000..dfea79525f --- /dev/null +++ b/images/platforms/white/wordpress.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: Apache-2.0 diff --git a/images/platforms/white/xwiki.svg b/images/platforms/white/xwiki.svg new file mode 100644 index 0000000000..db64f83d2e --- /dev/null +++ b/images/platforms/white/xwiki.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/white/xwiki.svg.license b/images/platforms/white/xwiki.svg.license new file mode 100644 index 0000000000..330e2cb8af --- /dev/null +++ b/images/platforms/white/xwiki.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design +SPDX-License-Identifier: CC0-1.0 diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 9d72e78528..7cf8bcf1b2 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -12,15 +12,19 @@ use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\Strings; -use GuzzleHttp\Psr7\Uri; /** * ContactSelector class */ class ContactSelector { + const SVG_COLOR_BLACK = 0; + const SVG_BLACK = 1; + const SVG_COLOR_WHITE = 2; + const SVG_WHITE = 3; + static $serverdata = []; - static $server_url = []; + static $server_id = []; /** * @param string $current current @@ -50,50 +54,51 @@ class ContactSelector return $o; } - private static function getServerForProfile(string $profile) + /** + * Fetches the server id for a given profile + * + * @param string $profile + * @return integer + */ + public static function getServerIdForProfile(string $profile): int { - $server_url = self::getServerURLForProfile($profile); - - if (!empty(self::$serverdata[$server_url])) { - return self::$serverdata[$server_url]; + if (!empty(self::$server_id[$profile])) { + return self::$server_id[$profile]; } - // Now query the GServer for the platform name - $gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['nurl' => $server_url]); + $contact = DBA::selectFirst('contact', ['gsid'], ['uid' => 0, 'nurl' => Strings::normaliseLink($profile)]); + if (empty($contact['gsid'])) { + return 0; + } - self::$serverdata[$server_url] = $gserver; - return $gserver; + self::$server_id[$profile] = $contact['gsid']; + + return $contact['gsid']; } /** - * @param string $profile Profile URL - * @return string Server URL - * @throws \Exception + * Get server array for a given server id + * + * @param integer $gsid + * @return array */ - private static function getServerURLForProfile(string $profile): string + private static function getServerForId(int $gsid = null): array { - if (!empty(self::$server_url[$profile])) { - return self::$server_url[$profile]; + if (empty($gsid)) { + return []; } - $server_url = ''; - - // Fetch the server url from the contact table - $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($profile)]); - if (DBA::isResult($contact) && !empty($contact['baseurl'])) { - $server_url = Strings::normaliseLink($contact['baseurl']); + if (!empty(self::$serverdata[$gsid])) { + return self::$serverdata[$gsid]; } - if (empty($server_url)) { - // Create the server url out of the profile url - $parts = parse_url($profile); - unset($parts['path']); - $server_url = Strings::normaliseLink((string)Uri::fromParts((array)$parts)); + $gserver = DBA::selectFirst('gserver', ['id', 'url', 'platform', 'network'], ['id' => $gsid]); + if (empty($gserver)) { + return []; } - self::$server_url[$profile] = $server_url; - - return $server_url; + self::$serverdata[$gserver['id']] = $gserver; + return $gserver; } /** @@ -106,7 +111,7 @@ class ContactSelector * @return string * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function networkToName(string $network, string $profile = '', string $protocol = '', int $gsid = null): string + public static function networkToName(string $network, string $protocol = '', int $gsid = null): string { $nets = [ Protocol::DFRN => DI::l10n()->t('DFRN'), @@ -137,15 +142,8 @@ class ContactSelector $networkname = str_replace($search, $replace, $network); - if ((in_array($network, Protocol::FEDERATED)) && ($profile != "")) { - if (!empty($gsid) && !empty(self::$serverdata[$gsid])) { - $gserver = self::$serverdata[$gsid]; - } elseif (!empty($gsid)) { - $gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['id' => $gsid]); - self::$serverdata[$gsid] = $gserver; - } else { - $gserver = self::getServerForProfile($profile); - } + if (in_array($network, Protocol::FEDERATED) && !empty($gsid)) { + $gserver = self::getServerForId($gsid); if (!empty($gserver['platform'])) { $platform = $gserver['platform']; @@ -170,90 +168,21 @@ class ContactSelector } /** - * Determines network's icon name + * Fetch the platform SVG of a given system + * @see https://codeberg.org/FediverseIconography/pages + * @see https://github.com/simple-icons/simple-icons + * @see https://icon-sets.iconify.design * - * @param string $network network - * @param string $profile optional, default empty - * @param int $gsid Server id - * @return string Name for network icon - * @throws \Exception + * @param string $network + * @param integer|null $gsid + * @param string $platform + * @param integer $uid + * @return string */ - public static function networkToIcon(string $network, string $profile = "", int $gsid = null): string + public static function networkToSVG(string $network, int $gsid = null, string $platform = '', int $uid = 0): string { - $nets = [ - Protocol::DFRN => 'friendica', - Protocol::OSTATUS => 'gnu-social', // There is no generic OStatus icon - Protocol::FEED => 'rss', - Protocol::MAIL => 'inbox', - Protocol::DIASPORA => 'diaspora', - Protocol::ZOT => 'hubzilla', - Protocol::LINKEDIN => 'linkedin', - Protocol::XMPP => 'xmpp', - Protocol::MYSPACE => 'file-text-o', /// @todo - Protocol::GPLUS => 'google-plus', - Protocol::PUMPIO => 'file-text-o', /// @todo - Protocol::TWITTER => 'twitter', - Protocol::DISCOURSE => 'dot-circle-o', /// @todo - Protocol::DIASPORA2 => 'diaspora', - Protocol::STATUSNET => 'gnu-social', - Protocol::ACTIVITYPUB => 'activitypub', - Protocol::PNUT => 'file-text-o', /// @todo - Protocol::TUMBLR => 'tumblr', - Protocol::BLUESKY => 'circle', /// @todo - ]; + $platform_icon_style = $uid ? (DI::pConfig()->get($uid, 'accessibility', 'platform_icon_style') ?? self::SVG_COLOR_BLACK) : self::SVG_COLOR_BLACK; - $platform_icons = [ - 'diaspora' => 'diaspora', - 'friendica' => 'friendica', - 'friendika' => 'friendica', - 'GNU Social' => 'gnu-social', - 'gnusocial' => 'gnu-social', - 'hubzilla' => 'hubzilla', - 'mastodon' => 'mastodon', - 'hometown' => 'mastodon', - 'peertube' => 'peertube', - 'pixelfed' => 'pixelfed', - 'pleroma' => 'pleroma', - 'akkoma' => 'pleroma', - 'red' => 'hubzilla', - 'redmatrix' => 'hubzilla', - 'socialhome' => 'social-home', - 'wordpress' => 'wordpress', - 'lemmy' => 'users', - 'plume' => 'plume', - 'funkwhale' => 'funkwhale', - 'nextcloud' => 'nextcloud', - 'drupal' => 'drupal', - 'firefish' => 'fire', - 'calckey' => 'calculator', - 'kbin' => 'check', - 'threads' => 'instagram' - ]; - - $search = array_keys($nets); - $replace = array_values($nets); - - $network_icon = str_replace($search, $replace, $network); - - if ((in_array($network, Protocol::FEDERATED)) && ($profile != "")) { - if (!empty($gsid) && !empty(self::$serverdata[$gsid])) { - $gserver = self::$serverdata[$gsid]; - } elseif (!empty($gsid)) { - $gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['id' => $gsid]); - self::$serverdata[$gsid] = $gserver; - } else { - $gserver = self::getServerForProfile($profile); - } - if (!empty($gserver['platform'])) { - $network_icon = $platform_icons[strtolower($gserver['platform'])] ?? $network_icon; - } - } - - return $network_icon; - } - - public static function networkToSVG(string $network, string $profile = "", int $gsid = null, string $platform = '', int $uid = 0): string - { $nets = [ Protocol::ACTIVITYPUB => 'activitypub', // https://commons.wikimedia.org/wiki/File:ActivityPub-logo-symbol.svg Protocol::BLUESKY => 'bluesky', // https://commons.wikimedia.org/wiki/File:Bluesky_Logo.svg @@ -272,66 +201,77 @@ class ContactSelector Protocol::ZOT => 'hubzilla', // https://www.svgrepo.com/svg/362219/hubzilla ]; - $svg = [ - 'akkoma', // https://commons.wikimedia.org/wiki/File:Akkoma_logo.svg - 'calckey', // https://commons.wikimedia.org/wiki/File:Calckey_Logomark.svg - 'diaspora', // https://www.svgrepo.com/svg/362315/diaspora - 'firefish', // https://commons.wikimedia.org/wiki/File:Firefish_animated.svg - 'flipboard', // https://commons.wikimedia.org/wiki/File:Flipboard_logo.svg - 'friendica', - 'glitchsoc', // https://iconography.fediverse.info/black/glitch-soc.svg - 'gnusocial', // https://commons.wikimedia.org/wiki/File:GNU_Social_Image_Logo.svg - 'gotosocial', // https://iconography.fediverse.info/black/gotosocial.svg - 'hometown', // https://iconography.fediverse.info/black/hometown.svg - 'hubzilla', // https://www.svgrepo.com/svg/362219/hubzilla - 'iceshrimp', // https://iconography.fediverse.info/black/iceshrimp.svg - 'lemmy', // https://commons.wikimedia.org/wiki/File:Lemmy_logo.svg - 'mastodon', // https://commons.wikimedia.org/wiki/File:Mastodon_logotype_(simple)_new_hue.svg - 'mbin', // https://iconography.fediverse.info/black/mbin.svg - 'misskey', // https://commons.wikimedia.org/wiki/File:Misskey_Mi_icon.svg - 'mobilizon', // https://www.svgrepo.com/svg/517896/mobilizon - 'peertube', // https://commons.wikimedia.org/wiki/File:Logo_de_PeerTube.svg - 'pixelfed', // https://commons.wikimedia.org/wiki/File:Pixelfed_logo_multicolor_(September_2018).svg - 'pleroma', // https://commons.wikimedia.org/wiki/File:Smaller_Pleroma_logo.svg - 'plume', // https://commons.wikimedia.org/wiki/File:Plume.svg - 'sharkey', // https://iconography.fediverse.info/black/sharky.svg - 'threads', // https://commons.wikimedia.org/wiki/File:Threads_(app)_logo.svg - 'wordpress', // https://commons.wikimedia.org/wiki/File:WordPress_blue_logo.svg - ]; - $search = array_keys($nets); $replace = array_values($nets); $network_svg = str_replace($search, $replace, $network); - if (in_array($network, Protocol::FEDERATED)) { - if (!empty($gsid) && !empty(self::$serverdata[$gsid])) { - $gserver = self::$serverdata[$gsid]; - } elseif (!empty($gsid)) { - $gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['id' => $gsid]); - self::$serverdata[$gsid] = $gserver; - } elseif (!empty($platform)) { - $gserver = ['platform' => $platform]; - } elseif ($profile != "") { - $gserver = self::getServerForProfile($profile); - } - if (!empty($gserver['platform'])) { - $network_svg = in_array($gserver['platform'], $svg) ? $gserver['platform'] : $network_svg; - } + if (in_array($network, Protocol::FEDERATED) && !empty($gsid)) { + $gserver = self::getServerForId($gsid); + $platform = $gserver['platform']; + } + + $svg = ['aardwolf', 'activitypods', 'activitypub', 'akkoma', 'anfora', 'awakari', 'azorius', + 'bluesky', 'bonfire', 'bookwyrm', 'bridgy_fed', 'brighteon_social', 'brutalinks', 'calckey', + 'castopod', 'catodon', 'chatter_net', 'chuckya', 'clubsall', 'communecter', 'decodon', + 'diaspora', 'discourse', 'dolphin', 'drupal', 'email', 'emissary', 'epicyon', 'f2ap', + 'fedibird', 'fedify', 'firefish', 'flipboard', 'flohmarkt', 'forgefriends', 'forgejo', + 'forte', 'foundkey', 'friendica', 'funkwhale', 'gancio', 'gath.io', 'ghost', 'gitlab', + 'glitch-soc', 'glitchsoc', 'gnu_social', 'gnusocial', 'goblin', 'go-fed', 'gotosocial', + 'greatape', 'guppe', 'hollo', 'hometown', 'honk', 'hubzilla', 'iceshrimp', 'juick', 'kazarma', + 'kbin', 'kepi', 'kitsune', 'kmyblue', 'kookie', 'ktistec', 'lemmy', 'loops', 'mastodon', + 'mbin', 'micro.blog', 'minds', 'misskey', 'mistpark', 'mitra', 'mobilizon', 'neodb', + 'newsmast', 'nextcloud_social', 'nodebb', 'osada', 'owncast', 'peertube', 'piefed', 'pinetta', + 'pixelfed', 'pleroma', 'plume', 'postmarks', 'prismo', 'pump-io', 'rebased', 'redmatrix', + 'reel2bits', 'rss', 'ruffy', 'sakura', 'seppo', 'shadowfacts', 'sharky', 'shuttlecraft', + 'smilodon', 'smithereen', 'snac', 'soapbox', 'socialhome', 'streams', 'sublinks', 'sutty', + 'takahē', 'takesama', 'threads', 'tumblr', 'vernissage', 'vervis', 'vidzy', 'vocata', 'wafrn', + 'wildebeest', 'wordpress', 'write.as', 'writefreely', 'wxwclub', 'xwiki', 'zap']; + + if ($platform_icon_style == self::SVG_WHITE) { + $svg = ['activitypub', 'akkoma', 'andstatus', 'bluesky', 'bonfire', 'bookwyrm', 'bridgy_fed', + 'calckey', 'diaspora', 'discourse', 'drupal', 'email', 'firefish', 'flipboard', 'forgejo', + 'friendica', 'funkwhale', 'ghost', 'gitlab', 'gnusocial', 'gotosocial', 'kbin', 'lemmy', + 'mastodon', 'microblog', 'minds', 'misskey', 'mobilizon', 'nextcloud', 'peertube', + 'pixelfed', 'pleroma', 'rss', 'shark', 'threads', 'wordpress', 'xwiki']; + } + + if (!empty($platform)) { + $aliases = [ + 'brighteon' => 'brighteon_social', + 'bridgy-fed' => 'bridgy_fed', + 'friendika' => 'friendica', + 'gathio' => 'gath.io', + 'GNU Social' => 'gnu_social', + 'gnusocial' => 'gnu_social', + 'guppe groups' => 'guppe', + 'microblog' => 'micro.blog', + 'microblogpub' => 'micro.blog', + 'nextcloud' => 'nextcloud_social', + 'red' => 'redmatrix', + 'sharkey' => 'sharky', + 'sutty-distributed-press' => 'sutty', + ]; + + $platform = str_replace(array_keys($aliases), array_values($aliases), $platform); + $network_svg = in_array($platform, $svg) ? $platform : $network_svg; } if (empty($network_svg)) { return ''; } - $color = ['activitypub', 'akkoma', 'bluesky', 'discourse', 'firefish', 'flipboard', - 'friendica', 'gnusocial', 'mastodon', 'peertube', 'pixelfed', 'pleroma', - 'rss', 'tumblr', 'wordpress']; + $color = ['aardwolf', 'activitypods', 'activitypub', 'akkoma', 'bluesky', 'chuckya', 'decodon', + 'discourse', 'fedify', 'firefish', 'flipboard', 'friendica', 'gitlab', 'gnusocial', 'kookie', + 'loops', 'mastodon', 'mbin', 'misskey', 'neodb', 'newsmast', 'nodebb', 'peertube', 'pixelfed', + 'pleroma', 'rss', 'sharky', 'tumblr', 'vervis', 'vocata', 'wordpress']; - if (($uid && DI::pConfig()->get($uid, 'accessibility', 'black_platform_icons')) || !in_array($network_svg, $color)) { - return 'images/platforms/black/' . $network_svg . '.svg'; - } else { + if (in_array($platform_icon_style, [self::SVG_COLOR_BLACK, self::SVG_COLOR_WHITE]) && in_array($network_svg, $color)) { return 'images/platforms/color/' . $network_svg . '.svg'; + } elseif (in_array($platform_icon_style, [self::SVG_WHITE, self::SVG_COLOR_WHITE])) { + return 'images/platforms/white/' . $network_svg . '.svg'; + } else { + return 'images/platforms/black/' . $network_svg . '.svg'; } } } diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 07d2b6fb8e..4810da647c 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -1516,9 +1516,8 @@ class Conversation 'uriid' => $item['uri-id'], 'author_gsid' => $item['author-gsid'], 'network' => $item['network'], - 'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network'], $item['author-gsid']), - 'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link'], $item['author-gsid']), - 'network_svg' => ContactSelector::networkToSVG($item['network'], $item['author-link'], $item['author-gsid'], '', $this->session->getLocalUserId()), + 'network_name' => ContactSelector::networkToName($item['author-network'], $item['network'], $item['author-gsid']), + 'network_svg' => ContactSelector::networkToSVG($item['network'], $item['author-gsid'], '', $this->session->getLocalUserId()), 'linktitle' => $this->l10n->t('View %s\'s profile @ %s', $profile_name, $item['author-link']), 'profile_url' => $profile_link, 'item_photo_menu_html' => $this->item->photoMenu($item, $formSecurityToken), diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index f1c9cadf7f..e571a219e8 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -921,6 +921,7 @@ class BBCode $contact = Contact::getByURL($attributes['profile'], false, ['network']); $network = $contact['network'] ?? Protocol::PHANTOM; + $gsid = ContactSelector::getServerIdForProfile($attributes['profile']); $tpl = Renderer::getMarkupTemplate('shared_content.tpl'); $text .= self::SHARED_ANCHOR . Renderer::replaceMacros($tpl, [ '$profile' => $attributes['profile'], @@ -930,9 +931,8 @@ class BBCode '$link_title' => DI::l10n()->t('Link to source'), '$posted' => $attributes['posted'], '$guid' => $attributes['guid'], - '$network_name' => ContactSelector::networkToName($network, $attributes['profile']), - '$network_icon' => ContactSelector::networkToIcon($network, $attributes['profile']), - '$network_svg' => ContactSelector::networkToSVG($network, $attributes['profile']), + '$network_name' => ContactSelector::networkToName($network, '', $gsid), + '$network_svg' => ContactSelector::networkToSVG($network, $gsid), '$content' => self::TOP_ANCHOR . self::setMentions(trim($content), 0, $network) . self::BOTTOM_ANCHOR, ]); break; diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php index be98e93afa..f91384051c 100644 --- a/src/Content/Widget/VCard.php +++ b/src/Content/Widget/VCard.php @@ -42,11 +42,9 @@ class VCard if ($contact['network'] != '') { $network_link = Strings::formatNetworkName($contact['network'], $contact_url); - $network_avatar = ContactSelector::networkToIcon($contact['network'], $contact_url); - $network_svg = ContactSelector::networkToSVG($contact['network'], $contact_url, 0, '', DI::userSession()->getLocalUserId()); + $network_svg = ContactSelector::networkToSVG($contact['network'], $contact['gsid'], '', DI::userSession()->getLocalUserId()); } else { $network_link = ''; - $network_avatar = ''; $network_svg = ''; } @@ -114,7 +112,6 @@ class VCard '$matrix' => DI::l10n()->t('Matrix:'), '$location' => DI::l10n()->t('Location:'), '$network_link' => $network_link, - '$network_avatar' => $network_avatar, '$network_svg' => $network_svg, '$network' => DI::l10n()->t('Network:'), '$account_type' => Contact::getAccountType($contact['contact-type']), diff --git a/src/Factory/Api/Mastodon/Status.php b/src/Factory/Api/Mastodon/Status.php index cd02890f2d..3e55b427b5 100644 --- a/src/Factory/Api/Mastodon/Status.php +++ b/src/Factory/Api/Mastodon/Status.php @@ -216,7 +216,7 @@ class Status extends BaseFactory } if ($platform == '') { - $platform = ContactSelector::networkToName($item['network'], $item['author-link'], $item['network'], $item['author-gsid']); + $platform = ContactSelector::networkToName($item['network'], $item['network'], $item['author-gsid']); } $application = new \Friendica\Object\Api\Mastodon\Application($item['app'] ?: $platform); diff --git a/src/Factory/Api/Twitter/Status.php b/src/Factory/Api/Twitter/Status.php index 0c94b7b6c4..084156b382 100644 --- a/src/Factory/Api/Twitter/Status.php +++ b/src/Factory/Api/Twitter/Status.php @@ -68,7 +68,7 @@ class Status extends BaseFactory */ public function createFromItemId(int $id, int $uid, bool $include_entities = false): \Friendica\Object\Api\Twitter\Status { - $fields = ['parent-uri-id', 'uri-id', 'uid', 'author-id', 'author-link', 'author-network', 'owner-id', 'causer-id', + $fields = ['parent-uri-id', 'uri-id', 'uid', 'author-id', 'author-link', 'author-network', 'author-gsid', 'owner-id', 'causer-id', 'starred', 'app', 'title', 'body', 'raw-body', 'created', 'network','post-reason', 'language', 'gravity', 'thr-parent-id', 'parent-author-id', 'parent-author-nick', 'uri', 'plink', 'private', 'vid', 'coord', 'quote-uri-id']; $item = Post::selectFirst($fields, ['id' => $id], ['order' => ['uid' => true]]); @@ -89,7 +89,7 @@ class Status extends BaseFactory */ public function createFromUriId(int $uriId, int $uid = 0, bool $include_entities = false): \Friendica\Object\Api\Twitter\Status { - $fields = ['parent-uri-id', 'uri-id', 'uid', 'author-id', 'author-link', 'author-network', 'owner-id', 'causer-id', + $fields = ['parent-uri-id', 'uri-id', 'uid', 'author-id', 'author-link', 'author-network', 'author-gsid', 'owner-id', 'causer-id', 'starred', 'app', 'title', 'body', 'raw-body', 'created', 'network','post-reason', 'language', 'gravity', 'thr-parent-id', 'parent-author-id', 'parent-author-nick', 'uri', 'plink', 'private', 'vid', 'coord']; $item = Post::selectFirst($fields, ['uri-id' => $uriId, 'uid' => [0, $uid]], ['order' => ['uid' => true]]); diff --git a/src/Model/Item.php b/src/Model/Item.php index 62b8b78772..63cd31c5a2 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -8,6 +8,7 @@ namespace Friendica\Model; use Friendica\Contact\LocalRelationship\Entity\LocalRelationship; +use Friendica\Content\ContactSelector; use Friendica\Content\Image; use Friendica\Content\Post\Collection\PostMedias; use Friendica\Content\Post\Entity\PostMedia; @@ -3375,7 +3376,7 @@ class Item $item['body'] = preg_replace("#\s*\[attachment .*?].*?\[/attachment]\s*#ism", "\n", $item['body']); } - $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media', 'quote-uri-id', 'post-type']; + $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'author-gsid', 'guid', 'created', 'plink', 'network', 'has-media', 'quote-uri-id', 'post-type']; $shared_uri_id = 0; $shared_links = []; @@ -3383,7 +3384,7 @@ class Item $shared = DI::contentItem()->getSharedPost($item, $fields); if (!empty($shared['post'])) { - $shared_item = $shared['post']; + $shared_item = $shared['post']; $shared_item['body'] = Post\Media::removeFromEndOfBody($shared_item['body']); $shared_item['body'] = Post\Media::replaceImage($shared_item['body']); $quote_uri_id = $shared['post']['uri-id']; @@ -3470,6 +3471,10 @@ class Item unset($hook_data); } + if (!empty($shared_item['uri-id'])) { + $s = self::replacePlatformIcon($s, $shared_item, $uid); + } + $hook_data = [ 'item' => $item, 'html' => $s, @@ -3533,6 +3538,39 @@ class Item return $hook_data['html']; } + /** + * Replace the platform icon with the icon in the style selected by the user + * + * @param string $html + * @param array $item + * @param integer $uid + * @return string + */ + private static function replacePlatformIcon(string $html, array $item, int $uid): string + { + $dom = new \DOMDocument(); + if (!@$dom->loadHTML($html)) { + return $html; + } + + $svg = ContactSelector::networkToSVG($item['network'], $item['author-gsid'], '', $uid); + if (empty($svg)) { + return $html; + } + + $xpath = new \DOMXPath($dom); + /** @var DOMElement $element */ + foreach ($xpath->query("//img[@class='network-svg']") as $element) { + $src = $element->getAttributeNode('src')->nodeValue; + if ($src == $svg) { + continue; + } + $element_html = $element->ownerDocument->saveHTML($element); + $html = str_replace($element_html, str_replace($src, $svg, $element_html), $html); + } + return $html; + } + /** * Modify links to pictures to links for the "Fancybox" gallery * diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php index 7ca747d3e3..a653c64939 100644 --- a/src/Module/Admin/Federation.php +++ b/src/Module/Admin/Federation.php @@ -182,7 +182,7 @@ class Federation extends BaseAdmin } $gserver['platform'] = $systems[$platform]['name']; - $gserver['svg'] = ContactSelector::networkToSVG($gserver['network'], '', null, $platform, DI::userSession()->getLocalUserId()); + $gserver['svg'] = ContactSelector::networkToSVG($gserver['network'], null, $platform, DI::userSession()->getLocalUserId()); $gserver['totallbl'] = DI::l10n()->tt('%2$s total system' , '%2$s total systems' , $gserver['total'], number_format($gserver['total'])); $gserver['monthlbl'] = DI::l10n()->tt('%2$s active user last month' , '%2$s active users last month' , $gserver['month'] ?? 0, number_format($gserver['month'] ?? 0)); $gserver['halfyearlbl'] = DI::l10n()->tt('%2$s active user last six months' , '%2$s active users last six months' , $gserver['halfyear'] ?? 0, number_format($gserver['halfyear'] ?? 0)); diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 62b1681656..5a939158ef 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -617,7 +617,7 @@ class Contact extends BaseModule 'account_type' => Model\Contact::getAccountType($contact['contact-type']), 'sparkle' => $sparkle, 'itemurl' => ($contact['addr'] ?? '') ?: $contact['url'], - 'network' => ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol'], $contact['gsid']), + 'network' => ContactSelector::networkToName($contact['network'], $contact['protocol'], $contact['gsid']), ]; } } diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php index 986f19bcb1..a176a20684 100644 --- a/src/Module/Contact/Profile.php +++ b/src/Module/Contact/Profile.php @@ -297,7 +297,7 @@ class Profile extends BaseModule $poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::FEED, Protocol::MAIL]); - $nettype = $this->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol'], $contact['gsid'])); + $nettype = $this->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['protocol'], $contact['gsid'])); // tabs $tab_str = Module\Contact::getTabsHTML($contact, Module\Contact::TAB_PROFILE); diff --git a/src/Module/Moderation/Blocklist/Server/Add.php b/src/Module/Moderation/Blocklist/Server/Add.php index aa80d47361..9f0110a558 100644 --- a/src/Module/Moderation/Blocklist/Server/Add.php +++ b/src/Module/Moderation/Blocklist/Server/Add.php @@ -96,7 +96,6 @@ class Add extends BaseModeration array_walk($gservers, function (array &$gserver) { $gserver['domain'] = (new Uri($gserver['url']))->getHost(); - $gserver['network_icon'] = ContactSelector::networkToIcon($gserver['network']); $gserver['network_svg'] = ContactSelector::networkToSVG($gserver['network']); $gserver['network_name'] = ContactSelector::networkToName($gserver['network']); }); diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 55de7978be..93da954d47 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -156,7 +156,8 @@ class Introductions extends BaseNotifications $header .= ' <' . $Introduction->getAddr() . '>'; } - $header .= ' (' . ContactSelector::networkToName($Introduction->getNetwork(), $Introduction->getUrl()) . ')'; + $gsid = ContactSelector::getServerIdForProfile($Introduction->getUrl()); + $header .= ' (' . ContactSelector::networkToName($Introduction->getNetwork(), '', $gsid) . ')'; if ($Introduction->getNetwork() != Protocol::DIASPORA) { $discard = $this->t('Discard'); @@ -191,7 +192,7 @@ class Introductions extends BaseNotifications '$addr' => $Introduction->getAddr(), '$lbl_knowyou' => $lbl_knowyou, '$lbl_network' => $this->t('Network:'), - '$network' => ContactSelector::networkToName($Introduction->getNetwork(), $Introduction->getUrl()), + '$network' => ContactSelector::networkToName($Introduction->getNetwork(), '', $gsid), '$knowyou' => $knowyou, '$approve' => $this->t('Approve'), '$note' => $Introduction->getNote(), diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 6e9cb02718..3c71b604d6 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -8,6 +8,7 @@ namespace Friendica\Module\Settings; use Friendica\App; +use Friendica\Content\ContactSelector; use Friendica\Content\Conversation\Collection\Timelines; use Friendica\Content\Text\BBCode; use Friendica\Content\Conversation\Factory\Channel as ChannelFactory; @@ -86,7 +87,7 @@ class Display extends BaseSettings $enable = (array)$request['enable']; $bookmark = (array)$request['bookmark']; $channel_languages = (array)$request['channel_languages']; - $first_day_of_week = (bool)$request['first_day_of_week']; + $first_day_of_week = (int)$request['first_day_of_week']; $calendar_default_view = trim($request['calendar_default_view']); $infinite_scroll = (bool)$request['infinite_scroll']; $enable_smart_threading = (bool)$request['enable_smart_threading']; @@ -95,7 +96,7 @@ class Display extends BaseSettings $stay_local = (bool)$request['stay_local']; $hide_empty_descriptions = (bool)$request['hide_empty_descriptions']; $hide_custom_emojis = (bool)$request['hide_custom_emojis']; - $black_platform_icons = (bool)$request['black_platform_icons']; + $platform_icon_style = (int)$request['platform_icon_style']; $show_page_drop = (bool)$request['show_page_drop']; $display_eventlist = (bool)$request['display_eventlist']; $preview_mode = (int)$request['preview_mode']; @@ -138,29 +139,29 @@ class Display extends BaseSettings $this->pConfig->set($uid, 'system', 'mobile_theme', $mobile_theme); } - $this->pConfig->set($uid, 'system', 'itemspage_network' , $itemspage_network); + $this->pConfig->set($uid, 'system', 'itemspage_network', $itemspage_network); $this->pConfig->set($uid, 'system', 'itemspage_mobile_network', $itemspage_mobile_network); - $this->pConfig->set($uid, 'system', 'update_interval' , $browser_update); - $this->pConfig->set($uid, 'system', 'no_smilies' , !$enable_smile); - $this->pConfig->set($uid, 'system', 'infinite_scroll' , $infinite_scroll); - $this->pConfig->set($uid, 'system', 'no_smart_threading' , !$enable_smart_threading); - $this->pConfig->set($uid, 'system', 'hide_dislike' , !$enable_dislike); - $this->pConfig->set($uid, 'system', 'display_resharer' , $display_resharer); - $this->pConfig->set($uid, 'system', 'stay_local' , $stay_local); - $this->pConfig->set($uid, 'system', 'show_page_drop' , $show_page_drop); - $this->pConfig->set($uid, 'system', 'display_eventlist' , $display_eventlist); - $this->pConfig->set($uid, 'system', 'preview_mode' , $preview_mode); - - $this->pConfig->set($uid, 'system', 'network_timelines' , $network_timelines); - $this->pConfig->set($uid, 'system', 'enabled_timelines' , $enabled_timelines); - $this->pConfig->set($uid, 'channel', 'languages' , $channel_languages); - - $this->pConfig->set($uid, 'accessibility', 'hide_empty_descriptions', $hide_empty_descriptions); - $this->pConfig->set($uid, 'accessibility', 'hide_custom_emojis' , $hide_custom_emojis); - $this->pConfig->set($uid, 'accessibility', 'black_platform_icons' , $black_platform_icons); + $this->pConfig->set($uid, 'system', 'update_interval', $browser_update); + $this->pConfig->set($uid, 'system', 'no_smilies', !$enable_smile); + $this->pConfig->set($uid, 'system', 'infinite_scroll', $infinite_scroll); + $this->pConfig->set($uid, 'system', 'no_smart_threading', !$enable_smart_threading); + $this->pConfig->set($uid, 'system', 'hide_dislike', !$enable_dislike); + $this->pConfig->set($uid, 'system', 'display_resharer', $display_resharer); + $this->pConfig->set($uid, 'system', 'stay_local', $stay_local); + $this->pConfig->set($uid, 'system', 'show_page_drop', $show_page_drop); + $this->pConfig->set($uid, 'system', 'display_eventlist', $display_eventlist); + $this->pConfig->set($uid, 'system', 'preview_mode', $preview_mode); - $this->pConfig->set($uid, 'calendar', 'first_day_of_week' , $first_day_of_week); - $this->pConfig->set($uid, 'calendar', 'default_view' , $calendar_default_view); + $this->pConfig->set($uid, 'system', 'network_timelines', $network_timelines); + $this->pConfig->set($uid, 'system', 'enabled_timelines', $enabled_timelines); + $this->pConfig->set($uid, 'channel', 'languages', $channel_languages); + + $this->pConfig->set($uid, 'accessibility', 'hide_empty_descriptions', $hide_empty_descriptions); + $this->pConfig->set($uid, 'accessibility', 'hide_custom_emojis', $hide_custom_emojis); + $this->pConfig->set($uid, 'accessibility', 'platform_icon_style', $platform_icon_style); + + $this->pConfig->set($uid, 'calendar', 'first_day_of_week', $first_day_of_week); + $this->pConfig->set($uid, 'calendar', 'default_view', $calendar_default_view); if (in_array($theme, Theme::getAllowedList())) { if ($theme == $user['theme']) { @@ -247,10 +248,16 @@ class Display extends BaseSettings $stay_local = $this->pConfig->get($uid, 'system', 'stay_local', false); $show_page_drop = $this->pConfig->get($uid, 'system', 'show_page_drop', true); $display_eventlist = $this->pConfig->get($uid, 'system', 'display_eventlist', true); - + $hide_empty_descriptions = $this->pConfig->get($uid, 'accessibility', 'hide_empty_descriptions', false); $hide_custom_emojis = $this->pConfig->get($uid, 'accessibility', 'hide_custom_emojis', false); - $black_platform_icons = $this->pConfig->get($uid, 'accessibility', 'black_platform_icons', false); + $platform_icon_style = $this->pConfig->get($uid, 'accessibility', 'platform_icon_style', ContactSelector::SVG_COLOR_BLACK); + $platform_icon_styles = [ + ContactSelector::SVG_COLOR_BLACK => $this->t('Color/Black'), + ContactSelector::SVG_BLACK => $this->t('Black'), + ContactSelector::SVG_COLOR_WHITE => $this->t('Color/White'), + ContactSelector::SVG_WHITE => $this->t('White'), + ]; $preview_mode = $this->pConfig->get($uid, 'system', 'preview_mode', BBCode::PREVIEW_LARGE); $preview_modes = [ @@ -319,21 +326,21 @@ class Display extends BaseSettings '$mobile_theme' => ['mobile_theme', $this->t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, false], '$theme_config' => $theme_config, - '$itemspage_network' => ['itemspage_network' , $this->t('Number of items to display per page:'), $itemspage_network, $this->t('Maximum of 100 items')], + '$itemspage_network' => ['itemspage_network', $this->t('Number of items to display per page:'), $itemspage_network, $this->t('Maximum of 100 items')], '$itemspage_mobile_network' => ['itemspage_mobile_network', $this->t('Number of items to display per page when viewed from mobile device:'), $itemspage_mobile_network, $this->t('Maximum of 100 items')], - '$ajaxint' => ['browser_update' , $this->t('Update browser every xx seconds'), $browser_update, $this->t('Minimum of 10 seconds. Enter -1 to disable it.')], - '$enable_smile' => ['enable_smile' , $this->t('Display emoticons'), $enable_smile, $this->t('When enabled, emoticons are replaced with matching symbols.')], - '$infinite_scroll' => ['infinite_scroll' , $this->t('Infinite scroll'), $infinite_scroll, $this->t('Automatic fetch new items when reaching the page end.')], - '$enable_smart_threading' => ['enable_smart_threading' , $this->t('Enable Smart Threading'), $enable_smart_threading, $this->t('Enable the automatic suppression of extraneous thread indentation.')], - '$enable_dislike' => ['enable_dislike' , $this->t('Display the Dislike feature'), $enable_dislike, $this->t('Display the Dislike button and dislike reactions on posts and comments.')], - '$display_resharer' => ['display_resharer' , $this->t('Display the resharer'), $display_resharer, $this->t('Display the first resharer as icon and text on a reshared item.')], - '$stay_local' => ['stay_local' , $this->t('Stay local'), $stay_local, $this->t("Don't go to a remote system when following a contact link.")], - '$show_page_drop' => ['show_page_drop' , $this->t('Show the post deletion checkbox'), $show_page_drop, $this->t("Display the checkbox for the post deletion on the network page.")], - '$display_eventlist' => ['display_eventlist' , $this->t('DIsplay the event list'), $display_eventlist, $this->t("Display the birthday reminder and event list on the network page.")], - '$preview_mode' => ['preview_mode' , $this->t('Link preview mode'), $preview_mode, $this->t('Appearance of the link preview that is added to each post with a link.'), $preview_modes, false], - '$hide_empty_descriptions' => ['hide_empty_descriptions' , $this->t('Hide pictures with empty alternative text'), $hide_empty_descriptions, $this->t("Don't display pictures that are missing the alternative text.")], - '$hide_custom_emojis' => ['hide_custom_emojis' , $this->t('Hide custom emojis'), $hide_custom_emojis, $this->t("Don't display custom emojis.")], - '$black_platform_icons' => ['black_platform_icons' , $this->t('Black platform Icons'), $black_platform_icons, $this->t("Use black platform icons instead of colored ones.")], + '$ajaxint' => ['browser_update', $this->t('Update browser every xx seconds'), $browser_update, $this->t('Minimum of 10 seconds. Enter -1 to disable it.')], + '$enable_smile' => ['enable_smile', $this->t('Display emoticons'), $enable_smile, $this->t('When enabled, emoticons are replaced with matching symbols.')], + '$infinite_scroll' => ['infinite_scroll', $this->t('Infinite scroll'), $infinite_scroll, $this->t('Automatic fetch new items when reaching the page end.')], + '$enable_smart_threading' => ['enable_smart_threading', $this->t('Enable Smart Threading'), $enable_smart_threading, $this->t('Enable the automatic suppression of extraneous thread indentation.')], + '$enable_dislike' => ['enable_dislike', $this->t('Display the Dislike feature'), $enable_dislike, $this->t('Display the Dislike button and dislike reactions on posts and comments.')], + '$display_resharer' => ['display_resharer', $this->t('Display the resharer'), $display_resharer, $this->t('Display the first resharer as icon and text on a reshared item.')], + '$stay_local' => ['stay_local', $this->t('Stay local'), $stay_local, $this->t("Don't go to a remote system when following a contact link.")], + '$show_page_drop' => ['show_page_drop', $this->t('Show the post deletion checkbox'), $show_page_drop, $this->t("Display the checkbox for the post deletion on the network page.")], + '$display_eventlist' => ['display_eventlist', $this->t('DIsplay the event list'), $display_eventlist, $this->t("Display the birthday reminder and event list on the network page.")], + '$preview_mode' => ['preview_mode', $this->t('Link preview mode'), $preview_mode, $this->t('Appearance of the link preview that is added to each post with a link.'), $preview_modes, false], + '$hide_empty_descriptions' => ['hide_empty_descriptions', $this->t('Hide pictures with empty alternative text'), $hide_empty_descriptions, $this->t("Don't display pictures that are missing the alternative text.")], + '$hide_custom_emojis' => ['hide_custom_emojis', $this->t('Hide custom emojis'), $hide_custom_emojis, $this->t("Don't display custom emojis.")], + '$platform_icon_style' => ['platform_icon_style', $this->t('Platform icons style'), $platform_icon_style, $this->t('Style of the platform icons'), $platform_icon_styles, false], '$timeline_label' => $this->t('Label'), '$timeline_descriptiom' => $this->t('Description'), @@ -344,7 +351,7 @@ class Display extends BaseSettings '$channel_languages' => ['channel_languages[]', $this->t('Channel languages:'), $channel_languages, $this->t('Select all languages that you want to see in your channels.'), $languages, 'multiple'], - '$first_day_of_week' => ['first_day_of_week' , $this->t('Beginning of week:') , $first_day_of_week , '', $weekdays , false], + '$first_day_of_week' => ['first_day_of_week', $this->t('Beginning of week:'), $first_day_of_week, '', $weekdays, false], '$calendar_default_view' => ['calendar_default_view', $this->t('Default calendar view:'), $calendar_default_view, '', $calendarViews, false], ]); } diff --git a/src/Object/Api/Twitter/Status.php b/src/Object/Api/Twitter/Status.php index 2940cd41d6..793f32fb01 100644 --- a/src/Object/Api/Twitter/Status.php +++ b/src/Object/Api/Twitter/Status.php @@ -121,7 +121,7 @@ class Status extends BaseDataTransferObject $this->entities = $entities; $this->extended_entities = $entities; - $origin = ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']); + $origin = ContactSelector::networkToName($item['author-network'], $item['network'], $item['author-gsid']); if (empty($this->source)) { $this->source = $origin; diff --git a/src/Object/Api/Twitter/User.php b/src/Object/Api/Twitter/User.php index 9effb4c617..ba376263c1 100644 --- a/src/Object/Api/Twitter/User.php +++ b/src/Object/Api/Twitter/User.php @@ -131,7 +131,7 @@ class User extends BaseDataTransferObject $this->name = $publicContact['name'] ?: $publicContact['nick']; $this->screen_name = $publicContact['nick'] ?: $publicContact['name']; $this->location = $publicContact['location'] ?: - ContactSelector::networkToName($publicContact['network'], $publicContact['url'], $publicContact['protocol']); + ContactSelector::networkToName($publicContact['network'], $publicContact['protocol'], $publicContact['gsid']); $this->derived = []; $this->url = $publicContact['url']; // No entities needed since we don't perform any shortening in the URL or description diff --git a/src/Object/Post.php b/src/Object/Post.php index 1c9ef6ca8b..450af95c84 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -606,9 +606,8 @@ class Post 'edited' => $edited, 'author_gsid' => $item['author-gsid'], 'network' => $item['network'], - 'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network'], $item['author-gsid']), - 'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link'], $item['author-gsid']), - 'network_svg' => ContactSelector::networkToSVG($item['network'], $item['author-link'], $item['author-gsid'], '', DI::userSession()->getLocalUserId()), + 'network_name' => ContactSelector::networkToName($item['author-network'], $item['network'], $item['author-gsid']), + 'network_svg' => ContactSelector::networkToSVG($item['network'], $item['author-gsid'], '', DI::userSession()->getLocalUserId()), 'received' => $item['received'], 'commented' => $item['commented'], 'created_date' => $item['created'], diff --git a/src/Util/Strings.php b/src/Util/Strings.php index 6ed6263a93..46d10529a9 100644 --- a/src/Util/Strings.php +++ b/src/Util/Strings.php @@ -155,7 +155,8 @@ class Strings { if ($network != '') { if ($url != '') { - $network_name = '' . ContactSelector::networkToName($network, $url) . ''; + $gsid = ContactSelector::getServerIdForProfile($url); + $network_name = '' . ContactSelector::networkToName($network, '', $gsid) . ''; } else { $network_name = ContactSelector::networkToName($network); } diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index de514387b9..29966fde8f 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2024.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-11-08 08:13+0000\n" +"POT-Creation-Date: 2024-11-10 19:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,8 +67,8 @@ msgstr "" #: src/Module/Register.php:238 src/Module/Search/Directory.php:23 #: src/Module/Settings/Account.php:36 src/Module/Settings/Account.php:377 #: src/Module/Settings/Channels.php:52 src/Module/Settings/Channels.php:127 -#: src/Module/Settings/Delegation.php:76 src/Module/Settings/Display.php:76 -#: src/Module/Settings/Display.php:190 +#: src/Module/Settings/Delegation.php:76 src/Module/Settings/Display.php:77 +#: src/Module/Settings/Display.php:191 #: src/Module/Settings/Profile/Photo/Crop.php:151 #: src/Module/Settings/Profile/Photo/Index.php:96 #: src/Module/Settings/RemoveMe.php:105 src/Module/Settings/UserExport.php:64 @@ -229,7 +229,7 @@ msgid "Message collection failure." msgstr "" #: mod/message.php:109 src/Module/Notifications/Introductions.php:127 -#: src/Module/Notifications/Introductions.php:162 +#: src/Module/Notifications/Introductions.php:163 #: src/Module/Notifications/Notification.php:71 msgid "Discard" msgstr "" @@ -281,7 +281,7 @@ msgid "Insert web link" msgstr "" #: mod/message.php:188 mod/message.php:344 mod/photos.php:1255 -#: src/Content/Conversation.php:386 src/Content/Conversation.php:1563 +#: src/Content/Conversation.php:386 src/Content/Conversation.php:1562 #: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:131 #: src/Object/Post.php:604 msgid "Please wait" @@ -305,7 +305,7 @@ msgstr "" #: src/Module/Moderation/Report/Create.php:249 #: src/Module/Profile/Profile.php:262 src/Module/Settings/Profile/Index.php:248 #: src/Module/Settings/Server/Action.php:65 src/Module/User/Delegation.php:175 -#: src/Object/Post.php:1146 view/theme/duepuntozero/config.php:73 +#: src/Object/Post.php:1145 view/theme/duepuntozero/config.php:73 #: view/theme/frio/config.php:138 view/theme/quattro/config.php:75 #: view/theme/vier/config.php:123 msgid "Submit" @@ -588,25 +588,25 @@ msgstr "" #: mod/photos.php:1093 mod/photos.php:1149 mod/photos.php:1229 #: src/Module/Contact.php:600 src/Module/Item/Compose.php:181 -#: src/Object/Post.php:1143 +#: src/Object/Post.php:1142 msgid "This is you" msgstr "" #: mod/photos.php:1095 mod/photos.php:1151 mod/photos.php:1231 #: src/Module/Moderation/Reports.php:102 src/Object/Post.php:598 -#: src/Object/Post.php:1145 +#: src/Object/Post.php:1144 msgid "Comment" msgstr "" #: mod/photos.php:1097 mod/photos.php:1153 mod/photos.php:1233 #: src/Content/Conversation.php:400 src/Module/Calendar/Event/Form.php:234 #: src/Module/Item/Compose.php:194 src/Module/Post/Edit.php:151 -#: src/Object/Post.php:1159 +#: src/Object/Post.php:1158 msgid "Preview" msgstr "" #: mod/photos.php:1098 src/Content/Conversation.php:354 -#: src/Module/Post/Edit.php:116 src/Object/Post.php:1147 +#: src/Module/Post/Edit.php:116 src/Object/Post.php:1146 msgid "Loading..." msgstr "" @@ -1018,43 +1018,43 @@ msgstr "" msgid "older" msgstr "" -#: src/Content/ContactSelector.php:37 +#: src/Content/ContactSelector.php:41 msgid "Frequently" msgstr "" -#: src/Content/ContactSelector.php:38 +#: src/Content/ContactSelector.php:42 msgid "Hourly" msgstr "" -#: src/Content/ContactSelector.php:39 +#: src/Content/ContactSelector.php:43 msgid "Twice daily" msgstr "" -#: src/Content/ContactSelector.php:40 +#: src/Content/ContactSelector.php:44 msgid "Daily" msgstr "" -#: src/Content/ContactSelector.php:41 +#: src/Content/ContactSelector.php:45 msgid "Weekly" msgstr "" -#: src/Content/ContactSelector.php:42 +#: src/Content/ContactSelector.php:46 msgid "Monthly" msgstr "" -#: src/Content/ContactSelector.php:112 +#: src/Content/ContactSelector.php:117 msgid "DFRN" msgstr "" -#: src/Content/ContactSelector.php:113 +#: src/Content/ContactSelector.php:118 msgid "OStatus" msgstr "" -#: src/Content/ContactSelector.php:114 +#: src/Content/ContactSelector.php:119 msgid "RSS/Atom" msgstr "" -#: src/Content/ContactSelector.php:115 +#: src/Content/ContactSelector.php:120 #: src/Module/Moderation/Users/Active.php:112 #: src/Module/Moderation/Users/Blocked.php:112 #: src/Module/Moderation/Users/Create.php:58 @@ -1065,67 +1065,67 @@ msgstr "" msgid "Email" msgstr "" -#: src/Content/ContactSelector.php:116 src/Module/Debug/Babel.php:301 +#: src/Content/ContactSelector.php:121 src/Module/Debug/Babel.php:301 msgid "Diaspora" msgstr "" -#: src/Content/ContactSelector.php:117 +#: src/Content/ContactSelector.php:122 msgid "Zot!" msgstr "" -#: src/Content/ContactSelector.php:118 +#: src/Content/ContactSelector.php:123 msgid "LinkedIn" msgstr "" -#: src/Content/ContactSelector.php:119 +#: src/Content/ContactSelector.php:124 msgid "XMPP/IM" msgstr "" -#: src/Content/ContactSelector.php:120 +#: src/Content/ContactSelector.php:125 msgid "MySpace" msgstr "" -#: src/Content/ContactSelector.php:121 +#: src/Content/ContactSelector.php:126 msgid "Google+" msgstr "" -#: src/Content/ContactSelector.php:122 +#: src/Content/ContactSelector.php:127 msgid "pump.io" msgstr "" -#: src/Content/ContactSelector.php:123 +#: src/Content/ContactSelector.php:128 msgid "Twitter" msgstr "" -#: src/Content/ContactSelector.php:124 +#: src/Content/ContactSelector.php:129 msgid "Discourse" msgstr "" -#: src/Content/ContactSelector.php:125 +#: src/Content/ContactSelector.php:130 msgid "Diaspora Connector" msgstr "" -#: src/Content/ContactSelector.php:126 +#: src/Content/ContactSelector.php:131 msgid "GNU Social Connector" msgstr "" -#: src/Content/ContactSelector.php:127 +#: src/Content/ContactSelector.php:132 msgid "ActivityPub" msgstr "" -#: src/Content/ContactSelector.php:128 +#: src/Content/ContactSelector.php:133 msgid "pnut" msgstr "" -#: src/Content/ContactSelector.php:129 +#: src/Content/ContactSelector.php:134 msgid "Tumblr" msgstr "" -#: src/Content/ContactSelector.php:130 +#: src/Content/ContactSelector.php:135 msgid "Bluesky" msgstr "" -#: src/Content/ContactSelector.php:162 +#: src/Content/ContactSelector.php:160 #, php-format msgid "%s (via %s)" msgstr "" @@ -1228,7 +1228,7 @@ msgid "Visible to everybody" msgstr "" #: src/Content/Conversation.php:324 src/Module/Item/Compose.php:193 -#: src/Object/Post.php:1158 +#: src/Object/Post.php:1157 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" @@ -1273,52 +1273,52 @@ msgid "attach file" msgstr "" #: src/Content/Conversation.php:359 src/Module/Item/Compose.php:183 -#: src/Module/Post/Edit.php:157 src/Object/Post.php:1148 +#: src/Module/Post/Edit.php:157 src/Object/Post.php:1147 msgid "Bold" msgstr "" #: src/Content/Conversation.php:360 src/Module/Item/Compose.php:184 -#: src/Module/Post/Edit.php:158 src/Object/Post.php:1149 +#: src/Module/Post/Edit.php:158 src/Object/Post.php:1148 msgid "Italic" msgstr "" #: src/Content/Conversation.php:361 src/Module/Item/Compose.php:185 -#: src/Module/Post/Edit.php:159 src/Object/Post.php:1150 +#: src/Module/Post/Edit.php:159 src/Object/Post.php:1149 msgid "Underline" msgstr "" #: src/Content/Conversation.php:362 src/Module/Item/Compose.php:186 -#: src/Module/Post/Edit.php:160 src/Object/Post.php:1152 +#: src/Module/Post/Edit.php:160 src/Object/Post.php:1151 msgid "Quote" msgstr "" #: src/Content/Conversation.php:363 src/Module/Item/Compose.php:187 -#: src/Module/Post/Edit.php:161 src/Object/Post.php:1153 +#: src/Module/Post/Edit.php:161 src/Object/Post.php:1152 msgid "Add emojis" msgstr "" #: src/Content/Conversation.php:364 src/Module/Item/Compose.php:188 -#: src/Object/Post.php:1151 +#: src/Object/Post.php:1150 msgid "Content Warning" msgstr "" #: src/Content/Conversation.php:365 src/Module/Item/Compose.php:189 -#: src/Module/Post/Edit.php:162 src/Object/Post.php:1154 +#: src/Module/Post/Edit.php:162 src/Object/Post.php:1153 msgid "Code" msgstr "" #: src/Content/Conversation.php:366 src/Module/Item/Compose.php:190 -#: src/Object/Post.php:1155 +#: src/Object/Post.php:1154 msgid "Image" msgstr "" #: src/Content/Conversation.php:367 src/Module/Item/Compose.php:191 -#: src/Module/Post/Edit.php:163 src/Object/Post.php:1156 +#: src/Module/Post/Edit.php:163 src/Object/Post.php:1155 msgid "Link" msgstr "" #: src/Content/Conversation.php:368 src/Module/Item/Compose.php:192 -#: src/Module/Post/Edit.php:164 src/Object/Post.php:1157 +#: src/Module/Post/Edit.php:164 src/Object/Post.php:1156 msgid "Link or Media" msgstr "" @@ -1365,7 +1365,7 @@ msgstr "" msgid "Public post" msgstr "" -#: src/Content/Conversation.php:410 src/Content/Widget/VCard.php:125 +#: src/Content/Conversation.php:410 src/Content/Widget/VCard.php:122 #: src/Model/Profile.php:462 src/Module/Admin/Logs/View.php:80 #: src/Module/Post/Edit.php:167 msgid "Message" @@ -1478,26 +1478,26 @@ msgstr "" msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:1522 src/Object/Post.php:541 +#: src/Content/Conversation.php:1521 src/Object/Post.php:541 #: src/Object/Post.php:542 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:1536 src/Object/Post.php:529 +#: src/Content/Conversation.php:1535 src/Object/Post.php:529 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:1537 src/Object/Post.php:530 +#: src/Content/Conversation.php:1536 src/Object/Post.php:530 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:1545 src/Object/Post.php:556 +#: src/Content/Conversation.php:1544 src/Object/Post.php:556 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:1561 +#: src/Content/Conversation.php:1560 msgid "View in context" msgstr "" @@ -1741,7 +1741,7 @@ msgstr "" #: src/Content/Feature.php:120 src/Content/Widget.php:607 #: src/Module/Admin/Site.php:464 src/Module/BaseSettings.php:111 -#: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:312 +#: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:319 msgid "Channels" msgstr "" @@ -1830,7 +1830,7 @@ msgstr "" msgid "Create new group" msgstr "" -#: src/Content/Item.php:317 src/Model/Item.php:3272 +#: src/Content/Item.php:317 src/Model/Item.php:3273 msgid "event" msgstr "" @@ -1838,7 +1838,7 @@ msgstr "" msgid "status" msgstr "" -#: src/Content/Item.php:326 src/Model/Item.php:3274 +#: src/Content/Item.php:326 src/Model/Item.php:3275 #: src/Module/Post/Tag/Add.php:109 msgid "photo" msgstr "" @@ -1891,7 +1891,7 @@ msgstr "" #: src/Content/Item.php:422 src/Module/Contact.php:450 #: src/Module/Contact/Profile.php:532 #: src/Module/Notifications/Introductions.php:126 -#: src/Module/Notifications/Introductions.php:198 +#: src/Module/Notifications/Introductions.php:199 #: src/Module/Notifications/Notification.php:75 msgid "Ignore" msgstr "" @@ -2000,7 +2000,7 @@ msgstr "" #: src/Content/Nav.php:219 src/Content/Nav.php:279 #: src/Module/BaseProfile.php:71 src/Module/BaseProfile.php:74 #: src/Module/BaseProfile.php:82 src/Module/BaseProfile.php:85 -#: src/Module/Settings/Display.php:313 view/theme/frio/theme.php:227 +#: src/Module/Settings/Display.php:320 view/theme/frio/theme.php:227 #: view/theme/frio/theme.php:231 msgid "Calendar" msgstr "" @@ -2195,7 +2195,7 @@ msgstr "" #: src/Content/Nav.php:321 src/Module/BaseModeration.php:114 #: src/Module/Moderation/Blocklist/Contact.php:96 -#: src/Module/Moderation/Blocklist/Server/Add.php:108 +#: src/Module/Moderation/Blocklist/Server/Add.php:107 #: src/Module/Moderation/Blocklist/Server/Import.php:102 #: src/Module/Moderation/Blocklist/Server/Index.php:81 #: src/Module/Moderation/Item/Delete.php:47 @@ -2240,8 +2240,8 @@ msgstr "" msgid "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:930 src/Model/Item.php:4031 -#: src/Model/Item.php:4037 src/Model/Item.php:4038 +#: src/Content/Text/BBCode.php:931 src/Model/Item.php:4069 +#: src/Model/Item.php:4075 src/Model/Item.php:4076 msgid "Link to source" msgstr "" @@ -2273,7 +2273,7 @@ msgstr "" msgid "The end" msgstr "" -#: src/Content/Text/HTML.php:847 src/Content/Widget/VCard.php:121 +#: src/Content/Text/HTML.php:847 src/Content/Widget/VCard.php:118 #: src/Model/Profile.php:456 src/Module/Contact/Profile.php:484 msgid "Follow" msgstr "" @@ -2446,46 +2446,46 @@ msgstr[1] "" msgid "More Trending Tags" msgstr "" -#: src/Content/Widget/VCard.php:98 src/Model/Contact.php:1207 +#: src/Content/Widget/VCard.php:96 src/Model/Contact.php:1207 #: src/Model/Profile.php:441 msgid "Post to group" msgstr "" -#: src/Content/Widget/VCard.php:103 src/Model/Contact.php:1211 +#: src/Content/Widget/VCard.php:101 src/Model/Contact.php:1211 #: src/Model/Profile.php:445 src/Module/Moderation/Item/Source.php:77 msgid "Mention" msgstr "" -#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:360 +#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:360 #: src/Module/Contact/Profile.php:420 src/Module/Profile/Profile.php:187 msgid "XMPP:" msgstr "" -#: src/Content/Widget/VCard.php:114 src/Model/Profile.php:361 +#: src/Content/Widget/VCard.php:112 src/Model/Profile.php:361 #: src/Module/Contact/Profile.php:422 src/Module/Profile/Profile.php:191 msgid "Matrix:" msgstr "" -#: src/Content/Widget/VCard.php:115 src/Model/Event.php:68 +#: src/Content/Widget/VCard.php:113 src/Model/Event.php:68 #: src/Model/Event.php:95 src/Model/Event.php:457 src/Model/Event.php:946 #: src/Model/Profile.php:355 src/Module/Contact/Profile.php:418 -#: src/Module/Directory.php:134 src/Module/Notifications/Introductions.php:179 +#: src/Module/Directory.php:134 src/Module/Notifications/Introductions.php:180 #: src/Module/Profile/Profile.php:209 msgid "Location:" msgstr "" -#: src/Content/Widget/VCard.php:119 src/Model/Profile.php:469 -#: src/Module/Notifications/Introductions.php:193 +#: src/Content/Widget/VCard.php:116 src/Model/Profile.php:469 +#: src/Module/Notifications/Introductions.php:194 msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:123 src/Model/Contact.php:1239 +#: src/Content/Widget/VCard.php:120 src/Model/Contact.php:1239 #: src/Model/Contact.php:1251 src/Model/Profile.php:458 #: src/Module/Contact/Profile.php:476 msgid "Unfollow" msgstr "" -#: src/Content/Widget/VCard.php:129 src/Model/Contact.php:1209 +#: src/Content/Widget/VCard.php:126 src/Model/Contact.php:1209 #: src/Model/Profile.php:443 msgid "View group" msgstr "" @@ -2829,7 +2829,7 @@ msgstr "" msgid "Could not connect to database." msgstr "" -#: src/Core/L10n.php:430 src/Model/Item.php:2315 +#: src/Core/L10n.php:430 src/Model/Item.php:2316 msgid "Undetermined" msgstr "" @@ -2839,37 +2839,37 @@ msgid "%s (%s)" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:416 -#: src/Module/Settings/Display.php:281 +#: src/Module/Settings/Display.php:288 msgid "Monday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:417 -#: src/Module/Settings/Display.php:282 +#: src/Module/Settings/Display.php:289 msgid "Tuesday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:418 -#: src/Module/Settings/Display.php:283 +#: src/Module/Settings/Display.php:290 msgid "Wednesday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:419 -#: src/Module/Settings/Display.php:284 +#: src/Module/Settings/Display.php:291 msgid "Thursday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:420 -#: src/Module/Settings/Display.php:285 +#: src/Module/Settings/Display.php:292 msgid "Friday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:421 -#: src/Module/Settings/Display.php:286 +#: src/Module/Settings/Display.php:293 msgid "Saturday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:415 -#: src/Module/Settings/Display.php:280 +#: src/Module/Settings/Display.php:287 msgid "Sunday" msgstr "" @@ -3191,7 +3191,7 @@ msgstr "" #: src/Model/Contact.php:1258 src/Module/Moderation/Users/Pending.php:88 #: src/Module/Notifications/Introductions.php:124 -#: src/Module/Notifications/Introductions.php:196 +#: src/Module/Notifications/Introductions.php:197 msgid "Approve" msgstr "" @@ -3298,17 +3298,17 @@ msgid "today" msgstr "" #: src/Model/Event.php:449 src/Module/Calendar/Show.php:115 -#: src/Module/Settings/Display.php:291 src/Util/Temporal.php:339 +#: src/Module/Settings/Display.php:298 src/Util/Temporal.php:339 msgid "month" msgstr "" #: src/Model/Event.php:450 src/Module/Calendar/Show.php:116 -#: src/Module/Settings/Display.php:292 src/Util/Temporal.php:340 +#: src/Module/Settings/Display.php:299 src/Util/Temporal.php:340 msgid "week" msgstr "" #: src/Model/Event.php:451 src/Module/Calendar/Show.php:117 -#: src/Module/Settings/Display.php:293 src/Util/Temporal.php:341 +#: src/Module/Settings/Display.php:300 src/Util/Temporal.php:341 msgid "day" msgstr "" @@ -3371,92 +3371,92 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: src/Model/Item.php:2322 +#: src/Model/Item.php:2323 #, php-format msgid "%s (%s - %s): %s" msgstr "" -#: src/Model/Item.php:2324 +#: src/Model/Item.php:2325 #, php-format msgid "%s (%s): %s" msgstr "" -#: src/Model/Item.php:2327 +#: src/Model/Item.php:2328 #, php-format msgid "" "Detected languages in this post:\n" "%s" msgstr "" -#: src/Model/Item.php:3276 +#: src/Model/Item.php:3277 msgid "activity" msgstr "" -#: src/Model/Item.php:3278 +#: src/Model/Item.php:3279 msgid "comment" msgstr "" -#: src/Model/Item.php:3281 src/Module/Post/Tag/Add.php:109 +#: src/Model/Item.php:3282 src/Module/Post/Tag/Add.php:109 msgid "post" msgstr "" -#: src/Model/Item.php:3451 +#: src/Model/Item.php:3452 #, php-format msgid "%s is blocked" msgstr "" -#: src/Model/Item.php:3453 +#: src/Model/Item.php:3454 #, php-format msgid "%s is ignored" msgstr "" -#: src/Model/Item.php:3455 +#: src/Model/Item.php:3456 #, php-format msgid "Content from %s is collapsed" msgstr "" -#: src/Model/Item.php:3459 +#: src/Model/Item.php:3460 msgid "Sensitive content" msgstr "" -#: src/Model/Item.php:3931 +#: src/Model/Item.php:3969 msgid "bytes" msgstr "" -#: src/Model/Item.php:3962 +#: src/Model/Item.php:4000 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3964 +#: src/Model/Item.php:4002 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3969 +#: src/Model/Item.php:4007 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3971 +#: src/Model/Item.php:4009 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3973 +#: src/Model/Item.php:4011 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:4014 src/Model/Item.php:4015 +#: src/Model/Item.php:4052 src/Model/Item.php:4053 msgid "View on separate page" msgstr "" @@ -3483,7 +3483,7 @@ msgid "Homepage:" msgstr "" #: src/Model/Profile.php:359 src/Module/Contact/Profile.php:424 -#: src/Module/Notifications/Introductions.php:181 +#: src/Module/Notifications/Introductions.php:182 msgid "About:" msgstr "" @@ -3873,7 +3873,7 @@ msgid "Disable" msgstr "" #: src/Module/Admin/Addons/Details.php:77 -#: src/Module/Admin/Themes/Details.php:41 src/Module/Settings/Display.php:340 +#: src/Module/Admin/Themes/Details.php:41 src/Module/Settings/Display.php:347 msgid "Enable" msgstr "" @@ -3923,7 +3923,7 @@ msgstr "" #: src/Module/Settings/Account.php:549 src/Module/Settings/Addons.php:64 #: src/Module/Settings/Connectors.php:149 #: src/Module/Settings/Connectors.php:235 -#: src/Module/Settings/Delegation.php:179 src/Module/Settings/Display.php:306 +#: src/Module/Settings/Delegation.php:179 src/Module/Settings/Display.php:313 #: src/Module/Settings/Features.php:61 msgid "Save Settings" msgstr "" @@ -4278,11 +4278,11 @@ msgstr "" msgid "%s is no valid input for maximum image size" msgstr "" -#: src/Module/Admin/Site.php:362 src/Module/Settings/Display.php:208 +#: src/Module/Admin/Site.php:362 src/Module/Settings/Display.php:209 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:379 src/Module/Settings/Display.php:218 +#: src/Module/Admin/Site.php:379 src/Module/Settings/Display.php:219 #, php-format msgid "%s - (Experimental)" msgstr "" @@ -5832,8 +5832,8 @@ msgstr "" #: src/Module/Install.php:253 src/Module/Install.php:258 #: src/Module/Install.php:272 src/Module/Install.php:285 #: src/Module/Install.php:312 -#: src/Module/Moderation/Blocklist/Server/Add.php:123 -#: src/Module/Moderation/Blocklist/Server/Add.php:125 +#: src/Module/Moderation/Blocklist/Server/Add.php:122 +#: src/Module/Moderation/Blocklist/Server/Add.php:124 #: src/Module/Moderation/Blocklist/Server/Import.php:113 #: src/Module/Moderation/Blocklist/Server/Index.php:72 #: src/Module/Moderation/Blocklist/Server/Index.php:73 @@ -5903,7 +5903,7 @@ msgstr "" msgid "Create New Event" msgstr "" -#: src/Module/Calendar/Show.php:118 src/Module/Settings/Display.php:294 +#: src/Module/Calendar/Show.php:118 src/Module/Settings/Display.php:301 msgid "list" msgstr "" @@ -6286,12 +6286,12 @@ msgstr "" #: src/Module/Moderation/Blocklist/Contact.php:117 #: src/Module/Moderation/Reports.php:109 #: src/Module/Notifications/Introductions.php:121 -#: src/Module/Notifications/Introductions.php:190 +#: src/Module/Notifications/Introductions.php:191 msgid "Profile URL" msgstr "" #: src/Module/Contact/Follow.php:156 src/Module/Contact/Profile.php:426 -#: src/Module/Notifications/Introductions.php:183 +#: src/Module/Notifications/Introductions.php:184 #: src/Module/Profile/Profile.php:222 msgid "Tags:" msgstr "" @@ -6509,7 +6509,7 @@ msgid "Manage remote servers" msgstr "" #: src/Module/Contact/Profile.php:406 -#: src/Module/Notifications/Introductions.php:184 +#: src/Module/Notifications/Introductions.php:185 msgid "Hide this contact from others" msgstr "" @@ -7575,16 +7575,16 @@ msgid_plural "%s servers scheduled to be purged." msgstr[0] "" msgstr[1] "" -#: src/Module/Moderation/Blocklist/Server/Add.php:107 +#: src/Module/Moderation/Blocklist/Server/Add.php:106 #: src/Module/Moderation/Blocklist/Server/Import.php:101 msgid "← Return to the list" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:109 +#: src/Module/Moderation/Blocklist/Server/Add.php:108 msgid "Block A New Server Domain Pattern" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:110 +#: src/Module/Moderation/Blocklist/Server/Add.php:109 #: src/Module/Moderation/Blocklist/Server/Index.php:85 msgid "" "

The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:

\n" @@ -7594,65 +7594,65 @@ msgid "" "" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:115 +#: src/Module/Moderation/Blocklist/Server/Add.php:114 #: src/Module/Moderation/Blocklist/Server/Index.php:93 msgid "Check pattern" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:116 +#: src/Module/Moderation/Blocklist/Server/Add.php:115 msgid "Matching known servers" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:117 +#: src/Module/Moderation/Blocklist/Server/Add.php:116 #: src/Module/Settings/Server/Action.php:62 #: src/Module/Settings/Server/Index.php:92 msgid "Server Name" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:118 +#: src/Module/Moderation/Blocklist/Server/Add.php:117 msgid "Server Domain" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:119 +#: src/Module/Moderation/Blocklist/Server/Add.php:118 msgid "Known Contacts" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:120 +#: src/Module/Moderation/Blocklist/Server/Add.php:119 #, php-format msgid "%d known server" msgid_plural "%d known servers" msgstr[0] "" msgstr[1] "" -#: src/Module/Moderation/Blocklist/Server/Add.php:121 +#: src/Module/Moderation/Blocklist/Server/Add.php:120 msgid "Add pattern to the blocklist" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:123 +#: src/Module/Moderation/Blocklist/Server/Add.php:122 #: src/Module/Moderation/Blocklist/Server/Index.php:102 msgid "Server Domain Pattern" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:123 +#: src/Module/Moderation/Blocklist/Server/Add.php:122 #: src/Module/Moderation/Blocklist/Server/Index.php:102 msgid "The domain pattern of the new server to add to the blocklist. Do not include the protocol." msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:124 +#: src/Module/Moderation/Blocklist/Server/Add.php:123 msgid "Purge server" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:124 +#: src/Module/Moderation/Blocklist/Server/Add.php:123 msgid "Also purges all the locally stored content authored by the known contacts registered on that server. Keeps the contacts and the server records. This action cannot be undone." msgid_plural "Also purges all the locally stored content authored by the known contacts registered on these servers. Keeps the contacts and the servers records. This action cannot be undone." msgstr[0] "" msgstr[1] "" -#: src/Module/Moderation/Blocklist/Server/Add.php:125 +#: src/Module/Moderation/Blocklist/Server/Add.php:124 msgid "Block reason" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:125 +#: src/Module/Moderation/Blocklist/Server/Add.php:124 msgid "The reason why you blocked this server domain pattern. This reason will be shown publicly in the server information page." msgstr "" @@ -8278,7 +8278,7 @@ msgid "Hide Ignored Requests" msgstr "" #: src/Module/Notifications/Introductions.php:107 -#: src/Module/Notifications/Introductions.php:170 +#: src/Module/Notifications/Introductions.php:171 msgid "Notification type:" msgstr "" @@ -8312,11 +8312,11 @@ msgstr "" msgid "Subscriber" msgstr "" -#: src/Module/Notifications/Introductions.php:208 +#: src/Module/Notifications/Introductions.php:209 msgid "No introductions." msgstr "" -#: src/Module/Notifications/Introductions.php:209 +#: src/Module/Notifications/Introductions.php:210 #: src/Module/Notifications/Notifications.php:127 #, php-format msgid "No more %s notifications." @@ -9554,12 +9554,12 @@ msgid "When selected, the channel results are reshared. This only works for publ msgstr "" #: src/Module/Settings/Channels.php:176 src/Module/Settings/Channels.php:197 -#: src/Module/Settings/Display.php:338 +#: src/Module/Settings/Display.php:345 msgid "Label" msgstr "" #: src/Module/Settings/Channels.php:177 src/Module/Settings/Channels.php:198 -#: src/Module/Settings/Display.php:339 +#: src/Module/Settings/Display.php:346 #: src/Module/Settings/TwoFactor/AppSpecific.php:124 msgid "Description" msgstr "" @@ -9918,202 +9918,218 @@ msgstr "" msgid "No entries." msgstr "" -#: src/Module/Settings/Display.php:176 +#: src/Module/Settings/Display.php:177 msgid "The theme you chose isn't available." msgstr "" -#: src/Module/Settings/Display.php:216 +#: src/Module/Settings/Display.php:217 #, php-format msgid "%s - (Unsupported)" msgstr "" -#: src/Module/Settings/Display.php:257 -msgid "No preview" +#: src/Module/Settings/Display.php:256 +msgid "Color/Black" +msgstr "" + +#: src/Module/Settings/Display.php:257 view/theme/frio/php/scheme.php:95 +msgid "Black" msgstr "" #: src/Module/Settings/Display.php:258 -msgid "No image" +msgid "Color/White" msgstr "" #: src/Module/Settings/Display.php:259 +msgid "White" +msgstr "" + +#: src/Module/Settings/Display.php:264 +msgid "No preview" +msgstr "" + +#: src/Module/Settings/Display.php:265 +msgid "No image" +msgstr "" + +#: src/Module/Settings/Display.php:266 msgid "Small Image" msgstr "" -#: src/Module/Settings/Display.php:260 +#: src/Module/Settings/Display.php:267 msgid "Large Image" msgstr "" -#: src/Module/Settings/Display.php:305 +#: src/Module/Settings/Display.php:312 msgid "Display Settings" msgstr "" -#: src/Module/Settings/Display.php:307 +#: src/Module/Settings/Display.php:314 msgid "General Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:308 +#: src/Module/Settings/Display.php:315 msgid "Custom Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:309 +#: src/Module/Settings/Display.php:316 msgid "Content Settings" msgstr "" -#: src/Module/Settings/Display.php:310 view/theme/duepuntozero/config.php:74 +#: src/Module/Settings/Display.php:317 view/theme/duepuntozero/config.php:74 #: view/theme/frio/config.php:139 view/theme/quattro/config.php:76 #: view/theme/vier/config.php:124 msgid "Theme settings" msgstr "" -#: src/Module/Settings/Display.php:311 +#: src/Module/Settings/Display.php:318 msgid "Timelines" msgstr "" -#: src/Module/Settings/Display.php:318 +#: src/Module/Settings/Display.php:325 msgid "Display Theme:" msgstr "" -#: src/Module/Settings/Display.php:319 +#: src/Module/Settings/Display.php:326 msgid "Mobile Theme:" msgstr "" -#: src/Module/Settings/Display.php:322 +#: src/Module/Settings/Display.php:329 msgid "Number of items to display per page:" msgstr "" -#: src/Module/Settings/Display.php:322 src/Module/Settings/Display.php:323 +#: src/Module/Settings/Display.php:329 src/Module/Settings/Display.php:330 msgid "Maximum of 100 items" msgstr "" -#: src/Module/Settings/Display.php:323 +#: src/Module/Settings/Display.php:330 msgid "Number of items to display per page when viewed from mobile device:" msgstr "" -#: src/Module/Settings/Display.php:324 +#: src/Module/Settings/Display.php:331 msgid "Update browser every xx seconds" msgstr "" -#: src/Module/Settings/Display.php:324 +#: src/Module/Settings/Display.php:331 msgid "Minimum of 10 seconds. Enter -1 to disable it." msgstr "" -#: src/Module/Settings/Display.php:325 +#: src/Module/Settings/Display.php:332 msgid "Display emoticons" msgstr "" -#: src/Module/Settings/Display.php:325 +#: src/Module/Settings/Display.php:332 msgid "When enabled, emoticons are replaced with matching symbols." msgstr "" -#: src/Module/Settings/Display.php:326 +#: src/Module/Settings/Display.php:333 msgid "Infinite scroll" msgstr "" -#: src/Module/Settings/Display.php:326 +#: src/Module/Settings/Display.php:333 msgid "Automatic fetch new items when reaching the page end." msgstr "" -#: src/Module/Settings/Display.php:327 +#: src/Module/Settings/Display.php:334 msgid "Enable Smart Threading" msgstr "" -#: src/Module/Settings/Display.php:327 +#: src/Module/Settings/Display.php:334 msgid "Enable the automatic suppression of extraneous thread indentation." msgstr "" -#: src/Module/Settings/Display.php:328 +#: src/Module/Settings/Display.php:335 msgid "Display the Dislike feature" msgstr "" -#: src/Module/Settings/Display.php:328 +#: src/Module/Settings/Display.php:335 msgid "Display the Dislike button and dislike reactions on posts and comments." msgstr "" -#: src/Module/Settings/Display.php:329 +#: src/Module/Settings/Display.php:336 msgid "Display the resharer" msgstr "" -#: src/Module/Settings/Display.php:329 +#: src/Module/Settings/Display.php:336 msgid "Display the first resharer as icon and text on a reshared item." msgstr "" -#: src/Module/Settings/Display.php:330 +#: src/Module/Settings/Display.php:337 msgid "Stay local" msgstr "" -#: src/Module/Settings/Display.php:330 +#: src/Module/Settings/Display.php:337 msgid "Don't go to a remote system when following a contact link." msgstr "" -#: src/Module/Settings/Display.php:331 +#: src/Module/Settings/Display.php:338 msgid "Show the post deletion checkbox" msgstr "" -#: src/Module/Settings/Display.php:331 +#: src/Module/Settings/Display.php:338 msgid "Display the checkbox for the post deletion on the network page." msgstr "" -#: src/Module/Settings/Display.php:332 +#: src/Module/Settings/Display.php:339 msgid "DIsplay the event list" msgstr "" -#: src/Module/Settings/Display.php:332 +#: src/Module/Settings/Display.php:339 msgid "Display the birthday reminder and event list on the network page." msgstr "" -#: src/Module/Settings/Display.php:333 +#: src/Module/Settings/Display.php:340 msgid "Link preview mode" msgstr "" -#: src/Module/Settings/Display.php:333 +#: src/Module/Settings/Display.php:340 msgid "Appearance of the link preview that is added to each post with a link." msgstr "" -#: src/Module/Settings/Display.php:334 +#: src/Module/Settings/Display.php:341 msgid "Hide pictures with empty alternative text" msgstr "" -#: src/Module/Settings/Display.php:334 +#: src/Module/Settings/Display.php:341 msgid "Don't display pictures that are missing the alternative text." msgstr "" -#: src/Module/Settings/Display.php:335 +#: src/Module/Settings/Display.php:342 msgid "Hide custom emojis" msgstr "" -#: src/Module/Settings/Display.php:335 +#: src/Module/Settings/Display.php:342 msgid "Don't display custom emojis." msgstr "" -#: src/Module/Settings/Display.php:336 -msgid "Black platform Icons" -msgstr "" - -#: src/Module/Settings/Display.php:336 -msgid "Use black platform icons instead of colored ones." -msgstr "" - -#: src/Module/Settings/Display.php:341 -msgid "Bookmark" +#: src/Module/Settings/Display.php:343 +msgid "Platform icons style" msgstr "" #: src/Module/Settings/Display.php:343 -msgid "Enable timelines that you want to see in the channels widget. Bookmark timelines that you want to see in the top menu." -msgstr "" - -#: src/Module/Settings/Display.php:345 -msgid "Channel languages:" -msgstr "" - -#: src/Module/Settings/Display.php:345 -msgid "Select all languages that you want to see in your channels." -msgstr "" - -#: src/Module/Settings/Display.php:347 -msgid "Beginning of week:" +msgid "Style of the platform icons" msgstr "" #: src/Module/Settings/Display.php:348 +msgid "Bookmark" +msgstr "" + +#: src/Module/Settings/Display.php:350 +msgid "Enable timelines that you want to see in the channels widget. Bookmark timelines that you want to see in the top menu." +msgstr "" + +#: src/Module/Settings/Display.php:352 +msgid "Channel languages:" +msgstr "" + +#: src/Module/Settings/Display.php:352 +msgid "Select all languages that you want to see in your channels." +msgstr "" + +#: src/Module/Settings/Display.php:354 +msgid "Beginning of week:" +msgstr "" + +#: src/Module/Settings/Display.php:355 msgid "Default calendar view:" msgstr "" @@ -11623,92 +11639,92 @@ msgstr "" msgid "More" msgstr "" -#: src/Object/Post.php:622 +#: src/Object/Post.php:621 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:623 +#: src/Object/Post.php:622 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:624 +#: src/Object/Post.php:623 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:625 +#: src/Object/Post.php:624 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:626 +#: src/Object/Post.php:625 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:648 +#: src/Object/Post.php:647 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:649 +#: src/Object/Post.php:648 msgid "Show more" msgstr "" -#: src/Object/Post.php:650 +#: src/Object/Post.php:649 msgid "Show fewer" msgstr "" -#: src/Object/Post.php:687 +#: src/Object/Post.php:686 #, php-format msgid "Reshared by: %s" msgstr "" -#: src/Object/Post.php:692 +#: src/Object/Post.php:691 #, php-format msgid "Viewed by: %s" msgstr "" -#: src/Object/Post.php:697 +#: src/Object/Post.php:696 #, php-format msgid "Read by: %s" msgstr "" -#: src/Object/Post.php:702 +#: src/Object/Post.php:701 #, php-format msgid "Liked by: %s" msgstr "" -#: src/Object/Post.php:707 +#: src/Object/Post.php:706 #, php-format msgid "Disliked by: %s" msgstr "" -#: src/Object/Post.php:712 +#: src/Object/Post.php:711 #, php-format msgid "Attended by: %s" msgstr "" -#: src/Object/Post.php:717 +#: src/Object/Post.php:716 #, php-format msgid "Maybe attended by: %s" msgstr "" -#: src/Object/Post.php:722 +#: src/Object/Post.php:721 #, php-format msgid "Not attended by: %s" msgstr "" -#: src/Object/Post.php:727 +#: src/Object/Post.php:726 #, php-format msgid "Commented by: %s" msgstr "" -#: src/Object/Post.php:732 +#: src/Object/Post.php:731 #, php-format msgid "Reacted with %s by: %s" msgstr "" -#: src/Object/Post.php:755 +#: src/Object/Post.php:754 #, php-format msgid "Quote shared by: %s" msgstr "" @@ -12022,10 +12038,6 @@ msgstr "" msgid "Dark" msgstr "" -#: view/theme/frio/php/scheme.php:95 -msgid "Black" -msgstr "" - #: view/theme/frio/php/scheme.php:106 msgid "Custom" msgstr "" diff --git a/view/templates/moderation/blocklist/server/add.tpl b/view/templates/moderation/blocklist/server/add.tpl index e29bf8ab60..f4e15c0c2f 100644 --- a/view/templates/moderation/blocklist/server/add.tpl +++ b/view/templates/moderation/blocklist/server/add.tpl @@ -38,8 +38,8 @@ {{foreach $gservers as $gserver}} - - + + {{$gserver.network_name}} {{$gserver.site_name|default:$gserver.domain}} diff --git a/view/templates/settings/display.tpl b/view/templates/settings/display.tpl index 1de96b5da9..683740c35f 100644 --- a/view/templates/settings/display.tpl +++ b/view/templates/settings/display.tpl @@ -30,7 +30,7 @@ {{include file="field_select.tpl" field=$preview_mode}} {{include file="field_checkbox.tpl" field=$hide_empty_descriptions}} {{include file="field_checkbox.tpl" field=$hide_custom_emojis}} - {{include file="field_checkbox.tpl" field=$black_platform_icons}} + {{include file="field_select.tpl" field=$platform_icon_style}}

{{$timeline_title}}

{{$timeline_explanation}} diff --git a/view/templates/shared_content.tpl b/view/templates/shared_content.tpl index 33280acb59..6430bdbe24 100644 --- a/view/templates/shared_content.tpl +++ b/view/templates/shared_content.tpl @@ -30,14 +30,10 @@
{{if $network_svg && $link}} {{$network_name}} - {{$link_title}} - {{elseif $network_icon && $link}} - {{elseif $link}} {{$network_name}} - {{elseif $network_icon}} - - {{elseif $network_icon}} - + {{elseif $network_svg}} + {{$network_name}} - {{$link_title}} {{else}} {{$network_name}} {{/if}} diff --git a/view/theme/frio/scheme/black.css b/view/theme/frio/scheme/black.css index 9588e2eea6..0b5daf4808 100644 --- a/view/theme/frio/scheme/black.css +++ b/view/theme/frio/scheme/black.css @@ -178,10 +178,6 @@ main .nav-tabs > li.active > a:hover { border: 0; } -.network-svg { - background-color: $font_color; -} - .badge { background-color: $nav_bg; } diff --git a/view/theme/frio/scheme/dark.css b/view/theme/frio/scheme/dark.css index 143af977dd..1c4ed0a049 100644 --- a/view/theme/frio/scheme/dark.css +++ b/view/theme/frio/scheme/dark.css @@ -167,10 +167,6 @@ main .nav-tabs > li.active > a:hover { border: 0; } -.network-svg { - background-color: $font_color; -} - .badge { background-color: $nav_bg; } diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index 3810162c42..85d40cd6dd 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -37,14 +37,10 @@
{{if $item.network_svg && $item.plink}} {{$item.plink.title}} - {{elseif $item.network_icon && $item.plink}} - {{elseif $item.plink}} {{$item.network_name}} - {{elseif $item.network_icon}} + {{elseif $item.network_svg}} - {{elseif $item.network_icon}} - {{else}} {{$item.network_name}} {{/if}} @@ -92,15 +88,15 @@ {{* contact info header for smartphones *}}