sforkowany z mirror/soapbox
Merge branch 'fix-akkoma' into 'develop'
Add support for Akkoma See merge request soapbox-pub/soapbox!1876x-truth-ads
commit
ec5fd4ee09
|
@ -0,0 +1,105 @@
|
|||
{
|
||||
"approval_required": false,
|
||||
"avatar_upload_limit": 2000000,
|
||||
"background_image": "https://fe.disroot.org/images/city.jpg",
|
||||
"background_upload_limit": 4000000,
|
||||
"banner_upload_limit": 4000000,
|
||||
"description": "FEDIsroot - Federated social network powered by Pleroma (open beta)",
|
||||
"description_limit": 5000,
|
||||
"email": "admin@example.lan",
|
||||
"languages": [
|
||||
"en"
|
||||
],
|
||||
"max_toot_chars": 5000,
|
||||
"pleroma": {
|
||||
"metadata": {
|
||||
"account_activation_required": false,
|
||||
"features": [
|
||||
"pleroma_api",
|
||||
"akkoma_api",
|
||||
"mastodon_api",
|
||||
"mastodon_api_streaming",
|
||||
"polls",
|
||||
"v2_suggestions",
|
||||
"pleroma_explicit_addressing",
|
||||
"shareable_emoji_packs",
|
||||
"multifetch",
|
||||
"pleroma:api/v1/notifications:include_types_filter",
|
||||
"editing",
|
||||
"media_proxy",
|
||||
"relay",
|
||||
"pleroma_emoji_reactions",
|
||||
"exposable_reactions",
|
||||
"profile_directory",
|
||||
"custom_emoji_reactions",
|
||||
"pleroma:get:main/ostatus"
|
||||
],
|
||||
"federation": {
|
||||
"enabled": true,
|
||||
"exclusions": false,
|
||||
"mrf_hashtag": {
|
||||
"federated_timeline_removal": [],
|
||||
"reject": [],
|
||||
"sensitive": [
|
||||
"nsfw"
|
||||
]
|
||||
},
|
||||
"mrf_object_age": {
|
||||
"actions": [
|
||||
"delist",
|
||||
"strip_followers"
|
||||
],
|
||||
"threshold": 604800
|
||||
},
|
||||
"mrf_policies": [
|
||||
"ObjectAgePolicy",
|
||||
"TagPolicy",
|
||||
"HashtagPolicy",
|
||||
"InlineQuotePolicy"
|
||||
],
|
||||
"quarantined_instances": [],
|
||||
"quarantined_instances_info": {
|
||||
"quarantined_instances": {}
|
||||
}
|
||||
},
|
||||
"fields_limits": {
|
||||
"max_fields": 10,
|
||||
"max_remote_fields": 20,
|
||||
"name_length": 512,
|
||||
"value_length": 2048
|
||||
},
|
||||
"post_formats": [
|
||||
"text/plain",
|
||||
"text/html",
|
||||
"text/markdown",
|
||||
"text/bbcode",
|
||||
"text/x.misskeymarkdown"
|
||||
],
|
||||
"privileged_staff": false
|
||||
},
|
||||
"stats": {
|
||||
"mau": 83
|
||||
},
|
||||
"vapid_public_key": null
|
||||
},
|
||||
"poll_limits": {
|
||||
"max_expiration": 31536000,
|
||||
"max_option_chars": 200,
|
||||
"max_options": 20,
|
||||
"min_expiration": 0
|
||||
},
|
||||
"registrations": false,
|
||||
"stats": {
|
||||
"domain_count": 6972,
|
||||
"status_count": 8081,
|
||||
"user_count": 357
|
||||
},
|
||||
"thumbnail": "https://fe.disroot.org/instance/thumbnail.jpeg",
|
||||
"title": "FEDIsroot",
|
||||
"upload_limit": 16000000,
|
||||
"uri": "https://fe.disroot.org",
|
||||
"urls": {
|
||||
"streaming_api": "wss://fe.disroot.org"
|
||||
},
|
||||
"version": "2.7.2 (compatible; Akkoma 3.3.1-0-gaf90a4e51)"
|
||||
}
|
|
@ -192,4 +192,12 @@ describe('normalizeInstance()', () => {
|
|||
const result = normalizeInstance(instance);
|
||||
expect(result.title).toBe('pixelfed');
|
||||
});
|
||||
|
||||
it('renames Akkoma to Pleroma', () => {
|
||||
const instance = require('soapbox/__fixtures__/akkoma-instance.json');
|
||||
const result = normalizeInstance(instance);
|
||||
|
||||
expect(result.version).toEqual('2.7.2 (compatible; Pleroma 2.4.5+akkoma)');
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
@ -98,6 +98,17 @@ const normalizeVersion = (instance: ImmutableMap<string, any>) => {
|
|||
});
|
||||
};
|
||||
|
||||
/** Rename Akkoma to Pleroma+akkoma */
|
||||
const fixAkkoma = (instance: ImmutableMap<string, any>) => {
|
||||
const version: string = instance.get('version', '');
|
||||
|
||||
if (version.includes('Akkoma')) {
|
||||
return instance.set('version', '2.7.2 (compatible; Pleroma 2.4.5+akkoma)');
|
||||
} else {
|
||||
return instance;
|
||||
}
|
||||
};
|
||||
|
||||
// Normalize instance (Pleroma, Mastodon, etc.) to Mastodon's format
|
||||
export const normalizeInstance = (instance: Record<string, any>) => {
|
||||
return InstanceRecord(
|
||||
|
@ -117,6 +128,7 @@ export const normalizeInstance = (instance: Record<string, any>) => {
|
|||
|
||||
// Normalize version
|
||||
normalizeVersion(instance);
|
||||
fixAkkoma(instance);
|
||||
|
||||
// Merge defaults
|
||||
instance.mergeDeepWith(mergeDefined, InstanceRecord());
|
||||
|
|
|
@ -57,6 +57,12 @@ export const SOAPBOX = 'soapbox';
|
|||
*/
|
||||
export const GLITCH = 'glitch';
|
||||
|
||||
/**
|
||||
* Akkoma, a Pleroma fork.
|
||||
* @see {@link https://akkoma.dev/AkkomaGang/akkoma}
|
||||
*/
|
||||
export const AKKOMA = 'akkoma';
|
||||
|
||||
/** Parse features for the given instance */
|
||||
const getInstanceFeatures = (instance: Instance) => {
|
||||
const v = parseVersion(instance.version);
|
||||
|
@ -202,7 +208,7 @@ const getInstanceFeatures = (instance: Instance) => {
|
|||
* Pleroma chats API.
|
||||
* @see {@link https://docs.pleroma.social/backend/development/API/chats/}
|
||||
*/
|
||||
chats: v.software === PLEROMA && gte(v.version, '2.1.0'),
|
||||
chats: v.software === PLEROMA && gte(v.version, '2.1.0') && v.build !== AKKOMA,
|
||||
|
||||
/**
|
||||
* Paginated chats API.
|
||||
|
|
Ładowanie…
Reference in New Issue