mirror of
				https://codeberg.org/yeentown/barkey.git
				synced 2025-10-30 21:14:12 +00:00 
			
		
		
		
	merge: Don't depend on launcher.moe for status assets (!653)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/653 Approved-by: Hazelnoot <acomputerdog@gmail.com> Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
		
						commit
						7347d03907
					
				
					 6 changed files with 7 additions and 7 deletions
				
			
		|  | @ -193,9 +193,9 @@ export class ClientServerService { | ||||||
| 			icon: meta.iconUrl, | 			icon: meta.iconUrl, | ||||||
| 			appleTouchIcon: meta.app512IconUrl, | 			appleTouchIcon: meta.app512IconUrl, | ||||||
| 			themeColor: meta.themeColor, | 			themeColor: meta.themeColor, | ||||||
| 			serverErrorImageUrl: meta.serverErrorImageUrl ?? 'https://launcher.moe/error.png', | 			serverErrorImageUrl: meta.serverErrorImageUrl ?? '/status/error.png', | ||||||
| 			infoImageUrl: meta.infoImageUrl ?? 'https://launcher.moe/nothinghere.png', | 			infoImageUrl: meta.infoImageUrl ?? '/status/nothinghere.png', | ||||||
| 			notFoundImageUrl: meta.notFoundImageUrl ?? 'https://launcher.moe/missingpage.webp', | 			notFoundImageUrl: meta.notFoundImageUrl ?? '/status/missingpage.webp', | ||||||
| 			instanceUrl: this.config.url, | 			instanceUrl: this.config.url, | ||||||
| 			randomMOTD: this.config.customMOTD ? this.config.customMOTD[Math.floor(Math.random() * this.config.customMOTD.length)] : undefined, | 			randomMOTD: this.config.customMOTD ? this.config.customMOTD[Math.floor(Math.random() * this.config.customMOTD.length)] : undefined, | ||||||
| 			metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(meta)), | 			metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(meta)), | ||||||
|  |  | ||||||
							
								
								
									
										
											BIN
										
									
								
								packages/frontend/assets/status/error.png
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								packages/frontend/assets/status/error.png
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 26 KiB | 
							
								
								
									
										
											BIN
										
									
								
								packages/frontend/assets/status/missingpage.webp
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								packages/frontend/assets/status/missingpage.webp
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 6.4 KiB | 
							
								
								
									
										
											BIN
										
									
								
								packages/frontend/assets/status/nothinghere.png
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								packages/frontend/assets/status/nothinghere.png
									
										
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 36 KiB | 
|  | @ -160,9 +160,9 @@ export const ROLE_POLICIES = [ | ||||||
| export const CURRENT_STICKY_TOP = 'CURRENT_STICKY_TOP'; | export const CURRENT_STICKY_TOP = 'CURRENT_STICKY_TOP'; | ||||||
| export const CURRENT_STICKY_BOTTOM = 'CURRENT_STICKY_BOTTOM'; | export const CURRENT_STICKY_BOTTOM = 'CURRENT_STICKY_BOTTOM'; | ||||||
| 
 | 
 | ||||||
| export const DEFAULT_SERVER_ERROR_IMAGE_URL = 'https://launcher.moe/error.png'; | export const DEFAULT_SERVER_ERROR_IMAGE_URL = '/status/error.png'; | ||||||
| export const DEFAULT_NOT_FOUND_IMAGE_URL = 'https://launcher.moe/missingpage.webp'; | export const DEFAULT_NOT_FOUND_IMAGE_URL = '/status/missingpage.webp'; | ||||||
| export const DEFAULT_INFO_IMAGE_URL = 'https://launcher.moe/nothinghere.png'; | export const DEFAULT_INFO_IMAGE_URL = '/status/nothinghere.png'; | ||||||
| 
 | 
 | ||||||
| export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'scale', 'position', 'fg', 'bg', 'border', 'font', 'blur', 'rainbow', 'sparkle', 'rotate', 'ruby', 'unixtime', 'crop', 'fade', 'followmouse']; | export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'scale', 'position', 'fg', 'bg', 'border', 'font', 'blur', 'rainbow', 'sparkle', 'rotate', 'ruby', 'unixtime', 'crop', 'fade', 'followmouse']; | ||||||
| export const MFM_PARAMS: Record<typeof MFM_TAGS[number], string[]> = { | export const MFM_PARAMS: Record<typeof MFM_TAGS[number], string[]> = { | ||||||
|  |  | ||||||
|  | @ -20,7 +20,7 @@ | ||||||
| 			worker-src 'self'; | 			worker-src 'self'; | ||||||
| 			script-src 'self' 'unsafe-eval' https://*.hcaptcha.com https://challenges.cloudflare.com https://esm.sh; | 			script-src 'self' 'unsafe-eval' https://*.hcaptcha.com https://challenges.cloudflare.com https://esm.sh; | ||||||
| 			style-src 'self' 'unsafe-inline'; | 			style-src 'self' 'unsafe-inline'; | ||||||
| 			img-src 'self' data: blob: www.google.com xn--931a.moe launcher.moe localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 activitypub.software secure.gravatar.com avatars.githubusercontent.com; | 			img-src 'self' data: blob: www.google.com xn--931a.moe localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 activitypub.software secure.gravatar.com avatars.githubusercontent.com; | ||||||
| 			media-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000; | 			media-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000; | ||||||
| 			connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com https://api.listenbrainz.org; | 			connect-src 'self' localhost:3000 localhost:5173 127.0.0.1:5173 127.0.0.1:3000 https://newassets.hcaptcha.com https://api.listenbrainz.org; | ||||||
| 			frame-src *;" | 			frame-src *;" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue