chore(license): relicense artwork and move non-free media out (#3173)

.github/GOVERNANCE.md

@@ -16,4 +16,10 @@ Every commit made by a contributor must include the [Developer Certificate of Or
 
 ## Name and marks
 
-The AGPL does not grant permission to use the Fluxer name, logo or other branding. Forks must use a distinct name and branding unless Fluxer Platform AB grants permission otherwise.
+Fluxer and the Fluxer logo are trademarks of Fluxer Platform AB. Neither the AGPL nor the CC BY-SA 4.0 licence on Fluxer artwork grants trademark rights. Fluxer Platform AB grants everyone the following permissions.
+
+- You may distribute unmodified builds of Fluxer, or builds with light patches, under the Fluxer name and logo. Light patches are changes for packaging, portability, security and bug fixes, configuration defaults and translations. Linux distributions, nixpkgs, Flathub and container images are all covered.
+- A self-hosted instance running such a build may show the Fluxer name and logo under the instance's own name and domain, as long as it does not imply affiliation with or endorsement by Fluxer Platform AB.
+- You may refer to Fluxer by name to describe compatibility, for example "works with Fluxer".
+
+Forks with substantive functional changes must use their own name and logo. Any other use needs permission from Fluxer Platform AB. Contact support@fluxer.com.

README.md

@@ -26,7 +26,7 @@
 Fluxer is a free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
 
 <p align="center">
-  <img src="./fluxer_static/marketing/screenshots/desktop-readme-1920w.png" alt="Fluxer running side by side on a desktop monitor and a phone" width="640">
+  <img src="https://fluxer.app/static/img/screenshots-desktop-readme-1920w.70cb6ce340007e0a.png" alt="Fluxer running side by side on a desktop monitor and a phone" width="640">
 </p>
 
 ## Download
@@ -143,14 +143,13 @@ Full setup notes, including canary, are in the [Linux repositories documentation
 
 The source is licensed under the [AGPL-3.0-or-later](./LICENSE) license.
 
-Fluxer branding, icons, default avatars, badge artwork, screenshots and marketing
+Fluxer artwork, such as the logo, icons, badges and default avatars, is
-imagery are copyright Fluxer, all rights reserved, as set out in
+licensed under [CC BY-SA 4.0](./fluxer_static/LICENSE). Third-party material
-[fluxer_static/LICENSE](./fluxer_static/LICENSE). Third-party material keeps its own
+keeps its own terms, listed in
-terms, listed in
 [fluxer_static/THIRD_PARTY_LICENSES.md](./fluxer_static/THIRD_PARTY_LICENSES.md).
 
-Public availability of this repository does not grant trademark, brand, or
+Use of the Fluxer name and logo is covered by the
-endorsement rights.
+[name and marks policy](./.github/GOVERNANCE.md#name-and-marks).
 
 [win-setup-x64]: https://pkgs.fluxer.com/desktop/stable/win32/x64/latest/setup
 [win-setup-arm64]: https://pkgs.fluxer.com/desktop/stable/win32/arm64/latest/setup

deploy/self-hosting/.env.example

@@ -357,9 +357,8 @@ FLUXER_DISCOVERY_ENABLED=true
 #FLUXER_GIFT_ENDPOINT=
 #FLUXER_MEDIA_PROXY_UPLOAD_RELAY_ENDPOINT=
 #PUBLIC_BOOTSTRAP_API_PUBLIC_ENDPOINT=
-# These follow FLUXER_STATIC_CDN_ENDPOINT first, then the public origin.
+# This follows FLUXER_STATIC_CDN_ENDPOINT first, then the public origin.
 #FLUXER_GATEWAY_STATIC_CDN_ENDPOINT=
-#FLUXER_UNFURL_STATIC_CDN_ENDPOINT=
 # These follow FLUXER_MEDIA_ENDPOINT first, then the public origin.
 #FLUXER_MEDIA_PROXY_PUBLIC_ENDPOINT=
 #FLUXER_GATEWAY_MEDIA_PROXY_ENDPOINT=

deploy/self-hosting/Caddyfile

@@ -42,7 +42,7 @@
 		reverse_proxy admin:8080
 	}
 
-	@staticAssets path /web/* /emoji/* /libs/* /avatars/* /badges/* /desktop/* /embeds/*
+	@staticAssets path /web/* /emoji/* /libs/* /avatars/* /badges/* /desktop/*
 	handle @staticAssets {
 		reverse_proxy static-proxy:8080
 	}

deploy/self-hosting/docker-compose.yml

@@ -845,8 +845,6 @@ services:
       FLUXER_SVC_MODE: shard
       FLUXER_SVC_SHARD_ID: "0"
       FLUXER_MEDIA_PROXY_ENDPOINT: http://media-proxy:8080
-      FLUXER_UNFURL_STATIC_CDN_ENDPOINT: ${FLUXER_UNFURL_STATIC_CDN_ENDPOINT:-}
-      FLUXER_STATIC_CDN_ENDPOINT: ${FLUXER_STATIC_CDN_ENDPOINT:-${FLUXER_PUBLIC_ORIGIN:-${FLUXER_PUBLIC_SCHEME:-https}://${FLUXER_DOMAIN}}}
     healthcheck: *fluxer-svc-healthcheck
     depends_on:
       nats: {condition: service_healthy}

fluxer_api/src/api/channel/tests/AttachmentDecay.test.ts

@@ -76,7 +76,7 @@ describe('Attachment Decay', () => {
 		const channel = await createChannel(harness, account.token, guild.id, 'test-channel');
 		const channelId = guild.system_channel_id ?? channel.id;
 		const file1Data = loadFixture('yeah.png');
-		const file2Data = loadFixture('thisisfine.gif');
+		const file2Data = loadFixture('animated.gif');
 		const {response, json} = await sendMessageWithAttachments(
 			harness,
 			account.token,
@@ -258,7 +258,7 @@ describe('Attachment Decay', () => {
 		const channel = await createChannel(harness, account.token, guild.id, 'test-channel');
 		const channelId = guild.system_channel_id ?? channel.id;
 		const smallFile = loadFixture('yeah.png');
-		const largeFile = loadFixture('thisisfine.gif');
+		const largeFile = loadFixture('animated.gif');
 		const smallResult = await sendMessageWithAttachments(
 			harness,
 			account.token,

fluxer_api/src/api/channel/tests/AttachmentUploadValidation.test.ts

@@ -327,17 +327,17 @@ describe('Attachment Upload Validation', () => {
 				const channel = await createChannel(harness, account.token, guild.id, 'test-channel');
 				const channelId = guild.system_channel_id ?? channel.id;
 				const file1Data = loadFixture('yeah.png');
-				const file2Data = loadFixture('thisisfine.gif');
+				const file2Data = loadFixture('animated.gif');
 				const payload = {
 					content: 'Ordered files test',
 					attachments: [
 						{id: 0, filename: 'yeah.png', description: 'First file', title: 'First'},
-						{id: 1, filename: 'thisisfine.gif', description: 'Second file', title: 'Second'},
+						{id: 1, filename: 'animated.gif', description: 'Second file', title: 'Second'},
 					],
 				};
 				const {response, json} = await sendMessageWithAttachments(harness, account.token, channelId, payload, [
 					{index: 0, filename: 'yeah.png', data: file1Data},
-					{index: 1, filename: 'thisisfine.gif', data: file2Data},
+					{index: 1, filename: 'animated.gif', data: file2Data},
 				]);
 				expect(response.status).toBe(200);
 				expect(json.attachments).toBeDefined();
@@ -346,7 +346,7 @@ describe('Attachment Upload Validation', () => {
 				expect(json.attachments![0].filename).toBe('yeah.png');
 				expect(json.attachments![0].description).toBe('First file');
 				expect(json.attachments![0].title).toBe('First');
-				expect(json.attachments![1].filename).toBe('thisisfine.gif');
+				expect(json.attachments![1].filename).toBe('animated.gif');
 				expect(json.attachments![1].description).toBe('Second file');
 				expect(json.attachments![1].title).toBe('Second');
 			});
@@ -356,17 +356,17 @@ describe('Attachment Upload Validation', () => {
 				const channel = await createChannel(harness, account.token, guild.id, 'test-channel');
 				const channelId = guild.system_channel_id ?? channel.id;
 				const file1Data = loadFixture('yeah.png');
-				const file2Data = loadFixture('thisisfine.gif');
+				const file2Data = loadFixture('animated.gif');
 				const payload = {
 					content: 'Sparse IDs test',
 					attachments: [
 						{id: 2, filename: 'yeah.png', description: 'ID is 2', title: 'Two'},
-						{id: 5, filename: 'thisisfine.gif', description: 'ID is 5', title: 'Five'},
+						{id: 5, filename: 'animated.gif', description: 'ID is 5', title: 'Five'},
 					],
 				};
 				const {response, json} = await sendMessageWithAttachments(harness, account.token, channelId, payload, [
 					{index: 2, filename: 'yeah.png', data: file1Data},
-					{index: 5, filename: 'thisisfine.gif', data: file2Data},
+					{index: 5, filename: 'animated.gif', data: file2Data},
 				]);
 				expect(response.status).toBe(200);
 				expect(json.attachments).toBeDefined();
@@ -472,7 +472,7 @@ describe('Attachment Upload Validation', () => {
 			const channel = await createChannel(harness, account.token, guild.id, 'test-channel');
 			const channelId = guild.system_channel_id ?? channel.id;
 			const file1Data = loadFixture('yeah.png');
-			const file2Data = loadFixture('thisisfine.gif');
+			const file2Data = loadFixture('animated.gif');
 			const payload = {
 				content: 'Mixed metadata test',
 				attachments: [
@@ -485,13 +485,13 @@ describe('Attachment Upload Validation', () => {
 					},
 					{
 						id: 1,
-						filename: 'thisisfine.gif',
+						filename: 'animated.gif',
 					},
 				],
 			};
 			const {response, json} = await sendMessageWithAttachments(harness, account.token, channelId, payload, [
 				{index: 0, filename: 'yeah.png', data: file1Data},
-				{index: 1, filename: 'thisisfine.gif', data: file2Data},
+				{index: 1, filename: 'animated.gif', data: file2Data},
 			]);
 			expect(response.status).toBe(200);
 			expect(json.attachments).toBeDefined();

fluxer_api/src/api/channel/tests/CrosspostWorkerTestUtils.ts

@@ -76,7 +76,7 @@ export async function sendWithImage(
 		filenames.map((filename, index) => ({
 			index,
 			filename,
-			data: loadFixture(filename.endsWith('.gif') ? 'thisisfine.gif' : 'yeah.png'),
+			data: loadFixture(filename.endsWith('.gif') ? 'animated.gif' : 'yeah.png'),
 		})),
 	);
 	if (response.status !== 200) {

fluxer_api/src/api/channel/tests/EmbedAttachmentUrlResolution.test.ts

@@ -86,25 +86,25 @@ describe('Embed Attachment URL Resolution', () => {
 			const channel = await createChannel(harness, account.token, guild.id, 'test-channel');
 			const channelId = guild.system_channel_id ?? channel.id;
 			const file1Data = loadFixture('yeah.png');
-			const file2Data = loadFixture('thisisfine.gif');
+			const file2Data = loadFixture('animated.gif');
 			const payload = {
 				content: 'Both image and thumbnail',
 				attachments: [
 					{id: 0, filename: 'yeah.png'},
-					{id: 1, filename: 'thisisfine.gif'},
+					{id: 1, filename: 'animated.gif'},
 				],
 				embeds: [
 					{
 						title: 'Complete Embed',
 						description: 'This embed uses both image and thumbnail',
-						image: {url: 'attachment://thisisfine.gif'},
+						image: {url: 'attachment://animated.gif'},
 						thumbnail: {url: 'attachment://yeah.png'},
 					},
 				],
 			};
 			const {response, json} = await sendMessageWithAttachments(harness, account.token, channelId, payload, [
 				{index: 0, filename: 'yeah.png', data: file1Data},
-				{index: 1, filename: 'thisisfine.gif', data: file2Data},
+				{index: 1, filename: 'animated.gif', data: file2Data},
 			]);
 			expect(response.status).toBe(200);
 			expect(json.embeds).toBeDefined();
@@ -576,12 +576,12 @@ describe('Embed Attachment URL Resolution', () => {
 			const channel = await createChannel(harness, account.token, guild.id, 'test-channel');
 			const channelId = guild.system_channel_id ?? channel.id;
 			const file1Data = loadFixture('yeah.png');
-			const file2Data = loadFixture('thisisfine.gif');
+			const file2Data = loadFixture('animated.gif');
 			const payload = {
 				content: 'Multiple embeds with different attachments',
 				attachments: [
 					{id: 0, filename: 'yeah.png'},
-					{id: 1, filename: 'thisisfine.gif'},
+					{id: 1, filename: 'animated.gif'},
 				],
 				embeds: [
 					{
@@ -592,19 +592,19 @@ describe('Embed Attachment URL Resolution', () => {
 					{
 						title: 'Second Embed',
 						description: 'Uses GIF',
-						image: {url: 'attachment://thisisfine.gif'},
+						image: {url: 'attachment://animated.gif'},
 					},
 				],
 			};
 			const {response, json} = await sendMessageWithAttachments(harness, account.token, channelId, payload, [
 				{index: 0, filename: 'yeah.png', data: file1Data},
-				{index: 1, filename: 'thisisfine.gif', data: file2Data},
+				{index: 1, filename: 'animated.gif', data: file2Data},
 			]);
 			expect(response.status).toBe(200);
 			expect(json.embeds).toBeDefined();
 			expect(json.embeds).toHaveLength(2);
 			expect(json.embeds![0].image?.url).toContain('yeah.png');
-			expect(json.embeds![1].image?.url).toContain('thisisfine.gif');
+			expect(json.embeds![1].image?.url).toContain('animated.gif');
 		});
 		it('should resolve multiple files referenced by embeds', async () => {
 			const account = await createTestAccount(harness);

fluxer_api/src/api/user/tests/FavoriteMemeLimits.test.ts

@@ -113,13 +113,13 @@ describe('Favorite Meme Limits', () => {
 			attachment_id: message1.attachments[0].id,
 			name: 'PNG Meme',
 		});
-		const message2 = await createMessageWithImageAttachment(harness, account.token, channel.id, 'thisisfine.gif');
+		const message2 = await createMessageWithImageAttachment(harness, account.token, channel.id, 'animated.gif');
 		const meme2 = await createFavoriteMemeFromMessage(harness, account.token, channel.id, message2.id, {
 			attachment_id: message2.attachments[0].id,
 			name: 'GIF Meme',
 		});
 		expect(meme2.id).toBeTruthy();
-		expect(meme2.filename).toBe('thisisfine.gif');
+		expect(meme2.filename).toBe('animated.gif');
 	});
 	test('should return error for invalid attachment id', async () => {
 		const account = await createTestAccountForAttachmentTests(harness);

fluxer_api/src/api/user/tests/FavoriteMemeOperations.test.ts

@@ -244,7 +244,7 @@ describe('Favorite Meme Operations', () => {
 			attachment_id: message1.attachments[0].id,
 			name: 'First Meme',
 		});
-		const message2 = await createMessageWithImageAttachment(harness, account.token, channel.id, 'thisisfine.gif');
+		const message2 = await createMessageWithImageAttachment(harness, account.token, channel.id, 'animated.gif');
 		await createFavoriteMemeFromMessage(harness, account.token, channel.id, message2.id, {
 			attachment_id: message2.attachments[0].id,
 			name: 'Second Meme',

fluxer_api/src/api/webhook/WebhookService.ts

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-import fs from 'node:fs/promises';
 import {stripOwnAttachmentSignature} from '@app/api/attachment/AttachmentUrls';
 import type {ChannelID, GuildID, MessageID, UserID, WebhookID, WebhookToken} from '@app/api/BrandedTypes';
 import {createChannelID, createGuildID, createWebhookID, createWebhookToken} from '@app/api/BrandedTypes';
+import {Config} from '@app/api/Config';
 import type {IChannelRepository} from '@app/api/channel/IChannelRepository';
 import type {MessageRequest, MessageUpdateRequest} from '@app/api/channel/MessageTypes';
 import {withChannelFollowLock} from '@app/api/channel/services/ChannelFollowers';
@@ -29,7 +29,6 @@ import type {RequestCache} from '@app/api/middleware/RequestCacheMiddleware';
 import type {Channel} from '@app/api/models/Channel';
 import type {Message} from '@app/api/models/Message';
 import type {Webhook} from '@app/api/models/Webhook';
-import {resolveAssetPath} from '@app/api/utils/AssetPaths';
 import * as RandomUtils from '@app/api/utils/RandomUtils';
 import type {IWebhookRepository} from '@app/api/webhook/IWebhookRepository';
 import {transform as GitHubTransform} from '@app/api/webhook/transformers/GitHubTransformer';
@@ -117,6 +116,10 @@ interface WebhookExecuteInstatusParams extends WebhookTokenParams {
 }
 
 const WEBHOOK_AVATAR_MISSING_CACHE_VALUE = '__fluxer_webhook_avatar_missing__';
+const HOSTED_WEBHOOK_AVATAR_URLS = {
+	github: 'https://fluxer.app/static/img/app-webhook-github.2d0319169a3aee33.webp',
+	instatus: 'https://fluxer.app/static/img/app-webhook-instatus.22ad5aee16da872c.webp',
+} as const;
 
 export class WebhookService {
 	private static readonly NO_ALLOWED_MENTIONS: AllowedMentionsRequest = {parse: []};
@@ -744,32 +747,22 @@ export class WebhookService {
 	}
 
 	private async getGitHubWebhookAvatar(webhookId: WebhookID): Promise<string | null> {
-		return this.getStaticWebhookAvatar({webhookId, provider: 'github'});
+		return this.getHostedWebhookAvatar({webhookId, provider: 'github'});
 	}
 
 	private async getInstatusWebhookAvatar(webhookId: WebhookID): Promise<string | null> {
-		return this.getStaticWebhookAvatar({webhookId, provider: 'instatus'});
+		return this.getHostedWebhookAvatar({webhookId, provider: 'instatus'});
 	}
 
-	private async getStaticWebhookAvatar({
+	private async getHostedWebhookAvatar({
 		webhookId,
 		provider,
 	}: {
 		webhookId: WebhookID;
-		provider: 'github' | 'instatus';
+		provider: keyof typeof HOSTED_WEBHOOK_AVATAR_URLS;
 	}): Promise<string | null> {
-		const cacheKey = `webhook:${webhookId}:avatar:${provider}`;
+		if (Config.instance.selfHosted) return null;
-		const avatarCache = await this.cacheService.get<string | null>(cacheKey);
+		return this.getWebhookAvatar({webhookId, avatarUrl: HOSTED_WEBHOOK_AVATAR_URLS[provider]});
-		if (avatarCache) return avatarCache;
-		const avatarFile = await fs.readFile(resolveAssetPath('assets', `${provider}.webp`));
-		const avatar = await this.avatarService.uploadAvatar({
-			prefix: 'avatars',
-			entityId: webhookId,
-			errorPath: 'avatar',
-			base64Image: avatarFile.toString('base64'),
-		});
-		await this.cacheService.set(cacheKey, avatar, seconds('1 day'));
-		return avatar;
 	}
 
 	private getWebhookMetadata(webhook: Webhook): Record<string, string> | undefined {

fluxer_api/src/api/webhook/tests/WebhookEmojiBypass.test.ts

@@ -35,7 +35,7 @@ describe('Webhook emoji bypass', () => {
 			user.token,
 			guildId,
 			'animated',
-			'thisisfine.gif',
+			'animated.gif',
 			'image/gif',
 		);
 		const webhook = await createWebhook(harness, channelId, user.token, 'Emoji Test Webhook');

fluxer_app/src/features/accessibility/components/NekoSprite.tsx

@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
+// SPDX-FileCopyrightText: 2022 adryd
 
 import styles from '@app/features/accessibility/components/NekoSprite.module.css';
 import Accessibility from '@app/features/accessibility/state/Accessibility';

fluxer_app/src/features/app/config/HostedMedia.ts

@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+export function hostedImageUrl(name: string): string {
+	return `https://fluxer.app/static/img/${name}`;
+}

fluxer_app/src/features/moderation/components/modals/BanMemberModal.module.css

@@ -7,9 +7,13 @@
 }
 
 .video {
+	display: block;
 	width: 100%;
 	max-width: 25rem;
+	height: auto;
+	aspect-ratio: 2 / 1;
 	margin-bottom: 1rem;
+	object-fit: cover;
 }
 
 .sectionTitle {

fluxer_app/src/features/moderation/components/modals/BanMemberModal.tsx

@@ -4,6 +4,7 @@ import Accessibility from '@app/features/accessibility/state/Accessibility';
 import * as Modal from '@app/features/app/components/dialogs/Modal';
 import {useAnimatedMediaVideoPlayback} from '@app/features/app/hooks/useAnimatedMediaPlayback';
 import {useSaveData} from '@app/features/app/hooks/useSaveData';
+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
 import * as GuildCommands from '@app/features/guild/commands/GuildCommands';
 import {
 	CUSTOM_ELLIPSIS_DESCRIPTOR,
@@ -16,6 +17,7 @@ import {
 import {showModerationErrorModal} from '@app/features/moderation/components/alerts/ModerationErrorModalUtils';
 import styles from '@app/features/moderation/components/modals/BanMemberModal.module.css';
 import {BAN_DELETE_MESSAGE_OPTIONS} from '@app/features/moderation/constants/BanDeleteMessageOptions';
+import {BANNED_MP4, BANNED_POSTER, BANNED_WEBM} from '@app/features/moderation/constants/BanModalMedia';
 import {Logger} from '@app/features/platform/utils/AppLogger';
 import {Button} from '@app/features/ui/button/Button';
 import * as ModalCommands from '@app/features/ui/commands/ModalCommands';
@@ -25,9 +27,6 @@ import {Input} from '@app/features/ui/components/form/FormInput';
 import {RadioGroup} from '@app/features/ui/radio_group/RadioGroup';
 import type {User} from '@app/features/user/models/User';
 import * as DisplayNameUtils from '@app/features/user/utils/DisplayNameUtils';
-import bannedMp4 from '@app/media/videos/banned.mp4';
-import bannedWebm from '@app/media/videos/banned.webm';
-import bannedPoster from '@app/media/videos/banned.webp';
 import {MAX_TEMP_BAN_DURATION_SECONDS, MIN_TEMP_BAN_DURATION_SECONDS} from '@fluxer/constants/src/LimitConstants';
 import {msg} from '@lingui/core/macro';
 import {Trans, useLingui} from '@lingui/react/macro';
@@ -101,7 +100,8 @@ export const BanMemberModal: React.FC<{guildId: string; targetUser: User}> = obs
 	const {i18n} = useLingui();
 	const videoRef = useRef<HTMLVideoElement>(null);
 	const dataSaverOn = useSaveData();
-	const motionArtworkAllowed = !Accessibility.useReducedMotion && !dataSaverOn;
+	const showArtwork = !RuntimeConfig.isSelfHosted();
+	const motionArtworkAllowed = showArtwork && !Accessibility.useReducedMotion && !dataSaverOn;
 	const videoPlaybackAllowed = useAnimatedMediaVideoPlayback(videoRef, {enabled: motionArtworkAllowed});
 	const [reason, setReason] = useState('');
 	const [deleteMessageSeconds, setDeleteMessageSeconds] = useState<number>(60 * 60 * 24);
@@ -160,22 +160,26 @@ export const BanMemberModal: React.FC<{guildId: string; targetUser: User}> = obs
 							loop
 							muted
 							playsInline
-							poster={bannedPoster}
+							poster={BANNED_POSTER}
+							width={480}
+							height={240}
 							className={styles.video}
 							data-flx="moderation.ban-member-modal.video"
 						>
-							<source src={bannedWebm} type="video/webm" data-flx="moderation.ban-member-modal.source.video-webm" />
+							<source src={BANNED_WEBM} type="video/webm" data-flx="moderation.ban-member-modal.source.video-webm" />
-							<source src={bannedMp4} type="video/mp4" data-flx="moderation.ban-member-modal.source.video-mp4" />
+							<source src={BANNED_MP4} type="video/mp4" data-flx="moderation.ban-member-modal.source.video-mp4" />
 						</video>
-					) : (
+					) : showArtwork ? (
 						<img
-							src={bannedPoster}
+							src={BANNED_POSTER}
 							alt=""
+							width={480}
+							height={240}
 							aria-hidden={true}
 							className={styles.video}
 							data-flx="moderation.ban-member-modal.video-still"
 						/>
-					)}
+					) : null}
 					<div data-flx="moderation.ban-member-modal.div">
 						<FormCombobox<number>
 							label={i18n._(BAN_DURATION_DESCRIPTOR)}

fluxer_app/src/features/moderation/constants/BanModalMedia.ts

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {hostedImageUrl} from '@app/features/app/config/HostedMedia';
+
+export const BANNED_MP4 = hostedImageUrl('app-banned.57f4a7f02835e746.mp4');
+export const BANNED_WEBM = hostedImageUrl('app-banned.7b2a4c17603fbe1c.webm');
+export const BANNED_POSTER = hostedImageUrl('app-banned.da3d66d03a7c4962.webp');

fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPage.module.css

@@ -778,6 +778,11 @@
 	.perkRowFlipped {
 		grid-template-columns: 5fr 7fr;
 	}
+
+	.perkRowTextOnly {
+		grid-template-columns: minmax(0, 1fr);
+		padding-block: 2.5rem;
+	}
 }
 
 .perkArtColumn {

fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPage.tsx

@@ -30,6 +30,7 @@ import {
 	resolveUploadSizes,
 } from '@app/features/premium/components/plutonium_page/PlutoniumPageComparison';
 import {PlutoniumPageIcon} from '@app/features/premium/components/plutonium_page/PlutoniumPageIcons';
+import {CROWN_AVIF, CROWN_WEBP} from '@app/features/premium/components/plutonium_page/PlutoniumPageMedia';
 import {
 	BACK_DESCRIPTOR,
 	CLOSING_BODY_DESCRIPTOR,
@@ -74,8 +75,6 @@ import FocusRing from '@app/features/ui/focus_ring/FocusRing';
 import MobileLayout from '@app/features/ui/state/MobileLayout';
 import Users from '@app/features/user/state/Users';
 import * as LocaleUtils from '@app/features/user/utils/LocaleUtils';
-import crownAvif from '@app/media/images/plutonium/plutonium-crown.avif';
-import crownWebp from '@app/media/images/plutonium/plutonium-crown.webp';
 import {GuildFeatures} from '@fluxer/constants/src/GuildConstants';
 import {getFormattedLongDate} from '@fluxer/date_utils/src/DateFormatting';
 import {Trans, useLingui} from '@lingui/react/macro';
@@ -451,22 +450,24 @@ export const PlutoniumPage = observer(function PlutoniumPage() {
 				)}
 				<section className={styles.hero} data-flx="premium.plutonium-page.hero">
 					<div className={styles.heroInner}>
-						<div className={styles.crownWrap}>
+						{!RuntimeConfig.isSelfHosted() && (
-							<picture>
+							<div className={styles.crownWrap}>
-								<source type="image/avif" srcSet={crownAvif} />
+								<picture>
-								<img
+									<source type="image/avif" srcSet={CROWN_AVIF} />
-									draggable={false}
+									<img
-									className={styles.crown}
+										draggable={false}
-									src={crownWebp}
+										className={styles.crown}
-									width={480}
+										src={CROWN_WEBP}
-									height={395}
+										width={480}
-									alt=""
+										height={395}
-									decoding="sync"
+										alt=""
-									fetchPriority="high"
+										decoding="sync"
-									data-flx="premium.plutonium-page.hero.crown"
+										fetchPriority="high"
-								/>
+										data-flx="premium.plutonium-page.hero.crown"
-							</picture>
+									/>
-						</div>
+								</picture>
+							</div>
+						)}
 						<h1 className={styles.displayHeading} data-flx="premium.plutonium-page.hero.title">
 							{PREMIUM_PRODUCT_FULL_NAME}
 						</h1>

fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPageMedia.ts

@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {hostedImageUrl} from '@app/features/app/config/HostedMedia';
+
+export const CROWN_AVIF = hostedImageUrl('perks-plutonium-crown.4d0b72644330bf10.avif');
+export const CROWN_WEBP = hostedImageUrl('perks-plutonium-crown.3265aa6b4147b19b.webp');
+
+export const AVATAR_LSF = hostedImageUrl('perks-avatar-lsf.0800cc17b7d31b5e.webp');
+export const BANNER_LSF = hostedImageUrl('perks-banner-lsf.05f2565afc72a167.webp');
+export const EMOJI_CATVIBE = hostedImageUrl('perks-emoji-catvibe.28e83552cc9a26c2.webp');
+export const EMOJI_CATWAVE = hostedImageUrl('perks-emoji-catwave.663abebab1c327fb.webp');
+export const STICKER_FEEL_THAT = hostedImageUrl('perks-sticker-feel-that.3eae385d2d9cc99a.webp');
+
+type ShotSet = [string, string, string];
+
+export interface ShotFamily {
+	avif: ShotSet;
+	webp: ShotSet;
+}
+
+function hostedShotSet([small, medium, large]: ShotSet): ShotSet {
+	return [hostedImageUrl(small), hostedImageUrl(medium), hostedImageUrl(large)];
+}
+
+function shotFamily(avif: ShotSet, webp: ShotSet): ShotFamily {
+	return {avif: hostedShotSet(avif), webp: hostedShotSet(webp)};
+}
+
+export const EXPRESSIONS_SHOTS = shotFamily(
+	[
+		'screenshots-feature-perk-expressions-640w.481d53f29ebbe154.avif',
+		'screenshots-feature-perk-expressions-1120w.609f056dd55a176f.avif',
+		'screenshots-feature-perk-expressions-1600w.35a92d3fc43fa858.avif',
+	],
+	[
+		'screenshots-feature-perk-expressions-640w.74bde0805e3452eb.webp',
+		'screenshots-feature-perk-expressions-1120w.f52ad1f714185faa.webp',
+		'screenshots-feature-perk-expressions-1600w.192c0d18c4a3d705.webp',
+	],
+);
+
+export const PROFILE_SHOTS = shotFamily(
+	[
+		'screenshots-feature-perk-profile-640w.0df90fc828ae1bb4.avif',
+		'screenshots-feature-perk-profile-1120w.ca5e8d03c4f7eac7.avif',
+		'screenshots-feature-perk-profile-1600w.c790612e9d3295f7.avif',
+	],
+	[
+		'screenshots-feature-perk-profile-640w.76efd2d804dc3c32.webp',
+		'screenshots-feature-perk-profile-1120w.799d04fb886684b2.webp',
+		'screenshots-feature-perk-profile-1600w.7459898617b3aa74.webp',
+	],
+);
+
+export const STREAM_SHOTS = shotFamily(
+	[
+		'screenshots-feature-perk-stream-640w.d0567b22ca4d9910.avif',
+		'screenshots-feature-perk-stream-1120w.07ea4f292b8953a5.avif',
+		'screenshots-feature-perk-stream-1600w.c9697ce430b0773e.avif',
+	],
+	[
+		'screenshots-feature-perk-stream-640w.2848435d90d0afa5.webp',
+		'screenshots-feature-perk-stream-1120w.a2076637a71b99bd.webp',
+		'screenshots-feature-perk-stream-1600w.745d8f0f60d30672.webp',
+	],
+);
+
+export const UPLOAD_SHOTS = shotFamily(
+	[
+		'screenshots-feature-perk-upload-640w.455d1bdceab21b42.avif',
+		'screenshots-feature-perk-upload-1120w.392656a9b0f21585.avif',
+		'screenshots-feature-perk-upload-1600w.1aa744f6f0122c3f.avif',
+	],
+	[
+		'screenshots-feature-perk-upload-640w.5b80c11e2a6dfe63.webp',
+		'screenshots-feature-perk-upload-1120w.156d068948c832fb.webp',
+		'screenshots-feature-perk-upload-1600w.bc3223b318081269.webp',
+	],
+);

fluxer_app/src/features/premium/components/plutonium_page/PlutoniumPageShowcase.tsx

@@ -1,6 +1,19 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+import RuntimeConfig from '@app/features/app/state/RuntimeConfig';
 import styles from '@app/features/premium/components/plutonium_page/PlutoniumPage.module.css';
+import {
+	AVATAR_LSF,
+	BANNER_LSF,
+	EMOJI_CATVIBE,
+	EMOJI_CATWAVE,
+	EXPRESSIONS_SHOTS,
+	PROFILE_SHOTS,
+	type ShotFamily,
+	STICKER_FEEL_THAT,
+	STREAM_SHOTS,
+	UPLOAD_SHOTS,
+} from '@app/features/premium/components/plutonium_page/PlutoniumPageMedia';
 import {
 	SHOWCASE_EXPRESSIONS_BODY_DESCRIPTOR,
 	SHOWCASE_EXPRESSIONS_TITLE_DESCRIPTOR,
@@ -13,35 +26,6 @@ import {
 	TAG_FOOTNOTE_MARKER_DESCRIPTOR,
 } from '@app/features/premium/components/plutonium_page/PlutoniumPageMessages';
 import FocusRing from '@app/features/ui/focus_ring/FocusRing';
-import avatarLsf from '@app/media/images/plutonium/avatar-lsf.webp';
-import bannerLsf from '@app/media/images/plutonium/banner-lsf.webp';
-import emojiCatvibe from '@app/media/images/plutonium/emoji-catvibe.webp';
-import emojiCatwave from '@app/media/images/plutonium/emoji-catwave.webp';
-import expressions640Avif from '@app/media/images/plutonium/feature-perk-expressions-640w.avif';
-import expressions640Webp from '@app/media/images/plutonium/feature-perk-expressions-640w.webp';
-import expressions1120Avif from '@app/media/images/plutonium/feature-perk-expressions-1120w.avif';
-import expressions1120Webp from '@app/media/images/plutonium/feature-perk-expressions-1120w.webp';
-import expressions1600Avif from '@app/media/images/plutonium/feature-perk-expressions-1600w.avif';
-import expressions1600Webp from '@app/media/images/plutonium/feature-perk-expressions-1600w.webp';
-import profile640Avif from '@app/media/images/plutonium/feature-perk-profile-640w.avif';
-import profile640Webp from '@app/media/images/plutonium/feature-perk-profile-640w.webp';
-import profile1120Avif from '@app/media/images/plutonium/feature-perk-profile-1120w.avif';
-import profile1120Webp from '@app/media/images/plutonium/feature-perk-profile-1120w.webp';
-import profile1600Avif from '@app/media/images/plutonium/feature-perk-profile-1600w.avif';
-import profile1600Webp from '@app/media/images/plutonium/feature-perk-profile-1600w.webp';
-import stream640Avif from '@app/media/images/plutonium/feature-perk-stream-640w.avif';
-import stream640Webp from '@app/media/images/plutonium/feature-perk-stream-640w.webp';
-import stream1120Avif from '@app/media/images/plutonium/feature-perk-stream-1120w.avif';
-import stream1120Webp from '@app/media/images/plutonium/feature-perk-stream-1120w.webp';
-import stream1600Avif from '@app/media/images/plutonium/feature-perk-stream-1600w.avif';
-import stream1600Webp from '@app/media/images/plutonium/feature-perk-stream-1600w.webp';
-import upload640Avif from '@app/media/images/plutonium/feature-perk-upload-640w.avif';
-import upload640Webp from '@app/media/images/plutonium/feature-perk-upload-640w.webp';
-import upload1120Avif from '@app/media/images/plutonium/feature-perk-upload-1120w.avif';
-import upload1120Webp from '@app/media/images/plutonium/feature-perk-upload-1120w.webp';
-import upload1600Avif from '@app/media/images/plutonium/feature-perk-upload-1600w.avif';
-import upload1600Webp from '@app/media/images/plutonium/feature-perk-upload-1600w.webp';
-import stickerFeelThat from '@app/media/images/plutonium/sticker-feel-that.webp';
 import type {MessageDescriptor} from '@lingui/core';
 import {useLingui} from '@lingui/react/macro';
 import {clsx} from 'clsx';
@@ -50,11 +34,6 @@ import type React from 'react';
 const PERK_SHOT_SIZES = '(min-width: 48rem) 50vw, calc(100vw - 5rem)';
 const CHAT_SURFACE = 'rgb(30, 29, 35)';
 
-interface ShotFamily {
-	avif: [string, string, string];
-	webp: [string, string, string];
-}
-
 interface PerkOverlay {
 	src: string;
 	left: number;
@@ -78,9 +57,9 @@ interface PerkCard {
 const SHOT_WIDTHS = [640, 1120, 1600] as const;
 
 const EXPRESSIONS_OVERLAYS: ReadonlyArray<PerkOverlay> = [
-	{src: emojiCatvibe, left: 65.22, top: 11.241, width: 4.372, height: 5.128, backdrop: CHAT_SURFACE},
+	{src: EMOJI_CATVIBE, left: 65.22, top: 11.241, width: 4.372, height: 5.128, backdrop: CHAT_SURFACE},
-	{src: emojiCatwave, left: 14.936, top: 31.197, width: 8.743, height: 10.256, backdrop: CHAT_SURFACE},
+	{src: EMOJI_CATWAVE, left: 14.936, top: 31.197, width: 8.743, height: 10.256, backdrop: CHAT_SURFACE},
-	{src: stickerFeelThat, left: 14.936, top: 52.35, width: 29.144, height: 34.188},
+	{src: STICKER_FEEL_THAT, left: 14.936, top: 52.35, width: 29.144, height: 34.188},
 ];
 
 const PERK_CARDS: ReadonlyArray<PerkCard> = [
@@ -88,10 +67,7 @@ const PERK_CARDS: ReadonlyArray<PerkCard> = [
 		id: 'expressions',
 		title: SHOWCASE_EXPRESSIONS_TITLE_DESCRIPTOR,
 		body: SHOWCASE_EXPRESSIONS_BODY_DESCRIPTOR,
-		shots: {
+		shots: EXPRESSIONS_SHOTS,
-			avif: [expressions640Avif, expressions1120Avif, expressions1600Avif],
-			webp: [expressions640Webp, expressions1120Webp, expressions1600Webp],
-		},
 		width: 549,
 		height: 468,
 		overlays: EXPRESSIONS_OVERLAYS,
@@ -100,10 +76,7 @@ const PERK_CARDS: ReadonlyArray<PerkCard> = [
 		id: 'profile',
 		title: SHOWCASE_PROFILE_TITLE_DESCRIPTOR,
 		body: SHOWCASE_PROFILE_BODY_DESCRIPTOR,
-		shots: {
+		shots: PROFILE_SHOTS,
-			avif: [profile640Avif, profile1120Avif, profile1600Avif],
-			webp: [profile640Webp, profile1120Webp, profile1600Webp],
-		},
 		width: 662,
 		height: 407,
 		overlays: [],
@@ -113,10 +86,7 @@ const PERK_CARDS: ReadonlyArray<PerkCard> = [
 		id: 'stream',
 		title: SHOWCASE_STREAM_TITLE_DESCRIPTOR,
 		body: SHOWCASE_STREAM_BODY_DESCRIPTOR,
-		shots: {
+		shots: STREAM_SHOTS,
-			avif: [stream640Avif, stream1120Avif, stream1600Avif],
-			webp: [stream640Webp, stream1120Webp, stream1600Webp],
-		},
 		width: 588,
 		height: 343,
 		overlays: [],
@@ -125,10 +95,7 @@ const PERK_CARDS: ReadonlyArray<PerkCard> = [
 		id: 'upload',
 		title: SHOWCASE_UPLOAD_TITLE_DESCRIPTOR,
 		body: SHOWCASE_UPLOAD_BODY_DESCRIPTOR,
-		shots: {
+		shots: UPLOAD_SHOTS,
-			avif: [upload640Avif, upload1120Avif, upload1600Avif],
-			webp: [upload640Webp, upload1120Webp, upload1600Webp],
-		},
 		width: 549,
 		height: 362,
 		overlays: [],
@@ -161,7 +128,7 @@ function ProfileOverlay() {
 			<g clipPath="url(#plutonium-perk-banner-clip)">
 				<g mask="url(#plutonium-perk-banner-bite)">
 					<image
-						href={bannerLsf}
+						href={BANNER_LSF}
 						x="345.333"
 						y="16.333"
 						width="300.333"
@@ -172,7 +139,7 @@ function ProfileOverlay() {
 				<circle cx="398.333" cy="114.333" r="41.6" fill="none" stroke="#0c0b0e" strokeWidth="3.2" />
 			</g>
 			<g clipPath="url(#plutonium-perk-avatar-clip)" mask="url(#plutonium-perk-avatar-notch)">
-				<image href={avatarLsf} x="358.333" y="74.333" width="80" height="80" preserveAspectRatio="xMidYMid slice" />
+				<image href={AVATAR_LSF} x="358.333" y="74.333" width="80" height="80" preserveAspectRatio="xMidYMid slice" />
 			</g>
 		</svg>
 	);
@@ -238,6 +205,7 @@ export function PlutoniumPageShowcase({
 	onFootnoteClick,
 }: PlutoniumPageShowcaseProps) {
 	const {i18n} = useLingui();
+	const showArt = !RuntimeConfig.isSelfHosted();
 	return (
 		<>
 			{PERK_CARDS.map((card, index) => {
@@ -254,12 +222,14 @@ export function PlutoniumPageShowcase({
 				return (
 					<article
 						key={card.id}
-						className={clsx(styles.perkRow, flipped && styles.perkRowFlipped)}
+						className={clsx(styles.perkRow, showArt ? flipped && styles.perkRowFlipped : styles.perkRowTextOnly)}
 						data-flx={`premium.plutonium-page.perk-row.${card.id}`}
 					>
-						<div className={styles.perkArtColumn} data-flx="premium.plutonium-page.perk-row.art-column">
+						{showArt && (
-							<PerkArt card={card} eager={index === 0} />
+							<div className={styles.perkArtColumn} data-flx="premium.plutonium-page.perk-row.art-column">
-						</div>
+								<PerkArt card={card} eager={index === 0} />
+							</div>
+						)}
 						<div className={styles.perkTextColumn} data-flx="premium.plutonium-page.perk-row.text-column">
 							<h2 className={styles.perkTitle} data-flx="premium.plutonium-page.perk-row.title">
 								{i18n._(card.title, {size: uploadSize})}

fluxer_app/src/features/ui/components/icons/InboxIcon.tsx

@@ -1,4 +1,5 @@
-// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: AGPL-3.0-or-later AND Apache-2.0
+// SPDX-FileCopyrightText: Google LLC
 
 import {remFromPx} from '@app/features/theme/layout/RemFromPx';
 import type {IconProps} from '@phosphor-icons/react';

fluxer_app/src/media/images/fluxer-logo-color.svg

@@ -1,4 +1,5 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+<!-- SPDX-FileCopyrightText: Fluxer Platform AB -->
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 512 512">
   <path fill="#4641D9" d="M512 256C512 114.615 397.385 0 256 0S0 114.615 0 256s114.615 256 256 256 256-114.615 256-256Z"/>
   <path fill="#fff" d="M121.272 233.143c-13.443 0-24.6738-10.866-23.0194-24.208 1.7884-14.418 5.4904-26.692 11.1064-36.821 8.685-15.39 19.962-26.59 33.828-33.6 14.019-7.009 28.8-10.514 44.343-10.514 15.543 0 29.638 3.505 42.286 10.514 12.8 6.857 27.657 17.372 44.571 31.543 11.429 9.6 20.419 16.457 26.972 20.572 6.704 3.961 14.171 5.942 22.4 5.942 13.257 0 23.695-4.723 31.314-14.171 3.633-4.505 6.348-10.015 8.145-16.53 3.686-13.366 14.025-25.07 27.889-25.07 13.392 0 24.638 10.739 23.095 24.042-1.681 14.49-5.391 26.819-11.129 36.987-8.686 15.39-20.038 26.59-34.057 33.6-14.019 7.009-28.8 10.514-44.343 10.514-15.543 0-29.714-3.276-42.514-9.829-12.8-6.704-27.581-17.447-44.343-32.228-10.972-9.6-19.886-16.381-26.743-20.343-6.857-4.114-14.4-6.172-22.629-6.172-12.343 0-22.552 4.267-30.628 12.8-4.204 4.442-7.252 10.452-9.143 18.031-3.337 13.367-13.623 24.941-27.401 24.941Zm0 138.057c-13.443 0-24.6738-10.866-23.0194-24.207 1.7884-14.419 5.4904-26.693 11.1064-36.822 8.685-15.39 19.962-26.59 33.828-33.6 14.019-7.009 28.8-10.514 44.343-10.514 15.543 0 29.638 3.505 42.286 10.514 12.8 6.858 27.657 17.372 44.571 31.543 11.429 9.6 20.419 16.457 26.972 20.572 6.704 3.962 14.171 5.943 22.4 5.943 13.257 0 23.695-4.724 31.314-14.172 3.633-4.505 6.348-10.015 8.145-16.53 3.686-13.366 14.025-25.07 27.889-25.07 13.392 0 24.638 10.74 23.095 24.042-1.681 14.49-5.391 26.819-11.129 36.987-8.686 15.39-20.038 26.59-34.057 33.6-14.019 7.009-28.8 10.514-44.343 10.514-15.543 0-29.714-3.276-42.514-9.829-12.8-6.704-27.581-17.447-44.343-32.228-10.972-9.6-19.886-16.381-26.743-20.343-6.857-4.114-14.4-6.171-22.629-6.171-12.343 0-22.552 4.266-30.628 12.8-4.204 4.441-7.252 10.451-9.143 18.03-3.337 13.367-13.623 24.941-27.401 24.941Z"/>

fluxer_app/src/media/images/fluxer-logo-monochrome.svg

@@ -1,4 +1,5 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+<!-- SPDX-FileCopyrightText: Fluxer Platform AB -->
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 512 512">
   <path fill="currentColor" d="M256 0c141.385 0 256 114.615 256 256S397.385 512 256 512 0 397.385 0 256 114.615 0 256 0Zm-68.47 266.057c-15.543 0-30.324 3.505-44.343 10.514-13.866 7.01-25.143 18.21-33.828 33.6-5.616 10.129-9.318 22.403-11.1061 36.822-1.6543 13.341 9.5761 24.207 23.0181 24.207 13.778 0 24.065-11.574 27.402-24.941 1.891-7.579 4.939-13.589 9.142-18.03 8.076-8.534 18.286-12.8 30.629-12.8 8.229 0 15.772 2.057 22.629 6.171 6.857 3.962 15.771 10.743 26.742 20.343 16.762 14.781 31.544 25.524 44.344 32.228 12.8 6.553 26.971 9.829 42.514 9.829 15.543 0 30.324-3.505 44.343-10.514 14.019-7.01 25.371-18.21 34.057-33.6 5.738-10.168 9.448-22.497 11.129-36.987 1.543-13.302-9.704-24.042-23.096-24.042-13.863.001-24.202 11.704-27.888 25.07-1.797 6.515-4.512 12.025-8.145 16.53-7.619 9.448-18.057 14.172-31.314 14.172-8.229 0-15.696-1.982-22.4-5.943-6.553-4.115-15.543-10.972-26.972-20.572-16.914-14.171-31.772-24.685-44.572-31.543-12.647-7.009-26.742-10.514-42.285-10.514Zm0-138.057c-15.543 0-30.324 3.505-44.343 10.514-13.866 7.01-25.143 18.21-33.828 33.6-5.616 10.129-9.318 22.403-11.1061 36.821-1.6544 13.341 9.5761 24.207 23.0181 24.208 13.778 0 24.065-11.574 27.402-24.941 1.891-7.579 4.939-13.589 9.142-18.031 8.076-8.533 18.286-12.8 30.629-12.8 8.229 0 15.772 2.058 22.629 6.172 6.857 3.962 15.771 10.743 26.742 20.343 16.762 14.781 31.544 25.524 44.344 32.228 12.8 6.553 26.971 9.829 42.514 9.829 15.543 0 30.324-3.505 44.343-10.514 14.019-7.01 25.371-18.21 34.057-33.6 5.738-10.168 9.448-22.497 11.129-36.987 1.543-13.303-9.704-24.042-23.096-24.042-13.863 0-24.202 11.704-27.888 25.07-1.797 6.515-4.512 12.025-8.145 16.53-7.619 9.448-18.057 14.171-31.314 14.171-8.229 0-15.696-1.981-22.4-5.942-6.553-4.115-15.543-10.972-26.972-20.572-16.914-14.171-31.772-24.686-44.572-31.543C217.168 131.505 203.073 128 187.53 128Z"/>
 </svg>

fluxer_app/src/media/images/fluxer-logo-wordmark-monochrome.svg

@@ -1,4 +1,5 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+<!-- SPDX-FileCopyrightText: Fluxer Platform AB -->
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1959 512">
   <path fill="currentColor" d="M585 431.4V93.48h82.944V431.4H585Zm41.472-120.32v-67.584h172.032v67.584H626.472Zm0-148.48V93.48h189.44v69.12h-189.44ZM843.951 431.4V73h82.944v358.4h-82.944ZM1047.92 438.568c-29.35 0-51.2-10.24-65.536-30.72-13.995-20.48-20.992-51.883-20.992-94.208V161.064h82.948v151.552c0 19.797 2.73 33.621 8.19 41.472 5.8 7.851 13.99 11.776 24.57 11.776 7.51 0 14.34-1.877 20.48-5.632 6.49-4.096 12.12-10.069 16.9-17.92 4.78-8.192 8.36-18.603 10.75-31.232 2.73-12.629 4.1-27.819 4.1-45.568V161.064h82.94V431.4h-70.65V325.928h-3.59c-2.05 26.283-6.65 47.787-13.82 64.512-7.17 16.384-17.07 28.501-29.7 36.352-12.63 7.851-28.16 11.776-46.59 11.776ZM1232.57 431.4l84.99-135.68-83.97-134.656h96.26l39.42 87.552h2.56l38.4-87.552h95.23l-81.4 134.656 82.43 135.68h-97.79l-37.38-86.016h-2.05L1327.8 431.4h-95.23Z"/>
   <path fill="currentColor" d="M1630.96 438.568c-25.6 0-47.1-3.584-64.51-10.752-17.06-7.509-30.89-17.579-41.47-30.208-10.58-12.971-18.26-27.648-23.04-44.032-4.44-16.384-6.66-33.621-6.66-51.712 0-19.456 2.39-38.059 7.17-55.808 5.12-17.749 12.8-33.451 23.04-47.104 10.58-13.995 24.07-24.917 40.45-32.768 16.73-8.192 36.69-12.288 59.9-12.288s43.01 4.096 59.4 12.288c16.72 7.851 30.03 18.944 39.93 33.28 9.9 14.336 16.22 30.891 18.95 49.664 3.07 18.773 2.73 39.083-1.03 60.928L1547 313.128v-45.056l132.6-2.56-10.75 26.112c2.05-15.701 1.71-28.843-1.02-39.424-2.39-10.923-7-19.115-13.83-24.576-6.82-5.803-16.21-8.704-28.16-8.704-12.63 0-22.69 3.243-30.2 9.728-7.51 6.485-12.8 15.701-15.88 27.648-3.07 11.605-4.6 25.429-4.6 41.472 0 27.648 4.6 47.787 13.82 60.416 9.22 12.629 23.38 18.944 42.5 18.944 8.19 0 15.01-1.024 20.48-3.072 5.46-2.048 9.89-4.949 13.31-8.704 3.41-4.096 5.8-8.875 7.17-14.336 1.36-5.803 1.87-12.288 1.53-19.456l75.78 4.096c1.02 11.264-.17 22.869-3.59 34.816-3.07 11.947-9.04 23.04-17.92 33.28-8.87 10.24-21.33 18.603-37.37 25.088-15.7 6.485-35.67 9.728-59.91 9.728ZM1778.45 431.4V161.064h71.68v107.52h4.1c2.05-28.672 5.97-51.2 11.77-67.584 6.15-16.725 13.66-28.501 22.53-35.328 9.22-7.168 19.46-10.752 30.72-10.752 6.15 0 12.46.853 18.95 2.56 6.82 1.707 13.48 4.437 19.96 8.192l-4.09 92.16c-7.51-4.437-14.85-7.68-22.02-9.728-7.17-2.389-13.99-3.584-20.48-3.584-10.92 0-20.14 3.072-27.65 9.216-7.51 6.144-13.31 15.189-17.4 27.136-3.76 11.947-5.64 26.453-5.64 43.52V431.4h-82.43ZM256 0c141.385 0 256 114.615 256 256S397.385 512 256 512 0 397.385 0 256 114.615 0 256 0Zm-68.47 266.057c-15.543 0-30.324 3.505-44.343 10.514-13.866 7.01-25.143 18.21-33.828 33.6-5.616 10.129-9.318 22.403-11.1061 36.822-1.6543 13.341 9.5761 24.207 23.0181 24.207 13.778 0 24.065-11.574 27.402-24.941 1.891-7.579 4.939-13.589 9.142-18.03 8.076-8.534 18.286-12.8 30.629-12.8 8.229 0 15.772 2.057 22.629 6.171 6.857 3.962 15.771 10.743 26.742 20.343 16.762 14.781 31.544 25.524 44.344 32.228 12.8 6.553 26.971 9.829 42.514 9.829 15.543 0 30.324-3.505 44.343-10.514 14.019-7.01 25.371-18.21 34.057-33.6 5.738-10.168 9.448-22.497 11.129-36.987 1.543-13.302-9.704-24.042-23.096-24.042-13.863.001-24.202 11.704-27.888 25.07-1.797 6.515-4.512 12.025-8.145 16.53-7.619 9.448-18.057 14.172-31.314 14.172-8.229 0-15.696-1.982-22.4-5.943-6.553-4.115-15.543-10.972-26.972-20.572-16.914-14.171-31.772-24.685-44.572-31.543-12.647-7.009-26.742-10.514-42.285-10.514Zm0-138.057c-15.543 0-30.324 3.505-44.343 10.514-13.866 7.01-25.143 18.21-33.828 33.6-5.616 10.129-9.318 22.403-11.1061 36.821-1.6544 13.341 9.5761 24.207 23.0181 24.208 13.778 0 24.065-11.574 27.402-24.941 1.891-7.579 4.939-13.589 9.142-18.031 8.076-8.533 18.286-12.8 30.629-12.8 8.229 0 15.772 2.058 22.629 6.172 6.857 3.962 15.771 10.743 26.742 20.343 16.762 14.781 31.544 25.524 44.344 32.228 12.8 6.553 26.971 9.829 42.514 9.829 15.543 0 30.324-3.505 44.343-10.514 14.019-7.01 25.371-18.21 34.057-33.6 5.738-10.168 9.448-22.497 11.129-36.987 1.543-13.303-9.704-24.042-23.096-24.042-13.863 0-24.202 11.704-27.888 25.07-1.797 6.515-4.512 12.025-8.145 16.53-7.619 9.448-18.057 14.171-31.314 14.171-8.229 0-15.696-1.981-22.4-5.942-6.553-4.115-15.543-10.972-26.972-20.572-16.914-14.171-31.772-24.686-44.572-31.543C217.168 131.505 203.073 128 187.53 128Z"/>

fluxer_app/src/media/images/fluxer-wordmark.svg

@@ -1,4 +1,5 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+<!-- SPDX-FileCopyrightText: Fluxer Platform AB -->
 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 1374 366">
   <path fill="currentColor" d="M0 358.4V20.48h82.944V358.4H0Zm41.472-120.32v-67.584h172.032v67.584H41.472Zm0-148.48V20.48h189.44V89.6H41.472ZM258.951 358.4V0h82.944v358.4h-82.944ZM462.92 365.568c-29.35 0-51.2-10.24-65.536-30.72-13.995-20.48-20.992-51.883-20.992-94.208V88.064h82.948v151.552c0 19.797 2.73 33.621 8.19 41.472 5.8 7.851 13.99 11.776 24.57 11.776 7.51 0 14.34-1.877 20.48-5.632 6.49-4.096 12.12-10.069 16.9-17.92 4.78-8.192 8.36-18.603 10.75-31.232 2.73-12.629 4.1-27.819 4.1-45.568V88.064h82.94V358.4h-70.65V252.928h-3.59c-2.05 26.283-6.65 47.787-13.82 64.512-7.17 16.384-17.07 28.501-29.7 36.352-12.63 7.851-28.16 11.776-46.59 11.776ZM647.569 358.4l84.99-135.68-83.97-134.656h96.26l39.42 87.552h2.56l38.4-87.552h95.23l-81.4 134.656 82.43 135.68h-97.79l-37.38-86.016h-2.05l-41.47 86.016h-95.23Z"/>
   <path fill="currentColor" d="M1045.96 365.568c-25.6 0-47.101-3.584-64.511-10.752-17.06-7.509-30.89-17.579-41.47-30.208-10.58-12.971-18.26-27.648-23.04-44.032-4.44-16.384-6.66-33.621-6.66-51.712 0-19.456 2.39-38.059 7.17-55.808 5.12-17.749 12.8-33.451 23.04-47.104 10.58-13.995 24.07-24.917 40.45-32.768 16.73-8.192 36.691-12.288 59.901-12.288s43.01 4.096 59.4 12.288c16.72 7.851 30.03 18.944 39.93 33.28 9.9 14.336 16.22 30.891 18.95 49.664 3.07 18.773 2.73 39.083-1.03 60.928l-196.091 3.072v-45.056l132.601-2.56-10.75 26.112c2.05-15.701 1.71-28.843-1.02-39.424-2.39-10.923-7-19.115-13.83-24.576-6.82-5.803-16.21-8.704-28.16-8.704-12.63 0-22.69 3.243-30.2 9.728-7.51 6.485-12.801 15.701-15.881 27.648-3.07 11.605-4.6 25.429-4.6 41.472 0 27.648 4.6 47.787 13.821 60.416 9.22 12.629 23.38 18.944 42.5 18.944 8.19 0 15.01-1.024 20.48-3.072 5.46-2.048 9.89-4.949 13.31-8.704 3.41-4.096 5.8-8.875 7.17-14.336 1.36-5.803 1.87-12.288 1.53-19.456l75.78 4.096c1.02 11.264-.17 22.869-3.59 34.816-3.07 11.947-9.04 23.04-17.92 33.28-8.87 10.24-21.33 18.603-37.37 25.088-15.7 6.485-35.67 9.728-59.91 9.728ZM1193.45 358.4V88.0639h71.68V195.584h4.1c2.05-28.672 5.97-51.2 11.77-67.584 6.15-16.725 13.66-28.5011 22.53-35.3281 9.22-7.168 19.46-10.752 30.72-10.752 6.15 0 12.46.853 18.95 2.56 6.82 1.707 13.48 4.437 19.96 8.192l-4.09 92.1601c-7.51-4.437-14.85-7.68-22.02-9.728-7.17-2.389-13.99-3.584-20.48-3.584-10.92 0-20.14 3.072-27.65 9.216-7.51 6.144-13.31 15.189-17.4 27.136-3.76 11.947-5.64 26.453-5.64 43.52V358.4h-82.43Z"/>

fluxer_app/src/media/images/neko.png.license

@@ -0,0 +1,12 @@
+SPDX-License-Identifier: MIT
+SPDX-FileCopyrightText: 2022 adryd
+
+Source: https://github.com/adryd325/oneko.js (oneko.gif)
+
+Copyright © 2022 adryd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

fluxer_app_proxy/src/csp.rs

@@ -96,6 +96,7 @@ const FRAME_SOURCES: &[&str] = &[
 
 const IMAGE_SOURCES: &[&str] = &[
     "https://*.fluxer.app",
+    "https://fluxer.app",
     "https://i.ytimg.com",
     "https://*.youtube.com",
     "https://*.fluxer.media",
@@ -104,6 +105,7 @@ const IMAGE_SOURCES: &[&str] = &[
 
 const MEDIA_SOURCES: &[&str] = &[
     "https://*.fluxer.app",
+    "https://fluxer.app",
     "https://*.youtube.com",
     "https://*.fluxer.media",
     "https://fluxer.media",
@@ -434,6 +436,24 @@ mod tests {
         assert!(csp.contains("frame-ancestors 'none'"));
     }
 
+    #[test]
+    fn build_csp_allows_the_apex_domain_for_images_and_media() {
+        let config = default_csp_config();
+        let csp = build_csp(&config, &[hash_of("boot()")], &runtime_sources());
+        for name in ["img-src ", "media-src "] {
+            let directive = csp
+                .split("; ")
+                .find(|directive| directive.starts_with(name))
+                .expect("directive");
+            assert!(
+                directive
+                    .split(' ')
+                    .any(|source| source == "https://fluxer.app"),
+                "{name}must allow the apex domain: {directive}"
+            );
+        }
+    }
+
     #[test]
     fn build_csp_allows_blob_connections_for_camera_background_media() {
         let config = default_csp_config();

fluxer_app_proxy/src/routes/spa_index.rs

@@ -74,7 +74,6 @@ const STATIC_ASSET_PREFIXES: &[&str] = &[
     "/avatars/",
     "/badges/",
     "/desktop/",
-    "/embeds/",
     "/emoji/",
     "/libs/",
     "/marketing/",

fluxer_desktop/build_resources/icons-canary/AppIcon.icon/Assets/Vector.svg

@@ -1,4 +1,5 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+<!-- SPDX-FileCopyrightText: Fluxer Platform AB -->
 <svg width="633" height="512" viewBox="0 0 633 512" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46.3631 210.286C19.4771 210.286 -2.98429 188.554 0.324514 161.87C3.90111 133.034 11.3051 108.486 22.5371 88.228C39.9071 57.448 62.4611 35.048 90.1931 21.028C118.231 7.01002 147.793 0 178.879 0C209.965 0 238.155 7.01002 263.451 21.028C289.051 34.742 318.765 55.772 352.593 84.114C375.451 103.314 393.431 117.028 406.537 125.258C419.945 133.18 434.879 137.142 451.337 137.142C477.851 137.142 498.727 127.696 513.965 108.8C521.231 99.79 526.661 88.77 530.255 75.74C537.627 49.008 558.305 25.6 586.033 25.6C612.817 25.6 635.309 47.078 632.223 73.684C628.861 102.664 621.441 127.322 609.965 147.658C592.593 178.438 569.889 200.838 541.851 214.858C513.813 228.876 484.251 235.886 453.165 235.886C422.079 235.886 393.737 229.334 368.137 216.228C342.537 202.82 312.975 181.334 279.451 151.772C257.507 132.572 239.679 119.01 225.965 111.086C212.251 102.858 197.165 98.742 180.707 98.742C156.021 98.742 135.603 107.276 119.451 124.342C111.043 133.226 104.947 145.246 101.165 160.404C94.4911 187.138 73.9191 210.286 46.3631 210.286ZM46.3631 486.4C19.4771 486.4 -2.98429 464.668 0.324514 437.986C3.90111 409.148 11.3051 384.6 22.5371 364.342C39.9071 333.562 62.4611 311.162 90.1931 297.142C118.231 283.124 147.793 276.114 178.879 276.114C209.965 276.114 238.155 283.124 263.451 297.142C289.051 310.858 318.765 331.886 352.593 360.228C375.451 379.428 393.431 393.142 406.537 401.372C419.945 409.296 434.879 413.258 451.337 413.258C477.851 413.258 498.727 403.81 513.965 384.914C521.231 375.904 526.661 364.884 530.255 351.854C537.627 325.122 558.305 301.714 586.033 301.714C612.817 301.714 635.309 323.194 632.223 349.798C628.861 378.778 621.441 403.436 609.965 423.772C592.593 454.552 569.889 476.952 541.851 490.972C513.813 504.99 484.251 512 453.165 512C422.079 512 393.737 505.448 368.137 492.342C342.537 478.934 312.975 457.448 279.451 427.886C257.507 408.686 239.679 395.124 225.965 387.2C212.251 378.972 197.165 374.858 180.707 374.858C156.021 374.858 135.603 383.39 119.451 400.458C111.043 409.34 104.947 421.36 101.165 436.518C94.4911 463.252 73.9191 486.4 46.3631 486.4Z" fill="white"/>
 </svg>

fluxer_desktop/build_resources/icons-stable/AppIcon.icon/Assets/Vector.svg

@@ -1,4 +1,5 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+<!-- SPDX-FileCopyrightText: Fluxer Platform AB -->
 <svg width="633" height="512" viewBox="0 0 633 512" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M46.3631 210.286C19.4771 210.286 -2.98429 188.554 0.324514 161.87C3.90111 133.034 11.3051 108.486 22.5371 88.228C39.9071 57.448 62.4611 35.048 90.1931 21.028C118.231 7.01002 147.793 0 178.879 0C209.965 0 238.155 7.01002 263.451 21.028C289.051 34.742 318.765 55.772 352.593 84.114C375.451 103.314 393.431 117.028 406.537 125.258C419.945 133.18 434.879 137.142 451.337 137.142C477.851 137.142 498.727 127.696 513.965 108.8C521.231 99.79 526.661 88.77 530.255 75.74C537.627 49.008 558.305 25.6 586.033 25.6C612.817 25.6 635.309 47.078 632.223 73.684C628.861 102.664 621.441 127.322 609.965 147.658C592.593 178.438 569.889 200.838 541.851 214.858C513.813 228.876 484.251 235.886 453.165 235.886C422.079 235.886 393.737 229.334 368.137 216.228C342.537 202.82 312.975 181.334 279.451 151.772C257.507 132.572 239.679 119.01 225.965 111.086C212.251 102.858 197.165 98.742 180.707 98.742C156.021 98.742 135.603 107.276 119.451 124.342C111.043 133.226 104.947 145.246 101.165 160.404C94.4911 187.138 73.9191 210.286 46.3631 210.286ZM46.3631 486.4C19.4771 486.4 -2.98429 464.668 0.324514 437.986C3.90111 409.148 11.3051 384.6 22.5371 364.342C39.9071 333.562 62.4611 311.162 90.1931 297.142C118.231 283.124 147.793 276.114 178.879 276.114C209.965 276.114 238.155 283.124 263.451 297.142C289.051 310.858 318.765 331.886 352.593 360.228C375.451 379.428 393.431 393.142 406.537 401.372C419.945 409.296 434.879 413.258 451.337 413.258C477.851 413.258 498.727 403.81 513.965 384.914C521.231 375.904 526.661 364.884 530.255 351.854C537.627 325.122 558.305 301.714 586.033 301.714C612.817 301.714 635.309 323.194 632.223 349.798C628.861 378.778 621.441 403.436 609.965 423.772C592.593 454.552 569.889 476.952 541.851 490.972C513.813 504.99 484.251 512 453.165 512C422.079 512 393.737 505.448 368.137 492.342C342.537 478.934 312.975 457.448 279.451 427.886C257.507 408.686 239.679 395.124 225.965 387.2C212.251 378.972 197.165 374.858 180.707 374.858C156.021 374.858 135.603 383.39 119.451 400.458C111.043 409.34 104.947 421.36 101.165 436.518C94.4911 463.252 73.9191 486.4 46.3631 486.4Z" fill="white"/>
 </svg>

fluxer_desktop/packaging/linux/app.fluxer.Fluxer.metainfo.xml

@@ -44,7 +44,7 @@
     <screenshots>
         <screenshot type="default" xml:lang="en">
             <caption>The main Fluxer window.</caption>
-            <image type="source" width="1920" height="1080">https://raw.githubusercontent.com/fluxerapp/fluxer/refs/heads/main/fluxer_static/marketing/screenshots/desktop-2560w.avif</image>
+            <image type="source" width="2560" height="2227">https://fluxer.app/static/img/screenshots-desktop-2560w.948e9d88f4c9807a.avif</image>
         </screenshot>
     </screenshots>
     <url type="bugtracker">https://github.com/fluxerapp/fluxer/issues</url>

fluxer_desktop/packaging/linux/app.fluxer.Fluxer.svg

@@ -1,2 +1,3 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+<!-- SPDX-FileCopyrightText: Fluxer Platform AB -->
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33.87 33.87"><g transform="translate(-32.28 -138.64)"><circle cx="49.21" cy="155.57" r="15.74" fill="none" stroke="currentColor" stroke-width=".26" opacity=".2" style="marker:none"/><path fill="#4641D9" d="M65.09 155.57a15.87 15.87 0 1 0-31.75 0 15.87 15.87 0 0 0 31.75 0z"/><path fill="#fff" d="M40.84 154.16c-.83 0-1.53-.68-1.42-1.5.1-.9.34-1.66.69-2.29a5 5 0 0 1 2.1-2.08 6.07 6.07 0 0 1 2.74-.65c.97 0 1.84.21 2.63.65a17 17 0 0 1 2.76 1.96c.7.6 1.26 1.02 1.66 1.28.41.24.88.36 1.4.36.82 0 1.47-.29 1.94-.88.23-.28.4-.62.52-1.03a1.9 1.9 0 0 1 1.73-1.57c.83 0 1.53.66 1.43 1.5a7.5 7.5 0 0 1-.69 2.3 5 5 0 0 1-2.12 2.08c-.87.43-1.79.65-2.75.65-.98 0-1.86-.21-2.65-.62a17.3 17.3 0 0 1-2.75-2c-.69-.6-1.24-1.02-1.67-1.27a2.71 2.71 0 0 0-1.4-.38c-.77 0-1.4.27-1.9.8-.26.27-.45.65-.57 1.12a1.86 1.86 0 0 1-1.68 1.57Zm0 8.64c-.83 0-1.53-.68-1.42-1.5.1-.9.34-1.67.69-2.3a5 5 0 0 1 2.1-2.08 6.07 6.07 0 0 1 2.74-.65c.97 0 1.84.22 2.63.65a17 17 0 0 1 2.76 1.96c.7.6 1.26 1.03 1.66 1.28.41.25.88.37 1.4.37.82 0 1.47-.3 1.94-.89.23-.28.4-.62.52-1.03a1.9 1.9 0 0 1 1.73-1.57c.83 0 1.53.67 1.43 1.5a7.5 7.5 0 0 1-.69 2.3 5 5 0 0 1-2.12 2.08c-.87.44-1.79.66-2.75.66-.98 0-1.86-.21-2.65-.62a17.3 17.3 0 0 1-2.75-2c-.69-.6-1.24-1.03-1.67-1.27a2.71 2.71 0 0 0-1.4-.39c-.77 0-1.4.27-1.9.8-.26.28-.45.65-.57 1.12a1.86 1.86 0 0 1-1.68 1.57z"/></g></svg>

fluxer_desktop/packaging/linux/app.fluxer.FluxerCanary.metainfo.xml

@@ -44,7 +44,7 @@
     <screenshots>
         <screenshot type="default">
             <caption>The main Fluxer window.</caption>
-            <image type="source" width="1920" height="1080">https://fluxerstatic.com/marketing/screenshots/desktop-1920w.avif</image>
+            <image type="source" width="1920" height="1670">https://fluxer.app/static/img/screenshots-desktop-1920w.4976d2d1f2238c05.avif</image>
         </screenshot>
     </screenshots>
     <url type="bugtracker">https://github.com/fluxerapp/fluxer/issues</url>

fluxer_desktop/packaging/linux/app.fluxer.FluxerCanary.svg

@@ -1,2 +1,3 @@
-<!-- SPDX-License-Identifier: AGPL-3.0-or-later -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+<!-- SPDX-FileCopyrightText: Fluxer Platform AB -->
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33.87 33.87"><g transform="translate(-32.28 -138.64)"><circle cx="49.21" cy="155.57" r="15.74" fill="none" stroke="currentColor" stroke-width=".26" opacity=".2" style="marker:none"/><path fill="#FFA600" d="M65.09 155.57a15.87 15.87 0 1 0-31.75 0 15.87 15.87 0 0 0 31.75 0z"/><path fill="#fff" d="M40.84 154.16c-.83 0-1.53-.68-1.42-1.5.1-.9.34-1.66.69-2.29a5 5 0 0 1 2.1-2.08 6.07 6.07 0 0 1 2.74-.65c.97 0 1.84.21 2.63.65a17 17 0 0 1 2.76 1.96c.7.6 1.26 1.02 1.66 1.28.41.24.88.36 1.4.36.82 0 1.47-.29 1.94-.88.23-.28.4-.62.52-1.03a1.9 1.9 0 0 1 1.73-1.57c.83 0 1.53.66 1.43 1.5a7.5 7.5 0 0 1-.69 2.3 5 5 0 0 1-2.12 2.08c-.87.43-1.79.65-2.75.65-.98 0-1.86-.21-2.65-.62a17.3 17.3 0 0 1-2.75-2c-.69-.6-1.24-1.02-1.67-1.27a2.71 2.71 0 0 0-1.4-.38c-.77 0-1.4.27-1.9.8-.26.27-.45.65-.57 1.12a1.86 1.86 0 0 1-1.68 1.57Zm0 8.64c-.83 0-1.53-.68-1.42-1.5.1-.9.34-1.67.69-2.3a5 5 0 0 1 2.1-2.08 6.07 6.07 0 0 1 2.74-.65c.97 0 1.84.22 2.63.65a17 17 0 0 1 2.76 1.96c.7.6 1.26 1.03 1.66 1.28.41.25.88.37 1.4.37.82 0 1.47-.3 1.94-.89.23-.28.4-.62.52-1.03a1.9 1.9 0 0 1 1.73-1.57c.83 0 1.53.67 1.43 1.5a7.5 7.5 0 0 1-.69 2.3 5 5 0 0 1-2.12 2.08c-.87.44-1.79.66-2.75.66-.98 0-1.86-.21-2.65-.62a17.3 17.3 0 0 1-2.75-2c-.69-.6-1.24-1.03-1.67-1.27a2.71 2.71 0 0 0-1.4-.39c-.77 0-1.4.27-1.9.8-.26.28-.45.65-.57 1.12a1.86 1.86 0 0 1-1.68 1.57z"/></g></svg>

fluxer_docs/src/content/docs/operator/configuration.mdx

@@ -174,7 +174,7 @@ The API and worker validate endpoint URLs at startup. The Gateway endpoint requi
 
 #### `FLUXER_STATIC_CDN_DOMAIN`
 
-Default empty. A separate host for static assets. When set, the static endpoint of `api` and `worker` is forced to `https` with no port. Only `api` and `worker` read it, so set `FLUXER_STATIC_CDN_ENDPOINT` to the same origin as well for `admin`, `app-proxy`, `gateway` and `unfurl`. Compose forwards it from `.env`.
+Default empty. A separate host for static assets. When set, the static endpoint of `api` and `worker` is forced to `https` with no port. Only `api` and `worker` read it, so set `FLUXER_STATIC_CDN_ENDPOINT` to the same origin as well for `admin`, `app-proxy` and `gateway`. Compose forwards it from `.env`.
 
 #### `FLUXER_INVITE_DOMAIN`
 
@@ -210,7 +210,7 @@ Defaults to the derived endpoint. The public Media Proxy URL. The `gifs` service
 
 #### `FLUXER_STATIC_CDN_ENDPOINT`
 
-Defaults to the derived endpoint. The static asset origin. Read by `api`, `worker`, `admin`, `app-proxy`, and `unfurl`. Compose forwards it from `.env`. When it is unset, `admin` and `unfurl-shard` get the public origin, and every other service derives it itself.
+Defaults to the derived endpoint. The static asset origin. Read by `api`, `worker`, `admin`, and `app-proxy`. Compose forwards it from `.env`. When it is unset, `admin` gets the public origin, and every other service derives it itself.
 
 #### `FLUXER_ADMIN_ENDPOINT`
 
@@ -252,10 +252,6 @@ No default. The internal Media Proxy address. `unfurl-shard` reads this name alo
 
 No default. The public Media Proxy URL used by `gifs`, `unfurl`, and `media-proxy`. `gifs` requires this or `FLUXER_MEDIA_ENDPOINT` to start. Set it on `media-proxy` so requests for its own assets use local storage instead of an HTTP round trip. For `api` and `worker`, use `FLUXER_MEDIA_ENDPOINT` instead. Compose forwards it from `.env` to every app service. When it is unset, they get `FLUXER_MEDIA_ENDPOINT`, or the public media URL when that is unset too.
 
-#### `FLUXER_UNFURL_STATIC_CDN_ENDPOINT`
-
-Falls back to `FLUXER_STATIC_CDN_ENDPOINT`. The static origin used by `unfurl`. Read only by `unfurl`. Compose forwards it from `.env` to `unfurl-shard`.
-
 ## The edge
 
 The `edge` container is the only HTTP entry point. Neither layout below needs a change to the edge settings.
@@ -1082,7 +1078,7 @@ Default `development`. The runtime mode. `development`, `production`, or `test`.
 
 #### `FLUXER_SELF_HOSTED`
 
-Default `false`. The self-host switch. Compose sets `true`. It relaxes the production Postgres SSL requirement, seeds the limit tier, gates registration, donation and discovery controllers, keeps premium billing off until it is set up as [Payments](#payments) describes, and turns blocklist feeds off.
+Default `false`. The self-host switch. Compose sets `true`. It relaxes the production Postgres SSL requirement, seeds the limit tier, gates registration, donation and discovery controllers, keeps premium billing off until it is set up as [Payments](#payments) describes, turns blocklist feeds off, and keeps hosted-only artwork from `fluxer.app` out of the app, webhook avatars and link embeds.
 
 `/_metrics` on `api`, `media-proxy`, `gateway`, and `push`, plus the Gateway's `/_health/ready`, `/_health/drain`, and `/_health/undrain`, are gated to loopback peers, so no proxy reaches them. The probes that work from outside are `/api/_health`, `/gateway/_health`, `/media/_health`, and the edge's own `/_health`.
 

fluxer_static/Dockerfile

@@ -9,7 +9,7 @@ ARG SOURCE_DATE=""
 
 LABEL org.opencontainers.image.title="fluxer-static"
 LABEL org.opencontainers.image.description="Self-hostable static asset bundle for Fluxer"
-LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
+LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later AND CC-BY-SA-4.0 AND CC-BY-4.0"
 LABEL org.opencontainers.image.vendor="Fluxer"
 LABEL org.opencontainers.image.url="https://fluxer.app"
 LABEL org.opencontainers.image.documentation="https://docs.fluxer.app"
@@ -20,10 +20,10 @@ LABEL org.opencontainers.image.created="${SOURCE_DATE}"
 LABEL app.fluxer.build-version="${BUILD_VERSION}"
 
 COPY fluxer_static/Caddyfile /etc/caddy/Caddyfile
+COPY --chown=65532:65532 fluxer_static/LICENSE fluxer_static/THIRD_PARTY_LICENSES.md /srv/fluxer-static/
 COPY --chown=65532:65532 fluxer_static/avatars /srv/fluxer-static/avatars
 COPY --chown=65532:65532 fluxer_static/badges /srv/fluxer-static/badges
 COPY --chown=65532:65532 fluxer_static/desktop /srv/fluxer-static/desktop
-COPY --chown=65532:65532 fluxer_static/embeds /srv/fluxer-static/embeds
 COPY --chown=65532:65532 fluxer_static/emoji /srv/fluxer-static/emoji
 COPY --chown=65532:65532 fluxer_static/web /srv/fluxer-static/web
 

fluxer_static/LICENSE

@@ -1,13 +1,449 @@
-Fluxer Static Asset License Notice
+Fluxer artwork license
 
-Unless a file or directory carries a more specific license notice, the contents
+Copyright Fluxer Platform AB
-of this repository are copyright Fluxer and are all rights reserved. This
-includes Fluxer branding, icons, default avatars, badge artwork, screenshots,
-marketing images, generated app imagery, and repository automation files.
 
-Third-party materials retain their upstream licenses. See
+Fluxer-owned artwork is licensed under the Creative Commons
-THIRD_PARTY_LICENSES.md and the license or notice files in the relevant
+Attribution-ShareAlike 4.0 International License (CC BY-SA 4.0). The full
-subdirectories for those terms.
+legal code follows below. This covers the Fluxer-owned assets in fluxer_static,
+such as the logo, symbol, badges, default avatars, favicons, app icons, Open
+Graph image and branding files. It also covers the same Fluxer artwork wherever
+else it appears in this repository, for example the desktop app icons, the app
+logo SVGs and the docs logo.
+
+Third-party files keep their own licenses. See THIRD_PARTY_LICENSES.md and the
+license or notice files in the relevant directories.
+
+This license does not grant trademark rights (section 2(b)(2) of the legal
+code). Use of the Fluxer name and logo is covered by the "Name and marks"
+section of .github/GOVERNANCE.md.
+
+=======================================================================
+
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+    wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More considerations
+     for the public:
+    wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+     including for purposes of Section 3(b); and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
 
-Public availability of this repository or the static asset bucket does not
-grant trademark, brand, or endorsement rights.

fluxer_static/THIRD_PARTY_LICENSES.md

@@ -1,15 +1,23 @@
 # Third-party licenses
 
-This repository mirrors static assets for Fluxer. Fluxer-owned assets are
+This directory mirrors static assets for Fluxer. Fluxer-owned assets are
-covered by the root `LICENSE` notice. Third-party assets keep their upstream
+copyright Fluxer Platform AB and licensed under CC BY-SA 4.0, see `LICENSE`.
-licenses and attribution requirements.
+Third-party assets keep their upstream licenses and attribution requirements.
 
 | Path | Component | License |
 | --- | --- | --- |
 | `desktop/spellcheck/dictionaries/` | Hunspell dictionaries packaged as exact `dictionary-*` npm package versions | Varies by language; each dictionary directory includes its own `LICENSE`, and the package summary is in `desktop/spellcheck/dictionaries/NOTICE.md`. |
-| `emoji/` | Twemoji graphics from `jdecked/twemoji` | CC-BY-4.0; see `emoji/LICENSE` and `emoji/NOTICE.md`. |
+| `emoji/` | Twemoji graphics from `jdecked/twemoji`, plus spritesheets generated from them as derivatives. Copyright 2014-2021 Twitter, Inc and other contributors, 2022-present Jason Sofonia, Justine De Caires and other contributors | CC-BY-4.0. See `emoji/LICENSE` and `emoji/NOTICE.md`. |
-| `marketing/flags/` | Twemoji flag graphics from `jdecked/twemoji` | CC-BY-4.0; see `marketing/flags/LICENSE` and `marketing/flags/NOTICE.md`. |
+| `marketing/flags/` | Twemoji flag graphics from `jdecked/twemoji`. Copyright 2014-2021 Twitter, Inc and other contributors, 2022-present Jason Sofonia, Justine De Caires and other contributors | CC-BY-4.0. See `marketing/flags/LICENSE` and `marketing/flags/NOTICE.md`. |
-| `embeds/icons/hn.webp` | Hacker News brand icon | Third-party brand asset; see `embeds/icons/NOTICE.md`. |
+| `web/og-image-default.png` | Background pattern "I Like Food" from Hero Patterns (https://heropatterns.com) by Steve Schoger | CC-BY-4.0 (https://creativecommons.org/licenses/by/4.0/). |
+
+`fluxer_app` also bundles this third-party artwork outside this directory:
+
+| Path | Component | License |
+| --- | --- | --- |
+| `fluxer_app/src/media/images/i-like-food.svg` | "I Like Food" pattern from Hero Patterns (https://heropatterns.com) by Steve Schoger | CC-BY-4.0 (https://creativecommons.org/licenses/by/4.0/). |
+| `fluxer_app/src/media/images/neko.png`, `fluxer_app/src/features/accessibility/components/NekoSprite.tsx` | Sprite sheet and sprite tables from `adryd325/oneko.js`. Copyright 2022 adryd | MIT (https://github.com/adryd325/oneko.js/blob/main/LICENSE). |
+| `fluxer_app/src/features/ui/components/icons/InboxIcon.tsx` | Inbox icon path from Google Material Icons (`google/material-design-icons`). Copyright Google LLC | Apache-2.0 (https://www.apache.org/licenses/LICENSE-2.0). |
 
 Noise suppression WebAssembly binaries and AudioWorklet processors are bundled
 by `fluxer_app` from `@sapphi-red/web-noise-suppressor` rather than mirrored

fluxer_static/avatars/NOTICE.md

@@ -1,5 +1,4 @@
 # Avatar asset notice
 
-The avatar images in this directory are Fluxer-owned static assets. They are
+The avatar images in this directory are copyright Fluxer Platform AB and
-covered by the root `LICENSE` notice unless a specific file later has a
+licensed under CC BY-SA 4.0. See the root `LICENSE`.
-more specific license notice.

fluxer_static/badges/NOTICE.md

@@ -1,4 +1,4 @@
 # Badge asset notice
 
-The badge SVGs in this directory are Fluxer-owned static assets and product
+The badge SVGs in this directory are copyright Fluxer Platform AB and licensed
-identity artwork. They are covered by the root `LICENSE` notice.
+under CC BY-SA 4.0. See the root `LICENSE`.

fluxer_static/embeds/NOTICE.md

@@ -1,5 +0,0 @@
-# Embed asset notices
-
-Embedded service icons are third-party service identifiers unless a specific
-file or subdirectory says otherwise. See `icons/NOTICE.md` for current icon
-notices.

fluxer_static/embeds/icons/NOTICE.md

@@ -1,5 +0,0 @@
-# Embedded service icon notices
-
-`hn.webp` is the Hacker News brand icon, included only as a third-party service
-identifier. This repository does not grant license, trademark, endorsement, or
-brand rights for Hacker News or Y Combinator marks.

fluxer_static/emoji/NOTICE.md

@@ -1,8 +1,12 @@
 # Emoji licenses
 
-The emoji SVGs and spritesheets in this directory are Twemoji graphics sourced
+The emoji SVGs in this directory are Twemoji graphics sourced from
-from `jdecked/twemoji`. Twemoji graphics are licensed under Creative Commons
+`jdecked/twemoji`. The spritesheets are generated from those SVGs and are
-Attribution 4.0 International (CC-BY-4.0), copied in `LICENSE`.
+derivatives of the same graphics. Twemoji graphics are licensed under Creative
+Commons Attribution 4.0 International (CC-BY-4.0), copied in `LICENSE`.
+
+Copyright 2014-2021 Twitter, Inc and other contributors. Copyright
+2022-present Jason Sofonia, Justine De Caires and other contributors.
 
 Attribution: Twemoji from https://github.com/jdecked/twemoji, as distributed by
 `@twemoji/[email protected]`.

fluxer_static/marketing/NOTICE.md

@@ -1,7 +1,7 @@
 # Marketing asset notices
 
-Fluxer-owned marketing screenshots, PWA install imagery, and branding assets
+The `branding/` directory holds Fluxer logo and symbol files, copyright Fluxer
-are covered by the root `LICENSE` notice.
+Platform AB and licensed under CC BY-SA 4.0. See the root `LICENSE`.
 
 The `flags/` directory is third-party Twemoji artwork and has its own
 CC-BY-4.0 license and attribution notice.

fluxer_static/marketing/branding/NOTICE.md

@@ -1,5 +1,6 @@
 # Branding asset notice
 
-The logo and symbol files in this directory are Fluxer-owned brand assets. They
+The logo and symbol files in this directory are copyright Fluxer Platform AB
-are covered by the root `LICENSE` notice and do not grant trademark or brand
+and licensed under CC BY-SA 4.0. See the root `LICENSE`. The license does not
-usage rights.
+grant trademark rights. See the "Name and marks" section of
+`.github/GOVERNANCE.md`.

fluxer_static/marketing/flags/NOTICE.md

@@ -4,5 +4,8 @@ The flag SVGs in this directory are Twemoji graphics sourced from
 `jdecked/twemoji`. Twemoji graphics are licensed under Creative Commons
 Attribution 4.0 International (CC-BY-4.0), copied in `LICENSE`.
 
+Copyright 2014-2021 Twitter, Inc and other contributors. Copyright
+2022-present Jason Sofonia, Justine De Caires and other contributors.
+
 Attribution: Twemoji from https://github.com/jdecked/twemoji, as distributed by
 `@twemoji/[email protected]`.

fluxer_static/marketing/pwa-install/NOTICE.md

@@ -1,4 +0,0 @@
-# PWA install asset notice
-
-The PWA install images in this directory are Fluxer-owned marketing assets.
-They are covered by the root `LICENSE` notice.