Merge branch 'fix/relase_typo' into slowcord
This commit is contained in:
		
						commit
						91ca2efb7c
					
				| @ -26,6 +26,6 @@ DROP TABLE webhooks; | ||||
| DROP TABLE channels; | ||||
| DROP TABLE members; | ||||
| DROP TABLE guilds; | ||||
| DROP TABLE client_relase; | ||||
| DROP TABLE client_release; | ||||
| -- DROP TABLE users; | ||||
| -- DROP TABLE config; | ||||
| @ -1,6 +1,6 @@ | ||||
| import { Router, Response, Request } from "express"; | ||||
| import { route } from "@fosscord/api"; | ||||
| import { Relase, Config } from "@fosscord/util"; | ||||
| import { Release, Config } from "@fosscord/util"; | ||||
| 
 | ||||
| const router = Router(); | ||||
| 
 | ||||
| @ -12,9 +12,9 @@ router.get("/:branch", route({}), async (req: Request, res: Response) => { | ||||
| 
 | ||||
| 	if(!platform || !["linux", "osx", "win"].includes(platform.toString())) return res.status(404) | ||||
| 
 | ||||
| 	const relase = await Relase.findOneOrFail({ name: client.relases.upstreamVersion }); | ||||
| 	const release = await Release.findOneOrFail({ name: client.releases.upstreamVersion }); | ||||
| 
 | ||||
| 	res.redirect(relase[`win_url`]); | ||||
| 	res.redirect(release[`win_url`]); | ||||
| }); | ||||
| 
 | ||||
| export default router; | ||||
|  | ||||
| @ -18,7 +18,7 @@ router.get("/:id", route({}), async (req: Request, res: Response) => { | ||||
| 			access_type: 2, | ||||
| 			name: "", | ||||
| 			features: [], | ||||
| 			relase_date: "", | ||||
| 			release_date: "", | ||||
| 			premium: false, | ||||
| 			slug: "", | ||||
| 			flags: 4, | ||||
|  | ||||
| @ -18,7 +18,7 @@ router.get("/:id", route({}), async (req: Request, res: Response) => { | ||||
| 			access_type: 2, | ||||
| 			name: "", | ||||
| 			features: [], | ||||
| 			relase_date: "", | ||||
| 			release_date: "", | ||||
| 			premium: false, | ||||
| 			slug: "", | ||||
| 			flags: 4, | ||||
|  | ||||
| @ -1,19 +1,19 @@ | ||||
| import { Router, Response, Request } from "express"; | ||||
| import { route } from "@fosscord/api"; | ||||
| import { Config, Relase } from "@fosscord/util"; | ||||
| import { Config, Release } from "@fosscord/util"; | ||||
| 
 | ||||
| const router = Router(); | ||||
| 
 | ||||
| router.get("/", route({}), async (req: Request, res: Response) => { | ||||
| 	const { client } = Config.get(); | ||||
| 
 | ||||
|     const relase = await Relase.findOneOrFail({ name: client.relases.upstreamVersion}) | ||||
|     const release = await Release.findOneOrFail({ name: client.releases.upstreamVersion}) | ||||
| 
 | ||||
| 	res.json({ | ||||
|         name: relase.name, | ||||
|         pub_date: relase.pub_date, | ||||
|         url: relase.url, | ||||
|         notes: relase.notes | ||||
|         name: release.name, | ||||
|         pub_date: release.pub_date, | ||||
|         url: release.url, | ||||
|         notes: release.notes | ||||
|     }); | ||||
| }); | ||||
| 
 | ||||
|  | ||||
| @ -1,8 +1,8 @@ | ||||
| import { Column, Entity} from "typeorm"; | ||||
| import { BaseClass } from "./BaseClass"; | ||||
| 
 | ||||
| @Entity("client_relase") | ||||
| export class Relase extends BaseClass { | ||||
| @Entity("client_release") | ||||
| export class Release extends BaseClass { | ||||
| 	@Column() | ||||
| 	name: string; | ||||
| 
 | ||||
| @ -188,8 +188,8 @@ export interface ConfigValue { | ||||
| 	}, | ||||
| 	client: { | ||||
| 		useTestClient: Boolean; | ||||
| 		relases: { | ||||
| 			useLocalRelases: Boolean; //TODO
 | ||||
| 		releases: { | ||||
| 			useLocalRelease: Boolean; //TODO
 | ||||
| 			upstreamVersion: string; | ||||
| 		} | ||||
| 	}, | ||||
| @ -222,7 +222,7 @@ export const DefaultConfigOptions: ConfigValue = { | ||||
| 	}, | ||||
| 	general: { | ||||
| 		instanceName: "Fosscord Instance", | ||||
| 		instanceDescription: "This is a Fosscord instance made in pre-relase days", | ||||
| 		instanceDescription: "This is a Fosscord instance made in pre-release days", | ||||
| 		frontPage: null, | ||||
| 		tosPage: null, | ||||
| 		correspondenceEmail: "noreply@localhost.local", | ||||
| @ -389,8 +389,8 @@ export const DefaultConfigOptions: ConfigValue = { | ||||
| 	}, | ||||
| 	client: { | ||||
| 		useTestClient: true, | ||||
| 		relases: { | ||||
| 			useLocalRelases: true, | ||||
| 		releases: { | ||||
| 			useLocalRelease: true, | ||||
| 			upstreamVersion: "0.0.264" | ||||
| 		} | ||||
| 	}, | ||||
|  | ||||
| @ -27,4 +27,4 @@ export * from "./Template"; | ||||
| export * from "./User"; | ||||
| export * from "./VoiceState"; | ||||
| export * from "./Webhook"; | ||||
| export * from "./ClientRelase"; | ||||
| export * from "./ClientRelease"; | ||||
							
								
								
									
										13
									
								
								util/src/migrations/1648643945733-ReleaseTypo.ts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								util/src/migrations/1648643945733-ReleaseTypo.ts
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,13 @@ | ||||
| import { MigrationInterface, QueryRunner } from "typeorm"; | ||||
| 
 | ||||
| export class ReleaseTypo1648643945733 implements MigrationInterface { | ||||
| 	name = "ReleaseTypo1648643945733"; | ||||
| 
 | ||||
| 	public async up(queryRunner: QueryRunner): Promise<void> { | ||||
| 		await queryRunner.renameTable("client_relase", "client_release"); | ||||
| 	} | ||||
| 
 | ||||
| 	public async down(queryRunner: QueryRunner): Promise<void> { | ||||
| 		await queryRunner.renameTable("client_release", "client_relase"); | ||||
| 	} | ||||
| } | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Madeline
						Madeline