From a35c9fa159173388d88ef77e1d31f53488aad094 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@jolla.com>
Date: Fri, 3 Apr 2026 22:55:30 +0200
Subject: Generalize for all fediverse accounts

---
 .../accounts/services/fediverse-microblog.service  | 32 ++++++++++++++++++++++
 .../services/fediverse-notifications.service       | 32 ++++++++++++++++++++++
 .../accounts/services/fediverse-sharing.service    | 31 +++++++++++++++++++++
 .../accounts/services/mastodon-microblog.service   | 32 ----------------------
 .../services/mastodon-notifications.service        | 32 ----------------------
 .../accounts/services/mastodon-sharing.service     | 31 ---------------------
 6 files changed, 95 insertions(+), 95 deletions(-)
 create mode 100644 settings/accounts/services/fediverse-microblog.service
 create mode 100644 settings/accounts/services/fediverse-notifications.service
 create mode 100644 settings/accounts/services/fediverse-sharing.service
 delete mode 100644 settings/accounts/services/mastodon-microblog.service
 delete mode 100644 settings/accounts/services/mastodon-notifications.service
 delete mode 100644 settings/accounts/services/mastodon-sharing.service

(limited to 'settings/accounts/services')

diff --git a/settings/accounts/services/fediverse-microblog.service b/settings/accounts/services/fediverse-microblog.service
new file mode 100644
index 0000000..9070ec1
--- /dev/null
+++ b/settings/accounts/services/fediverse-microblog.service
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- SPDX-FileCopyrightText: 2013 - 2026 Jolla Ltd. -->
+<!-- SPDX-License-Identifier: BSD-3-Clause -->
+<service id="fediverse-microblog">
+    <type>microblogging</type>
+    <translations>/usr/share/translations/settings-accounts-fediverse</translations>
+    <name>Posts</name>
+    <icon>image://theme/icon-l-fediverse</icon>
+    <provider>fediverse</provider>
+
+    <template>
+        <setting name="sync_profile_templates" type="as">["fediverse.Posts"]</setting>
+        <group name="auth">
+            <setting name="method">oauth2</setting>
+            <setting name="mechanism">web_server</setting>
+            <group name="oauth2">
+                <group name="web_server">
+                    <setting name="Host">mastodon.social</setting>
+                    <setting name="AllowedSchemes" type="as">["https"]</setting>
+                    <setting name="AuthPath">oauth/authorize</setting>
+                    <setting name="TokenPath">oauth/token</setting>
+                    <setting name="ResponseType">code</setting>
+                    <setting name="Scope" type="as">["read","write"]</setting>
+                    <setting name="RedirectUri">http://ipv4.jolla.com/online/status.html</setting>
+                </group>
+            </group>
+        </group>
+        <group name="api">
+            <setting name="Host">mastodon.social</setting>
+        </group>
+    </template>
+</service>
diff --git a/settings/accounts/services/fediverse-notifications.service b/settings/accounts/services/fediverse-notifications.service
new file mode 100644
index 0000000..ea1b59b
--- /dev/null
+++ b/settings/accounts/services/fediverse-notifications.service
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- SPDX-FileCopyrightText: 2013 - 2026 Jolla Ltd. -->
+<!-- SPDX-License-Identifier: BSD-3-Clause -->
+<service id="fediverse-notifications">
+    <type>microblogging</type>
+    <translations>/usr/share/translations/settings-accounts-fediverse</translations>
+    <name>Notifications</name>
+    <icon>image://theme/icon-l-fediverse</icon>
+    <provider>fediverse</provider>
+
+    <template>
+        <setting name="sync_profile_templates" type="as">["fediverse.Notifications"]</setting>
+        <group name="auth">
+            <setting name="method">oauth2</setting>
+            <setting name="mechanism">web_server</setting>
+            <group name="oauth2">
+                <group name="web_server">
+                    <setting name="Host">mastodon.social</setting>
+                    <setting name="AllowedSchemes" type="as">["https"]</setting>
+                    <setting name="AuthPath">oauth/authorize</setting>
+                    <setting name="TokenPath">oauth/token</setting>
+                    <setting name="ResponseType">code</setting>
+                    <setting name="Scope" type="as">["read","write"]</setting>
+                    <setting name="RedirectUri">http://ipv4.jolla.com/online/status.html</setting>
+                </group>
+            </group>
+        </group>
+        <group name="api">
+            <setting name="Host">mastodon.social</setting>
+        </group>
+    </template>
+</service>
diff --git a/settings/accounts/services/fediverse-sharing.service b/settings/accounts/services/fediverse-sharing.service
new file mode 100644
index 0000000..f66f11b
--- /dev/null
+++ b/settings/accounts/services/fediverse-sharing.service
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- SPDX-FileCopyrightText: 2013 - 2026 Jolla Ltd. -->
+<!-- SPDX-License-Identifier: BSD-3-Clause -->
+<service id="fediverse-sharing">
+    <type>sharing</type>
+    <translations>/usr/share/translations/settings-accounts-fediverse</translations>
+    <name>Sharing</name>
+    <icon>image://theme/icon-l-fediverse</icon>
+    <provider>fediverse</provider>
+
+    <template>
+        <group name="auth">
+            <setting name="method">oauth2</setting>
+            <setting name="mechanism">web_server</setting>
+            <group name="oauth2">
+                <group name="web_server">
+                    <setting name="Host">mastodon.social</setting>
+                    <setting name="AllowedSchemes" type="as">["https"]</setting>
+                    <setting name="AuthPath">oauth/authorize</setting>
+                    <setting name="TokenPath">oauth/token</setting>
+                    <setting name="ResponseType">code</setting>
+                    <setting name="Scope" type="as">["read","write"]</setting>
+                    <setting name="RedirectUri">http://ipv4.jolla.com/online/status.html</setting>
+                </group>
+            </group>
+        </group>
+        <group name="api">
+            <setting name="Host">mastodon.social</setting>
+        </group>
+    </template>
+</service>
diff --git a/settings/accounts/services/mastodon-microblog.service b/settings/accounts/services/mastodon-microblog.service
deleted file mode 100644
index 527f70f..0000000
--- a/settings/accounts/services/mastodon-microblog.service
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- SPDX-FileCopyrightText: 2013 - 2026 Jolla Ltd. -->
-<!-- SPDX-License-Identifier: BSD-3-Clause -->
-<service id="mastodon-microblog">
-    <type>microblogging</type>
-    <translations>/usr/share/translations/settings-accounts-mastodon</translations>
-    <name>Posts</name>
-    <icon>image://theme/icon-l-mastodon</icon>
-    <provider>mastodon</provider>
-
-    <template>
-        <setting name="sync_profile_templates" type="as">["mastodon.Posts"]</setting>
-        <group name="auth">
-            <setting name="method">oauth2</setting>
-            <setting name="mechanism">web_server</setting>
-            <group name="oauth2">
-                <group name="web_server">
-                    <setting name="Host">mastodon.social</setting>
-                    <setting name="AllowedSchemes" type="as">["https"]</setting>
-                    <setting name="AuthPath">oauth/authorize</setting>
-                    <setting name="TokenPath">oauth/token</setting>
-                    <setting name="ResponseType">code</setting>
-                    <setting name="Scope" type="as">["read","write"]</setting>
-                    <setting name="RedirectUri">http://ipv4.jolla.com/online/status.html</setting>
-                </group>
-            </group>
-        </group>
-        <group name="api">
-            <setting name="Host">https://mastodon.social</setting>
-        </group>
-    </template>
-</service>
diff --git a/settings/accounts/services/mastodon-notifications.service b/settings/accounts/services/mastodon-notifications.service
deleted file mode 100644
index f5471c9..0000000
--- a/settings/accounts/services/mastodon-notifications.service
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- SPDX-FileCopyrightText: 2013 - 2026 Jolla Ltd. -->
-<!-- SPDX-License-Identifier: BSD-3-Clause -->
-<service id="mastodon-notifications">
-    <type>microblogging</type>
-    <translations>/usr/share/translations/settings-accounts-mastodon</translations>
-    <name>Notifications</name>
-    <icon>image://theme/icon-l-mastodon</icon>
-    <provider>mastodon</provider>
-
-    <template>
-        <setting name="sync_profile_templates" type="as">["mastodon.Notifications"]</setting>
-        <group name="auth">
-            <setting name="method">oauth2</setting>
-            <setting name="mechanism">web_server</setting>
-            <group name="oauth2">
-                <group name="web_server">
-                    <setting name="Host">mastodon.social</setting>
-                    <setting name="AllowedSchemes" type="as">["https"]</setting>
-                    <setting name="AuthPath">oauth/authorize</setting>
-                    <setting name="TokenPath">oauth/token</setting>
-                    <setting name="ResponseType">code</setting>
-                    <setting name="Scope" type="as">["read","write"]</setting>
-                    <setting name="RedirectUri">http://ipv4.jolla.com/online/status.html</setting>
-                </group>
-            </group>
-        </group>
-        <group name="api">
-            <setting name="Host">https://mastodon.social</setting>
-        </group>
-    </template>
-</service>
diff --git a/settings/accounts/services/mastodon-sharing.service b/settings/accounts/services/mastodon-sharing.service
deleted file mode 100644
index fdf342a..0000000
--- a/settings/accounts/services/mastodon-sharing.service
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- SPDX-FileCopyrightText: 2013 - 2026 Jolla Ltd. -->
-<!-- SPDX-License-Identifier: BSD-3-Clause -->
-<service id="mastodon-sharing">
-    <type>sharing</type>
-    <translations>/usr/share/translations/settings-accounts-mastodon</translations>
-    <name>Sharing</name>
-    <icon>image://theme/icon-l-mastodon</icon>
-    <provider>mastodon</provider>
-
-    <template>
-        <group name="auth">
-            <setting name="method">oauth2</setting>
-            <setting name="mechanism">web_server</setting>
-            <group name="oauth2">
-                <group name="web_server">
-                    <setting name="Host">mastodon.social</setting>
-                    <setting name="AllowedSchemes" type="as">["https"]</setting>
-                    <setting name="AuthPath">oauth/authorize</setting>
-                    <setting name="TokenPath">oauth/token</setting>
-                    <setting name="ResponseType">code</setting>
-                    <setting name="Scope" type="as">["read","write"]</setting>
-                    <setting name="RedirectUri">http://ipv4.jolla.com/online/status.html</setting>
-                </group>
-            </group>
-        </group>
-        <group name="api">
-            <setting name="Host">https://mastodon.social</setting>
-        </group>
-    </template>
-</service>
-- 
cgit v1.2.3